Fix #252: lookForAtArea matrix result type. (#253)

* Fix lookForAtArea matrix result type. * npm run dtslint * Modify new test to explicitly match issue description * Separate tests for default and explicit isArray=false --------- Co-authored-by: Piotr Paulski <[email protected]>
screepers · Jan 6, 2024 · 12cfd11 · 12cfd11
1 parent 9d727de
commit 12cfd11
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/dist/index.d.ts b/dist/index.d.ts
@@ -1825,9 +1825,9 @@ interface LookAtResultMatrix<K extends LookConstant = LookConstant> {
     };
 }
 
-interface LookForAtAreaResultMatrix<T, K extends keyof LookAtTypes = keyof LookAtTypes> {
+interface LookForAtAreaResultMatrix<T> {
     [y: number]: {
-        [x: number]: Array<LookForAtAreaResult<T, K>>;
+        [x: number]: T[];
     };
 }
 
@@ -4546,7 +4546,7 @@ interface Room {
         bottom: number,
         right: number,
         asArray?: false,
-    ): LookForAtAreaResultMatrix<AllLookAtTypes[T], T>;
+    ): LookForAtAreaResultMatrix<AllLookAtTypes[T]>;
     /**
      * Get the given objets in the supplied area.
      * @param type One of the LOOK_* constants

diff --git a/dist/screeps-tests.ts b/dist/screeps-tests.ts
@@ -908,13 +908,23 @@ function resources(o: GenericStore): ResourceConstant[] {
     const x = flags[10];
     const y = x[11];
     const entry = y[0];
-    entry.flag.remove();
+    entry.remove();
 
     const creeps = room.lookForAtArea(LOOK_CREEPS, 10, 10, 20, 20, true);
 
     creeps[0].x;
     creeps[0].y;
     creeps[0].creep.move(TOP);
+
+    // #252
+    const structuresMatrix = room.lookForAtArea(LOOK_STRUCTURES, 10, 10, 20, 20);
+
+    structuresMatrix[15][15].find((s) => s.structureType === STRUCTURE_CONTROLLER);
+
+    // #252 with explicit isArray=false
+    const structuresMatrix2 = room.lookForAtArea(LOOK_STRUCTURES, 10, 10, 20, 20, false);
+
+    structuresMatrix2[15][15].find((s) => s.structureType === STRUCTURE_CONTROLLER);
 }
 
 // StoreDefinition

diff --git a/src/helpers.ts b/src/helpers.ts
@@ -226,9 +226,9 @@ interface LookAtResultMatrix<K extends LookConstant = LookConstant> {
     };
 }
 
-interface LookForAtAreaResultMatrix<T, K extends keyof LookAtTypes = keyof LookAtTypes> {
+interface LookForAtAreaResultMatrix<T> {
     [y: number]: {
-        [x: number]: Array<LookForAtAreaResult<T, K>>;
+        [x: number]: T[];
     };
 }
 

diff --git a/src/room.ts b/src/room.ts
@@ -247,7 +247,7 @@ interface Room {
         bottom: number,
         right: number,
         asArray?: false,
-    ): LookForAtAreaResultMatrix<AllLookAtTypes[T], T>;
+    ): LookForAtAreaResultMatrix<AllLookAtTypes[T]>;
     /**
      * Get the given objets in the supplied area.
      * @param type One of the LOOK_* constants