inai-react-components 1.6.0 → 1.6.1

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