toolcraft-openapi 0.0.170 → 0.0.172

package/dist/composition.json

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

package/node_modules/toolcraft-design/dist/explorer/detail-content.d.ts

@@ -0,0 +1,6 @@
+import { ansiToCells } from "../screen/ansi-text.js";
+export interface PreparedDetailContent {
+    text: string;
+    lines: ReturnType<typeof ansiToCells>[];
+}
+export declare function prepareDetailContent(content: string, width: number): PreparedDetailContent;

package/node_modules/toolcraft-design/dist/explorer/detail-content.js

@@ -0,0 +1,32 @@
+import { ansiToCells } from "../screen/ansi-text.js";
+import { renderMarkdown } from "../terminal-markdown/index.js";
+const markdownCache = new Map();
+export function prepareDetailContent(content, width) {
+    if (content.trim().length === 0) {
+        return { text: "", lines: [[]] };
+    }
+    width = Math.max(1, width);
+    const key = `${contentHash(content)}:${width}`;
+    const cached = markdownCache.get(key);
+    if (cached !== undefined)
+        return cached;
+    const text = renderMarkdown(content, { width }).trimEnd();
+    const lines = [[]];
+    for (const cell of ansiToCells(text)) {
+        if (cell.ch === "\n")
+            lines.push([]);
+        else
+            lines.at(-1).push(cell);
+    }
+    const prepared = { text, lines };
+    markdownCache.set(key, prepared);
+    return prepared;
+}
+function contentHash(content) {
+    let hash = 2166136261;
+    for (let index = 0; index < content.length; index += 1) {
+        hash ^= content.charCodeAt(index);
+        hash = Math.imul(hash, 16777619);
+    }
+    return hash >>> 0;
+}

package/node_modules/toolcraft-design/dist/explorer/layout.d.ts

@@ -19,3 +19,4 @@ export interface ExplorerLayout {
     footer: Rect;
 }
 export declare function computeExplorerLayout(opts: ExplorerLayoutOptions): ExplorerLayout;
+export declare function paneBodyRect(rect: Rect): Rect;

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

@@ -62,6 +62,14 @@ export function computeExplorerLayout(opts) {
         footer
     };
 }
