-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Convert nan to napi - Add async support - Add ref counter to support multiple threads accessing the same cache value. - Pass jv result as string in work to avoid sync with main thread. - Parse jv in main thread to convert to napi. - Set debug as compiled flag. - Add cache resize from js. --------- Co-authored-by: Ivan Kalinovski <[email protected]> Co-authored-by: talsabagport <[email protected]>
- Loading branch information
3 people
authored
Jan 28, 2025
1 parent
c01bba1
commit 7eab7fe
Showing
16 changed files
with
1,231 additions
and
186 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule jq
updated
from 2e01ff to 588ff1
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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, | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,136 @@ | ||
| 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)}`, | ||
| ); | ||
| } | ||
| return evaluatedKey ? [[evaluatedKey, await renderRecursivelyAsync(inputJson, value, execOptions)]] : []; | ||
| }); | ||
|
|
||
|
|
||
| return Object.fromEntries((await Promise.all(t)).flat()); | ||
|
|
||
|
|
||
| } | ||
|
|
||
| return template; | ||
| } | ||
|
|
||
| module.exports = { | ||
| renderRecursivelyAsync | ||
| }; |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.