@port-labs/jq-node-bindings 0.0.13 → 0.0.15-dev1

package/deps/jq/tests/uri.test

@@ -0,0 +1,38 @@
+# Tests are groups of three lines: program, input, expected output
+# Blank lines and lines starting with # are ignored
+
+@uri
+"<>&'\"\t"
+"%3C%3E%26%27%22%09"
+
+# decoding encoded output results in same text
+(@uri|@urid)
+"<>&'\"\t"
+"<>&'\"\t"
+
+# testing variable length unicode characters
+@uri
+"a \u03bc \u2230 \ud83d\ude0e"
+"a%20%CE%BC%20%E2%88%B0%20%F0%9F%98%8E"
+
+@urid
+"a%20%CE%BC%20%E2%88%B0%20%F0%9F%98%8E"
+"a \u03bc \u2230 \ud83d\ude0e"
+
+### invalid uri strings
+
+# unicode character should be length 4 (not 3)
+. | try @urid catch .
+"%F0%93%81"
+"string (\"%F0%93%81\") is not a valid uri encoding"
+
+# invalid hex value ('FX')
+. | try @urid catch .
+"%FX%9F%98%8E"
+"string (\"%FX%9F%98%8E\") is not a valid uri encoding"
+
+# trailing utf-8 octets must be formatted like 10xxxxxx
+# 'C0' = 11000000 invalid
+. | try @urid catch .
+"%F0%C0%81%8E"
+"string (\"%F0%C0%81%8E\") is not a valid uri encoding"

package/deps/jq/tests/uritest

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. "${0%/*}/setup" "$@"
+
+$VALGRIND $Q $JQ -L "$mods" --run-tests $JQTESTDIR/uri.test

package/deps/jq/tests/yes-main-program.jq

@@ -0,0 +1,2 @@
+def a: .;
+0

package/lib/index.js

@@ -1,10 +1,13 @@
 const jq = require('./jq');
 const template = require('./template');
+const templateAsync = require('./templateAsync');
 
 
 module.exports = {
   exec: jq.exec,
+  execAsync: jq.execAsync,
   renderRecursively: template.renderRecursively,
+  renderRecursivelyAsync: templateAsync.renderRecursivelyAsync,
   JqExecError: jq.JqExecError,
   JqExecCompileError: jq.JqExecCompileError,
 };

package/lib/jq.js

@@ -15,8 +15,9 @@ class JqExecCompileError extends JqExecError {
 }
 
 const exec = (object, filter, {enableEnv = false, throwOnError = false} = {}) => {
+  console.log("exec",object,filter)
   try {
-    const data = nativeJq.exec(JSON.stringify(object), formatFilter(filter, {enableEnv}))
+    const data = nativeJq.execSync(JSON.stringify(object), formatFilter(filter, {enableEnv}))
 
     return data?.value;
   } catch (err) {
@@ -27,8 +28,21 @@ const exec = (object, filter, {enableEnv = false, throwOnError = false} = {}) =>
   }
 }
 
+const execAsync = async (object, filter, {enableEnv = false, throwOnError = false} = {}) => {
+  console.log(object,filter)
+  try {
+    const data = await nativeJq.execAsync(JSON.stringify(object), formatFilter(filter, {enableEnv}))
+    return data?.value;
+  } catch (err) {
+    if (throwOnError) {
+      throw new (err?.message?.startsWith('jq: compile error') ? JqExecCompileError : JqExecError)(err.message);
+    }
+    return null
+  }
+}
 module.exports = {
   exec,
+  execAsync,
   JqExecError,
   JqExecCompileError
 };

package/lib/templateAsync.js

