node-llama-cpp 3.0.0-beta.1 → 3.0.0-beta.11

package/dist/utils/appendUserMessageToChatHistory.js

@@ -0,0 +1,18 @@
+export function appendUserMessageToChatHistory(chatHistory, message) {
+    const newChatHistory = chatHistory.slice();
+    if (newChatHistory.length > 0 && newChatHistory[newChatHistory.length - 1].type === "user") {
+        const lastUserMessage = newChatHistory[newChatHistory.length - 1];
+        newChatHistory[newChatHistory.length - 1] = {
+            ...lastUserMessage,
+            text: [lastUserMessage.text, message].join("\n\n")
+        };
+    }
+    else {
+        newChatHistory.push({
+            type: "user",
+            text: message
+        });
+    }
+    return newChatHistory;
+}
+//# sourceMappingURL=appendUserMessageToChatHistory.js.map

package/dist/utils/appendUserMessageToChatHistory.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"appendUserMessageToChatHistory.js","sourceRoot":"","sources":["../../src/utils/appendUserMessageToChatHistory.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,8BAA8B,CAAC,WAAuC,EAAE,OAAe;IACnG,MAAM,cAAc,GAAG,WAAW,CAAC,KAAK,EAAE,CAAC;IAE3C,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,IAAI,cAAc,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,EAAE;QACxF,MAAM,eAAe,GAAG,cAAc,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,CAAoB,CAAC;QAErF,cAAc,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG;YACxC,GAAG,eAAe;YAClB,IAAI,EAAE,CAAC,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC;SACrD,CAAC;KACL;SAAM;QACH,cAAc,CAAC,IAAI,CAAC;YAChB,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,OAAO;SAChB,CAAC,CAAC;KACN;IAED,OAAO,cAAc,CAAC;AAC1B,CAAC"}

package/dist/utils/cmake.js

@@ -6,6 +6,7 @@ import { chmodr } from "chmodrp";
 import { defaultXpacksCacheDirectory, defaultXpacksStoreDirectory, llamaDirectory, localXpacksCacheDirectory, localXpacksStoreDirectory, xpackDirectory, xpmVersion } from "../config.js";
 import { spawnCommand } from "./spawnCommand.js";
 import withStatusLogs from "./withStatusLogs.js";
