node-llama-cpp 3.2.0 → 3.3.0

package/dist/utils/gbnfJson/terminals/GbnfFormatString.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"GbnfFormatString.js","sourceRoot":"","sources":["../../../../src/utils/gbnfJson/terminals/GbnfFormatString.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAGhD,OAAO,EAAC,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAC;AAG3C,MAAM,OAAO,gBAAiB,SAAQ,YAAY;IAC9B,MAAM,CAAuC;IAE7D,YAAmB,MAA4C;QAC3D,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACzB,CAAC;IAEM,UAAU,CAAC,gBAAsC;QACpD,MAAM,KAAK,GAAG,OAAO,CAAC;QACtB,IAAI,IAAI,CAAC,MAAM,KAAK,MAAM;YACtB,OAAO,IAAI,WAAW,CAAC;gBACnB,KAAK;gBACL,IAAI,CAAC,eAAe,EAAE;gBACtB,KAAK;aACR,CAAC,CAAC,UAAU,EAAE,CAAC;aACf,IAAI,IAAI,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;YAC9B,OAAO,IAAI,WAAW,CAAC;gBACnB,KAAK;gBACL,IAAI,CAAC,eAAe,EAAE;gBACtB,KAAK;aACR,CAAC,CAAC,UAAU,EAAE,CAAC;QACpB,CAAC;aAAM,IAAI,IAAI,CAAC,MAAM,KAAK,WAAW;YAClC,OAAO,IAAI,WAAW,CAAC;gBACnB,KAAK;gBACL,IAAI,CAAC,eAAe,EAAE;gBACtB,KAAK;gBACL,IAAI,CAAC,eAAe,EAAE;gBACtB,KAAK;aACR,CAAC,CAAC,UAAU,EAAE,CAAC;QAEpB,OAAO,IAAI,UAAU,CAAC;YAClB,SAAS,EAAE,CAAC;YACZ,SAAS,EAAE,CAAC;SACf,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;IACjC,CAAC;IAEkB,WAAW;QAC1B,OAAO,iBAAiB,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACvD,CAAC;IAEO,eAAe;QACnB,OAAO,IAAI,WAAW,CAAC;YACnB,UAAU;YACV,KAAK;YACL,EAAE,CAAC;gBACC,WAAW;gBACX,WAAW;aACd,CAAC;YACF,KAAK;YACL,EAAE,CAAC;gBACC,WAAW;gBACX,YAAY;gBACZ,UAAU;aACb,CAAC;SACL,CAAC,CAAC,UAAU,EAAE,CAAC;IACpB,CAAC;IAEO,eAAe;QACnB,OAAO,IAAI,WAAW,CAAC;YACnB,EAAE,CAAC;gBACC,YAAY;gBACZ,WAAW;aACd,CAAC;YACF,KAAK;YACL,aAAa;YACb,KAAK;YACL,aAAa;YACb,mBAAmB;YACnB,EAAE,CAAC;gBACC,KAAK;gBACL,IAAI,WAAW,CAAC;oBACZ,EAAE,CAAC;wBACC,KAAK;wBACL,KAAK;qBACR,CAAC;oBACF,EAAE,CAAC;wBACC,YAAY;wBACZ,WAAW;qBACd,CAAC;oBACF,KAAK;oBACL,aAAa;iBAChB,CAAC,CAAC,UAAU,EAAE;aAClB,CAAC;SACL,CAAC,CAAC,UAAU,EAAE,CAAC;IACpB,CAAC;CACJ;AAED,SAAS,EAAE,CAAC,MAAgB;IACxB,OAAO,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC;AAC1C,CAAC"}

package/dist/utils/gbnfJson/terminals/GbnfGrammar.d.ts

@@ -1,6 +1,9 @@
 import { GbnfTerminal } from "../GbnfTerminal.js";
+import { GbnfGrammarGenerator } from "../GbnfGrammarGenerator.js";
 export declare class GbnfGrammar extends GbnfTerminal {
     readonly grammar: string | string[];
-    constructor(grammar: string | string[]);
+    readonly resolveToRawGrammar: boolean;
+    constructor(grammar: string | string[], resolveToRawGrammar?: boolean);
     getGrammar(): string;
+    resolve(grammarGenerator: GbnfGrammarGenerator): string;
 }

package/dist/utils/gbnfJson/terminals/GbnfGrammar.js

