@lazycatcloud/lzc-cli 1.2.27 → 1.2.28

package/lib/app/lpk_create.js

@@ -1,25 +1,27 @@
-import logger from "loglevel";
-import inquirer from "inquirer";
+import logger from "loglevel"
+import inquirer from "inquirer"
 import {
   contextDirname,
   loadFromYaml,
   envTemplateFile,
   ensureDir,
+  ensureDirectoryExists,
   dumpToYaml,
   isFileExist,
-  isValidPackageName,
-} from "../utils.js";
-import path from "node:path";
-import { TemplateConfig } from "./lpk_create_generator.js";
-import fs from "node:fs";
-import yaml from "js-yaml";
-let fsPromises = fs.promises;
+  isValidAppId
+} from "../utils.js"
+import path from "node:path"
+import { TemplateConfig } from "./lpk_create_generator.js"
+import fs from "node:fs"
+import yaml from "js-yaml"
+import chalk from "chalk"
+let fsPromises = fs.promises
 
 export class LpkManifest {
   constructor(defaultAppID) {
-    this.pwd = contextDirname(import.meta.url);
-    this.manifest = {};
-    this.defaultAppID = defaultAppID;
+    this.pwd = contextDirname(import.meta.url)
+    this.manifest = {}
+    this.defaultAppID = defaultAppID
   }
 
   async init(manifestFilePath, askInfo = false) {
@@ -27,138 +29,74 @@ export class LpkManifest {
       manifestFilePath = path.join(
         this.pwd,
         "../../template/_lpk/manifest.yml.in"
-      );
+      )
     }
 
     if (askInfo) {
-      let answer = await this.askLpkInfo();
-      this.manifest = yaml.load(
-        await envTemplateFile(manifestFilePath, answer)
-      );
+      let answer = await this.askLpkInfo()
+      this.manifest = yaml.load(await envTemplateFile(manifestFilePath, answer))
     } else {
-      this.manifest = loadFromYaml(manifestFilePath);
+      this.manifest = loadFromYaml(manifestFilePath)
     }
   }
 
   async create(outputDir) {
-    let outputFilePath = path.join(outputDir, "lzc-manifest.yml");
-    logger.debug(`创建文件 ${outputFilePath}`);
-
-    ensureDir(outputFilePath);
-
-    return fsPromises
-      .access(outputFilePath, fs.constants.F_OK | fs.constants.W_OK)
-      .then(
-        async () => {
-          const questions = [
-            {
-              name: "override",
-              type: "input",
-              default: "n",
-              message: "lzc-manifest.yml已经存在，是否覆盖(y/n): ",
-            },
-          ];
-          const answers = await inquirer.prompt(questions);
-          if (answers.override.toLowerCase() === "y") {
-            return dumpToYaml(this.manifest, outputFilePath);
-          }
-        },
-        () => {
-          return dumpToYaml(this.manifest, outputFilePath);
-        }
-      );
+    let outputFilePath = path.join(outputDir, "lzc-manifest.yml")
+    logger.debug(`创建文件 ${outputFilePath}`)
+    ensureDir(outputFilePath)
+    return dumpToYaml(this.manifest, outputFilePath)
   }
 
   async askLpkInfo() {
-    const noEmpty = (value) => value != "";
-    const smartAppId = `cloud.lazycat.app.${this.defaultAppID}`;
-    const getAppName = (answers) => {
-      const fields = answers["package"].split(".");
-      return fields[fields.length - 1];
-    };
-    return await inquirer.prompt([
+    const { appId } = await inquirer.prompt([
       {
         type: "input",
-        name: "package",
-        message: `请输入应用ID, 如 ${smartAppId}`,
-        default: smartAppId,
+        name: "appId",
+        message: `请输入应用ID, 如(${this.defaultAppID})`,
+        default: this.defaultAppID,
         validate: (input) => {
-          if (isValidPackageName(input)) {
-            return true;
+          if (isValidAppId(input)) {
+            return true
           } else {
-            return `应用ID错误，请输入正确的格式, 如 ${smartAppId}`;
+            // return `请输入 1-63 位的字母、数字或-，且不能以-开头或结尾。`
+            return `请输入 1-63 位的字母、数字。`
           }
-        },
-      },
-      {
-        type: "input",
-        name: "version",
-        message: "请输入应用版本信息",
-        default: "0.0.1",
-        validate: noEmpty,
-      },
-      {
-        type: "input",
-        name: "subdomain",
-        message: "请输入应用子域名",
-        default: getAppName,
-        validate: (input) => {
-          if (!/^([a-z]|[0-9]|[\-])+$/.test(input)) {
-            return "应用名称只能包含(减号，小写字母，数字)，请重新输入";
-          }
-          return true;
-        },
-      },
-      {
-        type: "input",
-        name: "name",
-        message: "请输入应用名称",
-        default: getAppName,
-        validate: noEmpty,
-      },
-      {
-        type: "input",
-        name: "description",
-        message: "应用简单的描述信息",
-      },
-      {
-        type: "input",
-        name: "homepage",
-        message: "应用主页地址",
-      },
-      {
-        type: "input",
-        name: "author",
-        message: "应用作者",
-      },
-    ]);
+        }
+      }
+    ])
+    const answer = {
+      name: appId,
+      package: `cloud.lazycat.app.${appId}`,
+      subdomain: appId
+    }
+    return answer
   }
 }
 
 export class TemplateInit {
   constructor(cwd, name, type) {
-    this.cwd = cwd;
-    this.name = name;
-    this.type = type;
-    this.lpkManifest = new LpkManifest(name);
+    this.cwd = cwd
+    this.name = name
+    this.type = type
+    this.lpkManifest = new LpkManifest(name)
   }
 
   async init() {
     if (!this.type) {
-      this.type = await chooseTemplate();
+      this.type = await chooseTemplate()
     }
 
     // 优先使用模板项目自定义的模板文件
     const typeTemplatePath = path.join(
       contextDirname(import.meta.url),
       `../../template/_lpk/${this.type}.manifest.yml.in`
-    );
-    const templatePath = isFileExist(typeTemplatePath) ? typeTemplatePath : "";
-    await this.lpkManifest.init(templatePath, true);
+    )
+    const templatePath = isFileExist(typeTemplatePath) ? typeTemplatePath : ""
+    await this.lpkManifest.init(templatePath, true)
   }
 
   async create() {
-    await this.lpkManifest.create(path.resolve(this.cwd, this.name));
+    await this.lpkManifest.create(path.resolve(this.cwd, this.name))
   }
 }
 
