node-llama-cpp 2.6.2 → 2.7.0

package/dist/utils/gbnfJson/types.js

@@ -0,0 +1,21 @@
+export function isGbnfJsonConstSchema(schema) {
+    return schema.const !== undefined;
+}
+export function isGbnfJsonEnumSchema(schema) {
+    return schema.enum != null;
+}
+export function isGbnfJsonOneOfSchema(schema) {
+    return schema.oneOf != null;
+}
+export function isGbnfJsonObjectSchema(schema) {
+    return schema.type === "object";
+}
+export function isGbnfJsonArraySchema(schema) {
+    return schema.type === "array";
+}
+export function isGbnfJsonBasicSchemaIncludesType(schema, type) {
+    if (schema.type instanceof Array)
+        return schema.type.includes(type);
+    return schema.type === type;
+}
+//# sourceMappingURL=types.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/utils/gbnfJson/types.ts"],"names":[],"mappings":"AAqEA,MAAM,UAAU,qBAAqB,CAAC,MAAsB;IACxD,OAAQ,MAA8B,CAAC,KAAK,KAAK,SAAS,CAAC;AAC/D,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,MAAsB;IACvD,OAAQ,MAA6B,CAAC,IAAI,IAAI,IAAI,CAAC;AACvD,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,MAAsB;IACxD,OAAQ,MAA8B,CAAC,KAAK,IAAI,IAAI,CAAC;AACzD,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,MAAsB;IACzD,OAAQ,MAA+B,CAAC,IAAI,KAAK,QAAQ,CAAC;AAC9D,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,MAAsB;IACxD,OAAQ,MAA8B,CAAC,IAAI,KAAK,OAAO,CAAC;AAC5D,CAAC;AAED,MAAM,UAAU,iCAAiC,CAC7C,MAA2B,EAAE,IAAO;IAEpC,IAAI,MAAM,CAAC,IAAI,YAAY,KAAK;QAC5B,OAAO,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAEtC,OAAO,MAAM,CAAC,IAAI,KAAK,IAAI,CAAC;AAChC,CAAC"}

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

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

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

@@ -0,0 +1,48 @@
+import { GbnfOr } from "../terminals/GbnfOr.js";
+import { GbnfObjectMap } from "../terminals/GbnfObjectMap.js";
+import { GbnfStringValue } from "../terminals/GbnfStringValue.js";
+import { GbnfArray } from "../terminals/GbnfArray.js";
+import { GbnfString } from "../terminals/GbnfString.js";
+import { GbnfNumber } from "../terminals/GbnfNumber.js";
+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) {
+    if (isGbnfJsonOneOfSchema(schema)) {
+        const values = schema.oneOf
+            .map((altSchema) => getGbnfJsonTerminalForGbnfJsonSchema(altSchema, grammarGenerator));
+        return new GbnfOr(values);
+    }
+    else if (isGbnfJsonConstSchema(schema)) {
+        return getGbnfJsonTerminalForLiteral(schema.const);
+    }
+    else if (isGbnfJsonEnumSchema(schema)) {
+        return new GbnfOr(schema.enum.map((item) => getGbnfJsonTerminalForLiteral(item)));
+    }
+    else if (isGbnfJsonObjectSchema(schema)) {
+        return new GbnfObjectMap(Object.entries(schema.properties).map(([propName, propSchema]) => {
+            return {
+                required: true,
+                key: new GbnfStringValue(propName),
+                value: getGbnfJsonTerminalForGbnfJsonSchema(propSchema, grammarGenerator)
+            };
+        }));
+    }
+    else if (isGbnfJsonArraySchema(schema)) {
+        return new GbnfArray(getGbnfJsonTerminalForGbnfJsonSchema(schema.items, grammarGenerator));
+    }
+    const terminals = [];
+    if (isGbnfJsonBasicSchemaIncludesType(schema, "string"))
+        terminals.push(new GbnfString());
+    if (isGbnfJsonBasicSchemaIncludesType(schema, "number"))
+        terminals.push(new GbnfNumber({ allowFractional: true }));
+    if (isGbnfJsonBasicSchemaIncludesType(schema, "integer"))
+        terminals.push(new GbnfNumber({ allowFractional: false }));
+    if (isGbnfJsonBasicSchemaIncludesType(schema, "boolean"))
+        terminals.push(new GbnfBoolean());
+    if (isGbnfJsonBasicSchemaIncludesType(schema, "null"))
+        terminals.push(new GbnfNull());
+    return new GbnfOr(terminals);
+}
+//# sourceMappingURL=getGbnfJsonTerminalForGbnfJsonSchema.js.map

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

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

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

