js-core-1.8.1 monaco-1.2.5 - fix parser detection of aliased functions

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.8.0",
+  "version": "1.8.1",
   "main": "./dist/index.js",
   "source": "src/index.ts",
   "exports": "./dist/index.js",

javascript/json-transform-core/package.json

@@ -53,13 +53,18 @@ describe("functions schema detection", () => {
             "$.a2": NUMBER_ARRAY,
             "$.a2[]": NUMBER,
           };
+          const altAlias = `$$${functionsParser.get(funcName).aliases?.[0]}`;
           expect(
             transformerResult(
               {
                 inline: `${alias}:$.a2`,
+                inlineAlias: `${altAlias}:$.a2`,
                 object: {
                   [alias]: [null, null, "A"],
                 },
+                objectAlias: {
+                  [altAlias]: [null, null, "A"],
+                },
                 object2: {
                   [alias]: [null, null, 0.5],
                 },
@@ -76,15 +81,19 @@ describe("functions schema detection", () => {
                   additionalProperties: false,
                   properties: {
                     inline: NUMBER,
+                    inlineAlias: NUMBER,
                     object: STRING,
+                    objectAlias: STRING,
                     object2: NUMBER,
                     object3: INTEGER,
                   },
                   type: "object",
                 },
                 ...givenTypeMap,
                 "$.inline": NUMBER,
+                "$.inlineAlias": NUMBER,
                 "$.object": STRING,
+                "$.objectAlias": STRING,
                 "$.object2": NUMBER,
                 "$.object3": INTEGER,
               },

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

@@ -61,10 +61,7 @@ class FunctionsParser {
    * 5 - What comes after the colon (value) -- only when 'noArgs' = false
    */
   private inlineFunctionRegexFactory = (names: string[], global: boolean, noArgs: boolean) =>
-    new RegExp(
-      `\\$\\$(${Array.from(this.getNames()).join("|")})(\\((.*?)\\))?(:${noArgs ? "" : `([^"]*)`}|$|")`,
-      global ? "g" : undefined,
-    );
+    new RegExp(`\\$\\$(${names.join("|")})(\\((.*?)\\))?(:${noArgs ? "" : `([^"]*)`}|$|")`, global ? "g" : undefined);
 
   private objectFunctionRegexFactory = (names: string[]) => new RegExp(`(?<=")\\$\\$(${names.join("|")})":`, "g");
 
@@ -125,22 +122,18 @@ class FunctionsParser {
 
   matchInline(
     data: any,
-    callback?: (
-      funcName: EmbeddedTransformerFunction,
-      func: FunctionDescriptor,
-      value: any,
-      args: Record<string, any>,
-    ) => any,
+    callback?: (funcName: string, func: FunctionDescriptor, value: any, args: Record<string, any>) => any,
   ) {
     if (typeof data !== "string") return null;
 
     const m = data.match(this.matchInlineFunctionWithArgsRegex);
     if (!m) {
       return null;
     }
-    const funcName = m[1] as EmbeddedTransformerFunction;
+    let funcName = m[1];
     let func = functionsParser.get(funcName);
     if (!func) return null;
+    if (func.aliasTo) funcName = func.aliasTo;
     if (func.subfunctions || callback) {
       const argsWithoutParenthesis = m[3];
       const args = parseArgs(func, argsWithoutParenthesis);
@@ -165,7 +158,7 @@ class FunctionsParser {
         }
         const func = getSubfunction(this.get(funcName), data);
         return {
-          name: funcName,
+          name: func.aliasTo ?? funcName,
           func,
           value,
           spec: data,

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

@@ -1,6 +1,6 @@
 {
   "name": "@nlighten/monaco-json-transform",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "description": "JSON Transform language tokenizer (and syntax highlight), hover provider and more",
   "main": "./dist/index.js",
   "source": "src/index.ts",
@@ -42,7 +42,7 @@
   "homepage": "https://github.com/nlighten-oss/json-transform#readme",
   "peerDependencies": {
     "@nlighten/json-schema-utils": "^1.0.3",
-    "@nlighten/json-transform-core": "^1.7.1",
+    "@nlighten/json-transform-core": "^1.8.1",
     "monaco-editor": "*"
   },
   "devDependencies": {