ds-01 1.0.2 → 1.0.4

package/dist/commands/add.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add.d.ts","sourceRoot":"","sources":["../../src/commands/add.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAkDpC,eAAO,MAAM,GAAG,SAwGZ,CAAC"}
+{"version":3,"file":"add.d.ts","sourceRoot":"","sources":["../../src/commands/add.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAkDpC,eAAO,MAAM,GAAG,SAqIZ,CAAC"}

package/dist/commands/add.js

@@ -4,7 +4,7 @@ import pc from "picocolors";
 import fs from "fs";
 import path from "path";
 import { execSync } from "child_process";
-import { getToken } from "../utils/config.js";
+import { getToken, getMachineId } from "../utils/config.js";
 const API_BASE_URL = process.env.DS01_API_URL || "https://ds-01.vercel.app";
 // Helper to verify Tailwind exists before doing anything
 function checkTailwindInstallation() {
@@ -49,15 +49,21 @@ export const add = new Command()
         process.exit(1);
     }
     const config = JSON.parse(fs.readFileSync(configPath, "utf-8"));
+    // Read the GLOBAL credentials, not the local project config
     const token = getToken();
+    const machineId = getMachineId();
+    if (!token || !machineId) {
+        cancel(pc.red("You are not authenticated. Run 'npx ds-01 login' first."));
+        process.exit(1);
+    }
     const s = spinner();
     s.start(`Fetching ${pc.cyan(`<${componentName} />`)} from registry...`);
     try {
         // 3. Fetch component from your API
         const response = await fetch(`${API_BASE_URL}/api/registry/${componentName}`, {
             headers: {
-                Authorization: `Bearer ${config.token}`,
-                "X-Machine-ID": config.machineId, // <-- ADD THIS LINE
+                Authorization: `Bearer ${token}`,
+                "X-Machine-ID": machineId, // <-- TypeScript error fixed here
             },
         });
         if (!response.ok) {
@@ -71,10 +77,23 @@ export const add = new Command()
         if (!fs.existsSync(targetDir)) {
             fs.mkdirSync(targetDir, { recursive: true });
         }
+        // 🛠️ EXTRACT NAMES FOR SMART REWRITING (e.g., ["PremiumHero", "Section", "AnimatedText"])
+        // We strip the extension (.tsx, .ts) to get the raw component name for import matching
+        const bundledFileNames = componentData.files.map((file) => file.name.replace(/\.[^/.]+$/, ""));
         // 5. Inject the pure code files
         for (const file of componentData.files) {
+            // Because the server sends just the basename (e.g., PremiumHero.tsx),
+            // path.join inherently flattens all files into the single targetDir folder.
             const filePath = path.join(targetDir, file.name);
-            fs.writeFileSync(filePath, file.content);
+            let content = file.content;
+            // 🛠️ DYNAMIC IMPORT REWRITER
+            bundledFileNames.forEach((fileName) => {
+                // Finds any relative import pointing to a bundled file (e.g., "../Section", "../../Section")
+                // and rewrites it strictly to a sibling import (e.g., "./Section")
+                const regex = new RegExp(`from\\s+["']\\.[^"']*?\\/${fileName}["']`, "g");
+                content = content.replace(regex, `from "./${fileName}"`);
+            });
+            fs.writeFileSync(filePath, content);
         }
         s.stop(pc.green(`Downloaded ${componentData.files.length} files into ${pc.white(`/${config.componentsPath}/${componentName}`)}`));
         // 6. Auto-install Missing Component Dependencies (e.g., framer-motion)
@@ -92,9 +111,11 @@ export const add = new Command()
             }
         }
         // 7. Clean Success Outro
+        // Find the main file to import (prioritize the one that matches the component name or use the first one)
+        const mainFile = bundledFileNames.find((name) => name.toLowerCase() === componentName.toLowerCase()) || bundledFileNames[0];
         outro(`${pc.white("✔")} ${pc.bold(`Component <${componentName} /> is ready!`)}\n` +
             pc.gray(`Import it: `) +
-            pc.cyan(`import { Section } from "@/${config.componentsPath}/${componentName}/Section"`));
+            pc.cyan(`import { ${mainFile} } from "@/${config.componentsPath}/${componentName}/${mainFile}"`));
     }
     catch (error) {
         s.stop(pc.red("An error occurred during injection."));

package/dist/utils/config.d.ts

@@ -1,4 +1,5 @@
 export declare function saveToken(token: string, machineId: string): void;
 export declare function getToken(): string | null;
+export declare function getMachineId(): string | null;
 export declare function deleteToken(): void;
 //# sourceMappingURL=config.d.ts.map

package/dist/utils/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/utils/config.ts"],"names":[],"mappings":"AAQA,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,QAczD;AAED,wBAAgB,QAAQ,IAAI,MAAM,GAAG,IAAI,CAWxC;AAED,wBAAgB,WAAW,SAI1B"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/utils/config.ts"],"names":[],"mappings":"AAQA,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,QAczD;AAED,wBAAgB,QAAQ,IAAI,MAAM,GAAG,IAAI,CAWxC;AAED,wBAAgB,YAAY,IAAI,MAAM,GAAG,IAAI,CAW5C;AAED,wBAAgB,WAAW,SAI1B"}

