screeps-clockwork 0.6.0 → 0.7.1

package/dist/src/wasm/screeps_clockwork.d.ts

@@ -1,8 +1,14 @@
 /* tslint:disable */
 /* eslint-disable */
-export function js_astar_multiroom_distance_map(start_packed: Uint32Array, get_cost_matrix: Function, max_rooms: number, max_ops: number, max_path_cost: number, any_of_destinations?: Uint32Array, all_of_destinations?: Uint32Array): MultiroomDistanceMap;
+export function js_astar_multiroom_distance_map(start_packed: Uint32Array, get_cost_matrix: Function, max_rooms: number, max_ops: number, max_path_cost: number, any_of_destinations?: Uint32Array | null, all_of_destinations?: Uint32Array | null): SearchResult;
 export function js_path_to_multiroom_mono_flow_field_origin(start: number, flow_field: MultiroomMonoFlowField): Path;
-export function js_dijkstra_multiroom_distance_map(start_packed: Uint32Array, get_cost_matrix: Function, max_ops: number, max_rooms: number, max_path_cost: number, any_of_destinations?: Uint32Array, all_of_destinations?: Uint32Array): MultiroomDistanceMap;
+export function js_path_to_multiroom_flow_field_origin(start: number, flow_field: MultiroomFlowField): Path;
+export function get_terrain_cost_matrix(room_name: number, plain_cost?: number | null, swamp_cost?: number | null, wall_cost?: number | null): ClockworkCostMatrix;
+/**
+ * Creates a flow field for the given distance map.
+ */
+export function multiroomFlowField(distance_map: MultiroomDistanceMap): MultiroomFlowField;
+export function js_dijkstra_multiroom_distance_map(start_packed: Uint32Array, get_cost_matrix: Function, max_ops: number, max_rooms: number, max_path_cost: number, any_of_destinations?: Uint32Array | null, all_of_destinations?: Uint32Array | null): SearchResult;
 /**
  * WASM wrapper for the BFS multiroom distance map function.
  *
@@ -19,9 +25,7 @@ export function js_dijkstra_multiroom_distance_map(start_packed: Uint32Array, ge
  * # Returns
  * A `MultiroomDistanceMap` containing the distances from the start positions
  */
-export function js_bfs_multiroom_distance_map(start_packed: Uint32Array, get_cost_matrix: Function, max_ops: number, max_rooms: number, max_path_cost: number, any_of_destinations?: Uint32Array, all_of_destinations?: Uint32Array): MultiroomDistanceMap;
-export function js_path_to_multiroom_distance_map_origin(start: number, distance_map: MultiroomDistanceMap): Path;
-export function get_terrain_cost_matrix(room_name: number, plain_cost?: number, swamp_cost?: number, wall_cost?: number): ClockworkCostMatrix;
+export function js_bfs_multiroom_distance_map(start_packed: Uint32Array, get_cost_matrix: Function, max_ops: number, max_rooms: number, max_path_cost: number, any_of_destinations?: Uint32Array | null, all_of_destinations?: Uint32Array | null): SearchResult;
 export function version(): string;
 /**
  * Exports the global range calculation between two positions.
@@ -31,11 +35,7 @@ export function get_range(packed_pos_1: number, packed_pos_2: number): number;
  * Creates a monodirectional flow field for the given distance map.
  */
 export function multiroomMonoFlowField(distance_map: MultiroomDistanceMap): MultiroomMonoFlowField;
-export function js_path_to_multiroom_flow_field_origin(start: number, flow_field: MultiroomFlowField): Path;
-/**
- * Creates a flow field for the given distance map.
- */
-export function multiroomFlowField(distance_map: MultiroomDistanceMap): MultiroomFlowField;
+export function js_path_to_multiroom_distance_map_origin(start: number, distance_map: MultiroomDistanceMap): Path;
 /**
  * Translates `COLOR_*` and `COLORS_ALL` constants.
  */
