inai-react-components 1.6.0 → 1.6.2

package/dist/commands/init.d.ts

@@ -274,14 +274,24 @@ 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 `<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.
+ * to the unified lib directory. ~75 components import `useUIMessages`
+ * from the i18n context; the CLI rewrites those imports at install-time
+ * to the `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.
+ * Normalizes `.js` import suffixes in the process (so the copied
+ * `i18n-context.tsx` reads without bundler-incompatible extensions) and
+ * never overwrites pre-existing files.
  */
 export declare function copyI18nFiles(registryDir: string | undefined, targetDir: string, libDirRelative: string): string[];
+/**
+ * Copies the canonical `cn.ts` from the cached registry to the user's
+ * lib directory. We copy the REAL source file (not a hardcoded template)
+ * because components import extra type exports like `ClassNames` that
+ * any minimal template would miss. Returns `true` if the file was
+ * written, `false` if the registry copy was missing or a user file was
+ * already present.
+ */
+export declare function copyCnFile(registryDir: string | undefined, targetDir: string, libDirRelative: string): boolean;
 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

@@ -7,6 +7,7 @@ import { cloneRegistry, getCacheDir } from "../utils/registry-resolver.js";
 import { THEME_NAMES } from "../utils/themes.js";
 import { detectFramework, frameworkLabel, getCssEntryPoint, } from "../utils/framework-detect.js";
 import { detectProjectLayout, } from "../utils/tsconfig-detect.js";
+import { stripRelativeJsExtensions } from "../utils/paths.js";
 const AVAILABLE_THEMES = THEME_NAMES;
 const FONT_PRESETS = [
     // Sans-serif — geometric & modern
@@ -351,14 +352,41 @@ function copyTokensToProject(registryDir, targetDir, theme, sourceRoot) {
     }
     return copied;
 }
+/**
+ * Read a source file from the registry and write it to the user's lib
+ * directory with imports normalized — `.js` suffixes stripped so the
+ * installed code reads naturally under bundler-style resolution (Vite,
+ * Next.js, TanStack Start, …). Never overwrites a pre-existing file so
+ * user customizations stay intact across re-runs.
+ *
+ * Returns the relative destination path if written, or `null` if skipped
+ * (file missing in registry, or already present in the user project).
+ */
+function copyLibFileNormalized(srcPath, destPath) {
+    if (!fs.existsSync(srcPath))
+        return false;
+    if (fs.existsSync(destPath))
+        return false; // don't clobber user files
+    const raw = fs.readFileSync(srcPath, "utf-8");
+    // Strip `.js` from relative sibling imports so `i18n-context.tsx`'s
+    // `./i18n-types.js` becomes `./i18n-types`. We intentionally DON'T
+    // apply `rewriteLibImports` here — these files live inside the lib
+    // directory already, so their sibling imports are correctly relative
+    // and shouldn't be rerouted through the `@/lib/*` alias.
+    const normalized = stripRelativeJsExtensions(raw);
+    fs.mkdirSync(path.dirname(destPath), { recursive: true });
+    fs.writeFileSync(destPath, normalized);
+    return true;
+}
 /**
  * Copies the i18n base files (context, types, defaults) from the registry
- * 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.
+ * to the unified lib directory. ~75 components import `useUIMessages`
+ * from the i18n context; the CLI rewrites those imports at install-time
+ * to the `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.
+ * Normalizes `.js` import suffixes in the process (so the copied
+ * `i18n-context.tsx` reads without bundler-incompatible extensions) and
+ * never overwrites pre-existing files.
  */
 export function copyI18nFiles(registryDir, targetDir, libDirRelative) {
     if (!registryDir)
@@ -366,20 +394,31 @@ export function copyI18nFiles(registryDir, targetDir, libDirRelative) {
     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, libDirRelative);
-    fs.mkdirSync(destBase, { recursive: true });
     const copied = [];
     for (const file of files) {
         const src = path.join(srcBase, file);
-        if (!fs.existsSync(src))
-            continue;
         const dest = path.join(destBase, file);
-        if (fs.existsSync(dest))
-            continue; // don't clobber user files
-        fs.copyFileSync(src, dest);
-        copied.push(`${libDirRelative}/${file}`);
+        if (copyLibFileNormalized(src, dest)) {
+            copied.push(`${libDirRelative}/${file}`);
+        }
     }
     return copied;
 }
