fix(resolve-map): fix #97, update to consider trailing comma & whites…

…pace

- add more tests

packages/resolve-map/src/index.ts

@@ -244,7 +244,8 @@ const resolveFunction = (
     let res;
     if (match) {
         const args = match[2]
-            .replace(/\s|,$/g, "")
+            // remove white space and trailing comma
+            .replace(/\s|(,\s*$)/g, "")
             .split(/,/g)
             .map((k) => k.split(":")[0])
             .reduce((acc: any, k) => ((acc[k] = resolve(k)), acc), {});

packages/resolve-map/test/index.ts

@@ -146,12 +146,38 @@ describe("resolve-map", () => {
         );
     });
 
+    it("destructures w/ local renames", () => {
+        assert.deepEqual(resolve({ a: 1, b: ({ a: aa }: any) => aa }), {
+            a: 1,
+            b: 1
+        });
+    });
+
     it("destructures w/ trailing comma", () => {
         assert.deepEqual(
             // since prettier is running over this file
             // build function dynamically to force trailing comma
             resolve({ a: 1, b: 2, c: new Function("{a,b,}", "return a + b") }),
-            { a: 1, b: 2, c: 3 }
+            { a: 1, b: 2, c: 3 },
+            "comma only"
+        );
+        assert.deepEqual(
+            resolve({
+                a: 1,
+                b: 2,
+                c: new Function("{ a, b, }", "return a + b")
+            }),
+            { a: 1, b: 2, c: 3 },
+            "comma & whitespaces"
+        );
+        assert.deepEqual(
+            resolve({
+                a: 1,
+                b: 2,
+                c: new Function("{ a, b: bb,  }", "return a + bb")
+            }),
+            { a: 1, b: 2, c: 3 },
+            "comma & whitespaces & rename"
         );
     });
 });