@rootnative/cli 0.0.0-alpha.5 → 0.0.0-alpha.7

package/dist/index.mjs

@@ -224,7 +224,7 @@ function getInstallCommand(pm, packages) {
 }
 
 // src/lib/installer.ts
-import path4 from "path";
+import path6 from "path";
 import { execa } from "execa";
 import fs4 from "fs-extra";
 
@@ -289,6 +289,7 @@ async function fetchFileContent(config, filePath) {
 }
 
 // src/lib/resolver.ts
+import path4 from "path";
 async function resolveComponents(config, requestedNames) {
   const resolved = /* @__PURE__ */ new Map();
   const utilsRegistry = await fetchUtilsRegistry(config);
@@ -321,9 +322,11 @@ function buildResult(resolved, utilsRegistry) {
       optionalDeps[pkg] = version;
     }
   }
+  const utilFileNames = {};
   for (const utilName of utilSet) {
     const utilEntry = utilsRegistry[utilName];
     if (utilEntry) {
+      utilFileNames[utilName] = path4.basename(utilEntry.file);
       for (const [pkg, version] of Object.entries(utilEntry.dependencies)) {
         optionalDeps[pkg] = version;
       }
@@ -332,6 +335,7 @@ function buildResult(resolved, utilsRegistry) {
   return {
     components,
     utils: Array.from(utilSet).sort(),
+    utilFileNames,
     npmDependencies: npmDeps,
     optionalNpmDependencies: optionalDeps
   };
@@ -341,16 +345,44 @@ function getComponentNames(result) {
 }
 
 // src/lib/transform.ts
+import path5 from "path";
 var SINGLE_LINE_IMPORT_REGEX = /((?:import|export)\s+(?:type\s+)?(?:\{[^}]*\}|\*\s+as\s+\w+|[\w,\s]+)\s+from\s+)(['"])([^'"]+)\2/g;
 var MULTI_LINE_IMPORT_REGEX = /((?:import|export)\s+(?:type\s+)?\{[\s\S]*?\}\s+from\s+)(['"])([^'"]+)\2/g;
 var SHARED_ROOT_MODULES = /* @__PURE__ */ new Set(["safe-area"]);
+function isPrefixAlias(alias) {
+  return !alias.startsWith(".");
+}
+function buildSpecifier(alias, rest, componentsAlias, componentName) {
+  if (isPrefixAlias(alias)) {
+    return `${alias}/${rest}`;
+  }
+  const fromDir = path5.posix.join(
+    toPosix(stripRelativePrefix(componentsAlias)),
+    componentName
+  );
+  const target = path5.posix.join(toPosix(stripRelativePrefix(alias)), rest);
+  const relative = path5.posix.relative(fromDir, target);
+  return relative.startsWith(".") ? relative : `./${relative}`;
+}
+function stripRelativePrefix(alias) {
+  return alias.replace(/^\.\//, "");
+}
+function toPosix(value) {
+  return value.replace(/\\/g, "/");
+}
 function transformImports(source, options) {
-  const { config, installedComponents } = options;
+  const { config, componentName, installedComponents } = options;
   const componentsAlias = config.aliases.components;
   const libAlias = config.aliases.lib;
   function rewriteImport(match, prefix, quote, importPath) {
     if (importPath === "@rootnative/utils") {
-      return `${prefix}${quote}${libAlias}/rootnative-utils${quote}`;
+      const specifier = buildSpecifier(
+        libAlias,
+        "rootnative-utils",
+        componentsAlias,
+        componentName
+      );
+      return `${prefix}${quote}${specifier}${quote}`;
     }
     if (importPath.startsWith("@rootnative/core")) {
       return match;
@@ -367,7 +399,13 @@ function transformImports(source, options) {
       const targetComponent = extractComponentName(importPath);
       if (targetComponent && installedComponents.includes(targetComponent)) {
         const restOfPath = importPath.replace(/^\.\.\//, "");
-        return `${prefix}${quote}${componentsAlias}/${restOfPath}${quote}`;
+        const specifier = buildSpecifier(
+          componentsAlias,
+          restOfPath,
+          componentsAlias,
+          componentName
+        );
+        return `${prefix}${quote}${specifier}${quote}`;
       }
     }
     return match;
@@ -410,7 +448,7 @@ async function installComponents(options) {
   await generateBarrel(resolution, utilsRegistry, libDir);
   spinner.succeed("Utility files copied");
   for (const { entry } of resolution.components) {
-    const componentDir = path4.join(componentsDir, entry.name);
+    const componentDir = path6.join(componentsDir, entry.name);
     const exists = await fs4.pathExists(componentDir);
     if (exists && !force) {
       logger.warn(
@@ -423,14 +461,14 @@ async function installComponents(options) {
     await fs4.ensureDir(componentDir);
     for (const filePath of entry.files) {
       const content = await fetchFileContent(config, filePath);
-      const fileName = path4.basename(filePath);
+      const fileName = path6.basename(filePath);
       const transformed = transformImports(content, {
         config,
         componentName: entry.name,
         installedComponents: allComponentNames
       });
       await fs4.writeFile(
-        path4.join(componentDir, fileName),
+        path6.join(componentDir, fileName),
         transformed,
         "utf-8"
       );
@@ -461,8 +499,8 @@ async function copyUtilFiles(config, resolution, utilsRegistry, libDir) {
     const utilEntry = utilsRegistry[utilName];
     if (!utilEntry) continue;
     const content = await fetchFileContent(config, utilEntry.file);
-    const fileName = path4.basename(utilEntry.file);
-    await fs4.writeFile(path4.join(libDir, fileName), content, "utf-8");
+    const fileName = path6.basename(utilEntry.file);
+    await fs4.writeFile(path6.join(libDir, fileName), content, "utf-8");
   }
 }
 async function generateBarrel(resolution, utilsRegistry, libDir) {
@@ -483,14 +521,14 @@ async function generateBarrel(resolution, utilsRegistry, libDir) {
     utilTypeExports
   );
   await fs4.writeFile(
-    path4.join(libDir, "rootnative-utils.ts"),
+    path6.join(libDir, "rootnative-utils.ts"),
     barrelContent,
     "utf-8"
   );
 }
 function collectDepsToInstall(resolution, cwd) {
   const deps = [];
-  const pkgPath = path4.resolve(cwd, "package.json");
+  const pkgPath = path6.resolve(cwd, "package.json");
   let existingDeps = {};
   try {
     const pkg = fs4.readJSONSync(pkgPath);
@@ -541,7 +579,10 @@ async function addCommand(componentNames, cwd, options) {
   if (resolution.utils.length > 0) {
     logger.break();
     console.log(chalk2.bold("Utilities to copy:"));
-    console.log(`  ${resolution.utils.map((u) => `${u}.ts`).join(", ")}`);
+    const fileNames = resolution.utils.map(
+      (u) => resolution.utilFileNames[u] ?? u
+    );
+    console.log(`  ${fileNames.join(", ")}`);
   }
   const npmDeps = Object.keys(resolution.npmDependencies);
   const optionalDeps = Object.keys(resolution.optionalNpmDependencies);
@@ -589,7 +630,7 @@ async function addCommand(componentNames, cwd, options) {
 }
 
 // src/commands/create.ts
-import path5 from "path";
+import path7 from "path";
 import chalk3 from "chalk";
 import { execa as execa2 } from "execa";
 import fs5 from "fs-extra";
@@ -779,7 +820,7 @@ async function createCommand(name, options = {}) {
     }
     packageManager = value;
   }
-  const targetDir = path5.resolve(process.cwd(), projectName);
+  const targetDir = path7.resolve(process.cwd(), projectName);
   if (await fs5.pathExists(targetDir)) {
     if (options.yes) {
       logger.warn(`Directory ${chalk3.bold(projectName)} already exists.`);
@@ -804,7 +845,7 @@ async function createCommand(name, options = {}) {
   spinner.start();
   try {
     for (const dir of templateConfig.dirs) {
-      await fs5.ensureDir(path5.join(targetDir, dir));
+      await fs5.ensureDir(path7.join(targetDir, dir));
     }
     for (const file of templateConfig.textFiles) {
       let content = await fetchText(`${templateBaseUrl}/${file}`);
@@ -829,18 +870,18 @@ async function createCommand(name, options = {}) {
         }
         content = JSON.stringify(appJson, null, 2) + "\n";
       }
-      await fs5.outputFile(path5.join(targetDir, file), content);
+      await fs5.outputFile(path7.join(targetDir, file), content);
     }
     for (const file of TEMPLATE_OPTIONAL_TEXT_FILES) {
       const content = await fetchTextOptional(`${templateBaseUrl}/${file}`);
       if (content !== null) {
-        await fs5.outputFile(path5.join(targetDir, file), content);
+        await fs5.outputFile(path7.join(targetDir, file), content);
       }
     }
     for (const file of TEMPLATE_BINARY_FILES) {
       const buffer = await fetchBinary(`${templateBaseUrl}/${file}`);
       if (buffer) {
-        await fs5.outputFile(path5.join(targetDir, file), buffer);
+        await fs5.outputFile(path7.join(targetDir, file), buffer);
       }
     }
     spinner.succeed("Project created");
@@ -889,7 +930,7 @@ async function createCommand(name, options = {}) {
 }
 
 // src/commands/doctor.ts
-import path6 from "path";
+import path8 from "path";
 import chalk4 from "chalk";
 import fs6 from "fs-extra";
 function logCheck(status, message) {
@@ -927,7 +968,7 @@ async function doctorCommand(cwd) {
     logCheck("fail", "Not a React Native or Expo project");
     issues++;
   }
-  const pkgPath = path6.resolve(cwd, "package.json");
+  const pkgPath = path8.resolve(cwd, "package.json");
   if (await fs6.pathExists(pkgPath)) {
     const pkg = await fs6.readJSON(pkgPath);
     const allDeps = {
@@ -942,7 +983,7 @@ async function doctorCommand(cwd) {
       issues++;
     }
   }
-  const corePkgPath = path6.resolve(
+  const corePkgPath = path8.resolve(
     cwd,
     "node_modules",
     "@rootnative",
@@ -973,7 +1014,7 @@ async function doctorCommand(cwd) {
       const dirs = await fs6.readdir(componentsDir);
       const componentDirs = [];
       for (const dir of dirs) {
-        const fullPath = path6.join(componentsDir, dir);
+        const fullPath = path8.join(componentsDir, dir);
         const stat = await fs6.stat(fullPath);
         if (stat.isDirectory()) {
           componentDirs.push(dir);
@@ -982,7 +1023,7 @@ async function doctorCommand(cwd) {
       if (componentDirs.length > 0) {
         let integrityOk = true;
         for (const dir of componentDirs) {
-          const indexPath = path6.join(componentsDir, dir, "index.ts");
+          const indexPath = path8.join(componentsDir, dir, "index.ts");
           if (!await fs6.pathExists(indexPath)) {
             logCheck("warn", `Component ${dir} is missing index.ts`);
             integrityOk = false;
@@ -1007,7 +1048,7 @@ async function doctorCommand(cwd) {
       );
     }
     const libDir = resolveAliasPath(config.aliases.lib, cwd);
-    const barrelPath = path6.join(libDir, "rootnative-utils.ts");
+    const barrelPath = path8.join(libDir, "rootnative-utils.ts");
     if (await fs6.pathExists(barrelPath)) {
       logCheck("pass", "Utility barrel file present");
     } else {
@@ -1019,8 +1060,8 @@ async function doctorCommand(cwd) {
       }
     }
   }
-  const nodeModules = path6.resolve(cwd, "node_modules");
-  const inertiaPkgPath = path6.join(
+  const nodeModules = path8.resolve(cwd, "node_modules");
+  const inertiaPkgPath = path8.join(
     nodeModules,
     "@rootnative",
     "inertia",
@@ -1037,7 +1078,7 @@ async function doctorCommand(cwd) {
     issues++;
   }
   for (const peer of REQUIRED_BARREL_PEERS) {
-    if (await fs6.pathExists(path6.join(nodeModules, peer.name))) {
+    if (await fs6.pathExists(path8.join(nodeModules, peer.name))) {
       logCheck("pass", `${peer.name} installed`);
       continue;
     }
@@ -1046,7 +1087,7 @@ async function doctorCommand(cwd) {
     issues++;
   }
   const safeAreaInstalled = await fs6.pathExists(
-    path6.join(nodeModules, "react-native-safe-area-context")
+    path8.join(nodeModules, "react-native-safe-area-context")
   );
   if (safeAreaInstalled) {
     logCheck("pass", "react-native-safe-area-context installed");
@@ -1057,7 +1098,7 @@ async function doctorCommand(cwd) {
     );
   }
   const vectorIconsInstalled = await fs6.pathExists(
-    path6.join(nodeModules, "@expo", "vector-icons")
+    path8.join(nodeModules, "@expo", "vector-icons")
   );
   if (vectorIconsInstalled) {
     logCheck("pass", "@expo/vector-icons installed");
@@ -1083,7 +1124,7 @@ import { execa as execa3 } from "execa";
 import prompts3 from "prompts";
 
 // src/lib/llm-docs.ts
-import path7 from "path";
+import path9 from "path";
 import fs7 from "fs-extra";
 var CLAUDE_MD = "CLAUDE.md";
 var POINTER_MARKER = "@rootnative/components/llms.txt";
@@ -1099,7 +1140,7 @@ This project uses RootNative UI (\`@rootnative/*\`). LLM-optimized docs:
 Prefer the \`node_modules\` copies \u2014 they match the installed version exactly.
 `;
 async function ensureLlmDocsPointer(cwd) {
-  const filePath = path7.join(cwd, CLAUDE_MD);
+  const filePath = path9.join(cwd, CLAUDE_MD);
   if (!await fs7.pathExists(filePath)) {
     await fs7.outputFile(filePath, `# CLAUDE.md
 
@@ -1311,7 +1352,7 @@ async function initCommand(cwd, options = {}) {
 }
 
 // src/commands/list.ts
-import path8 from "path";
+import path10 from "path";
 import chalk6 from "chalk";
 import fs8 from "fs-extra";
 async function listCommand(cwd) {
@@ -1339,7 +1380,7 @@ async function listCommand(cwd) {
     `  ${chalk6.dim("-".repeat(70))}`
   );
   for (const component of registryIndex.components) {
-    const componentDir = path8.join(componentsDir, component.name);
+    const componentDir = path10.join(componentsDir, component.name);
     const installed = await fs8.pathExists(componentDir);
     const status = installed ? chalk6.green("installed") : chalk6.dim("-");
     const nameDisplay = installed ? chalk6.green(component.name) : component.name;
@@ -1360,7 +1401,7 @@ function padEnd(str, length) {
 }
 
 // src/commands/update.ts
-import path9 from "path";
+import path11 from "path";
 import chalk8 from "chalk";
 import fs9 from "fs-extra";
 import prompts4 from "prompts";
@@ -1512,7 +1553,7 @@ async function updateCommand(componentNames, cwd, options) {
     targetNames = componentNames;
     const missing = [];
     for (const name of targetNames) {
-      const dir = path9.join(componentsDir, name);
+      const dir = path11.join(componentsDir, name);
       if (!await fs9.pathExists(dir)) {
         missing.push(name);
       }
@@ -1536,7 +1577,7 @@ async function updateCommand(componentNames, cwd, options) {
   resolveSpinner.succeed("Registry fetched");
   const componentDiffs = [];
   for (const { entry } of resolution.components) {
-    const componentDir = path9.join(componentsDir, entry.name);
+    const componentDir = path11.join(componentsDir, entry.name);
     if (!await fs9.pathExists(componentDir)) {
       componentDiffs.push({
         name: entry.name,
@@ -1547,8 +1588,8 @@ async function updateCommand(componentNames, cwd, options) {
     }
     const diffs = [];
     for (const filePath of entry.files) {
-      const fileName = path9.basename(filePath);
-      const localPath = path9.join(componentDir, fileName);
+      const fileName = path11.basename(filePath);
+      const localPath = path11.join(componentDir, fileName);
       const remoteContent = await fetchFileContent(config, filePath);
       const transformed = transformImports(remoteContent, {
         config,
@@ -1568,8 +1609,8 @@ async function updateCommand(componentNames, cwd, options) {
   for (const utilName of resolution.utils) {
     const utilEntry = utilsRegistry[utilName];
     if (!utilEntry) continue;
-    const fileName = path9.basename(utilEntry.file);
-    const localPath = path9.join(libDir, fileName);
+    const fileName = path11.basename(utilEntry.file);
+    const localPath = path11.join(libDir, fileName);
     const remoteContent = await fetchFileContent(config, utilEntry.file);
     let localContent = "";
     if (await fs9.pathExists(localPath)) {
@@ -1585,7 +1626,7 @@ async function updateCommand(componentNames, cwd, options) {
     }
   }
   const newBarrel = generateUtilsBarrel(resolution.utils, utilExports);
-  const barrelPath = path9.join(libDir, "rootnative-utils.ts");
+  const barrelPath = path11.join(libDir, "rootnative-utils.ts");
   let oldBarrel = "";
   if (await fs9.pathExists(barrelPath)) {
     oldBarrel = await fs9.readFile(barrelPath, "utf-8");
@@ -1651,7 +1692,7 @@ async function updateCommand(componentNames, cwd, options) {
   const applySpinner = createSpinner("Applying updates...");
   applySpinner.start();
   for (const comp of changedComponents) {
-    const componentDir = path9.join(componentsDir, comp.name);
+    const componentDir = path11.join(componentsDir, comp.name);
     await fs9.ensureDir(componentDir);
     if (comp.diffs.length === 0) {
       const entry = resolution.components.find(
@@ -1660,14 +1701,14 @@ async function updateCommand(componentNames, cwd, options) {
       if (!entry) continue;
       for (const filePath of entry.entry.files) {
         const content = await fetchFileContent(config, filePath);
-        const fileName = path9.basename(filePath);
+        const fileName = path11.basename(filePath);
         const transformed = transformImports(content, {
           config,
           componentName: comp.name,
           installedComponents: allComponentNames
         });
         await fs9.writeFile(
-          path9.join(componentDir, fileName),
+          path11.join(componentDir, fileName),
           transformed,
           "utf-8"
         );
@@ -1678,7 +1719,7 @@ async function updateCommand(componentNames, cwd, options) {
       if (!diff.hasChanges) continue;
       const newContent = diff.lines.filter((l) => l.type !== "remove").map((l) => l.content).join("\n");
       await fs9.writeFile(
-        path9.join(componentDir, diff.fileName),
+        path11.join(componentDir, diff.fileName),
         newContent,
         "utf-8"
       );
@@ -1688,7 +1729,7 @@ async function updateCommand(componentNames, cwd, options) {
   for (const diff of changedUtils) {
     if (!diff.hasChanges) continue;
     const newContent = diff.lines.filter((l) => l.type !== "remove").map((l) => l.content).join("\n");
-    const filePath = path9.join(
+    const filePath = path11.join(
       libDir,
       // diff.fileName is like "lib/color.ts" — strip the "lib/" prefix
       diff.fileName.replace(/^lib\//, "")
@@ -1709,10 +1750,10 @@ async function getInstalledComponents(componentsDir) {
   const entries = await fs9.readdir(componentsDir);
   const components = [];
   for (const entry of entries) {
-    const fullPath = path9.join(componentsDir, entry);
+    const fullPath = path11.join(componentsDir, entry);
     const stat = await fs9.stat(fullPath);
     if (stat.isDirectory()) {
-      const indexPath = path9.join(fullPath, "index.ts");
+      const indexPath = path11.join(fullPath, "index.ts");
       if (await fs9.pathExists(indexPath)) {
         components.push(entry);
       }
@@ -1722,7 +1763,7 @@ async function getInstalledComponents(componentsDir) {
 }
 
 // src/commands/upgrade.ts
-import path10 from "path";
+import path12 from "path";
 import chalk9 from "chalk";
 import { execa as execa4 } from "execa";
 import fs10 from "fs-extra";
@@ -1738,7 +1779,7 @@ async function fetchLatestFromNpm(packageName) {
   return response.json();
 }
 function getInstalledPackageInfo(cwd, packageName) {
-  const pkgPath = path10.resolve(
+  const pkgPath = path12.resolve(
     cwd,
     "node_modules",
     ...packageName.split("/"),
@@ -1778,7 +1819,7 @@ function diffPeerDeps(current, latest) {
   return { added, changed, removed };
 }
 function getProjectDeps(cwd) {
-  const pkgPath = path10.resolve(cwd, "package.json");
+  const pkgPath = path12.resolve(cwd, "package.json");
   try {
     const pkg = fs10.readJSONSync(pkgPath);
     return {

package/llms.txt

@@ -1,6 +1,6 @@
 # @rootnative/cli — CLI for RootNative UI
 
-> Version: 0.0.0-alpha.5
+> Version: 0.0.0-alpha.7
 > Binary: `rootnative`
 > Requirements: Node >=18
 
@@ -47,7 +47,7 @@ Creates `rootnative.json`:
   "$schema": "https://rootnative.github.io/ui/schema.json",
   "aliases": { "components": "@/components/ui", "lib": "@/lib" },
   "registryUrl": "https://raw.githubusercontent.com/rootnative/ui",
-  "registryVersion": "v0.0.0-alpha.5"
+  "registryVersion": "v0.0.0-alpha.7"
 }
 ```
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rootnative/cli",
-  "version": "0.0.0-alpha.5",
+  "version": "0.0.0-alpha.7",
   "description": "CLI for adding RootNative UI components to your React Native project",
   "private": false,
   "bin": {