+/**
+ * Copies the canonical `cn.ts` from the cached registry to the user's
+ * lib directory. We copy the REAL source file (not a hardcoded template)
+ * because components import extra type exports like `ClassNames` that
+ * any minimal template would miss. Returns `true` if the file was
+ * written, `false` if the registry copy was missing or a user file was
+ * already present.
+ */
+export function copyCnFile(registryDir, targetDir, libDirRelative) {
+    if (!registryDir)
+        return false;
+    const src = path.join(registryDir, "packages", "ui", "src", "lib", "cn.ts");
+    const dest = path.join(targetDir, libDirRelative, "cn.ts");
+    return copyLibFileNormalized(src, dest);
+}
 export async function runInit(config, targetDir, repoUrl) {
     const filesCreated = [];
     const sourceRoot = config.layout?.sourceRoot ?? "src";
@@ -393,27 +432,30 @@ 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 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.
+    // 3. Create the unified lib directory under `<sourceRoot>/lib/`. 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. `cn.ts` is seeded here so `init` users
+    //    can start writing app code immediately — the real file (not a
+    //    hardcoded template) is copied from the registry so secondary
+    //    exports like `ClassNames` stay available to components. Never
+    //    overwrite existing user files.
     const libDirRelative = `${sourceRoot}/lib`;
     const libDir = path.join(targetDir, libDirRelative);
     fs.mkdirSync(libDir, { recursive: true });
-    const cnPath = path.join(libDir, "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);
     fs.mkdirSync(path.dirname(cssPath), { recursive: true });
     if (repoUrl) {
-        // Remote mode: copy tokens from cached registry
+        // Remote mode: copy tokens and canonical lib files from the cached
+        // registry so users get the real `cn.ts` (including type exports
+        // like `ClassNames` that downstream components import) rather than
+        // a minimal hardcoded template.
         const registryDir = getCacheDir();
+        if (copyCnFile(registryDir, targetDir, libDirRelative)) {
+            filesCreated.push(`${libDirRelative}/cn.ts`);
+        }
         const tokenFiles = copyTokensToProject(registryDir, targetDir, config.theme, sourceRoot);
         filesCreated.push(...tokenFiles);
         // Copy i18n base files to the unified lib directory so that components'
@@ -424,7 +466,15 @@ export async function runInit(config, targetDir, repoUrl) {
         fs.writeFileSync(cssPath, getLocalTailwindCssTemplate(config.theme, config.fontBody, config.fontHeading, config.radius));
     }
     else {
-        // Local mode: reference @company/tokens package
+        // Local mode: reference @company/tokens package. Without a registry
+        // to read from, we seed `cn.ts` with a minimal template — users in
+        // this mode are almost always developing the monorepo itself, where
+        // the real `@company/ui` package is resolvable via workspace links.
+        const cnPath = path.join(libDir, "cn.ts");
+        if (!fs.existsSync(cnPath)) {
+            fs.writeFileSync(cnPath, getCnTemplate());
+            filesCreated.push(`${libDirRelative}/cn.ts`);
+        }
         fs.writeFileSync(cssPath, getLegacyTailwindCssTemplate(config.theme, config.fontBody, config.fontHeading, config.radius));
     }
     filesCreated.push(cssRelPath);

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.6.0");
+    .version("1.6.2");
 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/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.6.0",
+  "version": "1.6.2",
   "description": "CLI for InAI UI component library — install components from a private registry into your React project",
   "private": false,
   "type": "module",