@lablup/ui-common-cli 0.2.0-alpha.19 → 0.2.0-alpha.19.canary-20261020034030-36212c401

package/cli/agents.mjs

@@ -19,6 +19,7 @@ import {
   forkedExports,
   hiddenExports,
   importAstryxInternal,
+  replacementNote,
   uiCommonPackageJson,
 } from "./paths.mjs";
 import { rewriteOutput } from "./rewrite.mjs";
@@ -71,7 +72,7 @@ async function coreComponentCount() {
 /** ui-common's own lines, appended to the rewritten Astryx block. */
 function uiCommonSection({ version, astryxVersion, invocation }) {
   const components = customExports()
-    .filter((c) => !c.legacy && !c.fork && /^[A-Z]/.test(c.name))
+    .filter((c) => !c.legacy && !c.fork && !c.wraps && /^[A-Z]/.test(c.name))
     .map((c) => c.name);
   const lines = [
     `UI-COMMON (@lablup/ui-common v${version} wraps Astryx v${astryxVersion}):`,
@@ -84,9 +85,14 @@ function uiCommonSection({ version, astryxVersion, invocation }) {
       `- Use ${entry.replacedBy} (@lablup/ui-common/${entry.replacedBy}), not ${entry.name}: ui-common hides ${entry.name}.`,
     );
   }
-  for (const fork of forkedExports()) {
+  const replacements = forkedExports();
+  for (const fork of replacements.filter((f) => f.kind !== "wrapper")) {
+    lines.push(`- ${replacementNote(fork)}`);
+  }
+  const wrappers = replacements.filter((f) => f.kind === "wrapper");
+  if (wrappers.length > 0) {
     lines.push(
-      `- ${fork.name} (${fork.from}) comes from ui-common: its own copy of Astryx's, same API and import path. ${fork.reason}`,
+      `- Form controls (${wrappers.map((w) => w.name).join(", ")}) are ui-common's Form.Item wrappers at Astryx's import paths: no label, description, isRequired or status message props. Use them inside Form.Item, which owns label, extra, rules and help; \`status\` is "error" | "warning" for the border only.`,
     );
   }
   lines.push(

package/cli/paths.mjs

@@ -222,20 +222,30 @@ export function customExports(root = uiCommonRoot()) {
 }
 
 /**
- * ui-common's own copies of Astryx components (src/forks/): same names and
- * import paths as Astryx's, which exports.exclude.json hides. `names` are the
- * names a reader may meet it by; `from` is where a consumer imports it.
+ * ui-common's own versions of Astryx components, under the same names and
+ * import paths as Astryx's, which exports.exclude.json hides: copies with a
+ * fix and the same API (`kind: "fork"`, src/forks/), Form.Item wrappers that
+ * drop the field chrome (`kind: "wrapper"`, src/formControls/), and wrappers
+ * with the same API (`kind: "wrapped"`, Popover). `names`
+ * are the names a reader may meet it by; `from` is where a consumer imports
+ * it.
  *
- * @returns {Array<{name: string, from: string, names: string[], reason: string}>}
+ * @returns {Array<{name: string, kind: "fork" | "wrapper" | "wrapped", from: string, names: string[], reason: string}>}
  */
 export function forkedExports() {
   const exclusions = excludedExports();
   return customExports()
-    .filter((c) => c.fork !== undefined)
+    .filter((c) => c.fork !== undefined || c.wraps !== undefined)
     .map((c) => {
       const exclusion = exclusions.find((e) => e.replacedBy === c.name);
       return {
         name: c.name,
+        kind:
+          c.wraps === undefined
+            ? "fork"
+            : c.source.startsWith("formControls/")
+              ? "wrapper"
+              : "wrapped",
         from: `@lablup/ui-common/${c.subpath ?? exclusion?.name ?? ""}`,
         names: exclusion?.exports ?? [c.name],
         reason: exclusion?.reason ?? "",
@@ -243,6 +253,23 @@ export function forkedExports() {
     });
 }
 
+/**
+ * What to tell a reader about one of `forkedExports()`.
+ *
+ * @param {{name: string, kind: "fork" | "wrapper" | "wrapped", from: string, reason: string}} entry
+ */
+export function replacementNote(entry) {
+  if (entry.kind === "wrapper") {
+    return (
+      `${entry.name} (${entry.from}) comes from ui-common: Astryx's, wrapped for Form.Item, same import path. ` +
+      `It takes no label, description, required or status message; Form.Item's label, extra, rules and help do.`
+    );
+  }
+  return entry.kind === "wrapped"
+    ? `${entry.name} (${entry.from}) comes from ui-common: Astryx's, wrapped, same API and import path. ${entry.reason}`
+    : `${entry.name} (${entry.from}) comes from ui-common: its own copy of Astryx's, same API and import path. ${entry.reason}`;
+}
+
 /**
  * The exclusions that hide an Astryx name behind a different one. A fork's
  * exclusion is not one: the name stays, now ui-common's.

package/cli/rewrite.mjs

@@ -5,7 +5,7 @@
  * no quote, backslash or control character, so it is safe inside JSON string
  * literals: `--json` output stays valid JSON.
  */
-import { forkedExports, hiddenExports } from "./paths.mjs";
+import { forkedExports, hiddenExports, replacementNote } from "./paths.mjs";
 
 /** Astryx CLI subcommands. Used to tell `astryx component` from `astryx-base`. */
 export const ASTRYX_COMMANDS = [
@@ -113,10 +113,7 @@ export function exclusionNotes(text, args = []) {
   }
   for (const fork of forkedExports()) {
     if (fork.names.some(mentions)) {
-      notes.push(
-        `Note: ${fork.name} (${fork.from}) comes from ui-common: its own copy of ` +
-          `Astryx's, same API and import path. ${fork.reason}`,
-      );
+      notes.push(`Note: ${replacementNote(fork)}`);
     }
   }
   return notes;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lablup/ui-common-cli",
-  "version": "0.2.0-alpha.19",
+  "version": "0.2.0-alpha.19.canary-20261020034030-36212c401",
   "description": "The ui-common command line: the pinned Astryx CLI in @lablup/ui-common terms, the agent block, and the upgrade codemods",
   "license": "Apache-2.0",
   "author": "Lablup Inc.",
@@ -42,9 +42,9 @@
     "postcss-selector-parser": "^7.1.6"
   },
   "peerDependencies": {
-    "@lablup/ui-common": "0.2.0-alpha.19"
+    "@lablup/ui-common": "0.2.0-alpha.19.canary-20261020034030-36212c401"
   },
   "devDependencies": {
-    "@lablup/ui-common": "0.2.0-alpha.19"
+    "@lablup/ui-common": "0.2.0-alpha.19.canary-20261020034030-36212c401"
   }
 }