@ng-shangjc/cli 1.0.1-beta → 1.0.3-beta

package/dist/commands/install.js

@@ -56,7 +56,7 @@ const AVAILABLE_COMPONENTS = [
     'alert'
 ];
 const COMPONENT_DEPENDENCIES = {
-    button: ['utils'],
+    button: ['utils', 'class-variance-authority'],
     input: ['utils'],
     card: ['utils'],
     switch: ['utils'],
@@ -171,12 +171,17 @@ async function installComponent(componentName, options) {
         return;
     }
     try {
-        // Install dependencies first
+        // Install the component package itself first
+        await installComponentPackage(componentName);
+        // Install dependencies after component package is available
         if (dependencies.includes('utils')) {
             await installUtils();
         }
-        // Install the component package itself
-        await installComponentPackage(componentName);
+        // Install external dependencies (non-utils)
+        const externalDeps = dependencies.filter(dep => dep !== 'utils');
+        if (externalDeps.length > 0) {
+            await installExternalDependencies(externalDeps, componentName);
+        }
         // Create destination directory
         const destDir = path.join(process.cwd(), componentsPath, componentName);
         await fs.ensureDir(destDir);
@@ -238,6 +243,42 @@ async function installUtils() {
         throw error;
     }
 }
+async function installExternalDependencies(dependencies, componentName) {
+    // Read the component's package.json to get exact versions
+    const componentPackagePath = path.join(process.cwd(), 'node_modules', '@ng-shangjc', componentName, 'package.json');
+    let componentPackage;
+    try {
+        componentPackage = await fs.readJson(componentPackagePath);
+    }
+    catch (error) {
+        console.error(`❌ Failed to read component package.json:`, error);
+        throw error;
+    }
+    for (const dependency of dependencies) {
+        console.log(`📦 Installing ${dependency} dependency...`);
+        try {
+            // Get the exact version from component's peerDependencies or dependencies
+            const version = componentPackage.peerDependencies?.[dependency] || componentPackage.dependencies?.[dependency];
+            if (!version) {
+                console.warn(`⚠️  Could not find version for ${dependency} in component package.json, installing latest...`);
+            }
+            // Check if dependency is already installed in node_modules
+            const depPath = path.join(process.cwd(), 'node_modules', dependency);
+            if (!fs.existsSync(depPath)) {
+                const installSpec = version ? `${dependency}@${version}` : dependency;
+                console.log(`Installing ${installSpec}...`);
+                (0, child_process_1.execSync)(`npm install ${installSpec}`, { stdio: 'inherit' });
+            }
+            else {
+                console.log(`✅ ${dependency} already installed`);
+            }
+        }
+        catch (error) {
+            console.error(`❌ Failed to install ${dependency}:`, error);
+            throw error;
+        }
+    }
+}
 async function installComponentPackage(componentName) {
     console.log(`📦 Installing ${componentName} package...`);
     try {
@@ -296,6 +337,12 @@ async function downloadComponentFiles(componentName) {
                     if (fs.existsSync(sourceDir)) {
                         fs.copySync(sourceDir, targetDir);
                     }
+                    // Copy package.json to node_modules structure
+                    const packageSource = path.join(tempDir, 'package.json');
+                    const packageTarget = path.join(process.cwd(), 'node_modules', '@ng-shangjc', componentName, 'package.json');
+                    if (fs.existsSync(packageSource)) {
+                        fs.copySync(packageSource, packageTarget);
+                    }
                     // Clean up temp files
                     fs.removeSync(tempDir);
                     resolve();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ng-shangjc/cli",
-  "version": "1.0.1-beta",
+  "version": "1.0.3-beta",
   "bin": {
     "ng-shangjc": "./dist/index.js"
   },

package/src/commands/install.ts

@@ -33,7 +33,7 @@ const AVAILABLE_COMPONENTS = [
 ];
 
 const COMPONENT_DEPENDENCIES = {
-  button: ['utils'],
+  button: ['utils', 'class-variance-authority'],
   input: ['utils'],
   card: ['utils'],
   switch: ['utils'],
@@ -163,13 +163,19 @@ export async function installComponent(
   }
 
   try {
-    // Install dependencies first
+    // Install the component package itself first
+    await installComponentPackage(componentName);
+
+    // Install dependencies after component package is available
     if (dependencies.includes('utils')) {
       await installUtils();
     }
 
-    // Install the component package itself
-    await installComponentPackage(componentName);
+    // Install external dependencies (non-utils)
+    const externalDeps = dependencies.filter(dep => dep !== 'utils');
+    if (externalDeps.length > 0) {
+      await installExternalDependencies(externalDeps, componentName);
+    }
 
     // Create destination directory
     const destDir = path.join(process.cwd(), componentsPath, componentName);
@@ -241,6 +247,45 @@ async function installUtils() {
   }
 }
 
+async function installExternalDependencies(dependencies: string[], componentName: string) {
+  // Read the component's package.json to get exact versions
+  const componentPackagePath = path.join(process.cwd(), 'node_modules', '@ng-shangjc', componentName, 'package.json');
+  let componentPackage: any;
+  
+  try {
+    componentPackage = await fs.readJson(componentPackagePath);
+  } catch (error) {
+    console.error(`❌ Failed to read component package.json:`, error);
+    throw error;
+  }
+  
+  for (const dependency of dependencies) {
+    console.log(`📦 Installing ${dependency} dependency...`);
+    
+    try {
+      // Get the exact version from component's peerDependencies or dependencies
+      const version = componentPackage.peerDependencies?.[dependency] || componentPackage.dependencies?.[dependency];
+      if (!version) {
+        console.warn(`⚠️  Could not find version for ${dependency} in component package.json, installing latest...`);
+      }
+      
+      // Check if dependency is already installed in node_modules
+      const depPath = path.join(process.cwd(), 'node_modules', dependency);
+      
+      if (!fs.existsSync(depPath)) {
+        const installSpec = version ? `${dependency}@${version}` : dependency;
+        console.log(`Installing ${installSpec}...`);
+        execSync(`npm install ${installSpec}`, { stdio: 'inherit' });
+      } else {
+        console.log(`✅ ${dependency} already installed`);
+      }
+    } catch (error) {
+      console.error(`❌ Failed to install ${dependency}:`, error);
+      throw error;
+    }
+  }
+}
+
 async function installComponentPackage(componentName: string) {
   console.log(`📦 Installing ${componentName} package...`);
   
@@ -310,6 +355,14 @@ async function downloadComponentFiles(componentName: string) {
               fs.copySync(sourceDir, targetDir);
             }
             
+            // Copy package.json to node_modules structure
+            const packageSource = path.join(tempDir, 'package.json');
+            const packageTarget = path.join(process.cwd(), 'node_modules', '@ng-shangjc', componentName, 'package.json');
+            
+            if (fs.existsSync(packageSource)) {
+              fs.copySync(packageSource, packageTarget);
+            }
+            
             // Clean up temp files
             fs.removeSync(tempDir);