@@ -0,0 +1,5 @@
+import { GbnfNull } from "../terminals/GbnfNull.js";
+import { GbnfBooleanValue } from "../terminals/GbnfBooleanValue.js";
+import { GbnfNumberValue } from "../terminals/GbnfNumberValue.js";
+import { GbnfStringValue } from "../terminals/GbnfStringValue.js";
+export declare function getGbnfJsonTerminalForLiteral(literal: string | number | boolean | null): GbnfStringValue | GbnfNull | GbnfBooleanValue | GbnfNumberValue;

package/dist/utils/gbnfJson/utils/getGbnfJsonTerminalForLiteral.js

@@ -0,0 +1,16 @@
+import { GbnfNull } from "../terminals/GbnfNull.js";
+import { GbnfBooleanValue } from "../terminals/GbnfBooleanValue.js";
+import { GbnfNumberValue } from "../terminals/GbnfNumberValue.js";
+import { GbnfStringValue } from "../terminals/GbnfStringValue.js";
+export function getGbnfJsonTerminalForLiteral(literal) {
+    if (literal === null)
+        return new GbnfNull();
+    if (typeof literal === "boolean")
+        return new GbnfBooleanValue(literal);
+    if (typeof literal === "number")
+        return new GbnfNumberValue(literal);
+    if (typeof literal === "string")
+        return new GbnfStringValue(literal);
+    throw new Error(`Unrecognized literal type: ${typeof literal}`);
+}
+//# sourceMappingURL=getGbnfJsonTerminalForLiteral.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"getGbnfJsonTerminalForLiteral.js","sourceRoot":"","sources":["../../../../src/utils/gbnfJson/utils/getGbnfJsonTerminalForLiteral.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAC,gBAAgB,EAAC,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAC,eAAe,EAAC,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAC,eAAe,EAAC,MAAM,iCAAiC,CAAC;AAGhE,MAAM,UAAU,6BAA6B,CAAC,OAAyC;IACnF,IAAI,OAAO,KAAK,IAAI;QAChB,OAAO,IAAI,QAAQ,EAAE,CAAC;IAE1B,IAAI,OAAO,OAAO,KAAK,SAAS;QAC5B,OAAO,IAAI,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAEzC,IAAI,OAAO,OAAO,KAAK,QAAQ;QAC3B,OAAO,IAAI,eAAe,CAAC,OAAO,CAAC,CAAC;IAExC,IAAI,OAAO,OAAO,KAAK,QAAQ;QAC3B,OAAO,IAAI,eAAe,CAAC,OAAO,CAAC,CAAC;IAExC,MAAM,IAAI,KAAK,CAAC,8BAA8B,OAAO,OAAO,EAAE,CAAC,CAAC;AACpE,CAAC"}

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

@@ -0,0 +1,7 @@
+import { GbnfJsonSchema, GbnfJsonSchemaToType } from "../types.js";
+export declare function validateObjectAgainstGbnfSchema<T extends GbnfJsonSchema>(object: any, schema: T): object is GbnfJsonSchemaToType<T>;
+export declare class LlamaJsonSchemaValidationError extends Error {
+    readonly object: any;
+    readonly schema: GbnfJsonSchema;
+    constructor(message: string, object: any, schema: GbnfJsonSchema);
+}

package/dist/utils/gbnfJson/utils/validateObjectAgainstGbnfSchema.js

