rafters 0.0.4 → 0.0.5

package/dist/index.js

@@ -9,7 +9,7 @@ import { Command } from "commander";
 
 // src/commands/add.ts
 import { existsSync } from "fs";
-import { access, mkdir, writeFile } from "fs/promises";
+import { access, mkdir, readFile, writeFile } from "fs/promises";
 import { dirname, join as join2 } from "path";
 
 // ../../node_modules/.pnpm/zod@4.1.12/node_modules/zod/v4/classic/external.js
@@ -12927,39 +12927,72 @@ async function isInitialized(cwd) {
     return false;
   }
 }
+async function loadConfig(cwd) {
+  const paths = getRaftersPaths(cwd);
+  try {
+    const content = await readFile(paths.config, "utf-8");
+    return JSON.parse(content);
+  } catch {
+    return null;
+  }
+}
+function transformPath(registryPath, config3) {
+  if (!config3) return registryPath;
+  if (registryPath.startsWith("components/ui/")) {
+    return registryPath.replace("components/ui/", `${config3.componentsPath}/`);
+  }
+  if (registryPath.startsWith("lib/primitives/")) {
+    return registryPath.replace("lib/primitives/", `${config3.primitivesPath}/`);
+  }
+  return registryPath;
+}
 function fileExists(cwd, relativePath) {
   return existsSync(join2(cwd, relativePath));
 }
-function transformFileContent(content) {
+function transformFileContent(content, config3) {
   let transformed = content;
+  const componentsPath = config3?.componentsPath ?? "components/ui";
+  const primitivesPath = config3?.primitivesPath ?? "lib/primitives";
   transformed = transformed.replace(
     /from\s+['"]\.\.\/\.\.\/primitives\/([^'"]+)['"]/g,
-    "from '@/lib/primitives/$1'"
+    `from '@/${primitivesPath}/$1'`
   );
   transformed = transformed.replace(
     /from\s+['"]\.\.\/primitives\/([^'"]+)['"]/g,
-    "from '@/lib/primitives/$1'"
+    `from '@/${primitivesPath}/$1'`
+  );
+  transformed = transformed.replace(
+    /from\s+['"]\.\/([^'"]+)['"]/g,
+    `from '@/${componentsPath}/$1'`
+  );
+  const libPath = primitivesPath.replace(/\/primitives$/, "");
+  transformed = transformed.replace(
+    /from\s+['"]\.\.\/lib\/([^'"]+)['"]/g,
+    `from '@/${libPath}/$1'`
+  );
+  const hooksPath = componentsPath.replace(/components\/ui$/, "hooks");
+  transformed = transformed.replace(
+    /from\s+['"]\.\.\/hooks\/([^'"]+)['"]/g,
+    `from '@/${hooksPath}/$1'`
   );
-  transformed = transformed.replace(/from\s+['"]\.\/([^'"]+)['"]/g, "from '@/components/ui/$1'");
-  transformed = transformed.replace(/from\s+['"]\.\.\/lib\/([^'"]+)['"]/g, "from '@/lib/$1'");
-  transformed = transformed.replace(/from\s+['"]\.\.\/hooks\/([^'"]+)['"]/g, "from '@/hooks/$1'");
   transformed = transformed.replace(
     /from\s+['"]\.\.\/(?!lib\/|hooks\/)([^'"]+)['"]/g,
-    "from '@/components/ui/$1'"
+    `from '@/${componentsPath}/$1'`
   );
   return transformed;
 }
-async function installItem(cwd, item, options) {
+async function installItem(cwd, item, options, config3) {
   const installedFiles = [];
   let skipped = false;
   for (const file2 of item.files) {
-    const targetPath = join2(cwd, file2.path);
-    if (fileExists(cwd, file2.path)) {
+    const projectPath = transformPath(file2.path, config3);
+    const targetPath = join2(cwd, projectPath);
+    if (fileExists(cwd, projectPath)) {
       if (!options.overwrite) {
         log({
           event: "add:skip",
           component: item.name,
-          file: file2.path,
+          file: projectPath,
           reason: "exists"
         });
         skipped = true;
@@ -12967,9 +13000,9 @@ async function installItem(cwd, item, options) {
       }
     }
     await mkdir(dirname(targetPath), { recursive: true });
-    const transformedContent = transformFileContent(file2.content);
+    const transformedContent = transformFileContent(file2.content, config3);
     await writeFile(targetPath, transformedContent, "utf-8");
-    installedFiles.push(file2.path);
+    installedFiles.push(projectPath);
   }
   return {
     installed: installedFiles.length > 0,
@@ -13001,6 +13034,7 @@ async function add(components, options) {
     process.exitCode = 1;
     return;
   }
+  const config3 = await loadConfig(cwd);
   if (components.length === 0) {
     error46("No components specified. Usage: rafters add <component...>");
     process.exitCode = 1;
@@ -13033,7 +13067,7 @@ async function add(components, options) {
   const skipped = [];
   for (const item of allItems) {
     try {
-      const result = await installItem(cwd, item, options);
+      const result = await installItem(cwd, item, options, config3);
       if (result.installed) {
         installed.push(item.name);
         log({
@@ -13090,7 +13124,7 @@ async function add(components, options) {
 
 // src/commands/init.ts
 import { existsSync as existsSync2 } from "fs";
-import { copyFile, mkdir as mkdir3, readFile as readFile3, writeFile as writeFile3 } from "fs/promises";
+import { copyFile, mkdir as mkdir3, readFile as readFile4, writeFile as writeFile3 } from "fs/promises";
 import { join as join8, relative } from "path";
 
 // ../design-tokens/src/generation-rules.ts
@@ -48960,7 +48994,7 @@ function buildColorSystem(options = {}) {
 }
 
 // ../design-tokens/src/persistence/node-adapter.ts
-import { access as access2, mkdir as mkdir2, readdir as readdir2, readFile, writeFile as writeFile2 } from "fs/promises";
+import { access as access2, mkdir as mkdir2, readdir as readdir2, readFile as readFile2, writeFile as writeFile2 } from "fs/promises";
 import { join as join5 } from "path";
 
 // ../../node_modules/.pnpm/comment-parser@1.4.1/node_modules/comment-parser/es6/primitives.js
@@ -49925,7 +49959,7 @@ var NodePersistenceAdapter = class {
   }
   async loadNamespace(namespace) {
     const filePath = this.getFilePath(namespace);
-    const content = await readFile(filePath, "utf-8");
+    const content = await readFile2(filePath, "utf-8");
     const json3 = JSON.parse(content);
     const data = NamespaceFileSchema.parse(json3);
     return data.tokens;
@@ -49985,16 +50019,19 @@ var RuleContextSchema = external_exports.object({
 });
 
 // src/utils/detect.ts
-import { readFile as readFile2 } from "fs/promises";
+import { readFile as readFile3 } from "fs/promises";
 import { join as join7 } from "path";
 async function detectFramework(cwd) {
   try {
-    const content = await readFile2(join7(cwd, "package.json"), "utf-8");
+    const content = await readFile3(join7(cwd, "package.json"), "utf-8");
     const pkg = JSON.parse(content);
     const deps = { ...pkg.dependencies, ...pkg.devDependencies };
     if (deps.next) {
       return "next";
     }
+    if (deps["react-router"]) {
+      return "react-router";
+    }
     const hasRemix = Object.keys(deps).some((dep) => dep.startsWith("@remix-run/"));
     if (hasRemix) {
       return "remix";
@@ -50012,7 +50049,7 @@ async function detectFramework(cwd) {
 }
 async function detectTailwindVersion(cwd) {
   try {
-    const content = await readFile2(join7(cwd, "package.json"), "utf-8");
+    const content = await readFile3(join7(cwd, "package.json"), "utf-8");
     const pkg = JSON.parse(content);
     const deps = { ...pkg.dependencies, ...pkg.devDependencies };
     const tailwindVersion = deps.tailwindcss;
@@ -50033,7 +50070,7 @@ function isTailwindV3(version2) {
 }
 async function detectShadcn(cwd) {
   try {
-    const content = await readFile2(join7(cwd, "components.json"), "utf-8");
+    const content = await readFile3(join7(cwd, "components.json"), "utf-8");
     return JSON.parse(content);
   } catch {
     return null;
@@ -50106,8 +50143,17 @@ var CSS_LOCATIONS = {
   next: ["src/app/globals.css", "app/globals.css", "styles/globals.css"],
   vite: ["src/index.css", "src/main.css", "src/styles.css", "src/app.css"],
   remix: ["app/styles/global.css", "app/globals.css", "app/root.css"],
+  "react-router": ["app/app.css", "app/root.css", "app/styles.css", "app/globals.css"],
   unknown: ["src/styles/global.css", "src/index.css", "styles/globals.css"]
 };
+var COMPONENT_PATHS = {
+  astro: { components: "src/components/ui", primitives: "src/lib/primitives" },
+  next: { components: "components/ui", primitives: "lib/primitives" },
+  vite: { components: "src/components/ui", primitives: "src/lib/primitives" },
+  remix: { components: "app/components/ui", primitives: "app/lib/primitives" },
+  "react-router": { components: "app/components/ui", primitives: "app/lib/primitives" },
+  unknown: { components: "components/ui", primitives: "lib/primitives" }
+};
 async function findMainCssFile(cwd, framework) {
   const locations = CSS_LOCATIONS[framework] || CSS_LOCATIONS.unknown;
   for (const location of locations) {
@@ -50120,7 +50166,7 @@ async function findMainCssFile(cwd, framework) {
 }
 async function updateMainCss(cwd, cssPath, themePath) {
   const fullCssPath = join8(cwd, cssPath);
-  const cssContent = await readFile3(fullCssPath, "utf-8");
+  const cssContent = await readFile4(fullCssPath, "utf-8");
   const cssDir = join8(cwd, cssPath, "..");
   const themeFullPath = join8(cwd, themePath);
   const relativeThemePath = relative(cssDir, themeFullPath);
@@ -50206,7 +50252,7 @@ async function init(options) {
   if (shadcn?.tailwind?.css) {
     const cssPath = join8(cwd, shadcn.tailwind.css);
     try {
-      const cssContent = await readFile3(cssPath, "utf-8");
+      const cssContent = await readFile4(cssPath, "utf-8");
       existingColors = parseCssVariables(cssContent);
       const backupPath = await backupCss(cssPath);
       log({
@@ -50291,10 +50337,11 @@ async function init(options) {
   await writeFile3(join8(paths.output, "theme.css"), tailwindCss);
   await writeFile3(join8(paths.output, "tokens.ts"), typescriptSrc);
   await writeFile3(join8(paths.output, "tokens.json"), JSON.stringify(dtcgJson, null, 2));
+  let detectedCssPath = null;
   if (!shadcn) {
-    const mainCssPath = await findMainCssFile(cwd, framework);
-    if (mainCssPath) {
-      await updateMainCss(cwd, mainCssPath, ".rafters/output/theme.css");
+    detectedCssPath = await findMainCssFile(cwd, framework);
+    if (detectedCssPath) {
+      await updateMainCss(cwd, detectedCssPath, ".rafters/output/theme.css");
     } else {
       log({
         event: "init:css_not_found",
@@ -50302,10 +50349,20 @@ async function init(options) {
         searchedLocations: CSS_LOCATIONS[framework] || CSS_LOCATIONS.unknown
       });
     }
+  } else if (shadcn?.tailwind?.css) {
+    detectedCssPath = shadcn.tailwind.css;
   }
+  const frameworkPaths = COMPONENT_PATHS[framework] || COMPONENT_PATHS.unknown;
+  const config3 = {
+    framework,
+    componentsPath: frameworkPaths.components,
+    primitivesPath: frameworkPaths.primitives,
+    cssPath: detectedCssPath
+  };
+  await writeFile3(paths.config, JSON.stringify(config3, null, 2));
   log({
     event: "init:complete",
-    outputs: ["theme.css", "tokens.ts", "tokens.json"],
+    outputs: ["theme.css", "tokens.ts", "tokens.json", "config.rafters.json"],
     path: paths.output
   });
 }
@@ -50316,7 +50373,7 @@ import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js"
 import { CallToolRequestSchema, ListToolsRequestSchema } from "@modelcontextprotocol/sdk/types.js";
 
 // src/mcp/tools.ts
-import { readdir as readdir3, readFile as readFile4 } from "fs/promises";
+import { readdir as readdir3, readFile as readFile5 } from "fs/promises";
 import { basename, join as join9 } from "path";
 var DESIGN_PATTERNS = {
   "destructive-action": {
@@ -50877,7 +50934,7 @@ var RaftersToolHandler = class {
     const componentsPath = this.getComponentsPath();
     const filePath = join9(componentsPath, `${name2}.tsx`);
     try {
-      const source = await readFile4(filePath, "utf-8");
+      const source = await readFile5(filePath, "utf-8");
       const intelligence = parseJSDocIntelligence(source);
       const description = parseDescription(source);
       const metadata = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rafters",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "CLI for Rafters design system - scaffold tokens and add components",
   "type": "module",
   "bin": {