js-core-1.9.1 - fix json string inline function parsing issues

Author: elisherer

javascript/json-transform-core/package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "@nlighten/json-transform-core",
   "description": "Core types and utilities for handling JSON transformers",
-  "version": "1.9.0",
+  "version": "1.9.1",
   "main": "./dist/index.js",
   "source": "src/index.ts",
   "exports": "./dist/index.js",

javascript/json-transform-core/package.json

@@ -811,9 +811,9 @@ describe("functions schema detection", () => {
 
 describe("matchAllInlineFunctionsInLine", () => {
   test(`sanity`, () => {
-    expect(functionsParser.matchAllInlineFunctionsInLine("  : \"$$foo(1,2):$$bar(abc,'def'):$$\"   ")).toEqual([
+    expect(functionsParser.matchAllInlineFunctionsInLine("  : \"$$pad(1,2):$$wrap(abc,'def'):$$\"   ")).toEqual([
       {
-        name: "foo",
+        name: "pad",
         keyLength: 5,
         args: [
           {
@@ -830,30 +830,30 @@ describe("matchAllInlineFunctionsInLine", () => {
         index: 5,
         input: {
           index: 16,
-          length: 19,
-          value: "$$bar(abc,'def'):$$",
+          length: 18,
+          value: "$$wrap(abc,'def'):$$",
         },
       },
       {
-        keyLength: 5,
-        name: "bar",
+        keyLength: 6,
+        name: "wrap",
         args: [
           {
-            index: 22,
+            index: 23,
             length: 3,
             value: "abc",
           },
           {
-            index: 26,
+            index: 27,
             length: 5,
             value: "def",
           },
         ],
         index: 16,
         input: {
-          index: 33,
-          length: 6,
-          value: '$$"   ',
+          index: 34,
+          length: 2,
+          value: "$$",
         },
       },
     ]);
@@ -889,4 +889,29 @@ describe("matchAllInlineFunctionsInLine", () => {
       },
     ]);
   });
+
+  test(`sanity 3`, () => {
+    expect(functionsParser.matchAllInlineFunctionsInLine(`"$$pad:$$wrap:"`)).toEqual([
+      {
+        index: 1,
+        input: {
+          index: 7,
+          length: 7,
+          value: "$$wrap:",
+        },
+        keyLength: 5,
+        name: "pad",
+      },
+      {
+        index: 7,
+        input: {
+          index: 14,
+          length: 0,
+          value: "",
+        },
+        keyLength: 6,
+        name: "wrap",
+      },
+    ]);
+  });
 });

javascript/json-transform-core/src/__tests__/functions/functionsParser.test.ts

@@ -53,10 +53,7 @@ describe("convert", () => {
         },
         to: "$$substring(0,5):##current.name",
       }),
-    ).toEqual({
-      $$map: "$$flat:$.names",
-      to: "$$substring(0,5):##current.name",
-    });
+    ).toEqual("$$map('$$substring(0,5):##current.name'):$$flat:$.names");
   });
   test("object to inline - test 5", () => {
     expect(
@@ -130,19 +127,11 @@ describe("convert", () => {
       }),
     ).toEqual({
       "*": "$",
+      age: "$$math('$$math(\\'$$date(EPOCH):#now\\',-,\\'$$date(EPOCH):$.date_of_birth\\')',//,'$$math(365,*,\\'$$math(24,*,3600)\\')')",
       full_name: {
         $$join: ["$.first_name", "$.last_name"],
         delimiter: " ",
       },
-      age: {
-        $$math: [
-          {
-            $$math: ["$$date(EPOCH):#now", "-", "$$date(EPOCH):$.date_of_birth"],
-          },
-          "//",
-          "$$math(365,*,'$$math(24,*,3600)')",
-        ],
-      },
     });
   });
 

javascript/json-transform-core/src/__tests__/utils/convert.test.ts

@@ -193,14 +193,16 @@ class FunctionsParser {
     const matches: ({ index: number } & TokenizedInlineFunction)[] = [];
     let match: TokenizedInlineFunction | undefined;
     let indexOffset = line.indexOf("$$");
-    let str = line.substring(indexOffset).trimEnd();
-    if (line[indexOffset - 1] === '"' && str.at(-1) === '"') {
-      str = str.slice(0, -1).replace(/\\'/g, "\\\\'");
-      // try {
-      //   str = JSON.parse('"' + str); //.replace(/\\/g, "\\\\"); // duplicate all backslashes to get the right lengths
-      // } catch (e: any) {}
+    line = line.trimEnd();
+    if (line[indexOffset - 1] === '"' && line.at(-1) === '"') {
+      line = line.slice(0, -1).replace(/\\'/g, "\\\\'");
     }
+    let str = line.substring(indexOffset);
+
     while ((match = tokenizeInlineFunction(str))) {
+      if (!functionsParser.get(match.name)) {
+        break; // not a known function name (so not a function)
+      }
       (match as any).index = indexOffset; // add index to match
       match.args?.forEach(arg => {
         arg.index += indexOffset;
@@ -221,7 +223,6 @@ class FunctionsParser {
       indexOffset = match.input.index;
       str = line.substring(match.input.index);
     }
-    console.debug("debug", matches);
     return matches;
   }
 }