inai-react-components 1.5.2 → 1.6.1

package/dist/commands/add.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add.d.ts","sourceRoot":"","sources":["../../src/commands/add.ts"],"names":[],"mappings":"AAKA,OAAO,EAGL,KAAK,iBAAiB,EAEtB,KAAK,kBAAkB,EAExB,MAAM,aAAa,CAAC;AAwBrB,MAAM,WAAW,UAAU;IACzB,kDAAkD;IAClD,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,2CAA2C;IAC3C,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,kDAAkD;IAClD,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,oDAAoD;IACpD,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,kDAAkD;IAClD,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,MAAM,WAAW,SAAS;IACxB,KAAK,EAAE,OAAO,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,2DAA2D;IAC3D,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,4DAA4D;IAC5D,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,kEAAkE;IAClE,WAAW,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CACjD;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG;IAChD,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;CACd,CAsCA;AAED;;GAEG;AACH,wBAAgB,cAAc,CAC5B,QAAQ,EAAE;IAAE,UAAU,EAAE,iBAAiB,EAAE,CAAC;IAAC,MAAM,EAAE,iBAAiB,EAAE,CAAC;IAAC,SAAS,EAAE,iBAAiB,EAAE,CAAA;CAAE,EAC1G,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,GAAG,IAAI,GACpB,iBAAiB,GAAG,IAAI,CAc1B;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAC1B,SAAS,EAAE,iBAAiB,EAC5B,cAAc,EAAE,kBAAkB,GACjC,MAAM,CAiBR;AAgUD,wBAAsB,MAAM,CAC1B,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,UAAe,GACvB,OAAO,CAAC,SAAS,CAAC,CAmMpB;AAqCD,MAAM,WAAW,iBAAkB,SAAQ,UAAU;IACnD,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,wBAAsB,UAAU,CAC9B,aAAa,CAAC,EAAE,MAAM,EACtB,OAAO,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAAC,IAAI,CAAC,CAqIf"}
+{"version":3,"file":"add.d.ts","sourceRoot":"","sources":["../../src/commands/add.ts"],"names":[],"mappings":"AAKA,OAAO,EAGL,KAAK,iBAAiB,EAEtB,KAAK,kBAAkB,EAExB,MAAM,aAAa,CAAC;AA0BrB,MAAM,WAAW,UAAU;IACzB,kDAAkD;IAClD,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,2CAA2C;IAC3C,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,kDAAkD;IAClD,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,oDAAoD;IACpD,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,kDAAkD;IAClD,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,MAAM,WAAW,SAAS;IACxB,KAAK,EAAE,OAAO,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,2DAA2D;IAC3D,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,4DAA4D;IAC5D,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,kEAAkE;IAClE,WAAW,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CACjD;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG;IAChD,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;CACd,CAsCA;AAED;;GAEG;AACH,wBAAgB,cAAc,CAC5B,QAAQ,EAAE;IAAE,UAAU,EAAE,iBAAiB,EAAE,CAAC;IAAC,MAAM,EAAE,iBAAiB,EAAE,CAAC;IAAC,SAAS,EAAE,iBAAiB,EAAE,CAAA;CAAE,EAC1G,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,GAAG,IAAI,GACpB,iBAAiB,GAAG,IAAI,CAc1B;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAC1B,SAAS,EAAE,iBAAiB,EAC5B,cAAc,EAAE,kBAAkB,GACjC,MAAM,CAiBR;AAgRD,wBAAsB,MAAM,CAC1B,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,UAAe,GACvB,OAAO,CAAC,SAAS,CAAC,CAmMpB;AAqCD,MAAM,WAAW,iBAAkB,SAAQ,UAAU;IACnD,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,wBAAsB,UAAU,CAC9B,aAAa,CAAC,EAAE,MAAM,EACtB,OAAO,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAAC,IAAI,CAAC,CAqIf"}

package/dist/commands/add.js

@@ -10,7 +10,7 @@ import { saveSnapshot, sha256, } from "../utils/snapshot.js";
 import { fuzzySearchNames } from "../utils/fuzzy-search.js";
 import { normalizeThemeCss, getLocalTailwindCssTemplate, getLegacyTailwindCssTemplate, } from "./init.js";
 import { autoInstallDeps } from "../utils/auto-install.js";
