@zwa73/dev-utils 1.0.83 → 1.0.85

package/bin/cli

@@ -1,5 +1,5 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 
-const {cliRoute} = await import('../dist/mjs/index.js');
+const {cliRoute} = require('../dist/cjs/index.js');
 
 cliRoute();

package/dist/cjs/Command/GenTemplate.js

@@ -9,12 +9,12 @@ const RouteInterface_1 = require("./RouteInterface");
 const utils_1 = require("@zwa73/utils");
 const fs_1 = __importDefault(require("fs"));
 /**复制基础文件 */
-async function copyData(templatePath) {
+async function copyData(templatePath, projectPath) {
     const filelist = await fs_1.default.promises.readdir(templatePath);
     const plist = filelist.map(async (fileName) => {
         utils_1.SLogger.info(`正在复制 ${fileName}`);
         const filePath = pathe_1.default.join(templatePath, fileName);
-        const targetPath = pathe_1.default.join(RouteInterface_1.PROJECT_PATH, fileName);
+        const targetPath = pathe_1.default.join(projectPath, fileName);
         if (!await utils_1.UtilFT.pathExists(targetPath))
             await fs_1.default.promises.cp(filePath, targetPath, { recursive: true });
         else
@@ -24,16 +24,14 @@ async function copyData(templatePath) {
     await Promise.all(plist);
 }
 /**安装npm包 */
-async function installPackage(dep, devDep) {
-    const install = async (name) => await utils_1.UtilFunc.exec(`npm i --registry ${RouteInterface_1.MIRROR_SOURCE} ${name}`);
-    const installdev = async (name) => await utils_1.UtilFunc.exec(`npm i --registry ${RouteInterface_1.MIRROR_SOURCE} --save-dev ${name}`);
-    const packageList = ['@zwa73/utils'];
-    const devPackList = ['@types/node'];
-    for (const name of packageList) {
+async function installPackage(projectPath, depList, devDepList) {
+    const install = async (name) => await utils_1.UtilFunc.exec(`npm i --registry ${RouteInterface_1.MIRROR_SOURCE} ${name}`, { cwd: projectPath });
+    const installdev = async (name) => await utils_1.UtilFunc.exec(`npm i --registry ${RouteInterface_1.MIRROR_SOURCE} --save-dev ${name}`, { cwd: projectPath });
+    for (const name of depList) {
         utils_1.SLogger.info(`正在安装 ${name}`);
         await install(name);
     }
-    for (const name of devPackList) {
+    for (const name of devDepList) {
         utils_1.SLogger.info(`正在安装 ${name}`);
         await installdev(name);
     }
@@ -44,13 +42,19 @@ const CmdGenTemplate = (program) => program
     .alias("gentemplate")
     .description("生成项目模板")
     .argument("<template>", "项目模板 可用 base|electron")
-    .action(async (templateName) => {
-    await (0, RouteInterface_1.checkProject)();
-    const templatePath = pathe_1.default.join(RouteInterface_1.ROOT_PATH, 'template', templateName);
+    .requiredOption("-n, --projectName <name>", "项目名称")
+    .requiredOption("-d, --projectDescription <description>", "项目描述")
+    .requiredOption("-a, --authorName <name>", "作者名")
+    .action(async (templateName, opt) => {
+    const templatePath = pathe_1.default.join(RouteInterface_1.TEMPLATE_PATH, templateName);
     if (!await utils_1.UtilFT.pathExists(templatePath))
         utils_1.SLogger.error(`模板 ${templateName} 不存在`);
-    await copyData(pathe_1.default.join(RouteInterface_1.ROOT_PATH, 'template', templateName));
-    await installPackage(['@zwa73/utils'], ['@types/node']);
+    const projectPath = pathe_1.default.join(process.cwd(), opt.projectName);
+    await utils_1.UtilFT.ensurePathExists(projectPath, { dir: true });
+    await copyData(templatePath, projectPath);
+    await installPackage(projectPath, ['@zwa73/utils'], ['@types/node']);
+    if (await utils_1.UtilFT.pathExists(pathe_1.default.join(projectPath, "gitignore")))
+        await fs_1.default.promises.rename(pathe_1.default.join(projectPath, "gitignore"), pathe_1.default.join(projectPath, ".gitignore"));
     switch (templateName) {
         case 'base': break;
         case 'electron': break;

package/dist/cjs/Command/Release.js

@@ -32,7 +32,7 @@ function checkVersion(oldVersion, newVersion) {
 }
 /**更新版本号 */
 async function updateVersion(newVersion) {
-    const packagePath = pathe_1.default.join(RouteInterface_1.PROJECT_PATH, "package.json");
+    const packagePath = pathe_1.default.join(RouteInterface_1.PROCESS_PATH, "package.json");
     const packageData = await (0, utils_1.memoize)(utils_1.UtilFT.loadJSONFile)(packagePath);
     if (newVersion) {
         checkVersion(packageData.version, newVersion);
@@ -48,7 +48,7 @@ async function updateVersion(newVersion) {
 }
 /**获取包名 */
 async function getPackName() {
-    const packagePath = pathe_1.default.join(RouteInterface_1.PROJECT_PATH, "package.json");
+    const packagePath = pathe_1.default.join(RouteInterface_1.PROCESS_PATH, "package.json");
     const packageData = await (0, utils_1.memoize)(utils_1.UtilFT.loadJSONFile)(packagePath);
     return packageData.name
         .replace(/\//g, '-')

package/dist/cjs/Command/RouteInterface.d.ts

@@ -8,8 +8,8 @@ export declare const ROOT_PATH: string;
 export declare const DATA_PATH: string;
 /**template文件夹路径 */
 export declare const TEMPLATE_PATH: string;
-/**项目路径 */
-export declare const PROJECT_PATH: string;
+/**当前路径 */
+export declare const PROCESS_PATH: string;
 /** 检测非浮点的整数类型 */
 export declare function parseInteger(value: string): number;
 /** 检测任意数字类型 */

package/dist/cjs/Command/RouteInterface.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PROJECT_PATH = exports.TEMPLATE_PATH = exports.DATA_PATH = exports.ROOT_PATH = exports.OFFICIAL_SOURCE = exports.MIRROR_SOURCE = void 0;
+exports.PROCESS_PATH = exports.TEMPLATE_PATH = exports.DATA_PATH = exports.ROOT_PATH = exports.OFFICIAL_SOURCE = exports.MIRROR_SOURCE = void 0;
 exports.parseInteger = parseInteger;
 exports.parseNumber = parseNumber;
 exports.parseBoolean = parseBoolean;
@@ -22,8 +22,8 @@ exports.ROOT_PATH = pathe_1.default.join(__dirname, '..', '..', '..');
 exports.DATA_PATH = pathe_1.default.join(exports.ROOT_PATH, 'data');
 /**template文件夹路径 */
 exports.TEMPLATE_PATH = pathe_1.default.join(exports.DATA_PATH, 'template');
-/**项目路径 */
-exports.PROJECT_PATH = process.cwd();
+/**当前路径 */
+exports.PROCESS_PATH = process.cwd();
 /** 检测非浮点的整数类型 */
 function parseInteger(value) {
     const num = Number(value);
@@ -64,7 +64,7 @@ async function withOfficialSource(func) {
 }
 /**检查目录是否为项目 */
 async function checkProject() {
-    const filePath = pathe_1.default.join(exports.PROJECT_PATH, "package.json");
+    const filePath = pathe_1.default.join(exports.PROCESS_PATH, "package.json");
     if (!(await utils_1.UtilFT.pathExists(filePath)))
-        (0, utils_1.throwError)(`当前目录: ${exports.PROJECT_PATH} 不是npm项目目录, 请先使用 npm init`);
+        (0, utils_1.throwError)(`当前目录: ${exports.PROCESS_PATH} 不是npm项目目录, 请先使用 npm init`);
 }

package/dist/mjs/Command/GenTemplate.js

@@ -1,14 +1,14 @@
 import path from 'pathe';
-import { checkProject, MIRROR_SOURCE, PROJECT_PATH, ROOT_PATH } from "./RouteInterface.js";
+import { MIRROR_SOURCE, TEMPLATE_PATH } from "./RouteInterface.js";
 import { SLogger, UtilFT, UtilFunc } from "@zwa73/utils";
 import fs from 'fs';
 /**复制基础文件 */
-async function copyData(templatePath) {
+async function copyData(templatePath, projectPath) {
     const filelist = await fs.promises.readdir(templatePath);
     const plist = filelist.map(async (fileName) => {
         SLogger.info(`正在复制 ${fileName}`);
         const filePath = path.join(templatePath, fileName);
-        const targetPath = path.join(PROJECT_PATH, fileName);
+        const targetPath = path.join(projectPath, fileName);
         if (!await UtilFT.pathExists(targetPath))
             await fs.promises.cp(filePath, targetPath, { recursive: true });
         else
@@ -18,16 +18,14 @@ async function copyData(templatePath) {
     await Promise.all(plist);
 }
 /**安装npm包 */
-async function installPackage(dep, devDep) {
-    const install = async (name) => await UtilFunc.exec(`npm i --registry ${MIRROR_SOURCE} ${name}`);
-    const installdev = async (name) => await UtilFunc.exec(`npm i --registry ${MIRROR_SOURCE} --save-dev ${name}`);
-    const packageList = ['@zwa73/utils'];
-    const devPackList = ['@types/node'];
-    for (const name of packageList) {
+async function installPackage(projectPath, depList, devDepList) {
+    const install = async (name) => await UtilFunc.exec(`npm i --registry ${MIRROR_SOURCE} ${name}`, { cwd: projectPath });
+    const installdev = async (name) => await UtilFunc.exec(`npm i --registry ${MIRROR_SOURCE} --save-dev ${name}`, { cwd: projectPath });
+    for (const name of depList) {
         SLogger.info(`正在安装 ${name}`);
         await install(name);
     }
-    for (const name of devPackList) {
+    for (const name of devDepList) {
         SLogger.info(`正在安装 ${name}`);
         await installdev(name);
     }
@@ -38,13 +36,19 @@ export const CmdGenTemplate = (program) => program
     .alias("gentemplate")
     .description("生成项目模板")
     .argument("<template>", "项目模板 可用 base|electron")
-    .action(async (templateName) => {
-    await checkProject();
-    const templatePath = path.join(ROOT_PATH, 'template', templateName);
+    .requiredOption("-n, --projectName <name>", "项目名称")
+    .requiredOption("-d, --projectDescription <description>", "项目描述")
+    .requiredOption("-a, --authorName <name>", "作者名")
+    .action(async (templateName, opt) => {
+    const templatePath = path.join(TEMPLATE_PATH, templateName);
     if (!await UtilFT.pathExists(templatePath))
         SLogger.error(`模板 ${templateName} 不存在`);
-    await copyData(path.join(ROOT_PATH, 'template', templateName));
-    await installPackage(['@zwa73/utils'], ['@types/node']);
+    const projectPath = path.join(process.cwd(), opt.projectName);
+    await UtilFT.ensurePathExists(projectPath, { dir: true });
+    await copyData(templatePath, projectPath);
+    await installPackage(projectPath, ['@zwa73/utils'], ['@types/node']);
+    if (await UtilFT.pathExists(path.join(projectPath, "gitignore")))
+        await fs.promises.rename(path.join(projectPath, "gitignore"), path.join(projectPath, ".gitignore"));
     switch (templateName) {
         case 'base': break;
         case 'electron': break;

package/dist/mjs/Command/Release.js

@@ -1,6 +1,6 @@
 import path from 'pathe';
 import { memoize, SLogger, throwError, UtilFT, UtilFunc } from '@zwa73/utils';
-import { checkProject, OFFICIAL_SOURCE, PROJECT_PATH } from './RouteInterface.js';
+import { checkProject, OFFICIAL_SOURCE, PROCESS_PATH } from './RouteInterface.js';
 import fs from 'fs';
 /**解析版本号为number数组 */
 function parseVersion(version) {
@@ -26,7 +26,7 @@ function checkVersion(oldVersion, newVersion) {
 }
 /**更新版本号 */
 async function updateVersion(newVersion) {
-    const packagePath = path.join(PROJECT_PATH, "package.json");
+    const packagePath = path.join(PROCESS_PATH, "package.json");
     const packageData = await memoize(UtilFT.loadJSONFile)(packagePath);
     if (newVersion) {
         checkVersion(packageData.version, newVersion);
@@ -42,7 +42,7 @@ async function updateVersion(newVersion) {
 }
 /**获取包名 */
 async function getPackName() {
-    const packagePath = path.join(PROJECT_PATH, "package.json");
+    const packagePath = path.join(PROCESS_PATH, "package.json");
     const packageData = await memoize(UtilFT.loadJSONFile)(packagePath);
     return packageData.name
         .replace(/\//g, '-')

package/dist/mjs/Command/RouteInterface.d.ts

@@ -8,8 +8,8 @@ export declare const ROOT_PATH: string;
 export declare const DATA_PATH: string;
 /**template文件夹路径 */
 export declare const TEMPLATE_PATH: string;
-/**项目路径 */
-export declare const PROJECT_PATH: string;
+/**当前路径 */
+export declare const PROCESS_PATH: string;
 /** 检测非浮点的整数类型 */
 export declare function parseInteger(value: string): number;
 /** 检测任意数字类型 */

package/dist/mjs/Command/RouteInterface.js

@@ -10,8 +10,8 @@ export const ROOT_PATH = path.join(`${process.platform === 'win32' ? '' : '/'}${
 export const DATA_PATH = path.join(ROOT_PATH, 'data');
 /**template文件夹路径 */
 export const TEMPLATE_PATH = path.join(DATA_PATH, 'template');
-/**项目路径 */
-export const PROJECT_PATH = process.cwd();
+/**当前路径 */
+export const PROCESS_PATH = process.cwd();
 /** 检测非浮点的整数类型 */
 export function parseInteger(value) {
     const num = Number(value);
@@ -52,7 +52,7 @@ export async function withOfficialSource(func) {
 }
 /**检查目录是否为项目 */
 export async function checkProject() {
-    const filePath = path.join(PROJECT_PATH, "package.json");
+    const filePath = path.join(PROCESS_PATH, "package.json");
     if (!(await UtilFT.pathExists(filePath)))
-        throwError(`当前目录: ${PROJECT_PATH} 不是npm项目目录, 请先使用 npm init`);
+        throwError(`当前目录: ${PROCESS_PATH} 不是npm项目目录, 请先使用 npm init`);
 }

package/package.json

@@ -1,14 +1,14 @@
 {
 	"name": "@zwa73/dev-utils",
-	"version": "1.0.83",
+	"version": "1.0.85",
 	"description": "编译与调试工具",
-	"type": "module",
 	"exports": {
 		".": {
 			"require": "./dist/cjs/index.js",
 			"import": "./dist/mjs/index.js"
 		}
 	},
+	"types": "./dist/mjs/index.d.ts",
 	"scripts": {
 		"test": "jest",
 		"release": "powershell scripts/release",