toolcraft-openapi 0.0.163 → 0.0.165

package/dist/composition.json

@@ -33,12 +33,12 @@
     },
     {
       "name": "toolcraft-openapi",
-      "version": "0.0.163",
+      "version": "0.0.165",
       "license": "MIT"
     },
     {
       "name": "toolcraft-schema",
-      "version": "0.0.163",
+      "version": "0.0.165",
       "license": "MIT"
     },
     {

package/node_modules/toolcraft-design/dist/prompts/interactive/core.d.ts

@@ -24,6 +24,8 @@ export interface PromptOptions<Value> {
 }
 type InputStream = NodeJS.ReadableStream & {
     isTTY?: boolean;
+    destroyed?: boolean;
+    readableEnded?: boolean;
     setRawMode?: (enabled: boolean) => void;
     unpipe?: () => void;
 };
@@ -41,17 +43,17 @@ export declare class Prompt<Value> extends EventEmitter {
     private readonly trackValue;
     private previousFrame;
     private readlineInterface?;
-    private abortListener?;
     private closed;
     constructor(opts: PromptOptions<Value>, trackValue?: boolean);
     get cursor(): number;
     prompt(): Promise<Value | typeof CANCEL>;
     protected promptNonTty(): Promise<Value | typeof CANCEL>;
-    protected readNonTtyLine(): Promise<string>;
+    protected readNonTtyLine(): Promise<string | typeof CANCEL>;
     protected setValue(value: Value | undefined): void;
     protected setError(message: string): void;
     protected setUserInput(value: string): void;
     protected clearUserInput(): void;
+    private readonly onCancel;
     private readonly onKeypress;
     private updateTrackedInput;
     protected readonly render: () => void;

package/node_modules/toolcraft-design/dist/prompts/interactive/core.js

@@ -1,5 +1,6 @@
 import { EventEmitter } from "node:events";
 import * as readline from "node:readline";
+import { graphemes } from "../../dashboard/terminal-width.js";
 import { CANCEL } from "./cancel-symbol.js";
 import { mapKey } from "./keys.js";
 import { wrapFrame } from "./wrap.js";
@@ -50,7 +51,6 @@ export class Prompt extends EventEmitter {
     trackValue;
     previousFrame = "";
     readlineInterface;
-    abortListener;
     closed = false;
     constructor(opts, trackValue = true) {
         super();
@@ -75,18 +75,16 @@ export class Prompt extends EventEmitter {
         if (this.input.isTTY !== true) {
             return this.promptNonTty();
         }
+        if (this.input.destroyed || this.input.readableEnded) {
+            this.state = "cancel";
+            return Promise.resolve(CANCEL);
+        }
         return new Promise((resolve) => {
             const onSubmit = (value) => resolve(value);
             const onCancel = () => resolve(CANCEL);
             this.once("submit", onSubmit);
             this.once("cancel", onCancel);
-            this.abortListener = () => {
-                this.state = "cancel";
-                this.emit("finalize");
-                this.render();
-                this.close();
-            };
-            this.signal?.addEventListener("abort", this.abortListener, { once: true });
+            this.signal?.addEventListener("abort", this.onCancel, { once: true });
             this.readlineInterface = readline.createInterface({
                 input: this.input,
                 output: undefined,
@@ -95,6 +93,8 @@ export class Prompt extends EventEmitter {
                 escapeCodeTimeout: 50,
                 terminal: true
             });
+            this.readlineInterface.once("close", this.onCancel);
+            this.input.once("close", this.onCancel);
             readline.emitKeypressEvents(this.input, this.readlineInterface);
             this.readlineInterface.prompt();
             this.input.on("keypress", this.onKeypress);
@@ -117,11 +117,20 @@ export class Prompt extends EventEmitter {
                     return;
                 }
                 settled = true;
+                this.signal?.removeEventListener("abort", onAbort);
                 rl.close();
                 resolve(value);
             };
+            const onAbort = () => {
+                this.state = "cancel";
+                settle(CANCEL);
+            };
             rl.once("line", settle);
             rl.once("close", () => settle(rl.line));
+            this.signal?.addEventListener("abort", onAbort, { once: true });
+            if (this.signal?.aborted) {
+                onAbort();
+            }
         });
     }
     setValue(value) {
@@ -134,6 +143,15 @@ export class Prompt extends EventEmitter {
     setUserInput(value) {
         this.userInput = value;
         this._cursor = Math.min(this._cursor, this.userInput.length);
+        if (this.trackValue) {
+            let boundary = 0;
+            for (const segment of graphemes(value)) {
+                if (boundary >= this._cursor)
+                    break;
+                boundary += segment.length;
+            }
+            this._cursor = boundary;
+        }
         this.emit("userInput", this.userInput);
     }
     clearUserInput() {
@@ -141,7 +159,19 @@ export class Prompt extends EventEmitter {
         this._cursor = 0;
         this.emit("userInput", this.userInput);
     }
+    onCancel = () => {
+        if (this.closed || this.state === "submit" || this.state === "cancel") {
+            return;
+        }
+        this.state = "cancel";
+        this.emit("finalize");
+        this.render();
+        this.close();
+    };
     onKeypress = (char, key = {}) => {
+        if (this.closed) {
+            return;
+        }
         let action = mapKey(key.name, char);
         if (this.trackValue && char && char >= " " && key.name !== "return" && key.name !== "enter" && key.name !== "escape") {
             action = undefined;
@@ -187,6 +217,14 @@ export class Prompt extends EventEmitter {
         }
     };
     updateTrackedInput(char, key, action) {
+        if (key.name === "home") {
+            this._cursor = 0;
+            return;
+        }
+        if (key.name === "end") {
+            this._cursor = this.userInput.length;
+            return;
+        }
         if (key.ctrl) {
             if (key.name === "a") {
                 this._cursor = 0;
@@ -197,23 +235,24 @@ export class Prompt extends EventEmitter {
                 return;
             }
             if (key.name === "u") {
-                this.userInput = this.userInput.slice(this._cursor);
+                const remaining = this.userInput.slice(this._cursor);
                 this._cursor = 0;
-                this.emit("userInput", this.userInput);
+                this.setUserInput(remaining);
                 return;
             }
             if (key.name === "k") {
-                this.userInput = this.userInput.slice(0, this._cursor);
-                this.emit("userInput", this.userInput);
+                this.setUserInput(this.userInput.slice(0, this._cursor));
                 return;
             }
         }
+        const before = this.userInput.slice(0, this._cursor);
+        const after = this.userInput.slice(this._cursor);
         if (action === "left") {
-            this._cursor = Math.max(0, this._cursor - 1);
+            this._cursor -= graphemes(before).at(-1)?.length ?? 0;
             return;
         }
         if (action === "right") {
-            this._cursor = Math.min(this.userInput.length, this._cursor + 1);
+            this._cursor += graphemes(after)[0]?.length ?? 0;
             return;
         }
         if (action === "cancel" || action === "up" || action === "down" || action === "space") {
@@ -221,25 +260,22 @@ export class Prompt extends EventEmitter {
         }
         if (key.name === "backspace" || char === "\b" || char === "\x7f") {
             if (this._cursor > 0) {
-                this.userInput = `${this.userInput.slice(0, this._cursor - 1)}${this.userInput.slice(this._cursor)}`;
-                this._cursor -= 1;
-                this.emit("userInput", this.userInput);
+                this._cursor -= graphemes(before).at(-1)?.length ?? 0;
+                this.setUserInput(`${before.slice(0, this._cursor)}${after}`);
             }
             return;
         }
         if (key.name === "delete") {
             if (this._cursor < this.userInput.length) {
-                this.userInput = `${this.userInput.slice(0, this._cursor)}${this.userInput.slice(this._cursor + 1)}`;
-                this.emit("userInput", this.userInput);
+                this.setUserInput(`${before}${after.slice(graphemes(after)[0]?.length ?? 0)}`);
             }
             return;
         }
         if (!char || char < " " || key.ctrl) {
             return;
         }
-        this.userInput = `${this.userInput.slice(0, this._cursor)}${char}${this.userInput.slice(this._cursor)}`;
         this._cursor += char.length;
-        this.emit("userInput", this.userInput);
+        this.setUserInput(`${before}${char}${after}`);
     }
     render = () => {
         if (this.closed) {
@@ -267,10 +303,10 @@ export class Prompt extends EventEmitter {
         }
         this.closed = true;
         this.input.removeListener("keypress", this.onKeypress);
+        this.input.removeListener("close", this.onCancel);
         this.output.removeListener("resize", this.render);
-        if (this.abortListener) {
-            this.signal?.removeEventListener("abort", this.abortListener);
-        }
+        this.signal?.removeEventListener("abort", this.onCancel);
+        this.readlineInterface?.removeListener("close", this.onCancel);
         this.output.write(`${cursor.show}\n`);
         if (!process.platform.startsWith("win") && this.input.setRawMode) {
             this.input.setRawMode(false);

package/node_modules/toolcraft-design/dist/prompts/interactive/multiselect.js

@@ -2,6 +2,7 @@ import { color } from "../../components/color.js";
 import { GLYPHS, symbol } from "./glyphs.js";
 import { Prompt } from "./core.js";
 import { limitOptions } from "./pagination.js";
+import { wrapTextWithPrefix } from "./wrap.js";
 import { findNonDisabled } from "./select.js";
 class MultiselectPrompt extends Prompt {
     options;
@@ -111,7 +112,7 @@ function renderMultiselectPrompt(prompt, opts) {
                 .map((option) => prompt.state === "submit" ? color.dim(option.label) : color.dim.strikethrough(option.label))
                 .join(", ");
         const end = prompt.state === "submit" ? color.green(GLYPHS.barEnd) : color.red(GLYPHS.barEnd);
-        return `${color.gray(GLYPHS.barStart)} ${symbol(prompt.state)} ${opts.message}\n${color.gray(GLYPHS.bar)}  ${labels}\n${end}`;
+        return `${color.gray(GLYPHS.barStart)} ${symbol(prompt.state)} ${opts.message}\n${wrapTextWithPrefix(opts.output ?? process.stdout, labels, `${color.gray(GLYPHS.bar)}  `)}\n${end}`;
     }
     const lines = limitOptions({
         cursor: prompt.cursor,
@@ -120,7 +121,7 @@ function renderMultiselectPrompt(prompt, opts) {
         maxItems: opts.maxItems,
         columnPadding: 3,
         style: (option, active) => renderOption(option, prompt.value, active, false, false)
-    }).map((line) => `${prompt.state === "error" ? color.yellow(GLYPHS.bar) : color.cyan(GLYPHS.bar)}  ${line}`);
+    }).flatMap((line) => line.split("\n").map((physicalLine) => `${prompt.state === "error" ? color.yellow(GLYPHS.bar) : color.cyan(GLYPHS.bar)}  ${physicalLine}`));
     const body = [`${color.gray(GLYPHS.barStart)} ${symbol(prompt.state)} ${opts.message}`, ...lines];
     if (prompt.state === "error") {
         body.push(`${color.yellow(GLYPHS.barEnd)}  ${color.yellow(prompt.error)}`);

package/node_modules/toolcraft-design/dist/prompts/interactive/pagination.js

@@ -5,24 +5,6 @@ import { wrapAnsi } from "fast-wrap-ansi";
 function countLines(values) {
     return values.reduce((sum, value) => sum + value.split("\n").length, 0);
 }
-function trimToRows(values, cursorOffset, rows, hasTop, hasBottom) {
-    const output = [...values];
-    while (countLines(output) > rows && output.length > 1) {
-        const removeFromTop = hasTop && cursorOffset > 0;
-        const removeFromBottom = hasBottom && cursorOffset < output.length - 1;
-        if (removeFromTop) {
-            output.shift();
-            cursorOffset -= 1;
-        }
-        else if (removeFromBottom) {
-            output.pop();
-        }
-        else {
-            output.pop();
-        }
-    }
-    return output;
-}
 export function limitOptions(opts) {
     const { cursor, options, style, output, maxItems = Number.POSITIVE_INFINITY, columnPadding = 0, rowPadding = 4 } = opts;
     if (options.length === 0) {
@@ -36,17 +18,29 @@ export function limitOptions(opts) {
     if (cursor >= cappedVisibleCount - 3) {
         start = Math.max(Math.min(cursor - cappedVisibleCount + 3, options.length - cappedVisibleCount), 0);
     }
-    const hasTopMarker = cappedVisibleCount < options.length && start > 0;
-    const hasBottomMarker = cappedVisibleCount < options.length && start + cappedVisibleCount < options.length;
+    let end = start + cappedVisibleCount;
     const visible = options
-        .slice(start, start + cappedVisibleCount)
+        .slice(start, end)
         .map((option, index) => wrapAnsi(style(option, start + index === cursor), columns, { hard: true, trim: false }));
-    const trimmed = trimToRows(visible, Math.max(cursor - start, 0), Math.max(rowBudget - Number(hasTopMarker) - Number(hasBottomMarker), 1), hasTopMarker, hasBottomMarker);
-    if (hasTopMarker) {
-        trimmed.unshift(color.dim(GLYPHS.ellipsis));
+    const marker = wrapAnsi(color.dim(GLYPHS.ellipsis), columns, { hard: true, trim: false });
+    const markerRows = marker.split("\n").length;
+    while (visible.length > 1 && countLines(visible) + markerRows * (Number(start > 0) + Number(end < options.length)) > rowBudget) {
+        if (start < cursor) {
+            visible.shift();
+            start += 1;
+        }
+        else {
+            visible.pop();
+            end -= 1;
+        }
+    }
+    let remainingRows = rowBudget - countLines(visible);
+    if (start > 0 && remainingRows >= markerRows) {
+        visible.unshift(marker);
+        remainingRows -= markerRows;
     }
-    if (hasBottomMarker) {
-        trimmed.push(color.dim(GLYPHS.ellipsis));
+    if (end < options.length && remainingRows >= markerRows) {
+        visible.push(marker);
     }
-    return trimmed;
+    return visible;
 }

package/node_modules/toolcraft-design/dist/prompts/interactive/password.js

@@ -1,6 +1,8 @@
 import { color } from "../../components/color.js";
+import { graphemes } from "../../dashboard/terminal-width.js";
 import { GLYPHS, symbol, symbolBar } from "./glyphs.js";
 import { Prompt } from "./core.js";
+import { wrapTextWithPrefix } from "./wrap.js";
 class PasswordPrompt extends Prompt {
     mask;
     constructor(opts) {
@@ -15,16 +17,17 @@ class PasswordPrompt extends Prompt {
         this.on("userInput", (value) => this.setValue(value));
     }
     get masked() {
-        return this.mask.repeat(this.userInput.length);
+        return this.mask.repeat(graphemes(this.userInput).length);
     }
     get userInputWithCursor() {
         if (this.state === "submit") {
             return this.masked;
         }
         const masked = this.masked;
-        const before = masked.slice(0, this.cursor);
-        const current = masked[this.cursor];
-        const after = masked.slice(this.cursor + 1);
+        const maskCursor = graphemes(this.userInput.slice(0, this.cursor)).length * this.mask.length;
+        const before = masked.slice(0, maskCursor);
+        const current = masked.slice(maskCursor, maskCursor + this.mask.length);
+        const after = masked.slice(maskCursor + this.mask.length);
         if (current) {
             return `${before}${color.inverse(current)}${after}`;
         }
@@ -40,15 +43,15 @@ function renderHeader(prompt, message) {
 function renderPasswordPrompt(prompt, opts) {
     const value = prompt.masked;
     if (prompt.state === "submit") {
-        return `${renderHeader(prompt, opts.message)}\n${color.gray(GLYPHS.bar)}  ${color.dim(value)}\n${color.green(GLYPHS.barEnd)}`;
+        return `${renderHeader(prompt, opts.message)}\n${wrapTextWithPrefix(opts.output ?? process.stdout, color.dim(value), `${color.gray(GLYPHS.bar)}  `)}\n${color.green(GLYPHS.barEnd)}`;
     }
     if (prompt.state === "cancel") {
-        return `${renderHeader(prompt, opts.message)}\n${color.gray(GLYPHS.bar)}  ${color.dim.strikethrough(value)}\n${color.red(GLYPHS.barEnd)}`;
+        return `${renderHeader(prompt, opts.message)}\n${wrapTextWithPrefix(opts.output ?? process.stdout, color.dim.strikethrough(value), `${color.gray(GLYPHS.bar)}  `)}\n${color.red(GLYPHS.barEnd)}`;
     }
     if (prompt.state === "error") {
-        return `${renderHeader(prompt, opts.message)}\n${symbolBar(prompt.state)}  ${prompt.userInputWithCursor}\n${color.yellow(GLYPHS.barEnd)}  ${color.yellow(prompt.error)}`;
+        return `${renderHeader(prompt, opts.message)}\n${wrapTextWithPrefix(opts.output ?? process.stdout, prompt.userInputWithCursor, `${symbolBar(prompt.state)}  `)}\n${color.yellow(GLYPHS.barEnd)}  ${color.yellow(prompt.error)}`;
     }
-    return `${renderHeader(prompt, opts.message)}\n${symbolBar(prompt.state)}  ${prompt.userInputWithCursor}\n${color.cyan(GLYPHS.barEnd)}`;
+    return `${renderHeader(prompt, opts.message)}\n${wrapTextWithPrefix(opts.output ?? process.stdout, prompt.userInputWithCursor, `${symbolBar(prompt.state)}  `)}\n${color.cyan(GLYPHS.barEnd)}`;
 }
 export function passwordPrompt(opts) {
     return new PasswordPrompt(opts).prompt();

package/node_modules/toolcraft-design/dist/prompts/interactive/select.js

@@ -2,6 +2,7 @@ import { color } from "../../components/color.js";
 import { GLYPHS, symbol } from "./glyphs.js";
 import { Prompt } from "./core.js";
 import { limitOptions } from "./pagination.js";
+import { wrapTextWithPrefix } from "./wrap.js";
 class SelectPrompt extends Prompt {
     options;
     constructor(opts) {
@@ -72,7 +73,7 @@ function renderSelectPrompt(prompt, opts) {
         const option = prompt.visibleOptions[prompt.cursor];
         const rendered = option ? renderOption(option, false, prompt.state === "submit", prompt.state === "cancel") : "";
         const end = prompt.state === "submit" ? color.green(GLYPHS.barEnd) : color.red(GLYPHS.barEnd);
-        return `${color.gray(GLYPHS.barStart)} ${symbol(prompt.state)} ${opts.message}\n${color.gray(GLYPHS.bar)}  ${rendered}\n${end}`;
+        return `${color.gray(GLYPHS.barStart)} ${symbol(prompt.state)} ${opts.message}\n${wrapTextWithPrefix(opts.output ?? process.stdout, rendered, `${color.gray(GLYPHS.bar)}  `)}\n${end}`;
     }
     const lines = limitOptions({
         cursor: prompt.cursor,
@@ -81,7 +82,7 @@ function renderSelectPrompt(prompt, opts) {
         maxItems: opts.maxItems,
         columnPadding: 3,
         style: (option, active) => renderOption(option, active, false, false)
-    }).map((line) => `${color.cyan(GLYPHS.bar)}  ${line}`);
+    }).flatMap((line) => line.split("\n").map((physicalLine) => `${color.cyan(GLYPHS.bar)}  ${physicalLine}`));
     return `${color.gray(GLYPHS.barStart)} ${symbol(prompt.state)} ${opts.message}\n${lines.join("\n")}\n${color.cyan(GLYPHS.barEnd)}`;
 }
 export function selectPrompt(opts) {

package/node_modules/toolcraft-design/dist/prompts/interactive/text.js

@@ -1,6 +1,8 @@
 import { color } from "../../components/color.js";
+import { graphemes } from "../../dashboard/terminal-width.js";
 import { GLYPHS, symbol, symbolBar } from "./glyphs.js";
 import { Prompt } from "./core.js";
+import { wrapTextWithPrefix } from "./wrap.js";
 class TextPrompt extends Prompt {
     constructor(opts) {
         const initialUserInput = opts.initialValue ?? "";
@@ -9,7 +11,7 @@ class TextPrompt extends Prompt {
             initialValue: initialUserInput,
             initialUserInput,
             render: (prompt) => renderTextPrompt(prompt, opts),
-            validate: opts.validate
+            validate: (value) => opts.validate?.(value || opts.defaultValue || "")
         });
         this.on("userInput", (value) => this.setValue(value));
         this.on("finalize", () => {
@@ -23,8 +25,8 @@ class TextPrompt extends Prompt {
             return this.userInput;
         }
         const before = this.userInput.slice(0, this.cursor);
-        const current = this.userInput[this.cursor];
-        const after = this.userInput.slice(this.cursor + 1);
+        const current = graphemes(this.userInput.slice(this.cursor))[0];
+        const after = this.userInput.slice(this.cursor + (current?.length ?? 0));
         if (current) {
             return `${before}${color.inverse(current)}${after}`;
         }
@@ -40,20 +42,21 @@ function renderHeader(prompt, message) {
 function renderTextPrompt(prompt, opts) {
     const value = prompt.value ?? "";
     if (prompt.state === "submit") {
-        return `${renderHeader(prompt, opts.message)}\n${color.gray(GLYPHS.bar)}  ${color.dim(value)}\n${color.green(GLYPHS.barEnd)}`;
+        return `${renderHeader(prompt, opts.message)}\n${wrapTextWithPrefix(opts.output ?? process.stdout, color.dim(value), `${color.gray(GLYPHS.bar)}  `)}\n${color.green(GLYPHS.barEnd)}`;
     }
     if (prompt.state === "cancel") {
-        return `${renderHeader(prompt, opts.message)}\n${color.gray(GLYPHS.bar)}  ${color.dim.strikethrough(value)}\n${color.red(GLYPHS.barEnd)}`;
+        return `${renderHeader(prompt, opts.message)}\n${wrapTextWithPrefix(opts.output ?? process.stdout, color.dim.strikethrough(value), `${color.gray(GLYPHS.bar)}  `)}\n${color.red(GLYPHS.barEnd)}`;
     }
+    const [placeholder, ...placeholderRest] = graphemes(opts.placeholder ?? "");
     const input = prompt.userInput.length > 0
         ? prompt.userInputWithCursor
-        : opts.placeholder
-            ? `${color.inverse(opts.placeholder[0] ?? " ")}${color.dim(opts.placeholder.slice(1))}`
+        : placeholder
+            ? `${color.inverse(placeholder)}${color.dim(placeholderRest.join(""))}`
             : color.inverse("_");
     if (prompt.state === "error") {
-        return `${renderHeader(prompt, opts.message)}\n${symbolBar(prompt.state)}  ${input}\n${color.yellow(GLYPHS.barEnd)}  ${color.yellow(prompt.error)}`;
+        return `${renderHeader(prompt, opts.message)}\n${wrapTextWithPrefix(opts.output ?? process.stdout, input, `${symbolBar(prompt.state)}  `)}\n${color.yellow(GLYPHS.barEnd)}  ${color.yellow(prompt.error)}`;
     }
-    return `${renderHeader(prompt, opts.message)}\n${symbolBar(prompt.state)}  ${input}\n${color.cyan(GLYPHS.barEnd)}`;
+    return `${renderHeader(prompt, opts.message)}\n${wrapTextWithPrefix(opts.output ?? process.stdout, input, `${symbolBar(prompt.state)}  `)}\n${color.cyan(GLYPHS.barEnd)}`;
 }
 export function textPrompt(opts) {
     return new TextPrompt(opts).prompt();

package/node_modules/toolcraft-schema/package.json

@@ -1,6 +1,6 @@
 {
   "name": "toolcraft-schema",
-  "version": "0.0.163",
+  "version": "0.0.165",
   "license": "MIT",
   "type": "module",
   "main": "dist/index.js",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "toolcraft-openapi",
-  "version": "0.0.163",
+  "version": "0.0.165",
   "license": "MIT",
   "type": "module",
   "main": "dist/index.js",
@@ -30,7 +30,7 @@
     "toolcraft-openapi-generate": "dist/bin/generate.js"
   },
   "dependencies": {
-    "toolcraft": "0.0.163",
+    "toolcraft": "0.0.165",
     "fast-string-width": "^3.0.2",
     "fast-wrap-ansi": "^0.2.0",
     "sisteransi": "^1.0.5",
@@ -45,7 +45,7 @@
     "directory": "packages/toolcraft-openapi"
   },
   "optionalDependencies": {
-    "toolcraft-schema": "0.0.163",
+    "toolcraft-schema": "0.0.165",
     "toolcraft-design": "*",
     "@poe-code/frontmatter": "*"
   },