toolcraft-openapi 0.0.24 → 0.0.26

package/dist/bin/generate.d.ts

@@ -1,5 +1,9 @@
 #!/usr/bin/env node
 interface GenerateCliFileSystem {
+    lstat(targetPath: string): Promise<{
+        isDirectory(): boolean;
+        isSymbolicLink(): boolean;
+    }>;
     mkdir(directoryPath: string, options?: {
         recursive?: boolean;
     }): Promise<unknown>;
@@ -9,9 +13,6 @@ interface GenerateCliFileSystem {
         force?: boolean;
     }): Promise<void>;
     realpath(targetPath: string): Promise<string>;
-    stat(targetPath: string): Promise<{
-        isDirectory(): boolean;
-    }>;
     writeFile(filePath: string, contents: string, encoding: BufferEncoding): Promise<void>;
 }
 interface GenerateCliWriter {

package/dist/bin/generate.js

@@ -81,7 +81,7 @@ export async function syncGeneratedClient(options, services) {
     if (!options.check && drifted) {
         try {
             await writeGeneratedFiles(services.fs, outputDir, updatedFiles);
-            await deleteGeneratedFiles(services.fs, deletedFiles);
+            await deleteGeneratedFiles(services.fs, outputDir, deletedFiles);
         }
         catch (error) {
             await restoreGeneratedFiles(services.fs, outputDir, currentFiles, updatedFiles, deletedFiles);
@@ -170,10 +170,17 @@ function tryParseUrl(input) {
 async function readGeneratedFiles(fs, directoryPath) {
     const files = new Map();
     try {
+        const directoryStats = await fs.lstat(directoryPath);
+        if (directoryStats.isSymbolicLink()) {
+            throw new Error("Generated output must remain inside the output directory.");
+        }
         const entries = await fs.readdir(directoryPath);
         for (const entry of entries) {
             const entryPath = path.resolve(directoryPath, entry);
-            const stats = await fs.stat(entryPath);
+            const stats = await fs.lstat(entryPath);
+            if (stats.isSymbolicLink()) {
+                throw new Error("Generated output must remain inside the output directory.");
+            }
             if (stats.isDirectory()) {
                 for (const [nestedPath, nestedContents] of await readGeneratedFiles(fs, entryPath)) {
                     files.set(nestedPath, nestedContents);
@@ -228,8 +235,9 @@ async function assertSafeOutputPath(fs, outputDir, filePath) {
         throw new Error("Generated output must remain inside the output directory.");
     }
 }
-async function deleteGeneratedFiles(fs, filePaths) {
+async function deleteGeneratedFiles(fs, outputDir, filePaths) {
     for (const filePath of filePaths) {
+        await assertSafeOutputPath(fs, outputDir, filePath);
         await fs.rm(filePath, { force: true });
     }
 }
@@ -237,6 +245,7 @@ async function restoreGeneratedFiles(fs, outputDir, currentFiles, updatedFiles,
     for (const file of updatedFiles) {
         const previousContents = currentFiles.get(file.path);
         if (previousContents === undefined) {
+            await assertSafeOutputPath(fs, outputDir, file.path);
             await fs.rm(file.path, { force: true });
             continue;
         }

package/node_modules/@poe-code/design-system/dist/components/browser.js

@@ -10,7 +10,7 @@ function browserCommand(url, platform) {
         return { command: "open", args: [url] };
     }
     if (platform === "win32") {
-        return { command: "cmd", args: ["/c", "start", "", url] };
+        return { command: "rundll32.exe", args: ["url.dll,FileProtocolHandler", url] };
     }
     return { command: "xdg-open", args: [url] };
 }

package/node_modules/@poe-code/design-system/dist/explorer/actions.js

@@ -32,7 +32,7 @@ function currentDetailItem(state) {
     return state.detail.items?.[state.detail.cursor];
 }
 function selectedRows(state, fallback) {
-    if (state.selected.size === 0) {
+    if (!state.multiSelect || state.selected.size === 0) {
         return fallback.id === "" ? [] : [fallback];
     }
     return state.rows.filter((row) => state.selected.has(row.id));

package/node_modules/@poe-code/design-system/dist/explorer/keymap.js

@@ -45,14 +45,24 @@ const baseBuiltinCommands = [
     "extendSelectionDown"
 ];
 const reorderCommands = ["reorderUp", "reorderDown"];
+const selectionCommands = new Set([
+    "toggleSelect",
+    "selectAll",
+    "clearSelection",
+    "extendSelectionUp",
+    "extendSelectionDown"
+]);
 const reservedActionIds = new Set(["quit"]);
 export function resolveBindings(config, defaults = {}) {
-    const commands = config.reorder === undefined
+    const baseCommands = config.reorder === undefined
         ? baseBuiltinCommands
         : [
             ...baseBuiltinCommands.filter((command) => command !== "extendSelectionUp" && command !== "extendSelectionDown"),
             ...reorderCommands
         ];
+    const commands = config.multiSelect === false
+        ? baseCommands.filter((command) => !selectionCommands.has(command))
+        : baseCommands;
     const commandBindings = new Map();
     const flatBindings = new Map();
     const targetKeys = new Map();

package/node_modules/@poe-code/design-system/dist/explorer/reducer.js

@@ -101,6 +101,9 @@ function stepKey(state, key, runtimeHandles) {
     if (isBackspace(key)) {
         return updateFilter(state, state.filter.slice(0, -1));
     }
+    if (!state.multiSelect && isSelectionSpace(key)) {
+        return mark(state, 0);
+    }
     if (isPrintable(key)) {
         return updateFilter(state, `${state.filter}${key.ch}`);
     }
@@ -170,7 +173,7 @@ function resize(state, cols, rows) {
         return mark(state, 0);
     }
     return {
-        state: { ...state, size, layout, dirty: REGION_ALL },
+        state: clampDetailScroll({ ...state, size, layout, dirty: REGION_ALL }),
         effects: NO_EFFECTS
     };
 }
@@ -186,7 +189,7 @@ function rowsLoaded(state, rows) {
     const filtered = matches.map((match) => match.index);
     const matchPositions = createMatchPositions(matches);
     const cursor = clamp(state.cursor, 0, Math.max(0, filtered.length - 1));
-    const selected = pruneSelection(state.selected, rows);
+    const selected = state.multiSelect ? pruneSelection(state.selected, rows) : new Set();
     const detail = resetDetailForCursor(state, rows, filtered, cursor);
     const modal = modalStillValid(state.modal, rows);
     if (state.modal?.kind === "confirm" && modal === null) {
@@ -239,8 +242,9 @@ function detailItemRendered(state, rowId, token, itemIndex, content) {
         return mark(state, 0);
     }
     const items = state.detail.items.map((item, index) => index === itemIndex ? { ...item, renderedContent: content } : item);
+    const detail = { ...state.detail, items };
     return {
-        state: { ...state, detail: { ...state.detail, items }, dirty: REGION_DETAIL },
+        state: clampDetailScroll({ ...state, detail, dirty: REGION_DETAIL }),
         effects: NO_EFFECTS
     };
 }
@@ -400,6 +404,9 @@ function confirmKey(state, runtimeHandles) {
     return dispatchPrimary(state, runtimeHandles);
 }
 function toggleSelect(state) {
+    if (!state.multiSelect) {
+        return mark(state, 0);
+    }
     const row = currentRow(state);
     if (row === undefined) {
         return mark(state, 0);
@@ -414,6 +421,9 @@ function toggleSelect(state) {
     return selectionChanged(state, selected);
 }
 function selectAll(state) {
+    if (!state.multiSelect) {
+        return mark(state, 0);
+    }
     const selected = new Set(state.selected);
     for (const index of state.filtered) {
         const row = state.rows[index];
@@ -430,13 +440,14 @@ function clearSelection(state) {
     return selectionChanged(state, new Set());
 }
 function selectionChanged(state, selected) {
-    if (setsEqual(state.selected, selected)) {
+    const normalized = state.multiSelect ? selected : new Set();
+    if (setsEqual(state.selected, normalized)) {
         return mark(state, 0);
     }
     const next = {
         ...state,
-        selected,
-        actionState: recomputeActionState({ ...state, selected }),
+        selected: normalized,
+        actionState: recomputeActionState({ ...state, selected: normalized }),
         dirty: REGION_LIST | REGION_FOOTER
     };
     return { state: next, effects: NO_EFFECTS };
@@ -445,7 +456,7 @@ function detailScroll(state, delta) {
     if (state.focused !== "detail") {
         return mark(state, 0);
     }
-    const scroll = Math.max(0, state.detail.scroll + delta);
+    const scroll = clamp(state.detail.scroll + delta, 0, maxDetailScroll(state));
     if (scroll === state.detail.scroll) {
         return mark(state, 0);
     }
@@ -454,7 +465,49 @@ function detailScroll(state, delta) {
         effects: NO_EFFECTS
     };
 }
+function clampDetailScroll(state) {
+    const scroll = clamp(state.detail.scroll, 0, maxDetailScroll(state));
+    if (scroll === state.detail.scroll) {
+        return state;
+    }
+    return { ...state, detail: { ...state.detail, scroll } };
+}
+function maxDetailScroll(state) {
+    const items = state.detail.items;
+    if (items === null || items.length === 0) {
+        return 0;
+    }
+    if (items.length === 1 && items[0]?.title === undefined) {
+        const visibleHeight = detailBodyHeight(state);
+        if (visibleHeight <= 0) {
+            return 0;
+        }
+        return Math.max(0, detailContentLineCount(items[0]) - visibleHeight);
+    }
+    return Math.max(0, items.length - 1);
+}
+function detailContentLineCount(item) {
+    return (item.renderedContent ?? "").split("\n").length;
+}
+function detailBodyHeight(state) {
+    if (state.layout === "too-narrow" || state.layout === "narrow-list-only") {
+        return 0;
+    }
+    const rows = normalizeSize(state.size.rows);
+    const footerHeight = rows > 0 ? Math.min(1, rows) : 0;
+    const headerHeight = Math.min(3, Math.max(0, rows - footerHeight));
+    const contentHeight = Math.max(0, rows - headerHeight - footerHeight);
+    if (state.layout === "narrow-vertical") {
+        const listHeight = Math.ceil(contentHeight / 2);
+        const detailHeight = contentHeight - listHeight;
+        return Math.max(0, detailHeight - 1);
+    }
+    return contentHeight;
+}
 function extendSelection(state, delta) {
+    if (!state.multiSelect) {
+        return moveCursor(state, delta);
+    }
     const moved = moveCursor(state, delta);
     const row = currentRow(moved.state);
     if (row === undefined) {
@@ -646,7 +699,7 @@ function actionSource(state, action) {
     return state.actionState.get(action.id)?.source ?? "row";
 }
 function selectedRows(state) {
-    if (state.selected.size === 0) {
+    if (!state.multiSelect || state.selected.size === 0) {
         const row = currentRow(state);
         return row === undefined ? [] : [row];
     }
@@ -718,6 +771,9 @@ function isPrintable(key) {
 function isBackspace(key) {
     return key.name === "backspace" || key.name === "delete";
 }
+function isSelectionSpace(key) {
+    return key.name === "space" || key.ch === " ";
+}
 function isConfirmYes(key) {
     return key.ch === "y" || key.ch === "Y";
 }

package/node_modules/@poe-code/design-system/dist/explorer/render/detail.js

@@ -1,4 +1,5 @@
 import { getExplorerStyles } from "../theme.js";
+import { fitToWidth } from "./text.js";
 export function renderDetail(state, screen, layout) {
     const rect = layout.detail;
     const styles = getExplorerStyles();
@@ -35,7 +36,8 @@ function renderDetailBody(state, screen, rect, row) {
 function renderListMode(state, screen, rect, items, row) {
     const styles = getExplorerStyles();
     let y = 0;
-    for (let index = state.detail.scroll; index < items.length && y < rect.height; index += 1) {
+    const start = clamp(state.detail.scroll, 0, Math.max(0, items.length - 1));
+    for (let index = start; index < items.length && y < rect.height; index += 1) {
         const item = items[index];
         const cursor = index === state.detail.cursor;
         const title = item.title ?? item.id;
@@ -60,7 +62,9 @@ function renderListMode(state, screen, rect, items, row) {
     }
 }
 function renderBlob(screen, rect, text, scroll) {
-    const lines = text.split("\n").slice(scroll);
+    const allLines = text.split("\n");
+    const start = clamp(scroll, 0, Math.max(0, allLines.length - rect.height));
+    const lines = allLines.slice(start);
     for (let row = 0; row < rect.height; row += 1) {
         writeLine(screen, rect, row, lines[row] ?? "");
     }
@@ -86,14 +90,8 @@ function writeLine(screen, rect, row, text, style = {}) {
     if (row < 0 || row >= rect.height) {
         return;
     }
-    screen.put(rect.x, rect.y + row, fit(text, rect.width), style);
+    screen.put(rect.x, rect.y + row, fitToWidth(text, rect.width, rect.x), style);
 }
-function fit(text, width) {
-    if (width <= 0) {
-        return "";
-    }
-    if (text.length <= width) {
-        return text;
-    }
-    return width <= 1 ? text.slice(0, width) : `${text.slice(0, width - 1)}…`;
+function clamp(value, min, max) {
+    return Math.min(max, Math.max(min, value));
 }

package/node_modules/@poe-code/design-system/dist/explorer/render/footer.js

@@ -1,4 +1,5 @@
 import { getExplorerStyles } from "../theme.js";
+import { cellWidth, fitToWidth } from "./text.js";
 export function renderFooter(state, screen, layout) {
     const rect = layout.footer;
     const styles = getExplorerStyles();
@@ -9,22 +10,31 @@ export function renderFooter(state, screen, layout) {
     const hints = footerHints(state);
     let x = rect.x + 2;
     const y = rect.y;
+    const endX = rect.x + rect.width;
     for (const hint of hints) {
-        if (x >= rect.x + rect.width) {
+        if (x >= endX) {
             break;
         }
         if (hint.bracketed === false) {
             const text = `${hint.key} ${hint.label}`;
-            screen.put(x, y, text, hint.running ? styles.muted : {});
-            x += text.length + 2;
+            x += putFooterText(screen, x, y, endX, text, hint.running ? styles.muted : {}) + 2;
             continue;
         }
-        screen.put(x, y, `[${hint.key}]`, hint.running ? styles.muted : styles.accent);
-        x += hint.key.length + 2;
-        screen.put(x, y, ` ${hint.label}`, hint.running ? styles.muted : {});
-        x += hint.label.length + 3;
+        const keyText = `[${hint.key}]`;
+        const keyWidth = putFooterText(screen, x, y, endX, keyText, hint.running ? styles.muted : styles.accent);
+        x += keyWidth;
+        if (keyWidth < cellWidth(keyText) || x >= endX) {
+            break;
+        }
+        x += putFooterText(screen, x, y, endX, ` ${hint.label}`, hint.running ? styles.muted : {}) + 2;
     }
 }
+function putFooterText(screen, x, y, endX, text, style = {}) {
+    const remaining = Math.max(0, endX - x);
+    const fitted = fitToWidth(text, remaining, x);
+    screen.put(x, y, fitted, style);
+    return cellWidth(fitted, x);
+}
 function footerHints(state) {
     const hints = [];
     if (state.focused === "detail") {
@@ -36,7 +46,7 @@ function footerHints(state) {
             continue;
         }
         const key = actionKey(entry, id);
-        const label = state.selected.size > 0 && entry.source === "row"
+        const label = state.multiSelect && state.selected.size > 0 && entry.source === "row"
             ? `${entry.label} ${state.selected.size}`
             : entry.label;
         hints.push({ key, label, running: entry.running === true });

package/node_modules/@poe-code/design-system/dist/explorer/render/header.js

@@ -1,4 +1,5 @@
 import { getExplorerStyles } from "../theme.js";
+import { cellWidth, fitToWidth, padEndCells } from "./text.js";
 export function renderHeader(state, screen, layout) {
     const rect = layout.header;
     const styles = getExplorerStyles();
@@ -7,7 +8,7 @@ export function renderHeader(state, screen, layout) {
         return;
     }
     if (layout.mode === "too-narrow") {
-        screen.put(0, 0, fit("Terminal too narrow", rect.width), styles.borderFocused);
+        screen.put(0, 0, fitToWidth("Terminal too narrow", rect.width), styles.borderFocused);
         return;
     }
     drawTopBorder(screen, state.title, rect.width, styles.border);
@@ -15,13 +16,15 @@ export function renderHeader(state, screen, layout) {
         const prompt = `${state.title.toLocaleLowerCase()}>`;
         const filter = state.filter.length > 0 ? ` ${state.filter}` : "";
         const count = `${state.filtered.length}/${state.rows.length}`;
-        const selected = state.selected.size > 0 ? `  (${state.selected.size} selected)` : "";
+        const selected = state.multiSelect && state.selected.size > 0 ? `  (${state.selected.size} selected)` : "";
         const spinner = state.detail.loading ? "  *" : "";
         const right = `${count}${selected}${spinner}`;
         screen.put(0, 1, "│", styles.border);
         screen.put(Math.max(0, rect.width - 1), 1, "│", styles.border);
-        screen.put(2, 1, fit(`${prompt}${filter}`, Math.max(0, rect.width - right.length - 5)), styles.accent);
-        screen.put(Math.max(2, rect.width - right.length - 2), 1, right, styles.muted);
+        const rightWidth = cellWidth(right);
+        const promptWidth = Math.max(0, rect.width - rightWidth - 5);
+        screen.put(2, 1, fitToWidth(`${prompt}${filter}`, promptWidth, 2), styles.accent);
+        screen.put(Math.max(2, rect.width - rightWidth - 2), 1, right, styles.muted);
     }
     if (rect.height > 2) {
         drawHorizontal(screen, 2, rect.width, styles.border);
@@ -32,11 +35,10 @@ function drawTopBorder(screen, title, width, style) {
         screen.put(0, 0, "┌", style);
         return;
     }
-    const label = `─ ${title} `;
-    const middle = label.length < width - 1
-        ? `${label}${"─".repeat(width - 1 - label.length)}`
-        : label.slice(0, Math.max(0, width - 1));
-    screen.put(0, 0, `┌${middle.slice(0, Math.max(0, width - 2))}┐`, style);
+    const innerWidth = Math.max(0, width - 2);
+    const label = fitToWidth(`─ ${title} `, innerWidth, 1);
+    const middle = padEndCells(label, innerWidth, "─", 1);
+    screen.put(0, 0, `┌${middle}┐`, style);
 }
 function drawHorizontal(screen, y, width, style) {
     if (width === 1) {
@@ -45,12 +47,3 @@ function drawHorizontal(screen, y, width, style) {
     }
     screen.put(0, y, `├${"─".repeat(Math.max(0, width - 2))}┤`, style);
 }
-function fit(text, width) {
-    if (width <= 0) {
-        return "";
-    }
-    if (text.length <= width) {
-        return text;
-    }
-    return width <= 1 ? text.slice(0, width) : `${text.slice(0, width - 1)}…`;
-}

package/node_modules/@poe-code/design-system/dist/explorer/render/index.js

@@ -6,6 +6,7 @@ import { renderFooter } from "./footer.js";
 import { renderHeader } from "./header.js";
 import { renderList } from "./list.js";
 import { renderModal } from "./modal.js";
+import { fitToWidth } from "./text.js";
 const REGION_RENDERERS = [
     [REGION_HEADER, renderHeader],
     [REGION_LIST, renderList],
@@ -42,18 +43,9 @@ function renderToast(state, screen) {
         return;
     }
     const styles = getExplorerStyles();
-    const message = fit(` ${state.toast.message} `, screen.width);
+    const message = fitToWidth(` ${state.toast.message} `, screen.width);
     screen.put(0, y, message, styles.accent);
 }
-function fit(text, width) {
-    if (width <= 0) {
-        return "";
-    }
-    if (text.length <= width) {
-        return text;
-    }
-    return width <= 1 ? text.slice(0, width) : `${text.slice(0, width - 1)}…`;
-}
 export { renderDetail } from "./detail.js";
 export { renderFooter } from "./footer.js";
 export { renderHeader } from "./header.js";

package/node_modules/@poe-code/design-system/dist/explorer/render/list.js

@@ -1,4 +1,5 @@
 import { getExplorerStyles } from "../theme.js";
+import { cellWidth, centerCells, fitToWidth, splitGraphemeCells, stripAnsi } from "./text.js";
 const listLineCache = new WeakMap();
 export function renderList(state, screen, layout) {
     const styles = getExplorerStyles();
@@ -17,7 +18,7 @@ export function renderList(state, screen, layout) {
     listLineCache.set(screen, { rectKey, lines: cache });
     if (state.filtered.length === 0) {
         const hint = state.emptyHint;
-        writeLine(screen, rect, Math.floor(rect.height / 2), center(hint, rect.width), styles.muted);
+        writeLine(screen, rect, Math.floor(rect.height / 2), centerCells(hint, rect.width, rect.x), styles.muted);
         cache.clear();
         return;
     }
@@ -43,7 +44,7 @@ export function renderList(state, screen, layout) {
         if (y >= rect.height) {
             break;
         }
-        const selected = state.selected.has(row.id);
+        const selected = state.multiSelect && state.selected.has(row.id);
         const cursor = rowIndex === state.filtered[state.cursor];
         const positions = state.matchPositions.get(rowIndex) ?? [];
         const hash = lineHash(row, selected, cursor, positions);
@@ -67,40 +68,49 @@ function renderRow(screen, rect, rowY, row, opts) {
     const marker = opts.selected ? "┃" : " ";
     const cursor = opts.cursor ? "●" : "◌";
     const focus = opts.cursor && opts.focused ? " ▌" : "";
-    const badge = row.badge ? ` ${row.badge.text}` : "";
     const prefix = `${marker} ${cursor} `;
-    const available = Math.max(0, rect.width - prefix.length - focus.length - badge.length);
-    const title = stripAnsi(row.title).slice(0, available);
+    const prefixWidth = cellWidth(prefix, rect.x);
+    const focusWidth = cellWidth(focus);
+    const badge = row.badge
+        ? fitToWidth(` ${row.badge.text}`, Math.max(0, rect.width - prefixWidth - focusWidth), rect.x + prefixWidth)
+        : "";
+    const badgeWidth = cellWidth(badge);
+    const available = Math.max(0, rect.width - prefixWidth - focusWidth - badgeWidth);
+    const rawTitle = stripAnsi(row.title);
+    const titleX = rect.x + prefixWidth;
+    const title = fitToWidth(rawTitle, available, titleX);
+    const titleWasTruncated = cellWidth(rawTitle, titleX) > available;
+    const positions = new Set(opts.positions);
     let x = rect.x;
     const y = rect.y + rowY;
     screen.put(x, y, prefix, opts.cursor ? styles.accent : styles.muted);
-    x += prefix.length;
-    for (let index = 0; index < title.length; index += 1) {
-        const style = opts.positions.includes(index) ? styles.matchHighlight : {};
-        screen.put(x + index, y, title[index], style);
+    x += prefixWidth;
+    for (const segment of splitGraphemeCells(title, x)) {
+        const isTruncationMarker = titleWasTruncated && segment.end === title.length && segment.value === "…";
+        const style = !isTruncationMarker && hasMatchPosition(segment.start, segment.end, positions)
+            ? styles.matchHighlight
+            : {};
+        screen.put(x, y, segment.value, style);
+        x += segment.width;
     }
     if (row.badge) {
-        screen.put(rect.x + rect.width - badge.length - focus.length, y, badge, styles.tones[row.badge.tone ?? "muted"]);
+        screen.put(rect.x + rect.width - badgeWidth - focusWidth, y, badge, styles.tones[row.badge.tone ?? "muted"]);
     }
     if (focus) {
-        screen.put(rect.x + rect.width - focus.length, y, focus, styles.borderFocused);
+        screen.put(rect.x + rect.width - focusWidth, y, focus, styles.borderFocused);
     }
 }
 function writeLine(screen, rect, row, text, style = {}) {
-    screen.put(rect.x, rect.y + row, fit(text, rect.width), style);
+    screen.put(rect.x, rect.y + row, fitToWidth(text, rect.width, rect.x), style);
 }
 function lineHash(row, selected, cursor, positions) {
     return `${row.id}:${selected ? 1 : 0}:${cursor ? 1 : 0}:${positions.join(",")}`;
 }
-function center(text, width) {
-    return `${" ".repeat(Math.max(0, Math.floor((width - text.length) / 2)))}${text}`;
-}
-function fit(text, width) {
-    if (text.length <= width) {
-        return text;
+function hasMatchPosition(start, end, positions) {
+    for (let position = start; position < end; position += 1) {
+        if (positions.has(position)) {
+            return true;
+        }
     }
-    return width <= 1 ? text.slice(0, width) : `${text.slice(0, width - 1)}…`;
-}
-function stripAnsi(value) {
-    return value.replace(/\u001b\[[0-9;]*m/g, "");
+    return false;
 }

package/node_modules/@poe-code/design-system/dist/explorer/render/modal.js

@@ -1,4 +1,5 @@
 import { getExplorerStyles } from "../theme.js";
+import { fitToWidth, padEndCells } from "./text.js";
 export function renderModal(state, screen) {
     if (state.modal === null || screen.width <= 0 || screen.height <= 0) {
         return;
@@ -11,7 +12,7 @@ export function renderModal(state, screen) {
     drawBox(screen, x, y, width, height, title(state), styles.borderFocused);
     const lines = modalLines(state);
     for (let row = 0; row < Math.min(lines.length, height - 2); row += 1) {
-        screen.put(x + 2, y + 1 + row, fit(lines[row], width - 4), row === 1 ? styles.accent : {});
+        screen.put(x + 2, y + 1 + row, fitToWidth(lines[row], width - 4, x + 2), row === 1 ? styles.accent : {});
     }
 }
 function modalLines(state) {
@@ -54,8 +55,9 @@ function modalHeight(state) {
 }
 function drawBox(screen, x, y, width, height, boxTitle, style) {
     screen.clearRect({ x, y, width, height });
-    const titleSegment = `─ ${boxTitle} `;
-    screen.put(x, y, `╭${titleSegment}${"─".repeat(Math.max(0, width - titleSegment.length - 2))}╮`, style);
+    const innerWidth = Math.max(0, width - 2);
+    const titleSegment = fitToWidth(`─ ${boxTitle} `, innerWidth, x + 1);
+    screen.put(x, y, `╭${padEndCells(titleSegment, innerWidth, "─", x + 1)}╮`, style);
     for (let row = 1; row < height - 1; row += 1) {
         screen.put(x, y + row, "│", style);
         screen.put(x + width - 1, y + row, "│", style);
@@ -83,9 +85,3 @@ function paletteLines(state) {
 function labelFor(action) {
     return typeof action.label === "function" ? action.label() : action.label;
 }
-function fit(text, width) {
-    if (text.length <= width) {
-        return text;
-    }
-    return width <= 1 ? text.slice(0, width) : `${text.slice(0, width - 1)}…`;
-}

package/node_modules/@poe-code/design-system/dist/explorer/render/text.d.ts

@@ -0,0 +1,12 @@
+export interface GraphemeCell {
+    value: string;
+    start: number;
+    end: number;
+    width: number;
+}
+export declare function cellWidth(value: string, startColumn?: number): number;
+export declare function fitToWidth(text: string, width: number, startColumn?: number): string;
+export declare function centerCells(text: string, width: number, startColumn?: number): string;
+export declare function padEndCells(text: string, width: number, fill?: string, startColumn?: number): string;
+export declare function splitGraphemeCells(value: string, startColumn?: number): GraphemeCell[];
+export declare function stripAnsi(value: string): string;

package/node_modules/@poe-code/design-system/dist/explorer/render/text.js

@@ -0,0 +1,81 @@
+import { displayWidth, graphemes } from "../../dashboard/terminal-width.js";
+const ELLIPSIS = "…";
+export function cellWidth(value, startColumn = 0) {
+    return displayWidth(value, startColumn);
+}
+export function fitToWidth(text, width, startColumn = 0) {
+    if (width <= 0) {
+        return "";
+    }
+    if (cellWidth(text, startColumn) <= width) {
+        return text;
+    }
+    const ellipsisWidth = cellWidth(ELLIPSIS, startColumn);
+    if (ellipsisWidth > width) {
+        return takeCells(text, width, startColumn);
+    }
+    const prefix = takeCells(text, width - ellipsisWidth, startColumn);
+    return `${prefix}${ELLIPSIS}`;
+}
+export function centerCells(text, width, startColumn = 0) {
+    const fitted = fitToWidth(text, width, startColumn);
+    const padding = Math.max(0, Math.floor((width - cellWidth(fitted, startColumn)) / 2));
+    return `${" ".repeat(padding)}${fitted}`;
+}
+export function padEndCells(text, width, fill = " ", startColumn = 0) {
+    let output = takeCells(text, width, startColumn);
+    let used = cellWidth(output, startColumn);
+    let column = startColumn + used;
+    while (used < width) {
+        const fillWidth = cellWidth(fill, column);
+        if (fill.length === 0 || fillWidth <= 0 || used + fillWidth > width) {
+            const spaces = width - used;
+            output += " ".repeat(spaces);
+            used += spaces;
+            column += spaces;
+            continue;
+        }
+        output += fill;
+        used += fillWidth;
+        column += fillWidth;
+    }
+    return output;
+}
+export function splitGraphemeCells(value, startColumn = 0) {
+    const cells = [];
+    let offset = 0;
+    let column = startColumn;
+    for (const segment of graphemes(value)) {
+        const width = cellWidth(segment, column);
+        cells.push({
+            value: segment,
+            start: offset,
+            end: offset + segment.length,
+            width
+        });
+        offset += segment.length;
+        column += width;
+    }
+    return cells;
+}
+export function stripAnsi(value) {
+    return value.replace(/\u001b\[[0-9;]*m/g, "");
+}
+function takeCells(text, width, startColumn) {
+    if (width <= 0) {
+        return "";
+    }
+    let output = "";
+    let used = 0;
+    let column = startColumn;
+    for (const segment of graphemes(text)) {
+        const segmentWidth = cellWidth(segment, column);
+        if (used + segmentWidth > width) {
+            break;
+        }
+        output += segment;
+        used += segmentWidth;
+        column += segmentWidth;
+    }
+    return output;
+}

package/node_modules/@poe-code/design-system/dist/explorer/state.d.ts

@@ -102,6 +102,7 @@ export interface ExplorerState {
         loading: boolean;
     };
     selected: Set<string>;
+    multiSelect: boolean;
     modal: null | {
         kind: "help";
     } | {

package/node_modules/@poe-code/design-system/dist/explorer/state.js

@@ -16,6 +16,7 @@ export function createInitialState(config, size) {
         cols: normalizeSize(size.cols),
         rows: normalizeSize(size.rows)
     };
+    const multiSelect = config.multiSelect ?? true;
     return {
         title: config.title,
         emptyHint: config.emptyHint ?? "No detail",
@@ -35,6 +36,7 @@ export function createInitialState(config, size) {
             loading: false
         },
         selected: new Set(),
+        multiSelect,
         modal: null,
         toast: null,
         dirty: REGION_ALL,

package/node_modules/@poe-code/design-system/dist/prompts/index.js

@@ -95,12 +95,12 @@ export async function withSpinner(options) {
         const result = await fn();
         const msg = stopMessage ? stopMessage(result) : undefined;
         if (msg) {
-            process.stdout.write(`\x1b[32m◆\x1b[0m  ${msg}\n`);
+            process.stdout.write(`${color.green("◆")}  ${msg}\n`);
         }
         const sub = subtext ? subtext(result) : undefined;
         if (sub) {
             for (const line of sub.split("\n")) {
-                process.stdout.write(`\x1b[90m│\x1b[0m     ${line}\n`);
+                process.stdout.write(`${color.gray("│")}     ${line}\n`);
             }
         }
         return result;
@@ -120,7 +120,7 @@ export async function withSpinner(options) {
         const sub = subtext ? subtext(result) : undefined;
         if (sub) {
             for (const line of sub.split("\n")) {
-                process.stdout.write(`\x1b[90m│\x1b[0m     ${line}\n`);
+                process.stdout.write(`${color.gray("│")}     ${line}\n`);
             }
         }
         return result;

package/node_modules/auth-store/dist/encrypted-file-store.d.ts

@@ -33,6 +33,7 @@ export interface EncryptedFileStoreInput {
 export declare class EncryptedFileStore implements SecretStore {
     private readonly fs;
     private readonly filePath;
+    private readonly symbolicLinkCheckStartPath;
     private readonly salt;
     private readonly getMachineIdentity;
     private readonly getRandomBytes;

package/node_modules/auth-store/dist/encrypted-file-store.js

@@ -13,6 +13,7 @@ let temporaryFileSequence = 0;
 export class EncryptedFileStore {
     fs;
     filePath;
+    symbolicLinkCheckStartPath;
     salt;
     getMachineIdentity;
     getRandomBytes;
@@ -20,7 +21,16 @@ export class EncryptedFileStore {
     constructor(input) {
         this.fs = input.fs ?? fs;
         this.salt = input.salt;
-        this.filePath = input.filePath ?? path.join((input.getHomeDirectory ?? homedir)(), input.defaultDirectory ?? ".auth-store", input.defaultFileName ?? "credentials.enc");
+        if (input.filePath === undefined) {
+            const homeDirectory = (input.getHomeDirectory ?? homedir)();
+            const defaultDirectory = input.defaultDirectory ?? ".auth-store";
+            this.filePath = path.join(homeDirectory, defaultDirectory, input.defaultFileName ?? "credentials.enc");
+            this.symbolicLinkCheckStartPath = resolveDefaultDirectoryCheckStart(homeDirectory, defaultDirectory);
+        }
+        else {
+            this.filePath = input.filePath;
+            this.symbolicLinkCheckStartPath = null;
+        }
         this.getMachineIdentity = input.getMachineIdentity ?? defaultMachineIdentity;
         this.getRandomBytes = input.getRandomBytes ?? randomBytes;
     }
@@ -106,7 +116,7 @@ export class EncryptedFileStore {
     }
     async assertRegularCredentialPath() {
         const resolvedPath = path.resolve(this.filePath);
-        const protectedPaths = [path.dirname(resolvedPath), resolvedPath];
+        const protectedPaths = getProtectedCredentialPaths(resolvedPath, this.symbolicLinkCheckStartPath);
         for (const currentPath of protectedPaths) {
             try {
                 const stats = await this.fs.lstat(currentPath);
@@ -135,6 +145,30 @@ export class EncryptedFileStore {
         return this.keyPromise;
     }
 }
+function resolveDefaultDirectoryCheckStart(homeDirectory, defaultDirectory) {
+    const [firstSegment] = defaultDirectory.split(/[\\/]+/).filter(Boolean);
+    return path.resolve(homeDirectory, firstSegment ?? ".");
+}
+function getProtectedCredentialPaths(resolvedPath, symbolicLinkCheckStartPath) {
+    if (symbolicLinkCheckStartPath === null) {
+        return [path.dirname(resolvedPath), resolvedPath];
+    }
+    const resolvedStartPath = path.resolve(symbolicLinkCheckStartPath);
+    if (!isPathInsideOrEqual(resolvedPath, resolvedStartPath)) {
+        return [path.dirname(resolvedPath), resolvedPath];
+    }
+    const protectedPaths = [resolvedStartPath];
+    let currentPath = resolvedStartPath;
+    for (const segment of path.relative(resolvedStartPath, resolvedPath).split(path.sep).filter(Boolean)) {
+        currentPath = path.join(currentPath, segment);
+        protectedPaths.push(currentPath);
+    }
+    return protectedPaths;
+}
+function isPathInsideOrEqual(childPath, parentPath) {
+    const relativePath = path.relative(parentPath, childPath);
+    return relativePath === "" || (!relativePath.startsWith("..") && !path.isAbsolute(relativePath));
+}
 async function removeIfPresent(fileSystem, filePath) {
     try {
         await fileSystem.unlink(filePath);

package/node_modules/auth-store/dist/keychain-store.js

@@ -64,6 +64,19 @@ function runSecurityCommand(command, args, options) {
         });
         let stdout = "";
         let stderr = "";
+        let stdinErrorMessage;
+        const appendStderr = (message) => {
+            stderr = stderr.length === 0
+                ? message
+                : `${stderr}${stderr.endsWith("\n") ? "" : "\n"}${message}`;
+        };
+        const appendStdinError = () => {
+            if (stdinErrorMessage === undefined) {
+                return;
+            }
+            appendStderr(stdinErrorMessage);
+            stdinErrorMessage = undefined;
+        };
         child.stdout?.setEncoding("utf8");
         child.stdout?.on("data", (chunk) => {
             stdout += chunk.toString();
@@ -73,17 +86,23 @@ function runSecurityCommand(command, args, options) {
             stderr += chunk.toString();
         });
         if (options?.stdin !== undefined) {
+            child.stdin?.once("error", (error) => {
+                stdinErrorMessage = error instanceof Error ? error.message : String(error);
+            });
             child.stdin?.end(options.stdin);
         }
         child.on("error", (error) => {
             const message = error instanceof Error ? error.message : String(error ?? "Unknown error");
+            appendStdinError();
+            appendStderr(message);
             resolve({
                 stdout,
-                stderr: stderr ? `${stderr}${message}` : message,
+                stderr,
                 exitCode: 127
             });
         });
         child.on("close", (code) => {
+            appendStdinError();
             resolve({
                 stdout,
                 stderr,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "toolcraft-openapi",
-  "version": "0.0.24",
+  "version": "0.0.26",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -31,7 +31,7 @@
     "@clack/core": "^1.0.0",
     "@clack/prompts": "^1.0.0",
     "@poe-code/design-system": "^0.0.2",
-    "toolcraft": "0.0.24",
+    "toolcraft": "0.0.26",
     "auth-store": "^0.0.1",
     "yaml": "^2.8.2"
   },