@@ -189,7 +189,7 @@ export class ClockworkCostMatrix {
    * Creates a new cost matrix within the WASM module. Optionally, a default value
    * can be provided to initialize all cells in the matrix to that value.
    */
-  constructor(_default?: number);
+  constructor(_default?: number | null);
   /**
    * Gets the cost of a given position in the cost matrix.
    */
@@ -264,7 +264,7 @@ export class MonoFlowField {
   /**
    * Set the direction for a given coordinate.
    */
-  set(x: number, y: number, value?: Direction): void;
+  set(x: number, y: number, value?: Direction | null): void;
 }
 /**
  * Maps distance values across multiple rooms, storing a DistanceMap for each room
@@ -346,7 +346,7 @@ export class MultiroomMonoFlowField {
   /**
    * Sets the direction at a given position
    */
-  set(packed_pos: number, direction?: Direction): void;
+  set(packed_pos: number, direction?: Direction | null): void;
   /**
    * Gets the list of rooms in the flow field
    */
@@ -406,12 +406,36 @@ export class SearchGoal {
   readonly pos: any;
   readonly range: number;
 }
+/**
+ * A distance map search returns both the distance map (filled out
+ * with all tiles explored) and the targets found. These aren't necessarily
+ * the same positions specified as targets - if the target range is 5, then
+ * this is the first position in range 5 of the target. If multiple targets
+ * are specified, and you care about matching the found target with one of
+ * the original targets, you can iterate through your list and figure out the
+ * ones that are in range of the found target(s).
+ */
+export class SearchResult {
+  private constructor();
+  free(): void;
+  readonly distance_map: MultiroomDistanceMap;
+  readonly found_targets: Uint32Array;
+  readonly ops: number;
+}
 
 export type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembly.Module;
 
 export interface InitOutput {
   readonly memory: WebAssembly.Memory;
   readonly js_astar_multiroom_distance_map: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number, j: number) => number;
+  readonly __wbg_clockworkcostmatrix_free: (a: number, b: number) => void;
+  readonly clockworkcostmatrix_new: (a: number) => number;
+  readonly clockworkcostmatrix_get: (a: number, b: number, c: number) => number;
+  readonly clockworkcostmatrix_set: (a: number, b: number, c: number, d: number) => void;
+  readonly __wbg_searchresult_free: (a: number, b: number) => void;
+  readonly searchresult_distance_map: (a: number) => number;
+  readonly searchresult_found_targets: (a: number, b: number) => void;
+  readonly searchresult_ops: (a: number) => number;
   readonly js_path_to_multiroom_mono_flow_field_origin: (a: number, b: number) => number;
   readonly __wbg_multiroommonoflowfield_free: (a: number, b: number) => void;
   readonly multiroommonoflowfield_js_new: () => number;
@@ -419,13 +443,18 @@ export interface InitOutput {
   readonly multiroommonoflowfield_set: (a: number, b: number, c: number) => void;
   readonly multiroommonoflowfield_getRooms: (a: number, b: number) => void;
   readonly multiroommonoflowfield_getRoom: (a: number, b: number) => number;
-  readonly __wbg_monoflowfield_free: (a: number, b: number) => void;
-  readonly monoflowfield_get: (a: number, b: number, c: number) => number;
-  readonly monoflowfield_set: (a: number, b: number, c: number, d: number) => void;
-  readonly __wbg_clockworkcostmatrix_free: (a: number, b: number) => void;
-  readonly clockworkcostmatrix_new: (a: number) => number;
-  readonly clockworkcostmatrix_get: (a: number, b: number, c: number) => number;
-  readonly clockworkcostmatrix_set: (a: number, b: number, c: number, d: number) => void;
+  readonly js_path_to_multiroom_flow_field_origin: (a: number, b: number) => number;
+  readonly __wbg_multiroomflowfield_free: (a: number, b: number) => void;
+  readonly multiroomflowfield_js_new: () => number;
+  readonly multiroomflowfield_get: (a: number, b: number) => number;
+  readonly multiroomflowfield_set: (a: number, b: number, c: number) => void;
+  readonly multiroomflowfield_getRooms: (a: number, b: number) => void;
+  readonly multiroomflowfield_getRoom: (a: number, b: number) => number;
+  readonly multiroomflowfield_getDirections: (a: number, b: number, c: number) => void;
+  readonly multiroomflowfield_setDirections: (a: number, b: number, c: number, d: number) => void;
+  readonly multiroomflowfield_addDirection: (a: number, b: number, c: number) => void;
+  readonly get_terrain_cost_matrix: (a: number, b: number, c: number, d: number) => number;
+  readonly multiroomFlowField: (a: number) => number;
   readonly js_dijkstra_multiroom_distance_map: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number, j: number) => number;
   readonly __wbg_distancemap_free: (a: number, b: number) => void;
   readonly distancemap_toArray: (a: number, b: number) => void;
@@ -438,28 +467,11 @@ export interface InitOutput {
   readonly flowfield_setDirections: (a: number, b: number, c: number, d: number, e: number) => void;
   readonly flowfield_addDirection: (a: number, b: number, c: number, d: number) => void;
   readonly js_bfs_multiroom_distance_map: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number, j: number) => number;
-  readonly js_path_to_multiroom_distance_map_origin: (a: number, b: number) => number;
-  readonly get_terrain_cost_matrix: (a: number, b: number, c: number, d: number) => number;
+  readonly __wbg_monoflowfield_free: (a: number, b: number) => void;
+  readonly monoflowfield_get: (a: number, b: number, c: number) => number;
+  readonly monoflowfield_set: (a: number, b: number, c: number, d: number) => void;
   readonly version: (a: number) => void;
   readonly get_range: (a: number, b: number) => number;
-  readonly multiroomMonoFlowField: (a: number) => number;
-  readonly js_path_to_multiroom_flow_field_origin: (a: number, b: number) => number;
-  readonly __wbg_multiroomdistancemap_free: (a: number, b: number) => void;
-  readonly multiroomdistancemap_js_new: () => number;
-  readonly multiroomdistancemap_get: (a: number, b: number) => number;
-  readonly multiroomdistancemap_set: (a: number, b: number, c: number) => void;
-  readonly multiroomdistancemap_get_rooms: (a: number, b: number) => void;
-  readonly multiroomdistancemap_get_room: (a: number, b: number) => number;
-  readonly __wbg_multiroomflowfield_free: (a: number, b: number) => void;
-  readonly multiroomflowfield_js_new: () => number;
-  readonly multiroomflowfield_get: (a: number, b: number) => number;
-  readonly multiroomflowfield_set: (a: number, b: number, c: number) => void;
-  readonly multiroomflowfield_getRooms: (a: number, b: number) => void;
-  readonly multiroomflowfield_getRoom: (a: number, b: number) => number;
-  readonly multiroomflowfield_getDirections: (a: number, b: number, c: number) => void;
-  readonly multiroomflowfield_setDirections: (a: number, b: number, c: number, d: number) => void;
-  readonly multiroomflowfield_addDirection: (a: number, b: number, c: number) => void;
-  readonly multiroomFlowField: (a: number) => number;
   readonly __wbg_path_free: (a: number, b: number) => void;
   readonly __wbg_pathfatigue_free: (a: number, b: number) => void;
   readonly path_add: (a: number, b: number) => void;
@@ -472,6 +484,14 @@ export interface InitOutput {
   readonly pathfatigue_refresh: (a: number, b: number) => void;
   readonly pathfatigue_len: (a: number) => number;
   readonly pathfatigue_moveTime: (a: number, b: number) => number;
+  readonly multiroomMonoFlowField: (a: number) => number;
+  readonly js_path_to_multiroom_distance_map_origin: (a: number, b: number) => number;
+  readonly __wbg_multiroomdistancemap_free: (a: number, b: number) => void;
+  readonly multiroomdistancemap_js_new: () => number;
+  readonly multiroomdistancemap_get: (a: number, b: number) => number;
+  readonly multiroomdistancemap_set: (a: number, b: number, c: number) => void;
+  readonly multiroomdistancemap_get_rooms: (a: number, b: number) => void;
+  readonly multiroomdistancemap_get_room: (a: number, b: number) => number;
   readonly __wbg_searchgoal_free: (a: number, b: number) => void;
   readonly searchgoal_pos: (a: number) => number;
   readonly searchgoal_range: (a: number) => number;

package/dist/src/wrappers/astarDistanceMap.d.ts

@@ -1,5 +1,4 @@
 import { ClockworkCostMatrix } from '../wasm/screeps_clockwork';
-import { ClockworkMultiroomDistanceMap } from './multiroomDistanceMap';
 /**
  * Create a distance map for the given start positions, using a breadth-first search.
  * This does not factor in terrain costs (treating anything less than 255 in the cost
@@ -21,6 +20,16 @@ export declare function astarMultiroomDistanceMap(start: RoomPosition[], { costM
     maxRooms?: number;
     maxOps?: number;
     maxPathCost?: number;
-    anyOfDestinations?: RoomPosition[];
-    allOfDestinations?: RoomPosition[];
-}): ClockworkMultiroomDistanceMap;
+    anyOfDestinations?: {
+        pos: RoomPosition;
+        range: number;
+    }[];
+    allOfDestinations?: {
+        pos: RoomPosition;
+        range: number;
+    }[];
+}): {
+    distanceMap: import("./multiroomDistanceMap").ClockworkMultiroomDistanceMap;
+    foundTargets: RoomPosition[];
+    ops: number;
+};

package/dist/src/wrappers/bfsDistanceMap.d.ts

@@ -1,5 +1,4 @@
 import { ClockworkCostMatrix } from '../wasm/screeps_clockwork';
-import { ClockworkMultiroomDistanceMap } from './multiroomDistanceMap';
 /**
  * Create a distance map for the given start positions, using a breadth-first search.
  * This does not factor in terrain costs (treating anything less than 255 in the cost
@@ -21,6 +20,16 @@ export declare function bfsMultiroomDistanceMap(start: RoomPosition[], { costMat
     maxOps?: number;
     maxRooms?: number;
     maxPathCost?: number;
-    anyOfDestinations?: RoomPosition[];
-    allOfDestinations?: RoomPosition[];
-}): ClockworkMultiroomDistanceMap;
+    anyOfDestinations?: {
+        pos: RoomPosition;
+        range: number;
+    }[];
+    allOfDestinations?: {
+        pos: RoomPosition;
+        range: number;
+    }[];
+}): {
+    distanceMap: import("./multiroomDistanceMap").ClockworkMultiroomDistanceMap;
+    foundTargets: RoomPosition[];
+    ops: number;
+};

package/dist/src/wrappers/dijkstraDistanceMap.d.ts

@@ -1,5 +1,4 @@
 import { ClockworkCostMatrix } from '../wasm/screeps_clockwork';
-import { ClockworkMultiroomDistanceMap } from './multiroomDistanceMap';
 /**
  * Create a distance map for the given start positions, using Dijkstra's algorithm to
  * factor in terrain costs (0-255, where 255 is impassable).
@@ -20,6 +19,16 @@ export declare function dijkstraMultiroomDistanceMap(start: RoomPosition[], { co
     maxOps?: number;
     maxRooms?: number;
     maxPathCost?: number;
-    anyOfDestinations?: RoomPosition[];
-    allOfDestinations?: RoomPosition[];
-}): ClockworkMultiroomDistanceMap;
+    anyOfDestinations?: {
+        pos: RoomPosition;
+        range: number;
+    }[];
+    allOfDestinations?: {
+        pos: RoomPosition;
+        range: number;
+    }[];
+}): {
+    distanceMap: import("./multiroomDistanceMap").ClockworkMultiroomDistanceMap;
+    foundTargets: RoomPosition[];
+    ops: number;
+};

package/dist/src/wrappers/searchResult.d.ts

@@ -0,0 +1,7 @@
+import { SearchResult } from '../wasm/screeps_clockwork';
+import { ClockworkMultiroomDistanceMap } from './multiroomDistanceMap';
+export declare function fromPackedSearchResult(result: SearchResult): {
+    distanceMap: ClockworkMultiroomDistanceMap;
+    foundTargets: RoomPosition[];
+    ops: number;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "screeps-clockwork",
-  "version": "0.6.0",
+  "version": "0.7.1",
   "description": "A WASM movement library for Screeps",
   "main": "dist/index.js",
   "types": "dist/src/index.d.ts",
@@ -9,7 +9,7 @@
     "build:lib": "wasm-pack build --target web --out-dir src/wasm --config build.rustflags=[\\'-Ctarget-feature=-reference-types\\',\\'-Ctarget-feature=-multivalue\\',\\'-Ctarget-feature=-sign-ext\\'] -Z build-std=std,panic_abort",
     "build:src": "rollup -c",
     "build:docs": "typedoc",
-    "build:pserver": "run-s build:src build:docs && rollup -c --environment DEST:pserver",
+    "build:pserver": "run-s build:lib build:src && rollup -c --environment DEST:pserver",
     "watch": "run-s build watch:both",
     "watch:lib": "cargo-watch -w lib -s \"npm run build:lib\"",
     "watch:src": "wait-on src/wasm/screeps_clockwork_bg.wasm && rollup -cw",