Skip to content

Commit

Permalink
Chore/apply peggy changes (#35)
Browse files Browse the repository at this point in the history 
* chore: apply peggy changes

* chore: version bumps

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
  • Loading branch information
@jkoenig134 @mergify
jkoenig134 and mergify[bot] committed Feb 23, 2024
1 parent 3c95c94 commit f595da4
Show file tree
Hide file tree
Showing 6 changed files with 65 additions and 52 deletions.
16 changes: 8 additions & 8 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/consumption/package.json
View file
@@ -1,6 +1,6 @@
{
"name": "@nmshd/consumption",
"version": "3.9.3",
"version": "3.9.4",
"description": "The consumption library extends the transport library.",
"homepage": "https://enmeshed.eu",
"repository": {
Expand Down Expand Up @@ -61,7 +61,7 @@
},
"dependencies": {
"@js-soft/docdb-querytranslator": "^1.1.2",
"@nmshd/iql": "^1.0.1",
"@nmshd/iql": "^1.0.2",
"ts-simple-nameof": "^1.3.1"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/content/package.json
View file
@@ -1,6 +1,6 @@
{
"name": "@nmshd/content",
"version": "2.8.6",
"version": "2.8.7",
"description": "The content library defines data structures that can be transmitted using the transport library.",
"homepage": "https://enmeshed.eu",
"repository": {
Expand Down Expand Up @@ -52,7 +52,7 @@
},
"dependencies": {
"@js-soft/logging-abstractions": "^1.0.1",
"@nmshd/iql": "^1.0.0",
"@nmshd/iql": "^1.0.2",
"easy-tsnameof": "^3.0.6"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/iql/package.json
View file
@@ -1,6 +1,6 @@
{
"name": "@nmshd/iql",
"version": "1.0.1",
"version": "1.0.2",
"description": "Identity Query Language - A DSL to filter and query Enmeshed attributes",
"homepage": "https://enmeshed.eu",
"repository": {
Expand Down
85 changes: 49 additions & 36 deletions packages/iql/src/iql.gen.js
View file
@@ -1,10 +1,11 @@
// Generated by Peggy 3.0.2.
// @generated by Peggy 4.0.0.
//
// https://peggyjs.org/

"use strict";



/**
* Takes the path through a nested dict as an array of strings and returns
* the value, or a fallback value, if the path does not exist.
Expand Down Expand Up @@ -386,16 +387,16 @@ function peg$parse(input, options) {
var peg$f11 = function(val) {
return val.join("").replaceAll("\\\\", "\\").replaceAll("\\'", "'")
};
var peg$currPos = 0;
var peg$savedPos = 0;
var peg$currPos = options.peg$currPos | 0;
var peg$savedPos = peg$currPos;
var peg$posDetailsCache = [{ line: 1, column: 1 }];
var peg$maxFailPos = 0;
var peg$maxFailExpected = [];
var peg$silentFails = 0;
var peg$maxFailPos = peg$currPos;
var peg$maxFailExpected = options.peg$maxFailExpected || [];
var peg$silentFails = options.peg$silentFails | 0;

var peg$result;

if ("startRule" in options) {
if (options.startRule) {
if (!(options.startRule in peg$startRuleFunctions)) {
throw new Error("Can't start parsing from rule \"" + options.startRule + "\".");
}
Expand Down Expand Up @@ -470,9 +471,11 @@ function peg$parse(input, options) {
if (details) {
return details;
} else {
p = pos - 1;
while (!peg$posDetailsCache[p]) {
p--;
if (pos >= peg$posDetailsCache.length) {
p = peg$posDetailsCache.length - 1;
} else {
p = pos;
while (!peg$posDetailsCache[--p]) {}
}

details = peg$posDetailsCache[p];
Expand Down Expand Up @@ -1120,8 +1123,8 @@ function peg$parse(input, options) {
var s0, s1, s2;

s0 = peg$currPos;
if (peg$r0.test(input.charAt(peg$currPos))) {
s1 = input.charAt(peg$currPos);
s1 = input.charAt(peg$currPos);
if (peg$r0.test(s1)) {
peg$currPos++;
} else {
s1 = peg$FAILED;
Expand All @@ -1142,8 +1145,8 @@ function peg$parse(input, options) {
}
if (s0 === peg$FAILED) {
s0 = peg$currPos;
if (peg$r1.test(input.charAt(peg$currPos))) {
s1 = input.charAt(peg$currPos);
s1 = input.charAt(peg$currPos);
if (peg$r1.test(s1)) {
peg$currPos++;
} else {
s1 = peg$FAILED;
Expand Down Expand Up @@ -1188,8 +1191,8 @@ function peg$parse(input, options) {
if (peg$silentFails === 0) { peg$fail(peg$e14); }
}
if (s3 === peg$FAILED) {
if (peg$r2.test(input.charAt(peg$currPos))) {
s3 = input.charAt(peg$currPos);
s3 = input.charAt(peg$currPos);
if (peg$r2.test(s3)) {
peg$currPos++;
} else {
s3 = peg$FAILED;
Expand All @@ -1215,8 +1218,8 @@ function peg$parse(input, options) {
if (peg$silentFails === 0) { peg$fail(peg$e14); }
}
if (s3 === peg$FAILED) {
if (peg$r2.test(input.charAt(peg$currPos))) {
s3 = input.charAt(peg$currPos);
s3 = input.charAt(peg$currPos);
if (peg$r2.test(s3)) {
peg$currPos++;
} else {
s3 = peg$FAILED;
Expand Down Expand Up @@ -1262,8 +1265,8 @@ function peg$parse(input, options) {
if (peg$silentFails === 0) { peg$fail(peg$e14); }
}
if (s2 === peg$FAILED) {
if (peg$r3.test(input.charAt(peg$currPos))) {
s2 = input.charAt(peg$currPos);
s2 = input.charAt(peg$currPos);
if (peg$r3.test(s2)) {
peg$currPos++;
} else {
s2 = peg$FAILED;
Expand All @@ -1289,8 +1292,8 @@ function peg$parse(input, options) {
if (peg$silentFails === 0) { peg$fail(peg$e14); }
}
if (s2 === peg$FAILED) {
if (peg$r3.test(input.charAt(peg$currPos))) {
s2 = input.charAt(peg$currPos);
s2 = input.charAt(peg$currPos);
if (peg$r3.test(s2)) {
peg$currPos++;
} else {
s2 = peg$FAILED;
Expand All @@ -1312,17 +1315,17 @@ function peg$parse(input, options) {

s0 = peg$currPos;
s1 = peg$currPos;
if (peg$r4.test(input.charAt(peg$currPos))) {
s2 = input.charAt(peg$currPos);
s2 = input.charAt(peg$currPos);
if (peg$r4.test(s2)) {
peg$currPos++;
} else {
s2 = peg$FAILED;
if (peg$silentFails === 0) { peg$fail(peg$e17); }
}
if (s2 !== peg$FAILED) {
s3 = [];
if (peg$r5.test(input.charAt(peg$currPos))) {
s4 = input.charAt(peg$currPos);
s4 = input.charAt(peg$currPos);
if (peg$r5.test(s4)) {
peg$currPos++;
} else {
s4 = peg$FAILED;
Expand All @@ -1331,8 +1334,8 @@ function peg$parse(input, options) {
if (s4 !== peg$FAILED) {
while (s4 !== peg$FAILED) {
s3.push(s4);
if (peg$r5.test(input.charAt(peg$currPos))) {
s4 = input.charAt(peg$currPos);
s4 = input.charAt(peg$currPos);
if (peg$r5.test(s4)) {
peg$currPos++;
} else {
s4 = peg$FAILED;
Expand Down Expand Up @@ -1368,26 +1371,26 @@ function peg$parse(input, options) {
peg$silentFails++;
s0 = peg$currPos;
s1 = peg$currPos;
if (peg$r6.test(input.charAt(peg$currPos))) {
s2 = input.charAt(peg$currPos);
s2 = input.charAt(peg$currPos);
if (peg$r6.test(s2)) {
peg$currPos++;
} else {
s2 = peg$FAILED;
if (peg$silentFails === 0) { peg$fail(peg$e20); }
}
if (s2 !== peg$FAILED) {
s3 = [];
if (peg$r5.test(input.charAt(peg$currPos))) {
s4 = input.charAt(peg$currPos);
s4 = input.charAt(peg$currPos);
if (peg$r5.test(s4)) {
peg$currPos++;
} else {
s4 = peg$FAILED;
if (peg$silentFails === 0) { peg$fail(peg$e18); }
}
while (s4 !== peg$FAILED) {
s3.push(s4);
if (peg$r5.test(input.charAt(peg$currPos))) {
s4 = input.charAt(peg$currPos);
s4 = input.charAt(peg$currPos);
if (peg$r5.test(s4)) {
peg$currPos++;
} else {
s4 = peg$FAILED;
Expand Down Expand Up @@ -1418,8 +1421,8 @@ function peg$parse(input, options) {
var s0, s1;

peg$silentFails++;
if (peg$r7.test(input.charAt(peg$currPos))) {
s0 = input.charAt(peg$currPos);
s0 = input.charAt(peg$currPos);
if (peg$r7.test(s0)) {
peg$currPos++;
} else {
s0 = peg$FAILED;
Expand All @@ -1436,6 +1439,15 @@ function peg$parse(input, options) {

peg$result = peg$startRuleFunction();

if (options.peg$library) {
return /** @type {any} */ ({
peg$result,
peg$currPos,
peg$FAILED,
peg$maxFailExpected,
peg$maxFailPos
});
}
if (peg$result !== peg$FAILED && peg$currPos === input.length) {
return peg$result;
} else {
Expand All @@ -1454,6 +1466,7 @@ function peg$parse(input, options) {
}

module.exports = {
StartRules: ["Expr"],
SyntaxError: peg$SyntaxError,
parse: peg$parse
};
6 changes: 3 additions & 3 deletions packages/runtime/package.json
View file
@@ -1,6 +1,6 @@
{
"name": "@nmshd/runtime",
"version": "4.1.3",
"version": "4.1.4",
"description": "The enmeshed client runtime.",
"homepage": "https://enmeshed.eu",
"repository": {
Expand Down Expand Up @@ -65,8 +65,8 @@
"@js-soft/logging-abstractions": "^1.0.1",
"@js-soft/ts-serval": "2.0.10",
"@js-soft/ts-utils": "^2.3.3",
"@nmshd/consumption": "3.9.3",
"@nmshd/content": "2.8.6",
"@nmshd/consumption": "3.9.4",
"@nmshd/content": "2.8.7",
"@nmshd/crypto": "2.0.6",
"@nmshd/transport": "2.3.1",
"ajv": "^8.12.0",
Expand Down

0 comments on commit f595da4

Please sign in to comment.