node-llama-cpp 3.0.0-beta.17 → 3.0.0-beta.19

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

@@ -1 +1 @@
-{"version":3,"file":"GbnfArray.js","sourceRoot":"","sources":["../../../../src/utils/gbnfJson/terminals/GbnfArray.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAEhD,OAAO,EAAC,cAAc,EAAC,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAC,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AAGnC,MAAM,OAAO,SAAU,SAAQ,YAAY;IACvB,KAAK,CAAe;IAEpC,YAAmB,KAAmB;QAClC,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACvB,CAAC;IAEM,UAAU,CAAC,gBAAsC;QACpD,MAAM,kBAAkB,GAAG,IAAI,cAAc,EAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;QAC1E,MAAM,oBAAoB,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;QAElE,OAAO,IAAI,WAAW,CAAC;YACnB,KAAK,EAAE,kBAAkB;YACzB,IAAI,MAAM,CAAC;gBACP,IAAI,WAAW,CAAC;oBACZ,GAAG,EAAE,oBAAoB,EAAE,GAAG;oBAC9B,GAAG,EAAE,KAAK,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,IAAI;iBAC7D,CAAC;gBACF,IAAI,WAAW,CAAC;oBACZ,GAAG,EAAE,oBAAoB,EAAE,IAAI;iBAClC,CAAC;aACL,CAAC,CAAC,UAAU,CAAC,gBAAgB,CAAC;YAC/B,kBAAkB,EAAE,KAAK;SAC5B,CAAC,CAAC,UAAU,EAAE,CAAC;IACpB,CAAC;CACJ"}
+{"version":3,"file":"GbnfArray.js","sourceRoot":"","sources":["../../../../src/utils/gbnfJson/terminals/GbnfArray.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAEhD,OAAO,EAAC,kBAAkB,EAAC,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAC,cAAc,EAAC,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAC,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AAGnC,MAAM,OAAO,SAAU,SAAQ,YAAY;IACvB,KAAK,CAAe;IACpB,UAAU,CAAqB;IAE/C,YAAmB,KAAmB,EAAE,aAAiC,IAAI,kBAAkB,EAAE;QAC7F,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,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;QACF,MAAM,oBAAoB,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;QAElE,OAAO,IAAI,WAAW,CAAC;YACnB,KAAK,EAAE,qBAAqB,CAAC,IAAI,EAAE,QAAQ,CAAC;YAC5C,IAAI,MAAM,CAAC;gBACP,IAAI,WAAW,CAAC;oBACZ,GAAG,EAAE,oBAAoB,EAAE,GAAG;oBAC9B,GAAG,EAAE,KAAK,EAAE,qBAAqB,CAAC,IAAI,EAAE,QAAQ,CAAC,EAAE,oBAAoB,EAAE,IAAI;iBAChF,CAAC;gBACF,IAAI,WAAW,CAAC;oBACZ,GAAG,EAAE,oBAAoB,EAAE,IAAI;iBAClC,CAAC;aACL,CAAC,CAAC,UAAU,CAAC,gBAAgB,CAAC;YAC/B,qBAAqB,CAAC,KAAK,EAAE,QAAQ,CAAC,EAAE,KAAK;SAChD,CAAC,CAAC,UAAU,EAAE,CAAC;IACpB,CAAC;CACJ"}

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

@@ -1,5 +1,6 @@
 import { GbnfTerminal } from "../GbnfTerminal.js";
 import { GbnfGrammarGenerator } from "../GbnfGrammarGenerator.js";
+import { GbnfJsonScopeState } from "../utils/GbnfJsonScopeState.js";
 import { GbnfString } from "./GbnfString.js";
 import { GbnfStringValue } from "./GbnfStringValue.js";
 export declare class GbnfObjectMap extends GbnfTerminal {
@@ -8,10 +9,11 @@ export declare class GbnfObjectMap extends GbnfTerminal {
         value: GbnfTerminal;
         required: true;
     }>>;
+    readonly scopeState: GbnfJsonScopeState;
     constructor(fields: Array<Readonly<{
         key: GbnfString | GbnfStringValue;
         value: GbnfTerminal;
         required: true;
-    }>>);
+    }>>, scopeState?: GbnfJsonScopeState);
     getGrammar(grammarGenerator: GbnfGrammarGenerator): string;
 }

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

@@ -1,21 +1,26 @@
 import { GbnfTerminal } from "../GbnfTerminal.js";