@@ -0,0 +1,122 @@
+import { isGbnfJsonArraySchema, isGbnfJsonConstSchema, isGbnfJsonEnumSchema, isGbnfJsonObjectSchema, isGbnfJsonOneOfSchema } from "../types.js";
+export function validateObjectAgainstGbnfSchema(object, schema) {
+    try {
+        return validateObjectWithGbnfSchema(object, schema);
+    }
+    catch (err) {
+        if (err instanceof TechnicalValidationError)
+            throw new LlamaJsonSchemaValidationError(err.message, object, schema);
+        throw err;
+    }
+}
+export class LlamaJsonSchemaValidationError extends Error {
+    object;
+    schema;
+    constructor(message, object, schema) {
+        super(message);
+        this.object = object;
+        this.schema = schema;
+    }
+}
+class TechnicalValidationError extends Error {
+    constructor(message) {
+        super(message);
+    }
+}
+function validateObjectWithGbnfSchema(object, schema) {
+    if (isGbnfJsonArraySchema(schema))
+        return validateArray(object, schema);
+    else if (isGbnfJsonObjectSchema(schema))
+        return validateObject(object, schema);
+    else if (isGbnfJsonOneOfSchema(schema))
+        return validateOneOf(object, schema);
+    else if (isGbnfJsonEnumSchema(schema))
+        return validateEnum(object, schema);
+    else if (isGbnfJsonConstSchema(schema))
+        return validateConst(object, schema);
+    if (schema.type instanceof Array) {
+        for (const type of schema.type) {
+            if (validateImmutableType(object, type))
+                return true;
+        }
+        throw new Error(`Expected one of ${schema.type.join(", ")} but got "${typeof object}"`);
+    }
+    if (validateImmutableType(object, schema.type))
+        return true;
+    throw new Error(`Expected "${schema.type}" but got "${typeof object}"`);
+}
+function validateArray(object, schema) {
+    if (!(object instanceof Array))
+        throw new TechnicalValidationError(`Expected an array but got "${typeof object}"`);
+    let res = true;
+    for (const item of object)
+        res &&= validateObjectWithGbnfSchema(item, schema.items);
+    return res;
+}
+function validateObject(object, schema) {
+    if (typeof object !== "object" || object === null)
+        throw new TechnicalValidationError(`Expected an object but got "${typeof object}"`);
+    const objectKeys = Object.keys(object);
+    const objectKeysSet = new Set(objectKeys);
+    const schemaKeys = Object.keys(schema.properties);
+    const schemaKeysSet = new Set(schemaKeys);
+    const extraKeys = objectKeys.filter((key) => !schemaKeysSet.has(key));
+    if (extraKeys.length > 0)
+        throw new TechnicalValidationError(`Unexpected keys: ${extraKeys.map((key) => JSON.stringify(key)).join(", ")}`);
+    const missingKeys = schemaKeys.filter((key) => !objectKeysSet.has(key));
+    if (missingKeys.length > 0)
+        throw new TechnicalValidationError(`Missing keys: ${extraKeys.map((key) => JSON.stringify(key)).join(", ")}`);
+    let res = true;
+    for (const key of schemaKeys)
+        res &&= validateObjectWithGbnfSchema(object[key], schema.properties[key]);
+    return res;
+}
+function validateOneOf(object, schema) {
+    for (const item of schema.oneOf) {
+        try {
+            return validateObjectWithGbnfSchema(object, item);
+        }
+        catch (err) {
+            if (err instanceof TechnicalValidationError)
+                continue;
+            throw err;
+        }
+    }
+    throw new TechnicalValidationError(`Expected one of ${schema.oneOf.length} schemas but got ${JSON.stringify(object)}`);
+}
+function validateEnum(object, schema) {
+    for (const value of schema.enum) {
+        if (object === value)
+            return true;
+    }
+    throw new TechnicalValidationError(`Expected one of ${schema.enum.map((item) => JSON.stringify(item)).join(", ")} but got ${JSON.stringify(object)}`);
+}
+function validateConst(object, schema) {
+    if (object === schema.const)
+        return true;
+    throw new TechnicalValidationError(`Expected ${JSON.stringify(schema.const)} but got ${JSON.stringify(object)}`);
+}
+function validateImmutableType(value, type) {
+    if (type === "string") {
+        return typeof value === "string";
+    }
+    else if (type === "number") {
+        return typeof value === "number";
+    }
+    else if (type === "integer") {
+        if (typeof value !== "number")
+            return false;
+        return value % 1 === 0;
+    }
+    else if (type === "boolean") {
+        return typeof value === "boolean";
+    }
+    else if (type === "null") {
+        return value === null;
+    }
+    else {
+        void (type);
+    }
+    throw new TechnicalValidationError(`Unknown immutable type ${JSON.stringify(type)}`);
+}
+//# sourceMappingURL=validateObjectAgainstGbnfSchema.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"validateObjectAgainstGbnfSchema.js","sourceRoot":"","sources":["../../../../src/utils/gbnfJson/utils/validateObjectAgainstGbnfSchema.ts"],"names":[],"mappings":"AAAA,OAAO,EAEgD,qBAAqB,EAAE,qBAAqB,EAAE,oBAAoB,EACrH,sBAAsB,EAAE,qBAAqB,EAChD,MAAM,aAAa,CAAC;AAGrB,MAAM,UAAU,+BAA+B,CAA2B,MAAW,EAAE,MAAS;IAC5F,IAAI;QACA,OAAO,4BAA4B,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;KACvD;IAAC,OAAO,GAAG,EAAE;QACV,IAAI,GAAG,YAAY,wBAAwB;YACvC,MAAM,IAAI,8BAA8B,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QAE1E,MAAM,GAAG,CAAC;KACb;AACL,CAAC;AAED,MAAM,OAAO,8BAA+B,SAAQ,KAAK;IACrC,MAAM,CAAM;IACZ,MAAM,CAAiB;IAEvC,YAAmB,OAAe,EAAE,MAAW,EAAE,MAAsB;QACnE,KAAK,CAAC,OAAO,CAAC,CAAC;QAEf,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACzB,CAAC;CACJ;AAED,MAAM,wBAAyB,SAAQ,KAAK;IACxC,YAAmB,OAAe;QAC9B,KAAK,CAAC,OAAO,CAAC,CAAC;IACnB,CAAC;CACJ;AAED,SAAS,4BAA4B,CAA2B,MAAW,EAAE,MAAS;IAClF,IAAI,qBAAqB,CAAC,MAAM,CAAC;QAC7B,OAAO,aAAa,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;SACpC,IAAI,sBAAsB,CAAC,MAAM,CAAC;QACnC,OAAO,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;SACrC,IAAI,qBAAqB,CAAC,MAAM,CAAC;QAClC,OAAO,aAAa,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;SACpC,IAAI,oBAAoB,CAAC,MAAM,CAAC;QACjC,OAAO,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;SACnC,IAAI,qBAAqB,CAAC,MAAM,CAAC;QAClC,OAAO,aAAa,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEzC,IAAI,MAAM,CAAC,IAAI,YAAY,KAAK,EAAE;QAC9B,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,EAAE;YAC5B,IAAI,qBAAqB,CAAC,MAAM,EAAE,IAAI,CAAC;gBACnC,OAAO,IAAI,CAAC;SACnB;QAED,MAAM,IAAI,KAAK,CAAC,mBAAmB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,OAAO,MAAM,GAAG,CAAC,CAAC;KAC3F;IAED,IAAI,qBAAqB,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC;QAC1C,OAAO,IAAI,CAAC;IAEhB,MAAM,IAAI,KAAK,CAAC,aAAa,MAAM,CAAC,IAAI,cAAc,OAAO,MAAM,GAAG,CAAC,CAAC;AAC5E,CAAC;AAED,SAAS,aAAa,CAAgC,MAAW,EAAE,MAAS;IACxE,IAAI,CAAC,CAAC,MAAM,YAAY,KAAK,CAAC;QAC1B,MAAM,IAAI,wBAAwB,CAAC,8BAA8B,OAAO,MAAM,GAAG,CAAC,CAAC;IAEvF,IAAI,GAAG,GAAG,IAAI,CAAC;IACf,KAAK,MAAM,IAAI,IAAI,MAAM;QACrB,GAAG,KAAK,4BAA4B,CAAC,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAE7D,OAAO,GAAG,CAAC;AACf,CAAC;AAED,SAAS,cAAc,CAAiC,MAAW,EAAE,MAAS;IAC1E,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI;QAC7C,MAAM,IAAI,wBAAwB,CAAC,+BAA+B,OAAO,MAAM,GAAG,CAAC,CAAC;IAExF,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACvC,MAAM,aAAa,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC;IAC1C,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IAClD,MAAM,aAAa,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC;IAE1C,MAAM,SAAS,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;IACtE,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC;QACpB,MAAM,IAAI,wBAAwB,CAAC,oBAAoB,SAAS,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAErH,MAAM,WAAW,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;IACxE,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC;QACtB,MAAM,IAAI,wBAAwB,CAAC,iBAAiB,SAAS,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAElH,IAAI,GAAG,GAAG,IAAI,CAAC;IACf,KAAK,MAAM,GAAG,IAAI,UAAU;QACxB,GAAG,KAAK,4BAA4B,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;IAE9E,OAAO,GAAG,CAAC;AACf,CAAC;AAED,SAAS,aAAa,CAAgC,MAAW,EAAE,MAAS;IACxE,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK,EAAE;QAC7B,IAAI;YACA,OAAO,4BAA4B,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;SACrD;QAAC,OAAO,GAAG,EAAE;YACV,IAAI,GAAG,YAAY,wBAAwB;gBACvC,SAAS;YAEb,MAAM,GAAG,CAAC;SACb;KACJ;IAED,MAAM,IAAI,wBAAwB,CAAC,mBAAmB,MAAM,CAAC,KAAK,CAAC,MAAM,oBAAoB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;AAC3H,CAAC;AAED,SAAS,YAAY,CAA+B,MAAW,EAAE,MAAS;IACtE,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,IAAI,EAAE;QAC7B,IAAI,MAAM,KAAK,KAAK;YAChB,OAAO,IAAI,CAAC;KACnB;IAED,MAAM,IAAI,wBAAwB,CAAC,mBAC/B,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAC7D,YAAY,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;AAC1C,CAAC;AAED,SAAS,aAAa,CAAgC,MAAW,EAAE,MAAS;IACxE,IAAI,MAAM,KAAK,MAAM,CAAC,KAAK;QACvB,OAAO,IAAI,CAAC;IAEhB,MAAM,IAAI,wBAAwB,CAAC,YAAY,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;AACrH,CAAC;AAED,SAAS,qBAAqB,CAAC,KAAU,EAAE,IAAiC;IACxE,IAAI,IAAI,KAAK,QAAQ,EAAE;QACnB,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC;KACpC;SAAM,IAAI,IAAI,KAAK,QAAQ,EAAE;QAC1B,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC;KACpC;SAAM,IAAI,IAAI,KAAK,SAAS,EAAE;QAC3B,IAAI,OAAO,KAAK,KAAK,QAAQ;YACzB,OAAO,KAAK,CAAC;QACjB,OAAO,KAAK,GAAG,CAAC,KAAK,CAAC,CAAC;KAC1B;SAAM,IAAI,IAAI,KAAK,SAAS,EAAE;QAC3B,OAAO,OAAO,KAAK,KAAK,SAAS,CAAC;KACrC;SAAM,IAAI,IAAI,KAAK,MAAM,EAAE;QACxB,OAAO,KAAK,KAAK,IAAI,CAAC;KACzB;SAAM;QACH,KAAK,CAAC,IAAoB,CAAC,CAAC;KAC/B;IAED,MAAM,IAAI,wBAAwB,CAAC,0BAA0B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AACzF,CAAC"}

