fix(resolve-map): add support for alt ES6 destructure form {a: b}

- also fixes issue w/ minimized builds
thi-ng · Jul 15, 2018 · 2482945 · 2482945
1 parent 08a7600
commit 2482945
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/packages/resolve-map/src/index.ts b/packages/resolve-map/src/index.ts
@@ -7,7 +7,7 @@ import { getIn, mutIn } from "@thi.ng/paths";
 
 const SEMAPHORE = Symbol("SEMAPHORE");
 
-const RE_ARGS = /^(function\s+\w+)?\s*\(\{([\w\s,]+)\}/
+const RE_ARGS = /^(function\s+\w+)?\s*\(\{([\w\s,:]+)\}/
 
 export type ResolveFn = (path: string) => any;
 
@@ -212,6 +212,7 @@ const resolveFunction = (fn: (x: any, r?: ResolveFn) => any, resolve: ResolveFn,
         const args = match[2]
             .replace(/\s/g, "")
             .split(/,/g)
+            .map((k) => k.split(":")[0])
             .reduce((acc, k) => (acc[k] = resolve(k), acc), {});
         res = fn(args, resolve);
     } else {

diff --git a/packages/resolve-map/test/index.ts b/packages/resolve-map/test/index.ts
@@ -73,7 +73,7 @@ describe("resolve-map", () => {
     it("destructure", () => {
         const stats = {
             // sequence average
-            mean: ({ src }) => tx.reduce(tx.mean(), src),
+            mean: ({ src: a }) => tx.reduce(tx.mean(), a),
             // sequence range
             range: ({ min, max }) => max - min,
             // computes sequence min val