@cloudflare/kumo 1.5.1 → 1.7.0

package/dist/command-line/cli.js

@@ -382,40 +382,98 @@ import { dirname as dirname4, join as join5, resolve, relative, isAbsolute } fro
 import { fileURLToPath as fileURLToPath4 } from "node:url";
 
 // src/command-line/utils/transformer.ts
-function transformImports(content) {
-  const importRegex = /import\s+(?:type\s+)?{([^}]+)}\s+from\s+["']([^"']+)["'];?/g;
-  return content.replace(importRegex, (match, imports, path) => {
-    if (!path.startsWith("../")) {
-      return match;
-    }
-    const isComponentOrUtil = path.includes("/components/") || path.includes("/utils/");
-    if (!isComponentOrUtil) {
-      return match;
+function parseImports(content) {
+  const importRegex = /import\s+(type\s+)?{([^}]+)}\s+from\s+["']([^"']+)["'];?/g;
+  const imports = [];
+  let match;
+  while ((match = importRegex.exec(content)) !== null) {
+    imports.push({
+      fullMatch: match[0],
+      imports: match[2],
+      path: match[3],
+      startIndex: match.index,
+      endIndex: match.index + match[0].length,
+      isTypeOnlyImport: match[1] !== void 0
+    });
+  }
+  return imports;
+}
+function shouldTransformToKumo(path) {
+  if (!path.startsWith("../")) {
+    return false;
+  }
+  return path.includes("/components/") || path.includes("/utils/");
+}
+function parseImportItems(imports, isTypeOnlyImport) {
+  const items = imports.split(",").map((item) => item.trim()).filter((item) => item.length > 0);
+  const valueImports = [];
+  const typeImports = [];
+  for (const item of items) {
+    if (isTypeOnlyImport || item.startsWith("type ")) {
+      const typeName = item.startsWith("type ") ? item.slice(5).trim() : item;
+      typeImports.push(typeName);
+    } else {
+      valueImports.push(item);
     }
-    const isTypeOnlyImport = match.trim().startsWith("import type ");
-    const importItems = imports.split(",").map((item) => item.trim()).filter((item) => item.length > 0);
-    const typeImports = [];
-    const valueImports = [];
-    for (const item of importItems) {
-      if (item.startsWith("type ")) {
-        typeImports.push(item.slice(5).trim());
-      } else {
-        valueImports.push(item);
-      }
+  }
+  return { valueImports, typeImports };
+}
+function buildConsolidatedImport(valueImports, typeImports) {
+  const parts = [];
+  for (const item of valueImports) {
+    parts.push(item);
+  }
+  for (const item of typeImports) {
+    parts.push(`type ${item}`);
+  }
+  return `import { ${parts.join(", ")} } from "@cloudflare/kumo";`;
+}
+function transformImports(content) {
+  const parsedImports = parseImports(content);
+  const kumoImports = [];
+  const nonKumoImports = [];
+  for (const imp of parsedImports) {
+    if (shouldTransformToKumo(imp.path)) {
+      kumoImports.push(imp);
+    } else {
+      nonKumoImports.push(imp);
     }
-    if (isTypeOnlyImport) {
-      return `import type { ${importItems.join(", ")} } from "@cloudflare/kumo";`;
-    } else if (typeImports.length > 0 && valueImports.length > 0) {
-      const valueImport = `import { ${valueImports.join(", ")} } from "@cloudflare/kumo";`;
-      const typeImport = `import type { ${typeImports.join(", ")} } from "@cloudflare/kumo";`;
-      return `${valueImport}
-${typeImport}`;
-    } else if (typeImports.length > 0) {
-      return `import type { ${typeImports.join(", ")} } from "@cloudflare/kumo";`;
+  }
+  if (kumoImports.length === 0) {
+    return content;
+  }
+  const allValueImports = [];
+  const allTypeImports = [];
+  for (const imp of kumoImports) {
+    const { valueImports, typeImports } = parseImportItems(
+      imp.imports,
+      imp.isTypeOnlyImport
+    );
+    allValueImports.push(...valueImports);
+    allTypeImports.push(...typeImports);
+  }
+  const consolidatedImport = buildConsolidatedImport(
+    allValueImports,
+    allTypeImports
+  );
+  let result = content;
+  const sortedKumoImports = [...kumoImports].sort(
+    (a, b) => b.startIndex - a.startIndex
+  );
+  for (let i = 0; i < sortedKumoImports.length; i++) {
+    const imp = sortedKumoImports[i];
+    if (i === sortedKumoImports.length - 1) {
+      result = result.slice(0, imp.startIndex) + consolidatedImport + result.slice(imp.endIndex);
     } else {
-      return `import { ${valueImports.join(", ")} } from "@cloudflare/kumo";`;
+      let startIndex = imp.startIndex;
+      let endIndex = imp.endIndex;
+      if (startIndex > 0 && result[startIndex - 1] === "\n") {
+        startIndex--;
+      }
+      result = result.slice(0, startIndex) + result.slice(endIndex);
     }
-  });
+  }
+  return result;
 }
 
 // src/command-line/commands/add.ts

package/dist/command-line/commands/add.js

@@ -33,40 +33,98 @@ function readConfig(projectRoot = process.cwd()) {
 }
 
 // src/command-line/utils/transformer.ts
-function transformImports(content) {
-  const importRegex = /import\s+(?:type\s+)?{([^}]+)}\s+from\s+["']([^"']+)["'];?/g;
-  return content.replace(importRegex, (match, imports, path) => {
-    if (!path.startsWith("../")) {
-      return match;
-    }
-    const isComponentOrUtil = path.includes("/components/") || path.includes("/utils/");
-    if (!isComponentOrUtil) {
-      return match;
+function parseImports(content) {
+  const importRegex = /import\s+(type\s+)?{([^}]+)}\s+from\s+["']([^"']+)["'];?/g;
+  const imports = [];
+  let match;
+  while ((match = importRegex.exec(content)) !== null) {
+    imports.push({
+      fullMatch: match[0],
+      imports: match[2],
+      path: match[3],
+      startIndex: match.index,
+      endIndex: match.index + match[0].length,
+      isTypeOnlyImport: match[1] !== void 0
+    });
+  }
+  return imports;
+}
+function shouldTransformToKumo(path) {
+  if (!path.startsWith("../")) {
+    return false;
+  }
+  return path.includes("/components/") || path.includes("/utils/");
+}
+function parseImportItems(imports, isTypeOnlyImport) {
+  const items = imports.split(",").map((item) => item.trim()).filter((item) => item.length > 0);
+  const valueImports = [];
+  const typeImports = [];
+  for (const item of items) {
+    if (isTypeOnlyImport || item.startsWith("type ")) {
+      const typeName = item.startsWith("type ") ? item.slice(5).trim() : item;
+      typeImports.push(typeName);
+    } else {
+      valueImports.push(item);
     }
-    const isTypeOnlyImport = match.trim().startsWith("import type ");
-    const importItems = imports.split(",").map((item) => item.trim()).filter((item) => item.length > 0);
-    const typeImports = [];
-    const valueImports = [];
-    for (const item of importItems) {
-      if (item.startsWith("type ")) {
-        typeImports.push(item.slice(5).trim());
-      } else {
-        valueImports.push(item);
-      }
+  }
+  return { valueImports, typeImports };
+}
+function buildConsolidatedImport(valueImports, typeImports) {
+  const parts = [];
+  for (const item of valueImports) {
+    parts.push(item);
+  }
+  for (const item of typeImports) {
+    parts.push(`type ${item}`);
+  }
+  return `import { ${parts.join(", ")} } from "@cloudflare/kumo";`;
+}
+function transformImports(content) {
+  const parsedImports = parseImports(content);
+  const kumoImports = [];
+  const nonKumoImports = [];
+  for (const imp of parsedImports) {
+    if (shouldTransformToKumo(imp.path)) {
+      kumoImports.push(imp);
+    } else {
+      nonKumoImports.push(imp);
     }
-    if (isTypeOnlyImport) {
-      return `import type { ${importItems.join(", ")} } from "@cloudflare/kumo";`;
-    } else if (typeImports.length > 0 && valueImports.length > 0) {
-      const valueImport = `import { ${valueImports.join(", ")} } from "@cloudflare/kumo";`;
-      const typeImport = `import type { ${typeImports.join(", ")} } from "@cloudflare/kumo";`;
-      return `${valueImport}
-${typeImport}`;
-    } else if (typeImports.length > 0) {
-      return `import type { ${typeImports.join(", ")} } from "@cloudflare/kumo";`;
+  }
+  if (kumoImports.length === 0) {
+    return content;
+  }
+  const allValueImports = [];
+  const allTypeImports = [];
+  for (const imp of kumoImports) {
+    const { valueImports, typeImports } = parseImportItems(
+      imp.imports,
+      imp.isTypeOnlyImport
+    );
+    allValueImports.push(...valueImports);
+    allTypeImports.push(...typeImports);
+  }
+  const consolidatedImport = buildConsolidatedImport(
+    allValueImports,
+    allTypeImports
+  );
+  let result = content;
+  const sortedKumoImports = [...kumoImports].sort(
+    (a, b) => b.startIndex - a.startIndex
+  );
+  for (let i = 0; i < sortedKumoImports.length; i++) {
+    const imp = sortedKumoImports[i];
+    if (i === sortedKumoImports.length - 1) {
+      result = result.slice(0, imp.startIndex) + consolidatedImport + result.slice(imp.endIndex);
     } else {
-      return `import { ${valueImports.join(", ")} } from "@cloudflare/kumo";`;
+      let startIndex = imp.startIndex;
+      let endIndex = imp.endIndex;
+      if (startIndex > 0 && result[startIndex - 1] === "\n") {
+        startIndex--;
+      }
+      result = result.slice(0, startIndex) + result.slice(endIndex);
     }
-  });
+  }
+  return result;
 }
 
 // src/command-line/commands/add.ts

package/dist/{command-palette-TGXgr6Vq.js → command-palette-D3MNR7w9.js}

@@ -1,11 +1,11 @@
 "use client";
-import { jsx as e, jsxs as g, Fragment as E } from "react/jsx-runtime";
+import { jsx as e, jsxs as p, Fragment as E } from "react/jsx-runtime";
 import { forwardRef as K, useContext as N, createContext as v, useCallback as b, useRef as T } from "react";
 import { CaretRightIcon as M, ArrowSquareOutIcon as H, ArrowRightIcon as _, MagnifyingGlassIcon as F } from "@phosphor-icons/react";
 import { S as G } from "./surface-BIC6CXiz.js";
 import { L as j } from "./loader-DHGMYlC6.js";
 import { c as m } from "./cn-Bhsu1vx2.js";
-import { P as U, Q as V, X as z, Z as w, W as O, V as $, Y as q, b8 as B, a9 as Q, ae as S, af as W, ag as X } from "./vendor-base-ui-CQ6wEonS.js";
+import { a3 as U, a4 as z, a8 as O, aa as w, a7 as V, a6 as $, a9 as q, bf as B, am as S, ar as J, as as Q, at as W } from "./vendor-base-ui-9w7J6BvW.js";
 const C = v({});
 function I({
   open: t,
@@ -18,9 +18,9 @@ function I({
   }, c = b(() => {
     n(!1);
   }, [n]);
-  return /* @__PURE__ */ e(Q, { open: t, onOpenChange: n, modal: !0, children: /* @__PURE__ */ g(S, { children: [
+  return /* @__PURE__ */ e(S, { open: t, onOpenChange: n, modal: !0, children: /* @__PURE__ */ p(J, { children: [
     /* @__PURE__ */ e(
-      W,
+      Q,
       {
         className: "fixed inset-0 bg-kumo-overlay opacity-80 transition-all duration-150 data-[ending-style]:opacity-0 data-[starting-style]:opacity-0",
         onClick: s
@@ -29,7 +29,7 @@ function I({
     /* @__PURE__ */ e(
       G,
       {
-        as: X,
+        as: W,
         className: m(
           "fixed top-[10vh] left-1/2 w-full max-w-2xl -translate-x-1/2",
           "overflow-hidden rounded-lg",
@@ -44,7 +44,7 @@ function I({
     )
   ] }) });
 }
-function Y({
+function X({
   open: t,
   onOpenChange: n,
   onBackdropClick: o,
@@ -65,7 +65,7 @@ function Y({
       onOpenChange: n,
       onBackdropClick: o,
       children: /* @__PURE__ */ e(
-        A,
+        L,
         {
           items: s,
           value: c,
@@ -82,12 +82,12 @@ function Y({
     }
   );
 }
-function Z({
+function Y({
   children: t,
   leading: n,
   trailing: o
 }) {
-  return /* @__PURE__ */ g("div", { className: "flex items-center gap-3 bg-kumo-base px-4 py-3", children: [
+  return /* @__PURE__ */ p("div", { className: "flex items-center gap-3 bg-kumo-base px-4 py-3", children: [
     n ?? /* @__PURE__ */ e(
       F,
       {
@@ -113,7 +113,7 @@ const D = K(function({ children: n, className: o }, l) {
   );
 });
 D.displayName = "CommandPalette.List";
-function J({
+function Z({
   children: t,
   className: n,
   ...o
@@ -125,7 +125,7 @@ function ee({
   className: n
 }) {
   return /* @__PURE__ */ e(
-    O,
+    V,
     {
       className: m(
         "mb-2 px-2 pt-1 text-xs font-semibold text-kumo-strong",
@@ -160,7 +160,7 @@ function te({
   );
 }
 function ne({ children: t }) {
-  return /* @__PURE__ */ e(z, { children: /* @__PURE__ */ e("div", { className: "p-8 text-center", children: /* @__PURE__ */ e("p", { className: "text-kumo-strong", children: t ?? "No results found" }) }) });
+  return /* @__PURE__ */ e(O, { children: /* @__PURE__ */ e("div", { className: "p-8 text-center", children: /* @__PURE__ */ e("p", { className: "text-kumo-strong", children: t ?? "No results found" }) }) });
 }
 function oe({ children: t }) {
   return /* @__PURE__ */ e("div", { className: "flex items-center justify-center p-8", children: t ?? /* @__PURE__ */ e(j, { size: 24 }) });
@@ -209,7 +209,7 @@ function se({
   external: d = !1,
   nonInteractive: r = !1
 }) {
-  return /* @__PURE__ */ g(
+  return /* @__PURE__ */ p(
     w,
     {
       value: u,
@@ -220,13 +220,13 @@ function se({
       ),
       children: [
         c && /* @__PURE__ */ e("div", { className: "flex flex-shrink-0 items-center text-kumo-subtle", children: c }),
-        /* @__PURE__ */ e("div", { className: "min-w-0 flex-1", children: /* @__PURE__ */ g("div", { className: "flex items-center gap-2 truncate", children: [
-          n?.map((f, p) => /* @__PURE__ */ g("span", { className: "flex items-center gap-2", children: [
+        /* @__PURE__ */ e("div", { className: "min-w-0 flex-1", children: /* @__PURE__ */ p("div", { className: "flex items-center gap-2 truncate", children: [
+          n?.map((f, g) => /* @__PURE__ */ p("span", { className: "flex items-center gap-2", children: [
             /* @__PURE__ */ e(
               y,
               {
                 text: f,
-                highlights: l?.[p],
+                highlights: l?.[g],
                 className: "text-base text-kumo-default"
               }
             ),
@@ -237,7 +237,7 @@ function se({
                 weight: "bold"
               }
             )
-          ] }, p)),
+          ] }, g)),
           /* @__PURE__ */ e(
             y,
             {
@@ -247,7 +247,7 @@ function se({
             }
           ),
           d && /* @__PURE__ */ e(H, { className: "h-3.5 w-3.5 flex-shrink-0 text-kumo-subtle" }),
-          s && /* @__PURE__ */ g(E, { children: [
+          s && /* @__PURE__ */ p(E, { children: [
             /* @__PURE__ */ e("span", { className: "text-kumo-strong", children: "—" }),
             /* @__PURE__ */ e("span", { className: "truncate text-sm text-kumo-strong", children: s })
           ] })
@@ -272,8 +272,8 @@ function re({
     }
   );
 }
-const P = v({}), le = () => !0;
-function A({
+const A = v({}), le = () => !0;
+function L({
   children: t,
   items: n,
   value: o,
@@ -286,12 +286,12 @@ function A({
   onSelect: d,
   getSelectableItems: r
 }) {
-  const f = T(-1), p = b(
+  const f = T(-1), g = b(
     (h, x) => {
       f.current = x.index, s?.(h, x);
     },
     [s]
-  ), L = b(
+  ), P = b(
     (h) => {
       const x = h.key === "Enter", R = h.metaKey || h.ctrlKey;
       if (x && R && d && r) {
@@ -307,13 +307,13 @@ function A({
       items: n,
       value: o,
       onValueChange: l,
-      onItemHighlighted: p,
+      onItemHighlighted: g,
       itemToStringValue: c,
       filter: u,
       autoHighlight: "always",
       keepHighlight: !0,
       open: i,
-      children: /* @__PURE__ */ e(P.Provider, { value: { onInputKeyDown: L }, children: t })
+      children: /* @__PURE__ */ e(A.Provider, { value: { onInputKeyDown: P }, children: t })
     }
   ) });
 }
@@ -326,7 +326,7 @@ function ie({
   trailing: c,
   ...u
 }) {
-  const { onInputKeyDown: i } = N(P), { onClose: a } = N(C), d = b(
+  const { onInputKeyDown: i } = N(A), { onClose: a } = N(C), d = b(
     (r) => {
       if (l?.(r), !r.defaultPrevented) {
         if (r.key === "Escape" && a) {
@@ -338,7 +338,7 @@ function ie({
     },
     [i, l, a]
   );
-  return /* @__PURE__ */ e(Z, { leading: s, trailing: c, children: /* @__PURE__ */ e(
+  return /* @__PURE__ */ e(Y, { leading: s, trailing: c, children: /* @__PURE__ */ e(
     q,
     {
       placeholder: n,
@@ -357,21 +357,21 @@ function ce({
   children: t,
   className: n
 }) {
-  return /* @__PURE__ */ e(V, { className: m("space-y-3", n), children: t });
+  return /* @__PURE__ */ e(z, { className: m("space-y-3", n), children: t });
 }
 const ue = U, ye = {}, ke = {}, Ne = {
   /** Modal dialog wrapper - use with Panel for content that can swap */
   Dialog: I,
   /** Dialog + Panel combined - for simple single-view command palettes */
-  Root: Y,
+  Root: X,
   /** Autocomplete panel without dialog - use inside Dialog for swappable content */
-  Panel: A,
+  Panel: L,
   /** Input for use inside Panel */
   Input: ie,
   /** Scrollable results container */
   List: D,
   /** Category grouping */
-  Group: J,
+  Group: Z,
   /** Section header text */
   GroupLabel: ee,
   /** Basic item */
@@ -396,4 +396,4 @@ export {
   ye as K,
   ke as a
 };
-//# sourceMappingURL=command-palette-TGXgr6Vq.js.map
+//# sourceMappingURL=command-palette-D3MNR7w9.js.map