package/dist/utils/getGbnfGrammarForGbnfJsonSchema.d.ts

@@ -0,0 +1,2 @@
+import { GbnfJsonSchema } from "./gbnfJson/types.js";
+export declare function getGbnfGrammarForGbnfJsonSchema(schema: GbnfJsonSchema): string;

package/dist/utils/getGbnfGrammarForGbnfJsonSchema.js

@@ -0,0 +1,23 @@
+import { getGbnfJsonTerminalForGbnfJsonSchema } from "./gbnfJson/utils/getGbnfJsonTerminalForGbnfJsonSchema.js";
+import { GbnfGrammarGenerator } from "./gbnfJson/GbnfGrammarGenerator.js";
+export function getGbnfGrammarForGbnfJsonSchema(schema) {
+    const grammarGenerator = new GbnfGrammarGenerator();
+    const rootTerminal = getGbnfJsonTerminalForGbnfJsonSchema(schema, grammarGenerator);
+    const rootGrammar = rootTerminal.getGrammar(grammarGenerator);
+    const rules = [{
+            name: "root",
+            grammar: rootGrammar + " [\\n]".repeat(4) + " [\\n]*"
+        }];
+    for (const [ruleName, grammar] of grammarGenerator.rules.entries()) {
+        if (grammar == null)
+            continue;
+        rules.push({
+            name: ruleName,
+            grammar
+        });
+    }
+    const ruleStrings = rules.map((rule) => rule.name + " ::= " + rule.grammar);
+    const gbnf = ruleStrings.join("\n");
+    return gbnf;
+}
+//# sourceMappingURL=getGbnfGrammarForGbnfJsonSchema.js.map

