toolcraft-openapi 0.0.168 → 0.0.170

package/dist/composition.json

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

package/node_modules/toolcraft-design/dist/explorer/filter.js

@@ -1,3 +1,4 @@
+import { graphemes } from "../dashboard/terminal-width.js";
 const MATCH_SCORE = 10;
 const CONSECUTIVE_BONUS = 14;
 const WORD_START_BONUS = 10;
@@ -13,7 +14,11 @@ export function filterRows(query, rows, opts = {}) {
         const preparedText = opts.caseSensitive === true ? text : text.toLocaleLowerCase();
         const match = matchSubsequence(preparedQuery, preparedText);
         if (match !== undefined) {
-            matches.push({ index, ...match });
+            matches.push({
+                index,
+                ...match,
+                positions: text === preparedText ? match.positions : projectPositions(text, match.positions)
+            });
         }
     });
     return matches.sort((left, right) => right.score - left.score || left.index - right.index);
@@ -27,6 +32,33 @@ function searchableText(row) {
 function stripAnsi(value) {
     return value.replace(/\u001b\[[0-9;]*m/g, "");
 }
+function projectPositions(text, positions) {
+    const projected = [];
+    let originalOffset = 0;
+    let foldedOffset = 0;
+    let matchIndex = 0;
+    for (const segment of graphemes(text)) {
+        const foldedLength = segment.toLocaleLowerCase().length;
+        const firstMatch = matchIndex;
+        while (matchIndex < positions.length && positions[matchIndex] < foldedOffset + foldedLength) {
+            if (segment.length === foldedLength) {
+                projected.push(originalOffset + positions[matchIndex] - foldedOffset);
+            }
+            matchIndex += 1;
+        }
+        if (matchIndex > firstMatch && segment.length !== foldedLength) {
+            for (let offset = 0; offset < segment.length; offset += 1) {
+                projected.push(originalOffset + offset);
+            }
+        }
+        if (matchIndex === positions.length) {
+            break;
+        }
+        originalOffset += segment.length;
+        foldedOffset += foldedLength;
+    }
+    return projected;
+}
 function matchSubsequence(query, text) {
     const queryCharacters = Array.from(query);
     const textCharacters = Array.from(text);

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

@@ -1,9 +1,12 @@
 import { EventEmitter } from "node:events";
 import * as readline from "node:readline";
+import { Readable } from "node:stream";
+import { StringDecoder } from "node:string_decoder";
 import { graphemes } from "../../dashboard/terminal-width.js";
 import { CANCEL } from "./cancel-symbol.js";
 import { mapKey } from "./keys.js";
 import { wrapFrame } from "./wrap.js";
+const pendingCarriageReturns = new WeakMap();
 const cursor = {
     hide: "\x1b[?25l",
     show: "\x1b[?25h",
@@ -128,6 +131,88 @@ export class Prompt extends EventEmitter {
             this.state = "cancel";
             return Promise.resolve(CANCEL);
         }
+        const input = this.input;
+        if (input instanceof Readable) {
+            return new Promise((resolve, reject) => {
+                const decoder = new StringDecoder("utf8");
+                let line = "";
+                let settled = false;
+                const settle = (value, remainder) => {
+                    if (settled)
+                        return;
+                    settled = true;
+                    input.removeListener("data", onData);
+                    input.removeListener("end", onEnd);
+                    input.removeListener("close", onCancel);
+                    input.removeListener("error", settle);
+                    this.signal?.removeEventListener("abort", onCancel);
+                    input.pause();
+                    if (remainder?.length)
+                        input.unshift(remainder, input.readableEncoding ?? undefined);
+                    if (value instanceof Error)
+                        reject(value);
+                    else
+                        resolve(value);
+                };
+                const onCancel = () => {
+                    this.state = "cancel";
+                    settle(CANCEL);
+                };
+                const onEnd = () => settle(line + decoder.end());
+                const onData = (chunk) => {
+                    if (chunk.length === 0)
+                        return;
+                    if (settled) {
+                        if (!input.destroyed)
+                            input.unshift(chunk, input.readableEncoding ?? undefined);
+                        return;
+                    }
+                    let offset = 0;
+                    const previousCarriageReturn = pendingCarriageReturns.get(input);
+                    if (previousCarriageReturn !== undefined) {
+                        pendingCarriageReturns.delete(input);
+                        const isLineFeed = typeof chunk === "string" ? chunk[0] === "\n" : chunk[0] === 10;
+                        if (isLineFeed && Date.now() - previousCarriageReturn <= 100)
+                            offset = 1;
+                    }
+                    for (; offset < chunk.length; offset += 1) {
+                        const character = typeof chunk === "string" ? chunk[offset] : decoder.write(chunk.subarray(offset, offset + 1));
+                        if (character.endsWith("\r") || character.endsWith("\n")) {
+                            line += character.slice(0, -1);
+                            offset += 1;
+                            if (character.endsWith("\r")) {
+                                if (offset === chunk.length) {
+                                    pendingCarriageReturns.set(input, Date.now());
+                                }
+                                else if (typeof chunk === "string" ? chunk[offset] === "\n" : chunk[offset] === 10) {
+                                    offset += 1;
+                                }
+                            }
+                            settle(line, chunk.slice(offset));
+                            return;
+                        }
+                        line += character;
+                    }
+                };
+                input.once("end", onEnd);
+                input.once("close", onCancel);
+                input.once("error", settle);
+                this.signal?.addEventListener("abort", onCancel, { once: true });
+                if (this.signal?.aborted)
+                    onCancel();
+                else if (input.readableEnded)
+                    onEnd();
+                else if (input.destroyed)
+                    onCancel();
+                else if (!settled) {
+                    input.on("data", onData);
+                    if (!settled)
+                        input.resume();
+                    if (settled)
+                        input.pause();
+                }
+            });
+        }
         return new Promise((resolve, reject) => {
             let rl = null;
             let settled = false;

package/node_modules/toolcraft-schema/package.json

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "toolcraft-openapi",
-  "version": "0.0.168",
+  "version": "0.0.170",
   "license": "MIT",
   "type": "module",
   "main": "dist/index.js",
@@ -30,7 +30,7 @@
     "toolcraft-openapi-generate": "dist/bin/generate.js"
   },
   "dependencies": {
-    "toolcraft": "0.0.168",
+    "toolcraft": "0.0.170",
     "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.168",
+    "toolcraft-schema": "0.0.170",
     "toolcraft-design": "*",
     "@poe-code/frontmatter": "*"
   },