@ng-shangjc/cli 1.0.0 → 1.0.2-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'],
@@ -71,30 +71,24 @@ const COMPONENT_DEPENDENCIES = {
 };
 const COMPONENT_FILES = {
     button: [
-        'button.component.ts',
-        'button.metadata.ts'
+        'button.component.ts'
     ],
     input: [
-        'input.component.ts',
-        'input.metadata.ts'
+        'input.component.ts'
     ],
     card: [
-        'card.component.ts',
-        'card.metadata.ts'
+        'card.component.ts'
     ],
     switch: [
-        'switch.component.ts',
-        'switch.metadata.ts'
+        'switch.component.ts'
     ],
     dialog: [
         'dialog.component.ts',
-        'dialog.service.ts',
-        'dialog.metadata.ts'
+        'dialog.service.ts'
     ],
     tooltip: [
         'tooltip.component.ts',
-        'tooltip.directive.ts',
-        'tooltip.metadata.ts'
+        'tooltip.directive.ts'
     ],
     select: [
         'select.component.ts'
@@ -181,11 +175,18 @@ async function installComponent(componentName, options) {
         if (dependencies.includes('utils')) {
             await installUtils();
         }
+        // Install external dependencies (non-utils)
+        const externalDeps = dependencies.filter(dep => dep !== 'utils');
+        if (externalDeps.length > 0) {
+            await installExternalDependencies(externalDeps, componentName);
+        }
+        // Install the component package itself
+        await installComponentPackage(componentName);
         // Create destination directory
         const destDir = path.join(process.cwd(), componentsPath, componentName);
         await fs.ensureDir(destDir);
-        // Get source directory
-        const sourceDir = path.join(__dirname, '..', '..', '..', 'packages', componentName, 'src', 'lib');
+        // Get source directory from installed npm package
+        const sourceDir = path.join(process.cwd(), 'node_modules', '@ng-shangjc', componentName, 'src', 'lib');
         // Copy component files
         const files = COMPONENT_FILES[componentName];
         for (const file of files) {
@@ -203,22 +204,21 @@ async function installComponent(componentName, options) {
         const indexContent = generateIndexFile(componentName, files, config.componentType);
         await fs.writeFile(path.join(destDir, 'index.ts'), indexContent);
         console.log(`✅ Created index.ts`);
-        // Copy README
-        const readmePath = path.join(__dirname, '..', '..', '..', 'packages', componentName, 'README.md');
-        if (await fs.pathExists(readmePath)) {
-            await fs.copy(readmePath, path.join(destDir, 'README.md'));
-            console.log(`✅ Copied README.md`);
-        }
         // Update configuration
         if (!config.installedComponents.includes(componentName)) {
             config.installedComponents.push(componentName);
             await fs.writeJson(configPath, config, { spaces: 2 });
             console.log(`✅ Updated shangjc.config.json`);
         }
+        // Create/update barrel index.ts in the main ui/shangjc folder
+        await createOrUpdateBarrelIndex(config.componentsPath, config.installedComponents);
         console.log(`🎉 Successfully installed ${componentName} component!`);
         console.log(`\n📁 Files installed to: ${destDir}`);
         console.log(`\n📖 Usage:`);
+        console.log(`// Individual import:`);
         console.log(`import { ${getComponentClassName(componentName)} } from './${componentsPath}/${componentName}';`);
+        console.log(`// Or barrel import (if multiple components):`);
+        console.log(`import { ${getComponentClassName(componentName)} } from './${componentsPath}';`);
     }
     catch (error) {
         console.error('❌ Installation failed:', error);
@@ -232,7 +232,7 @@ async function installUtils() {
         const utilsPath = path.join(process.cwd(), 'node_modules', '@ng-shangjc', 'utils');
         if (!fs.existsSync(utilsPath)) {
             console.log('Installing @ng-shangjc/utils...');
-            (0, child_process_1.execSync)('npm install @ng-shangjc/utils', { stdio: 'inherit' });
+            (0, child_process_1.execSync)('npm install --save-dev @ng-shangjc/utils', { stdio: 'inherit' });
         }
         else {
             console.log('✅ @ng-shangjc/utils already installed');
@@ -243,6 +243,115 @@ 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 {
+        // Check if component is already installed in node_modules
+        const componentPath = path.join(process.cwd(), 'node_modules', '@ng-shangjc', componentName);
+        if (!fs.existsSync(componentPath)) {
+            console.log(`Installing @ng-shangjc/${componentName}...`);
+            (0, child_process_1.execSync)(`npm install --save-dev @ng-shangjc/${componentName}`, { stdio: 'inherit' });
+        }
+        else {
+            console.log(`✅ @ng-shangjc/${componentName} already installed`);
+        }
+    }
+    catch (error) {
+        console.error(`❌ Failed to install ${componentName} package:`, error);
+        console.log(`🔄 Attempting to download files directly...`);
+        // Fallback: try to download files directly from npm registry
+        try {
+            await downloadComponentFiles(componentName);
+            console.log(`✅ Successfully downloaded ${componentName} files directly`);
+        }
+        catch (downloadError) {
+            console.error(`❌ Failed to download ${componentName} files:`, downloadError);
+            throw new Error(`Failed to install ${componentName}: Package installation and direct download both failed`);
+        }
+    }
+}
+async function downloadComponentFiles(componentName) {
+    const https = require('https');
+    const tar = require('tar');
+    return new Promise((resolve, reject) => {
+        const packageUrl = `https://registry.npmjs.org/@ng-shangjc/${componentName}/-/${componentName}-1.0.0.tgz`;
+        const tempDir = path.join(process.cwd(), '.ng-shangjc-temp');
+        // Ensure temp directory exists
+        fs.ensureDirSync(tempDir);
+        const file = fs.createWriteStream(path.join(tempDir, `${componentName}.tgz`));
+        https.get(packageUrl, (response) => {
+            if (response.statusCode !== 200) {
+                reject(new Error(`Failed to download package: ${response.statusCode}`));
+                return;
+            }
+            response.pipe(file);
+            file.on('finish', () => {
+                file.close();
+                // Extract the tarball
+                fs.createReadStream(path.join(tempDir, `${componentName}.tgz`))
+                    .pipe(tar.extract({
+                    cwd: tempDir,
+                    strip: 1 // Remove the package folder
+                }))
+                    .on('finish', () => {
+                    // Copy the extracted files to node_modules structure
+                    const sourceDir = path.join(tempDir, 'src', 'lib');
+                    const targetDir = path.join(process.cwd(), 'node_modules', '@ng-shangjc', componentName, 'src', 'lib');
+                    fs.ensureDirSync(path.dirname(targetDir));
+                    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();
+                })
+                    .on('error', reject);
+            });
+        }).on('error', reject);
+    });
+}
 function generateIndexFile(componentName, files, mode) {
     const exports = files
         .filter(file => file.endsWith('.ts'))
@@ -261,3 +370,24 @@ ${exports}
 function getComponentClassName(componentName) {
     return componentName.charAt(0).toUpperCase() + componentName.slice(1) + 'Component';
 }
+async function createOrUpdateBarrelIndex(componentsPath, installedComponents) {
+    const barrelDir = path.join(process.cwd(), componentsPath);
+    const barrelPath = path.join(barrelDir, 'index.ts');
+    // Ensure the directory exists
+    await fs.ensureDir(barrelDir);
+    // Generate barrel content
+    const exports = installedComponents
+        .sort() // Sort for consistent ordering
+        .map(component => {
+        const className = getComponentClassName(component);
+        return `export { ${className} } from './${component}';`;
+    })
+        .join('\n');
+    const barrelContent = `// Generated by ng-shangjc CLI
+// Barrel exports for all installed components
+
+${exports}
+`;
+    await fs.writeFile(barrelPath, barrelContent);
+    console.log(`✅ Updated barrel index.ts at ${componentsPath}`);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ng-shangjc/cli",
-  "version": "1.0.0",
+  "version": "1.0.2-beta",
   "bin": {
     "ng-shangjc": "./dist/index.js"
   },
@@ -11,7 +11,8 @@
   "dependencies": {
     "commander": "^11.0.0",
     "fs-extra": "^11.0.0",
-    "inquirer": "^9.0.0"
+    "inquirer": "^9.0.0",
+    "tar": "^6.0.0"
   },
   "devDependencies": {
     "@types/fs-extra": "^11.0.0",

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'],
@@ -49,30 +49,24 @@ const COMPONENT_DEPENDENCIES = {
 
 const COMPONENT_FILES = {
   button: [
-    'button.component.ts',
-    'button.metadata.ts'
+    'button.component.ts'
   ],
   input: [
-    'input.component.ts',
-    'input.metadata.ts'
+    'input.component.ts'
   ],
   card: [
-    'card.component.ts',
-    'card.metadata.ts'
+    'card.component.ts'
   ],
   switch: [
-    'switch.component.ts',
-    'switch.metadata.ts'
+    'switch.component.ts'
   ],
   dialog: [
     'dialog.component.ts',
-    'dialog.service.ts',
-    'dialog.metadata.ts'
+    'dialog.service.ts'
   ],
   tooltip: [
     'tooltip.component.ts',
-    'tooltip.directive.ts',
-    'tooltip.metadata.ts'
+    'tooltip.directive.ts'
   ],
   select: [
     'select.component.ts'
@@ -174,12 +168,21 @@ export async function installComponent(
       await installUtils();
     }
 
+    // Install external dependencies (non-utils)
+    const externalDeps = dependencies.filter(dep => dep !== 'utils');
+    if (externalDeps.length > 0) {
+      await installExternalDependencies(externalDeps, componentName);
+    }
+
+    // Install the component package itself
+    await installComponentPackage(componentName);
+
     // Create destination directory
     const destDir = path.join(process.cwd(), componentsPath, componentName);
     await fs.ensureDir(destDir);
 
-    // Get source directory
-    const sourceDir = path.join(__dirname, '..', '..', '..', 'packages', componentName, 'src', 'lib');
+    // Get source directory from installed npm package
+    const sourceDir = path.join(process.cwd(), 'node_modules', '@ng-shangjc', componentName, 'src', 'lib');
     
     // Copy component files
     const files = COMPONENT_FILES[componentName as keyof typeof COMPONENT_FILES];
@@ -201,13 +204,6 @@ export async function installComponent(
     await fs.writeFile(path.join(destDir, 'index.ts'), indexContent);
     console.log(`✅ Created index.ts`);
 
-    // Copy README
-    const readmePath = path.join(__dirname, '..', '..', '..', 'packages', componentName, 'README.md');
-    if (await fs.pathExists(readmePath)) {
-      await fs.copy(readmePath, path.join(destDir, 'README.md'));
-      console.log(`✅ Copied README.md`);
-    }
-
     // Update configuration
     if (!config.installedComponents.includes(componentName)) {
       config.installedComponents.push(componentName);
@@ -215,10 +211,16 @@ export async function installComponent(
       console.log(`✅ Updated shangjc.config.json`);
     }
 
+    // Create/update barrel index.ts in the main ui/shangjc folder
+    await createOrUpdateBarrelIndex(config.componentsPath, config.installedComponents);
+
     console.log(`🎉 Successfully installed ${componentName} component!`);
     console.log(`\n📁 Files installed to: ${destDir}`);
     console.log(`\n📖 Usage:`);
+    console.log(`// Individual import:`);
     console.log(`import { ${getComponentClassName(componentName)} } from './${componentsPath}/${componentName}';`);
+    console.log(`// Or barrel import (if multiple components):`);
+    console.log(`import { ${getComponentClassName(componentName)} } from './${componentsPath}';`);
 
   } catch (error) {
     console.error('❌ Installation failed:', error);
@@ -235,7 +237,7 @@ async function installUtils() {
     
     if (!fs.existsSync(utilsPath)) {
       console.log('Installing @ng-shangjc/utils...');
-      execSync('npm install @ng-shangjc/utils', { stdio: 'inherit' });
+      execSync('npm install --save-dev @ng-shangjc/utils', { stdio: 'inherit' });
     } else {
       console.log('✅ @ng-shangjc/utils already installed');
     }
@@ -245,6 +247,133 @@ 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...`);
+  
+  try {
+    // Check if component is already installed in node_modules
+    const componentPath = path.join(process.cwd(), 'node_modules', '@ng-shangjc', componentName);
+    
+    if (!fs.existsSync(componentPath)) {
+      console.log(`Installing @ng-shangjc/${componentName}...`);
+      execSync(`npm install --save-dev @ng-shangjc/${componentName}`, { stdio: 'inherit' });
+    } else {
+      console.log(`✅ @ng-shangjc/${componentName} already installed`);
+    }
+  } catch (error) {
+    console.error(`❌ Failed to install ${componentName} package:`, error);
+    console.log(`🔄 Attempting to download files directly...`);
+    
+    // Fallback: try to download files directly from npm registry
+    try {
+      await downloadComponentFiles(componentName);
+      console.log(`✅ Successfully downloaded ${componentName} files directly`);
+    } catch (downloadError) {
+      console.error(`❌ Failed to download ${componentName} files:`, downloadError);
+      throw new Error(`Failed to install ${componentName}: Package installation and direct download both failed`);
+    }
+  }
+}
+
+async function downloadComponentFiles(componentName: string) {
+  const https = require('https');
+  const tar = require('tar');
+  
+  return new Promise<void>((resolve, reject) => {
+    const packageUrl = `https://registry.npmjs.org/@ng-shangjc/${componentName}/-/${componentName}-1.0.0.tgz`;
+    const tempDir = path.join(process.cwd(), '.ng-shangjc-temp');
+    
+    // Ensure temp directory exists
+    fs.ensureDirSync(tempDir);
+    
+    const file = fs.createWriteStream(path.join(tempDir, `${componentName}.tgz`));
+    
+    https.get(packageUrl, (response: any) => {
+      if (response.statusCode !== 200) {
+        reject(new Error(`Failed to download package: ${response.statusCode}`));
+        return;
+      }
+      
+      response.pipe(file);
+      
+      file.on('finish', () => {
+        file.close();
+        
+        // Extract the tarball
+        fs.createReadStream(path.join(tempDir, `${componentName}.tgz`))
+          .pipe(tar.extract({
+            cwd: tempDir,
+            strip: 1 // Remove the package folder
+          }))
+          .on('finish', () => {
+            // Copy the extracted files to node_modules structure
+            const sourceDir = path.join(tempDir, 'src', 'lib');
+            const targetDir = path.join(process.cwd(), 'node_modules', '@ng-shangjc', componentName, 'src', 'lib');
+            
+            fs.ensureDirSync(path.dirname(targetDir));
+            
+            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();
+          })
+          .on('error', reject);
+      });
+    }).on('error', reject);
+  });
+}
+
 function generateIndexFile(componentName: string, files: string[], mode: string): string {
   const exports = files
     .filter(file => file.endsWith('.ts'))
@@ -264,4 +393,30 @@ ${exports}
 
 function getComponentClassName(componentName: string): string {
   return componentName.charAt(0).toUpperCase() + componentName.slice(1) + 'Component';
+}
+
+async function createOrUpdateBarrelIndex(componentsPath: string, installedComponents: string[]) {
+  const barrelDir = path.join(process.cwd(), componentsPath);
+  const barrelPath = path.join(barrelDir, 'index.ts');
+  
+  // Ensure the directory exists
+  await fs.ensureDir(barrelDir);
+  
+  // Generate barrel content
+  const exports = installedComponents
+    .sort() // Sort for consistent ordering
+    .map(component => {
+      const className = getComponentClassName(component);
+      return `export { ${className} } from './${component}';`;
+    })
+    .join('\n');
+  
+  const barrelContent = `// Generated by ng-shangjc CLI
+// Barrel exports for all installed components
+
+${exports}
+`;
+  
+  await fs.writeFile(barrelPath, barrelContent);
+  console.log(`✅ Updated barrel index.ts at ${componentsPath}`);
 }