@nmakarov/cli-toolkit 0.21.0 → 0.23.0

package/dist/init.js

@@ -14,7 +14,7 @@ var __export = (target, all) => {
     __defProp(target, name, { get: all[name], enumerable: true });
 };
 
-// src/screen/components.ts
+// src/screen/components.js
 import { createElement as h } from "react";
 import { Box, Text } from "ink";
 function getScreenWidth(maxWidth = null) {
@@ -89,13 +89,12 @@ function ScreenFooter({ lines, textStyle }) {
   );
 }
 var init_components = __esm({
-  "src/screen/components.ts"() {
-    "use strict";
+  "src/screen/components.js"() {
   }
 });
 
-// src/screen/list-components.ts
-import React2, { useState, useEffect, useRef, createElement } from "react";
+// src/screen/list-components.js
+import React, { useState, useEffect, useRef, createElement } from "react";
 import { Box as Box2, Text as Text2 } from "ink";
 function MultiColumnListComponent({ items, ctx, selectedIndexRef }) {
   const [, forceUpdate] = useState({});
@@ -231,11 +230,11 @@ function MultiColumnListWithPreviewComponent({
   const previewRows = [];
   if (typeof previewContent === "string") {
     previewRows.push(h2(ScreenRow, { key: "preview-string", children: h2(Text2, { bold: true }, previewContent) }));
-  } else if (typeof previewContent === "object" && !React2.isValidElement(previewContent) && previewContent !== null) {
+  } else if (typeof previewContent === "object" && !React.isValidElement(previewContent) && previewContent !== null) {
     Object.entries(previewContent).forEach(([key, value], idx) => {
       previewRows.push(h2(ScreenRow, { key: `preview-${key}-${idx}`, children: h2(Text2, {}, `${key}: ${value}`) }));
     });
-  } else if (React2.isValidElement(previewContent)) {
+  } else if (React.isValidElement(previewContent)) {
     previewRows.push(h2(ScreenRow, { key: "preview-element", children: previewContent }));
   }
   return h2(
@@ -248,11 +247,13 @@ function MultiColumnListWithPreviewComponent({
     ...previewRows
   );
 }
-function ListComponent({ items, ctx, selectedIndexRef, renderItem, getTitle, sortable = false, maxHeight, sortHighlightStyle, selectionMarker = " " }) {
+function ListComponent({ items, ctx, selectedIndexRef, renderItem, getTitle, sortable = false, maxHeight, sortHighlightStyle, selectionMarker = " ", onSelectionChange }) {
   const [, forceUpdate] = useState({});
   const [sortOrder, setSortOrder] = useState("none");
   const [scrollOffset, setScrollOffset] = useState(0);
   const scrollStateRef = useRef({ scrollOffset: 0, maxHeight: 0, totalItems: 0 });
+  const itemsRef = useRef(items);
+  itemsRef.current = items;
   const defaultGetTitle = (item) => {
     return getTitle ? getTitle(item) : typeof item.value === "string" ? item.value : item.value?.title || item.name;
   };
@@ -266,18 +267,24 @@ function ListComponent({ items, ctx, selectedIndexRef, renderItem, getTitle, sor
       return titleA > titleB ? -1 : titleA < titleB ? 1 : 0;
     }
   }) : items;
+  const displayItemsRef = useRef(displayItems);
+  displayItemsRef.current = displayItems;
   const effectiveMaxHeight = maxHeight || displayItems.length;
-  const canScroll = displayItems.length > effectiveMaxHeight;
+  const _canScroll = displayItems.length > effectiveMaxHeight;
   const maxScrollOffset = Math.max(0, displayItems.length - effectiveMaxHeight);
   const clampedScrollOffset = Math.min(Math.max(0, scrollOffset), maxScrollOffset);
   const visibleItems = displayItems.slice(clampedScrollOffset, clampedScrollOffset + effectiveMaxHeight);
   const canScrollUp = clampedScrollOffset > 0;
   const canScrollDown = clampedScrollOffset < maxScrollOffset;
   scrollStateRef.current = { scrollOffset, maxHeight: effectiveMaxHeight, totalItems: displayItems.length };
+  const onSelectionChangeRef = useRef(onSelectionChange);
+  onSelectionChangeRef.current = onSelectionChange;
   useEffect(() => {
     ctx.setAction("moveUp", () => {
       const newIndex = Math.max(0, selectedIndexRef.current - 1);
       selectedIndexRef.current = newIndex;
+      const list = displayItemsRef.current;
+      onSelectionChangeRef.current?.(newIndex, list[newIndex]);
       const { scrollOffset: currentScrollOffset, maxHeight: currentMaxHeight, totalItems } = scrollStateRef.current;
       const currentMaxScrollOffset = Math.max(0, totalItems - currentMaxHeight);
       const currentClampedScrollOffset = Math.min(Math.max(0, currentScrollOffset), currentMaxScrollOffset);
@@ -287,18 +294,11 @@ function ListComponent({ items, ctx, selectedIndexRef, renderItem, getTitle, sor
       forceUpdate({});
     });
     ctx.setAction("moveDown", () => {
-      const currentItems = sortable && sortOrder !== "none" ? [...items].sort((a, b) => {
-        const titleA = titleGetter(a).toLowerCase();
-        const titleB = titleGetter(b).toLowerCase();
-        if (sortOrder === "asc") {
-          return titleA < titleB ? -1 : titleA > titleB ? 1 : 0;
-        } else {
-          return titleA > titleB ? -1 : titleA < titleB ? 1 : 0;
-        }
-      }) : items;
-      const maxIndex = currentItems.length - 1;
+      const currentItems = displayItemsRef.current;
+      const maxIndex = Math.max(0, currentItems.length - 1);
       const newIndex = Math.min(maxIndex, selectedIndexRef.current + 1);
       selectedIndexRef.current = newIndex;
+      onSelectionChangeRef.current?.(newIndex, currentItems[newIndex]);
       const { scrollOffset: currentScrollOffset, maxHeight: currentMaxHeight, totalItems } = scrollStateRef.current;
       const currentMaxScrollOffset = Math.max(0, totalItems - currentMaxHeight);
       const currentClampedScrollOffset = Math.min(Math.max(0, currentScrollOffset), currentMaxScrollOffset);
@@ -308,8 +308,7 @@ function ListComponent({ items, ctx, selectedIndexRef, renderItem, getTitle, sor
       forceUpdate({});
     });
     ctx.setAction("scrollUp", () => {
-      const { scrollOffset: currentScrollOffset, maxHeight: currentMaxHeight, totalItems } = scrollStateRef.current;
-      const currentMaxScrollOffset = Math.max(0, totalItems - currentMaxHeight);
+      const { scrollOffset: currentScrollOffset } = scrollStateRef.current;
       const newScrollOffset = Math.max(0, currentScrollOffset - 1);
       setScrollOffset(newScrollOffset);
       forceUpdate({});
@@ -324,9 +323,9 @@ function ListComponent({ items, ctx, selectedIndexRef, renderItem, getTitle, sor
     if (sortable) {
       ctx.setAction("toggleSort", () => {
         const nextSort = sortOrder === "none" ? "asc" : sortOrder === "asc" ? "desc" : "none";
-        const currentSelectedItem = displayItems[selectedIndexRef.current];
+        const currentSelectedItem = displayItemsRef.current[selectedIndexRef.current];
         setSortOrder(nextSort);
-        const newSortedItems = nextSort !== "none" ? [...items].sort((a, b) => {
+        const newSortedItems = nextSort !== "none" ? [...itemsRef.current].sort((a, b) => {
           const titleA = titleGetter(a).toLowerCase();
           const titleB = titleGetter(b).toLowerCase();
           if (nextSort === "asc") {
@@ -334,7 +333,7 @@ function ListComponent({ items, ctx, selectedIndexRef, renderItem, getTitle, sor
           } else {
             return titleA > titleB ? -1 : titleA < titleB ? 1 : 0;
           }
-        }) : items;
+        }) : itemsRef.current;
         const newIndex = newSortedItems.findIndex((item) => item === currentSelectedItem);
         if (newIndex !== -1) {
           selectedIndexRef.current = newIndex;
@@ -472,14 +471,13 @@ function ListComponent({ items, ctx, selectedIndexRef, renderItem, getTitle, sor
 }
 var h2;
 var init_list_components = __esm({
-  "src/screen/list-components.ts"() {
-    "use strict";
+  "src/screen/list-components.js"() {
     init_components();
     h2 = createElement;
   }
 });
 
-// src/screen/screens.ts
+// src/screen/screens.js
 import { useState as useState2, createElement as h3 } from "react";
 import { render, useInput, Text as Text3 } from "ink";
 function groupKeyBindings(bindings) {
@@ -557,7 +555,7 @@ async function showScreen(config2) {
     let renderResult = null;
     let initialized = false;
     const Screen = () => {
-      const [updateCounter, setUpdateCounter] = useState2(0);
+      const [, setUpdateCounter] = useState2(0);
       if (!initialized) {
         const defaultBindings = [
           { key: "escape", caption: "go back", action: "back", protected: true, order: 1 },
@@ -676,7 +674,7 @@ async function showScreen(config2) {
           }
         }
         if (matchedBinding && actions[matchedBinding.action]) {
-          const actionResult = actions[matchedBinding.action]({
+          actions[matchedBinding.action]({
             input,
             key,
             binding: matchedBinding
@@ -806,8 +804,7 @@ async function showMultiColumnListWithPreviewScreen(config2) {
 }
 var showMenuScreen, showWordGridScreen;
 var init_screens = __esm({
-  "src/screen/screens.ts"() {
-    "use strict";
+  "src/screen/screens.js"() {
     init_components();
     init_list_components();
     showMenuScreen = showListScreen;
@@ -815,9 +812,9 @@ var init_screens = __esm({
   }
 });
 
-// src/screen/ui-elements.ts
+// src/screen/ui-elements.js
 import { createElement as h4 } from "react";
-import { Box as Box4, Text as Text4 } from "ink";
+import { Box as Box3, Text as Text4 } from "ink";
 function ListItem({
   children,
   isSelected = false,
@@ -827,7 +824,7 @@ function ListItem({
   dimColor = false
 }) {
   return h4(
-    Box4,
+    Box3,
     {},
     h4(Text4, {
       color: isSelected ? backgroundColor || "green" : color,
@@ -842,10 +839,10 @@ function TextBlock({
   color = "white",
   dimmed = false,
   bold = false,
-  maxWidth
+  maxWidth: _maxWidth
 }) {
   return h4(
-    Box4,
+    Box3,
     {},
     h4(Text4, {
       color,
@@ -856,7 +853,7 @@ function TextBlock({
 }
 function Divider({ character = "\u2500", width = 80 }) {
   return h4(
-    Box4,
+    Box3,
     { marginY: 1 },
     h4(Text4, { dimColor: true }, character.repeat(width))
   );
@@ -871,7 +868,7 @@ function GridCell({
   align = "left"
 }) {
   return h4(
-    Box4,
+    Box3,
     { width },
     h4(Text4, {
       color,
@@ -882,25 +879,24 @@ function GridCell({
     }, children)
   );
 }
-function InputField({ prompt, value, onChange, onSubmit }) {
+function InputField({ prompt, value, onChange: _onChange, onSubmit: _onSubmit }) {
   return h4(
-    Box4,
+    Box3,
     { flexDirection: "column" },
     h4(Text4, {}, prompt),
     h4(
-      Box4,
+      Box3,
       { marginTop: 1 },
       h4(Text4, { color: "cyan" }, " > ", value, "_")
     )
   );
 }
 var init_ui_elements = __esm({
-  "src/screen/ui-elements.ts"() {
-    "use strict";
+  "src/screen/ui-elements.js"() {
   }
 });
 
-// src/screen/utils.ts
+// src/screen/utils.js
 function buildBreadcrumb(parts) {
   if (parts.length === 0) return "";
   if (parts.length === 1) return parts[0];
@@ -914,12 +910,11 @@ function buildDetailBreadcrumb(path, suffix = "") {
   return suffix ? `${breadcrumb} ${suffix}` : breadcrumb;
 }
 var init_utils = __esm({
-  "src/screen/utils.ts"() {
-    "use strict";
+  "src/screen/utils.js"() {
   }
 });
 
-// src/screen/footer-builder.ts
+// src/screen/footer-builder.js
 function buildFooter(config2 = {}) {
   const {
     navigation = null,
@@ -970,8 +965,7 @@ function organizeFooterMessages(messages) {
 }
 var FooterPresets;
 var init_footer_builder = __esm({
-  "src/screen/footer-builder.ts"() {
-    "use strict";
+  "src/screen/footer-builder.js"() {
     FooterPresets = {
       /**
        * Menu screen footer
@@ -1030,10 +1024,10 @@ var init_footer_builder = __esm({
   }
 });
 
-// src/screen/index.ts
+// src/screen/index.js
 var screen_exports = {};
 __export(screen_exports, {
-  Box: () => Box5,
+  Box: () => Box4,
   Divider: () => Divider,
   FooterPresets: () => FooterPresets,
   GridCell: () => GridCell,
@@ -1042,7 +1036,7 @@ __export(screen_exports, {
   ListItem: () => ListItem,
   MultiColumnListComponent: () => MultiColumnListComponent,
   MultiColumnListWithPreviewComponent: () => MultiColumnListWithPreviewComponent,
-  React: () => React5,
+  React: () => React2,
   ScreenBody: () => ScreenBody,
   ScreenContainer: () => ScreenContainer,
   ScreenDivider: () => ScreenDivider,
@@ -1056,6 +1050,7 @@ __export(screen_exports, {
   buildFooter: () => buildFooter,
   h: () => createElement2,
   load: () => load,
+  memo: () => memo,
   organizeFooterMessages: () => organizeFooterMessages,
   showListScreen: () => showListScreen,
   showMenuScreen: () => showMenuScreen,
@@ -1064,14 +1059,15 @@ __export(screen_exports, {
   showScreen: () => showScreen,
   showWordGridScreen: () => showWordGridScreen,
   useCallback: () => useCallback,
-  useEffect: () => useEffect3,
+  useEffect: () => useEffect2,
   useInput: () => useInput2,
+  useLayoutEffect: () => useLayoutEffect,
   useMemo: () => useMemo,
-  useRef: () => useRef3,
+  useRef: () => useRef2,
   useState: () => useState3
 });
-import React5, { useState as useState3, useEffect as useEffect3, useRef as useRef3, useMemo, useCallback, createElement as createElement2 } from "react";
-import { Box as Box5, Text as Text5, useInput as useInput2 } from "ink";
+import React2, { useState as useState3, useEffect as useEffect2, useLayoutEffect, useRef as useRef2, useMemo, useCallback, memo, createElement as createElement2 } from "react";
+import { Box as Box4, Text as Text5, useInput as useInput2 } from "ink";
 async function load() {
   if (loadPromise) return loadPromise;
   loadPromise = Promise.all([
@@ -1083,8 +1079,7 @@ async function load() {
 }
 var loadPromise;
 var init_screen = __esm({
-  "src/screen/index.ts"() {
-    "use strict";
+  "src/screen/index.js"() {
     init_screens();
     init_list_components();
     init_components();
@@ -1099,7 +1094,7 @@ var init_screen = __esm({
   }
 });
 
-// src/args/index.ts
+// src/args/index.js
 import { readFileSync, existsSync } from "fs";
 import { resolve, dirname, basename, extname, join, isAbsolute } from "path";
 import { config } from "dotenv";
@@ -1582,10 +1577,10 @@ var Args = class _Args {
   }
 };
 
-// src/params/index.ts
+// src/params/index.js
 import Joi from "joi";
 
-// src/errors.ts
+// src/errors.js
 var FrameworkError = class extends Error {
   constructor(message) {
     super(message);
@@ -1605,7 +1600,7 @@ var InitError = class extends FrameworkError {
   }
 };
 
-// src/params/custom-types.ts
+// src/params/custom-types.js
 var joiEdateType = (value, helpers) => {
   if (typeof value === "string" && /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d{3})?Z$/.test(value)) {
     const testDate = new Date(value);
@@ -1698,7 +1693,7 @@ function calculateTimeOffset(amount, unit, sign) {
   }
   return sign === "+" ? amount * multiplier : -amount * multiplier;
 }
-var joiStringArrayType = (type) => (value, helpers) => {
+var joiStringArrayType = (type) => (value, _helpers) => {
   if (value === void 0 || typeof value === "function") {
     return [];
   }
@@ -1724,7 +1719,7 @@ var joiStringArrayType = (type) => (value, helpers) => {
   return arr;
 };
 
-// src/params/index.ts
+// src/params/index.js
 var Params = class _Params {
   context;
   // Partial context during initialization
@@ -1984,7 +1979,7 @@ var Params = class _Params {
       definition = val;
       val = val.value;
     }
-    const def = this.assignDefinition(key, definition);
+    this.assignDefinition(key, definition);
     if (!this.runAllRegisteredSetters(key, val)) {
       this.params[key] = val;
     }
@@ -2103,11 +2098,11 @@ var Params = class _Params {
   }
 };
 
-// src/logger/index.ts
+// src/logger/index.js
 import chalk from "chalk";
 import util from "util";
 
-// src/logger/transports.ts
+// src/logger/transports.js
 var ConsoleTransport = class {
   write(payload) {
     console.info(payload);
@@ -2127,7 +2122,7 @@ var ParentProcessTransport = class {
   }
 };
 
-// src/logger/index.ts
+// src/logger/index.js
 var ALL_LEVELS = [
   "silly",
   "debug",
@@ -2200,6 +2195,7 @@ var Logger = class _Logger {
   }
   /**
    * Initialize logger from context and CLI parameters. Whatever is in options goes (after discovered params).
+   * Params are tracked under the `logger` module for --showUsedParams.
    */
   static init(context, options) {
     const paramDefs = {
@@ -2213,7 +2209,7 @@ var Logger = class _Logger {
       progressWithTimes: "boolean default false",
       progressThrottleMs: "number"
     };
-    const discovered = context.params.getAllForModule(paramDefs);
+    const discovered = context.params.getAllForModule("logger", paramDefs);
     const config2 = { ...discovered, ...options };
     const logger = new _Logger(context, config2);
     context.logger = logger;
@@ -2409,9 +2405,9 @@ var Logger = class _Logger {
   }
 };
 
-// src/init/index.ts
+// src/init/index.js
 import { EventEmitter } from "events";
-function extractComponentOptions(opts, componentName) {
+function extractComponentOptions(opts, _componentName) {
   const reservedKeys = ["overrides", "defaults", "modules"];
   const componentOptions = {};
   for (const [key, value] of Object.entries(opts)) {
@@ -2478,6 +2474,19 @@ function printAllParameters(context) {
 async function init(flow, opts = {}) {
   let stop = false;
   let context = null;
+  let cleanupRan = false;
+  const runRegisteredCleanups = async (ctx) => {
+    if (cleanupRan) return;
+    cleanupRan = true;
+    const fns = [...ctx.cleanupFunctions].reverse();
+    for (const fn of fns) {
+      try {
+        await fn(ctx);
+      } catch (error) {
+        ctx.logger.warn("[cleanup] error in cleanup function:", error);
+      }
+    }
+  };
   try {
     try {
       const screenModule = await Promise.resolve().then(() => (init_screen(), screen_exports));
@@ -2500,13 +2509,24 @@ async function init(flow, opts = {}) {
       printAllParameters(context);
       process.exit(0);
     }
+    let sigintCount = 0;
     process.on("SIGINT", async () => {
-      if (stop) {
-        context.logger.warn("[process] killed");
-        process.exit(2);
+      if (!context) return;
+      sigintCount += 1;
+      if (sigintCount === 1) {
+        stop = true;
+        context.logger.info(`>> emitting stop with allowance ${stopAllowance}`);
+        context.emitter.emit("stop", stopAllowance);
+        return;
       }
+      context.logger.warn("[process] second SIGINT: running cleanup then exit");
+      await runRegisteredCleanups(context);
+      process.exit(2);
+    });
+    process.on("SIGTERM", () => {
+      if (!context || stop) return;
       stop = true;
-      context.logger.info(`>> emitting stop with allowance ${stopAllowance}`);
+      context.logger.info(`>> SIGTERM: emitting stop with allowance ${stopAllowance}`);
       context.emitter.emit("stop", stopAllowance);
     });
     await flow(context);
@@ -2531,13 +2551,7 @@ async function init(flow, opts = {}) {
     }
   } finally {
     if (context) {
-      for (const fn of context.cleanupFunctions.reverse()) {
-        try {
-          await fn(context);
-        } catch (error) {
-          context.logger.warn("[cleanup] error in cleanup function:", error);
-        }
-      }
+      await runRegisteredCleanups(context);
     }
   }
 }