package/dist/utils/config.js

@@ -30,6 +30,19 @@ export function getToken() {
     }
     return null;
 }
+export function getMachineId() {
+    if (fs.existsSync(credentialsPath)) {
+        try {
+            const data = fs.readFileSync(credentialsPath, "utf-8");
+            const parsed = JSON.parse(data);
+            return parsed.machineId || null;
+        }
+        catch {
+            return null;
+        }
+    }
+    return null;
+}
 export function deleteToken() {
     if (fs.existsSync(credentialsPath)) {
         fs.unlinkSync(credentialsPath);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ds-01",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "Make your site best with DS01",
   "type": "module",
   "bin": {

package/src/commands/add.ts

@@ -4,7 +4,7 @@ import pc from "picocolors";
 import fs from "fs";
 import path from "path";
 import { execSync } from "child_process";
-import { getToken } from "../utils/config.js";
+import { getToken, getMachineId } from "../utils/config.js";
 
 const API_BASE_URL = process.env.DS01_API_URL || "https://ds-01.vercel.app";
 
@@ -17,8 +17,8 @@ function checkTailwindInstallation() {
   if (!fs.existsSync(pkgJsonPath)) {
     cancel(
       pc.red(
-        "No package.json found. Please run this command inside a Node.js project.",
-      ),
+        "No package.json found. Please run this command inside a Node.js project."
+      )
     );
     process.exit(1);
   }
@@ -35,14 +35,14 @@ function checkTailwindInstallation() {
     cancel(
       pc.red("Tailwind CSS is missing from your project dependencies.\n") +
         pc.gray(
-          "DS01 components rely strictly on Tailwind CSS for styling.\n\n",
+          "DS01 components rely strictly on Tailwind CSS for styling.\n\n"
         ) +
         pc.white(
-          "Kindly install it and configure your project, then retry:\n",
+          "Kindly install it and configure your project, then retry:\n"
         ) +
         pc.cyan("  npm install tailwindcss @tailwindcss/postcss postcss\n\n") +
         pc.gray("Official Setup Guide: ") +
-        pc.underline("https://tailwindcss.com/docs/installation"),
+        pc.underline("https://tailwindcss.com/docs/installation")
     );
     process.exit(1);
   }
@@ -57,7 +57,7 @@ export const add = new Command()
 
     // 1. Premium Header
     intro(
-      `${pc.bgWhite(pc.black(pc.bold(" DS01 ")))} ${pc.gray("Adding Component")}`,
+      `${pc.bgWhite(pc.black(pc.bold(" DS01 ")))} ${pc.gray("Adding Component")}`
     );
 
     // 2. Run Pre-Flight Tailwind Check
@@ -72,7 +72,15 @@ export const add = new Command()
     }
 
     const config = JSON.parse(fs.readFileSync(configPath, "utf-8"));
+    
+    // Read the GLOBAL credentials, not the local project config
     const token = getToken();
+    const machineId = getMachineId();
+
+    if (!token || !machineId) {
+      cancel(pc.red("You are not authenticated. Run 'npx ds-01 login' first."));
+      process.exit(1);
+    }
 
     const s = spinner();
     s.start(`Fetching ${pc.cyan(`<${componentName} />`)} from registry...`);
@@ -83,10 +91,10 @@ export const add = new Command()
         `${API_BASE_URL}/api/registry/${componentName}`,
         {
           headers: {
-            Authorization: `Bearer ${config.token}`,
-            "X-Machine-ID": config.machineId, // <-- ADD THIS LINE
+            Authorization: `Bearer ${token}`,
+            "X-Machine-ID": machineId as string, // <-- TypeScript error fixed here
           },
-        },
+        }
       );
 
       if (!response.ok) {
@@ -103,23 +111,41 @@ export const add = new Command()
         fs.mkdirSync(targetDir, { recursive: true });
       }
 