@@ -0,0 +1,137 @@
+const jq = require('./jq');
+
+const findInsideDoubleBracesIndices = (input) => {
+  let wrappingQuote = null;
+  let insideDoubleBracesStart = null;
+  const indices = [];
+
+  for (let i = 0; i < input.length; i += 1) {
+    const char = input[i];
+
+    if (insideDoubleBracesStart && char === '\\') {
+      // If next character is escaped, skip it
+      i += 1;
+    }
+    if (insideDoubleBracesStart && (char === '"' || char === "'")) {
+      // If inside double braces and inside quotes, ignore braces
+      if (!wrappingQuote) {
+        wrappingQuote = char;
+      } else if (wrappingQuote === char) {
+        wrappingQuote = null;
+      }
+    } else if (!wrappingQuote && char === '{' && i > 0 && input[i - 1] === '{') {
+      // if opening double braces that not wrapped with quotes
+      if (insideDoubleBracesStart) {
+        throw new Error(`Found double braces in index ${i - 1} inside other one in index ${insideDoubleBracesStart - '{{'.length}`);
+      }
+      insideDoubleBracesStart = i + 1;
+      if (input[i + 1] === '{') {
+        // To overcome three "{" in a row considered as two different opening double braces
+        i += 1;
+      }
+    } else if (!wrappingQuote && char === '}' && i > 0 && input[i - 1] === '}') {
+      // if closing double braces that not wrapped with quotes
+      if (insideDoubleBracesStart) {
+        indices.push({start: insideDoubleBracesStart, end: i - 1});
+        insideDoubleBracesStart = null;
+        if (input[i + 1] === '}') {
+          // To overcome three "}" in a row considered as two different closing double braces
+          i += 1;
+        }
+      } else {
+        throw new Error(`Found closing double braces in index ${i - 1} without opening double braces`);
+      }
+    }
+  }
+
+  if (insideDoubleBracesStart) {
+    throw new Error(`Found opening double braces in index ${insideDoubleBracesStart - '{{'.length} without closing double braces`);
+  }
+
+  return indices;
+}
+
+const renderAsync =async (inputJson, template, execOptions = {}) => {
+  if (typeof template !== 'string') {
+    return null;
+  }
+  const indices = findInsideDoubleBracesIndices(template);
+  if (!indices.length) {
+    // If no jq templates in string, return it
+    return template;
+  }
+
+  const firstIndex = indices[0];
+  if (indices.length === 1 && template.trim().startsWith('{{') && template.trim().endsWith('}}')) {
+    // If entire string is a template, evaluate and return the result with the original type
+    return await jq.execAsync(inputJson, template.slice(firstIndex.start, firstIndex.end), execOptions);
+  }
+
+  let result = template.slice(0, firstIndex.start - '{{'.length); // Initiate result with string until first template start index
+  for (let i = 0; i < indices.length; i++) {
+    const index = indices[i];
+    
+//   }
+//   indices.forEach((index, i) => {
+    const jqResult = await jq.execAsync(inputJson, template.slice(index.start, index.end), execOptions);
+    result +=
+      // Add to the result the stringified evaluated jq of the current template
+      (typeof jqResult === 'string' ? jqResult : JSON.stringify(jqResult)) +
+      // Add to the result from template end index. if last template index - until the end of string, else until next start index
+      template.slice(
+        index.end + '}}'.length,
+        i + 1 === indices.length ? template.length : indices[i + 1].start - '{{'.length,
+      );
+//   });
+    }
+
+  return result;
+}
+
+const renderRecursivelyAsync = async(inputJson, template, execOptions = {}) => {
+  if (typeof template === 'string') {
+    return await renderAsync(inputJson, template, execOptions);
+  }
+  if (Array.isArray(template)) {
+    return await Promise.all(template.map((value) => renderRecursivelyAsync(inputJson, value, execOptions)));
+  }
+  if (typeof template === 'object' && template !== null) {
+    
+
+
+      const t =Object.entries(template).map(async([key, value]) => {
+        const SPREAD_KEYWORD = "spreadValue";
+        const keywordMatcher = `^\\{\\{\\s*${SPREAD_KEYWORD}\\(\\s*\\)\\s*\\}\\}$`;  // matches {{ <Keyword>() }} with white spaces where you'd expect them
+
+        if (key.trim().match(keywordMatcher)) {
+          const evaluatedValue = await renderRecursivelyAsync(inputJson, value, execOptions);
+          if (typeof evaluatedValue !== "object") {
+            throw new Error(
+              `Evaluated value should be an object if the key is ${key}. Original value: ${value}, evaluated to: ${JSON.stringify(evaluatedValue)}`
+            );
+          }
+          return Object.entries(evaluatedValue);
+        }
+
+        const evaluatedKey = await renderRecursivelyAsync(inputJson, key, execOptions);
+        if (!['undefined', 'string'].includes(typeof evaluatedKey) && evaluatedKey !== null) {
+          throw new Error(
+            `Evaluated object key should be undefined, null or string. Original key: ${key}, evaluated to: ${JSON.stringify(evaluatedKey)}`,
+          );
+        }
+        console.log("evaluatedKey",evaluatedKey,value)
+        return evaluatedKey ? [[evaluatedKey, await renderRecursivelyAsync(inputJson, value, execOptions)]] : [];
+      });
+
+
+    return Object.fromEntries((await Promise.all(t)).flat());
+
+
+  }
+
+  return template;
+}
+
+module.exports = {
+  renderRecursivelyAsync
+};

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@port-labs/jq-node-bindings",
-  "version": "v0.0.13",
+  "version": "v0.0.15-dev1",
   "description": "Node.js bindings for JQ",
-  "jq-node-bindings": "0.0.13",
+  "jq-node-bindings": "0.0.15-dev1",
   "main": "lib/index.js",
   "scripts": {
     "configure": "node-gyp configure",
@@ -30,17 +30,17 @@
     "bluebird": "^3.5.3",
     "jest": "^29.0.5",
     "jest-junit": "^15.0.0",
-    "jsdoc": "^3.4.0",
-    "jshint": "^2.10.1",
+    "jsdoc": "^4.0.3",
+    "jshint": "^2.13.6",
     "mocha": "^10.2.0",
-    "node-gyp": "^9.3.1",
+    "node-gyp": "^10.2.0",
     "prettier": "^2.5.1",
     "toolkit-jsdoc": "^1.0.0"
   },
   "dependencies": {
     "bindings": "^1.3.1",
-    "jqts": "^0.0.8",
-    "nan": "^2.17.0"
+    "nan": "^2.20.0",
+    "node-addon-api": "^8.3.0"
   },
   "engines": {
     "node": ">=6.0.0"