diff --git a/package-lock.json b/package-lock.json index 0e22c89a0..4499a89f8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11007,8 +11007,9 @@ } }, "node_modules/feelers": { - "version": "0.1.0-alpha.8", - "license": "MIT", + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/feelers/-/feelers-0.1.0.tgz", + "integrity": "sha512-gvF3VkrCIQIiYehB51JYjvADkT36eMQKfVPWyDYrbG1bfc9+Y7bvjdzhLgxEuk2BvFaYj1amRyqgOTXkP+gYUw==", "dependencies": { "@bpmn-io/cm-theme": "^0.1.0-alpha.2", "@bpmn-io/feel-lint": "^0.1.1", @@ -11019,32 +11020,19 @@ "@codemirror/state": "^6.1.4", "@codemirror/view": "^6.5.1", "@lezer/markdown": "^1.0.2", - "feelin": "^0.43.0", + "feelin": "^1.0.0", "lezer-feel": "^0.16.2", "min-dom": "^4.1.0" - }, - "workspaces": { - "packages": [ - "feelers-playground" - ] } }, "node_modules/feelers/node_modules/component-event": { "version": "0.2.1", "license": "MIT" }, - "node_modules/feelers/node_modules/feelin": { - "version": "0.43.1", - "license": "MIT", - "dependencies": { - "@lezer/lr": "^1.2.0", - "lezer-feel": "^0.16.1", - "luxon": "^3.1.0" - } - }, "node_modules/feelers/node_modules/lezer-feel": { "version": "0.16.2", - "license": "MIT", + "resolved": "https://registry.npmjs.org/lezer-feel/-/lezer-feel-0.16.2.tgz", + "integrity": "sha512-G9heYUw4ibeNWFmlhs8yR/QEDd6OAFvv2e7F2x1zOhxqYKKEBXhXQEIvQh1psgQMJjQSuUvVZRxPbnjfvGq/Bw==", "dependencies": { "@lezer/highlight": "^1.1.2", "@lezer/lr": "^1.2.5" @@ -11064,20 +11052,22 @@ } }, "node_modules/feelin": { - "version": "0.41.0", - "license": "MIT", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/feelin/-/feelin-1.0.0.tgz", + "integrity": "sha512-ED1pbRGivpxPHjMBssCivkuAWGm3ma0yK46DqcUlA8KP1Rz5Limjg8YENBRsyc1ZSoSkpboVuscqWmXw2Cl03A==", "dependencies": { - "@lezer/lr": "^1.2.0", - "lezer-feel": "^0.13.0", - "luxon": "^3.0.1" + "@lezer/lr": "^1.3.9", + "lezer-feel": "^1.0.0", + "luxon": "^3.1.0" } }, "node_modules/feelin/node_modules/lezer-feel": { - "version": "0.13.1", - "license": "MIT", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/lezer-feel/-/lezer-feel-1.0.2.tgz", + "integrity": "sha512-WEqRVhYZNOr6+aTWfS2CLVX1ebS1KeQjTeVQVgzXkGNC0AqmFWcRwEgAGm3FHKE66cxj3RPKx7T+ofr6FzmJjQ==", "dependencies": { - "@lezer/highlight": "^1.0.0", - "@lezer/lr": "^1.2.3" + "@lezer/highlight": "^1.1.6", + "@lezer/lr": "^1.3.9" } }, "node_modules/figures": { @@ -19893,8 +19883,8 @@ "big.js": "^6.2.1", "classnames": "^2.3.1", "didi": "^9.0.0", - "feelers": "^0.1.0-alpha.8", - "feelin": "^0.41.0", + "feelers": "^0.1.0", + "feelin": "^1.0.0", "flatpickr": "^4.6.13", "ids": "^1.0.0", "min-dash": "^4.0.0", @@ -21397,8 +21387,8 @@ "big.js": "^6.2.1", "classnames": "^2.3.1", "didi": "^9.0.0", - "feelers": "^0.1.0-alpha.8", - "feelin": "^0.41.0", + "feelers": "^0.1.0", + "feelin": "^1.0.0", "flatpickr": "^4.6.13", "ids": "^1.0.0", "min-dash": "^4.0.0", @@ -27495,7 +27485,9 @@ } }, "feelers": { - "version": "0.1.0-alpha.8", + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/feelers/-/feelers-0.1.0.tgz", + "integrity": "sha512-gvF3VkrCIQIiYehB51JYjvADkT36eMQKfVPWyDYrbG1bfc9+Y7bvjdzhLgxEuk2BvFaYj1amRyqgOTXkP+gYUw==", "requires": { "@bpmn-io/cm-theme": "^0.1.0-alpha.2", "@bpmn-io/feel-lint": "^0.1.1", @@ -27506,7 +27498,7 @@ "@codemirror/state": "^6.1.4", "@codemirror/view": "^6.5.1", "@lezer/markdown": "^1.0.2", - "feelin": "^0.43.0", + "feelin": "^1.0.0", "lezer-feel": "^0.16.2", "min-dom": "^4.1.0" }, @@ -27514,16 +27506,10 @@ "component-event": { "version": "0.2.1" }, - "feelin": { - "version": "0.43.1", - "requires": { - "@lezer/lr": "^1.2.0", - "lezer-feel": "^0.16.1", - "luxon": "^3.1.0" - } - }, "lezer-feel": { "version": "0.16.2", + "resolved": "https://registry.npmjs.org/lezer-feel/-/lezer-feel-0.16.2.tgz", + "integrity": "sha512-G9heYUw4ibeNWFmlhs8yR/QEDd6OAFvv2e7F2x1zOhxqYKKEBXhXQEIvQh1psgQMJjQSuUvVZRxPbnjfvGq/Bw==", "requires": { "@lezer/highlight": "^1.1.2", "@lezer/lr": "^1.2.5" @@ -27543,18 +27529,22 @@ } }, "feelin": { - "version": "0.41.0", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/feelin/-/feelin-1.0.0.tgz", + "integrity": "sha512-ED1pbRGivpxPHjMBssCivkuAWGm3ma0yK46DqcUlA8KP1Rz5Limjg8YENBRsyc1ZSoSkpboVuscqWmXw2Cl03A==", "requires": { - "@lezer/lr": "^1.2.0", - "lezer-feel": "^0.13.0", - "luxon": "^3.0.1" + "@lezer/lr": "^1.3.9", + "lezer-feel": "^1.0.0", + "luxon": "^3.1.0" }, "dependencies": { "lezer-feel": { - "version": "0.13.1", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/lezer-feel/-/lezer-feel-1.0.2.tgz", + "integrity": "sha512-WEqRVhYZNOr6+aTWfS2CLVX1ebS1KeQjTeVQVgzXkGNC0AqmFWcRwEgAGm3FHKE66cxj3RPKx7T+ofr6FzmJjQ==", "requires": { - "@lezer/highlight": "^1.0.0", - "@lezer/lr": "^1.2.3" + "@lezer/highlight": "^1.1.6", + "@lezer/lr": "^1.3.9" } } } diff --git a/packages/form-js-viewer/package.json b/packages/form-js-viewer/package.json index cd8d536d5..55db10d0a 100644 --- a/packages/form-js-viewer/package.json +++ b/packages/form-js-viewer/package.json @@ -47,8 +47,8 @@ "big.js": "^6.2.1", "classnames": "^2.3.1", "didi": "^9.0.0", - "feelers": "^0.1.0-alpha.8", - "feelin": "^0.41.0", + "feelers": "^0.1.0", + "feelin": "^1.0.0", "flatpickr": "^4.6.13", "ids": "^1.0.0", "min-dash": "^4.0.0", diff --git a/packages/form-js-viewer/src/features/expression-language/variableExtractionHelpers.js b/packages/form-js-viewer/src/features/expression-language/variableExtractionHelpers.js index 1c6aa8850..b1caefc1b 100644 --- a/packages/form-js-viewer/src/features/expression-language/variableExtractionHelpers.js +++ b/packages/form-js-viewer/src/features/expression-language/variableExtractionHelpers.js @@ -1,4 +1,4 @@ -import { parseExpressions, parseUnaryTests } from 'feelin'; +import { parseExpression, parseUnaryTests } from 'feelin'; export const getFlavouredFeelVariableNames = (feelString, feelFlavour, options = {}) => { @@ -9,7 +9,7 @@ export const getFlavouredFeelVariableNames = (feelString, feelFlavour, options = if (![ 'expression', 'unaryTest' ].includes(feelFlavour)) return []; - const tree = feelFlavour === 'expression' ? parseExpressions(feelString) : parseUnaryTests(feelString); + const tree = feelFlavour === 'expression' ? parseExpression(feelString) : parseUnaryTests(feelString); const simpleExpressionTree = _buildSimpleFeelStructureTree(tree, feelString);