+export function paneBodyRect(rect) {
+    return {
+        x: rect.x + 2,
+        y: rect.y + 1,
+        width: Math.max(0, rect.width - 4),
+        height: Math.max(0, rect.height - 2)
+    };
+}
 function resolveMode(cols, rows) {
     if (cols < 60 || rows < 8) {
         return "too-narrow";

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

@@ -1,6 +1,8 @@
 import { graphemes } from "../dashboard/terminal-width.js";
 import { buildActionContext, resolveAction } from "./actions.js";
+import { prepareDetailContent } from "./detail-content.js";
 import { filterRows } from "./filter.js";
+import { computeExplorerLayout, paneBodyRect } from "./layout.js";
 import { REGION_ALL, REGION_DETAIL, REGION_FOOTER, REGION_HEADER, REGION_LIST, REGION_MODAL, resolveExplorerLayoutMode } from "./state.js";
 const NO_EFFECTS = [];
 const DEFAULT_ACTION_HANDLES = {
@@ -640,31 +642,18 @@ function maxDetailScroll(state) {
         return 0;
     }
     if (items.length === 1 && items[0]?.title === undefined) {
-        const visibleHeight = detailBodyHeight(state);
-        if (visibleHeight <= 0) {
+        const body = paneBodyRect(computeExplorerLayout({ ...state.size, focused: state.focused }).detail);
+        const content = items[0]?.renderedContent;
+        if (body.width <= 0 || body.height <= 0 || content === undefined) {
             return 0;
         }
-        return Math.max(0, detailContentLineCount(items[0]) - visibleHeight);
+        return Math.max(0, prepareDetailContent(content, body.width).lines.length - body.height);
     }
     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 - 2);
-    }
-    return Math.max(0, contentHeight - 2);
+    const body = paneBodyRect(computeExplorerLayout({ ...state.size, focused: state.focused }).detail);
+    return body.width > 0 ? body.height : 0;
 }
 function extendSelection(state, delta) {
     if (!state.multiSelect) {

package/node_modules/toolcraft-design/dist/explorer/render/detail.d.ts

@@ -1,4 +1,4 @@
 import type { ScreenSurface as ScreenBuffer } from "../../screen/screen.js";
-import type { ExplorerLayout } from "../layout.js";
+import { type ExplorerLayout } from "../layout.js";
 import type { ExplorerState } from "../state.js";
 export declare function renderDetail(state: ExplorerState, screen: ScreenBuffer, layout: ExplorerLayout): void;

package/node_modules/toolcraft-design/dist/explorer/render/detail.js

@@ -1,9 +1,8 @@
-import { ansiToCells } from "../../screen/ansi-text.js";
-import { renderMarkdown } from "../../terminal-markdown/index.js";
+import { prepareDetailContent } from "../detail-content.js";
+import { paneBodyRect } from "../layout.js";
 import { getExplorerStyles } from "../theme.js";
-import { drawPaneFrame, paneBodyRect } from "./pane.js";
+import { drawPaneFrame } from "./pane.js";
 import { fitToWidth } from "./text.js";
-const markdownCache = new Map();
 export function renderDetail(state, screen, layout) {
     const rect = layout.detail;
     const styles = getExplorerStyles();
@@ -14,38 +13,34 @@ export function renderDetail(state, screen, layout) {
     const row = state.rows.find((r) => r.id === state.detail.rowId) ?? null;
     const pane = state.paneDefinitions[1];
     const title = pane?.titleForRow?.(row ?? undefined) ?? pane?.title ?? "Preview";
-    if (layout.mode === "narrow-vertical") {
-        drawPaneFrame(screen, rect, title, state.focused === "detail" ? styles.borderFocused : styles.border, { focused: state.focused === "detail", indicator: scrollIndicator(state) });
-        renderDetailBody(state, screen, paneBodyRect(rect), row);
-        return;
-    }
-    drawPaneFrame(screen, rect, title, state.focused === "detail" ? styles.borderFocused : styles.border, { focused: state.focused === "detail", indicator: scrollIndicator(state) });
-    renderDetailBody(state, screen, paneBodyRect(rect), row);
+    const { start, max } = renderDetailBody(state, screen, paneBodyRect(rect), row);
+    drawPaneFrame(screen, rect, title, state.focused === "detail" ? styles.borderFocused : styles.border, { focused: state.focused === "detail", indicator: scrollIndicator(state, start, max) });
 }
 function renderDetailBody(state, screen, rect, row) {
     const styles = getExplorerStyles();
     const items = state.detail.items;
     if (rect.width <= 0 || rect.height <= 0) {
-        return;
+        return { start: 0, max: 0 };
     }
     if (items === null) {
         writeLine(screen, rect, 0, row === null ? state.emptyHint : "Loading detail...", styles.muted);
-        return;
+        return { start: 0, max: 0 };
     }
     if (items.length === 0) {
         writeLine(screen, rect, 0, state.emptyHint, styles.muted);
-        return;
+        return { start: 0, max: 0 };
     }
     if (items.length === 1 && items[0]?.title === undefined) {
-        renderBlob(screen, rect, renderItemMarkdown(items[0], rect, row), state.detail.scroll);
-        return;
+        const content = prepareDetailContent(renderItem(items[0], rect, row), rect.width);
+        return renderBlob(screen, rect, content.lines, state.detail.scroll);
     }
-    renderListMode(state, screen, rect, items, row);
+    return renderListMode(state, screen, rect, items, row);
 }
 function renderListMode(state, screen, rect, items, row) {
     const styles = getExplorerStyles();
     let y = 0;
-    const start = clamp(state.detail.scroll, 0, Math.max(0, items.length - 1));
+    const max = Math.max(0, items.length - 1);
+    const start = clamp(state.detail.scroll, 0, max);
     for (let index = start; index < items.length && y < rect.height; index += 1) {
         const item = items[index];
         const cursor = index === state.detail.cursor;
@@ -59,7 +54,8 @@ function renderListMode(state, screen, rect, items, row) {
             writeLine(screen, rect, y, `  ${item.subtitle}`, styles.muted);
             y += 1;
         }
-        for (const line of renderItemMarkdown(item, rect, row).split("\n")) {
+        const content = prepareDetailContent(renderItem(item, rect, row), rect.width);
+        for (const line of content.text.split("\n")) {
             if (y >= rect.height) {
                 break;
             }
@@ -70,16 +66,11 @@ function renderListMode(state, screen, rect, items, row) {
             y += 1;
         }
     }
+    return { start, max };
 }
-function renderBlob(screen, rect, text, scroll) {
-    const allLines = [[]];
-    for (const cell of ansiToCells(text)) {
-        if (cell.ch === "\n")
-            allLines.push([]);
-        else
-            allLines.at(-1).push(cell);
-    }
-    const start = clamp(scroll, 0, Math.max(0, allLines.length - rect.height));
+function renderBlob(screen, rect, allLines, scroll) {
+    const max = Math.max(0, allLines.length - rect.height);
+    const start = clamp(scroll, 0, max);
     const lines = allLines.slice(start);
     for (let row = 0; row < rect.height; row += 1) {
         let x = rect.x;
@@ -90,20 +81,7 @@ function renderBlob(screen, rect, text, scroll) {
             x += cell.width;
         }
     }
-}
-function renderItemMarkdown(item, rect, row) {
-    const content = renderItem(item, rect, row);
-    if (content.trim().length === 0) {
-        return "";
-    }
-    const width = Math.max(1, rect.width);
-    const key = `${contentHash(content)}:${width}`;
-    const cached = markdownCache.get(key);
-    if (cached !== undefined)
-        return cached;
-    const rendered = renderMarkdown(content, { width }).trimEnd();
-    markdownCache.set(key, rendered);
-    return rendered;
+    return { start, max };
 }
 function renderItem(item, rect, row) {
     if (item.renderedContent !== undefined) {
@@ -131,18 +109,8 @@ function writeLine(screen, rect, row, text, style = {}) {
 function clamp(value, min, max) {
     return Math.min(max, Math.max(min, value));
 }
-function scrollIndicator(state) {
+function scrollIndicator(state, start, max) {
     if (state.detail.loading)
         return "⠋";
-    const content = state.detail.items?.[state.detail.cursor]?.renderedContent ?? "";
-    const total = Math.max(1, content.split("\n").length);
-    return `${Math.min(100, Math.round((state.detail.scroll / Math.max(1, total - 1)) * 100))}%`;
-}
-function contentHash(content) {
-    let hash = 2166136261;
-    for (let index = 0; index < content.length; index += 1) {
-        hash ^= content.charCodeAt(index);
-        hash = Math.imul(hash, 16777619);
-    }
-    return hash >>> 0;
+    return `${max === 0 ? 0 : Math.round((start / max) * 100)}%`;
 }

package/node_modules/toolcraft-design/dist/explorer/render/pane.d.ts

@@ -5,4 +5,4 @@ export declare function drawPaneFrame(screen: ScreenBuffer, rect: Rect, title: s
     focused?: boolean;
     indicator?: string;
 }): void;
-export declare function paneBodyRect(rect: Rect): Rect;
+export { paneBodyRect } from "../layout.js";

package/node_modules/toolcraft-design/dist/explorer/render/pane.js

@@ -23,11 +23,4 @@ export function drawPaneFrame(screen, rect, title, style = {}, options = {}) {
         screen.put(rect.x, rect.y + rect.height - 1, `${options.focused ? "┗" : "└"}${horizontal.repeat(innerWidth)}${options.focused ? "┛" : "┘"}`, style);
     }
 }
-export function paneBodyRect(rect) {
-    return {
-        x: rect.x + 2,
-        y: rect.y + 1,
-        width: Math.max(0, rect.width - 4),
-        height: Math.max(0, rect.height - 2)
-    };
-}
+export { paneBodyRect } from "../layout.js";

package/node_modules/toolcraft-schema/package.json

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

package/package.json

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