toolcraft-openapi 0.0.166 → 0.0.168

package/dist/composition.json

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

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

@@ -28,17 +28,24 @@ function stripAnsi(value) {
     return value.replace(/\u001b\[[0-9;]*m/g, "");
 }
 function matchSubsequence(query, text) {
+    const queryCharacters = Array.from(query);
+    const textCharacters = Array.from(text);
     let previousStates = [];
-    for (let queryIndex = 0; queryIndex < query.length; queryIndex += 1) {
+    for (let queryIndex = 0; queryIndex < queryCharacters.length; queryIndex += 1) {
         const states = [];
-        for (let textIndex = 0; textIndex < text.length; textIndex += 1) {
-            if (text[textIndex] !== query[queryIndex]) {
+        let offset = 0;
+        for (let textIndex = 0; textIndex < textCharacters.length; textIndex += 1) {
+            const character = textCharacters[textIndex];
+            const position = offset;
+            offset += character.length;
+            if (character !== queryCharacters[queryIndex]) {
                 continue;
             }
+            const positions = character.length === 2 ? [position, position + 1] : [position];
             if (queryIndex === 0) {
                 states[textIndex] = {
-                    score: characterScore(text, textIndex, undefined) + Math.max(0, EARLY_MATCH_BONUS - textIndex),
-                    positions: [textIndex]
+                    score: characterScore(textCharacters, textIndex, undefined) + Math.max(0, EARLY_MATCH_BONUS - position),
+                    positions
                 };
                 continue;
             }
@@ -48,8 +55,8 @@ function matchSubsequence(query, text) {
                     continue;
                 }
                 const next = {
-                    score: previous.score + characterScore(text, textIndex, previousIndex),
-                    positions: [...previous.positions, textIndex]
+                    score: previous.score + characterScore(textCharacters, textIndex, previousIndex),
+                    positions: [...previous.positions, ...positions]
                 };
                 if (isBetterMatch(next, states[textIndex])) {
                     states[textIndex] = next;

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

@@ -1,3 +1,4 @@
+import { graphemes } from "../dashboard/terminal-width.js";
 import { buildActionContext, resolveAction } from "./actions.js";
 import { filterRows } from "./filter.js";
 import { REGION_ALL, REGION_DETAIL, REGION_FOOTER, REGION_HEADER, REGION_LIST, REGION_MODAL, resolveExplorerLayoutMode } from "./state.js";
@@ -47,6 +48,10 @@ export function step(state, event, runtimeHandles = DEFAULT_ACTION_HANDLES) {
 }
 function stepKey(state, key, runtimeHandles) {
     const target = state.bindings.resolve(key);
+    if (target?.type === "builtin" && target.id === "quit") {
+        const next = state.modal === null ? state : modalDismissed(state, null, runtimeHandles).state;
+        return { state: markDirty(next, 0), effects: [{ type: "exit", result: null }] };
+    }
     if (state.modal !== null) {
         return stepModalKey(state, key, target, runtimeHandles);
     }
@@ -66,8 +71,6 @@ function stepKey(state, key, runtimeHandles) {
     }
     if (target?.type === "builtin") {
         switch (target.id) {
-            case "quit":
-                return { state: markDirty(state, 0), effects: [{ type: "exit", result: null }] };
             case "filter":
                 return focusFilter(state);
             case "help":
@@ -126,8 +129,8 @@ function stepKey(state, key, runtimeHandles) {
     }
     if (isBackspace(key)) {
         if (isSecondListFocused(state))
-            return updateDetailFilter(state, (state.detail.filter ?? "").slice(0, -1));
-        return updateFilter(state, state.filter.slice(0, -1));
+            return updateDetailFilter(state, graphemes(state.detail.filter ?? "").slice(0, -1).join(""));
+        return updateFilter(state, graphemes(state.filter).slice(0, -1).join(""));
     }
     if (!state.multiSelect && isSelectionSpace(key)) {
         return mark(state, 0);
@@ -150,7 +153,7 @@ function stepFilterKey(state, key, target, runtimeHandles) {
         };
     }
     if (isBackspace(key)) {
-        return updateFilter(state, state.filter.slice(0, -1));
+        return updateFilter(state, graphemes(state.filter).slice(0, -1).join(""));
     }
     if (isPrintable(key)) {
         return updateFilter(state, `${state.filter}${key.ch}`);
@@ -166,7 +169,7 @@ function stepModalKey(state, key, target, runtimeHandles) {
             return modalDismissed(state, state.modal.value, runtimeHandles);
         }
         if (isBackspace(key)) {
-            return setModal(state, { ...state.modal, value: state.modal.value.slice(0, -1) });
+            return setModal(state, { ...state.modal, value: graphemes(state.modal.value).slice(0, -1).join("") });
         }
         if (isPrintable(key)) {
             return setModal(state, { ...state.modal, value: `${state.modal.value}${key.ch}` });
@@ -726,7 +729,7 @@ function paletteInput(state, key) {
         return mark(state, 0);
     }
     if (isBackspace(key)) {
-        return setPaletteQuery(state, state.modal.query.slice(0, -1));
+        return setPaletteQuery(state, graphemes(state.modal.query).slice(0, -1).join(""));
     }
     if (isPrintable(key)) {
         return setPaletteQuery(state, `${state.modal.query}${key.ch}`);

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

@@ -73,7 +73,19 @@ export class Prompt extends EventEmitter {
             return Promise.resolve(CANCEL);
         }
         if (this.input.isTTY !== true) {
-            return this.promptNonTty();
+            return this.promptNonTty().then((value) => {
+                if (value === CANCEL || !this.trackValue) {
+                    return value;
+                }
+                this.setValue(value);
+                const error = this.validate?.(this.value);
+                if (error) {
+                    throw error instanceof Error ? error : new Error(error);
+                }
+                this.state = "submit";
+                this.emit("finalize");
+                return this.value;
+            });
         }
         if (this.input.destroyed || this.input.readableEnded) {
             this.state = "cancel";
@@ -116,7 +128,7 @@ export class Prompt extends EventEmitter {
             this.state = "cancel";
             return Promise.resolve(CANCEL);
         }
-        return new Promise((resolve) => {
+        return new Promise((resolve, reject) => {
             let rl = null;
             let settled = false;
             const settle = (value) => {
@@ -126,21 +138,31 @@ export class Prompt extends EventEmitter {
                 settled = true;
                 this.input.removeListener("close", onCancel);
                 this.signal?.removeEventListener("abort", onCancel);
+                rl?.removeListener("error", settle);
+                rl?.removeListener("line", settle);
+                rl?.removeListener("close", onClose);
                 rl?.close();
-                resolve(value);
+                if (value instanceof Error) {
+                    reject(value);
+                }
+                else {
+                    resolve(value);
+                }
             };
             const onCancel = () => {
                 this.state = "cancel";
                 settle(CANCEL);
             };
+            const onClose = () => settle(rl?.line ?? "");
             this.input.once("close", onCancel);
             rl = readline.createInterface({ input: this.input, terminal: false });
             if (settled) {
                 rl.close();
                 return;
             }
+            rl.once("error", settle);
             rl.once("line", settle);
-            rl.once("close", () => settle(rl?.line ?? ""));
+            rl.once("close", onClose);
             this.signal?.addEventListener("abort", onCancel, { once: true });
             if (this.signal?.aborted) {
                 onCancel();

package/node_modules/toolcraft-schema/package.json

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

package/package.json

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