+import { GbnfJsonScopeState } from "../utils/GbnfJsonScopeState.js";
 import { GbnfWhitespace } from "./GbnfWhitespace.js";
 import { GbnfGrammar } from "./GbnfGrammar.js";
 export class GbnfObjectMap extends GbnfTerminal {
     fields;
-    constructor(fields) {
+    scopeState;
+    constructor(fields, scopeState = new GbnfJsonScopeState()) {
         super();
         this.fields = fields;
+        this.scopeState = scopeState;
     }
     getGrammar(grammarGenerator) {
-        const whitespaceRuleName = new GbnfWhitespace().resolve(grammarGenerator);
+        const getWhitespaceRuleName = (newScope, newLine) => (newScope
+            ? new GbnfWhitespace(this.scopeState.getForNewScope(), { newLine }).resolve(grammarGenerator)
+            : new GbnfWhitespace(this.scopeState, { newLine }).resolve(grammarGenerator));
         return new GbnfGrammar([
-            '"{"', whitespaceRuleName,
+            '"{"', getWhitespaceRuleName(true, "before"),
             ...this.fields.map(({ key, value }, index) => {
                 return new GbnfGrammar([
                     key.getGrammar(), '":"', "[ ]?", value.resolve(grammarGenerator),
                     index < this.fields.length - 1 ? '","' : "",
-                    whitespaceRuleName
+                    getWhitespaceRuleName(index < this.fields.length - 1, "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;AAIhD,OAAO,EAAC,cAAc,EAAC,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAC,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAG7C,MAAM,OAAO,aAAc,SAAQ,YAAY;IAC3B,MAAM,CAA8F;IAEpH,YAAmB,MAAmG;QAClH,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACzB,CAAC;IAEM,UAAU,CAAC,gBAAsC;QACpD,MAAM,kBAAkB,GAAG,IAAI,cAAc,EAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;QAE1E,OAAO,IAAI,WAAW,CAAC;YACnB,KAAK,EAAE,kBAAkB;YACzB,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,kBAAkB;iBACrB,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;AAGlE,OAAO,EAAC,cAAc,EAAC,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAC,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAG7C,MAAM,OAAO,aAAc,SAAQ,YAAY;IAC3B,MAAM,CAA8F;IACpG,UAAU,CAAqB;IAE/C,YACI,MAAmG,EACnG,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"}

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

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

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

@@ -0,0 +1,37 @@
+import { GbnfTerminal } from "../GbnfTerminal.js";
+import { grammarNoValue } from "./gbnfConsts.js";
+export class GbnfRepetition extends GbnfTerminal {
+    value;
+    minRepetitions;
+    maxRepetitions;
+    constructor(value, minRepetitions, maxRepetitions) {
+        super();
+        this.value = value;
+        this.minRepetitions = minRepetitions;
+        this.maxRepetitions = maxRepetitions;
+    }
+    getGrammar(grammarGenerator) {
+        const resolvedValue = this.value.resolve(grammarGenerator);
+        let grammarStart = "";
+        let grammarEnd = "";
+        for (let i = 0; i < this.minRepetitions; i++) {
+            grammarStart += "(" + resolvedValue + " ";
+            grammarEnd += ")";
+        }
+        if (this.maxRepetitions === Infinity || this.maxRepetitions == null) {
+            grammarStart += "(" + resolvedValue + " ";
+            grammarEnd += ")*";
+        }
+        else {
+            for (let i = this.minRepetitions + 1; i <= this.maxRepetitions; i++) {
+                grammarStart += "(" + resolvedValue + " ";
+                grammarEnd += ")?";
+            }
+        }
+        const res = grammarStart + grammarEnd;
+        if (res === "")
+            return grammarNoValue;
+        return res;
+    }
+}
+//# sourceMappingURL=GbnfRepetition.js.map

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

@@ -0,0 +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;YAC1C,YAAY,IAAI,GAAG,GAAG,aAAa,GAAG,GAAG,CAAC;YAC1C,UAAU,IAAI,GAAG,CAAC;SACrB;QAED,IAAI,IAAI,CAAC,cAAc,KAAK,QAAQ,IAAI,IAAI,CAAC,cAAc,IAAI,IAAI,EAAE;YACjE,YAAY,IAAI,GAAG,GAAG,aAAa,GAAG,GAAG,CAAC;YAC1C,UAAU,IAAI,IAAI,CAAC;SACtB;aAAM;YACH,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC,cAAc,GAAG,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC,EAAE,EAAE;gBACjE,YAAY,IAAI,GAAG,GAAG,aAAa,GAAG,GAAG,CAAC;gBAC1C,UAAU,IAAI,IAAI,CAAC;aACtB;SACJ;QAED,MAAM,GAAG,GAAG,YAAY,GAAG,UAAU,CAAC;QAEtC,IAAI,GAAG,KAAK,EAAE;YACV,OAAO,cAAc,CAAC;QAE1B,OAAO,GAAG,CAAC;IACf,CAAC;CACJ"}

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

@@ -2,14 +2,32 @@ import { GbnfTerminal } from "../GbnfTerminal.js";
 import { reservedRuleNames } from "./gbnfConsts.js";
 export class GbnfString extends GbnfTerminal {
     getGrammar() {
-        return '"\\"" ( ' +
-            '[^"\\\\]' +
-            " | " +
-            '"\\\\" (["\\\\/bfnrt] | "u" [0-9a-fA-F] [0-9a-fA-F] [0-9a-fA-F] [0-9a-fA-F])' + // escape sequences
-            ')* "\\""';
+        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]'
+                ])
+            ]) + "*",
+            '"\\""'
+        ].join(" ");
     }
     getRuleName() {
         return reservedRuleNames.string;
     }
 }
+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,UAAU;YACb,UAAU;YACV,KAAK;YACL,8EAA8E,GAAG,mBAAmB;YACpG,UAAU,CAAC;IACnB,CAAC;IAEkB,WAAW;QAC1B,OAAO,iBAAiB,CAAC,MAAM,CAAC;IACpC,CAAC;CACJ"}
+{"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"}

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

@@ -1,8 +1,11 @@
 import { GbnfTerminal } from "../GbnfTerminal.js";
+import { GbnfJsonScopeState } from "../utils/GbnfJsonScopeState.js";
 export declare class GbnfWhitespace extends GbnfTerminal {
-    readonly newLinesAllowed: boolean;
-    constructor({ newLinesAllowed }?: {
-        newLinesAllowed?: boolean;
+    readonly scopeState: GbnfJsonScopeState;
+    readonly newLine: "before" | "after" | false;
+    constructor(scopeState: GbnfJsonScopeState, { newLine }?: {
+        newLine?: "before" | "after" | false;
+        space?: boolean;
     });
     getGrammar(): string;
     protected getRuleName(): string;

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

@@ -1,20 +1,48 @@
 import { GbnfTerminal } from "../GbnfTerminal.js";
 import { reservedRuleNames } from "./gbnfConsts.js";
+import { GbnfVerbatimText } from "./GbnfVerbatimText.js";
 export class GbnfWhitespace extends GbnfTerminal {
-    newLinesAllowed;
-    constructor({ newLinesAllowed = true } = {}) {
+    scopeState;
+    newLine;
+    constructor(scopeState, { newLine = "before" } = {}) {
         super();
-        this.newLinesAllowed = newLinesAllowed;
+        this.scopeState = scopeState;
+        this.newLine = newLine;
     }
     getGrammar() {
-        if (this.newLinesAllowed)
-            return "[\\n]? [ \\t]* [\\n]?";
-        return "[ \\t]*";
+        if (this.scopeState.settings.allowNewLines && this.newLine !== false) {
+            const values = [
+                ...(this.newLine === "before"
+                    ? ["[\\n]"]
+                    : []),
+                ...(this.scopeState.currentNestingScope === 0
+                    ? []
+                    : [
+                        or([
+                            new GbnfVerbatimText(" ".repeat(this.scopeState.currentNestingScope * this.scopeState.settings.scopePadSpaces)).getGrammar(),
+                            new GbnfVerbatimText("\t".repeat(this.scopeState.currentNestingScope)).getGrammar()
+                        ])
+                    ]),
+                ...(this.newLine === "after"
+                    ? ["[\\n]"]
+                    : [])
+            ];
+            return or([
+                values.join(" "),
+                "[ ]?"
+            ]);
+        }
+        return "[ ]?";
     }
     getRuleName() {
-        if (this.newLinesAllowed)
-            return reservedRuleNames.whitespace.withNewLines;
-        return reservedRuleNames.whitespace.withoutNewLines;
+        return reservedRuleNames.whitespace({
+            newLine: this.newLine,
+            scopeSpaces: this.scopeState.settings.scopePadSpaces,
+            nestingScope: this.scopeState.currentNestingScope
+        });
     }
 }
+function or(definitions) {
+    return "(" + definitions.join(" | ") + ")";
+}
 //# sourceMappingURL=GbnfWhitespace.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"GbnfWhitespace.js","sourceRoot":"","sources":["../../../../src/utils/gbnfJson/terminals/GbnfWhitespace.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAC,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAGlD,MAAM,OAAO,cAAe,SAAQ,YAAY;IAC5B,eAAe,CAAU;IAEzC,YAAmB,EAAC,eAAe,GAAG,IAAI,KAAmC,EAAE;QAC3E,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;IAC3C,CAAC;IAEM,UAAU;QACb,IAAI,IAAI,CAAC,eAAe;YACpB,OAAO,uBAAuB,CAAC;QAEnC,OAAO,SAAS,CAAC;IACrB,CAAC;IAEkB,WAAW;QAC1B,IAAI,IAAI,CAAC,eAAe;YACpB,OAAO,iBAAiB,CAAC,UAAU,CAAC,YAAY,CAAC;QAErD,OAAO,iBAAiB,CAAC,UAAU,CAAC,eAAe,CAAC;IACxD,CAAC;CACJ"}
+{"version":3,"file":"GbnfWhitespace.js","sourceRoot":"","sources":["../../../../src/utils/gbnfJson/terminals/GbnfWhitespace.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAEhD,OAAO,EAAC,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAC,gBAAgB,EAAC,MAAM,uBAAuB,CAAC;AAGvD,MAAM,OAAO,cAAe,SAAQ,YAAY;IAC5B,UAAU,CAAqB;IAC/B,OAAO,CAA6B;IAEpD,YAAmB,UAA8B,EAAE,EAC/C,OAAO,GAAG,QAAQ,KAIlB,EAAE;QACF,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IAEM,UAAU;QACb,IAAI,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,aAAa,IAAI,IAAI,CAAC,OAAO,KAAK,KAAK,EAAE;YAClE,MAAM,MAAM,GAAG;gBACX,GAAG,CACC,IAAI,CAAC,OAAO,KAAK,QAAQ;oBACrB,CAAC,CAAC,CAAC,OAAO,CAAC;oBACX,CAAC,CAAC,EAAE,CACX;gBACD,GAAG,CACC,IAAI,CAAC,UAAU,CAAC,mBAAmB,KAAK,CAAC;oBACrC,CAAC,CAAC,EAAE;oBACJ,CAAC,CAAC;wBACE,EAAE,CAAC;4BACC,IAAI,gBAAgB,CAChB,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,mBAAmB,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,cAAc,CAAC,CAC5F,CAAC,UAAU,EAAE;4BACd,IAAI,gBAAgB,CAChB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,mBAAmB,CAAC,CACnD,CAAC,UAAU,EAAE;yBACjB,CAAC;qBACL,CACR;gBACD,GAAG,CACC,IAAI,CAAC,OAAO,KAAK,OAAO;oBACpB,CAAC,CAAC,CAAC,OAAO,CAAC;oBACX,CAAC,CAAC,EAAE,CACX;aACJ,CAAC;YAEF,OAAO,EAAE,CAAC;gBACN,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;gBAChB,MAAM;aACT,CAAC,CAAC;SACN;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;IAEkB,WAAW;QAC1B,OAAO,iBAAiB,CAAC,UAAU,CAAC;YAChC,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,WAAW,EAAE,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,cAAc;YACpD,YAAY,EAAE,IAAI,CAAC,UAAU,CAAC,mBAAmB;SACpD,CAAC,CAAC;IACP,CAAC;CACJ;AAED,SAAS,EAAE,CAAC,WAAqB;IAC7B,OAAO,GAAG,GAAG,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC;AAC/C,CAAC"}

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

@@ -7,8 +7,9 @@ export declare const reservedRuleNames: {
         readonly integer: "integer-number-rule";
     };
     readonly string: "string-rule";
-    readonly whitespace: {
-        readonly withNewLines: "whitespace-new-lines-rule";
-        readonly withoutNewLines: "whitespace-no-new-lines-rule";
-    };
+    readonly whitespace: ({ newLine, nestingScope, scopeSpaces }: {
+        newLine?: false | "before" | "after" | undefined;
+        nestingScope: number;
+        scopeSpaces: number;
+    }) => string;
 };

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

@@ -7,9 +7,20 @@ export const reservedRuleNames = {
         integer: "integer-number-rule"
     },
     string: "string-rule",
-    whitespace: {
-        withNewLines: "whitespace-new-lines-rule",
-        withoutNewLines: "whitespace-no-new-lines-rule"
+    whitespace({ newLine, nestingScope, scopeSpaces }) {
+        if (!newLine)
+            return "whitespace-no-new-lines-rule";
+        return [
+            "whitespace-",
+            newLine === "before"
+                ? "b"
+                : newLine === "after"
+                    ? "a"
+                    : "n",
+            "-" + nestingScope,
+            "-" + scopeSpaces,
+            "-rule"
+        ].join("");
     }
 };
 //# sourceMappingURL=gbnfConsts.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"gbnfConsts.js","sourceRoot":"","sources":["../../../../src/utils/gbnfJson/terminals/gbnfConsts.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,CAAC;AACnC,MAAM,CAAC,MAAM,iBAAiB,GAAG;IAC7B,IAAI,EAAE,WAAW;IACjB,OAAO,EAAE,cAAc;IACvB,MAAM,EAAE;QACJ,UAAU,EAAE,wBAAwB;QACpC,OAAO,EAAE,qBAAqB;KACjC;IACD,MAAM,EAAE,aAAa;IACrB,UAAU,EAAE;QACR,YAAY,EAAE,2BAA2B;QACzC,eAAe,EAAE,8BAA8B;KAClD;CACK,CAAC"}
+{"version":3,"file":"gbnfConsts.js","sourceRoot":"","sources":["../../../../src/utils/gbnfJson/terminals/gbnfConsts.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,CAAC;AACnC,MAAM,CAAC,MAAM,iBAAiB,GAAG;IAC7B,IAAI,EAAE,WAAW;IACjB,OAAO,EAAE,cAAc;IACvB,MAAM,EAAE;QACJ,UAAU,EAAE,wBAAwB;QACpC,OAAO,EAAE,qBAAqB;KACjC;IACD,MAAM,EAAE,aAAa;IACrB,UAAU,CAAC,EAAC,OAAO,EAAE,YAAY,EAAE,WAAW,EAE7C;QACG,IAAI,CAAC,OAAO;YACR,OAAO,8BAA8B,CAAC;QAE1C,OAAO;YACH,aAAa;YACb,OAAO,KAAK,QAAQ;gBAChB,CAAC,CAAC,GAAG;gBACL,CAAC,CAAC,OAAO,KAAK,OAAO;oBACjB,CAAC,CAAC,GAAG;oBACL,CAAC,CAAC,GAAG;YACb,GAAG,GAAG,YAAY;YAClB,GAAG,GAAG,WAAW;YACjB,OAAO;SACV,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACf,CAAC;CACK,CAAC"}

package/dist/utils/gbnfJson/utils/GbnfJsonScopeState.d.ts

@@ -0,0 +1,10 @@
+export type GbnfJsonScopeSettings = {
+    readonly allowNewLines: boolean;
+    readonly scopePadSpaces: number;
+};
+export declare class GbnfJsonScopeState {
+    readonly settings: GbnfJsonScopeSettings;
+    readonly currentNestingScope: number;
+    constructor(settings?: GbnfJsonScopeSettings, currentNestingScope?: number);
+    getForNewScope(): GbnfJsonScopeState;
+}

package/dist/utils/gbnfJson/utils/GbnfJsonScopeState.js

@@ -0,0 +1,15 @@
+export class GbnfJsonScopeState {
+    settings;
+    currentNestingScope;
+    constructor(settings = {
+        allowNewLines: true,
+        scopePadSpaces: 4
+    }, currentNestingScope = 0) {
+        this.settings = settings;
+        this.currentNestingScope = currentNestingScope;
+    }
+    getForNewScope() {
+        return new GbnfJsonScopeState(this.settings, this.currentNestingScope + 1);
+    }
+}
+//# sourceMappingURL=GbnfJsonScopeState.js.map

package/dist/utils/gbnfJson/utils/GbnfJsonScopeState.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"GbnfJsonScopeState.js","sourceRoot":"","sources":["../../../../src/utils/gbnfJson/utils/GbnfJsonScopeState.ts"],"names":[],"mappings":"AAKA,MAAM,OAAO,kBAAkB;IACX,QAAQ,CAAwB;IAChC,mBAAmB,CAAS;IAE5C,YAAmB,WAAkC;QACjD,aAAa,EAAE,IAAI;QACnB,cAAc,EAAE,CAAC;KACpB,EAAE,sBAA8B,CAAC;QAC9B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,mBAAmB,GAAG,mBAAmB,CAAC;IACnD,CAAC;IAEM,cAAc;QACjB,OAAO,IAAI,kBAAkB,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,mBAAmB,GAAG,CAAC,CAAC,CAAC;IAC/E,CAAC;CACJ"}

package/dist/utils/gbnfJson/utils/getGbnfJsonTerminalForGbnfJsonSchema.d.ts

@@ -1,4 +1,5 @@
 import { GbnfTerminal } from "../GbnfTerminal.js";
 import { GbnfGrammarGenerator } from "../GbnfGrammarGenerator.js";
 import { GbnfJsonSchema } from "../types.js";
-export declare function getGbnfJsonTerminalForGbnfJsonSchema(schema: GbnfJsonSchema, grammarGenerator: GbnfGrammarGenerator): GbnfTerminal;
+import { GbnfJsonScopeState } from "./GbnfJsonScopeState.js";
+export declare function getGbnfJsonTerminalForGbnfJsonSchema(schema: GbnfJsonSchema, grammarGenerator: GbnfGrammarGenerator, scopeState?: GbnfJsonScopeState): GbnfTerminal;

package/dist/utils/gbnfJson/utils/getGbnfJsonTerminalForGbnfJsonSchema.js

@@ -8,10 +8,11 @@ import { GbnfBoolean } from "../terminals/GbnfBoolean.js";
 import { GbnfNull } from "../terminals/GbnfNull.js";
 import { isGbnfJsonArraySchema, isGbnfJsonBasicSchemaIncludesType, isGbnfJsonConstSchema, isGbnfJsonEnumSchema, isGbnfJsonObjectSchema, isGbnfJsonOneOfSchema } from "../types.js";
 import { getGbnfJsonTerminalForLiteral } from "./getGbnfJsonTerminalForLiteral.js";
-export function getGbnfJsonTerminalForGbnfJsonSchema(schema, grammarGenerator) {
+import { GbnfJsonScopeState } from "./GbnfJsonScopeState.js";
+export function getGbnfJsonTerminalForGbnfJsonSchema(schema, grammarGenerator, scopeState = new GbnfJsonScopeState()) {
     if (isGbnfJsonOneOfSchema(schema)) {
         const values = schema.oneOf
-            .map((altSchema) => getGbnfJsonTerminalForGbnfJsonSchema(altSchema, grammarGenerator));
+            .map((altSchema) => getGbnfJsonTerminalForGbnfJsonSchema(altSchema, grammarGenerator, scopeState));
         return new GbnfOr(values);
     }
     else if (isGbnfJsonConstSchema(schema)) {
@@ -25,12 +26,12 @@ export function getGbnfJsonTerminalForGbnfJsonSchema(schema, grammarGenerator) {
             return {
                 required: true,
                 key: new GbnfStringValue(propName),
-                value: getGbnfJsonTerminalForGbnfJsonSchema(propSchema, grammarGenerator)
+                value: getGbnfJsonTerminalForGbnfJsonSchema(propSchema, grammarGenerator, scopeState.getForNewScope())
             };
-        }));
+        }), scopeState);
     }
     else if (isGbnfJsonArraySchema(schema)) {
-        return new GbnfArray(getGbnfJsonTerminalForGbnfJsonSchema(schema.items, grammarGenerator));
+        return new GbnfArray(getGbnfJsonTerminalForGbnfJsonSchema(schema.items, grammarGenerator, scopeState), scopeState);
     }
     const terminals = [];
     if (isGbnfJsonBasicSchemaIncludesType(schema, "string"))

package/dist/utils/gbnfJson/utils/getGbnfJsonTerminalForGbnfJsonSchema.js.map

@@ -1 +1 @@
-{"version":3,"file":"getGbnfJsonTerminalForGbnfJsonSchema.js","sourceRoot":"","sources":["../../../../src/utils/gbnfJson/utils/getGbnfJsonTerminalForGbnfJsonSchema.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"getGbnfJsonTerminalForGbnfJsonSchema.js","sourceRoot":"","sources":["../../../../src/utils/gbnfJson/utils/getGbnfJsonTerminalForGbnfJsonSchema.ts"],"names":[],"mappings":"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"}

package/dist/utils/parseTextTemplate.d.ts

@@ -2,7 +2,7 @@ import { MergeUnionTypes } from "./mergeUnionTypes.js";
 /**
  * Parses a text template into a map of parts and their prefixes and suffixes.
  * This parser assumes each part occurs exactly once in the template, and that all parts must occur in the order they are defined.
- * For example,
+ * @example
  * ```typescript
  * const res = parseTextTemplate(
  *     "Hello, {{name}}! What is the {{thing}}?",
@@ -25,7 +25,7 @@ import { MergeUnionTypes } from "./mergeUnionTypes.js";
  *     }
  * });
  * ```
- *
+ * @example
  * ```typescript
  * const res2 = parseTextTemplate(
  *     "What is the {{thing}}?",

package/dist/utils/parseTextTemplate.js

@@ -2,7 +2,7 @@ import { splitText } from "lifecycle-utils";
 /**
  * Parses a text template into a map of parts and their prefixes and suffixes.
  * This parser assumes each part occurs exactly once in the template, and that all parts must occur in the order they are defined.
- * For example,
+ * @example
  * ```typescript
  * const res = parseTextTemplate(
  *     "Hello, {{name}}! What is the {{thing}}?",
@@ -25,7 +25,7 @@ import { splitText } from "lifecycle-utils";
  *     }
  * });
  * ```
- *
+ * @example
  * ```typescript
  * const res2 = parseTextTemplate(
  *     "What is the {{thing}}?",

package/dist/utils/runtime.d.ts

@@ -0,0 +1,4 @@
+export declare const runningInElectron: boolean;
+export declare const runningInsideAsar: boolean;
+export declare const runningInBun: boolean;
+export declare const runningInNode: boolean;

package/dist/utils/runtime.js

@@ -0,0 +1,8 @@
+import path from "path";
+import { fileURLToPath } from "url";
+const __filename = fileURLToPath(import.meta.url);
+export const runningInElectron = process.versions.electron != null;
+export const runningInsideAsar = runningInElectron && __filename.toLowerCase().includes(".asar" + path.sep);
+export const runningInBun = process.versions.bun != null;
+export const runningInNode = !runningInElectron && !runningInBun;
+//# sourceMappingURL=runtime.js.map

package/dist/utils/runtime.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../../src/utils/runtime.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAC,aAAa,EAAC,MAAM,KAAK,CAAC;AAElC,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAElD,MAAM,CAAC,MAAM,iBAAiB,GAAG,OAAO,CAAC,QAAQ,CAAC,QAAQ,IAAI,IAAI,CAAC;AACnE,MAAM,CAAC,MAAM,iBAAiB,GAAG,iBAAiB,IAAI,UAAU,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;AAC5G,MAAM,CAAC,MAAM,YAAY,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,IAAI,IAAI,CAAC;AACzD,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,iBAAiB,IAAI,CAAC,YAAY,CAAC"}

package/llama/addon.cpp

@@ -289,6 +289,10 @@ class AddonModel : public Napi::ObjectWrap<AddonModel> {
                     model_params.use_mlock = options.Get("useMlock").As<Napi::Boolean>().Value();
                 }
 
+                if (options.Has("checkTensors")) {
+                    model_params.check_tensors = options.Get("checkTensors").As<Napi::Boolean>().Value();
+                }
+
                 if (options.Has("onLoadProgress")) {
                     auto onLoadProgressJSCallback = options.Get("onLoadProgress").As<Napi::Function>();
                     if (onLoadProgressJSCallback.IsFunction()) {
@@ -1483,6 +1487,11 @@ class AddonContextSampleTokenWorker : public Napi::AsyncWorker {
             llama_token new_token_id = 0;
 
             // Select the best prediction.
+            if (llama_get_logits(ctx->ctx) == nullptr) {
+                SetError("This model does not support token generation");
+                return;
+            }
+
             auto logits = llama_get_logits_ith(ctx->ctx, batchLogitIndex);
             auto n_vocab = llama_n_vocab(ctx->model->model);
 
@@ -1701,13 +1710,15 @@ static void addonLlamaCppLogCallback(ggml_log_level level, const char* text, voi
         }
     }
 
-    if (level == 2) {
-        fputs(text, stderr);
-        fflush(stderr);
-    } else {
-        fputs(text, stdout);
-        fflush(stdout);
-    }
+    if (text != nullptr) {
+        if (level == 2) {
+            fputs(text, stderr);
+            fflush(stderr);
+        } else {
+            fputs(text, stdout);
+            fflush(stdout);
+        }
+    }    
 }
 
 Napi::Value setLogger(const Napi::CallbackInfo& info) {

package/llama/binariesGithubRelease.json

@@ -1,3 +1,3 @@
 {
-    "release": "b2717"
+    "release": "b2861"
 }

package/llama/grammars/README.md

@@ -51,7 +51,7 @@ single-line ::= [^\n]+ "\n"`
 
 ## Sequences and Alternatives
 
-The order of symbols in a sequence matter. For example, in `"1. " move " " move "\n"`, the `"1. "` must come before the first `move`, etc.
+The order of symbols in a sequence matters. For example, in `"1. " move " " move "\n"`, the `"1. "` must come before the first `move`, etc.
 
 Alternatives, denoted by `|`, give different sequences that are acceptable. For example, in `move ::= pawn | nonpawn | castle`, `move` can be a `pawn` move, a `nonpawn` move, or a `castle`.
 

package/llama/llama.cpp.info.json

@@ -1,4 +1,4 @@
 {
-    "tag": "b2717",
+    "tag": "b2861",
     "llamaCppGithubRepo": "ggerganov/llama.cpp"
 }

package/llamaBins/linux-arm64/_nlcBuildMetadata.json

@@ -1 +1 @@
-{"buildOptions":{"customCmakeOptions":{},"progressLogs":true,"platform":"linux","platformInfo":{"name":"Ubuntu","version":"22.04"},"arch":"arm64","gpu":false,"llamaCpp":{"repo":"ggerganov/llama.cpp","release":"b2717"}}}
+{"buildOptions":{"customCmakeOptions":{},"progressLogs":true,"platform":"linux","platformInfo":{"name":"Ubuntu","version":"22.04"},"arch":"arm64","gpu":false,"llamaCpp":{"repo":"ggerganov/llama.cpp","release":"b2861"}}}

package/llamaBins/linux-armv7l/_nlcBuildMetadata.json

@@ -1 +1 @@
-{"buildOptions":{"customCmakeOptions":{},"progressLogs":true,"platform":"linux","platformInfo":{"name":"Ubuntu","version":"22.04"},"arch":"armv7l","gpu":false,"llamaCpp":{"repo":"ggerganov/llama.cpp","release":"b2717"}}}
+{"buildOptions":{"customCmakeOptions":{},"progressLogs":true,"platform":"linux","platformInfo":{"name":"Ubuntu","version":"22.04"},"arch":"armv7l","gpu":false,"llamaCpp":{"repo":"ggerganov/llama.cpp","release":"b2861"}}}

package/llamaBins/linux-x64/_nlcBuildMetadata.json

@@ -1 +1 @@
-{"buildOptions":{"customCmakeOptions":{},"progressLogs":true,"platform":"linux","platformInfo":{"name":"Ubuntu","version":"22.04"},"arch":"x64","gpu":false,"llamaCpp":{"repo":"ggerganov/llama.cpp","release":"b2717"}}}
+{"buildOptions":{"customCmakeOptions":{},"progressLogs":true,"platform":"linux","platformInfo":{"name":"Ubuntu","version":"22.04"},"arch":"x64","gpu":false,"llamaCpp":{"repo":"ggerganov/llama.cpp","release":"b2861"}}}

package/llamaBins/linux-x64-cuda/_nlcBuildMetadata.json

@@ -1 +1 @@
-{"buildOptions":{"customCmakeOptions":{},"progressLogs":true,"platform":"linux","platformInfo":{"name":"Ubuntu","version":"22.04"},"arch":"x64","gpu":"cuda","llamaCpp":{"repo":"ggerganov/llama.cpp","release":"b2717"}}}
+{"buildOptions":{"customCmakeOptions":{},"progressLogs":true,"platform":"linux","platformInfo":{"name":"Ubuntu","version":"22.04"},"arch":"x64","gpu":"cuda","llamaCpp":{"repo":"ggerganov/llama.cpp","release":"b2861"}}}

package/llamaBins/linux-x64-vulkan/_nlcBuildMetadata.json

@@ -1 +1 @@
-{"buildOptions":{"customCmakeOptions":{},"progressLogs":true,"platform":"linux","platformInfo":{"name":"Ubuntu","version":"22.04"},"arch":"x64","gpu":"vulkan","llamaCpp":{"repo":"ggerganov/llama.cpp","release":"b2717"}}}
+{"buildOptions":{"customCmakeOptions":{},"progressLogs":true,"platform":"linux","platformInfo":{"name":"Ubuntu","version":"22.04"},"arch":"x64","gpu":"vulkan","llamaCpp":{"repo":"ggerganov/llama.cpp","release":"b2861"}}}

package/llamaBins/mac-arm64-metal/_nlcBuildMetadata.json

@@ -1 +1 @@
-{"buildOptions":{"customCmakeOptions":{},"progressLogs":true,"platform":"mac","platformInfo":{"name":"macOS","version":"21.6.0"},"arch":"arm64","gpu":"metal","llamaCpp":{"repo":"ggerganov/llama.cpp","release":"b2717"}}}
+{"buildOptions":{"customCmakeOptions":{},"progressLogs":true,"platform":"mac","platformInfo":{"name":"macOS","version":"21.6.0"},"arch":"arm64","gpu":"metal","llamaCpp":{"repo":"ggerganov/llama.cpp","release":"b2861"}}}

package/llamaBins/mac-x64/_nlcBuildMetadata.json

@@ -1 +1 @@
-{"buildOptions":{"customCmakeOptions":{},"progressLogs":true,"platform":"mac","platformInfo":{"name":"macOS","version":"21.6.0"},"arch":"x64","gpu":false,"llamaCpp":{"repo":"ggerganov/llama.cpp","release":"b2717"}}}
+{"buildOptions":{"customCmakeOptions":{},"progressLogs":true,"platform":"mac","platformInfo":{"name":"macOS","version":"21.6.0"},"arch":"x64","gpu":false,"llamaCpp":{"repo":"ggerganov/llama.cpp","release":"b2861"}}}

package/llamaBins/win-arm64/_nlcBuildMetadata.json

@@ -1 +1 @@
-{"buildOptions":{"customCmakeOptions":{},"progressLogs":true,"platform":"win","platformInfo":{"name":"Windows","version":"10.0.20348"},"arch":"arm64","gpu":false,"llamaCpp":{"repo":"ggerganov/llama.cpp","release":"b2717"}}}
+{"buildOptions":{"customCmakeOptions":{},"progressLogs":true,"platform":"win","platformInfo":{"name":"Windows","version":"10.0.20348"},"arch":"arm64","gpu":false,"llamaCpp":{"repo":"ggerganov/llama.cpp","release":"b2861"}}}

package/llamaBins/win-x64/_nlcBuildMetadata.json

@@ -1 +1 @@
-{"buildOptions":{"customCmakeOptions":{},"progressLogs":true,"platform":"win","platformInfo":{"name":"Windows","version":"10.0.20348"},"arch":"x64","gpu":false,"llamaCpp":{"repo":"ggerganov/llama.cpp","release":"b2717"}}}
+{"buildOptions":{"customCmakeOptions":{},"progressLogs":true,"platform":"win","platformInfo":{"name":"Windows","version":"10.0.20348"},"arch":"x64","gpu":false,"llamaCpp":{"repo":"ggerganov/llama.cpp","release":"b2861"}}}

package/llamaBins/win-x64-cuda/_nlcBuildMetadata.json

@@ -1 +1 @@
-{"buildOptions":{"customCmakeOptions":{},"progressLogs":true,"platform":"win","platformInfo":{"name":"Windows","version":"10.0.20348"},"arch":"x64","gpu":"cuda","llamaCpp":{"repo":"ggerganov/llama.cpp","release":"b2717"}}}
+{"buildOptions":{"customCmakeOptions":{},"progressLogs":true,"platform":"win","platformInfo":{"name":"Windows","version":"10.0.20348"},"arch":"x64","gpu":"cuda","llamaCpp":{"repo":"ggerganov/llama.cpp","release":"b2861"}}}

package/llamaBins/win-x64-vulkan/_nlcBuildMetadata.json

@@ -1 +1 @@
-{"buildOptions":{"customCmakeOptions":{},"progressLogs":true,"platform":"win","platformInfo":{"name":"Windows","version":"10.0.20348"},"arch":"x64","gpu":"vulkan","llamaCpp":{"repo":"ggerganov/llama.cpp","release":"b2717"}}}
+{"buildOptions":{"customCmakeOptions":{},"progressLogs":true,"platform":"win","platformInfo":{"name":"Windows","version":"10.0.20348"},"arch":"x64","gpu":"vulkan","llamaCpp":{"repo":"ggerganov/llama.cpp","release":"b2861"}}}