package/dist/utils/getGbnfGrammarForGbnfJsonSchema.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getGbnfGrammarForGbnfJsonSchema.js","sourceRoot":"","sources":["../../src/utils/getGbnfGrammarForGbnfJsonSchema.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,oCAAoC,EAAC,MAAM,0DAA0D,CAAC;AAC9G,OAAO,EAAC,oBAAoB,EAAC,MAAM,oCAAoC,CAAC;AAGxE,MAAM,UAAU,+BAA+B,CAAC,MAAsB;IAClE,MAAM,gBAAgB,GAAG,IAAI,oBAAoB,EAAE,CAAC;IACpD,MAAM,YAAY,GAAG,oCAAoC,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IACpF,MAAM,WAAW,GAAG,YAAY,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;IAE9D,MAAM,KAAK,GAAsC,CAAC;YAC9C,IAAI,EAAE,MAAM;YACZ,OAAO,EAAE,WAAW,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,SAAS;SACxD,CAAC,CAAC;IAEH,KAAK,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,gBAAgB,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE;QAChE,IAAI,OAAO,IAAI,IAAI;YACf,SAAS;QAEb,KAAK,CAAC,IAAI,CAAC;YACP,IAAI,EAAE,QAAQ;YACd,OAAO;SACV,CAAC,CAAC;KACN;IAED,MAAM,WAAW,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,GAAG,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC;IAC5E,MAAM,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEpC,OAAO,IAAI,CAAC;AAChB,CAAC"}