@@ -169,10 +107,10 @@ export async function chooseTemplate() {
         name: "type",
         message: "选择项目构建模板",
         type: "list",
-        choices: ["lite", "vue3", "vue2", "golang", "ionic_vue3"],
-      },
+        choices: ["vue3"]
+      }
     ])
-  )["type"];
+  )["type"]
 }
 
 // 创建一个应用
@@ -181,50 +119,42 @@ export async function chooseTemplate() {
 // - 调用模板的hook
 class LpkCreate {
   constructor(name, cwd = process.cwd()) {
-    this.name = name;
-    this.cwd = cwd ?? process.cwd();
+    this.name = name
+    this.cwd = cwd ?? process.cwd()
+    this.appDir = path.resolve(this.cwd, this.name)
   }
 
   async init() {
-    ensureDir(path.resolve(this.cwd, this.name, "file"));
-    return this;
+    return this
   }
 
   async exec() {
-    const type = await chooseTemplate();
-    const template = new TemplateInit(this.cwd, this.name, type);
-    await template.init();
-
-    console.log(`初始化项目 ${this.name}`);
-    await TemplateConfig[type].build(path.resolve(this.cwd, this.name));
+    const type = await chooseTemplate()
+    const template = new TemplateInit(this.cwd, this.name, type)
+    await template.init()
+
+    console.log(chalk.green(`✨ 初始化项目 ${this.name}`))
+    const { isExists, renamedFileName } = ensureDirectoryExists(
+      this.appDir,
+      true
+    )
+    if (isExists && renamedFileName) {
+      console.warn(
+        chalk.yellow(
+          `! 检测到相同目录,已自动将旧目录重命名为 ${renamedFileName}`
+        )
+      )
+    }
+    await TemplateConfig[type].build(path.resolve(this.cwd, this.name))
 
-    console.log("初始化懒猫云应用");
-    await TemplateConfig[type].after(this.name, this.cwd);
+    console.log(chalk.green(`✨ 初始化懒猫云应用`))
+    await TemplateConfig[type].after(this.name, this.cwd)
 
-    await template.create();
+    await template.create()
   }
 }
 
 export default async (name, cwd = process.cwd()) => {
-  await fsPromises.access(path.resolve(cwd, name)).then(
-    async () => {
-      const questions = [
-        {
-          name: "override",
-          type: "input",
-          default: "n",
-          message: "项目已存在，是否覆盖(y/n): ",
-        },
-      ];
-      const answers = await inquirer.prompt(questions);
-      if (answers.override.toLowerCase() === "y") {
-        const lpk = await new LpkCreate(name, cwd).init();
-        return await lpk.exec();
-      }
-    },
-    async () => {
-      const lpk = await new LpkCreate(name, cwd).init();
-      return await lpk.exec();
-    }
-  );
-};
+  const lpk = await new LpkCreate(name, cwd).init()
+  return await lpk.exec()
+}

package/lib/app/lpk_create_generator.js

@@ -1,111 +1,108 @@
-import glob from "fast-glob";
-import path from "path";
-import fs from "fs";
-import { isBinaryFileSync } from "isbinaryfile";
-import { contextDirname, isFileExist } from "../utils.js";
-import chalk from "chalk";
-import { spawnSync } from "node:child_process";
-import logger from "loglevel";
+import glob from "fast-glob"
+import path from "path"
+import fs from "fs"
+import { isBinaryFileSync } from "isbinaryfile"
+import { contextDirname, isFileExist } from "../utils.js"
+import chalk from "chalk"
+import { spawnSync } from "node:child_process"
+import logger from "loglevel"
 
-const __dirname = contextDirname(import.meta.url);
+const __dirname = contextDirname(import.meta.url)
 
 async function loadFiles(dirPath, prefix = "") {
-  const templateRoot = path.join(__dirname, "../../template/");
-  const templateDir = path.join(templateRoot, dirPath);
+  const templateRoot = path.join(__dirname, "../../template/")
+  const templateDir = path.join(templateRoot, dirPath)
 
-  const _files = await glob(["**/*"], { cwd: templateDir });
-  let content;
-  let files = {};
+  const _files = await glob(["**/*"], { cwd: templateDir })
+  let content
+  let files = {}
   for (let p of _files) {
-    const sourcePath = path.join(templateDir, p);
+    const sourcePath = path.join(templateDir, p)
 
-    const statInfo = fs.statSync(sourcePath);
-    const mode = statInfo.mode;
+    const statInfo = fs.statSync(sourcePath)
+    const mode = statInfo.mode
     if (isBinaryFileSync(sourcePath)) {
-      content = fs.readFileSync(sourcePath);
+      content = fs.readFileSync(sourcePath)
     } else {
-      content = fs.readFileSync(sourcePath, "utf8");
+      content = fs.readFileSync(sourcePath, "utf8")
     }
     // change _ prefix file into dot file
     if (p.startsWith("_")) {
-      p = p.replace("_", ".");
+      p = p.replace("_", ".")
     }
 
     files[path.join(prefix, p)] = {
       content,
-      mode,
-    };
+      mode
+    }
   }
-  return files;
+  return files
 }
 
 function writeFileTree(target, files) {
   Object.keys(files).forEach((p) => {
-    const filePath = path.join(target, p);
+    const filePath = path.join(target, p)
     if (!fs.existsSync(path.dirname(filePath))) {
-      fs.mkdirSync(path.dirname(filePath), { recursive: true });
+      fs.mkdirSync(path.dirname(filePath), { recursive: true })
     }
-    logger.debug(`创建文件 ${filePath}`);
-    fs.writeFileSync(filePath, files[p].content, { mode: files[p].mode });
-  });
+    logger.debug(`创建文件 ${filePath}`)
+    fs.writeFileSync(filePath, files[p].content, { mode: files[p].mode })
+  })
 }
 
 async function generate(type, to, opts = {}) {
-  const files = await loadFiles(type, opts.prefix);
-  writeFileTree(to, files);
+  const files = await loadFiles(type, opts.prefix)
+  writeFileTree(to, files)
 }
 
 function appendREADME(dir) {
-  const readme = path.resolve(dir, "README.md");
+  const readme = path.resolve(dir, "README.md")
   const readmeTemplate = path.resolve(
     __dirname,
     "../../template/_lpk/README.md"
-  );
+  )
   if (!isFileExist(readme)) {
-    fs.copyFileSync(readmeTemplate, readme);
+    fs.copyFileSync(readmeTemplate, readme)
   } else {
     const contentStream = fs.readFileSync(readmeTemplate, {
-      encoding: "utf-8",
-    });
-    fs.writeFileSync(readme, contentStream, { flag: "a" });
+      encoding: "utf-8"
+    })
+    fs.writeFileSync(readme, contentStream, { flag: "a" })
   }
 }
 
 function vueTemplate(type) {
-  const v = type == "vue3" ? "vue@3" : "vue@2";
+  const v = type == "vue3" ? "vue@3" : "vue@2"
   return {
     build: async (to, option) => {
-      spawnSync("npm", ["init", v, path.basename(to)], { stdio: "inherit" });
+      spawnSync("npm", ["init", v, path.basename(to)], { stdio: "inherit" })
     },
     after: async function (name, cwd) {
       spawnSync("npm", ["install"], {
         cwd: path.resolve(cwd, name),
-        stdio: "inherit",
-      });
+        stdio: "inherit"
+      })
 
       const lzcBuildTemplatePath = path.resolve(
         __dirname,
         `../../template/_lpk/vue.lzc-build.yml.in`
-      );
-      logger.debug("复制", lzcBuildTemplatePath);
-      fs.copyFileSync(
-        lzcBuildTemplatePath,
-        path.resolve(name, "lzc-build.yml")
-      );
+      )
+      logger.debug("复制", lzcBuildTemplatePath)
+      fs.copyFileSync(lzcBuildTemplatePath, path.resolve(name, "lzc-build.yml"))
 
       const iconPngPath = path.resolve(
         __dirname,
         "../../template/_lpk/lazycat.png"
-      );
-      fs.copyFileSync(iconPngPath, path.resolve(name, "lazycat.png"));
+      )
+      fs.copyFileSync(iconPngPath, path.resolve(name, "lazycat.png"))
 
       // 更改默认的端口
