@lazycatcloud/lzc-cli 1.3.11 → 1.3.13

package/lib/app/lpk_create.js

@@ -1,129 +1,110 @@
-import logger from "loglevel"
-import inquirer from "inquirer"
-import {
-  contextDirname,
-  loadFromYaml,
-  envTemplateFile,
-  ensureDir,
-  ensureDirectoryExists,
-  dumpToYaml,
-  isFileExist,
-  isValidAppId,
-  fakeLoadManifestYml
-} 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
+import logger from 'loglevel';
+import inquirer from 'inquirer';
+import { contextDirname, loadFromYaml, envTemplateFile, ensureDir, ensureDirectoryExists, dumpToYaml, isFileExist, isValidAppId, fakeLoadManifestYml } 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';
+import { t } from '../i18n/index.js';
+
+let fsPromises = fs.promises;
 
 export class LpkManifest {
-  constructor(defaultAppID) {
-    this.pwd = contextDirname(import.meta.url)
-    this.manifest = {}
-    this.defaultAppID = defaultAppID
-  }
-
-  async init(manifestFilePath, askInfo = false) {
-    if (!manifestFilePath) {
-      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))
-    } else {
-      try {
-        this.manifest = loadFromYaml(manifestFilePath)
-      } catch (err) {
-        this.manifest = fakeLoadManifestYml(manifestFilePath)
-        this.excpManifest = true
-      }
-    }
-  }
-
-  async create(outputDir) {
-    let outputFilePath = path.join(outputDir, "lzc-manifest.yml")
-    logger.debug(`创建文件 ${outputFilePath}`)
-    ensureDir(outputFilePath)
-    return dumpToYaml(this.manifest, outputFilePath)
-  }
-
-  async askLpkInfo() {
-    const { appId } = await inquirer.prompt([
-      {
-        type: "input",
-        name: "appId",
-        message: `请输入应用ID，例如app-demo1`,
-        default: this.defaultAppID,
-        validate: (input) => {
-          if (isValidAppId(input)) {
-            return true
-          } else {
-            return `允许小写字母或数字或-的组合，但不以数字开头，且不能以 - 开头或结束，也不能有连续的短横线 --`
-          }
-        }
-      }
-    ])
-    const answer = {
-      name: appId,
-      package: `cloud.lazycat.app.${appId}`,
-      subdomain: appId
-    }
-    return answer
-  }
+	constructor(defaultAppID) {
+		this.pwd = contextDirname(import.meta.url);
+		this.manifest = {};
+		this.defaultAppID = defaultAppID;
+	}
+
+	async init(manifestFilePath, askInfo = false) {
+		if (!manifestFilePath) {
+			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));
+		} else {
+			try {
+				this.manifest = loadFromYaml(manifestFilePath);
+			} catch (err) {
+				this.manifest = fakeLoadManifestYml(manifestFilePath);
+				this.excpManifest = true;
+			}
+		}
+	}
+
+	async create(outputDir) {
+		let outputFilePath = path.join(outputDir, 'lzc-manifest.yml');
+		logger.debug(`create file ${outputFilePath}`);
+		ensureDir(outputFilePath);
+		return dumpToYaml(this.manifest, outputFilePath);
+	}
+
+	async askLpkInfo() {
+		const { appId } = await inquirer.prompt([
+			{
+				type: 'input',
+				name: 'appId',
+				message: t('lzc_cli.lib.app.lpk_create.ask_lpk_info_message', `请输入应用ID，例如 app-demo1`),
+				default: this.defaultAppID,
+				validate: (input) => {
+					if (isValidAppId(input)) {
+						return true;
+					} else {
+						return t(
+							'lzc_cli.lib.app.lpk_create.ask_lpk_info_validate_fail',
+							`允许小写字母或数字或-的组合，但不以数字开头，且不能以 - 开头或结束，也不能有连续的短横线 --`,
+						);
+					}
+				},
+			},
+		]);
+		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)
-  }
-
-  async init() {
-    if (!this.type) {
-      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)
-  }
-
-  async create() {
-    await this.lpkManifest.create(path.resolve(this.cwd, this.name))
-  }
+	constructor(cwd, name, type) {
+		this.cwd = cwd;
+		this.name = name;
+		this.type = type;
+		this.lpkManifest = new LpkManifest(name);
+	}
+
+	async init() {
+		if (!this.type) {
+			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);
+	}
+
+	async create() {
+		await this.lpkManifest.create(path.resolve(this.cwd, this.name));
+	}
 }
 
 export async function chooseTemplate() {
-  return (
-    await inquirer.prompt([
-      {
-        name: "type",
-        message: "选择项目构建模板",
-        type: "list",
-        choices: ["vue3"]
-      }
-    ])
-  )["type"]
+	return (
+		await inquirer.prompt([
+			{
+				name: 'type',
+				message: t('lzc_cli.lib.app.lpk_create.choose_template_message', '选择项目构建模板'),
+				type: 'list',
+				choices: ['vue3'],
+			},
+		])
+	)['type'];
 }
 
 // 创建一个应用
@@ -131,43 +112,42 @@ export async function chooseTemplate() {
 // - 根据 lpk manifest 模板中所需要的字段填充manifest
 // - 调用模板的hook
 class LpkCreate {
-  constructor(name, cwd = process.cwd()) {
-    this.name = name
-    this.cwd = cwd ?? process.cwd()
-    this.appDir = path.resolve(this.cwd, this.name)
-  }
-
-  async init() {
-    return this
-  }
-
-  async exec() {
-    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(chalk.green(`✨ 初始化懒猫云应用`))
-    await TemplateConfig[type].after(this.name, this.cwd)
-
-    await template.create()
-  }
+	constructor(name, cwd = process.cwd()) {
+		this.name = name;
+		this.cwd = cwd ?? process.cwd();
+		this.appDir = path.resolve(this.cwd, this.name);
+	}
+
+	async init() {
+		return this;
+	}
+
+	async exec() {
+		const type = await chooseTemplate();
+		const template = new TemplateInit(this.cwd, this.name, type);
+		await template.init();
+
+		console.log(chalk.green(t('lzc_cli.lib.app.lpk_create.exec_init_project_tips', `✨ 初始化项目 {{name}}`, { name: this.name })));
+		const { isExists, renamedFileName } = ensureDirectoryExists(this.appDir, true);
+		if (isExists && renamedFileName) {
+			console.warn(
+				chalk.yellow(
+					t('lzc_cli.lib.app.lpk_create.exec_init_project_name_exist_tips', `! 检测到相同目录,已自动将旧目录重命名为 {{renamedFileName}}`, {
+						renamedFileName,
+					}),
+				),
+			);
+		}
+		await TemplateConfig[type].build(path.resolve(this.cwd, this.name));
+
+		console.log(chalk.green(t('lzc_cli.lib.app.lpk_create.exec_init_project_success_tips', `✨ 初始化懒猫云应用`)));
+		await TemplateConfig[type].after(this.name, this.cwd);
+
+		await template.create();
+	}
 }
 
 export default async (name, cwd = process.cwd()) => {
-  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,91 +1,99 @@
-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 spawn from "cross-spawn"
-import logger from "loglevel"
+import glob from 'fast-glob';
+import path from 'path';
+import fs from 'fs';
+import { isBinaryFileSync } from 'isbinaryfile';
+import { contextDirname } from '../utils.js';
+import chalk from 'chalk';
+// import spawn from "cross-spawn"
+import logger from 'loglevel';
+import { t } from '../i18n/index.js';
 
-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)
+async function loadFiles(dirPath, prefix = '') {
+	const templateRoot = path.join(__dirname, '..', '..', 'template');
+	const templateDir = path.join(templateRoot, dirPath);
 
-  const _files = await glob(["**/*", "**/.*", ".*"], { cwd: templateDir })
-  let content
-  let files = {}
-  for (let p of _files) {
-    const sourcePath = path.join(templateDir, p)
+	const _files = await glob(['**/*', '**/.*', '.*'], { cwd: templateDir });
+	let content;
+	let files = {};
+	for (let p of _files) {
+		const sourcePath = path.join(templateDir, p);
 
-    const statInfo = fs.statSync(sourcePath)
-    const mode = statInfo.mode
-    if (isBinaryFileSync(sourcePath)) {
-      content = fs.readFileSync(sourcePath)
-    } else {
-      content = fs.readFileSync(sourcePath, "utf8")
-    }
-    // change _ prefix file into dot file
-    if (p.startsWith("_")) {
-      p = p.replace("_", ".")
-    }
+		const statInfo = fs.statSync(sourcePath);
+		const mode = statInfo.mode;
+		if (isBinaryFileSync(sourcePath)) {
+			content = fs.readFileSync(sourcePath);
+		} else {
+			content = fs.readFileSync(sourcePath, 'utf8');
+		}
+		// change _ prefix file into dot file
+		if (p.startsWith('_')) {
+			p = p.replace('_', '.');
+		}
 
-    files[path.join(prefix, p)] = {
-      content,
-      mode
-    }
-  }
-  return files
+		files[path.join(prefix, p)] = {
+			content,
+			mode,
+		};
+	}
+	return files;
 }
 
 function writeFileTree(target, files) {
-  Object.keys(files).forEach((p) => {
-    const filePath = path.join(target, p)
-    if (!fs.existsSync(path.dirname(filePath))) {
-      fs.mkdirSync(path.dirname(filePath), { recursive: true })
-    }
-    logger.debug(`创建文件 ${filePath}`)
-    fs.writeFileSync(filePath, files[p].content, { mode: files[p].mode })
-  })
+	Object.keys(files).forEach((p) => {
+		const filePath = path.join(target, p);
+		if (!fs.existsSync(path.dirname(filePath))) {
+			fs.mkdirSync(path.dirname(filePath), { recursive: true });
+		}
+		logger.debug(t('lzc_cli.lib.app.lpk_create_generator.write_file_tree_create_file', `创建文件 {{filePath}}`, { filePath }));
+		fs.writeFileSync(filePath, files[p].content, { mode: files[p].mode });
+	});
 }
 
 export 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 appCreateSuccessTip(name) {
-  console.log(
-    chalk.green(
-      `
+	console.log(
+		chalk.green(
+			t(
+				'lzc_cli.lib.app.lpk_create_generator.app_create_success_tip',
+				`
 ✨ 懒猫微服应用已创建成功 !
 ✨ 进行下面步骤后即可进入容器开发
-   cd ${name}
+   cd {{name}}
    lzc-cli project devshell
-   `.trim()
-    )
-  )
+   `,
+				{ name },
+			).trim(),
+		),
+	);
 }
 
 export const TemplateConfig = {
-  vue3: {
-    build: async (to, option) => {
-      await generate("vue", to, option)
-    },
-    after: async function (name) {
-      appCreateSuccessTip(name)
-      console.log(
-        chalk.green(
-          `
+	vue3: {
+		build: async (to, option) => {
+			await generate('vue', to, option);
+		},
+		after: async function (name) {
+			appCreateSuccessTip(name);
+			console.log(
+				chalk.green(
+					t(
+						'lzc_cli.lib.app.lpk_create_generator.template_config_vue3_green',
+						`
 ⚙️  进入应用容器后执行下面命令:
    npm install
    npm run dev
 🚀 启动应用:
    进入微服客户端启动器页面点击应用图标来测试应用
-   `.trim()
-        )
-      )
-    }
-  }
-}
+   `,
+					).trim(),
+				),
+			);
+		},
+	},
+};