rafters 0.0.9 → 0.0.12

package/dist/index.js

@@ -12563,23 +12563,23 @@ var RegistryFileSchema = external_exports.object({
   devDependencies: external_exports.array(external_exports.string()).default([])
   // e.g., ["vitest"] - from @devDependencies JSDoc
 });
-var RegistryItemTypeSchema = external_exports.enum([
-  "registry:ui",
-  "registry:primitive",
-  "registry:composite"
-]);
+var RegistryItemTypeSchema = external_exports.enum(["ui", "primitive", "composite"]);
 var RegistryItemSchema = external_exports.object({
   name: external_exports.string(),
   type: RegistryItemTypeSchema,
   description: external_exports.string().optional(),
   primitives: external_exports.array(external_exports.string()),
-  files: external_exports.array(RegistryFileSchema)
+  files: external_exports.array(RegistryFileSchema),
+  rules: external_exports.array(external_exports.string()).default([]),
+  composites: external_exports.array(external_exports.string()).default([])
 });
 var RegistryIndexSchema = external_exports.object({
   name: external_exports.string(),
   homepage: external_exports.string(),
   components: external_exports.array(external_exports.string()),
-  primitives: external_exports.array(external_exports.string())
+  primitives: external_exports.array(external_exports.string()),
+  composites: external_exports.array(external_exports.string()).default([]),
+  rules: external_exports.array(external_exports.string()).default([])
 });
 
 // src/registry/client.ts
@@ -12650,6 +12650,30 @@ var RegistryClient = class {
     this.cache.set(cacheKey, item);
     return item;
   }
+  /**
+   * Fetch a composite by name
+   */
+  async fetchComposite(name2) {
+    const cacheKey = `composite:${name2}`;
+    const cached2 = this.cache.get(cacheKey);
+    if (cached2) {
+      return cached2;
+    }
+    const url2 = `${this.baseUrl}/registry/composites/${name2}.json`;
+    const response = await fetch(url2);
+    if (response.status === 404) {
+      throw new Error(`Composite "${name2}" not found`);
+    }
+    if (!response.ok) {
+      throw new Error(
+        `Failed to fetch composite "${name2}": ${response.status} ${response.statusText}`
+      );
+    }
+    const data = await response.json();
+    const item = RegistryItemSchema.parse(data);
+    this.cache.set(cacheKey, item);
+    return item;
+  }
   /**
    * Fetch a registry item (component or primitive) by name
    * Tries component first, then primitive
@@ -12675,6 +12699,13 @@ var RegistryClient = class {
     const index = await this.fetchIndex();
     return index.components.map((name2) => ({ name: name2 }));
   }
+  /**
+   * List all available composites
+   */
+  async listComposites() {
+    const index = await this.fetchIndex();
+    return index.composites.map((name2) => ({ name: name2 }));
+  }
   /**
    * Check if a component exists in the registry
    */
@@ -13199,25 +13230,40 @@ async function saveConfig(cwd, config3) {
 }
 function getInstalledNames(config3) {
   if (!config3?.installed) return [];
-  const names2 = /* @__PURE__ */ new Set([...config3.installed.components, ...config3.installed.primitives]);
+  const names2 = /* @__PURE__ */ new Set([
+    ...config3.installed.components,
+    ...config3.installed.primitives,
+    ...config3.installed.composites ?? []
+  ]);
   return [...names2].sort();
 }
