node-llama-cpp 3.0.0-beta.2 → 3.0.0-beta.21

package/dist/utils/spawnCommand.js

@@ -1,5 +1,5 @@
 import spawn from "cross-spawn";
-export function spawnCommand(command, args, cwd, env = process.env) {
+export function spawnCommand(command, args, cwd, env = process.env, progressLogs = true) {
     function getCommandString() {
         let res = command;
         for (const arg of args) {
@@ -13,8 +13,28 @@ export function spawnCommand(command, args, cwd, env = process.env) {
         return res;
     }
     return new Promise((resolve, reject) => {
+        const stdout = [];
+        const stderr = [];
+        const combinedStd = [];
+        function createResult() {
+            const finalStdout = stdout.join("");
+            stdout.length = 0;
+            const finalStderr = stderr.join("");
+            stderr.length = 0;
+            const finalCombinedStd = combinedStd.join("");
+            combinedStd.length = 0;
+            return {
+                stdout: finalStdout,
+                stderr: finalStderr,
+                combinedStd: finalCombinedStd
+            };
+        }
+        function createError(message) {
+            const { stdout: finalStdout, stderr: finalStderr, combinedStd: finalCombinedStd } = createResult();
+            return new SpawnError(message, finalStdout, finalStderr, finalCombinedStd);
+        }
         const child = spawn(command, args, {
-            stdio: "inherit",
+            stdio: [null, null, null],
             cwd,
             env,
             detached: false,
@@ -22,18 +42,48 @@ export function spawnCommand(command, args, cwd, env = process.env) {
         });
         child.on("exit", (code) => {
             if (code == 0)
-                resolve();
+                resolve(createResult());
             else
-                reject(new Error(`Command ${getCommandString()} exited with code ${code}`));
+                reject(createError(`Command ${getCommandString()} exited with code ${code}`));
         });
         child.on("error", reject);
         child.on("disconnect", () => reject(new Error(`Command ${getCommandString()} disconnected`)));
         child.on("close", code => {
             if (code == 0)
-                resolve();
+                resolve(createResult());
             else
-                reject(new Error(`Command ${getCommandString()} closed with code ${code}`));
+                reject(createError(`Command ${getCommandString()} closed with code ${code}`));
+        });
+        if (progressLogs) {
+            child.stdout?.pipe(process.stdout);
+            child.stderr?.pipe(process.stderr);
+            process.stdin.pipe(child.stdin);
+        }
+        else {
+            child.stderr?.pipe(process.stderr);
+        }
+        child.stdout?.on("data", (data) => {
+            stdout.push(data.toString());
+            combinedStd.push(data.toString());
+        });
+        child.stderr?.on("data", (data) => {
+            stderr.push(data.toString());
+            combinedStd.push(data.toString());
         });
     });
 }
+export class SpawnError extends Error {
+    stdout;
+    stderr;
+    combinedStd;
+    constructor(message, stdout, stderr, combinedStd) {
+        super(message);
+        Object.defineProperty(this, "stdout", { enumerable: false });
+        Object.defineProperty(this, "stderr", { enumerable: false });
+        Object.defineProperty(this, "combinedStd", { enumerable: false });
+        this.stdout = stdout;
+        this.stderr = stderr;
+        this.combinedStd = combinedStd;
+    }
+}
 //# sourceMappingURL=spawnCommand.js.map

package/dist/utils/spawnCommand.js.map

@@ -1 +1 @@
-{"version":3,"file":"spawnCommand.js","sourceRoot":"","sources":["../../src/utils/spawnCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,aAAa,CAAC;AAEhC,MAAM,UAAU,YAAY,CAAC,OAAe,EAAE,IAAc,EAAE,GAAW,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG;IACxF,SAAS,gBAAgB;QACrB,IAAI,GAAG,GAAG,OAAO,CAAC;QAElB,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;YACpB,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBACnB,GAAG,IAAI,KAAK,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC;aAC7C;iBAAM;gBACH,GAAG,IAAI,IAAI,GAAG,EAAE,CAAC;aACpB;SACJ;QAED,OAAO,GAAG,CAAC;IACf,CAAC;IAED,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACzC,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE;YAC/B,KAAK,EAAE,SAAS;YAChB,GAAG;YACH,GAAG;YACH,QAAQ,EAAE,KAAK;YACf,WAAW,EAAE,IAAI;SACpB,CAAC,CAAC;QAEH,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;YACtB,IAAI,IAAI,IAAI,CAAC;gBACT,OAAO,EAAE,CAAC;;gBAEV,MAAM,CAAC,IAAI,KAAK,CAAC,WAAW,gBAAgB,EAAE,qBAAqB,IAAI,EAAE,CAAC,CAAC,CAAC;QACpF,CAAC,CAAC,CAAC;QACH,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC1B,KAAK,CAAC,EAAE,CAAC,YAAY,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,WAAW,gBAAgB,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC;QAC9F,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE;YACrB,IAAI,IAAI,IAAI,CAAC;gBACT,OAAO,EAAE,CAAC;;gBAEV,MAAM,CAAC,IAAI,KAAK,CAAC,WAAW,gBAAgB,EAAE,qBAAqB,IAAI,EAAE,CAAC,CAAC,CAAC;QACpF,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC"}
+{"version":3,"file":"spawnCommand.js","sourceRoot":"","sources":["../../src/utils/spawnCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,aAAa,CAAC;AAEhC,MAAM,UAAU,YAAY,CACxB,OAAe,EAAE,IAAc,EAAE,GAAW,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,eAAwB,IAAI;IAE7F,SAAS,gBAAgB;QACrB,IAAI,GAAG,GAAG,OAAO,CAAC;QAElB,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;YACpB,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBACnB,GAAG,IAAI,KAAK,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC;aAC7C;iBAAM;gBACH,GAAG,IAAI,IAAI,GAAG,EAAE,CAAC;aACpB;SACJ;QAED,OAAO,GAAG,CAAC;IACf,CAAC;IAED,OAAO,IAAI,OAAO,CAAwD,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC1F,MAAM,MAAM,GAAa,EAAE,CAAC;QAC5B,MAAM,MAAM,GAAa,EAAE,CAAC;QAC5B,MAAM,WAAW,GAAa,EAAE,CAAC;QAEjC,SAAS,YAAY;YACjB,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACpC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;YAClB,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACpC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;YAClB,MAAM,gBAAgB,GAAG,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAC9C,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC;YAEvB,OAAO;gBACH,MAAM,EAAE,WAAW;gBACnB,MAAM,EAAE,WAAW;gBACnB,WAAW,EAAE,gBAAgB;aAChC,CAAC;QACN,CAAC;QAED,SAAS,WAAW,CAAC,OAAe;YAChC,MAAM,EAAC,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,gBAAgB,EAAC,GAAG,YAAY,EAAE,CAAC;YAEjG,OAAO,IAAI,UAAU,CAAC,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,gBAAgB,CAAC,CAAC;QAC/E,CAAC;QAED,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE;YAC/B,KAAK,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC;YACzB,GAAG;YACH,GAAG;YACH,QAAQ,EAAE,KAAK;YACf,WAAW,EAAE,IAAI;SACpB,CAAC,CAAC;QAEH,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;YACtB,IAAI,IAAI,IAAI,CAAC;gBACT,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;;gBAExB,MAAM,CAAC,WAAW,CAAC,WAAW,gBAAgB,EAAE,qBAAqB,IAAI,EAAE,CAAC,CAAC,CAAC;QACtF,CAAC,CAAC,CAAC;QACH,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC1B,KAAK,CAAC,EAAE,CAAC,YAAY,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,WAAW,gBAAgB,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC;QAC9F,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE;YACrB,IAAI,IAAI,IAAI,CAAC;gBACT,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;;gBAExB,MAAM,CAAC,WAAW,CAAC,WAAW,gBAAgB,EAAE,qBAAqB,IAAI,EAAE,CAAC,CAAC,CAAC;QACtF,CAAC,CAAC,CAAC;QAEH,IAAI,YAAY,EAAE;YACd,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YACnC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YACnC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,KAAM,CAAC,CAAC;SACpC;aAAM;YACH,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;SACtC;QAED,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;YAC9B,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC7B,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC;QACH,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;YAC9B,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC7B,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC;AAED,MAAM,OAAO,UAAW,SAAQ,KAAK;IACjB,MAAM,CAAS;IACf,MAAM,CAAS;IACf,WAAW,CAAS;IAEpC,YAAmB,OAAe,EAAE,MAAc,EAAE,MAAc,EAAE,WAAmB;QACnF,KAAK,CAAC,OAAO,CAAC,CAAC;QAEf,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,QAA6B,EAAE,EAAC,UAAU,EAAE,KAAK,EAAC,CAAC,CAAC;QAChF,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,QAA6B,EAAE,EAAC,UAAU,EAAE,KAAK,EAAC,CAAC,CAAC;QAChF,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,aAAkC,EAAE,EAAC,UAAU,EAAE,KAAK,EAAC,CAAC,CAAC;QAErF,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACnC,CAAC;CACJ"}

package/dist/utils/tokenizeInput.d.ts

@@ -0,0 +1,3 @@
+import { Token, Tokenizer } from "../types.js";
+import { LlamaText } from "./LlamaText.js";
+export declare function tokenizeInput(input: Token | Token[] | string | LlamaText, tokenizer: Tokenizer, options?: "trimLeadingSpace"): Token[];

package/dist/utils/tokenizeInput.js

@@ -0,0 +1,12 @@
+import { isLlamaText } from "./LlamaText.js";
+import { isToken } from "./isToken.js";
+export function tokenizeInput(input, tokenizer, options) {
+    if (typeof input === "string")
+        return tokenizer(input, false, options);
+    else if (isLlamaText(input))
+        return input.tokenize(tokenizer, options);
+    else if (isToken(input))
+        return [input];
+    return input;
+}
+//# sourceMappingURL=tokenizeInput.js.map

package/dist/utils/tokenizeInput.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tokenizeInput.js","sourceRoot":"","sources":["../../src/utils/tokenizeInput.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,WAAW,EAAY,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAC,OAAO,EAAC,MAAM,cAAc,CAAC;AAErC,MAAM,UAAU,aAAa,CAAC,KAA2C,EAAE,SAAoB,EAAE,OAA4B;IACzH,IAAI,OAAO,KAAK,KAAK,QAAQ;QACzB,OAAO,SAAS,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;SACvC,IAAI,WAAW,CAAC,KAAK,CAAC;QACvB,OAAO,KAAK,CAAC,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;SACzC,IAAI,OAAO,CAAC,KAAK,CAAC;QACnB,OAAO,CAAC,KAAK,CAAC,CAAC;IAEnB,OAAO,KAAK,CAAC;AACjB,CAAC"}

package/dist/utils/utilTypes.d.ts

@@ -0,0 +1,3 @@
+export type Writable<T> = {
+    -readonly [P in keyof T]: T[P];
+};

package/dist/utils/utilTypes.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=utilTypes.js.map

package/dist/utils/utilTypes.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utilTypes.js","sourceRoot":"","sources":["../../src/utils/utilTypes.ts"],"names":[],"mappings":""}

package/dist/utils/waitForLockfileRelease.d.ts

@@ -0,0 +1,5 @@
+export declare function waitForLockfileRelease({ resourcePath, checkInterval, staleDuration }: {
+    resourcePath: string;
+    checkInterval?: number;
+    staleDuration?: number;
+}): Promise<void>;

package/dist/utils/waitForLockfileRelease.js

@@ -0,0 +1,20 @@
+import lockfile from "proper-lockfile";
+import { isLockActive, waitForLockRelease } from "lifecycle-utils";
+import { lockfileLockScope } from "./withLockfile.js";
+export async function waitForLockfileRelease({ resourcePath, checkInterval = 1000 * 5.5, staleDuration = 1000 * 10 }) {
+    // eslint-disable-next-line no-constant-condition
+    while (true) {
+        if (isLockActive(lockfileLockScope, resourcePath)) {
+            await waitForLockRelease(lockfileLockScope, resourcePath);
+            continue;
+        }
+        const lockfileActive = await lockfile.check(resourcePath, { stale: staleDuration, realpath: false });
+        const lockIsActive = isLockActive(lockfileLockScope, resourcePath);
+        if (lockIsActive)
+            continue;
+        if (!lockfileActive)
+            return;
+        await new Promise((resolve) => setTimeout(resolve, checkInterval));
+    }
+}
+//# sourceMappingURL=waitForLockfileRelease.js.map

package/dist/utils/waitForLockfileRelease.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"waitForLockfileRelease.js","sourceRoot":"","sources":["../../src/utils/waitForLockfileRelease.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,iBAAiB,CAAC;AACvC,OAAO,EAAC,YAAY,EAAE,kBAAkB,EAAC,MAAM,iBAAiB,CAAC;AACjE,OAAO,EAAC,iBAAiB,EAAC,MAAM,mBAAmB,CAAC;AAEpD,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,EACzC,YAAY,EAAE,aAAa,GAAG,IAAI,GAAG,GAAG,EAAE,aAAa,GAAG,IAAI,GAAG,EAAE,EAGtE;IACG,iDAAiD;IACjD,OAAO,IAAI,EAAE;QACT,IAAI,YAAY,CAAC,iBAAiB,EAAE,YAAY,CAAC,EAAE;YAC/C,MAAM,kBAAkB,CAAC,iBAAiB,EAAE,YAAY,CAAC,CAAC;YAC1D,SAAS;SACZ;QAED,MAAM,cAAc,GAAG,MAAM,QAAQ,CAAC,KAAK,CAAC,YAAY,EAAE,EAAC,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,KAAK,EAAC,CAAC,CAAC;QACnG,MAAM,YAAY,GAAG,YAAY,CAAC,iBAAiB,EAAE,YAAY,CAAC,CAAC;QAEnE,IAAI,YAAY;YACZ,SAAS;QAEb,IAAI,CAAC,cAAc;YACf,OAAO;QAEX,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC,CAAC;KACtE;AACL,CAAC"}

package/dist/utils/withLockfile.d.ts

@@ -0,0 +1,7 @@
+export declare const lockfileLockScope: {};
+export declare function withLockfile<const T>({ resourcePath, staleDuration, updateInterval, retries }: {
+    resourcePath: string;
+    staleDuration?: number;
+    updateInterval?: number;
+    retries?: number;
+}, callback: () => T | Promise<T>): Promise<T>;

package/dist/utils/withLockfile.js

@@ -0,0 +1,44 @@
+import lockfile from "proper-lockfile";
+import { withLock } from "lifecycle-utils";
+import { getConsoleLogPrefix } from "./getConsoleLogPrefix.js";
+export const lockfileLockScope = {};
+export async function withLockfile({ resourcePath, staleDuration = 1000 * 10, updateInterval = staleDuration / 2, retries = 2 }, callback) {
+    return await withLock(lockfileLockScope, resourcePath, async () => {
+        let releaseLock;
+        let res;
+        const lockPromise = lockfile.lock(resourcePath, {
+            stale: staleDuration,
+            update: updateInterval,
+            retries,
+            realpath: false
+        });
+        try {
+            releaseLock = await lockPromise;
+        }
+        catch (err) {
+            console.error(getConsoleLogPrefix() + `Failed to acquire lockfile for "${resourcePath}"`, err);
+            throw err;
+        }
+        try {
+            res = await callback();
+        }
+        catch (err) {
+            try {
+                await releaseLock();
+            }
+            catch (err) {
+                console.error(getConsoleLogPrefix() + `Failed to release lockfile for "${resourcePath}"`, err);
+            }
+            throw err;
+        }
+        try {
+            await releaseLock();
+        }
+        catch (err) {
+            console.error(getConsoleLogPrefix() + `Failed to release lockfile for "${resourcePath}"`, err);
+            throw err;
+        }
+        return res;
+    });
+}
+//# sourceMappingURL=withLockfile.js.map

package/dist/utils/withLockfile.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"withLockfile.js","sourceRoot":"","sources":["../../src/utils/withLockfile.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,iBAAiB,CAAC;AACvC,OAAO,EAAC,QAAQ,EAAC,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAC,mBAAmB,EAAC,MAAM,0BAA0B,CAAC;AAE7D,MAAM,CAAC,MAAM,iBAAiB,GAAG,EAAE,CAAC;AAEpC,MAAM,CAAC,KAAK,UAAU,YAAY,CAC9B,EACI,YAAY,EAAE,aAAa,GAAG,IAAI,GAAG,EAAE,EAAE,cAAc,GAAG,aAAa,GAAG,CAAC,EAAE,OAAO,GAAG,CAAC,EAG3F,EACD,QAA8B;IAE9B,OAAO,MAAM,QAAQ,CAAC,iBAAiB,EAAE,YAAY,EAAE,KAAK,IAAI,EAAE;QAC9D,IAAI,WAAgC,CAAC;QACrC,IAAI,GAAM,CAAC;QAEX,MAAM,WAAW,GAAG,QAAQ,CAAC,IAAI,CAAC,YAAY,EAAE;YAC5C,KAAK,EAAE,aAAa;YACpB,MAAM,EAAE,cAAc;YACtB,OAAO;YACP,QAAQ,EAAE,KAAK;SAClB,CAAC,CAAC;QAEH,IAAI;YACA,WAAW,GAAG,MAAM,WAAW,CAAC;SACnC;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,mBAAmB,EAAE,GAAG,mCAAmC,YAAY,GAAG,EAAE,GAAG,CAAC,CAAC;YAC/F,MAAM,GAAG,CAAC;SACb;QAED,IAAI;YACA,GAAG,GAAG,MAAM,QAAQ,EAAE,CAAC;SAC1B;QAAC,OAAO,GAAG,EAAE;YACV,IAAI;gBACA,MAAM,WAAW,EAAE,CAAC;aACvB;YAAC,OAAO,GAAG,EAAE;gBACV,OAAO,CAAC,KAAK,CAAC,mBAAmB,EAAE,GAAG,mCAAmC,YAAY,GAAG,EAAE,GAAG,CAAC,CAAC;aAClG;YAED,MAAM,GAAG,CAAC;SACb;QAED,IAAI;YACA,MAAM,WAAW,EAAE,CAAC;SACvB;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,mBAAmB,EAAE,GAAG,mCAAmC,YAAY,GAAG,EAAE,GAAG,CAAC,CAAC;YAC/F,MAAM,GAAG,CAAC;SACb;QAED,OAAO,GAAG,CAAC;IACf,CAAC,CAAC,CAAC;AACP,CAAC"}

package/dist/utils/withOra.d.ts

@@ -2,4 +2,6 @@ export default function withOra<T>(message: string | {
     loading: string;
     success?: string;
     fail?: string;
+    useStatusLogs?: boolean;
+    noSuccessLiveStatus?: boolean;
 }, callback: () => Promise<T>): Promise<T>;

package/dist/utils/withOra.js

@@ -1,20 +1,36 @@
 import ora from "ora";
+import { useCiLogs } from "../config.js";
+import { getConsoleLogPrefix } from "./getConsoleLogPrefix.js";
+import withStatusLogs from "./withStatusLogs.js";
 export default async function withOra(message, callback) {
-    const spinner = ora(typeof message === "string" ? message : message.loading);
-    spinner.start();
+    if (useCiLogs || (typeof message !== "string" && message.useStatusLogs))
+        return withStatusLogs(message, callback);
+    const spinner = ora({
+        prefixText: getConsoleLogPrefix(),
+        ...(typeof message === "string"
+            ? { text: message }
+            : { loading: message.loading, success: message.success, fail: message.fail })
+    });
+    spinner.start(typeof message === "string"
+        ? message
+        : message.loading);
     try {
         const res = await callback();
-        if (typeof message !== "string")
-            spinner.succeed(message.success);
+        if (typeof message !== "string") {
+            if (message.noSuccessLiveStatus)
+                spinner.clear();
+            else
+                spinner.succeed(message.success);
+        }
         else
-            spinner.succeed();
+            spinner.succeed(message);
         return res;
     }
     catch (er) {
         if (typeof message !== "string")
             spinner.fail(message.fail);
         else
-            spinner.fail();
+            spinner.fail(message);
         throw er;
     }
 }

package/dist/utils/withOra.js.map

@@ -1 +1 @@
-{"version":3,"file":"withOra.js","sourceRoot":"","sources":["../../src/utils/withOra.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,KAAK,CAAC;AAEtB,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,OAAO,CACjC,OAIC,EACD,QAA0B;IAE1B,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAE7E,OAAO,CAAC,KAAK,EAAE,CAAC;IAEhB,IAAI;QACA,MAAM,GAAG,GAAG,MAAM,QAAQ,EAAE,CAAC;QAE7B,IAAI,OAAO,OAAO,KAAK,QAAQ;YAC3B,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;;YAEjC,OAAO,CAAC,OAAO,EAAE,CAAC;QAEtB,OAAO,GAAG,CAAC;KACd;IAAC,OAAO,EAAE,EAAE;QACT,IAAI,OAAO,OAAO,KAAK,QAAQ;YAC3B,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;;YAE3B,OAAO,CAAC,IAAI,EAAE,CAAC;QAEnB,MAAM,EAAE,CAAC;KACZ;AACL,CAAC"}
+{"version":3,"file":"withOra.js","sourceRoot":"","sources":["../../src/utils/withOra.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,KAAK,CAAC;AACtB,OAAO,EAAC,SAAS,EAAC,MAAM,cAAc,CAAC;AACvC,OAAO,EAAC,mBAAmB,EAAC,MAAM,0BAA0B,CAAC;AAC7D,OAAO,cAAc,MAAM,qBAAqB,CAAC;AAEjD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,OAAO,CACjC,OAMC,EACD,QAA0B;IAE1B,IAAI,SAAS,IAAI,CAAC,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,CAAC,aAAa,CAAC;QACnE,OAAO,cAAc,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IAE7C,MAAM,OAAO,GAAG,GAAG,CAAC;QAChB,UAAU,EAAE,mBAAmB,EAAE;QACjC,GAAG,CACC,OAAO,OAAO,KAAK,QAAQ;YACvB,CAAC,CAAC,EAAC,IAAI,EAAE,OAAO,EAAqC;YACrD,CAAC,CAAC,EAAC,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAC,CACjF;KACJ,CAAC,CAAC;IAEH,OAAO,CAAC,KAAK,CACT,OAAO,OAAO,KAAK,QAAQ;QACvB,CAAC,CAAC,OAAO;QACT,CAAC,CAAC,OAAO,CAAC,OAAO,CACxB,CAAC;IAEF,IAAI;QACA,MAAM,GAAG,GAAG,MAAM,QAAQ,EAAE,CAAC;QAE7B,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;YAC7B,IAAI,OAAO,CAAC,mBAAmB;gBAC3B,OAAO,CAAC,KAAK,EAAE,CAAC;;gBAEhB,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;SACxC;;YACG,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAE7B,OAAO,GAAG,CAAC;KACd;IAAC,OAAO,EAAE,EAAE;QACT,IAAI,OAAO,OAAO,KAAK,QAAQ;YAC3B,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;;YAE3B,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAE1B,MAAM,EAAE,CAAC;KACZ;AACL,CAAC"}

package/dist/utils/withProgressLog.d.ts

@@ -0,0 +1,23 @@
+/// <reference types="node" />
+export declare function withProgressLog<T>({ loadingText, successText, failText, liveUpdates, statusIcons, initialPercentage, initialProgressBarText, progressBarLength, minPercentageChangeForNonLiveUpdates, eta, etaUpdateInterval, noProgress, progressFractionDigits, noSuccessLiveStatus, liveCtrlCSendsAbortSignal }: {
+    loadingText: string;
+    successText: string;
+    failText: string;
+    liveUpdates?: boolean;
+    statusIcons?: boolean;
+    initialPercentage?: number;
+    initialProgressBarText?: string;
+    progressBarLength?: number;
+    minPercentageChangeForNonLiveUpdates?: number;
+    eta?: boolean;
+    etaUpdateInterval?: number;
+    noProgress?: boolean;
+    progressFractionDigits?: boolean;
+    noSuccessLiveStatus?: boolean;
+    liveCtrlCSendsAbortSignal?: boolean;
+}, callback: (progressUpdater: ProgressUpdater) => Promise<T>): Promise<T>;
+type ProgressUpdater = {
+    setProgress(percentage: number, progressText?: string): ProgressUpdater;
+    abortSignal?: AbortSignal;
+};
+export {};

package/dist/utils/withProgressLog.js

@@ -0,0 +1,211 @@
+import process from "process";
+import UpdateManager from "stdout-update";
+import sliceAnsi from "slice-ansi";
+import stripAnsi from "strip-ansi";
+import chalk from "chalk";
+import logSymbols from "log-symbols";
+import prettyMilliseconds from "pretty-ms";
+import { useCiLogs } from "../config.js";
+import { clockChar } from "../consts.js";
+import { ConsoleInteraction, ConsoleInteractionKey } from "../cli/utils/ConsoleInteraction.js";
+import { getConsoleLogPrefix } from "./getConsoleLogPrefix.js";
+import withOra from "./withOra.js";
+export async function withProgressLog({ loadingText, successText, failText, liveUpdates = true, statusIcons = true, initialPercentage = 0, initialProgressBarText, progressBarLength = 40, minPercentageChangeForNonLiveUpdates = 0.1, eta = true, etaUpdateInterval = 1000, noProgress = false, progressFractionDigits = true, noSuccessLiveStatus = false, liveCtrlCSendsAbortSignal = false }, callback) {
+    const shouldLiveUpdate = !useCiLogs && liveUpdates;
+    const startTime = Date.now();
+    const abortController = new AbortController();
+    let currentProgress = initialPercentage;
+    let currentProgressBarText = initialProgressBarText;
+    let isAborted = false;
+    const getEta = () => {
+        const now = Date.now();
+        if (!eta || currentProgress === 1 || now - startTime < 1000)
+            return null;
+        const timeRemaining = ((now - startTime) / currentProgress) * (1 - currentProgress);
+        if (!Number.isFinite(timeRemaining) || typeof timeRemaining === "bigint")
+            return null;
+        if (timeRemaining < 1000)
+            return "0s left";
+        try {
+            return prettyMilliseconds(timeRemaining, {
+                keepDecimalsOnWholeSeconds: true,
+                secondsDecimalDigits: 2,
+                compact: true
+            }) + " left";
+        }
+        catch (err) {
+            return null;
+        }
+    };
+    if (noProgress) {
+        return withOra({
+            loading: loadingText,
+            success: successText,
+            fail: failText,
+            useStatusLogs: !shouldLiveUpdate,
+            noSuccessLiveStatus
+        }, () => {
+            const progressUpdater = {
+                setProgress: () => progressUpdater
+            };
+            return callback(progressUpdater);
+        });
+    }
+    else if (!shouldLiveUpdate) {
+        const getLoadingText = () => {
+            const formattedProgress = (currentProgress * 100)
+                .toLocaleString("en-US", {
+                minimumIntegerDigits: 1,
+                minimumFractionDigits: 0,
+                maximumFractionDigits: progressFractionDigits ? 3 : 0
+            }) + "%";
+            const etaText = getEta();
+            return [
+                chalk.cyan(clockChar),
+                loadingText,
+                chalk.yellow(formattedProgress),
+                (currentProgressBarText != null && currentProgressBarText !== "")
+                    ? chalk.gray(currentProgressBarText + (etaText != null
+                        ? (" | " + etaText)
+                        : ""))
+                    : chalk.gray(etaText ?? "")
+            ].join(" ");
+        };
+        let lastLogProgress = initialPercentage;
+        let lastLogProgressBarText = initialProgressBarText;
+        const progressUpdater = {
+            setProgress(progress, progressText) {
+                currentProgress = progress;
+                currentProgressBarText = progressText;
+                if (Math.abs(currentProgress - lastLogProgress) >= minPercentageChangeForNonLiveUpdates ||
+                    currentProgressBarText !== lastLogProgressBarText ||
+                    (progress === 1 && lastLogProgress !== 1)) {
+                    console.log(getConsoleLogPrefix() + getLoadingText());
+                    lastLogProgress = currentProgress;
+                    lastLogProgressBarText = currentProgressBarText;
+                }
+                return progressUpdater;
+            }
+        };
+        console.log(getConsoleLogPrefix() + getLoadingText());
+        try {
+            const res = await callback(progressUpdater);
+            console.log(getConsoleLogPrefix() + `${logSymbols.success} ${successText}`);
+            return res;
+        }
+        catch (er) {
+            console.log(getConsoleLogPrefix() + `${logSymbols.error} ${failText}`);
+            throw er;
+        }
+    }
+    const updateManager = UpdateManager.getInstance();
+    let etaUpdateTimeout = undefined;
+    function getProgressLine() {
+        const formattedProgress = (currentProgress * 100)
+            .toLocaleString("en-US", {
+            minimumIntegerDigits: 1,
+            minimumFractionDigits: progressFractionDigits ? 4 : 0,
+            maximumFractionDigits: progressFractionDigits ? 4 : 0
+        })
+            .slice(0, 5) + "%";
+        const addedText = (currentProgressBarText != null && currentProgressBarText !== "")
+            ? currentProgressBarText
+            : "";
+        const leftPad = " ".repeat(Math.floor((progressBarLength - stripAnsi(formattedProgress + (addedText.length > 0
+            ? (addedText + 1)
+            : 0)).length) / 2));
+        return [
+            loadingText,
+            renderProgressBar({
+                barText: leftPad + ` ${chalk.black.bgWhiteBright(formattedProgress)}${addedText.length === 0 ? "" : (" " + chalk.gray(addedText))} `,
+                backgroundText: leftPad + ` ${chalk.yellow.bgGray(formattedProgress)}${addedText.length === 0 ? "" : (" " + chalk.white(addedText))} `,
+                length: progressBarLength,
+                loadedPercentage: Math.max(0, Math.min(1, currentProgress)),
+                barStyle: chalk.black.bgWhiteBright,
+                backgroundStyle: chalk.bgGray
+            }),
+            isAborted
+                ? chalk.red("Aborted")
+                : chalk.gray(getEta() ?? "")
+        ].join(" ");
+    }
+    function updateProgressBar() {
+        updateManager.update([
+            getConsoleLogPrefix() + getProgressLine()
+        ]);
+        clearTimeout(etaUpdateTimeout);
+        if (eta && currentProgress !== 1)
+            etaUpdateTimeout = setTimeout(updateProgressBar, etaUpdateInterval);
+    }
+    const progressUpdater = {
+        setProgress(progress, progressText) {
+            currentProgress = progress;
+            currentProgressBarText = progressText;
+            if (!isAborted)
+                updateProgressBar();
+            return progressUpdater;
+        },
+        abortSignal: liveCtrlCSendsAbortSignal
+            ? abortController.signal
+            : undefined
+    };
+    updateManager.hook();
+    const consoleInteraction = new ConsoleInteraction();
+    let moveCursorUpAfterUnhook = false;
+    consoleInteraction.onKey(ConsoleInteractionKey.ctrlC, () => {
+        isAborted = true;
+        if (liveCtrlCSendsAbortSignal) {
+            abortController.abort();
+            consoleInteraction.stop();
+            updateProgressBar();
+            updateManager.unhook(true);
+        }
+        else {
+            consoleInteraction.stop();
+            updateManager.unhook(true);
+            updateProgressBar();
+            process.exit(0);
+        }
+    });
+    try {
+        updateProgressBar();
+        consoleInteraction.start();
+        const res = await callback(progressUpdater);
+        clearTimeout(etaUpdateTimeout);
+        if (noSuccessLiveStatus) {
+            updateManager.update([""]);
+            moveCursorUpAfterUnhook = true;
+        }
+        else
+            updateManager.update([
+                getConsoleLogPrefix() + (statusIcons
+                    ? (logSymbols.success + " ")
+                    : "") + successText
+            ]);
+        return res;
+    }
+    catch (err) {
+        updateManager.update([
+            getConsoleLogPrefix() + (statusIcons
+                ? (logSymbols.error + " ")
+                : "") + failText
+        ]);
+        throw err;
+    }
+    finally {
+        consoleInteraction.stop();
+        updateManager.unhook(true);
+        if (moveCursorUpAfterUnhook)
+            process.stdout.moveCursor(0, -1);
+    }
+}
+function renderProgressBar({ barText, backgroundText, length, loadedPercentage, barStyle, backgroundStyle }) {
+    const barChars = Math.floor(length * loadedPercentage);
+    const backgroundChars = length - barChars;
+    const slicedBarText = sliceAnsi(barText, 0, barChars);
+    const paddedBarText = slicedBarText + " ".repeat(barChars - stripAnsi(slicedBarText).length);
+    const slicedBackgroundText = sliceAnsi(backgroundText, barChars, barChars + backgroundChars);
+    const paddedBackgroundText = slicedBackgroundText + " ".repeat(backgroundChars - stripAnsi(slicedBackgroundText).length);
+    return barStyle(paddedBarText) + backgroundStyle(paddedBackgroundText);
+}
+//# sourceMappingURL=withProgressLog.js.map

package/dist/utils/withProgressLog.js.map

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

package/dist/utils/withStatusLogs.d.ts

@@ -1,5 +1,6 @@
-export default function withStatusLogs<T>(message: string | {
+export default function withStatusLogs<T>(messageAndOptions: string | {
     loading: string;
     success?: string;
     fail?: string;
+    disableLogs?: boolean;
 }, callback: () => Promise<T>): Promise<T>;

package/dist/utils/withStatusLogs.js

@@ -1,21 +1,24 @@
 import chalk from "chalk";
 import logSymbols from "log-symbols";
-const clockChar = "\u25f7";
-export default async function withStatusLogs(message, callback) {
-    console.log(`${chalk.cyan(clockChar)} ${typeof message === "string" ? message : message.loading}`);
+import { clockChar } from "../consts.js";
+import { getConsoleLogPrefix } from "./getConsoleLogPrefix.js";
+export default async function withStatusLogs(messageAndOptions, callback) {
+    if (typeof messageAndOptions !== "string" && messageAndOptions.disableLogs)
+        return await callback();
+    console.log(getConsoleLogPrefix() + `${chalk.cyan(clockChar)} ${typeof messageAndOptions === "string" ? messageAndOptions : messageAndOptions.loading}`);
     try {
         const res = await callback();
-        if (typeof message !== "string")
-            console.log(`${logSymbols.success} ${message.success}`);
+        if (typeof messageAndOptions !== "string")
+            console.log(getConsoleLogPrefix() + `${logSymbols.success} ${messageAndOptions.success}`);
         else
-            console.log(`${logSymbols.success} ${message}`);
+            console.log(getConsoleLogPrefix() + `${logSymbols.success} ${messageAndOptions}`);
         return res;
     }
     catch (er) {
-        if (typeof message !== "string")
-            console.log(`${logSymbols.error} ${message.fail}`);
+        if (typeof messageAndOptions !== "string")
+            console.log(getConsoleLogPrefix() + `${logSymbols.error} ${messageAndOptions.fail}`);
         else
-            console.log(`${logSymbols.error} ${message}`);
+            console.log(getConsoleLogPrefix() + `${logSymbols.error} ${messageAndOptions}`);
         throw er;
     }
 }

package/dist/utils/withStatusLogs.js.map

@@ -1 +1 @@
-{"version":3,"file":"withStatusLogs.js","sourceRoot":"","sources":["../../src/utils/withStatusLogs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,UAAU,MAAM,aAAa,CAAC;AAErC,MAAM,SAAS,GAAG,QAAQ,CAAC;AAE3B,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,cAAc,CACxC,OAIC,EACD,QAA0B;IAE1B,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;IAEnG,IAAI;QACA,MAAM,GAAG,GAAG,MAAM,QAAQ,EAAE,CAAC;QAE7B,IAAI,OAAO,OAAO,KAAK,QAAQ;YAC3B,OAAO,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC,OAAO,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;;YAExD,OAAO,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC,OAAO,IAAI,OAAO,EAAE,CAAC,CAAC;QAEpD,OAAO,GAAG,CAAC;KACd;IAAC,OAAO,EAAE,EAAE;QACT,IAAI,OAAO,OAAO,KAAK,QAAQ;YAC3B,OAAO,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC,KAAK,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;;YAEnD,OAAO,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC,KAAK,IAAI,OAAO,EAAE,CAAC,CAAC;QAElD,MAAM,EAAE,CAAC;KACZ;AACL,CAAC"}
+{"version":3,"file":"withStatusLogs.js","sourceRoot":"","sources":["../../src/utils/withStatusLogs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,UAAU,MAAM,aAAa,CAAC;AACrC,OAAO,EAAC,SAAS,EAAC,MAAM,cAAc,CAAC;AACvC,OAAO,EAAC,mBAAmB,EAAC,MAAM,0BAA0B,CAAC;AAG7D,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,cAAc,CACxC,iBAKC,EACD,QAA0B;IAE1B,IAAI,OAAO,iBAAiB,KAAK,QAAQ,IAAI,iBAAiB,CAAC,WAAW;QACtE,OAAO,MAAM,QAAQ,EAAE,CAAC;IAE5B,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,OAAO,iBAAiB,KAAK,QAAQ,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,iBAAiB,CAAC,OAAO,EAAE,CAAC,CAAC;IAEzJ,IAAI;QACA,MAAM,GAAG,GAAG,MAAM,QAAQ,EAAE,CAAC;QAE7B,IAAI,OAAO,iBAAiB,KAAK,QAAQ;YACrC,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,GAAG,GAAG,UAAU,CAAC,OAAO,IAAI,iBAAiB,CAAC,OAAO,EAAE,CAAC,CAAC;;YAE1F,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,GAAG,GAAG,UAAU,CAAC,OAAO,IAAI,iBAAiB,EAAE,CAAC,CAAC;QAEtF,OAAO,GAAG,CAAC;KACd;IAAC,OAAO,EAAE,EAAE;QACT,IAAI,OAAO,iBAAiB,KAAK,QAAQ;YACrC,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,GAAG,GAAG,UAAU,CAAC,KAAK,IAAI,iBAAiB,CAAC,IAAI,EAAE,CAAC,CAAC;;YAErF,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,GAAG,GAAG,UAAU,CAAC,KAAK,IAAI,iBAAiB,EAAE,CAAC,CAAC;QAEpF,MAAM,EAAE,CAAC;KACZ;AACL,CAAC"}

package/llama/.clang-format

@@ -17,7 +17,7 @@ FixNamespaceComments: false
 IndentAccessModifiers: true
 SpaceAfterCStyleCast: false
 PointerAlignment: Left
-IndentCaseLabels: false
+IndentCaseLabels: true
 BinPackArguments: false
 BinPackParameters: false
 Cpp11BracedListStyle: false
@@ -29,7 +29,6 @@ AlwaysBreakTemplateDeclarations: No
 DeriveLineEnding: false
 UseCRLF: false
 AllowAllArgumentsOnNextLine: true
-AlignAfterOpenBracket: DontAlign
 PackConstructorInitializers: CurrentLine
 AlignAfterOpenBracket: BlockIndent
 BraceWrapping: