@ng-shangjc/cli 1.0.2-beta → 1.0.4-beta

package/dist/commands/install.js

@@ -171,7 +171,9 @@ 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();
         }
@@ -180,13 +182,15 @@ async function installComponent(componentName, options) {
         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 from installed npm package
         const sourceDir = path.join(process.cwd(), 'node_modules', '@ng-shangjc', componentName, 'src', 'lib');
+        // Check if source files exist (they should after download fallback)
+        if (!fs.existsSync(sourceDir)) {
+            throw new Error(`Component source files not found at ${sourceDir}. Installation may have failed.`);
+        }
         // Copy component files
         const files = COMPONENT_FILES[componentName];
         for (const file of files) {
@@ -341,7 +345,12 @@ async function downloadComponentFiles(componentName) {
                     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);
+                        let packageJson = fs.readJsonSync(packageSource);
+                        // Fix workspace:* dependencies for published packages
+                        if (packageJson.peerDependencies && packageJson.peerDependencies['@ng-shangjc/utils'] === 'workspace:*') {
+                            packageJson.peerDependencies['@ng-shangjc/utils'] = '^0.0.1';
+                        }
+                        fs.writeJsonSync(packageTarget, packageJson);
                     }
                     // Clean up temp files
                     fs.removeSync(tempDir);

package/package.json

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

package/src/commands/install.ts

@@ -163,7 +163,10 @@ 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();
     }
@@ -174,9 +177,6 @@ export async function installComponent(
       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);
@@ -184,6 +184,11 @@ export async function installComponent(
     // Get source directory from installed npm package
     const sourceDir = path.join(process.cwd(), 'node_modules', '@ng-shangjc', componentName, 'src', 'lib');
     
+    // Check if source files exist (they should after download fallback)
+    if (!fs.existsSync(sourceDir)) {
+      throw new Error(`Component source files not found at ${sourceDir}. Installation may have failed.`);
+    }
+    
     // Copy component files
     const files = COMPONENT_FILES[componentName as keyof typeof COMPONENT_FILES];
     
@@ -360,7 +365,14 @@ async function downloadComponentFiles(componentName: string) {
             const packageTarget = path.join(process.cwd(), 'node_modules', '@ng-shangjc', componentName, 'package.json');
             
             if (fs.existsSync(packageSource)) {
-              fs.copySync(packageSource, packageTarget);
+              let packageJson = fs.readJsonSync(packageSource);
+              
+              // Fix workspace:* dependencies for published packages
+              if (packageJson.peerDependencies && packageJson.peerDependencies['@ng-shangjc/utils'] === 'workspace:*') {
+                packageJson.peerDependencies['@ng-shangjc/utils'] = '^0.0.1';
+              }
+              
+              fs.writeJsonSync(packageTarget, packageJson);
             }
             
             // Clean up temp files