+var FOLDER_NAMES = /* @__PURE__ */ new Set(["composites"]);
 function isAlreadyInstalled(config3, item) {
   if (!config3?.installed) return false;
-  if (item.type === "registry:ui") {
+  if (item.type === "ui") {
     return config3.installed.components.includes(item.name);
   }
+  if (item.type === "composite") {
+    return (config3.installed.composites ?? []).includes(item.name);
+  }
   return config3.installed.primitives.includes(item.name);
 }
 function trackInstalled(config3, items) {
   if (!config3.installed) {
-    config3.installed = { components: [], primitives: [] };
+    config3.installed = { components: [], primitives: [], composites: [] };
+  }
+  if (!config3.installed.composites) {
+    config3.installed.composites = [];
   }
   for (const item of items) {
-    if (item.type === "registry:ui") {
+    if (item.type === "ui") {
       if (!config3.installed.components.includes(item.name)) {
         config3.installed.components.push(item.name);
       }
+    } else if (item.type === "composite") {
+      if (!config3.installed.composites.includes(item.name)) {
+        config3.installed.composites.push(item.name);
+      }
     } else {
       if (!config3.installed.primitives.includes(item.name)) {
         config3.installed.primitives.push(item.name);
@@ -13226,6 +13272,7 @@ function trackInstalled(config3, items) {
   }
   config3.installed.components.sort();
   config3.installed.primitives.sort();
+  config3.installed.composites.sort();
 }
 function transformPath(registryPath, config3) {
   if (!config3) return registryPath;
@@ -13235,6 +13282,9 @@ function transformPath(registryPath, config3) {
   if (registryPath.startsWith("lib/primitives/")) {
     return registryPath.replace("lib/primitives/", `${config3.primitivesPath}/`);
   }
+  if (registryPath.startsWith("composites/")) {
+    return registryPath.replace("composites/", `${config3.compositesPath}/`);
+  }
   return registryPath;
 }
 function fileExists(cwd, relativePath) {
@@ -13306,15 +13356,32 @@ async function add(componentArgs, options) {
   setAgentMode(options.agent ?? false);
   let components = componentArgs;
   const client = new RegistryClient(options.registryUrl);
+  let folder;
+  const firstArg = components[0];
+  if (firstArg && FOLDER_NAMES.has(firstArg)) {
+    folder = firstArg;
+    components = components.slice(1);
+  }
   if (options.list) {
     const availableComponents = await client.listComponents();
+    const availableComposites = await client.listComposites();
     if (options.agent) {
-      log({ event: "add:list", components: availableComponents });
+      log({
+        event: "add:list",
+        components: availableComponents,
+        composites: availableComposites
+      });
     } else {
       console.log("Available components:\n");
       for (const comp of availableComponents) {
         console.log(`  ${comp.name}  ${comp.description ?? ""}`);
       }
+      if (availableComposites.length > 0) {
+        console.log("\nAvailable composites:\n");
+        for (const comp of availableComposites) {
+          console.log(`  ${comp.name}  ${comp.description ?? ""}`);
+        }
+      }
     }
     return;
   }
@@ -13357,15 +13424,23 @@ async function add(componentArgs, options) {
   });
   const allItems = [];
   const seen = /* @__PURE__ */ new Set();
-  for (const componentName of components) {
+  for (const itemName of components) {
     try {
-      const items = await client.resolveDependencies(componentName, seen);
-      allItems.push(...items);
+      if (folder === "composites") {
+        if (!seen.has(itemName)) {
+          const item = await client.fetchComposite(itemName);
+          seen.add(itemName);
+          allItems.push(item);
+        }
+      } else {
+        const items = await client.resolveDependencies(itemName, seen);
+        allItems.push(...items);
+      }
     } catch (err) {
       if (err instanceof Error) {
         error46(err.message);
       } else {
-        error46(`Failed to fetch component "${componentName}"`);
+        error46(`Failed to fetch "${itemName}"`);
       }
       process.exitCode = 1;
       return;
@@ -13443,10 +13518,11 @@ async function add(componentArgs, options) {
       framework: "unknown",
       componentsPath: "components/ui",
       primitivesPath: "lib/primitives",
+      compositesPath: "composites",
       cssPath: null,
       shadcn: false,
       exports: DEFAULT_EXPORTS,
-      installed: { components: [], primitives: [] }
+      installed: { components: [], primitives: [], composites: [] }
     };
     trackInstalled(newConfig, installedItems);
     await saveConfig(cwd, newConfig);
@@ -13469,7 +13545,7 @@ async function add(componentArgs, options) {
 }
 
 // src/commands/init.ts
-import { existsSync as existsSync2 } from "fs";
+import { existsSync as existsSync3 } from "fs";
 import { copyFile, mkdir as mkdir3, readFile as readFile5, rm, writeFile as writeFile3 } from "fs/promises";
 import { createRequire } from "module";
 import { join as join9, relative } from "path";
@@ -14397,6 +14473,42 @@ function buildExtensions(token) {
   if (token.customPropertyOnly) {
     extensions.customPropertyOnly = token.customPropertyOnly;
   }
+  if (token.userOverride) {
+    extensions.userOverride = token.userOverride;
+  }
+  if (token.computedValue !== void 0) {
+    extensions.computedValue = convertValue({ ...token, value: token.computedValue });
+  }
+  if (token.generationRule) {
+    extensions.generationRule = token.generationRule;
+  }
+  if (token.pairedWith && token.pairedWith.length > 0) {
+    extensions.pairedWith = token.pairedWith;
+  }
+  if (token.conflictsWith && token.conflictsWith.length > 0) {
+    extensions.conflictsWith = token.conflictsWith;
+  }
+  if (token.applicableComponents && token.applicableComponents.length > 0) {
+    extensions.applicableComponents = token.applicableComponents;
+  }
+  if (token.requiredForComponents && token.requiredForComponents.length > 0) {
+    extensions.requiredForComponents = token.requiredForComponents;
+  }
+  if (token.trustLevel) {
+    extensions.trustLevel = token.trustLevel;
+  }
+  if (token.cognitiveLoad !== void 0) {
+    extensions.cognitiveLoad = token.cognitiveLoad;
+  }
+  if (token.consequence) {
+    extensions.consequence = token.consequence;
+  }
+  if (token.accessibilityLevel) {
+    extensions.accessibilityLevel = token.accessibilityLevel;
+  }
+  if (token.appliesWhen && token.appliesWhen.length > 0) {
+    extensions.appliesWhen = token.appliesWhen;
+  }
   return Object.keys(extensions).length > 0 ? { rafters: extensions } : {};
 }
 function tokenToDTCG(token) {
@@ -47524,7 +47636,7 @@ function extractPrimitiveDependencies(source) {
     const pkg = match2[1];
     if (pkg && (pkg.includes("/primitives/") || pkg.includes("../primitives/"))) {
       const primitiveName = pkg.split("/").pop()?.replace(/\.(ts|tsx)$/, "");
-      if (primitiveName && !primitives.includes(primitiveName) && primitiveName !== "types") {
+      if (primitiveName && !primitives.includes(primitiveName)) {
         primitives.push(primitiveName);
       }
     }
@@ -47547,7 +47659,13 @@ function extractJSDocDependencies(source) {
       if (!field) continue;
       const value2 = getTagValue(tag).trim();
       if (value2) {
-        result[field].push(...value2.split(/\s+/).filter(Boolean));
+        const tokens = value2.split(/\s+/).filter(Boolean);
+        const validTokens = [];
+        for (const token of tokens) {
+          if (token.startsWith("(")) break;
+          validTokens.push(token);
+        }
+        result[field].push(...validTokens);
       }
     }
   }
@@ -50782,8 +50900,15 @@ var RuleContextSchema = external_exports.object({
 });
 
 // src/utils/detect.ts
+import { existsSync as existsSync2 } from "fs";
 import { readFile as readFile4 } from "fs/promises";
 import { join as join8 } from "path";
+var CONFIG_FILE_FRAMEWORKS = [
+  { files: ["astro.config.mjs", "astro.config.ts", "astro.config.js"], framework: "astro" },
+  { files: ["next.config.mjs", "next.config.ts", "next.config.js"], framework: "next" },
+  { files: ["remix.config.js", "remix.config.ts"], framework: "remix" },
+  { files: ["vite.config.ts", "vite.config.js", "vite.config.mjs"], framework: "vite" }
+];
 async function detectFramework(cwd) {
   try {
     const content = await readFile4(join8(cwd, "package.json"), "utf-8");
@@ -50805,10 +50930,19 @@ async function detectFramework(cwd) {
     if (deps.vite) {
       return "vite";
     }
-    return "unknown";
   } catch {
-    return "unknown";
   }
+  return detectFrameworkFromConfigFiles(cwd);
+}
+function detectFrameworkFromConfigFiles(cwd) {
+  for (const { files, framework } of CONFIG_FILE_FRAMEWORKS) {
+    for (const file2 of files) {
+      if (existsSync2(join8(cwd, file2))) {
+        return framework;
+      }
+    }
+  }
+  return "unknown";
 }
 async function detectTailwindVersion(cwd) {
   try {
@@ -50910,18 +51044,34 @@ var CSS_LOCATIONS = {
   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" }
+  astro: {
+    components: "src/components/ui",
+    primitives: "src/lib/primitives",
+    composites: "src/composites"
+  },
+  next: { components: "components/ui", primitives: "lib/primitives", composites: "composites" },
+  vite: {
+    components: "src/components/ui",
+    primitives: "src/lib/primitives",
+    composites: "src/composites"
+  },
+  remix: {
+    components: "app/components/ui",
+    primitives: "app/lib/primitives",
+    composites: "app/composites"
+  },
+  "react-router": {
+    components: "app/components/ui",
+    primitives: "app/lib/primitives",
+    composites: "app/composites"
+  },
+  unknown: { components: "components/ui", primitives: "lib/primitives", composites: "composites" }
 };
 async function findMainCssFile(cwd, framework) {
   const locations = CSS_LOCATIONS[framework] || CSS_LOCATIONS.unknown;
   for (const location of locations) {
     const fullPath = join9(cwd, location);
-    if (existsSync2(fullPath)) {
+    if (existsSync3(fullPath)) {
       return location;
     }
   }
@@ -51043,7 +51193,7 @@ async function generateOutputs(cwd, paths, registry2, exports, shadcn) {
   }
   return outputs;
 }
-async function regenerateFromExisting(cwd, paths, shadcn, isAgentMode2) {
+async function regenerateFromExisting(cwd, paths, shadcn, isAgentMode2, framework) {
   log({ event: "init:regenerate", cwd });
   let existingConfig = null;
   try {
@@ -51051,6 +51201,13 @@ async function regenerateFromExisting(cwd, paths, shadcn, isAgentMode2) {
     existingConfig = JSON.parse(configContent);
   } catch {
   }
+  if (framework !== "unknown" && existingConfig) {
+    const frameworkPaths = COMPONENT_PATHS[framework] || COMPONENT_PATHS.unknown;
+    existingConfig.framework = framework;
+    existingConfig.componentsPath = frameworkPaths.components;
+    existingConfig.primitivesPath = frameworkPaths.primitives;
+    existingConfig.compositesPath = frameworkPaths.composites;
+  }
   const adapter = new NodePersistenceAdapter(cwd);
   const allTokens = await adapter.load();
   if (allTokens.length === 0) {
@@ -51086,7 +51243,7 @@ async function regenerateFromExisting(cwd, paths, shadcn, isAgentMode2) {
     path: paths.output
   });
 }
-async function resetToDefaults(cwd, paths, shadcn, isAgentMode2) {
+async function resetToDefaults(cwd, paths, shadcn, isAgentMode2, framework) {
   log({ event: "init:reset", cwd });
   let existingConfig = null;
   try {
@@ -51094,6 +51251,13 @@ async function resetToDefaults(cwd, paths, shadcn, isAgentMode2) {
     existingConfig = JSON.parse(configContent);
   } catch {
   }
+  if (framework !== "unknown" && existingConfig) {
+    const frameworkPaths = COMPONENT_PATHS[framework] || COMPONENT_PATHS.unknown;
+    existingConfig.framework = framework;
+    existingConfig.componentsPath = frameworkPaths.components;
+    existingConfig.primitivesPath = frameworkPaths.primitives;
+    existingConfig.compositesPath = frameworkPaths.composites;
+  }
   const adapter = new NodePersistenceAdapter(cwd);
   const existingTokens = await adapter.load();
   const overriddenTokens = existingTokens.filter((t2) => t2.userOverride);
@@ -51179,12 +51343,12 @@ async function init(options) {
   if (isTailwindV3(tailwindVersion)) {
     throw new Error("Tailwind v3 detected. Rafters requires Tailwind v4.");
   }
-  const raftersExists = existsSync2(paths.root);
+  const raftersExists = existsSync3(paths.root);
   if (options.reset && !raftersExists) {
     throw new Error("Nothing to reset. No .rafters/ directory found.");
   }
   if (raftersExists && options.reset) {
-    await resetToDefaults(cwd, paths, shadcn, isAgentMode2);
+    await resetToDefaults(cwd, paths, shadcn, isAgentMode2, framework);
     return;
   }
   if (raftersExists && !options.rebuild) {
@@ -51193,7 +51357,7 @@ async function init(options) {
     );
   }
   if (raftersExists && options.rebuild) {
-    await regenerateFromExisting(cwd, paths, shadcn, isAgentMode2);
+    await regenerateFromExisting(cwd, paths, shadcn, isAgentMode2, framework);
     return;
   }
   let existingColors = null;
@@ -51304,12 +51468,14 @@ async function init(options) {
     framework,
     componentsPath: frameworkPaths.components,
     primitivesPath: frameworkPaths.primitives,
+    compositesPath: frameworkPaths.composites,
     cssPath: detectedCssPath,
     shadcn: !!shadcn,
     exports,
     installed: {
       components: [],
-      primitives: []
+      primitives: [],
+      composites: []
     }
   };
   await writeFile3(paths.config, JSON.stringify(config3, null, 2));
@@ -51326,7 +51492,7 @@ import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js"
 import { CallToolRequestSchema, ListToolsRequestSchema } from "@modelcontextprotocol/sdk/types.js";
 
 // src/mcp/tools.ts
-import { existsSync as existsSync3 } from "fs";
+import { existsSync as existsSync4 } from "fs";
 import { readdir as readdir3, readFile as readFile6 } from "fs/promises";
 import { basename, join as join10 } from "path";
 
@@ -52753,7 +52919,7 @@ var RaftersToolHandler = class {
     let installed = [];
     try {
       const paths = getRaftersPaths(this.projectRoot);
-      if (existsSync3(paths.config)) {
+      if (existsSync4(paths.config)) {
         const content = await readFile6(paths.config, "utf-8");
         const config3 = JSON.parse(content);
         installed = config3.installed?.components ?? [];
@@ -53291,7 +53457,7 @@ async function mcp() {
 }
 
 // src/commands/studio.ts
-import { existsSync as existsSync4 } from "fs";
+import { existsSync as existsSync5 } from "fs";
 import { dirname as dirname3, join as join11 } from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
 import { execa as execa2 } from "execa";
@@ -53299,14 +53465,14 @@ var __dirname2 = dirname3(fileURLToPath3(import.meta.url));
 async function studio() {
   const cwd = process.cwd();
   const paths = getRaftersPaths(cwd);
-  if (!existsSync4(paths.root)) {
+  if (!existsSync5(paths.root)) {
     console.error('No .rafters/ directory found. Run "rafters init" first.');
     process.exit(1);
   }
   const devStudioPath = join11(__dirname2, "..", "..", "..", "studio");
   const prodStudioPath = join11(__dirname2, "..", "node_modules", "@rafters", "studio");
-  const studioPath = existsSync4(devStudioPath) ? devStudioPath : prodStudioPath;
-  if (!existsSync4(studioPath)) {
+  const studioPath = existsSync5(devStudioPath) ? devStudioPath : prodStudioPath;
+  if (!existsSync5(studioPath)) {
     console.error("Studio package not found. Please reinstall @rafters/cli.");
     process.exit(1);
   }

package/dist/registry/types.d.ts

@@ -22,9 +22,9 @@ type RegistryFile = z.infer<typeof RegistryFileSchema>;
  * Item type in registry
  */
 declare const RegistryItemTypeSchema: z.ZodEnum<{
-    "registry:ui": "registry:ui";
-    "registry:primitive": "registry:primitive";
-    "registry:composite": "registry:composite";
+    ui: "ui";
+    primitive: "primitive";
+    composite: "composite";
 }>;
 type RegistryItemType = z.infer<typeof RegistryItemTypeSchema>;
 /**
@@ -33,9 +33,9 @@ type RegistryItemType = z.infer<typeof RegistryItemTypeSchema>;
 declare const RegistryItemSchema: z.ZodObject<{
     name: z.ZodString;
     type: z.ZodEnum<{
-        "registry:ui": "registry:ui";
-        "registry:primitive": "registry:primitive";
-        "registry:composite": "registry:composite";
+        ui: "ui";
+        primitive: "primitive";
+        composite: "composite";
     }>;
     description: z.ZodOptional<z.ZodString>;
     primitives: z.ZodArray<z.ZodString>;
@@ -45,6 +45,8 @@ declare const RegistryItemSchema: z.ZodObject<{
         dependencies: z.ZodArray<z.ZodString>;
         devDependencies: z.ZodDefault<z.ZodArray<z.ZodString>>;
     }, z.core.$strip>>;
+    rules: z.ZodDefault<z.ZodArray<z.ZodString>>;
+    composites: z.ZodDefault<z.ZodArray<z.ZodString>>;
 }, z.core.$strip>;
 type RegistryItem = z.infer<typeof RegistryItemSchema>;
 /**
@@ -55,6 +57,8 @@ declare const RegistryIndexSchema: z.ZodObject<{
     homepage: z.ZodString;
     components: z.ZodArray<z.ZodString>;
     primitives: z.ZodArray<z.ZodString>;
+    composites: z.ZodDefault<z.ZodArray<z.ZodString>>;
+    rules: z.ZodDefault<z.ZodArray<z.ZodString>>;
 }, z.core.$strip>;
 type RegistryIndex = z.infer<typeof RegistryIndexSchema>;
 

package/dist/registry/types.js

@@ -8,23 +8,23 @@ var RegistryFileSchema = z.object({
   devDependencies: z.array(z.string()).default([])
   // e.g., ["vitest"] - from @devDependencies JSDoc
 });
-var RegistryItemTypeSchema = z.enum([
-  "registry:ui",
-  "registry:primitive",
-  "registry:composite"
-]);
+var RegistryItemTypeSchema = z.enum(["ui", "primitive", "composite"]);
 var RegistryItemSchema = z.object({
   name: z.string(),
   type: RegistryItemTypeSchema,
   description: z.string().optional(),
   primitives: z.array(z.string()),
-  files: z.array(RegistryFileSchema)
+  files: z.array(RegistryFileSchema),
+  rules: z.array(z.string()).default([]),
+  composites: z.array(z.string()).default([])
 });
 var RegistryIndexSchema = z.object({
   name: z.string(),
   homepage: z.string(),
   components: z.array(z.string()),
-  primitives: z.array(z.string())
+  primitives: z.array(z.string()),
+  composites: z.array(z.string()).default([]),
+  rules: z.array(z.string()).default([])
 });
 export {
   RegistryFileSchema,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rafters",
-  "version": "0.0.9",
+  "version": "0.0.12",
   "description": "CLI for Rafters design system - scaffold tokens and add components",
   "license": "MIT",
   "type": "module",
@@ -48,6 +48,11 @@
     "vitest": "catalog:",
     "zocker": "catalog:"
   },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/ezmode-games/rafters.git",
+    "directory": "packages/cli"
+  },
   "publishConfig": {
     "access": "public"
   }