ht-skills 0.2.0 → 0.2.1

package/lib/cli.js

@@ -431,16 +431,89 @@ function normalizeInlineText(value) {
   return String(value || "").replace(/\s+/g, " ").trim();
 }
 
+const ANSI_PATTERN = /\u001B\[[0-?]*[ -/]*[@-~]/g;
+
+function stripAnsi(value) {
+  return String(value || "").replace(ANSI_PATTERN, "");
+}
+
+function isFullwidthCodePoint(codePoint) {
+  if (!Number.isFinite(codePoint)) {
+    return false;
+  }
+
+  return codePoint >= 0x1100 && (
+    codePoint <= 0x115f ||
+    codePoint === 0x2329 ||
+    codePoint === 0x232a ||
+    (codePoint >= 0x2e80 && codePoint <= 0xa4cf && codePoint !== 0x303f) ||
+    (codePoint >= 0xac00 && codePoint <= 0xd7a3) ||
+    (codePoint >= 0xf900 && codePoint <= 0xfaff) ||
+    (codePoint >= 0xfe10 && codePoint <= 0xfe19) ||
+    (codePoint >= 0xfe30 && codePoint <= 0xfe6f) ||
+    (codePoint >= 0xff00 && codePoint <= 0xff60) ||
+    (codePoint >= 0xffe0 && codePoint <= 0xffe6) ||
+    (codePoint >= 0x1f300 && codePoint <= 0x1f64f) ||
+    (codePoint >= 0x1f900 && codePoint <= 0x1f9ff) ||
+    (codePoint >= 0x20000 && codePoint <= 0x3fffd)
+  );
+}
+
+function getCharacterWidth(character) {
+  const codePoint = character.codePointAt(0);
+  if (!Number.isFinite(codePoint)) {
+    return 0;
+  }
+  if (
+    codePoint === 0 ||
+    (codePoint >= 0x0000 && codePoint <= 0x001f) ||
+    (codePoint >= 0x007f && codePoint <= 0x009f)
+  ) {
+    return 0;
+  }
+  return isFullwidthCodePoint(codePoint) ? 2 : 1;
+}
+
+function getDisplayWidth(value) {
+  let width = 0;
+  for (const character of stripAnsi(value)) {
+    width += getCharacterWidth(character);
+  }
+  return width;
+}
+
+function sliceTextByDisplayWidth(value, maxWidth) {
+  const safeWidth = Math.max(1, Number(maxWidth || 0));
+  const characters = [...String(value || "")];
+  let width = 0;
+  let index = 0;
+
+  while (index < characters.length) {
+    const characterWidth = getCharacterWidth(characters[index]);
+    if (width + characterWidth > safeWidth) {
+      break;
+    }
+    width += characterWidth;
+    index += 1;
+  }
+
+  return {
+    slice: characters.slice(0, index).join(""),
+    rest: characters.slice(index).join(""),
+    width,
+  };
+}
+
 function truncateText(value, maxLength) {
   const text = normalizeInlineText(value);
   const safeMaxLength = Math.max(1, Number(maxLength || 0));
-  if (text.length <= safeMaxLength) {
+  if (getDisplayWidth(text) <= safeMaxLength) {
     return text;
   }
   if (safeMaxLength <= 1) {
     return "…";
   }
-  return `${text.slice(0, safeMaxLength - 1).trimEnd()}…`;
+  return `${sliceTextByDisplayWidth(text, safeMaxLength - 1).slice.trimEnd()}…`;
 }
 
 function wrapText(value, maxWidth) {
@@ -448,37 +521,37 @@ function wrapText(value, maxWidth) {
   const safeWidth = Math.max(1, Number(maxWidth || 0));
   if (!text) return [""];
 
-  const words = text.split(" ");
   const lines = [];
-  let current = "";
+  let remaining = text;
 
-  for (const word of words) {
-    if (!current) {
-      if (word.length <= safeWidth) {
-        current = word;
-        continue;
-      }
-      lines.push(truncateText(word, safeWidth));
-      continue;
+  while (remaining) {
+    if (getDisplayWidth(remaining) <= safeWidth) {
+      lines.push(remaining);
+      break;
     }
 
-    const candidate = `${current} ${word}`;
-    if (candidate.length <= safeWidth) {
-      current = candidate;
-      continue;
-    }
+    const characters = [...remaining];
+    let width = 0;
+    let index = 0;
+    let lastBreakIndex = -1;
 
-    lines.push(current);
-    if (word.length <= safeWidth) {
-      current = word;
-    } else {
-      lines.push(truncateText(word, safeWidth));
-      current = "";
+    while (index < characters.length) {
+      const character = characters[index];
+      const characterWidth = getCharacterWidth(character);
+      if (width + characterWidth > safeWidth) {
+        break;
+      }
+      width += characterWidth;
+      index += 1;
+      if (character === " ") {
+        lastBreakIndex = index;
+      }
     }
-  }
 
-  if (current) {
-    lines.push(current);
+    const breakIndex = lastBreakIndex > 0 ? lastBreakIndex : Math.max(1, index);
+    const line = characters.slice(0, breakIndex).join("").trimEnd();
+    lines.push(line);
+    remaining = characters.slice(breakIndex).join("").trimStart();
   }
 
   return lines.length ? lines : [""];
@@ -563,7 +636,7 @@ function formatSearchResult(item, { index = 0, colorize = (text) => text, width
   }
 
   const separator = "  ";
-  const availableDescriptionWidth = width - plainPrefix.length - separator.length;
+  const availableDescriptionWidth = width - getDisplayWidth(plainPrefix) - getDisplayWidth(separator);
   if (availableDescriptionWidth < minDescriptionWidth) {
     return truncateText(`${plainPrefix}${separator}${descriptionPart}`, width);
   }
@@ -578,25 +651,26 @@ function formatSearchCard(item, { index = 0, colorize = (text) => text, width =
   const slugPart = `${item.slug}@${item.latestVersion}`;
   const namePart = normalizeInlineText(item.name || "");
   const descriptionPart = normalizeInlineText(item.description || "");
-  const maxInnerWidth = Math.max(42, width - 6);
+  const maxInnerWidth = Math.max(16, width - 6);
   const titleText = `${slugPart}${namePart ? ` (${namePart})` : ""}`;
   const detailLines = wrapText(descriptionPart || "-", maxInnerWidth);
   const contentWidth = Math.max(
-    Math.min(maxInnerWidth, titleText.length),
-    ...detailLines.map((line) => Math.min(maxInnerWidth, line.length)),
-    42,
+    16,
+    getDisplayWidth(ordinal) + 1,
+    Math.min(maxInnerWidth, getDisplayWidth(titleText)),
+    ...detailLines.map((line) => Math.min(maxInnerWidth, getDisplayWidth(line))),
   );
-  const titleSuffix = "─".repeat(Math.max(0, contentWidth - ordinal.length - 1));
+  const titleSuffix = "─".repeat(Math.max(0, contentWidth - getDisplayWidth(ordinal) - 1));
   const title = `${colorize("◇", "success")}  ${colorize(ordinal, "accent")} ${colorize(titleSuffix, "muted")}╮`;
   const blank = `│ ${" ".repeat(contentWidth)} │`;
   const firstLineText = truncateText(titleText, contentWidth);
-  const firstLine = `│ ${colorize(firstLineText, "accent")}${" ".repeat(Math.max(0, contentWidth - firstLineText.length))} │`;
+  const firstLine = `│ ${colorize(firstLineText, "accent")}${" ".repeat(Math.max(0, contentWidth - getDisplayWidth(firstLineText)))} │`;
   const detailRendered = detailLines.map((line) => {
     const text = truncateText(line, contentWidth);
-    return `│ ${text}${" ".repeat(Math.max(0, contentWidth - text.length))} │`;
+    return `│ ${text}${" ".repeat(Math.max(0, contentWidth - getDisplayWidth(text)))} │`;
   });
   const bottom = `╰${"─".repeat(contentWidth + 2)}╯`;
-  return [title, blank, firstLine, ...detailRendered, bottom].join("\n");
+  return [title, blank, firstLine, ...detailRendered, blank, bottom].join("\n");
 }
 
 function printFallbackIntro({ registry, slug, version, skillName, skillDescription, installTargets }, log = console.log) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ht-skills",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "CLI for installing and submitting skills from HT Skills Marketplace.",
   "type": "commonjs",
   "bin": {