+      // 🛠️ EXTRACT NAMES FOR SMART REWRITING (e.g., ["PremiumHero", "Section", "AnimatedText"])
+      // We strip the extension (.tsx, .ts) to get the raw component name for import matching
+      const bundledFileNames = componentData.files.map((file: any) => 
+        file.name.replace(/\.[^/.]+$/, "") 
+      );
+
       // 5. Inject the pure code files
       for (const file of componentData.files) {
+        // Because the server sends just the basename (e.g., PremiumHero.tsx),
+        // path.join inherently flattens all files into the single targetDir folder.
         const filePath = path.join(targetDir, file.name);
-        fs.writeFileSync(filePath, file.content);
+        let content = file.content;
+
+        // 🛠️ DYNAMIC IMPORT REWRITER
+        bundledFileNames.forEach((fileName: string) => {
+          // Finds any relative import pointing to a bundled file (e.g., "../Section", "../../Section")
+          // and rewrites it strictly to a sibling import (e.g., "./Section")
+          const regex = new RegExp(`from\\s+["']\\.[^"']*?\\/${fileName}["']`, "g");
+          content = content.replace(regex, `from "./${fileName}"`);
+        });
+
+        fs.writeFileSync(filePath, content);
       }
 
       s.stop(
         pc.green(
-          `Downloaded ${componentData.files.length} files into ${pc.white(`/${config.componentsPath}/${componentName}`)}`,
-        ),
+          `Downloaded ${componentData.files.length} files into ${pc.white(`/${config.componentsPath}/${componentName}`)}`
+        )
       );
 
       // 6. Auto-install Missing Component Dependencies (e.g., framer-motion)
       if (componentData.dependencies && componentData.dependencies.length > 0) {
         const depsToInstall = componentData.dependencies.join(" ");
         s.start(
-          `Installing missing dependencies: ${pc.cyan(depsToInstall)}...`,
+          `Installing missing dependencies: ${pc.cyan(depsToInstall)}...`
         );
 
         try {
@@ -127,29 +153,32 @@ export const add = new Command()
           execSync(`npm install ${depsToInstall}`, { stdio: "ignore" });
           s.stop(
             pc.green(
-              `Dependencies installed successfully: ${pc.gray(depsToInstall)}`,
-            ),
+              `Dependencies installed successfully: ${pc.gray(depsToInstall)}`
+            )
           );
         } catch (error) {
           s.stop(pc.red("Failed to auto-install dependencies."));
           note(
             `Please run: ${pc.cyan(`npm install ${depsToInstall}`)} manually.`,
-            "Manual Action Required",
+            "Manual Action Required"
           );
         }
       }
 
       // 7. Clean Success Outro
+      // Find the main file to import (prioritize the one that matches the component name or use the first one)
+      const mainFile = bundledFileNames.find((name: string) => name.toLowerCase() === componentName.toLowerCase()) || bundledFileNames[0];
+      
       outro(
         `${pc.white("✔")} ${pc.bold(`Component <${componentName} /> is ready!`)}\n` +
           pc.gray(`Import it: `) +
           pc.cyan(
-            `import { Section } from "@/${config.componentsPath}/${componentName}/Section"`,
-          ),
+            `import { ${mainFile} } from "@/${config.componentsPath}/${componentName}/${mainFile}"`
+          )
       );
     } catch (error: any) {
       s.stop(pc.red("An error occurred during injection."));
       cancel(pc.gray(error.message || "Unknown CLI Error"));
       process.exit(1);
     }
-  });
+  });

package/src/utils/config.ts

@@ -35,6 +35,19 @@ export function getToken(): string | null {
   return null;
 }
 
+export function getMachineId(): string | null {
+  if (fs.existsSync(credentialsPath)) {
+    try {
+      const data = fs.readFileSync(credentialsPath, "utf-8");
+      const parsed = JSON.parse(data);
+      return parsed.machineId || null;
+    } catch {
+      return null;
+    }
+  }
+  return null;
+}
+
 export function deleteToken() {
   if (fs.existsSync(credentialsPath)) {
     fs.unlinkSync(credentialsPath);