@xtia/grid 0.0.7 → 0.0.8

package/README.md

@@ -1,6 +1,6 @@
 # `Grid`
 
-**Alpha**: Some API details may change
+**Alpha**: Pre-0.1.0 API details may change
 
 ## Summary
 
@@ -48,7 +48,7 @@ const grid = Grid.from(source);
 
 ### Wrapping existing structures
 
-Use Grid's interface over any read/write 2D structure:
+Use Grid's interface and features over any read/write 2D structure:
 
 ```ts
 const gameMap = [

package/lib/grid.d.ts

@@ -13,7 +13,7 @@ type PathFindOptions<T> = {
         cell: Cell<T>;
         cost: number;
     }) => void;
-    shortcutMap?: Source2D<Cell<T>[] | undefined>;
+    shortcutMap?: Source2D<Cell<T>[] | undefined> | GetXYFunc<Cell<T>[]>;
 };
 type CostMapOptions<T> = PathFindOptions<T> & {
     stopAt?: LocationSpec<T>;
@@ -43,9 +43,9 @@ export declare class Cell<T> {
     private getSiblingXY;
     getNeighbours(includeDiagonals?: boolean): Cell<T>[];
     look(xDelta: number, yDelta: number): Cell<T> | undefined;
-    findPath(target: LocationSpec<T>, getCost: CostFunc<T>, options?: PathFindOptions<T>): Cell<T>[] | null;
-    getPathMap(getCost: CostFunc<T>, options?: PathFindOptions<T>): Pipe2D<Cell<T>[] | null>;
-    getCostMap(getCost: CostFunc<T>, options?: CostMapOptions<T>): Pipe2D<number>;
+    findPath(target: LocationSpec<T>, getCost: CostFunc<T> | Map<T, number>, options?: PathFindOptions<T>): Cell<T>[] | null;
+    getPathMap(getCost: CostFunc<T> | Map<T, number>, options?: PathFindOptions<T>): Pipe2D<Cell<T>[] | null>;
+    getCostMap(getCost: CostFunc<T> | Map<T, number>, options?: CostMapOptions<T>): Pipe2D<number>;
     private calculateCosts;
     getLineTo(target: LocationSpec<T>): IterableIterator<Cell<T>>;
     getLineTo(x: number, y: number): IterableIterator<Cell<T>>;

package/lib/grid.js

@@ -72,15 +72,18 @@ export class Cell {
         const pathInfo = asPathMap
             ? new Map()
             : null;
+        const getCostFn = getCost instanceof Map
+            ? (cell) => { var _a; return (_a = getCost.get(cell.value)) !== null && _a !== void 0 ? _a : Infinity; }
+            : getCost;
         costs.set(this, 0);
         const queue = new OrderedQueue(cell => { var _a; return (_a = costs.get(cell)) !== null && _a !== void 0 ? _a : Infinity; }, this);
         const stopAtCell = options.stopAt && this.getSiblingCell(options.stopAt);
         while (queue.length > 0) {
             const current = queue.take();
-            (_a = options.onVisit) === null || _a === void 0 ? void 0 : _a.call(options, { cell: current, cost: costs.get(current) });
             if (visited.has(current))
                 continue;
             visited.add(current);
+            (_a = options.onVisit) === null || _a === void 0 ? void 0 : _a.call(options, { cell: current, cost: costs.get(current) });
             if (stopAtCell && current === stopAtCell) {
                 break;
             }
@@ -91,19 +94,21 @@ export class Cell {
                     : TraversalType.diagonal,
                 cell
             }));
-            if (options.shortcutMap) {
-                const shortcuts = (_b = options.shortcutMap.get(current.x, current.y)) === null || _b === void 0 ? void 0 : _b.map(cell => ({
+            const shortcutCells = typeof options.shortcutMap == "function"
+                ? options.shortcutMap(current.x, current.y)
+                : (_b = options.shortcutMap) === null || _b === void 0 ? void 0 : _b.get(current.x, current.y);
+            if (shortcutCells) {
+                const shortcuts = shortcutCells.map(cell => ({
                     traversalType: TraversalType.shortcut,
                     cell
                 }));
-                if (shortcuts)
-                    neighbours.push(...shortcuts);
+                neighbours.push(...shortcuts);
             }
             neighbours.forEach(n => {
                 var _a;
                 if (visited.has(n.cell))
                     return;
-                const moveCost = getCost(n.cell, {
+                const moveCost = getCostFn(n.cell, {
                     traversalType: n.traversalType,
                     from: current,
                 });

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.7",
+  "version": "0.0.8",
   "description": "2D store and utilities, with zero-copy regions and transform layers, pathfinding, Pipe2D interop",
   "name": "@xtia/grid",
   "exports": {