+import { withLockfile } from "./withLockfile.js";
 export async function hasBuiltinCmake() {
     try {
         const resolvedPath = await which("cmake");
@@ -46,14 +47,14 @@ export async function downloadCmakeIfNeeded(wrapWithStatusLogs = false) {
     }
     catch (err) { }
     if (!wrapWithStatusLogs)
-        await downloadCmake();
+        await downloadCmake({ progressLogs: wrapWithStatusLogs });
     else
         await withStatusLogs({
             loading: chalk.blue("Downloading cmake"),
             success: chalk.blue("Downloaded cmake"),
             fail: chalk.blue("Failed to download cmake")
         }, async () => {
-            await downloadCmake();
+            await downloadCmake({ progressLogs: wrapWithStatusLogs });
         });
 }
 export async function clearLocalCmake() {
@@ -74,15 +75,19 @@ export async function fixXpackPermissions() {
     }
     catch (err) { }
 }
-async function downloadCmake() {
-    const xpmEnv = {
-        ...process.env,
-        XPACKS_STORE_FOLDER: defaultXpacksStoreDirectory,
-        XPACKS_CACHE_FOLDER: defaultXpacksCacheDirectory
-    };
-    await spawnCommand("npm", ["exec", "--yes", "--", `xpm@${xpmVersion}`, "install", "@xpack-dev-tools/cmake@latest", "--no-save"], xpackDirectory, xpmEnv);
-    await fs.remove(localXpacksCacheDirectory);
-    await fixXpackPermissions();
+async function downloadCmake({ progressLogs = true } = {}) {
+    await withLockfile({
+        resourcePath: path.join(xpackDirectory, "cmakeInstall")
+    }, async () => {
+        const xpmEnv = {
+            ...process.env,
+            XPACKS_STORE_FOLDER: defaultXpacksStoreDirectory,
+            XPACKS_CACHE_FOLDER: defaultXpacksCacheDirectory
+        };
+        await spawnCommand("npm", ["exec", "--yes", "--", `xpm@${xpmVersion}`, "install", "@xpack-dev-tools/cmake@latest", "--no-save"], xpackDirectory, xpmEnv, progressLogs);
+        await fs.remove(localXpacksCacheDirectory);
+        await fixXpackPermissions();
+    });
 }
 async function getBinFromWindowCmd(cmdFilePath, binName) {
     const fileContent = await fs.readFile(cmdFilePath, "utf8");

package/dist/utils/cmake.js.map

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

package/dist/utils/compareTokens.d.ts

@@ -0,0 +1,2 @@
+import { Token } from "../types.js";
+export declare function compareTokens(token1: Token, token2: Token): boolean;

package/dist/utils/compareTokens.js

@@ -0,0 +1,4 @@
+export function compareTokens(token1, token2) {
+    return token1 === token2;
+}
+//# sourceMappingURL=compareTokens.js.map

package/dist/utils/compareTokens.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"compareTokens.js","sourceRoot":"","sources":["../../src/utils/compareTokens.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,aAAa,CAAC,MAAa,EAAE,MAAa;IACtD,OAAO,MAAM,KAAK,MAAM,CAAC;AAC7B,CAAC"}

package/dist/utils/findCharacterRemovalCountToFitChatHistoryInContext.d.ts

@@ -0,0 +1,18 @@
+import { ChatHistoryItem, Tokenizer } from "../types.js";
+import { ChatWrapper } from "../ChatWrapper.js";
+export declare function findCharacterRemovalCountToFitChatHistoryInContext({ compressChatHistory, chatHistory, tokensCountToFit, tokenizer, chatWrapper, initialCharactersRemovalCount, estimatedCharactersPerToken, maxDecompressionAttempts }: {
+    compressChatHistory(options: {
+        chatHistory: readonly ChatHistoryItem[];
+        charactersToRemove: number;
+    }): ChatHistoryItem[] | Promise<ChatHistoryItem[]>;
+    chatHistory: ChatHistoryItem[];
+    tokensCountToFit: number;
+    tokenizer: Tokenizer;
+    chatWrapper: ChatWrapper;
+    initialCharactersRemovalCount?: number;
+    estimatedCharactersPerToken?: number;
+    maxDecompressionAttempts?: number;
+}): Promise<{
+    removedCharactersCount: number;
+    compressedChatHistory: ChatHistoryItem[];
+}>;

package/dist/utils/findCharacterRemovalCountToFitChatHistoryInContext.js

@@ -0,0 +1,61 @@
+export async function findCharacterRemovalCountToFitChatHistoryInContext({ compressChatHistory, chatHistory, tokensCountToFit, tokenizer, chatWrapper, initialCharactersRemovalCount = 0, estimatedCharactersPerToken = 5, maxDecompressionAttempts = 2 }) {
+    function getTokensCountForChatHistory(chatHistory) {
+        const { contextText } = chatWrapper.generateContextText(chatHistory);
+        return contextText.tokenize(tokenizer).length;
+    }
+    async function getResultForCharacterRemovalCount(characterRemovalCount) {
+        if (characterRemovalCount === 0)
+            return {
+                compressedHistory: chatHistory,
+                tokensCount: getTokensCountForChatHistory(chatHistory),
+                characterRemovalCount
+            };
+        const compressedHistory = await compressChatHistory({
+            chatHistory,
+            charactersToRemove: characterRemovalCount
+        });
+        return {
+            compressedHistory,
+            tokensCount: getTokensCountForChatHistory(compressedHistory),
+            characterRemovalCount
+        };
+    }
+    let latestCompressionAttempt = await getResultForCharacterRemovalCount(initialCharactersRemovalCount);
+    const firstCompressionAttempt = latestCompressionAttempt;
+    let currentEstimatedCharactersPerToken = estimatedCharactersPerToken;
+    if (latestCompressionAttempt.tokensCount === tokensCountToFit ||
+        (latestCompressionAttempt.tokensCount < tokensCountToFit && latestCompressionAttempt.characterRemovalCount === 0))
+        return {
+            removedCharactersCount: initialCharactersRemovalCount,
+            compressedChatHistory: latestCompressionAttempt.compressedHistory
+        };
+    for (let compressionAttempts = 0, decompressionAttempts = 0; latestCompressionAttempt.tokensCount !== tokensCountToFit;) {
+        if (compressionAttempts > 0) {
+            currentEstimatedCharactersPerToken =
+                Math.abs(latestCompressionAttempt.characterRemovalCount - firstCompressionAttempt.characterRemovalCount) /
+                    Math.abs(latestCompressionAttempt.tokensCount - firstCompressionAttempt.tokensCount);
+            if (!Number.isFinite(currentEstimatedCharactersPerToken))
+                currentEstimatedCharactersPerToken = estimatedCharactersPerToken;
+        }
+        const tokensLeftToRemove = tokensCountToFit - latestCompressionAttempt.tokensCount;
+        let additionalCharactersToRemove = Math.round(tokensLeftToRemove * currentEstimatedCharactersPerToken);
+        if (additionalCharactersToRemove === 0) {
+            if (tokensLeftToRemove > 0)
+                additionalCharactersToRemove = 1;
+            else if (tokensLeftToRemove < 0)
+                additionalCharactersToRemove = -1;
+        }
+        if (tokensLeftToRemove > 0)
+            compressionAttempts++;
+        else if (tokensLeftToRemove < 0)
+            decompressionAttempts++;
+        if (decompressionAttempts >= maxDecompressionAttempts)
+            break;
+        latestCompressionAttempt = await getResultForCharacterRemovalCount(latestCompressionAttempt.characterRemovalCount + additionalCharactersToRemove);
+    }
+    return {
+        removedCharactersCount: latestCompressionAttempt.characterRemovalCount,
+        compressedChatHistory: latestCompressionAttempt.compressedHistory
+    };
+}
+//# sourceMappingURL=findCharacterRemovalCountToFitChatHistoryInContext.js.map

package/dist/utils/findCharacterRemovalCountToFitChatHistoryInContext.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"findCharacterRemovalCountToFitChatHistoryInContext.js","sourceRoot":"","sources":["../../src/utils/findCharacterRemovalCountToFitChatHistoryInContext.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,KAAK,UAAU,kDAAkD,CAAC,EACrE,mBAAmB,EACnB,WAAW,EACX,gBAAgB,EAChB,SAAS,EACT,WAAW,EACX,6BAA6B,GAAG,CAAC,EACjC,2BAA2B,GAAG,CAAC,EAC/B,wBAAwB,GAAG,CAAC,EAY/B;IAIG,SAAS,4BAA4B,CAAC,WAAuC;QACzE,MAAM,EAAC,WAAW,EAAC,GAAG,WAAW,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC;QACnE,OAAO,WAAW,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC;IAClD,CAAC;IAED,KAAK,UAAU,iCAAiC,CAAC,qBAA6B;QAC1E,IAAI,qBAAqB,KAAK,CAAC;YAC3B,OAAO;gBACH,iBAAiB,EAAE,WAAW;gBAC9B,WAAW,EAAE,4BAA4B,CAAC,WAAW,CAAC;gBACtD,qBAAqB;aACxB,CAAC;QAEN,MAAM,iBAAiB,GAAG,MAAM,mBAAmB,CAAC;YAChD,WAAW;YACX,kBAAkB,EAAE,qBAAqB;SAC5C,CAAC,CAAC;QAEH,OAAO;YACH,iBAAiB;YACjB,WAAW,EAAE,4BAA4B,CAAC,iBAAiB,CAAC;YAC5D,qBAAqB;SACxB,CAAC;IACN,CAAC;IAED,IAAI,wBAAwB,GAAG,MAAM,iCAAiC,CAAC,6BAA6B,CAAC,CAAC;IACtG,MAAM,uBAAuB,GAAG,wBAAwB,CAAC;IACzD,IAAI,kCAAkC,GAAG,2BAA2B,CAAC;IAErE,IAAI,wBAAwB,CAAC,WAAW,KAAK,gBAAgB;QACzD,CAAC,wBAAwB,CAAC,WAAW,GAAG,gBAAgB,IAAI,wBAAwB,CAAC,qBAAqB,KAAK,CAAC,CAAC;QAEjH,OAAO;YACH,sBAAsB,EAAE,6BAA6B;YACrD,qBAAqB,EAAE,wBAAwB,CAAC,iBAAiB;SACpE,CAAC;IAEN,KACI,IAAI,mBAAmB,GAAG,CAAC,EAAE,qBAAqB,GAAG,CAAC,EACtD,wBAAwB,CAAC,WAAW,KAAK,gBAAgB,GAC3D;QACE,IAAI,mBAAmB,GAAG,CAAC,EAAE;YACzB,kCAAkC;gBAC9B,IAAI,CAAC,GAAG,CAAC,wBAAwB,CAAC,qBAAqB,GAAG,uBAAuB,CAAC,qBAAqB,CAAC;oBACxG,IAAI,CAAC,GAAG,CAAC,wBAAwB,CAAC,WAAW,GAAG,uBAAuB,CAAC,WAAW,CAAC,CAAC;YAEzF,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,kCAAkC,CAAC;gBACpD,kCAAkC,GAAG,2BAA2B,CAAC;SACxE;QAED,MAAM,kBAAkB,GAAG,gBAAgB,GAAG,wBAAwB,CAAC,WAAW,CAAC;QACnF,IAAI,4BAA4B,GAAG,IAAI,CAAC,KAAK,CAAC,kBAAkB,GAAG,kCAAkC,CAAC,CAAC;QAEvG,IAAI,4BAA4B,KAAK,CAAC,EAAE;YACpC,IAAI,kBAAkB,GAAG,CAAC;gBACtB,4BAA4B,GAAG,CAAC,CAAC;iBAChC,IAAI,kBAAkB,GAAG,CAAC;gBAC3B,4BAA4B,GAAG,CAAC,CAAC,CAAC;SACzC;QAED,IAAI,kBAAkB,GAAG,CAAC;YACtB,mBAAmB,EAAE,CAAC;aACrB,IAAI,kBAAkB,GAAG,CAAC;YAC3B,qBAAqB,EAAE,CAAC;QAE5B,IAAI,qBAAqB,IAAI,wBAAwB;YACjD,MAAM;QAEV,wBAAwB,GAAG,MAAM,iCAAiC,CAC9D,wBAAwB,CAAC,qBAAqB,GAAG,4BAA4B,CAChF,CAAC;KACL;IAED,OAAO;QACH,sBAAsB,EAAE,wBAAwB,CAAC,qBAAqB;QACtE,qBAAqB,EAAE,wBAAwB,CAAC,iBAAiB;KACpE,CAAC;AACN,CAAC"}

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

@@ -2,4 +2,5 @@ export declare class GbnfGrammarGenerator {
     rules: Map<string, string | null>;
     private ruleId;
     generateRuleName(): string;
+    generateGbnfFile(rootGrammar: string): string;
 }

package/dist/utils/gbnfJson/GbnfGrammarGenerator.js

@@ -6,5 +6,22 @@ export class GbnfGrammarGenerator {
         this.ruleId++;
         return `rule${ruleId}`;
     }
+    generateGbnfFile(rootGrammar) {
+        const rules = [{
+                name: "root",
+                grammar: rootGrammar
+            }];
+        for (const [ruleName, grammar] of this.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=GbnfGrammarGenerator.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"GbnfGrammarGenerator.js","sourceRoot":"","sources":["../../../src/utils/gbnfJson/GbnfGrammarGenerator.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,oBAAoB;IACtB,KAAK,GAAG,IAAI,GAAG,EAAyB,CAAC;IACxC,MAAM,GAAW,CAAC,CAAC;IAEpB,gBAAgB;QACnB,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,IAAI,CAAC,MAAM,EAAE,CAAC;QAEd,OAAO,OAAO,MAAM,EAAE,CAAC;IAC3B,CAAC;CACJ"}
+{"version":3,"file":"GbnfGrammarGenerator.js","sourceRoot":"","sources":["../../../src/utils/gbnfJson/GbnfGrammarGenerator.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,oBAAoB;IACtB,KAAK,GAAG,IAAI,GAAG,EAAyB,CAAC;IACxC,MAAM,GAAW,CAAC,CAAC;IAEpB,gBAAgB;QACnB,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,IAAI,CAAC,MAAM,EAAE,CAAC;QAEd,OAAO,OAAO,MAAM,EAAE,CAAC;IAC3B,CAAC;IAEM,gBAAgB,CAAC,WAAmB;QACvC,MAAM,KAAK,GAAsC,CAAC;gBAC9C,IAAI,EAAE,MAAM;gBACZ,OAAO,EAAE,WAAW;aACvB,CAAC,CAAC;QAEH,KAAK,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE;YACpD,IAAI,OAAO,IAAI,IAAI;gBACf,SAAS;YAEb,KAAK,CAAC,IAAI,CAAC;gBACP,IAAI,EAAE,QAAQ;gBACd,OAAO;aACV,CAAC,CAAC;SACN;QAED,MAAM,WAAW,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,GAAG,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC;QAC5E,MAAM,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEpC,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ"}

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

@@ -1,7 +1,7 @@
 import { GbnfGrammarGenerator } from "./GbnfGrammarGenerator.js";
 export declare abstract class GbnfTerminal {
     private _ruleName;
-    getRuleName(grammarGenerator: GbnfGrammarGenerator): string;
+    protected getRuleName(grammarGenerator: GbnfGrammarGenerator): string;
     abstract getGrammar(grammarGenerator: GbnfGrammarGenerator): string;
     resolve(grammarGenerator: GbnfGrammarGenerator): string;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"GbnfTerminal.js","sourceRoot":"","sources":["../../../src/utils/gbnfJson/GbnfTerminal.ts"],"names":[],"mappings":"AAGA,MAAM,OAAgB,YAAY;IACtB,SAAS,GAAkB,IAAI,CAAC;IAEjC,WAAW,CAAC,gBAAsC;QACrD,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI;YACtB,OAAO,IAAI,CAAC,SAAS,CAAC;QAE1B,MAAM,QAAQ,GAAG,gBAAgB,CAAC,gBAAgB,EAAE,CAAC;QACrD,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;QAE1B,OAAO,QAAQ,CAAC;IACpB,CAAC;IAIM,OAAO,CAAC,gBAAsC;QACjD,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC;QAEpD,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC;YACrC,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC;QAE5E,OAAO,QAAQ,CAAC;IACpB,CAAC;CACJ"}
+{"version":3,"file":"GbnfTerminal.js","sourceRoot":"","sources":["../../../src/utils/gbnfJson/GbnfTerminal.ts"],"names":[],"mappings":"AAGA,MAAM,OAAgB,YAAY;IACtB,SAAS,GAAkB,IAAI,CAAC;IAE9B,WAAW,CAAC,gBAAsC;QACxD,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI;YACtB,OAAO,IAAI,CAAC,SAAS,CAAC;QAE1B,MAAM,QAAQ,GAAG,gBAAgB,CAAC,gBAAgB,EAAE,CAAC;QACrD,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;QAE1B,OAAO,QAAQ,CAAC;IACpB,CAAC;IAIM,OAAO,CAAC,gBAAsC;QACjD,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC;QAEpD,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC;YACrC,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC;QAE5E,OAAO,QAAQ,CAAC;IACpB,CAAC;CACJ"}

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

@@ -0,0 +1,6 @@
+import { GbnfTerminal } from "../GbnfTerminal.js";
+export declare class GbnfVerbatimText extends GbnfTerminal {
+    readonly value: string;
+    constructor(value: string);
+    getGrammar(): string;
+}

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

@@ -0,0 +1,21 @@
+import { GbnfTerminal } from "../GbnfTerminal.js";
+export class GbnfVerbatimText extends GbnfTerminal {
+    value;
+    constructor(value) {
+        super();
+        this.value = value;
+    }
+    getGrammar() {
+        return [
+            '"',
+            this.value
+                .replaceAll("\\", "\\\\")
+                .replaceAll('"', '\\"')
+                .replaceAll("\t", "\\t")
+                .replaceAll("\r", "\\r")
+                .replaceAll("\n", "\\n"),
+            '"'
+        ].join("");
+    }
+}
+//# sourceMappingURL=GbnfVerbatimText.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"GbnfVerbatimText.js","sourceRoot":"","sources":["../../../../src/utils/gbnfJson/terminals/GbnfVerbatimText.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAGhD,MAAM,OAAO,gBAAiB,SAAQ,YAAY;IAC9B,KAAK,CAAS;IAE9B,YAAmB,KAAa;QAC5B,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACvB,CAAC;IAEQ,UAAU;QACf,OAAO;YACH,GAAG;YACH,IAAI,CAAC,KAAK;iBACL,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC;iBACxB,UAAU,CAAC,GAAG,EAAE,KAAK,CAAC;iBACtB,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC;iBACvB,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC;iBACvB,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC;YAC5B,GAAG;SACN,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACf,CAAC;CACJ"}

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

@@ -24,7 +24,7 @@ export type GbnfJsonArraySchema = {
     items: GbnfJsonSchema;
 };
 export type GbnfJsonSchemaToType<T> = GbnfJsonSchemaToTSType<T>;
-export type GbnfJsonSchemaToTSType<T> = T extends GbnfJsonBasicSchema ? GbnfJsonBasicSchemaToType<T["type"]> : T extends GbnfJsonConstSchema ? T["const"] : T extends GbnfJsonEnumSchema ? T["enum"][number] : T extends GbnfJsonOneOfSchema ? GbnfJsonSchemaToType<T["oneOf"][number]> : T extends GbnfJsonObjectSchema ? GbnfJsonObjectSchemaToType<T["properties"]> : T extends GbnfJsonArraySchema ? GbnfJsonSchemaToType<T["items"]>[] : never;
+export type GbnfJsonSchemaToTSType<T> = GbnfJsonBasicSchema extends T ? undefined : undefined extends T ? undefined : T extends GbnfJsonBasicSchema ? GbnfJsonBasicSchemaToType<T["type"]> : T extends GbnfJsonConstSchema ? T["const"] : T extends GbnfJsonEnumSchema ? T["enum"][number] : T extends GbnfJsonOneOfSchema ? GbnfJsonSchemaToType<T["oneOf"][number]> : T extends GbnfJsonObjectSchema ? GbnfJsonObjectSchemaToType<T["properties"]> : T extends GbnfJsonArraySchema ? GbnfJsonSchemaToType<T["items"]>[] : undefined;
 type GbnfJsonBasicSchemaToType<T> = T extends GbnfJsonSchemaImmutableType ? ImmutableTypeToType<T> : T extends GbnfJsonSchemaImmutableType[] ? ImmutableTypeToType<T[number]> : never;
 type ImmutableTypeToType<T> = T extends "string" ? string : T extends "number" ? number : T extends "integer" ? number : T extends "boolean" ? boolean : T extends "null" ? null : never;
 type GbnfJsonObjectSchemaToType<Props> = {

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

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

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

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

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

package/dist/utils/getConsoleLogPrefix.d.ts

@@ -0,0 +1 @@
+export declare function getConsoleLogPrefix(forcePrefix?: boolean): string;

package/dist/utils/getConsoleLogPrefix.js

@@ -0,0 +1,9 @@
+import chalk from "chalk";
+import { getIsRunningFromCLI } from "../state.js";
+export function getConsoleLogPrefix(forcePrefix = false) {
+    const isInCLI = getIsRunningFromCLI();
+    if (!isInCLI || forcePrefix)
+        return chalk.grey("[node-llama-cpp] ");
+    return "";
+}
+//# sourceMappingURL=getConsoleLogPrefix.js.map

package/dist/utils/getConsoleLogPrefix.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getConsoleLogPrefix.js","sourceRoot":"","sources":["../../src/utils/getConsoleLogPrefix.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAC,mBAAmB,EAAC,MAAM,aAAa,CAAC;AAEhD,MAAM,UAAU,mBAAmB,CAAC,cAAuB,KAAK;IAC5D,MAAM,OAAO,GAAG,mBAAmB,EAAE,CAAC;IAEtC,IAAI,CAAC,OAAO,IAAI,WAAW;QACvB,OAAO,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IAE3C,OAAO,EAAE,CAAC;AACd,CAAC"}

package/dist/utils/getGbnfGrammarForGbnfJsonSchema.js

@@ -4,20 +4,6 @@ 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;
+    return grammarGenerator.generateGbnfFile(rootGrammar + " [\\n]".repeat(4) + " [\\n]*");
 }
 //# sourceMappingURL=getGbnfGrammarForGbnfJsonSchema.js.map

package/dist/utils/getGbnfGrammarForGbnfJsonSchema.js.map

@@ -1 +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"}
+{"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,OAAO,gBAAgB,CAAC,gBAAgB,CAAC,WAAW,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC;AAC3F,CAAC"}

package/dist/utils/getGrammarsFolder.d.ts

@@ -1 +1,2 @@
-export declare function getGrammarsFolder(): Promise<string>;
+import { Llama } from "../bindings/Llama.js";
+export declare function getGrammarsFolder(buildType: Llama["buildType"]): Promise<string>;

package/dist/utils/getGrammarsFolder.js

@@ -1,18 +1,19 @@
 import fs from "fs-extra";
 import { llamaBinsGrammarsDirectory, llamaCppGrammarsDirectory } from "../config.js";
-import { getUsedBinFlag } from "./usedBinFlag.js";
-export async function getGrammarsFolder() {
-    const usedBinFlag = await getUsedBinFlag();
-    if (usedBinFlag === "localBuildFromSource") {
-        if (await fs.pathExists(llamaCppGrammarsDirectory))
+import { isLlamaCppRepoCloned } from "../bindings/utils/cloneLlamaCppRepo.js";
+export async function getGrammarsFolder(buildType) {
+    if (buildType === "localBuild") {
+        if (await isLlamaCppRepoCloned(true) && await fs.pathExists(llamaCppGrammarsDirectory))
             return llamaCppGrammarsDirectory;
     }
-    else if (usedBinFlag === "prebuiltBinaries") {
+    else if (buildType === "prebuilt") {
         if (await fs.pathExists(llamaBinsGrammarsDirectory))
             return llamaBinsGrammarsDirectory;
-        else if (await fs.pathExists(llamaCppGrammarsDirectory))
+        else if (await isLlamaCppRepoCloned(false) && await fs.pathExists(llamaCppGrammarsDirectory))
             return llamaCppGrammarsDirectory;
     }
+    else
+        void (buildType);
     throw new Error("Grammars folder not found");
 }
 //# sourceMappingURL=getGrammarsFolder.js.map

package/dist/utils/getGrammarsFolder.js.map

@@ -1 +1 @@
-{"version":3,"file":"getGrammarsFolder.js","sourceRoot":"","sources":["../../src/utils/getGrammarsFolder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,EAAC,0BAA0B,EAAE,yBAAyB,EAAC,MAAM,cAAc,CAAC;AACnF,OAAO,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAC;AAEhD,MAAM,CAAC,KAAK,UAAU,iBAAiB;IACnC,MAAM,WAAW,GAAG,MAAM,cAAc,EAAE,CAAC;IAE3C,IAAI,WAAW,KAAK,sBAAsB,EAAE;QACxC,IAAI,MAAM,EAAE,CAAC,UAAU,CAAC,yBAAyB,CAAC;YAC9C,OAAO,yBAAyB,CAAC;KACxC;SAAM,IAAI,WAAW,KAAK,kBAAkB,EAAE;QAC3C,IAAI,MAAM,EAAE,CAAC,UAAU,CAAC,0BAA0B,CAAC;YAC/C,OAAO,0BAA0B,CAAC;aACjC,IAAI,MAAM,EAAE,CAAC,UAAU,CAAC,yBAAyB,CAAC;YACnD,OAAO,yBAAyB,CAAC;KACxC;IAED,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;AACjD,CAAC"}
+{"version":3,"file":"getGrammarsFolder.js","sourceRoot":"","sources":["../../src/utils/getGrammarsFolder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,EAAC,0BAA0B,EAAE,yBAAyB,EAAC,MAAM,cAAc,CAAC;AAEnF,OAAO,EAAC,oBAAoB,EAAC,MAAM,wCAAwC,CAAC;AAE5E,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,SAA6B;IACjE,IAAI,SAAS,KAAK,YAAY,EAAE;QAC5B,IAAI,MAAM,oBAAoB,CAAC,IAAI,CAAC,IAAI,MAAM,EAAE,CAAC,UAAU,CAAC,yBAAyB,CAAC;YAClF,OAAO,yBAAyB,CAAC;KACxC;SAAM,IAAI,SAAS,KAAK,UAAU,EAAE;QACjC,IAAI,MAAM,EAAE,CAAC,UAAU,CAAC,0BAA0B,CAAC;YAC/C,OAAO,0BAA0B,CAAC;aACjC,IAAI,MAAM,oBAAoB,CAAC,KAAK,CAAC,IAAI,MAAM,EAAE,CAAC,UAAU,CAAC,yBAAyB,CAAC;YACxF,OAAO,yBAAyB,CAAC;KACxC;;QACG,KAAK,CAAC,SAAyB,CAAC,CAAC;IAErC,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;AACjD,CAAC"}

package/dist/utils/getModuleVersion.d.ts

@@ -0,0 +1 @@
+export declare function getModuleVersion(): Promise<string>;

package/dist/utils/getModuleVersion.js

@@ -0,0 +1,13 @@
+import path from "path";
+import { fileURLToPath } from "url";
+import fs from "fs-extra";
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+let moduleVersion = null;
+export async function getModuleVersion() {
+    if (moduleVersion != null)
+        return moduleVersion;
+    const packageJson = await fs.readJson(path.join(__dirname, "..", "..", "package.json"));
+    moduleVersion = packageJson.version;
+    return moduleVersion;
+}
+//# sourceMappingURL=getModuleVersion.js.map

package/dist/utils/getModuleVersion.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getModuleVersion.js","sourceRoot":"","sources":["../../src/utils/getModuleVersion.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAC,aAAa,EAAC,MAAM,KAAK,CAAC;AAClC,OAAO,EAAE,MAAM,UAAU,CAAC;AAE1B,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAE/D,IAAI,aAAa,GAAkB,IAAI,CAAC;AACxC,MAAM,CAAC,KAAK,UAAU,gBAAgB;IAClC,IAAI,aAAa,IAAI,IAAI;QACrB,OAAO,aAAa,CAAC;IAEzB,MAAM,WAAW,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC;IAExF,aAAa,GAAG,WAAW,CAAC,OAAiB,CAAC;IAE9C,OAAO,aAAa,CAAC;AACzB,CAAC"}

package/dist/utils/getQueuedTokensBeforeStopTrigger.d.ts

@@ -0,0 +1,6 @@
+import { Token, Tokenizer } from "../types.js";
+import { StopGenerationDetector } from "./StopGenerationDetector.js";
+export declare function getQueuedTokensBeforeStopTrigger(triggeredStops: ReturnType<typeof StopGenerationDetector["prototype"]["getTriggeredStops"]>, partiallyFreeTokens: {
+    tokens: Token[];
+    text: string;
+}, tokenizer: Tokenizer): Token[];

package/dist/utils/getQueuedTokensBeforeStopTrigger.js

@@ -0,0 +1,22 @@
+export function getQueuedTokensBeforeStopTrigger(triggeredStops, partiallyFreeTokens, tokenizer) {
+    if (partiallyFreeTokens.tokens.length === 0 && partiallyFreeTokens.text.length === 0)
+        return [];
+    else if (partiallyFreeTokens.tokens.length !== 0 && partiallyFreeTokens.text.length === 0)
+        return partiallyFreeTokens.tokens;
+    else if (partiallyFreeTokens.tokens.length === 0 && partiallyFreeTokens.text.length !== 0)
+        return tokenizer(partiallyFreeTokens.text);
+    const triggerThatStartsWithStringIndex = triggeredStops.findIndex((trigger) => trigger.stopTrigger.length > 0 && typeof trigger.stopTrigger[0] === "string");
+    const triggerThatStartsWithTokenIndex = triggeredStops.findIndex((trigger) => trigger.stopTrigger.length > 0 && typeof trigger.stopTrigger[0] !== "string");
+    if (triggerThatStartsWithTokenIndex > 0 && triggerThatStartsWithStringIndex < 0)
+        return partiallyFreeTokens.tokens;
+    else if (triggerThatStartsWithStringIndex > 0 && triggerThatStartsWithTokenIndex < 0)
+        return tokenizer(partiallyFreeTokens.text);
+    const stringTokens = tokenizer(partiallyFreeTokens.text);
+    if (stringTokens.length === partiallyFreeTokens.tokens.length &&
+        stringTokens.every((value, index) => value === partiallyFreeTokens.tokens[index]))
+        return stringTokens;
+    else if (triggerThatStartsWithStringIndex < triggerThatStartsWithTokenIndex)
+        return stringTokens;
+    return partiallyFreeTokens.tokens;
+}
+//# sourceMappingURL=getQueuedTokensBeforeStopTrigger.js.map

package/dist/utils/getQueuedTokensBeforeStopTrigger.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getQueuedTokensBeforeStopTrigger.js","sourceRoot":"","sources":["../../src/utils/getQueuedTokensBeforeStopTrigger.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,gCAAgC,CAC5C,cAA2F,EAC3F,mBAGC,EACD,SAAoB;IAEpB,IAAI,mBAAmB,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,mBAAmB,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC;QAChF,OAAO,EAAE,CAAC;SACT,IAAI,mBAAmB,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,mBAAmB,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC;QACrF,OAAO,mBAAmB,CAAC,MAAM,CAAC;SACjC,IAAI,mBAAmB,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,mBAAmB,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC;QACrF,OAAO,SAAS,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAE/C,MAAM,gCAAgC,GAAG,cAAc,CAAC,SAAS,CAC7D,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,IAAI,OAAO,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,QAAQ,CAC5F,CAAC;IACF,MAAM,+BAA+B,GAAG,cAAc,CAAC,SAAS,CAC5D,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,IAAI,OAAO,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,QAAQ,CAC5F,CAAC;IAEF,IAAI,+BAA+B,GAAG,CAAC,IAAI,gCAAgC,GAAG,CAAC;QAC3E,OAAO,mBAAmB,CAAC,MAAM,CAAC;SACjC,IAAI,gCAAgC,GAAG,CAAC,IAAI,+BAA+B,GAAG,CAAC;QAChF,OAAO,SAAS,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAE/C,MAAM,YAAY,GAAG,SAAS,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;IACzD,IAAI,YAAY,CAAC,MAAM,KAAK,mBAAmB,CAAC,MAAM,CAAC,MAAM;QACzD,YAAY,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,mBAAmB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAEjF,OAAO,YAAY,CAAC;SACnB,IAAI,gCAAgC,GAAG,+BAA+B;QACvE,OAAO,YAAY,CAAC;IAExB,OAAO,mBAAmB,CAAC,MAAM,CAAC;AACtC,CAAC"}

package/dist/utils/getTypeScriptTypeStringForGbnfJsonSchema.d.ts

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

package/dist/utils/getTypeScriptTypeStringForGbnfJsonSchema.js

@@ -0,0 +1,49 @@
+import { isGbnfJsonArraySchema, isGbnfJsonBasicSchemaIncludesType, isGbnfJsonConstSchema, isGbnfJsonEnumSchema, isGbnfJsonObjectSchema, isGbnfJsonOneOfSchema } from "./gbnfJson/types.js";
+export function getTypeScriptTypeStringForGbnfJsonSchema(schema) {
+    if (isGbnfJsonOneOfSchema(schema)) {
+        const values = schema.oneOf
+            .map((altSchema) => getTypeScriptTypeStringForGbnfJsonSchema(altSchema));
+        return values.join(" | ");
+    }
+    else if (isGbnfJsonConstSchema(schema)) {
+        return JSON.stringify(schema.const) ?? "";
+    }
+    else if (isGbnfJsonEnumSchema(schema)) {
+        return schema.enum
+            .map((item) => JSON.stringify(item) ?? "")
+            .filter((item) => item !== "")
+            .join(" | ");
+    }
+    else if (isGbnfJsonObjectSchema(schema)) {
+        return Object.entries(schema.properties)
+            .map(([propName, propSchema]) => {
+            const escapedValue = JSON.stringify(propName) ?? "";
+            const keyText = escapedValue.slice(1, -1) === propName ? propName : escapedValue;
+            const valueType = getTypeScriptTypeStringForGbnfJsonSchema(propSchema);
+            if (keyText === "" || valueType === "")
+                return "";
+            return keyText + ": " + valueType;
+        })
+            .filter((item) => item !== "")
+            .join(", ");
+    }
+    else if (isGbnfJsonArraySchema(schema)) {
+        const valuesType = getTypeScriptTypeStringForGbnfJsonSchema(schema.items);
+        if (valuesType === "")
+            return "[]";
+        return "(" + valuesType + ")[]";
+    }
+    const types = [];
+    if (isGbnfJsonBasicSchemaIncludesType(schema, "string"))
+        types.push("string");
+    if (isGbnfJsonBasicSchemaIncludesType(schema, "number"))
+        types.push("number");
+    if (isGbnfJsonBasicSchemaIncludesType(schema, "integer"))
+        types.push("bigint");
+    if (isGbnfJsonBasicSchemaIncludesType(schema, "boolean"))
+        types.push("boolean");
+    if (isGbnfJsonBasicSchemaIncludesType(schema, "null"))
+        types.push("null");
+    return types.join(" | ");
+}
+//# sourceMappingURL=getTypeScriptTypeStringForGbnfJsonSchema.js.map

package/dist/utils/getTypeScriptTypeStringForGbnfJsonSchema.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getTypeScriptTypeStringForGbnfJsonSchema.js","sourceRoot":"","sources":["../../src/utils/getTypeScriptTypeStringForGbnfJsonSchema.ts"],"names":[],"mappings":"AAAA,OAAO,EACa,qBAAqB,EAAE,iCAAiC,EAAE,qBAAqB,EAC/F,oBAAoB,EAAE,sBAAsB,EAAE,qBAAqB,EACtE,MAAM,qBAAqB,CAAC;AAE7B,MAAM,UAAU,wCAAwC,CAAC,MAAsB;IAC3E,IAAI,qBAAqB,CAAC,MAAM,CAAC,EAAE;QAC/B,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK;aACtB,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,wCAAwC,CAAC,SAAS,CAAC,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;KAC7B;SAAM,IAAI,qBAAqB,CAAC,MAAM,CAAC,EAAE;QACtC,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;KAC7C;SAAM,IAAI,oBAAoB,CAAC,MAAM,CAAC,EAAE;QACrC,OAAO,MAAM,CAAC,IAAI;aACb,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;aACzC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,EAAE,CAAC;aAC7B,IAAI,CAAC,KAAK,CAAC,CAAC;KACpB;SAAM,IAAI,sBAAsB,CAAC,MAAM,CAAC,EAAE;QACvC,OAAO,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC;aACnC,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,UAAU,CAAC,EAAE,EAAE;YAC5B,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;YACpD,MAAM,OAAO,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC;YACjF,MAAM,SAAS,GAAG,wCAAwC,CAAC,UAAU,CAAC,CAAC;YAEvE,IAAI,OAAO,KAAK,EAAE,IAAI,SAAS,KAAK,EAAE;gBAClC,OAAO,EAAE,CAAC;YAEd,OAAO,OAAO,GAAG,IAAI,GAAG,SAAS,CAAC;QACtC,CAAC,CAAC;aACD,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,EAAE,CAAC;aAC7B,IAAI,CAAC,IAAI,CAAC,CAAC;KACnB;SAAM,IAAI,qBAAqB,CAAC,MAAM,CAAC,EAAE;QACtC,MAAM,UAAU,GAAG,wCAAwC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAE1E,IAAI,UAAU,KAAK,EAAE;YACjB,OAAO,IAAI,CAAC;QAEhB,OAAO,GAAG,GAAG,UAAU,GAAG,KAAK,CAAC;KACnC;IAED,MAAM,KAAK,GAA4D,EAAE,CAAC;IAE1E,IAAI,iCAAiC,CAAC,MAAM,EAAE,QAAQ,CAAC;QACnD,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAEzB,IAAI,iCAAiC,CAAC,MAAM,EAAE,QAAQ,CAAC;QACnD,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAEzB,IAAI,iCAAiC,CAAC,MAAM,EAAE,SAAS,CAAC;QACpD,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAEzB,IAAI,iCAAiC,CAAC,MAAM,EAAE,SAAS,CAAC;QACpD,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAE1B,IAAI,iCAAiC,CAAC,MAAM,EAAE,MAAM,CAAC;QACjD,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAEvB,OAAO,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AAC7B,CAAC"}

package/dist/utils/gitReleaseBundles.js

@@ -1,7 +1,8 @@
 import fs from "fs-extra";
 import simpleGit from "simple-git";
-import { currentReleaseGitBundlePath, defaultLlamaCppGitHubRepo, llamaCppDirectory } from "../config.js";
-import { getBinariesGithubRelease } from "./binariesGithubRelease.js";
+import { currentReleaseGitBundlePath, builtinLlamaCppGitHubRepo, llamaCppDirectory } from "../config.js";
+import { getBinariesGithubRelease } from "../bindings/utils/binariesGithubRelease.js";
+import { isGithubReleaseNeedsResolving } from "./resolveGithubRelease.js";
 export async function unshallowAndSquashCurrentRepoAndSaveItAsReleaseBundle() {
     if (!(await fs.pathExists(llamaCppDirectory)))
         throw new Error("llama.cpp directory does not exist");
@@ -39,11 +40,11 @@ export async function unshallowAndSquashCurrentRepoAndSaveItAsReleaseBundle() {
     await simpleGit(llamaCppDirectory).raw(["bundle", "create", currentReleaseGitBundlePath, "HEAD"]);
 }
 export async function getGitBundlePathForRelease(githubOwner, githubRepo, release) {
-    const [defaultGithubOwner, defaultGithubRepo] = defaultLlamaCppGitHubRepo.split("/");
-    if (githubOwner !== defaultGithubOwner || githubRepo !== defaultGithubRepo)
+    const [builtinGithubOwner, builtinGithubRepo] = builtinLlamaCppGitHubRepo.split("/");
+    if (githubOwner !== builtinGithubOwner || githubRepo !== builtinGithubRepo)
         return null;
     const currentBundleRelease = await getBinariesGithubRelease();
-    if (currentBundleRelease === "latest")
+    if (isGithubReleaseNeedsResolving(currentBundleRelease))
         return null;
     if (currentBundleRelease !== release)
         return null;

package/dist/utils/gitReleaseBundles.js.map

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

package/dist/utils/hashString.d.ts

@@ -0,0 +1 @@
+export declare function hashString(text: string): Promise<string>;