-import { resolveLocalDir, getSourceRoot, rewriteCompanyUiImports, } from "../utils/paths.js";
+import { resolveLocalDir, getSourceRoot, rewriteCompanyUiImports, rewriteLibImports, stripRelativeJsExtensions, } from "../utils/paths.js";
 /**
  * Parse a component spec into its registry namespace, type prefix and name.
  *
@@ -173,13 +173,25 @@ async function installOne(component, registry, componentsJson, registryDir, root
             }
         }
         let content = fs.readFileSync(registryFilePath, "utf-8");
-        // Blocks and templates reference sibling components via
-        // `from "@company/ui/<name>"`. Rewrite those to point at the user's
-        // locally-installed components using the project's alias prefix, so
-        // the block compiles without `@company/ui` being in node_modules.
-        if (isMultiFile) {
-            content = rewriteCompanyUiImports(content, componentsJson);
-        }
+        // Normalize every import in the copied file so the installed code
+        // reads consistently regardless of where it came from:
+        //
+        //   1. `rewriteLibImports`  — unifies `./lib/cn.js`, `../lib/cn.js`,
+        //      and `@company/ui/lib/cn` onto the single `aliases.lib` alias.
+        //      Runs first so `@company/ui/lib/*` is routed to `lib/`, not
+        //      rewritten to `aliases.components/lib/` by the next step.
+        //   2. `rewriteCompanyUiImports` — blocks/templates reference sibling
+        //      components via `from "@company/ui/<name>"`; rewrite those to
+        //      the user's alias (`@/components/ui/<name>`). Components never
+        //      use this pattern, but running it on everything is a no-op
+        //      and keeps the pipeline uniform.
+        //   3. `stripRelativeJsExtensions` — the source uses `.js` suffixes
+        //      for `moduleResolution: NodeNext`; consumer projects use
+        //      bundler resolution so the suffix is unnecessary and visually
+        //      confusing in `.tsx` files. Strip it from relative/alias specs.
+        content = rewriteLibImports(content, componentsJson);
+        content = rewriteCompanyUiImports(content, componentsJson);
+        content = stripRelativeJsExtensions(content);
         if (options.dryRun) {
             console.log(chalk.dim(`  [dry-run] would write ${path.relative(rootDir, localFilePath)}`));
         }
@@ -195,15 +207,26 @@ async function installOne(component, registry, componentsJson, registryDir, root
         }
         copiedFiles.push(displayName);
     }
-    // Internal deps (lib/cn, lib/animations, lib/i18n-context, ...).
+    // Internal deps (lib/cn, lib/animations, lib/i18n-context, lib/api-client, …).
+    //
+    // Destination: the unified `aliases.lib` directory (falls back to
+    // `<sourceRoot>/lib/` for legacy `components.json` files without the
+    // field). Every component, block, and template shares this one lib
+    // tree; their imports are rewritten above via `rewriteLibImports` to
+    // point at `aliases.lib`, so placement here must match that alias.
     //
-    // Placement matters: source components import via `./lib/<name>.js`
-    // (sibling), so lib files MUST land in `<componentDir>/lib/` — NOT in
-    // `<sourceRoot>/lib/`. Otherwise the relative imports break at runtime.
+    // Collision policy: if a file already exists AND its content matches
+    // something the CLI previously wrote (or it's about to be overwritten
+    // with the exact same bytes), we treat it as a no-op. Otherwise we
+    // respect `force` / `skipExisting` / prompt like any other file — this
+    // protects the user's own `lib/utils.ts`, custom `api-client.ts`, etc.
     //
     // Extensions: most lib files are `.ts` but `i18n-context.tsx` contains
     // JSX and must be copied as `.tsx`. We probe both in order.
-    const componentsDir = resolveLocalDir(componentsJson.aliases.components, componentsJson);
+    const libDirRaw = componentsJson.aliases.lib;
+    const libDir = libDirRaw
+        ? resolveLocalDir(libDirRaw, componentsJson)
+        : `${getSourceRoot(componentsJson)}/lib`;
     const copiedInternalDeps = [];
     for (const dep of component.internalDeps) {
         const depBase = dep.split("/").pop();
@@ -222,102 +245,59 @@ async function installOne(component, registry, componentsJson, registryDir, root
         else {
             continue;
         }
-        // e.g. componentsDir = "app/components/ui" → target:
-        //      "app/components/ui/lib/i18n-context.tsx"
-        const depTargetPath = path.join(rootDir, componentsDir, "lib", depFileName);
-        const content = fs.readFileSync(depSourcePath, "utf-8");
+        // e.g. libDir = "src/lib" → target: "src/lib/i18n-context.tsx"
+        const depTargetPath = path.join(rootDir, libDir, depFileName);
+        // Lib files must go through the same import normalization as
+        // everything else — otherwise `i18n-context.tsx` would still
+        // contain `from "./i18n-types.js"` (relative-sibling) which breaks
+        // under the unified layout if the user's tsconfig ever shifts.
+        let depContent = fs.readFileSync(depSourcePath, "utf-8");
+        depContent = rewriteLibImports(depContent, componentsJson);
+        depContent = rewriteCompanyUiImports(depContent, componentsJson);
+        depContent = stripRelativeJsExtensions(depContent);
+        // Protect the user's pre-existing lib files. If the destination
+        // exists and its content differs from what we're about to write,
+        // respect `force`/`skipExisting`/prompt like the main copy loop.
+        if (fs.existsSync(depTargetPath)) {
+            const existing = fs.readFileSync(depTargetPath, "utf-8");
+            if (existing === depContent) {
+                // Identical — no work to do.
+                copiedInternalDeps.push(dep);
+                continue;
+            }
+            if (!options.force) {
+                if (options.skipExisting) {
+                    continue;
+                }
+                if (options.dryRun) {
+                    // Treat as would-overwrite for dry-run logging.
+                }
+                else if (process.stdin.isTTY) {
+                    const res = await prompts({
+                        type: "confirm",
+                        name: "overwrite",
+                        message: `Lib file "${path.relative(rootDir, depTargetPath)}" already exists. Overwrite?`,
+                        initial: false,
+                    });
+                    if (!res.overwrite)
+                        continue;
+                }
+                else {
+                    // Non-interactive and not forced — skip silently to avoid
+                    // clobbering the user's own implementation (e.g. api-client).
+                    continue;
+                }
+            }
+        }
         if (options.dryRun) {
             console.log(chalk.dim(`  [dry-run] would write ${path.relative(rootDir, depTargetPath)}`));
         }
         else {
             fs.mkdirSync(path.dirname(depTargetPath), { recursive: true });
-            fs.writeFileSync(depTargetPath, content);
+            fs.writeFileSync(depTargetPath, depContent);
         }
         copiedInternalDeps.push(dep);
     }
-    // Block/template lib: blocks import via `../../lib/animations` and
-    // `../../lib/styles` relative to `<blocksDir>/<blockName>/page.tsx`,
-    // which resolves two levels up to `path.dirname(blocksDir)/lib/`.
-    // Copy the global block lib from `apps/docs/src/registry/lib/` there.
-    if (isMultiFile) {
-        const blocksDir = resolveLocalDir(componentsJson.aliases.blocks, componentsJson);
-        const blockLibDest = path.join(rootDir, path.dirname(blocksDir), "lib");
-        for (const libFile of ["animations.ts", "styles.ts"]) {
-            const src = path.join(registryDir, "apps", "docs", "src", "registry", "lib", libFile);
-            if (!fs.existsSync(src))
-                continue;
-            const dest = path.join(blockLibDest, libFile);
-            if (fs.existsSync(dest) && !options.force)
-                continue;
-            if (options.dryRun) {
-                console.log(chalk.dim(`  [dry-run] would write ${path.relative(rootDir, dest)}`));
-            }
-            else {
-                fs.mkdirSync(blockLibDest, { recursive: true });
-                fs.copyFileSync(src, dest);
-            }
-        }
-        // Some data-heavy blocks (data-table-full, template-admin-dashboard,
-        // detail-panel-table, etc.) import from `../../../lib/api-client` and
-        // `../../../lib/api-types`, which resolves to `<sourceRoot>/lib/`.
-        // These are integration points with the user's backend that can't be
-        // shipped as real code — but we can write minimal stubs so the project
-        // compiles out of the box. Stubs are only written if the file doesn't
-        // already exist; if the user has a real implementation it stays intact.
-        const sourceRoot = getSourceRoot(componentsJson);
-        const userLibDir = path.join(rootDir, sourceRoot, "lib");
-        const stubApiTypes = path.join(userLibDir, "api-types.ts");
-        const stubApiClient = path.join(userLibDir, "api-client.ts");
-        if (!fs.existsSync(stubApiTypes) && !options.dryRun) {
-            fs.mkdirSync(userLibDir, { recursive: true });
-            fs.writeFileSync(stubApiTypes, `// Stub generated by inai-react-components. Replace with your real API types.
-// These types satisfy the shape expected by data-heavy blocks
-// (data-table-full, template-admin-dashboard, detail-panel-table, ...).
-// If you already have a typed API layer, delete this file and point the
-// block imports at your own module instead.
-
-export interface PaginationMeta {
-  totalRows: number;
-  totalPages: number;
-  page: number;
-  pageSize: number;
-}
-
-export interface PaginatedResponse<T> {
-  data: T[];
-  pagination: PaginationMeta;
-}
-`);
-        }
-        if (!fs.existsSync(stubApiClient) && !options.dryRun) {
-            fs.mkdirSync(userLibDir, { recursive: true });
-            fs.writeFileSync(stubApiClient, `// Stub generated by inai-react-components. Replace with your real API client.
-// Data-heavy blocks call \`fetchPaginated\` and \`downloadCsv\` at runtime.
-// Without a real implementation the app will throw when you interact with
-// those features — wire these up to your backend (fetch, tRPC, REST, etc.).
-
-import type { PaginatedResponse } from "./api-types.js";
-
-export async function fetchPaginated<T>(
-  endpoint: string,
-  _params: Record<string, unknown>
-): Promise<PaginatedResponse<T>> {
-  throw new Error(
-    \`fetchPaginated stub called for "\${endpoint}". Replace <sourceRoot>/lib/api-client.ts with your real API client.\`
-  );
-}
-
-export async function downloadCsv(
-  endpoint: string,
-  _params: Record<string, unknown>
-): Promise<void> {
-  throw new Error(
-    \`downloadCsv stub called for "\${endpoint}". Replace <sourceRoot>/lib/api-client.ts with your real CSV exporter.\`
-  );
-}
-`);
-        }
-    }
     // Update components.json (skipped in dry-run).
     if (!options.dryRun) {
         const registryVersion = registry.version;

package/dist/commands/init.d.ts

@@ -245,6 +245,7 @@ export interface ComponentsJson {
         components: string;
         blocks: string;
         utils: string;
+        lib?: string;
     };
     theme: Theme;
     font: {
@@ -273,12 +274,14 @@ export declare function getLegacyTailwindCssTemplate(theme: Theme, fontBody: Fon
 export declare function normalizeThemeCss(css: string, theme: string): string;
 /**
  * Copies the i18n base files (context, types, defaults) from the registry
- * to `<componentPath>/lib/`. Required because ~75 components import
- * `useUIMessages` from `./lib/i18n-context.js` — the lib directory must
- * live as a SIBLING of the component `.tsx` files so relative imports
- * resolve correctly.
+ * to `<sourceRoot>/lib/`. ~75 components import `useUIMessages` from the
+ * i18n context; the CLI rewrites those imports at install-time to the
+ * unified `aliases.lib` directory, so the files must land there.
+ *
+ * Never overwrites pre-existing files so a user's custom i18n provider
+ * stays intact across re-runs.
  */