package/llama/CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.12)
 project ("llama-addon")
 
 if (MSVC)
-  add_compile_options(/EHsc)
+  # add_compile_options(/EHsc)
 else()
   add_compile_options(-fexceptions)
 endif()

package/llama/binariesGithubRelease.json

@@ -1,3 +1,3 @@
 {
-    "release": "b1357"
+    "release": "b1365"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "node-llama-cpp",
-  "version": "2.6.2",
-  "description": "Run AI models locally on your machine with node.js bindings for llama.cpp",
+  "version": "2.7.0",
+  "description": "Run AI models locally on your machine with node.js bindings for llama.cpp. Force a JSON schema on the model output on the generation level",
   "main": "dist/index.js",
   "type": "module",
   "types": "./dist/index.d.ts",
@@ -47,7 +47,9 @@
     "prewatch": "rimraf ./dist ./tsconfig.tsbuildinfo",
     "watch": "tsc --build tsconfig.json --watch --force",
     "cmake-js-llama": "cd llama && cmake-js",
-    "test": "npm run test:typescript && npm run lint:eslint",
+    "test": "npm run test:typescript && npm run lint:eslint && npm run test:standalone",
+    "test:standalone": "vitest run ./test",
+    "test:standalone:interactive": "vitest watch ./test",
     "test:typescript": "tsc --build tsconfig.json --dry --force",
     "lint": "npm run lint:eslint",
     "lint:eslint": "eslint --ext .js --ext .ts .",
@@ -79,9 +81,11 @@
     "cuda",
     "grammar",
     "json-grammar",
+    "json-schema-grammar",
     "temperature",
     "topK",
     "topP",
+    "json-schema",
     "raspberry-pi",
     "self-hosted",
     "local",
@@ -101,7 +105,7 @@
     "@types/cli-progress": "^3.11.0",
     "@types/cross-spawn": "^6.0.2",
     "@types/fs-extra": "^11.0.1",
-    "@types/node": "^20.4.9",
+    "@types/node": "^20.8.4",
     "@types/uuid": "^9.0.2",
     "@types/which": "^3.0.0",
     "@types/yargs": "^17.0.24",
@@ -121,6 +125,7 @@
     "typedoc-vitepress-theme": "^1.0.0-next.3",
     "typescript": "^5.1.6",
     "vitepress": "^1.0.0-rc.20",
+    "vitest": "^0.34.6",
     "zx": "^7.2.3"
   },
   "dependencies": {