@tomjs/hbuilderx-cli 1.1.0 → 1.3.0

package/dist/index.js

@@ -5,6 +5,7 @@ import { cosmiconfig } from "cosmiconfig";
 import path from "node:path";
 import { mkdirp, readJson, writeFile } from "@tomjs/node";
 import archiver from "archiver";
+import { glob } from "glob";
 import colors from "picocolors";
 import Logger from "@tomjs/logger";
 import chokidar from "chokidar";
@@ -28,9 +29,16 @@ async function getConfig(opts) {
 	return (await explorer.search())?.config || {};
 }
 
+//#endregion
+//#region src/constant.ts
+const LOG_PREFIX = "[tomjs:hbuilderx]";
+
 //#endregion
 //#region src/util.ts
-const logger = new Logger({ directory: "create-app/logs" });
+const logger = new Logger({
+	prefix: LOG_PREFIX,
+	time: true
+});
 const isWindows = process.platform === "win32";
 let _opts = {};
 function setOptions(opts) {
@@ -40,12 +48,6 @@ function setOptions(opts) {
 //#endregion
 //#region src/pack.ts
 async function packExtension(opts) {
-	const packFiles = Array.isArray(opts.packFiles) ? opts.packFiles : [
-		"dist",
-		"package.json",
-		"license"
-	];
-	if (!packFiles.includes("package.json")) packFiles.push("package.json");
 	const cwd = opts.cwd || process.cwd();
 	const pkgPath = path.join(cwd, "package.json");
 	if (!fs.existsSync(pkgPath)) {
@@ -53,12 +55,23 @@ async function packExtension(opts) {
 		return;
 	}
 	const pkg = await readJson(pkgPath);
-	if (!checkPackage(pkg)) return;
+	if (!checkPackageFields(pkg)) return;
 	const mainFile = path.join(cwd, pkg.main);
 	if (!fs.existsSync(mainFile)) {
 		logger.error(`未找到 ${colors.bold("package.json")} 中 ${colors.bold("main")} 字段值路径： ${colors.green(mainFile)}`);
 		return;
 	}
+	const packFilters = Array.isArray(pkg.files) && pkg.files.length ? pkg.files : [
+		"dist",
+		"resources",
+		"package.json",
+		"LICENSE"
+	];
+	const pkgFiles = await glob(packFilters.filter((s) => !s.startsWith("!")), {
+		cwd,
+		ignore: packFilters.filter((s) => s.startsWith("!")).map((s) => s.slice(1)).concat(["node_modules/**"])
+	});
+	console.log(pkgFiles);
 	logger.info(`${colors.blue(pkg.name)} 插件打包开始`);
 	const archive = archiver("zip", { zlib: { level: 9 } });
 	archive.on("error", (err) => {
@@ -74,7 +87,7 @@ async function packExtension(opts) {
 	});
 	const output = fs.createWriteStream(path.join(cwd, `${pkg.name}.zip`));
 	archive.pipe(output);
-	packFiles.forEach((file) => {
+	pkgFiles.forEach((file) => {
 		const filePath = path.join(cwd, file);
 		if (!fs.existsSync(filePath)) return;
 		if (fs.lstatSync(filePath).isDirectory()) archive.directory(filePath, file);
@@ -82,7 +95,7 @@ async function packExtension(opts) {
 	});
 	archive.finalize();
 }
-function checkPackage(pkg) {
+function checkPackageFields(pkg) {
 	if (!pkg) {
 		logger.error("package.json 文件格式错误");
 		return false;
@@ -116,7 +129,7 @@ function createWatcher(paths, callback) {
 	let ready = false;
 	watcher.on("ready", async () => {
 		ready = true;
-		logger.info(`监听: ${watchPaths.map((s) => colors.green(s))}`);
+		logger.info(`监听 ${watchPaths.map((s) => colors.green(s))}`);
 		await callback();
 	});
 	watcher.on("all", async (event, path$1) => {
@@ -142,9 +155,9 @@ async function watchFiles(opts) {
 }
 async function genDtsFromPkg(pkgPath, opts) {
 	const pkg = await readJson(pkgPath);
-	if (!pkg) return logger.error(`${colors.green("package.json")} 文件解析失败`);
+	if (!pkg) return logger.error(`${colors.blue("package.json")} 文件解析失败`);
 	const contributes = pkg.contributes;
-	if (!contributes) return logger.error(`${colors.green("package.json")} 文件缺少 contributes 属性`);
+	if (!contributes) return logger.error(`${colors.blue("package.json")} 文件缺少 contributes 属性`);
 	const code = `// 通过 @tomjs/hbuilderx-cli 生成的 d.ts 文件
 declare module 'hbuilderx' {
 ${getCommandCode(contributes, opts)}
@@ -252,6 +265,7 @@ Usage
 Options
   --watch, -w           监听 package.json，生产 d.ts 文件
   --pack, -p            生成插件打包文件
+  --flag, -f            日志标识:time/symbol/none，默认 "time"
   --config              指定配置文件，如 "hx-cli.config.mjs"
   --verbose             显示更多信息
   --help, -h            显示帮助信息
@@ -274,6 +288,14 @@ Examples
 			type: "boolean",
 			shortFlag: "p"
 		},
+		flag: {
+			type: "string",
+			choices: [
+				"time",
+				"symbol",
+				"none"
+			]
+		},
 		verbose: {
 			type: "boolean",
 			default: false
@@ -293,6 +315,7 @@ if (flags.help) cli.showHelp(0);
 else if (flags.version) cli.showVersion();
 else {
 	logger.enableDebug(flags.verbose);
+	logger.setOptions({ flag: flags.flag || "time" });
 	const cliOpts = Object.assign({ cwd: input[0] }, flags);
 	logger.debug("cli options:", cliOpts);
 	const config = await getConfig(cliOpts);

package/dist/types.d.ts

@@ -0,0 +1,42 @@
+//#region src/types.d.ts
+/**
+ * cli 参数
+ */
+interface CliOptions {
+  /**
+   * 监听文件变化
+   */
+  watch?: boolean;
+  /**
+   * 打包插件，根据 package.json 中的 files 字段打包，如果未设置，默认取 dist,resources,package.json,LICENSE 文件夹或文件。
+   */
+  pack?: boolean;
+  /**
+   * 时间前缀
+   */
+  time?: boolean;
+  /**
+   * 当前工作目录/根目录
+   */
+  cwd?: string;
+  /**
+   * 配置文件
+   */
+  config?: string;
+  /**
+   * 生成 d.ts 文件路径
+   * @default 'hbuilderx.d.ts'
+   */
+  dts?: string;
+  /**
+   * 添加到生成的 d.ts 中的命令，如用到的内置命令
+   */
+  commands?: string[];
+  /**
+   * verbose 模式
+   * @default false
+   */
+  verbose?: boolean;
+}
+//#endregion
+export { CliOptions };

package/dist/types.js

@@ -0,0 +1 @@
+export {  };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tomjs/hbuilderx-cli",
   "type": "module",
-  "version": "1.1.0",
+  "version": "1.3.0",
   "description": "为 HBuilderX 开发插件提供便利的 cli 工具，根据 package.json 中的 contributes 配置，为 hbuilderx 的命令、视图等 API 提供 id 提示",
   "author": {
     "name": "Tom Gao",
@@ -19,6 +19,12 @@
     "extension",
     "webview"
   ],
+  "exports": {
+    "./types": {
+      "types": "./dist/types.d.ts"
+    }
+  },
+  "types": "./dist/types.d.ts",
   "bin": {
     "hx-cli": "./dist/index.js"
   },
@@ -29,11 +35,12 @@
     "node": ">=20"
   },
   "dependencies": {
-    "@tomjs/logger": "^1.4.0",
+    "@tomjs/logger": "^3.0.0",
     "@tomjs/node": "^2.2.3",
     "archiver": "^7.0.1",
     "chokidar": "^5.0.0",
     "cosmiconfig": "^9.0.0",
+    "glob": "^13.0.0",
     "meow": "^14.0.0",
     "picocolors": "^1.1.1"
   },
@@ -42,7 +49,7 @@
   },
   "scripts": {
     "dev": "tsdown --watch",
-    "build": "tsdown",
+    "build": "rimraf ./dist && tsdown",
     "lint": "eslint --fix"
   }
 }