-export declare function copyI18nFiles(registryDir: string | undefined, targetDir: string, componentPath: string): string[];
+export declare function copyI18nFiles(registryDir: string | undefined, targetDir: string, libDirRelative: string): string[];
 export declare function runInit(config: InitConfig, targetDir: string, repoUrl?: string): Promise<{
     success: boolean;
     filesCreated: string[];

package/dist/commands/init.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"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"}

package/dist/commands/init.js

@@ -180,6 +180,11 @@ export function buildComponentsJson(config, repoUrl) {
         aliasPrefix: "@/",
     };
     const utilsAlias = `${layout.aliasPrefix}lib/utils`;
+    // Unified destination for every shared lib file shipped by the CLI
+    // (cn, animations, i18n context, api stubs, ...). Stored in alias form
+    // so it can be used as an import specifier verbatim and also resolved
+    // back to a filesystem path via `resolveLocalDir`.
+    const libAlias = `${layout.aliasPrefix}lib`;
     const json = {
         $schema: "https://inai-ui.dev/schema.json",
         style: "default",
@@ -193,6 +198,7 @@ export function buildComponentsJson(config, repoUrl) {
             components: config.componentPath,
             blocks: config.blockPath,
             utils: utilsAlias,
+            lib: libAlias,
         },
         theme: config.theme,
         font: {
@@ -347,25 +353,30 @@ function copyTokensToProject(registryDir, targetDir, theme, sourceRoot) {
 }
 /**
  * Copies the i18n base files (context, types, defaults) from the registry
- * to `<componentPath>/lib/`. Required because ~75 components import
- * `useUIMessages` from `./lib/i18n-context.js` — the lib directory must
- * live as a SIBLING of the component `.tsx` files so relative imports
- * resolve correctly.
+ * to `<sourceRoot>/lib/`. ~75 components import `useUIMessages` from the
+ * i18n context; the CLI rewrites those imports at install-time to the
+ * unified `aliases.lib` directory, so the files must land there.
+ *
+ * Never overwrites pre-existing files so a user's custom i18n provider
+ * stays intact across re-runs.
  */
-export function copyI18nFiles(registryDir, targetDir, componentPath) {
+export function copyI18nFiles(registryDir, targetDir, libDirRelative) {
     if (!registryDir)
         return [];
     const files = ["i18n-context.tsx", "i18n-types.ts", "i18n-defaults.ts"];
     const srcBase = path.join(registryDir, "packages", "ui", "src", "lib");
-    const destBase = path.join(targetDir, componentPath, "lib");
+    const destBase = path.join(targetDir, libDirRelative);
     fs.mkdirSync(destBase, { recursive: true });
     const copied = [];
     for (const file of files) {
         const src = path.join(srcBase, file);
         if (!fs.existsSync(src))
             continue;
-        fs.copyFileSync(src, path.join(destBase, file));
-        copied.push(`${componentPath}/lib/${file}`);
+        const dest = path.join(destBase, file);
+        if (fs.existsSync(dest))
+            continue; // don't clobber user files
+        fs.copyFileSync(src, dest);
+        copied.push(`${libDirRelative}/${file}`);
     }
     return copied;
 }
@@ -382,15 +393,20 @@ export async function runInit(config, targetDir, repoUrl) {
     fs.mkdirSync(componentDir, { recursive: true });
     const blockDir = path.join(targetDir, config.blockPath);
     fs.mkdirSync(blockDir, { recursive: true });
-    // 3. Create cn.ts utility as a sibling of the components directory.
-    //    Components import via `./lib/cn.js`, so lib/ MUST live directly
-    //    next to the installed component files — `<componentPath>/lib/`,
-    //    not `<sourceRoot>/lib/`.
-    const libDir = path.join(targetDir, config.componentPath, "lib");
+    // 3. Create the unified lib directory under `<sourceRoot>/lib/` and
+    //    seed it with `cn.ts`. Every component/block lib file ships here;
+    //    the CLI rewrites all imports at install-time to point at the
+    //    `aliases.lib` alias so there's a single source of truth.
+    //
+    //    Never overwrite an existing `cn.ts` — the user may have their own.
+    const libDirRelative = `${sourceRoot}/lib`;
+    const libDir = path.join(targetDir, libDirRelative);
     fs.mkdirSync(libDir, { recursive: true });
     const cnPath = path.join(libDir, "cn.ts");
-    fs.writeFileSync(cnPath, getCnTemplate());
-    filesCreated.push(`${config.componentPath}/lib/cn.ts`);
+    if (!fs.existsSync(cnPath)) {
+        fs.writeFileSync(cnPath, getCnTemplate());
+        filesCreated.push(`${libDirRelative}/cn.ts`);
+    }
     // 4. Copy tokens and create CSS
     const cssRelPath = config.cssEntryPoint ?? `${sourceRoot}/index.css`;
     const cssPath = path.join(targetDir, cssRelPath);
@@ -400,9 +416,10 @@ export async function runInit(config, targetDir, repoUrl) {
         const registryDir = getCacheDir();
         const tokenFiles = copyTokensToProject(registryDir, targetDir, config.theme, sourceRoot);
         filesCreated.push(...tokenFiles);
-        // Copy i18n base files next to the components so their
-        // `./lib/i18n-context.js` imports resolve.
-        const i18nFiles = copyI18nFiles(registryDir, targetDir, config.componentPath);
+        // Copy i18n base files to the unified lib directory so that components'
+        // `./lib/i18n-context.js` imports (rewritten at install-time to the
+        // `aliases.lib` alias) resolve.
+        const i18nFiles = copyI18nFiles(registryDir, targetDir, libDirRelative);
         filesCreated.push(...i18nFiles);
         fs.writeFileSync(cssPath, getLocalTailwindCssTemplate(config.theme, config.fontBody, config.fontHeading, config.radius));
     }

package/dist/commands/status.d.ts

@@ -17,6 +17,17 @@ export interface ComponentsJsonFile {
         blocks: string;
         templates?: string;
         utils: string;
+        /**
+         * Destination directory for shared library utilities (`cn`, animation
+         * helpers, i18n context, API client stubs, …). When set, all lib files
+         * copied by `add` land here and imports inside components/blocks are
+         * rewritten to use this alias uniformly.
+         *
+         * Stored in alias form (e.g. `"@/lib"`) so it can be used directly as
+         * an import specifier. Falls back to `"${layout.aliasPrefix}lib"` when
+         * absent (legacy pre-1.6 configs).
+         */
+        lib?: string;
     };
     theme: string;
     font?: {

package/dist/commands/status.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../src/commands/status.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../src/commands/status.ts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -17,7 +17,7 @@ const program = new Command();
 program
     .name("inai-ui")
     .description("CLI for InAI UI component library")
-    .version("1.5.2");
+    .version("1.6.1");
 program
     .command("init [repo-url]")
     .description("Initialize InAI UI in your project. Optionally pass a Git repo URL to fetch components remotely.")

package/dist/utils/paths.d.ts

@@ -41,16 +41,65 @@ export declare function getSourceRoot(componentsJson: Pick<ComponentsJsonFile, "
  *    assume their tsconfig handles it).
  */
 export declare function getComponentsImportAlias(componentsJson: Pick<ComponentsJsonFile, "aliases" | "layout">): string;
+/**
+ * Compute the import-alias form of `aliases.lib`. Used when rewriting
+ * every lib import (relative `./lib/cn.js`, compound `../lib/cn.js`, and
+ * package `@company/ui/lib/cn`) to a single, consistent alias so the
+ * installed code never depends on a particular on-disk layout.
+ *
+ * Falls back to `${aliasPrefix}lib` when `aliases.lib` is missing — this
+ * keeps the CLI compatible with pre-1.6 `components.json` files that
+ * don't yet declare the field.
+ */
+export declare function getLibImportAlias(componentsJson: Pick<ComponentsJsonFile, "aliases" | "layout">): string;
+/**
+ * Rewrite every lib import in a copied source file to the unified
+ * `aliases.lib` alias. This handles:
+ *   - Component sibling imports: `./lib/cn.js`          → `@/lib/cn`
+ *   - Compound-component imports: `../lib/cn.js`        → `@/lib/cn`
+ *   - Package imports:            `@company/ui/lib/cn`  → `@/lib/cn`
+ *
+ * The `.js` suffix (required in the source for `moduleResolution: NodeNext`)
+ * is stripped in the process so the resulting code reads naturally in a
+ * consumer project using bundler-style resolution (Vite, Next, TanStack
+ * Start, Webpack).
+ *
+ * Side-effect imports (`import "@company/ui/lib/xxx"`) get the same
+ * treatment.
+ */
+export declare function rewriteLibImports(source: string, componentsJson: Pick<ComponentsJsonFile, "aliases" | "layout">): string;
+/**
+ * Strip `.js` extensions from relative and alias-prefixed imports in a
+ * copied source file. This is safe for consumer projects because they
+ * almost always use bundler-style module resolution (Vite, Next.js,
+ * TanStack Start, Webpack, esbuild), which resolves extensionless
+ * imports directly.
+ *
+ * Handles every common module reference form:
+ *   - Static: `from "./x.js"`, `import "./x.js"` (side-effect)
+ *   - Dynamic: `import("./x.js")` and `import(\`./x.js\`)`
+ *   - Type-only: `typeof import("./x.js")`, `import("./x.js").Foo` (TS
+ *     inline import types appearing mid-line, not at statement start)
+ *
+ * Only touches specifiers that start with `./`, `../`, `@/`, `~/`, or
+ * `$/` — package specifiers (`react`, `motion/react`, ...) and URLs are
+ * left untouched because they might legitimately end in `.js`.
+ */
+export declare function stripRelativeJsExtensions(source: string): string;
 /**
  * Rewrite `@company/ui/*` imports in a block or template file to point
  * at the user's locally-installed components. Without this, block files
  * that `import { Button } from "@company/ui/button"` would fail at
  * compile time because `@company/ui` doesn't exist in the consumer project.
  *
+ * Note: `@company/ui/lib/*` is handled separately by `rewriteLibImports`
+ * (which must run BEFORE this function) so lib files route to
+ * `aliases.lib` instead of `aliases.components/lib`. This function only
+ * rewrites the non-lib specifiers that remain.
+ *
  * Transformations:
  * - `from "@company/ui/data-table"`       → `from "~/components/ui/data-table"`
  * - `from "@company/ui/data-table/sub"`   → `from "~/components/ui/data-table/sub"`
- * - `from "@company/ui/lib/animations"`   → `from "~/components/ui/lib/animations"`
  * - `from "@company/ui"` (bare barrel)    → no rewrite (logged as unsupported)
  *
  * The alias prefix (`~/`, `@/`, etc.) is derived from the project layout

package/dist/utils/paths.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../../src/utils/paths.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAIhE;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,eAAe,CAC7B,KAAK,EAAE,MAAM,EACb,cAAc,EAAE,IAAI,CAAC,kBAAkB,EAAE,QAAQ,CAAC,GACjD,MAAM,CAQR;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAC3B,cAAc,EAAE,IAAI,CAAC,kBAAkB,EAAE,QAAQ,CAAC,GACjD,MAAM,CAER;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,wBAAwB,CACtC,cAAc,EAAE,IAAI,CAAC,kBAAkB,EAAE,SAAS,GAAG,QAAQ,CAAC,GAC7D,MAAM,CAYR;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,IAAI,CAAC,kBAAkB,EAAE,SAAS,GAAG,QAAQ,CAAC,GAC7D,MAAM,CAaR"}
+{"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../../src/utils/paths.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAIhE;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,eAAe,CAC7B,KAAK,EAAE,MAAM,EACb,cAAc,EAAE,IAAI,CAAC,kBAAkB,EAAE,QAAQ,CAAC,GACjD,MAAM,CAQR;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAC3B,cAAc,EAAE,IAAI,CAAC,kBAAkB,EAAE,QAAQ,CAAC,GACjD,MAAM,CAER;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,wBAAwB,CACtC,cAAc,EAAE,IAAI,CAAC,kBAAkB,EAAE,SAAS,GAAG,QAAQ,CAAC,GAC7D,MAAM,CAYR;AAED;;;;;;;;;GASG;AACH,wBAAgB,iBAAiB,CAC/B,cAAc,EAAE,IAAI,CAAC,kBAAkB,EAAE,SAAS,GAAG,QAAQ,CAAC,GAC7D,MAAM,CAiBR;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,IAAI,CAAC,kBAAkB,EAAE,SAAS,GAAG,QAAQ,CAAC,GAC7D,MAAM,CAqBR;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAYhE;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,IAAI,CAAC,kBAAkB,EAAE,SAAS,GAAG,QAAQ,CAAC,GAC7D,MAAM,CAaR"}

package/dist/utils/paths.js

@@ -64,16 +64,102 @@ export function getComponentsImportAlias(componentsJson) {
     }
     return raw;
 }
+/**
+ * Compute the import-alias form of `aliases.lib`. Used when rewriting
+ * every lib import (relative `./lib/cn.js`, compound `../lib/cn.js`, and
+ * package `@company/ui/lib/cn`) to a single, consistent alias so the
+ * installed code never depends on a particular on-disk layout.
+ *
+ * Falls back to `${aliasPrefix}lib` when `aliases.lib` is missing — this
+ * keeps the CLI compatible with pre-1.6 `components.json` files that
+ * don't yet declare the field.
+ */
+export function getLibImportAlias(componentsJson) {
+    const raw = componentsJson.aliases.lib;
+    if (raw) {
+        // Already in alias form — return verbatim.
+        for (const prefix of KNOWN_PREFIXES) {
+            if (raw.startsWith(prefix))
+                return raw;
+        }
+        // Raw path — try to convert via layout.
+        const layout = componentsJson.layout;
+        if (layout && raw.startsWith(`${layout.sourceRoot}/`)) {
+            return `${layout.aliasPrefix}${raw.slice(layout.sourceRoot.length + 1)}`;
+        }
+        return raw;
+    }
+    // Fallback for legacy configs: derive from layout.
+    const prefix = componentsJson.layout?.aliasPrefix ?? "@/";
+    return `${prefix}lib`;
+}
+/**
+ * Rewrite every lib import in a copied source file to the unified
+ * `aliases.lib` alias. This handles:
+ *   - Component sibling imports: `./lib/cn.js`          → `@/lib/cn`
+ *   - Compound-component imports: `../lib/cn.js`        → `@/lib/cn`
+ *   - Package imports:            `@company/ui/lib/cn`  → `@/lib/cn`
+ *
+ * The `.js` suffix (required in the source for `moduleResolution: NodeNext`)
+ * is stripped in the process so the resulting code reads naturally in a
+ * consumer project using bundler-style resolution (Vite, Next, TanStack
+ * Start, Webpack).
+ *
+ * Side-effect imports (`import "@company/ui/lib/xxx"`) get the same
+ * treatment.
+ */
+export function rewriteLibImports(source, componentsJson) {
+    const libAlias = getLibImportAlias(componentsJson);
+    // 1) Relative imports: `./lib/foo.js`, `../lib/foo.js`, `../../lib/foo.js`
+    let result = source.replace(/(from\s+["'])(?:\.\.?\/)+lib\/([a-zA-Z0-9_-]+)(?:\.js)?(["'])/g, (_, pre, name, post) => `${pre}${libAlias}/${name}${post}`);
+    result = result.replace(/(import\s+["'])(?:\.\.?\/)+lib\/([a-zA-Z0-9_-]+)(?:\.js)?(["'])/g, (_, pre, name, post) => `${pre}${libAlias}/${name}${post}`);
+    // 2) Package imports: `@company/ui/lib/foo`
+    result = result.replace(/(from\s+["'])@company\/ui\/lib\/([a-zA-Z0-9_-]+)(?:\.js)?(["'])/g, (_, pre, name, post) => `${pre}${libAlias}/${name}${post}`);
+    result = result.replace(/(import\s+["'])@company\/ui\/lib\/([a-zA-Z0-9_-]+)(?:\.js)?(["'])/g, (_, pre, name, post) => `${pre}${libAlias}/${name}${post}`);
+    return result;
+}
+/**
+ * Strip `.js` extensions from relative and alias-prefixed imports in a
+ * copied source file. This is safe for consumer projects because they
+ * almost always use bundler-style module resolution (Vite, Next.js,
+ * TanStack Start, Webpack, esbuild), which resolves extensionless
+ * imports directly.
+ *
+ * Handles every common module reference form:
+ *   - Static: `from "./x.js"`, `import "./x.js"` (side-effect)
+ *   - Dynamic: `import("./x.js")` and `import(\`./x.js\`)`
+ *   - Type-only: `typeof import("./x.js")`, `import("./x.js").Foo` (TS
+ *     inline import types appearing mid-line, not at statement start)
+ *
+ * Only touches specifiers that start with `./`, `../`, `@/`, `~/`, or
+ * `$/` — package specifiers (`react`, `motion/react`, ...) and URLs are
+ * left untouched because they might legitimately end in `.js`.
+ */
+export function stripRelativeJsExtensions(source) {
+    // 1) Static `from "..."` and `import "..."` statements.
+    const statement = /((?:from|import)\s+[^"'`]*["'`])((?:\.{1,2}\/|[@~$]\/)[^"'`]*)\.js(["'`])/g;
+    // 2) Dynamic / inline type `import("...")` calls. These can appear
+    //    anywhere in a type position, so the preceding keyword isn't
+    //    constrained to start of a statement.
+    const dynamic = /(import\s*\(\s*["'`])((?:\.{1,2}\/|[@~$]\/)[^"'`]*)\.js(["'`])/g;
+    return source
+        .replace(statement, (_, pre, spec, post) => `${pre}${spec}${post}`)
+        .replace(dynamic, (_, pre, spec, post) => `${pre}${spec}${post}`);
+}
 /**
  * Rewrite `@company/ui/*` imports in a block or template file to point
  * at the user's locally-installed components. Without this, block files
  * that `import { Button } from "@company/ui/button"` would fail at
  * compile time because `@company/ui` doesn't exist in the consumer project.
  *
+ * Note: `@company/ui/lib/*` is handled separately by `rewriteLibImports`
+ * (which must run BEFORE this function) so lib files route to
+ * `aliases.lib` instead of `aliases.components/lib`. This function only
+ * rewrites the non-lib specifiers that remain.
+ *
  * Transformations:
  * - `from "@company/ui/data-table"`       → `from "~/components/ui/data-table"`
  * - `from "@company/ui/data-table/sub"`   → `from "~/components/ui/data-table/sub"`
- * - `from "@company/ui/lib/animations"`   → `from "~/components/ui/lib/animations"`
  * - `from "@company/ui"` (bare barrel)    → no rewrite (logged as unsupported)
  *
  * The alias prefix (`~/`, `@/`, etc.) is derived from the project layout

package/dist/utils/registry-resolver.d.ts

@@ -5,6 +5,11 @@ export declare function getRegistryCacheDir(name: string): string;
  * Clone (or fast-forward) a git registry into the legacy single-cache
  * directory. Preserved for backward compatibility with the v0.5.0
  * code path that called this directly.
+ *
+ * If a prior cache is present but refuses to fast-forward (dirty tree,
+ * diverged history, interrupted previous run), the cache is reset to
+ * match origin; if that also fails, the directory is nuked and a fresh
+ * clone is done. Users should never have to touch `~/.inai-ui/registry`.
  */
 export declare function cloneRegistry(repoUrl: string): string;
 /**

package/dist/utils/registry-resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"registry-resolver.d.ts","sourceRoot":"","sources":["../../src/utils/registry-resolver.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,QAAQ,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAS7E,wBAAgB,WAAW,IAAI,MAAM,CAEpC;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAExD;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAWrD;AAmBD;;;;;;;;;;;;GAYG;AACH,wBAAsB,eAAe,CACnC,QAAQ,EAAE,QAAQ,EAClB,UAAU,EAAE,MAAM,EAClB,OAAO,GAAE,sBAA2B,GACnC,OAAO,CAAC,MAAM,CAAC,CAkGjB;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAS7D"}
+{"version":3,"file":"registry-resolver.d.ts","sourceRoot":"","sources":["../../src/utils/registry-resolver.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,QAAQ,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAS7E,wBAAgB,WAAW,IAAI,MAAM,CAEpC;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAExD;AA8CD;;;;;;;;;GASG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAcrD;AAmBD;;;;;;;;;;;;GAYG;AACH,wBAAsB,eAAe,CACnC,QAAQ,EAAE,QAAQ,EAClB,UAAU,EAAE,MAAM,EAClB,OAAO,GAAE,sBAA2B,GACnC,OAAO,CAAC,MAAM,CAAC,CA+FjB;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAS7D"}

package/dist/utils/registry-resolver.js

@@ -15,22 +15,71 @@ export function getCacheDir() {
 export function getRegistryCacheDir(name) {
     return path.join(REGISTRIES_CACHE_DIR, name);
 }
+/**
+ * Attempt to refresh an existing git cache to the latest upstream state.
+ * Tries `git pull --ff-only` first, and if the working tree is dirty or
+ * has diverged from upstream (either of which aborts the fast-forward),
+ * falls back to a hard reset + clean so the cache matches origin exactly.
+ *
+ * The cache is an implementation detail of the CLI — users should never
+ * have to edit files inside it, so any local changes are unconditionally
+ * discarded in favor of whatever origin currently ships.
+ *
+ * Returns `true` on success, `false` if both pull and reset failed (in
+ * which case the caller should nuke the directory and re-clone).
+ */
+function refreshGitCache(cacheDir) {
+    try {
+        execSync("git pull --ff-only", { cwd: cacheDir, stdio: "pipe" });
+        return true;
+    }
+    catch {
+        // Dirty tree, diverged history, or both. Salvage the clone by
+        // fetching fresh refs and resetting hard onto origin's default
+        // branch. `git clean -fd` drops any untracked files the user (or a
+        // previous botched run) left behind.
+        try {
+            execSync("git fetch --all --prune", { cwd: cacheDir, stdio: "pipe" });
+            // Derive the remote HEAD dynamically so we respect whatever branch
+            // origin tracks (main, master, develop, ...).
+            const remoteHead = execSync("git symbolic-ref refs/remotes/origin/HEAD", { cwd: cacheDir, stdio: ["pipe", "pipe", "pipe"] })
+                .toString()
+                .trim();
+            execSync(`git reset --hard ${remoteHead}`, {
+                cwd: cacheDir,
+                stdio: "pipe",
+            });
+            execSync("git clean -fd", { cwd: cacheDir, stdio: "pipe" });
+            return true;
+        }
+        catch {
+            return false;
+        }
+    }
+}
 /**
  * Clone (or fast-forward) a git registry into the legacy single-cache
  * directory. Preserved for backward compatibility with the v0.5.0
  * code path that called this directly.
+ *
+ * If a prior cache is present but refuses to fast-forward (dirty tree,
+ * diverged history, interrupted previous run), the cache is reset to
+ * match origin; if that also fails, the directory is nuked and a fresh
+ * clone is done. Users should never have to touch `~/.inai-ui/registry`.
  */
 export function cloneRegistry(repoUrl) {
     if (fs.existsSync(path.join(LEGACY_CACHE_DIR, ".git"))) {
-        execSync("git pull --ff-only", { cwd: LEGACY_CACHE_DIR, stdio: "pipe" });
-    }
-    else {
-        fs.mkdirSync(CACHE_BASE, { recursive: true });
-        if (fs.existsSync(LEGACY_CACHE_DIR)) {
-            fs.rmSync(LEGACY_CACHE_DIR, { recursive: true });
+        if (refreshGitCache(LEGACY_CACHE_DIR)) {
+            return LEGACY_CACHE_DIR;
         }
-        execSync(`git clone "${repoUrl}" "${LEGACY_CACHE_DIR}"`, { stdio: "pipe" });
+        // Salvage failed — nuke and re-clone below.
+        fs.rmSync(LEGACY_CACHE_DIR, { recursive: true, force: true });
+    }
+    fs.mkdirSync(CACHE_BASE, { recursive: true });
+    if (fs.existsSync(LEGACY_CACHE_DIR)) {
+        fs.rmSync(LEGACY_CACHE_DIR, { recursive: true });
     }
+    execSync(`git clone "${repoUrl}" "${LEGACY_CACHE_DIR}"`, { stdio: "pipe" });
     return LEGACY_CACHE_DIR;
 }
 /**
@@ -89,18 +138,13 @@ export async function resolveRegistry(registry, projectDir, options = {}) {
         const cloneUrl = token ? embedTokenInGitUrl(registry.url, token) : registry.url;
         const branch = registry.branch ?? "main";
         if (fs.existsSync(path.join(cacheDir, ".git"))) {
-            try {
-                execSync("git pull --ff-only", { cwd: cacheDir, stdio: "pipe" });
-            }
-            catch {
-                // If pull fails (network hiccup, diverged), fall back to cached copy.
+            if (!refreshGitCache(cacheDir)) {
+                // Salvage failed — nuke and re-clone below.
+                fs.rmSync(cacheDir, { recursive: true, force: true });
             }
         }
-        else {
+        if (!fs.existsSync(path.join(cacheDir, ".git"))) {
             fs.mkdirSync(REGISTRIES_CACHE_DIR, { recursive: true });
-            if (fs.existsSync(cacheDir)) {
-                fs.rmSync(cacheDir, { recursive: true });
-            }
             execSync(`git clone --branch "${branch}" "${cloneUrl}" "${cacheDir}"`, { stdio: "pipe" });
         }
         return cacheDir;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "inai-react-components",
-  "version": "1.5.2",
+  "version": "1.6.1",
   "description": "CLI for InAI UI component library — install components from a private registry into your React project",
   "private": false,
   "type": "module",