@svton/cli 1.2.3 → 1.2.5

package/dist/index.js

@@ -743,55 +743,65 @@ async function generateEnvExample(features, config, targetPath) {
       return lines.join("\n");
     })
   ].join("\n");
-  await import_fs_extra4.default.writeFile(import_path3.default.join(targetPath, ".env.example"), content);
+  await import_fs_extra4.default.writeFile(import_path3.default.join(targetPath, "apps/backend/.env.example"), content);
   logger.info("Generated .env.example");
 }
-async function copyConfigFiles(features, config, templatePath, targetPath) {
+async function copyConfigFiles(features, config, templateDir, targetPath) {
   for (const featureKey of features) {
     const feature = config.features[featureKey];
     if (feature && feature.configFiles) {
       for (const configFile of feature.configFiles) {
-        const sourcePath = import_path3.default.join(templatePath, configFile.template);
+        const sourcePath = import_path3.default.join(templateDir, configFile.template);
         const destPath = import_path3.default.join(targetPath, configFile.path);
-        await import_fs_extra4.default.ensureDir(import_path3.default.dirname(destPath));
-        await import_fs_extra4.default.copy(sourcePath, destPath);
-        logger.info(`Copied config: ${configFile.path}`);
+        if (await import_fs_extra4.default.pathExists(sourcePath)) {
+          await import_fs_extra4.default.ensureDir(import_path3.default.dirname(destPath));
+          await import_fs_extra4.default.copy(sourcePath, destPath);
+          logger.info(`Copied config: ${configFile.path}`);
+        } else {
+          logger.warn(`Config template not found: ${sourcePath}`);
+        }
       }
     }
   }
 }
-async function copyExampleFiles(features, config, templatePath, targetPath) {
+async function copyExampleFiles(features, config, templateDir, targetPath) {
   for (const featureKey of features) {
     const feature = config.features[featureKey];
     if (feature && feature.exampleFiles) {
-      const sourcePath = import_path3.default.join(templatePath, feature.exampleFiles.source);
+      const sourcePath = import_path3.default.join(templateDir, feature.exampleFiles.source);
       const destPath = import_path3.default.join(targetPath, feature.exampleFiles.target);
       if (await import_fs_extra4.default.pathExists(sourcePath)) {
         await import_fs_extra4.default.ensureDir(import_path3.default.dirname(destPath));
         await import_fs_extra4.default.copy(sourcePath, destPath);
         logger.info(`Copied examples: ${feature.exampleFiles.target}`);
+      } else {
+        logger.warn(`Example template not found: ${sourcePath}`);
       }
     }
   }
 }
-async function copySkillFiles(features, config, templatePath, targetPath) {
+async function copySkillFiles(features, config, templateDir, targetPath) {
   const skillsDir = import_path3.default.join(targetPath, ".kiro/skills");
   await import_fs_extra4.default.ensureDir(skillsDir);
-  const baseSkillSource = import_path3.default.join(templatePath, "skills/base.skill.md");
+  const baseSkillSource = import_path3.default.join(templateDir, "skills/base.skill.md");
   const baseSkillDest = import_path3.default.join(skillsDir, "project-capabilities.md");
   if (await import_fs_extra4.default.pathExists(baseSkillSource)) {
     await import_fs_extra4.default.copy(baseSkillSource, baseSkillDest);
     logger.info("Copied base skill file");
+  } else {
+    logger.warn(`Base skill template not found: ${baseSkillSource}`);
   }
   for (const featureKey of features) {
     const feature = config.features[featureKey];
     if (feature && feature.skillFile) {
-      const sourcePath = import_path3.default.join(templatePath, feature.skillFile.template);
+      const sourcePath = import_path3.default.join(templateDir, feature.skillFile.template);
       const destPath = import_path3.default.join(targetPath, feature.skillFile.target);
       if (await import_fs_extra4.default.pathExists(sourcePath)) {
         await import_fs_extra4.default.ensureDir(import_path3.default.dirname(destPath));
         await import_fs_extra4.default.copy(sourcePath, destPath);
         logger.info(`Copied skill: ${feature.skillFile.target}`);
+      } else {
+        logger.warn(`Skill template not found: ${sourcePath}`);
       }
     }
   }
@@ -824,7 +834,7 @@ ${featuresList}
 \u5F53\u4F60\u9700\u8981\u4F7F\u7528\u67D0\u4E2A\u529F\u80FD\u65F6\uFF0C\u53EF\u4EE5\uFF1A
 
 1. \u67E5\u770B\u5BF9\u5E94\u7684 skill \u6587\u6863\u4E86\u89E3 API \u548C\u6700\u4F73\u5B9E\u8DF5
-2. \u53C2\u8003 \`src/examples/\` \u76EE\u5F55\u4E0B\u7684\u793A\u4F8B\u4EE3\u7801
+2. \u53C2\u8003 \`apps/backend/src/examples/\` \u76EE\u5F55\u4E0B\u7684\u793A\u4F8B\u4EE3\u7801
 3. \u67E5\u770B\u5B98\u65B9\u6587\u6863\u83B7\u53D6\u66F4\u591A\u4FE1\u606F
 
 ## \u6587\u6863\u8D44\u6E90
@@ -837,7 +847,7 @@ ${featuresList}
   logger.info("Generated capabilities index");
 }
 async function updatePackageJson(features, config, targetPath) {
-  const packageJsonPath = import_path3.default.join(targetPath, "package.json");
+  const packageJsonPath = import_path3.default.join(targetPath, "apps/backend/package.json");
   const packageJson = await import_fs_extra4.default.readJSON(packageJsonPath);
   const dependencies = collectDependencies(features, config);
   packageJson.dependencies = {
@@ -874,7 +884,7 @@ function generateModuleRegistrations(features, config) {
   return registrations.join("\n");
 }
 async function updateAppModule(features, config, targetPath) {
-  const appModulePath = import_path3.default.join(targetPath, "src/app.module.ts");
+  const appModulePath = import_path3.default.join(targetPath, "apps/backend/src/app.module.ts");
   if (!await import_fs_extra4.default.pathExists(appModulePath)) {
     logger.warn("app.module.ts not found, skipping module injection");
     return;
@@ -1041,8 +1051,26 @@ async function createProject(projectName, options = {}) {
     process.exit(1);
   }
 }
+async function getTemplateDirectory() {
+  const cliPackageRoot = import_path4.default.dirname(__dirname);
+  const frameworkRoot = import_path4.default.dirname(import_path4.default.dirname(cliPackageRoot));
+  const localTemplateDir = import_path4.default.join(frameworkRoot, "templates");
+  if (await import_fs_extra5.default.pathExists(localTemplateDir)) {
+    logger.debug(`Using local template directory: ${localTemplateDir}`);
+    return localTemplateDir;
+  }
+  logger.debug("Downloading templates from GitHub for feature integration...");
+  try {
+    const templateDir = await downloadTemplateFromGitHub();
+    logger.debug("Templates downloaded successfully");
+    return templateDir;
+  } catch (error) {
+    throw new Error(`Failed to download templates from GitHub: ${error}`);
+  }
+}
 async function createProjectFromTemplate(config) {
   const spinner = (0, import_ora.default)("Creating project...").start();
+  let templateDirToCleanup = null;
   try {
     await import_fs_extra5.default.ensureDir(config.projectPath);
     process.chdir(config.projectPath);
@@ -1051,11 +1079,17 @@ async function createProjectFromTemplate(config) {
     if (config.features.length > 0) {
       spinner.text = "Integrating selected features...";
       const featuresConfig = await loadFeaturesConfig();
-      const templatePath = import_path4.default.join(__dirname, "../../../templates");
+      const templateDir = await getTemplateDirectory();
+      const cliPackageRoot = import_path4.default.dirname(__dirname);
+      const frameworkRoot = import_path4.default.dirname(import_path4.default.dirname(cliPackageRoot));
+      const localTemplateDir = import_path4.default.join(frameworkRoot, "templates");
+      if (templateDir !== localTemplateDir) {
+        templateDirToCleanup = templateDir;
+      }
       await updatePackageJson(config.features, featuresConfig, config.projectPath);
-      await copyConfigFiles(config.features, featuresConfig, templatePath, config.projectPath);
-      await copyExampleFiles(config.features, featuresConfig, templatePath, config.projectPath);
-      await copySkillFiles(config.features, featuresConfig, templatePath, config.projectPath);
+      await copyConfigFiles(config.features, featuresConfig, templateDir, config.projectPath);
+      await copyExampleFiles(config.features, featuresConfig, templateDir, config.projectPath);
+      await copySkillFiles(config.features, featuresConfig, templateDir, config.projectPath);
       await generateEnvExample(config.features, featuresConfig, config.projectPath);
       if (config.template === "backend-only" || config.template === "full-stack") {
         await updateAppModule(config.features, featuresConfig, config.projectPath);
@@ -1073,11 +1107,15 @@ async function createProjectFromTemplate(config) {
   } catch (error) {
     spinner.fail("Failed to create project");
     throw error;
+  } finally {
+    if (templateDirToCleanup) {
+      await cleanupTemplateDir(templateDirToCleanup);
+    }
   }
 }
 
 // package.json
-var version = "1.2.3";
+var version = "1.2.5";
 
 // src/index.ts
 async function cli() {

package/dist/index.mjs

@@ -716,55 +716,65 @@ async function generateEnvExample(features, config, targetPath) {
       return lines.join("\n");
     })
   ].join("\n");
-  await fs4.writeFile(path3.join(targetPath, ".env.example"), content);
+  await fs4.writeFile(path3.join(targetPath, "apps/backend/.env.example"), content);
   logger.info("Generated .env.example");
 }
-async function copyConfigFiles(features, config, templatePath, targetPath) {
+async function copyConfigFiles(features, config, templateDir, targetPath) {
   for (const featureKey of features) {
     const feature = config.features[featureKey];
     if (feature && feature.configFiles) {
       for (const configFile of feature.configFiles) {
-        const sourcePath = path3.join(templatePath, configFile.template);
+        const sourcePath = path3.join(templateDir, configFile.template);
         const destPath = path3.join(targetPath, configFile.path);
-        await fs4.ensureDir(path3.dirname(destPath));
-        await fs4.copy(sourcePath, destPath);
-        logger.info(`Copied config: ${configFile.path}`);
+        if (await fs4.pathExists(sourcePath)) {
+          await fs4.ensureDir(path3.dirname(destPath));
+          await fs4.copy(sourcePath, destPath);
+          logger.info(`Copied config: ${configFile.path}`);
+        } else {
+          logger.warn(`Config template not found: ${sourcePath}`);
+        }
       }
     }
   }
 }
-async function copyExampleFiles(features, config, templatePath, targetPath) {
+async function copyExampleFiles(features, config, templateDir, targetPath) {
   for (const featureKey of features) {
     const feature = config.features[featureKey];
     if (feature && feature.exampleFiles) {
-      const sourcePath = path3.join(templatePath, feature.exampleFiles.source);
+      const sourcePath = path3.join(templateDir, feature.exampleFiles.source);
       const destPath = path3.join(targetPath, feature.exampleFiles.target);
       if (await fs4.pathExists(sourcePath)) {
         await fs4.ensureDir(path3.dirname(destPath));
         await fs4.copy(sourcePath, destPath);
         logger.info(`Copied examples: ${feature.exampleFiles.target}`);
+      } else {
+        logger.warn(`Example template not found: ${sourcePath}`);
       }
     }
   }
 }
-async function copySkillFiles(features, config, templatePath, targetPath) {
+async function copySkillFiles(features, config, templateDir, targetPath) {
   const skillsDir = path3.join(targetPath, ".kiro/skills");
   await fs4.ensureDir(skillsDir);
-  const baseSkillSource = path3.join(templatePath, "skills/base.skill.md");
+  const baseSkillSource = path3.join(templateDir, "skills/base.skill.md");
   const baseSkillDest = path3.join(skillsDir, "project-capabilities.md");
   if (await fs4.pathExists(baseSkillSource)) {
     await fs4.copy(baseSkillSource, baseSkillDest);
     logger.info("Copied base skill file");
+  } else {
+    logger.warn(`Base skill template not found: ${baseSkillSource}`);
   }
   for (const featureKey of features) {
     const feature = config.features[featureKey];
     if (feature && feature.skillFile) {
-      const sourcePath = path3.join(templatePath, feature.skillFile.template);
+      const sourcePath = path3.join(templateDir, feature.skillFile.template);
       const destPath = path3.join(targetPath, feature.skillFile.target);
       if (await fs4.pathExists(sourcePath)) {
         await fs4.ensureDir(path3.dirname(destPath));
         await fs4.copy(sourcePath, destPath);
         logger.info(`Copied skill: ${feature.skillFile.target}`);
+      } else {
+        logger.warn(`Skill template not found: ${sourcePath}`);
       }
     }
   }
@@ -797,7 +807,7 @@ ${featuresList}
 \u5F53\u4F60\u9700\u8981\u4F7F\u7528\u67D0\u4E2A\u529F\u80FD\u65F6\uFF0C\u53EF\u4EE5\uFF1A
 
 1. \u67E5\u770B\u5BF9\u5E94\u7684 skill \u6587\u6863\u4E86\u89E3 API \u548C\u6700\u4F73\u5B9E\u8DF5
-2. \u53C2\u8003 \`src/examples/\` \u76EE\u5F55\u4E0B\u7684\u793A\u4F8B\u4EE3\u7801
+2. \u53C2\u8003 \`apps/backend/src/examples/\` \u76EE\u5F55\u4E0B\u7684\u793A\u4F8B\u4EE3\u7801
 3. \u67E5\u770B\u5B98\u65B9\u6587\u6863\u83B7\u53D6\u66F4\u591A\u4FE1\u606F
 
 ## \u6587\u6863\u8D44\u6E90
@@ -810,7 +820,7 @@ ${featuresList}
   logger.info("Generated capabilities index");
 }
 async function updatePackageJson(features, config, targetPath) {
-  const packageJsonPath = path3.join(targetPath, "package.json");
+  const packageJsonPath = path3.join(targetPath, "apps/backend/package.json");
   const packageJson = await fs4.readJSON(packageJsonPath);
   const dependencies = collectDependencies(features, config);
   packageJson.dependencies = {
@@ -847,7 +857,7 @@ function generateModuleRegistrations(features, config) {
   return registrations.join("\n");
 }
 async function updateAppModule(features, config, targetPath) {
-  const appModulePath = path3.join(targetPath, "src/app.module.ts");
+  const appModulePath = path3.join(targetPath, "apps/backend/src/app.module.ts");
   if (!await fs4.pathExists(appModulePath)) {
     logger.warn("app.module.ts not found, skipping module injection");
     return;
@@ -1014,8 +1024,26 @@ async function createProject(projectName, options = {}) {
     process.exit(1);
   }
 }
+async function getTemplateDirectory() {
+  const cliPackageRoot = path4.dirname(__dirname);
+  const frameworkRoot = path4.dirname(path4.dirname(cliPackageRoot));
+  const localTemplateDir = path4.join(frameworkRoot, "templates");
+  if (await fs5.pathExists(localTemplateDir)) {
+    logger.debug(`Using local template directory: ${localTemplateDir}`);
+    return localTemplateDir;
+  }
+  logger.debug("Downloading templates from GitHub for feature integration...");
+  try {
+    const templateDir = await downloadTemplateFromGitHub();
+    logger.debug("Templates downloaded successfully");
+    return templateDir;
+  } catch (error) {
+    throw new Error(`Failed to download templates from GitHub: ${error}`);
+  }
+}
 async function createProjectFromTemplate(config) {
   const spinner = ora("Creating project...").start();
+  let templateDirToCleanup = null;
   try {
     await fs5.ensureDir(config.projectPath);
     process.chdir(config.projectPath);
@@ -1024,11 +1052,17 @@ async function createProjectFromTemplate(config) {
     if (config.features.length > 0) {
       spinner.text = "Integrating selected features...";
       const featuresConfig = await loadFeaturesConfig();
-      const templatePath = path4.join(__dirname, "../../../templates");
+      const templateDir = await getTemplateDirectory();
+      const cliPackageRoot = path4.dirname(__dirname);
+      const frameworkRoot = path4.dirname(path4.dirname(cliPackageRoot));
+      const localTemplateDir = path4.join(frameworkRoot, "templates");
+      if (templateDir !== localTemplateDir) {
+        templateDirToCleanup = templateDir;
+      }
       await updatePackageJson(config.features, featuresConfig, config.projectPath);
-      await copyConfigFiles(config.features, featuresConfig, templatePath, config.projectPath);
-      await copyExampleFiles(config.features, featuresConfig, templatePath, config.projectPath);
-      await copySkillFiles(config.features, featuresConfig, templatePath, config.projectPath);
+      await copyConfigFiles(config.features, featuresConfig, templateDir, config.projectPath);
+      await copyExampleFiles(config.features, featuresConfig, templateDir, config.projectPath);
+      await copySkillFiles(config.features, featuresConfig, templateDir, config.projectPath);
       await generateEnvExample(config.features, featuresConfig, config.projectPath);
       if (config.template === "backend-only" || config.template === "full-stack") {
         await updateAppModule(config.features, featuresConfig, config.projectPath);
@@ -1046,11 +1080,15 @@ async function createProjectFromTemplate(config) {
   } catch (error) {
     spinner.fail("Failed to create project");
     throw error;
+  } finally {
+    if (templateDirToCleanup) {
+      await cleanupTemplateDir(templateDirToCleanup);
+    }
   }
 }
 
 // package.json
-var version = "1.2.3";
+var version = "1.2.5";
 
 // src/index.ts
 async function cli() {

package/features.json

@@ -17,7 +17,7 @@
       ],
       "configFiles": [
         {
-          "path": "src/config/cache.config.ts",
+          "path": "apps/backend/src/config/cache.config.ts",
           "template": "configs/cache.config.ts"
         }
       ],
@@ -34,7 +34,7 @@
       },
       "exampleFiles": {
         "source": "examples/cache",
-        "target": "src/examples/cache",
+        "target": "apps/backend/src/examples/cache",
         "description": "缓存装饰器使用示例"
       },
       "skillFile": {
@@ -58,7 +58,7 @@
       ],
       "configFiles": [
         {
-          "path": "src/config/queue.config.ts",
+          "path": "apps/backend/src/config/queue.config.ts",
           "template": "configs/queue.config.ts"
         }
       ],
@@ -75,7 +75,7 @@
       },
       "exampleFiles": {
         "source": "examples/queue",
-        "target": "src/examples/queue",
+        "target": "apps/backend/src/examples/queue",
         "description": "队列任务处理示例"
       },
       "skillFile": {
@@ -104,7 +104,7 @@
       ],
       "configFiles": [
         {
-          "path": "src/config/payment.config.ts",
+          "path": "apps/backend/src/config/payment.config.ts",
           "template": "configs/payment.config.ts"
         }
       ],
@@ -121,7 +121,7 @@
       },
       "exampleFiles": {
         "source": "examples/payment",
-        "target": "src/examples/payment",
+        "target": "apps/backend/src/examples/payment",
         "description": "支付功能示例（微信/支付宝）"
       },
       "skillFile": {
@@ -146,7 +146,7 @@
       ],
       "configFiles": [
         {
-          "path": "src/config/oauth.config.ts",
+          "path": "apps/backend/src/config/oauth.config.ts",
           "template": "configs/oauth.config.ts"
         }
       ],
@@ -163,7 +163,7 @@
       },
       "exampleFiles": {
         "source": "examples/oauth",
-        "target": "src/examples/oauth",
+        "target": "apps/backend/src/examples/oauth",
         "description": "OAuth 登录示例"
       },
       "skillFile": {
@@ -188,7 +188,7 @@
       ],
       "configFiles": [
         {
-          "path": "src/config/sms.config.ts",
+          "path": "apps/backend/src/config/sms.config.ts",
           "template": "configs/sms.config.ts"
         }
       ],
@@ -205,7 +205,7 @@
       },
       "exampleFiles": {
         "source": "examples/sms",
-        "target": "src/examples/sms",
+        "target": "apps/backend/src/examples/sms",
         "description": "短信发送示例"
       },
       "skillFile": {
@@ -232,7 +232,7 @@
       ],
       "configFiles": [
         {
-          "path": "src/config/storage.config.ts",
+          "path": "apps/backend/src/config/storage.config.ts",
           "template": "configs/storage.config.ts"
         }
       ],
@@ -249,7 +249,7 @@
       },
       "exampleFiles": {
         "source": "examples/storage",
-        "target": "src/examples/storage",
+        "target": "apps/backend/src/examples/storage",
         "description": "文件上传示例"
       },
       "skillFile": {
@@ -273,7 +273,7 @@
       ],
       "configFiles": [
         {
-          "path": "src/config/rate-limit.config.ts",
+          "path": "apps/backend/src/config/rate-limit.config.ts",
           "template": "configs/rate-limit.config.ts"
         }
       ],
@@ -290,7 +290,7 @@
       },
       "exampleFiles": {
         "source": "examples/rate-limit",
-        "target": "src/examples/rate-limit",
+        "target": "apps/backend/src/examples/rate-limit",
         "description": "限流使用示例"
       },
       "skillFile": {
@@ -310,7 +310,7 @@
       "envVars": [],
       "configFiles": [
         {
-          "path": "src/config/authz.config.ts",
+          "path": "apps/backend/src/config/authz.config.ts",
           "template": "configs/authz.config.ts"
         }
       ],
@@ -327,7 +327,7 @@
       },
       "exampleFiles": {
         "source": "examples/authz",
-        "target": "src/examples/authz",
+        "target": "apps/backend/src/examples/authz",
         "description": "权限控制示例"
       },
       "skillFile": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@svton/cli",
-  "version": "1.2.3",
+  "version": "1.2.5",
   "description": "Svton CLI - Create full-stack applications with NestJS, Next.js, and Taro",
   "keywords": [
     "cli",