-      const packageJson = path.resolve(name, "package.json");
-      const pkgInfo = JSON.parse(fs.readFileSync(packageJson));
-      pkgInfo["scripts"]["dev"] = `vite --port 3000 --host`;
-      fs.writeFileSync(packageJson, JSON.stringify(pkgInfo, null, "  "));
+      const packageJson = path.resolve(name, "package.json")
+      const pkgInfo = JSON.parse(fs.readFileSync(packageJson))
+      pkgInfo["scripts"]["dev"] = `vite --port 3000 --host`
+      fs.writeFileSync(packageJson, JSON.stringify(pkgInfo, null, "  "))
 
-      appendREADME(path.resolve(cwd, name));
+      appendREADME(path.resolve(cwd, name))
 
       console.log(
         chalk.green(
@@ -116,20 +113,50 @@ function vueTemplate(type) {
   ${chalk.yellow(`lzc-cli app install ${name}.lpk`)}
    `.trim()
         )
-      );
-    },
-  };
+      )
+    }
+  }
+}
+
+function appCreateSuccessTip(name) {
+  console.log(
+    chalk.green(
+      `
+✨ 懒猫微服应用已创建成功 !
+✨ 进行下面步骤后即可进入容器开发
+   cd ${name}
+   lzc-cli project devshell
+   `.trim()
+    )
+  )
 }
 
 export const TemplateConfig = {
-  vue3: vueTemplate("vue3"),
+  vue3: {
+    build: async (to, option) => {
+      await generate("vue", to, option)
+    },
+    after: async function (name) {
+      appCreateSuccessTip(name)
+      console.log(
+        chalk.green(
+          `
+⚙️  进入应用容器后执行下面命令:
+   npm install
+   npm run dev
+   `.trim()
+        )
+      )
+    }
+  },
+  // vue3: vueTemplate("vue3"),
   vue2: vueTemplate("vue2"),
   lite: {
     build: async (to, option) => {
-      await generate("lite", to, option);
+      await generate("lite", to, option)
     },
     after: async function (name, cwd) {
-      appendREADME(path.resolve(cwd, name));
+      appendREADME(path.resolve(cwd, name))
 
       console.log(
         chalk.green(
@@ -142,21 +169,21 @@ export const TemplateConfig = {
   ${chalk.yellow(`lzc-cli app install ${name}.lpk`)}
    `.trim()
         )
-      );
-    },
+      )
+    }
   },
   ionic_vue3: {
     build: async (to, option) => {
-      await generate("ionic_vue3", to, option);
+      await generate("ionic_vue3", to, option)
     },
     after: async function (name, cwd) {
-      appendREADME(path.resolve(cwd, name));
+      appendREADME(path.resolve(cwd, name))
 
-      console.log(chalk.green("开始安装依赖"));
+      console.log(chalk.green("开始安装依赖"))
       spawnSync("npm", ["install"], {
         cwd: path.join(cwd, name),
-        stdio: "inherit",
-      });
+        stdio: "inherit"
+      })
 
       console.log(
         chalk.green(
@@ -174,15 +201,15 @@ export const TemplateConfig = {
   ${chalk.yellow(`npm run build_ios`)}
    `.trim()
         )
-      );
-    },
+      )
+    }
   },
   golang: {
     build: async (to, option) => {
-      await generate("golang", to, option);
+      await generate("golang", to, option)
     },
     after: function (name, cwd) {
-      appendREADME(path.resolve(cwd, name));
+      appendREADME(path.resolve(cwd, name))
 
       console.log(
         chalk.green(
@@ -196,7 +223,7 @@ export const TemplateConfig = {
   ${chalk.yellow(`lzc-cli app install ${name}.lpk`)}
 `.trim()
         )
-      );
-    },
-  },
-};
+      )
+    }
+  }
+}