@happlyui/cli 0.3.1 → 0.3.2

package/dist/index.js

@@ -187131,7 +187131,7 @@ var require_dist2 = __commonJS((exports) => {
 });
 
 // src/types/index.ts
-var REGISTRY_URL = "https://raw.githubusercontent.com/Mindful-Connect/happly-ui-npm/production/packages/registry", CONFIG_FILE = "components.json", BASE_COLORS;
+var REGISTRY_URL = "https://raw.githubusercontent.com/Mindful-Connect/happly-ui-npm/production/packages/registry", CONFIG_FILE = "happly-ui-components.json", BASE_COLORS;
 var init_types = __esm(() => {
   BASE_COLORS = [
     "slate",
@@ -187205,7 +187205,7 @@ function getComponentPath(componentName, componentType, config, fileName) {
     case "registry:hook":
       return path2.join(srcPrefix + (config.aliases.hooks || "@/hooks").replace("@/", ""), finalFileName);
     case "registry:lib":
-      return path2.join(srcPrefix + (config.aliases.lib || "@/lib").replace("@/", ""), finalFileName);
+      return path2.join(srcPrefix + (config.aliases.lib || "@/lib").replace("@/", ""), "happly-ui", finalFileName);
     default:
       return path2.join(srcPrefix + config.aliases.ui.replace("@/", ""), finalFileName);
   }
@@ -189691,7 +189691,8 @@ async function updateTailwindConfig(cwd, config, tailwindVersion) {
 }
 function generateCssVariables() {
   const vars = [];
-  const ds = colors.ds || {};
+  const colorsObj = colors;
+  const ds = colorsObj.ds || {};
   Object.entries(ds).forEach(([key, value]) => {
     if (key === "primary")
       return;
@@ -189731,7 +189732,8 @@ function generateThemeBlock() {
   Object.entries(borderRadii).forEach(([key, value]) => {
     lines.push(`  --radius-${key}: ${value};`);
   });
-  const ds = colors.ds || {};
+  const colorsObj = colors;
+  const ds = colorsObj.ds || {};
   const flattenDs = (obj, prefix) => {
     Object.entries(obj).forEach(([key, value]) => {
       if (typeof value === "object" && value !== null) {
@@ -190130,13 +190132,13 @@ async function init(options) {
         type: "text",
         name: "componentsPath",
         message: "Where should components be installed?",
-        initial: projectInfo.isSrcDir ? "src/components/ui" : "components/ui"
+        initial: projectInfo.isSrcDir ? "src/components/happly-ui" : "components/happly-ui"
       },
       {
         type: "text",
         name: "utilsPath",
         message: "Where should utils be installed?",
-        initial: projectInfo.isSrcDir ? "src/lib/utils" : "lib/utils"
+        initial: projectInfo.isSrcDir ? "src/lib/happly-ui/happly-ui-utils" : "lib/happly-ui/happly-ui-utils"
       }
     ]);
     if (!responses.baseColor) {
@@ -190148,7 +190150,7 @@ async function init(options) {
   const writeSpinner = ora("Writing configuration...").start();
   try {
     await writeConfig(cwd, config);
-    writeSpinner.text = "Created components.json";
+    writeSpinner.text = `Created ${CONFIG_FILE}`;
     const srcPrefix = config.srcDir ? "src/" : "";
     const utilsPath = srcPrefix + config.aliases.utils.replace("@/", "");
     const utilsContent = config.tsx ? UTILS_TEMPLATE : UTILS_JS_TEMPLATE;
@@ -190205,13 +190207,13 @@ async function init(options) {
   logger.success("Project initialized successfully!");
   logger.break();
   logger.info("You can now add components:");
-  logger.log(`  ${logger.highlight("bunx --bun happlyui add button")}`);
+  logger.log(`  ${logger.highlight("bunx --bun @happlyui/cli add button")}`);
   logger.break();
 }
 function createDefaultConfig(projectInfo) {
   const isSrcDir = projectInfo.isSrcDir;
   return {
-    $schema: "https://cdn.jsdelivr.net/gh/Mindful-Connect/happly-ui-npm@production/schemas/components.json",
+    $schema: "https://cdn.jsdelivr.net/gh/Mindful-Connect/happly-ui-npm@production/schemas/happly-ui-components.json",
     srcDir: isSrcDir,
     tailwind: {
       config: projectInfo.tailwindConfig || "tailwind.config.ts",
@@ -190222,8 +190224,8 @@ function createDefaultConfig(projectInfo) {
     tsx: projectInfo.isTypeScript,
     aliases: {
       components: "@/components",
-      utils: "@/lib/utils",
-      ui: "@/components/ui",
+      utils: "@/lib/happly-ui/happly-ui-utils",
+      ui: "@/components/happly-ui",
       hooks: "@/hooks",
       lib: "@/lib"
     }
@@ -190231,7 +190233,7 @@ function createDefaultConfig(projectInfo) {
 }
 function createConfig(projectInfo, responses) {
   return {
-    $schema: "https://cdn.jsdelivr.net/gh/Mindful-Connect/happly-ui-npm@production/schemas/components.json",
+    $schema: "https://cdn.jsdelivr.net/gh/Mindful-Connect/happly-ui-npm@production/schemas/happly-ui-components.json",
     srcDir: projectInfo.isSrcDir,
     tailwind: {
       config: projectInfo.tailwindConfig || "tailwind.config.ts",
@@ -190270,22 +190272,21 @@ function transformImports(content, config) {
     "@/components/ui": config.aliases.ui,
     "@/components": config.aliases.components,
     "@/lib/utils": config.aliases.utils,
-    "@/lib": config.aliases.lib || "@/lib",
+    "@/lib/happly-ui-utils": config.aliases.utils,
+    "@/lib": (config.aliases.lib || "@/lib") + "/happly-ui",
     "@/hooks": config.aliases.hooks || "@/hooks"
   };
-  let result = content;
-  for (const [from, to] of Object.entries(pathMappings)) {
-    const patterns = [
-      new RegExp(`from ["']${escapeRegex(from)}(/[^"']*)?["']`, "g"),
-      new RegExp(`import ["']${escapeRegex(from)}(/[^"']*)?["']`, "g")
-    ];
-    for (const pattern of patterns) {
-      result = result.replace(pattern, (match) => {
-        return match.replace(from, to);
-      });
+  const keys = Object.keys(pathMappings).sort((a, b) => b.length - a.length);
+  return content.replace(/((?:from|import)\s+["'])([^"']*)(["'])/g, (match, prefix, path6, suffix) => {
+    for (const key of keys) {
+      if (path6 === key || path6.startsWith(key + "/")) {
+        const to = pathMappings[key];
+        const newPath = path6.replace(key, to);
+        return `${prefix}${newPath}${suffix}`;
+      }
     }
-  }
-  return result;
+    return match;
+  });
 }
 function transformToJs(content) {
   content = content.replace(/import\s+type\s*\{[^}]*\}\s*from\s*['"][^'"]+['"];?\n?/g, "");
@@ -190296,9 +190297,6 @@ function transformToJs(content) {
   content = content.replace(/\s+as\s+\w+(\[\])?/g, "");
   return content;
 }
-function escapeRegex(str) {
-  return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
 
 // src/commands/add.ts
 async function add(components, options) {
@@ -190367,7 +190365,12 @@ async function add(components, options) {
   for (const item of items) {
     for (const file of item.files) {
       const fileType = file.type || item.type;
-      const fileName = path6.basename(file.path);
+      let fileName = path6.basename(file.path);
+      if (fileType === "registry:lib") {
+        if (file.path.startsWith("lib/")) {
+          fileName = file.path.substring(4);
+        }
+      }
       const targetPath = getComponentPath(item.name, fileType, config, fileName);
       if (componentExists(cwd, targetPath)) {
         existingFiles.push(targetPath);
@@ -190395,7 +190398,12 @@ async function add(components, options) {
     for (const item of items) {
       for (const file of item.files) {
         const fileType = file.type || item.type;
-        const fileName = path6.basename(file.path);
+        let fileName = path6.basename(file.path);
+        if (fileType === "registry:lib") {
+          if (file.path.startsWith("lib/")) {
+            fileName = file.path.substring(4);
+          }
+        }
         const targetPath = getComponentPath(item.name, fileType, config, fileName);
         const transformedContent = transformComponent(file, config);
         await writeComponentFile(cwd, targetPath, transformedContent);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@happlyui/cli",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "description": "Add HapplyUI components to your project",
   "type": "module",
   "bin": {