js-1.1.3 - fix bug in parsing inline arguments

Author: elisherer

docs/package-lock.json

@@ -19,7 +19,7 @@
     "@docusaurus/preset-classic": "3.7.0",
     "@mdx-js/react": "3.1.0",
     "@monaco-editor/react": "4.6.0",
-    "@nlighten/json-transform": "^1.1.2",
+    "@nlighten/json-transform": "^1.1.3",
     "@nlighten/json-transform-core": "^1.1.1",
     "buffer": "^6.0.3",
     "clsx": "2.1.0",

docs/package.json

@@ -93,7 +93,9 @@ const initMonaco = (monaco: Monaco) => {
       tags,
     };
   };
-  const functionSuggestions = functions.getNames().map(x => `$$${x}`);
+  const functionSuggestions = functions.getNames()
+    .filter(x => !functions.get(x).deprecated)
+    .map(x => `$$${x}`);
 
   monaco.languages.registerCompletionItemProvider("json", {
     provideCompletionItems: (model, position) => {

docs/src/components/monaco/Monaco.init.ts

@@ -42,11 +42,14 @@ export const tokenizeLine = (line: string, lineNumber: number, ts: TokenizationS
     iterResult = iter.next(), match = iterResult.value as RegExpMatchArray | null
   ) {
     if (!match || typeof match.index === "undefined") continue;
+    const func = functions.get(match[1])
+    const deprecated = func?.deprecated;
+
     ts.tokens.push({
       line: lineNumber,
       char: match.index,
       length: 2 + match[1].length, // $$ and name
-      type: TokenType.FUNCTION,
+      type: deprecated ? TokenType.FUNCTION_DEPRECATED : TokenType.FUNCTION,
       modifier: TokenModifier.DECLARATION,
     });
   }

docs/src/components/monaco/jsonTransformerTokenizer.ts

@@ -1,7 +1,7 @@
 {
   "name": "@nlighten/json-transform",
   "description": "JSON transformers JavaScript implementation",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "main": "dist/json-transform.js",
   "umd:main": "dist/json-transform.umd.js",
   "module": "dist/json-transform.module.js",

javascript/json-transform/package.json

@@ -169,7 +169,7 @@ const createPayloadResolver = (payload: any, additionalContext: Record<string, a
 
 const singleQuotedStringJsonParse = (input: string) => {
   try {
-    return JSON.parse(`"${input.slice(1, -1).replace(/"/g, '\\"')}"`);
+    return JSON.parse(`"${input.slice(1, -1).replace(/"/g, '\\"').replace(/\\'/g, "'")}"`);
   } catch (e: any) {
     console.error(e);
     return null;

javascript/json-transform/src/JsonHelpers.ts

@@ -32,14 +32,8 @@
       ],
       "definition": {
         "$$and": [
-          {
-            "$$is": "$[0]",
-            "eq": 2
-          },
-          {
-            "$$is": "$[1]",
-            "eq": 3
-          }
+          "$$is(=,2):$[0]",
+          "$$is(=,3):$[1]"
         ]
       }
     },