@@ -1,9 +1,11 @@
 import { GbnfTerminal } from "../GbnfTerminal.js";
 export class GbnfGrammar extends GbnfTerminal {
     grammar;
-    constructor(grammar) {
+    resolveToRawGrammar;
+    constructor(grammar, resolveToRawGrammar = false) {
         super();
         this.grammar = grammar;
+        this.resolveToRawGrammar = resolveToRawGrammar;
     }
     getGrammar() {
         if (this.grammar instanceof Array)
@@ -12,5 +14,10 @@ export class GbnfGrammar extends GbnfTerminal {
                 .join(" ");
         return this.grammar;
     }
+    resolve(grammarGenerator) {
+        if (this.resolveToRawGrammar)
+            return this.getGrammar();
+        return super.resolve(grammarGenerator);
+    }
 }
 //# sourceMappingURL=GbnfGrammar.js.map

package/dist/utils/gbnfJson/terminals/GbnfGrammar.js.map

@@ -1 +1 @@
-{"version":3,"file":"GbnfGrammar.js","sourceRoot":"","sources":["../../../../src/utils/gbnfJson/terminals/GbnfGrammar.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAGhD,MAAM,OAAO,WAAY,SAAQ,YAAY;IACzB,OAAO,CAAoB;IAE3C,YAAmB,OAA0B;QACzC,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IAEM,UAAU;QACb,IAAI,IAAI,CAAC,OAAO,YAAY,KAAK;YAC7B,OAAO,IAAI,CAAC,OAAO;iBACd,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,EAAE,CAAC;iBAC7B,IAAI,CAAC,GAAG,CAAC,CAAC;QAEnB,OAAO,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;CACJ"}
+{"version":3,"file":"GbnfGrammar.js","sourceRoot":"","sources":["../../../../src/utils/gbnfJson/terminals/GbnfGrammar.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAIhD,MAAM,OAAO,WAAY,SAAQ,YAAY;IACzB,OAAO,CAAoB;IAC3B,mBAAmB,CAAU;IAE7C,YAAmB,OAA0B,EAAE,sBAA+B,KAAK;QAC/E,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,mBAAmB,GAAG,mBAAmB,CAAC;IACnD,CAAC;IAEM,UAAU;QACb,IAAI,IAAI,CAAC,OAAO,YAAY,KAAK;YAC7B,OAAO,IAAI,CAAC,OAAO;iBACd,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,EAAE,CAAC;iBAC7B,IAAI,CAAC,GAAG,CAAC,CAAC;QAEnB,OAAO,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;IAEe,OAAO,CAAC,gBAAsC;QAC1D,IAAI,IAAI,CAAC,mBAAmB;YACxB,OAAO,IAAI,CAAC,UAAU,EAAE,CAAC;QAE7B,OAAO,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC3C,CAAC;CACJ"}

package/dist/utils/gbnfJson/terminals/GbnfInsideStringChar.d.ts

@@ -0,0 +1,5 @@
+import { GbnfTerminal } from "../GbnfTerminal.js";
+export declare class GbnfInsideStringChar extends GbnfTerminal {
+    getGrammar(): string;
+    protected getRuleName(): string;
+}

package/dist/utils/gbnfJson/terminals/GbnfInsideStringChar.js

@@ -0,0 +1,24 @@
+import { GbnfTerminal } from "../GbnfTerminal.js";
+import { reservedRuleNames } from "./gbnfConsts.js";
+export class GbnfInsideStringChar extends GbnfTerminal {
+    getGrammar() {
+        return [
+            negatedCharacterSet([
+                '"',
+                "\\\\",
+                "\\x7F",
+                "\\x00-\\x1F"
+            ]),
+            // escape sequences
+            '"\\\\" ["\\\\/bfnrt]',
+            '"\\\\u" [0-9a-fA-F]{4}'
+        ].join(" | ");
+    }
+    getRuleName() {
+        return reservedRuleNames.stringChar;
+    }
+}
+function negatedCharacterSet(characterDefinitions) {
+    return "[^" + characterDefinitions.join("") + "]";
+}
+//# sourceMappingURL=GbnfInsideStringChar.js.map

package/dist/utils/gbnfJson/terminals/GbnfInsideStringChar.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"GbnfInsideStringChar.js","sourceRoot":"","sources":["../../../../src/utils/gbnfJson/terminals/GbnfInsideStringChar.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAC,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAElD,MAAM,OAAO,oBAAqB,SAAQ,YAAY;IAC3C,UAAU;QACb,OAAO;YACH,mBAAmB,CAAC;gBAChB,GAAG;gBACH,MAAM;gBACN,OAAO;gBACP,aAAa;aAChB,CAAC;YAEF,mBAAmB;YACnB,sBAAsB;YACtB,wBAAwB;SAC3B,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAClB,CAAC;IAEkB,WAAW;QAC1B,OAAO,iBAAiB,CAAC,UAAU,CAAC;IACxC,CAAC;CACJ;AAED,SAAS,mBAAmB,CAAC,oBAA8B;IACvD,OAAO,IAAI,GAAG,oBAAoB,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC;AACtD,CAAC"}

package/dist/utils/gbnfJson/terminals/GbnfNumber.js

@@ -7,10 +7,11 @@ export class GbnfNumber extends GbnfTerminal {
         this.allowFractional = allowFractional;
     }
     getGrammar() {
-        const numberGrammar = '("-"? ([0-9] | [1-9] [0-9]*))';
+        const num = '"-"? ("0" | [1-9] [0-9]{0,15})';
+        const exponent = ' ([eE] [-+]? ("0" | [1-9] [0-9]{0,15}))?';
         if (this.allowFractional)
-            return numberGrammar + ' ("." [0-9]+)? ([eE] [-+]? [0-9]+)?';
-        return numberGrammar;
+            return num + ' ("." [0-9]{1,16})?' + exponent;
+        return num + exponent;
     }
     getRuleName() {
         if (this.allowFractional)

package/dist/utils/gbnfJson/terminals/GbnfNumber.js.map

@@ -1 +1 @@
-{"version":3,"file":"GbnfNumber.js","sourceRoot":"","sources":["../../../../src/utils/gbnfJson/terminals/GbnfNumber.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAC,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAGlD,MAAM,OAAO,UAAW,SAAQ,YAAY;IACxB,eAAe,CAAU;IAEzC,YAAmB,EAAC,eAAe,GAAG,IAAI,EAA6B;QACnE,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;IAC3C,CAAC;IAEM,UAAU;QACb,MAAM,aAAa,GAAG,+BAA+B,CAAC;QAEtD,IAAI,IAAI,CAAC,eAAe;YACpB,OAAO,aAAa,GAAG,qCAAqC,CAAC;QAEjE,OAAO,aAAa,CAAC;IACzB,CAAC;IAEkB,WAAW;QAC1B,IAAI,IAAI,CAAC,eAAe;YACpB,OAAO,iBAAiB,CAAC,MAAM,CAAC,UAAU,CAAC;QAE/C,OAAO,iBAAiB,CAAC,MAAM,CAAC,OAAO,CAAC;IAC5C,CAAC;CACJ"}
+{"version":3,"file":"GbnfNumber.js","sourceRoot":"","sources":["../../../../src/utils/gbnfJson/terminals/GbnfNumber.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAC,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAGlD,MAAM,OAAO,UAAW,SAAQ,YAAY;IACxB,eAAe,CAAU;IAEzC,YAAmB,EAAC,eAAe,GAAG,IAAI,EAA6B;QACnE,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;IAC3C,CAAC;IAEM,UAAU;QACb,MAAM,GAAG,GAAG,gCAAgC,CAAC;QAC7C,MAAM,QAAQ,GAAG,0CAA0C,CAAC;QAE5D,IAAI,IAAI,CAAC,eAAe;YACpB,OAAO,GAAG,GAAG,qBAAqB,GAAG,QAAQ,CAAC;QAElD,OAAO,GAAG,GAAG,QAAQ,CAAC;IAC1B,CAAC;IAEkB,WAAW;QAC1B,IAAI,IAAI,CAAC,eAAe;YACpB,OAAO,iBAAiB,CAAC,MAAM,CAAC,UAAU,CAAC;QAE/C,OAAO,iBAAiB,CAAC,MAAM,CAAC,OAAO,CAAC;IAC5C,CAAC;CACJ"}

package/dist/utils/gbnfJson/terminals/GbnfNumberValue.d.ts

@@ -1,7 +1,9 @@
 import { GbnfTerminal } from "../GbnfTerminal.js";
+import { GbnfGrammarGenerator } from "../GbnfGrammarGenerator.js";
 export declare class GbnfNumberValue extends GbnfTerminal {
     readonly value: number;
     constructor(value: number);
     getGrammar(): string;
-    resolve(): string;
+    resolve(grammarGenerator: GbnfGrammarGenerator): string;
+    protected generateRuleName(grammarGenerator: GbnfGrammarGenerator): string;
 }

package/dist/utils/gbnfJson/terminals/GbnfNumberValue.js

@@ -8,8 +8,14 @@ export class GbnfNumberValue extends GbnfTerminal {
     getGrammar() {
         return '"' + JSON.stringify(this.value) + '"';
     }
-    resolve() {
-        return this.getGrammar();
+    resolve(grammarGenerator) {
+        const grammar = this.getGrammar();
+        if (grammar.length <= grammarGenerator.getProposedLiteralValueRuleNameLength())
+            return grammar;
+        return super.resolve(grammarGenerator);
+    }
+    generateRuleName(grammarGenerator) {
+        return grammarGenerator.generateRuleNameForLiteralValue(this.value);
     }
 }
 //# sourceMappingURL=GbnfNumberValue.js.map

package/dist/utils/gbnfJson/terminals/GbnfNumberValue.js.map

@@ -1 +1 @@
-{"version":3,"file":"GbnfNumberValue.js","sourceRoot":"","sources":["../../../../src/utils/gbnfJson/terminals/GbnfNumberValue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAGhD,MAAM,OAAO,eAAgB,SAAQ,YAAY;IAC7B,KAAK,CAAS;IAE9B,YAAmB,KAAa;QAC5B,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACvB,CAAC;IAEe,UAAU;QACtB,OAAO,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC;IAClD,CAAC;IAEe,OAAO;QACnB,OAAO,IAAI,CAAC,UAAU,EAAE,CAAC;IAC7B,CAAC;CACJ"}
+{"version":3,"file":"GbnfNumberValue.js","sourceRoot":"","sources":["../../../../src/utils/gbnfJson/terminals/GbnfNumberValue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAIhD,MAAM,OAAO,eAAgB,SAAQ,YAAY;IAC7B,KAAK,CAAS;IAE9B,YAAmB,KAAa;QAC5B,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACvB,CAAC;IAEe,UAAU;QACtB,OAAO,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC;IAClD,CAAC;IAEe,OAAO,CAAC,gBAAsC;QAC1D,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QAClC,IAAI,OAAO,CAAC,MAAM,IAAI,gBAAgB,CAAC,qCAAqC,EAAE;YAC1E,OAAO,OAAO,CAAC;QAEnB,OAAO,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC3C,CAAC;IAEkB,gBAAgB,CAAC,gBAAsC;QACtE,OAAO,gBAAgB,CAAC,+BAA+B,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACxE,CAAC;CACJ"}

package/dist/utils/gbnfJson/terminals/GbnfObjectMap.d.ts

@@ -9,11 +9,20 @@ export declare class GbnfObjectMap extends GbnfTerminal {
         value: GbnfTerminal;
         required: true;
     }>>;
+    readonly additionalProperties?: GbnfTerminal;
+    readonly minProperties: number;
+    readonly maxProperties?: number;
     readonly scopeState: GbnfJsonScopeState;
-    constructor(fields: Array<Readonly<{
-        key: GbnfString | GbnfStringValue;
-        value: GbnfTerminal;
-        required: true;
-    }>>, scopeState?: GbnfJsonScopeState);
+    constructor({ fields, additionalProperties, minProperties, maxProperties, scopeState }: {
+        fields: Array<Readonly<{
+            key: GbnfString | GbnfStringValue;
+            value: GbnfTerminal;
+            required: true;
+        }>>;
+        additionalProperties?: GbnfTerminal;
+        minProperties?: number;
+        maxProperties?: number;
+        scopeState?: GbnfJsonScopeState;
+    });
     getGrammar(grammarGenerator: GbnfGrammarGenerator): string;
 }

package/dist/utils/gbnfJson/terminals/GbnfObjectMap.js

@@ -1,29 +1,87 @@
 import { GbnfTerminal } from "../GbnfTerminal.js";
 import { GbnfJsonScopeState } from "../utils/GbnfJsonScopeState.js";
+import { GbnfString } from "./GbnfString.js";
 import { GbnfWhitespace } from "./GbnfWhitespace.js";
 import { GbnfGrammar } from "./GbnfGrammar.js";
+import { GbnfRepetition } from "./GbnfRepetition.js";
+import { GbnfCommaWhitespace } from "./GbnfCommaWhitespace.js";
 export class GbnfObjectMap extends GbnfTerminal {
     fields;
+    additionalProperties;
+    minProperties;
+    maxProperties;
     scopeState;
-    constructor(fields, scopeState = new GbnfJsonScopeState()) {
+    constructor({ fields, additionalProperties, minProperties = 0, maxProperties, scopeState = new GbnfJsonScopeState() }) {
         super();
         this.fields = fields;
+        this.additionalProperties = additionalProperties;
+        this.minProperties = Math.floor(minProperties);
+        this.maxProperties = maxProperties == null ? undefined : Math.floor(maxProperties);
         this.scopeState = scopeState;
+        if (this.minProperties < this.fields.length)
+            this.minProperties = this.fields.length;
+        if (this.maxProperties != null && this.maxProperties < this.minProperties)
+            this.maxProperties = this.minProperties;
+        else if (this.maxProperties != null && this.maxProperties < 0)
+            this.maxProperties = 0;
     }
     getGrammar(grammarGenerator) {
         const getWhitespaceRuleName = (newScope, newLine) => (newScope
             ? new GbnfWhitespace(this.scopeState.getForNewScope(), { newLine }).resolve(grammarGenerator)
             : new GbnfWhitespace(this.scopeState, { newLine }).resolve(grammarGenerator));
+        const getCommaWhitespaceRule = (newScope, newLine) => (newScope
+            ? new GbnfCommaWhitespace(this.scopeState.getForNewScope(), { newLine })
+            : new GbnfCommaWhitespace(this.scopeState, { newLine }));
+        const getCommaWhitespaceRuleName = (newScope, newLine) => (getCommaWhitespaceRule(newScope, newLine).resolve(grammarGenerator));
+        const objectItemsGrammar = [];
+        for (const { key, value } of this.fields) {
+            if (objectItemsGrammar.length > 0)
+                objectItemsGrammar.push(getCommaWhitespaceRuleName(true, "before"));
+            objectItemsGrammar.push(new GbnfGrammar([
+                key.getGrammar(grammarGenerator), '":"', "[ ]?", value.resolve(grammarGenerator)
+            ]).getGrammar());
+        }
+        if (this.additionalProperties != null) {
+            const additionalPropertiesGrammar = new GbnfGrammar([
+                new GbnfString().resolve(grammarGenerator), '":"', "[ ]?", this.additionalProperties.resolve(grammarGenerator)
+            ]);
+            if (this.minProperties > this.fields.length) {
+                if (objectItemsGrammar.length > 0)
+                    objectItemsGrammar.push(getCommaWhitespaceRuleName(true, "before"));
+                objectItemsGrammar.push(new GbnfRepetition({
+                    value: additionalPropertiesGrammar,
+                    separator: getCommaWhitespaceRule(true, "before"),
+                    minRepetitions: this.minProperties - this.fields.length,
+                    maxRepetitions: this.maxProperties == null
+                        ? undefined
+                        : this.maxProperties - this.fields.length
+                }).getGrammar(grammarGenerator));
+            }
+            else if (this.maxProperties == null || this.maxProperties > this.fields.length) {
+                if (objectItemsGrammar.length === 0)
+                    objectItemsGrammar.push(new GbnfRepetition({
+                        value: additionalPropertiesGrammar,
+                        separator: getCommaWhitespaceRule(true, "before"),
+                        maxRepetitions: this.maxProperties == null
+                            ? undefined
+                            : this.maxProperties - this.fields.length
+                    }).getGrammar(grammarGenerator));
+                else
+                    objectItemsGrammar.push(new GbnfRepetition({
+                        value: new GbnfGrammar([
+                            getCommaWhitespaceRuleName(true, "before"),
+                            additionalPropertiesGrammar.resolve(grammarGenerator)
+                        ], true),
+                        maxRepetitions: this.maxProperties == null
+                            ? undefined
+                            : this.maxProperties - this.fields.length
+                    }).getGrammar(grammarGenerator));
+            }
+        }
         return new GbnfGrammar([
             '"{"', getWhitespaceRuleName(true, "before"),
-            ...this.fields.map(({ key, value }, index) => {
-                return new GbnfGrammar([
-                    key.getGrammar(), '":"', "[ ]?", value.resolve(grammarGenerator),
-                    index < this.fields.length - 1 ? '","' : "",
-                    getWhitespaceRuleName(index < this.fields.length - 1, "before")
-                ]).getGrammar();
-            }),
-            '"}"'
+            new GbnfGrammar(objectItemsGrammar).getGrammar(),
+            getWhitespaceRuleName(false, "before"), '"}"'
         ]).getGrammar();
     }
 }

package/dist/utils/gbnfJson/terminals/GbnfObjectMap.js.map

@@ -1 +1 @@
-{"version":3,"file":"GbnfObjectMap.js","sourceRoot":"","sources":["../../../../src/utils/gbnfJson/terminals/GbnfObjectMap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAEhD,OAAO,EAAC,kBAAkB,EAAC,MAAM,gCAAgC,CAAC;AAGlE,OAAO,EAAC,cAAc,EAAC,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAC,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAG7C,MAAM,OAAO,aAAc,SAAQ,YAAY;IAC3B,MAAM,CAA4F;IAClG,UAAU,CAAqB;IAE/C,YACI,MAAiG,EACjG,aAAiC,IAAI,kBAAkB,EAAE;QAEzD,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IACjC,CAAC;IAEM,UAAU,CAAC,gBAAsC;QACpD,MAAM,qBAAqB,GAAG,CAAC,QAAiB,EAAE,OAAmC,EAAE,EAAE,CAAC,CACtF,QAAQ;YACJ,CAAC,CAAC,IAAI,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,cAAc,EAAE,EAAE,EAAC,OAAO,EAAC,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC;YAC3F,CAAC,CAAC,IAAI,cAAc,CAAC,IAAI,CAAC,UAAU,EAAE,EAAC,OAAO,EAAC,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,CACjF,CAAC;QAEF,OAAO,IAAI,WAAW,CAAC;YACnB,KAAK,EAAE,qBAAqB,CAAC,IAAI,EAAE,QAAQ,CAAC;YAC5C,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAC,GAAG,EAAE,KAAK,EAAC,EAAE,KAAK,EAAE,EAAE;gBACvC,OAAO,IAAI,WAAW,CAAC;oBACnB,GAAG,CAAC,UAAU,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC;oBAChE,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;oBAC3C,qBAAqB,CAAC,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,QAAQ,CAAC;iBAClE,CAAC,CAAC,UAAU,EAAE,CAAC;YACpB,CAAC,CAAC;YACF,KAAK;SACR,CAAC,CAAC,UAAU,EAAE,CAAC;IACpB,CAAC;CACJ"}
+{"version":3,"file":"GbnfObjectMap.js","sourceRoot":"","sources":["../../../../src/utils/gbnfJson/terminals/GbnfObjectMap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAEhD,OAAO,EAAC,kBAAkB,EAAC,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAC;AAE3C,OAAO,EAAC,cAAc,EAAC,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAC,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAC,cAAc,EAAC,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAC,mBAAmB,EAAC,MAAM,0BAA0B,CAAC;AAG7D,MAAM,OAAO,aAAc,SAAQ,YAAY;IAC3B,MAAM,CAA4F;IAClG,oBAAoB,CAAgB;IACpC,aAAa,CAAS;IACtB,aAAa,CAAU;IACvB,UAAU,CAAqB;IAE/C,YAAmB,EACf,MAAM,EAAE,oBAAoB,EAAE,aAAa,GAAG,CAAC,EAAE,aAAa,EAC9D,UAAU,GAAG,IAAI,kBAAkB,EAAE,EAMxC;QACG,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAC;QACjD,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QAC/C,IAAI,CAAC,aAAa,GAAG,aAAa,IAAI,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QACnF,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAE7B,IAAI,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM;YACvC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;QAE5C,IAAI,IAAI,CAAC,aAAa,IAAI,IAAI,IAAI,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa;YACrE,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC;aACvC,IAAI,IAAI,CAAC,aAAa,IAAI,IAAI,IAAI,IAAI,CAAC,aAAa,GAAG,CAAC;YACzD,IAAI,CAAC,aAAa,GAAG,CAAC,CAAC;IAC/B,CAAC;IAEM,UAAU,CAAC,gBAAsC;QACpD,MAAM,qBAAqB,GAAG,CAAC,QAAiB,EAAE,OAAmC,EAAE,EAAE,CAAC,CACtF,QAAQ;YACJ,CAAC,CAAC,IAAI,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,cAAc,EAAE,EAAE,EAAC,OAAO,EAAC,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC;YAC3F,CAAC,CAAC,IAAI,cAAc,CAAC,IAAI,CAAC,UAAU,EAAE,EAAC,OAAO,EAAC,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,CACjF,CAAC;QAEF,MAAM,sBAAsB,GAAG,CAAC,QAAiB,EAAE,OAAmC,EAAE,EAAE,CAAC,CACvF,QAAQ;YACJ,CAAC,CAAC,IAAI,mBAAmB,CAAC,IAAI,CAAC,UAAU,CAAC,cAAc,EAAE,EAAE,EAAC,OAAO,EAAC,CAAC;YACtE,CAAC,CAAC,IAAI,mBAAmB,CAAC,IAAI,CAAC,UAAU,EAAE,EAAC,OAAO,EAAC,CAAC,CAC5D,CAAC;QACF,MAAM,0BAA0B,GAAG,CAAC,QAAiB,EAAE,OAAmC,EAAE,EAAE,CAAC,CAC3F,sBAAsB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,CACtE,CAAC;QAEF,MAAM,kBAAkB,GAAa,EAAE,CAAC;QACxC,KAAK,MAAM,EAAC,GAAG,EAAE,KAAK,EAAC,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YACrC,IAAI,kBAAkB,CAAC,MAAM,GAAG,CAAC;gBAC7B,kBAAkB,CAAC,IAAI,CAAC,0BAA0B,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;YAExE,kBAAkB,CAAC,IAAI,CACnB,IAAI,WAAW,CAAC;gBACZ,GAAG,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC;aACnF,CAAC,CAAC,UAAU,EAAE,CAClB,CAAC;QACN,CAAC;QAED,IAAI,IAAI,CAAC,oBAAoB,IAAI,IAAI,EAAE,CAAC;YACpC,MAAM,2BAA2B,GAAG,IAAI,WAAW,CAAC;gBAChD,IAAI,UAAU,EAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,gBAAgB,CAAC;aACjH,CAAC,CAAC;YAEH,IAAI,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;gBAC1C,IAAI,kBAAkB,CAAC,MAAM,GAAG,CAAC;oBAC7B,kBAAkB,CAAC,IAAI,CAAC,0BAA0B,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;gBAExE,kBAAkB,CAAC,IAAI,CACnB,IAAI,cAAc,CAAC;oBACf,KAAK,EAAE,2BAA2B;oBAClC,SAAS,EAAE,sBAAsB,CAAC,IAAI,EAAE,QAAQ,CAAC;oBACjD,cAAc,EAAE,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM;oBACvD,cAAc,EAAE,IAAI,CAAC,aAAa,IAAI,IAAI;wBACtC,CAAC,CAAC,SAAS;wBACX,CAAC,CAAC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM;iBAChD,CAAC,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAClC,CAAC;YACN,CAAC;iBAAM,IAAI,IAAI,CAAC,aAAa,IAAI,IAAI,IAAI,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;gBAC/E,IAAI,kBAAkB,CAAC,MAAM,KAAK,CAAC;oBAC/B,kBAAkB,CAAC,IAAI,CACnB,IAAI,cAAc,CAAC;wBACf,KAAK,EAAE,2BAA2B;wBAClC,SAAS,EAAE,sBAAsB,CAAC,IAAI,EAAE,QAAQ,CAAC;wBACjD,cAAc,EAAE,IAAI,CAAC,aAAa,IAAI,IAAI;4BACtC,CAAC,CAAC,SAAS;4BACX,CAAC,CAAC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM;qBAChD,CAAC,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAClC,CAAC;;oBAEF,kBAAkB,CAAC,IAAI,CACnB,IAAI,cAAc,CAAC;wBACf,KAAK,EAAE,IAAI,WAAW,CAAC;4BACnB,0BAA0B,CAAC,IAAI,EAAE,QAAQ,CAAC;4BAC1C,2BAA2B,CAAC,OAAO,CAAC,gBAAgB,CAAC;yBACxD,EAAE,IAAI,CAAC;wBACR,cAAc,EAAE,IAAI,CAAC,aAAa,IAAI,IAAI;4BACtC,CAAC,CAAC,SAAS;4BACX,CAAC,CAAC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM;qBAChD,CAAC,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAClC,CAAC;YACV,CAAC;QACL,CAAC;QAED,OAAO,IAAI,WAAW,CAAC;YACnB,KAAK,EAAE,qBAAqB,CAAC,IAAI,EAAE,QAAQ,CAAC;YAC5C,IAAI,WAAW,CAAC,kBAAkB,CAAC,CAAC,UAAU,EAAE;YAChD,qBAAqB,CAAC,KAAK,EAAE,QAAQ,CAAC,EAAE,KAAK;SAChD,CAAC,CAAC,UAAU,EAAE,CAAC;IACpB,CAAC;CACJ"}

package/dist/utils/gbnfJson/terminals/GbnfOr.d.ts

@@ -2,7 +2,8 @@ import { GbnfTerminal } from "../GbnfTerminal.js";
 import { GbnfGrammarGenerator } from "../GbnfGrammarGenerator.js";
 export declare class GbnfOr extends GbnfTerminal {
     readonly values: readonly GbnfTerminal[];
-    constructor(values: readonly GbnfTerminal[]);
+    readonly useRawGrammar: boolean;
+    constructor(values: readonly GbnfTerminal[], useRawGrammar?: boolean);
     getGrammar(grammarGenerator: GbnfGrammarGenerator): string;
     resolve(grammarGenerator: GbnfGrammarGenerator): string;
 }

package/dist/utils/gbnfJson/terminals/GbnfOr.js

@@ -2,13 +2,17 @@ import { GbnfTerminal } from "../GbnfTerminal.js";
 import { grammarNoValue } from "./gbnfConsts.js";
 export class GbnfOr extends GbnfTerminal {
     values;
-    constructor(values) {
+    useRawGrammar;
+    constructor(values, useRawGrammar = false) {
         super();
         this.values = values;
+        this.useRawGrammar = useRawGrammar;
     }
     getGrammar(grammarGenerator) {
         const mappedValues = this.values
-            .map((v) => v.resolve(grammarGenerator))
+            .map((v) => (this.useRawGrammar
+            ? v.getGrammar(grammarGenerator)
+            : v.resolve(grammarGenerator)))
             .filter((value) => value !== "" && value !== grammarNoValue);
         if (mappedValues.length === 0)
             return grammarNoValue;

package/dist/utils/gbnfJson/terminals/GbnfOr.js.map

@@ -1 +1 @@
-{"version":3,"file":"GbnfOr.js","sourceRoot":"","sources":["../../../../src/utils/gbnfJson/terminals/GbnfOr.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAEhD,OAAO,EAAC,cAAc,EAAC,MAAM,iBAAiB,CAAC;AAG/C,MAAM,OAAO,MAAO,SAAQ,YAAY;IACpB,MAAM,CAA0B;IAEhD,YAAmB,MAA+B;QAC9C,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACzB,CAAC;IAEM,UAAU,CAAC,gBAAsC;QACpD,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM;aAC3B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;aACvC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,EAAE,IAAI,KAAK,KAAK,cAAc,CAAC,CAAC;QAEjE,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC;YACzB,OAAO,cAAc,CAAC;aACrB,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC;YAC9B,OAAO,YAAY,CAAC,CAAC,CAAE,CAAC;QAE5B,OAAO,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC;IAClD,CAAC;IAEe,OAAO,CAAC,gBAAsC;QAC1D,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM;aAC3B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;aACvC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,EAAE,IAAI,KAAK,KAAK,cAAc,CAAC,CAAC;QAEjE,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC;YACzB,OAAO,cAAc,CAAC;aACrB,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC;YAC9B,OAAO,YAAY,CAAC,CAAC,CAAE,CAAC;QAE5B,OAAO,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC3C,CAAC;CACJ"}
+{"version":3,"file":"GbnfOr.js","sourceRoot":"","sources":["../../../../src/utils/gbnfJson/terminals/GbnfOr.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAEhD,OAAO,EAAC,cAAc,EAAC,MAAM,iBAAiB,CAAC;AAG/C,MAAM,OAAO,MAAO,SAAQ,YAAY;IACpB,MAAM,CAA0B;IAChC,aAAa,CAAU;IAEvC,YAAmB,MAA+B,EAAE,gBAAyB,KAAK;QAC9E,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACvC,CAAC;IAEM,UAAU,CAAC,gBAAsC;QACpD,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM;aAC3B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CACR,IAAI,CAAC,aAAa;YACd,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,gBAAgB,CAAC;YAChC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,CACpC,CAAC;aACD,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,EAAE,IAAI,KAAK,KAAK,cAAc,CAAC,CAAC;QAEjE,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC;YACzB,OAAO,cAAc,CAAC;aACrB,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC;YAC9B,OAAO,YAAY,CAAC,CAAC,CAAE,CAAC;QAE5B,OAAO,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC;IAClD,CAAC;IAEe,OAAO,CAAC,gBAAsC;QAC1D,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM;aAC3B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;aACvC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,EAAE,IAAI,KAAK,KAAK,cAAc,CAAC,CAAC;QAEjE,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC;YACzB,OAAO,cAAc,CAAC;aACrB,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC;YAC9B,OAAO,YAAY,CAAC,CAAC,CAAE,CAAC;QAE5B,OAAO,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC3C,CAAC;CACJ"}

package/dist/utils/gbnfJson/terminals/GbnfRepetition.d.ts

@@ -2,8 +2,14 @@ import { GbnfTerminal } from "../GbnfTerminal.js";
 import { GbnfGrammarGenerator } from "../GbnfGrammarGenerator.js";
 export declare class GbnfRepetition extends GbnfTerminal {
     readonly value: GbnfTerminal;
+    readonly separator?: GbnfTerminal;
     readonly minRepetitions: number;
     readonly maxRepetitions: number | null;
-    constructor(value: GbnfTerminal, minRepetitions: number, maxRepetitions: number | null);
+    constructor({ value, separator, minRepetitions, maxRepetitions }: {
+        value: GbnfTerminal;
+        separator?: GbnfTerminal;
+        minRepetitions?: number;
+        maxRepetitions?: number | null;
+    });
     getGrammar(grammarGenerator: GbnfGrammarGenerator): string;
 }

package/dist/utils/gbnfJson/terminals/GbnfRepetition.js

@@ -1,37 +1,86 @@
 import { GbnfTerminal } from "../GbnfTerminal.js";
+import { GbnfGrammar } from "./GbnfGrammar.js";
 import { grammarNoValue } from "./gbnfConsts.js";
 export class GbnfRepetition extends GbnfTerminal {
     value;
+    separator;
     minRepetitions;
     maxRepetitions;
-    constructor(value, minRepetitions, maxRepetitions) {
+    constructor({ value, separator, minRepetitions = 0, maxRepetitions }) {
         super();
         this.value = value;
-        this.minRepetitions = minRepetitions;
-        this.maxRepetitions = maxRepetitions;
+        this.separator = separator;
+        this.minRepetitions = Math.floor(minRepetitions);
+        this.maxRepetitions = maxRepetitions == null ? null : Math.floor(maxRepetitions);
+        if (this.minRepetitions < 0)
+            this.minRepetitions = 0;
+        if (this.maxRepetitions != null && this.maxRepetitions < 0)
+            this.maxRepetitions = 0;
+        if (this.maxRepetitions != null && this.maxRepetitions < this.minRepetitions)
+            this.maxRepetitions = this.minRepetitions;
     }
     getGrammar(grammarGenerator) {
+        if (this.maxRepetitions === 0)
+            return grammarNoValue;
         const resolvedValue = this.value.resolve(grammarGenerator);
-        let grammarStart = "";
-        let grammarEnd = "";
-        for (let i = 0; i < this.minRepetitions; i++) {
-            grammarStart += "(" + resolvedValue + " ";
-            grammarEnd += ")";
+        const resolvedSeparator = this.separator?.resolve(grammarGenerator);
+        if (this.minRepetitions === 0 && this.maxRepetitions == 1)
+            return new GbnfGrammar(["(", resolvedValue, ")?"]).getGrammar();
+        else if (this.minRepetitions === 1 && this.maxRepetitions === 1)
+            return resolvedValue;
+        else if (this.minRepetitions === this.maxRepetitions) {
+            if (resolvedSeparator == null)
+                return new GbnfGrammar(["(", resolvedValue, "){" + String(this.minRepetitions) + "}"]).getGrammar();
+            if (this.minRepetitions === 2)
+                return new GbnfGrammar([resolvedValue, resolvedSeparator, resolvedValue]).getGrammar();
+            return new GbnfGrammar([
+                resolvedValue, "(", resolvedSeparator, resolvedValue, "){" + String(this.minRepetitions - 1) + "}"
+            ]).getGrammar();
         }
-        if (this.maxRepetitions === Infinity || this.maxRepetitions == null) {
-            grammarStart += "(" + resolvedValue + " ";
-            grammarEnd += ")*";
+        else if (this.minRepetitions === 0 && this.maxRepetitions == null) {
+            if (resolvedSeparator == null)
+                return new GbnfGrammar(["(", resolvedValue, ")*"]).getGrammar();
+            return new GbnfGrammar([
+                "(", resolvedValue, "(", resolvedSeparator, resolvedValue, ")*", ")?"
+            ]).getGrammar();
         }
-        else {
-            for (let i = this.minRepetitions + 1; i <= this.maxRepetitions; i++) {
-                grammarStart += "(" + resolvedValue + " ";
-                grammarEnd += ")?";
-            }
+        else if (this.minRepetitions === 1 && this.maxRepetitions == null) {
+            if (resolvedSeparator == null)
+                return new GbnfGrammar(["(", resolvedValue, ")+"]).getGrammar();
+            return new GbnfGrammar([
+                resolvedValue, "(", resolvedSeparator, resolvedValue, ")*"
+            ]).getGrammar();
         }
-        const res = grammarStart + grammarEnd;
-        if (res === "")
-            return grammarNoValue;
-        return res;
+        else if (this.maxRepetitions == null) {
+            if (resolvedSeparator == null)
+                return new GbnfGrammar(["(", resolvedValue, "){" + String(this.minRepetitions) + ",}"]).getGrammar();
+            return new GbnfGrammar([
+                resolvedValue, "(", resolvedSeparator, resolvedValue, "){" + String(this.minRepetitions - 1) + ",}"
+            ]).getGrammar();
+        }
+        if (resolvedSeparator == null)
+            return new GbnfGrammar(["(", resolvedValue, "){" + String(this.minRepetitions) + "," + String(this.maxRepetitions) + "}"]).getGrammar();
+        if (this.minRepetitions === 0) {
+            if (this.maxRepetitions === 2)
+                return new GbnfGrammar([
+                    "(", resolvedValue, "(", resolvedSeparator, resolvedValue, ")?", ")?"
+                ]).getGrammar();
+            return new GbnfGrammar([
+                "(", resolvedValue, "(", resolvedSeparator, resolvedValue, "){0," + String(this.maxRepetitions - 1) + "}", ")?"
+            ]).getGrammar();
+        }
+        else if (this.minRepetitions === 1) {
+            if (this.maxRepetitions === 2)
+                return new GbnfGrammar([
+                    resolvedValue, "(", resolvedSeparator, resolvedValue, ")?"
+                ]).getGrammar();
+            return new GbnfGrammar([
+                resolvedValue, "(", resolvedSeparator, resolvedValue, "){0," + String(this.maxRepetitions - 1) + "}"
+            ]).getGrammar();
+        }
+        return new GbnfGrammar([
+            resolvedValue, "(", resolvedSeparator, resolvedValue, "){" + String(this.minRepetitions - 1) + "," + String(this.maxRepetitions - 1) + "}"
+        ]).getGrammar();
     }
 }
 //# sourceMappingURL=GbnfRepetition.js.map

package/dist/utils/gbnfJson/terminals/GbnfRepetition.js.map

@@ -1 +1 @@
-{"version":3,"file":"GbnfRepetition.js","sourceRoot":"","sources":["../../../../src/utils/gbnfJson/terminals/GbnfRepetition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAEhD,OAAO,EAAC,cAAc,EAAC,MAAM,iBAAiB,CAAC;AAG/C,MAAM,OAAO,cAAe,SAAQ,YAAY;IAC5B,KAAK,CAAe;IACpB,cAAc,CAAS;IACvB,cAAc,CAAgB;IAE9C,YAAmB,KAAmB,EAAE,cAAsB,EAAE,cAA6B;QACzF,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;IACzC,CAAC;IAEM,UAAU,CAAC,gBAAsC;QACpD,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;QAC3D,IAAI,YAAY,GAAG,EAAE,CAAC;QACtB,IAAI,UAAU,GAAG,EAAE,CAAC;QAEpB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC,EAAE,EAAE,CAAC;YAC3C,YAAY,IAAI,GAAG,GAAG,aAAa,GAAG,GAAG,CAAC;YAC1C,UAAU,IAAI,GAAG,CAAC;QACtB,CAAC;QAED,IAAI,IAAI,CAAC,cAAc,KAAK,QAAQ,IAAI,IAAI,CAAC,cAAc,IAAI,IAAI,EAAE,CAAC;YAClE,YAAY,IAAI,GAAG,GAAG,aAAa,GAAG,GAAG,CAAC;YAC1C,UAAU,IAAI,IAAI,CAAC;QACvB,CAAC;aAAM,CAAC;YACJ,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC,cAAc,GAAG,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC,EAAE,EAAE,CAAC;gBAClE,YAAY,IAAI,GAAG,GAAG,aAAa,GAAG,GAAG,CAAC;gBAC1C,UAAU,IAAI,IAAI,CAAC;YACvB,CAAC;QACL,CAAC;QAED,MAAM,GAAG,GAAG,YAAY,GAAG,UAAU,CAAC;QAEtC,IAAI,GAAG,KAAK,EAAE;YACV,OAAO,cAAc,CAAC;QAE1B,OAAO,GAAG,CAAC;IACf,CAAC;CACJ"}
+{"version":3,"file":"GbnfRepetition.js","sourceRoot":"","sources":["../../../../src/utils/gbnfJson/terminals/GbnfRepetition.ts"],"names":[],"mappings":"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"}

package/dist/utils/gbnfJson/terminals/GbnfString.d.ts

@@ -1,5 +1,12 @@
 import { GbnfTerminal } from "../GbnfTerminal.js";
+import { GbnfGrammarGenerator } from "../GbnfGrammarGenerator.js";
 export declare class GbnfString extends GbnfTerminal {
-    getGrammar(): string;
+    readonly minLength: number;
+    readonly maxLength?: number;
+    constructor({ minLength, maxLength }?: {
+        minLength?: number;
+        maxLength?: number;
+    });
+    getGrammar(grammarGenerator: GbnfGrammarGenerator): string;
     protected getRuleName(): string;
 }

package/dist/utils/gbnfJson/terminals/GbnfString.js

@@ -1,33 +1,43 @@
 import { GbnfTerminal } from "../GbnfTerminal.js";
 import { reservedRuleNames } from "./gbnfConsts.js";
+import { GbnfRepetition } from "./GbnfRepetition.js";
+import { GbnfInsideStringChar } from "./GbnfInsideStringChar.js";
 export class GbnfString extends GbnfTerminal {
-    getGrammar() {
+    minLength;
+    maxLength;
+    constructor({ minLength = 0, maxLength } = {}) {
+        super();
+        this.minLength = Math.floor(minLength ?? 0);
+        this.maxLength = maxLength == null ? undefined : Math.floor(maxLength);
+        if (this.minLength < 0)
+            this.minLength = 0;
+        if (this.maxLength != null && this.maxLength < this.minLength)
+            this.maxLength = this.minLength;
+    }
+    getGrammar(grammarGenerator) {
+        if (this.minLength == 0 && this.maxLength == null)
+            return [
+                '"\\""',
+                new GbnfInsideStringChar().resolve(grammarGenerator) + "*",
+                '"\\""'
+            ].join(" ");
+        else if (this.minLength == 0 && this.maxLength == 0)
+            return '"\\"\\""';
         return [
             '"\\""',
-            or([
-                negatedCharacterSet([
-                    '"',
-                    "\\\\",
-                    "\\x7F",
-                    "\\x00-\\x1F"
-                ]),
-                // escape sequences
-                '"\\\\" ' + or([
-                    '["\\\\/bfnrt]',
-                    '"u" [0-9a-fA-F] [0-9a-fA-F] [0-9a-fA-F] [0-9a-fA-F]'
-                ])
-            ]) + "*",
+            new GbnfRepetition({
+                value: new GbnfInsideStringChar(),
+                minRepetitions: this.minLength,
+                maxRepetitions: this.maxLength
+            }).getGrammar(grammarGenerator),
             '"\\""'
         ].join(" ");
     }
     getRuleName() {
-        return reservedRuleNames.string;
+        return reservedRuleNames.string({
+            minLength: this.minLength,
+            maxLength: this.maxLength
+        });
     }
 }
-function negatedCharacterSet(characterDefinitions) {
-    return "[^" + characterDefinitions.join("") + "]";
-}
-function or(definitions) {
-    return "(" + definitions.join(" | ") + ")";
-}
 //# sourceMappingURL=GbnfString.js.map

package/dist/utils/gbnfJson/terminals/GbnfString.js.map

@@ -1 +1 @@
-{"version":3,"file":"GbnfString.js","sourceRoot":"","sources":["../../../../src/utils/gbnfJson/terminals/GbnfString.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAC,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAGlD,MAAM,OAAO,UAAW,SAAQ,YAAY;IACjC,UAAU;QACb,OAAO;YACH,OAAO;YACP,EAAE,CAAC;gBACC,mBAAmB,CAAC;oBAChB,GAAG;oBACH,MAAM;oBACN,OAAO;oBACP,aAAa;iBAChB,CAAC;gBAEF,mBAAmB;gBACnB,SAAS,GAAG,EAAE,CAAC;oBACX,eAAe;oBACf,qDAAqD;iBACxD,CAAC;aACL,CAAC,GAAG,GAAG;YACR,OAAO;SACV,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAChB,CAAC;IAEkB,WAAW;QAC1B,OAAO,iBAAiB,CAAC,MAAM,CAAC;IACpC,CAAC;CACJ;AAED,SAAS,mBAAmB,CAAC,oBAA8B;IACvD,OAAO,IAAI,GAAG,oBAAoB,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC;AACtD,CAAC;AAED,SAAS,EAAE,CAAC,WAAqB;IAC7B,OAAO,GAAG,GAAG,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC;AAC/C,CAAC"}
+{"version":3,"file":"GbnfString.js","sourceRoot":"","sources":["../../../../src/utils/gbnfJson/terminals/GbnfString.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAEhD,OAAO,EAAC,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAC,cAAc,EAAC,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAC,oBAAoB,EAAC,MAAM,2BAA2B,CAAC;AAG/D,MAAM,OAAO,UAAW,SAAQ,YAAY;IACxB,SAAS,CAAS;IAClB,SAAS,CAAU;IAEnC,YAAmB,EACf,SAAS,GAAG,CAAC,EACb,SAAS,KAIT,EAAE;QACF,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,IAAI,CAAC,CAAC,CAAC;QAC5C,IAAI,CAAC,SAAS,GAAG,SAAS,IAAI,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAEvE,IAAI,IAAI,CAAC,SAAS,GAAG,CAAC;YAClB,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC;QAEvB,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,IAAI,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS;YACzD,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;IACxC,CAAC;IAEM,UAAU,CAAC,gBAAsC;QACpD,IAAI,IAAI,CAAC,SAAS,IAAI,CAAC,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI;YAC7C,OAAO;gBACH,OAAO;gBACP,IAAI,oBAAoB,EAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,GAAG,GAAG;gBAC1D,OAAO;aACV,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aACX,IAAI,IAAI,CAAC,SAAS,IAAI,CAAC,IAAI,IAAI,CAAC,SAAS,IAAI,CAAC;YAC/C,OAAO,UAAU,CAAC;QAEtB,OAAO;YACH,OAAO;YACP,IAAI,cAAc,CAAC;gBACf,KAAK,EAAE,IAAI,oBAAoB,EAAE;gBACjC,cAAc,EAAE,IAAI,CAAC,SAAS;gBAC9B,cAAc,EAAE,IAAI,CAAC,SAAS;aACjC,CAAC,CAAC,UAAU,CAAC,gBAAgB,CAAC;YAC/B,OAAO;SACV,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAChB,CAAC;IAEkB,WAAW;QAC1B,OAAO,iBAAiB,CAAC,MAAM,CAAC;YAC5B,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,SAAS,EAAE,IAAI,CAAC,SAAS;SAC5B,CAAC,CAAC;IACP,CAAC;CACJ"}

package/dist/utils/gbnfJson/terminals/GbnfStringValue.d.ts

@@ -1,6 +1,8 @@
 import { GbnfTerminal } from "../GbnfTerminal.js";
+import { GbnfGrammarGenerator } from "../GbnfGrammarGenerator.js";
 export declare class GbnfStringValue extends GbnfTerminal {
     readonly value: string;
     constructor(value: string);
     getGrammar(): string;
+    protected generateRuleName(grammarGenerator: GbnfGrammarGenerator): string;
 }

package/dist/utils/gbnfJson/terminals/GbnfStringValue.js

@@ -10,14 +10,17 @@ export class GbnfStringValue extends GbnfTerminal {
             '"',
             '\\"',
             this.value
-                .replaceAll("\\", "\\\\")
-                .replaceAll("\t", "\\t")
-                .replaceAll("\r", "\\r")
-                .replaceAll("\n", "\\n")
+                .replaceAll("\\", "\\\\\\\\")
+                .replaceAll("\t", "\\\\t")
+                .replaceAll("\r", "\\\\r")
+                .replaceAll("\n", "\\\\n")
                 .replaceAll('"', "\\\\" + '\\"'),
             '\\"',
             '"'
         ].join("");
     }
+    generateRuleName(grammarGenerator) {
+        return grammarGenerator.generateRuleNameForLiteralValue(this.value);
+    }
 }
 //# sourceMappingURL=GbnfStringValue.js.map

package/dist/utils/gbnfJson/terminals/GbnfStringValue.js.map

@@ -1 +1 @@
-{"version":3,"file":"GbnfStringValue.js","sourceRoot":"","sources":["../../../../src/utils/gbnfJson/terminals/GbnfStringValue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAGhD,MAAM,OAAO,eAAgB,SAAQ,YAAY;IAC7B,KAAK,CAAS;IAE9B,YAAmB,KAAa;QAC5B,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACvB,CAAC;IAEe,UAAU;QACtB,OAAO;YACH,GAAG;YACH,KAAK;YACL,IAAI,CAAC,KAAK;iBACL,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC;iBACxB,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC;iBACvB,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC;iBACvB,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC;iBACvB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,KAAK,CAAC;YACpC,KAAK;YACL,GAAG;SACN,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACf,CAAC;CACJ"}
+{"version":3,"file":"GbnfStringValue.js","sourceRoot":"","sources":["../../../../src/utils/gbnfJson/terminals/GbnfStringValue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAIhD,MAAM,OAAO,eAAgB,SAAQ,YAAY;IAC7B,KAAK,CAAS;IAE9B,YAAmB,KAAa;QAC5B,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACvB,CAAC;IAEe,UAAU;QACtB,OAAO;YACH,GAAG;YACH,KAAK;YACL,IAAI,CAAC,KAAK;iBACL,UAAU,CAAC,IAAI,EAAE,UAAU,CAAC;iBAC5B,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC;iBACzB,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC;iBACzB,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC;iBACzB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,KAAK,CAAC;YACpC,KAAK;YACL,GAAG;SACN,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACf,CAAC;IAEkB,gBAAgB,CAAC,gBAAsC;QACtE,OAAO,gBAAgB,CAAC,+BAA+B,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACxE,CAAC;CACJ"}

package/dist/utils/gbnfJson/terminals/GbnfWhitespace.d.ts

@@ -5,8 +5,9 @@ export declare class GbnfWhitespace extends GbnfTerminal {
     readonly newLine: "before" | "after" | false;
     constructor(scopeState: GbnfJsonScopeState, { newLine }?: {
         newLine?: "before" | "after" | false;
-        space?: boolean;
     });
     getGrammar(): string;
+    protected getGrammarFromResolve(): string;
+    private _getGrammar;
     protected getRuleName(): string;
 }