@zwa73/dev-utils 1.0.29 → 1.0.31

package/dist/Command/ExpandMacro.d.ts

@@ -0,0 +1,3 @@
+import { Command } from "commander";
+/**构造macro */
+export declare const CmdExpandMacro: (program: Command) => Command;

package/dist/Command/{BuildMacro.js → ExpandMacro.js}

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CmdBuildMacro = void 0;
+exports.CmdExpandMacro = void 0;
 const UtilDevTool_1 = require("../UtilDevTool");
 /**构造macro */
-const CmdBuildMacro = (program) => program
-    .command("Build-Macro")
-    .alias("buildmacro")
-    .description("生成根据macro生成代码")
+const CmdExpandMacro = (program) => program
+    .command("Expand-Macro")
+    .alias("expandmacro")
+    .description("根据macro生成代码")
     .option("-i, --include <glob>", "包含的glob 默认 src/**/*.macro.ts", "src/**/*.macro.ts")
     .option("-g, --exclude <glob>", "忽略的glob")
     .option("-p, --project <path>", "tsconfig路径 默认tsconfig.json", "tsconfig.json")
@@ -17,4 +17,4 @@ const CmdBuildMacro = (program) => program
         project: opt.project,
     });
 });
-exports.CmdBuildMacro = CmdBuildMacro;
+exports.CmdExpandMacro = CmdExpandMacro;

package/dist/Command/GenSchema.d.ts

@@ -0,0 +1,3 @@
+import { Command } from "commander";
+/**生成schema */
+export declare const CmdGenSchema: (program: Command) => Command;

package/dist/Command/{BuildSchema.js → GenSchema.js}

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CmdBuildSchema = void 0;
+exports.CmdGenSchema = void 0;
 const UtilDevTool_1 = require("../UtilDevTool");
 /**生成schema */
-const CmdBuildSchema = (program) => program
-    .command("Build-Schema")
-    .alias("buildschema")
+const CmdGenSchema = (program) => program
+    .command("Gen-Schema")
+    .alias("genschema")
     .description("生成匹配的文件的所有type的schema")
     .option("-i, --include <glob>", "包含的glob 默认 src/**/*.schema.ts", "src/**/*.schema.ts")
     .option("-g, --exclude <glob>", "忽略的glob")
@@ -19,4 +19,4 @@ const CmdBuildSchema = (program) => program
         outDir: opt.outDir,
     });
 });
-exports.CmdBuildSchema = CmdBuildSchema;
+exports.CmdGenSchema = CmdGenSchema;

package/dist/Command/Route.js

@@ -7,16 +7,16 @@ const Node_1 = require("./Node");
 const Release_1 = require("./Release");
 const MapPath_1 = require("./MapPath");
 const ScanDups_1 = require("./ScanDups");
-const BuildSchema_1 = require("./BuildSchema");
-const BuildMacro_1 = require("./BuildMacro");
+const GenSchema_1 = require("./GenSchema");
+const ExpandMacro_1 = require("./ExpandMacro");
 async function cliRoute() {
     (0, Init_1.CmdInit)(commander_1.program);
     (0, Node_1.CmdNode)(commander_1.program);
     (0, Release_1.CmdRelease)(commander_1.program);
     (0, MapPath_1.CmdMapPath)(commander_1.program);
     (0, ScanDups_1.CmdScanDups)(commander_1.program);
-    (0, BuildSchema_1.CmdBuildSchema)(commander_1.program);
-    (0, BuildMacro_1.CmdBuildMacro)(commander_1.program);
+    (0, GenSchema_1.CmdGenSchema)(commander_1.program);
+    (0, ExpandMacro_1.CmdExpandMacro)(commander_1.program);
     commander_1.program.parse(process.argv);
 }
 exports.cliRoute = cliRoute;

package/dist/UtilDevTool.js

@@ -138,7 +138,7 @@ var UtilDT;
      * @param targetPath - 目标文件 默认为去除".macro"的同名文件
      */
     async function $macro(regionId, codeText, targetPath) {
-        const loc = (0, utils_1.getFuncLoc)(2);
+        const loc = utils_1.UtilFunc.getFuncLoc(2);
         if (!loc) {
             utils_1.SLogger.error(`UtilDT.$macro 未能找到函数位置`);
             return;

package/package.json

@@ -1,13 +1,14 @@
 {
 	"name": "@zwa73/dev-utils",
-	"version": "1.0.29",
+	"version": "1.0.31",
 	"description": "编译与调试工具",
 	"main": "index.js",
 	"scripts": {
 		"test": "jest",
 		"release": "powershell scripts/release",
 		"compile": "powershell scripts/compile",
-		"watch": "powershell scripts/watch"
+		"watch": "powershell scripts/watch",
+		"postinstall": "start node scripts/postinstall.js"
 	},
 	"keywords": [
 		"schema"

package/scripts/postinstall.js

@@ -0,0 +1,62 @@
+const path = require('path');
+const { UtilFT, SLogger } = require("../index");
+const readline = require('readline');
+
+const PACKAGE_PATH = path.join(__dirname,'..','package.json');
+const VERSION_PATH = path.join(__dirname,"..","..","version.json");
+//提示表
+const INFO_TABLE = {
+    "1.0.31":"zcli Build-Macro Build-Schema 更名为 Expand-Macro Gen-Schema"
+}
+
+// 将版本号转换为可以比较的数字
+function versionToNumber(version) {
+    if(version==undefined) return 0;
+    return version.split('.').map(Number).reduce((acc, val) => acc * 1000 + val);
+}
+
+//显示提示
+function showUpgradeMessages(prevVersion, currentVersion) {
+    const prevVersionNumber = versionToNumber(prevVersion);
+    const currentVersionNumber = versionToNumber(currentVersion);
+    let hasOut = false;
+    // 遍历infoTable中的所有版本
+    for (const version in INFO_TABLE) {
+        const versionNumber = versionToNumber(version);
+        // 如果用户的上一个版本低于这个版本，而当前版本高于或等于这个版本
+        if (versionNumber > prevVersionNumber && versionNumber <= currentVersionNumber) {
+            // 显示这个版本的提示信息
+            console.log(INFO_TABLE[version]);
+            hasOut=true;
+        }
+    }
+    return hasOut;
+}
+
+
+
+async function main(){
+    const packageTable = await UtilFT.loadJSONFile(PACKAGE_PATH);
+    const currentVersion = packageTable.version;
+    await UtilFT.ensurePathExists(VERSION_PATH);
+    const versionTable = Object.assign({},
+        await UtilFT.loadJSONFile(VERSION_PATH,{}),
+        {"dev-utils":{version:currentVersion}});
+    const prevVersion = versionTable.utils.version;
+
+    console.log(`${currentVersion} 版本已安装`);
+    // 使用这个函数来显示升级信息
+    const hasOut = showUpgradeMessages(prevVersion, currentVersion);
+
+    versionTable.utils.version = currentVersion;
+    await UtilFT.writeJSONFile(VERSION_PATH, versionTable);
+
+    if(!hasOut) return;
+    const rl = readline.createInterface({
+        input: process.stdin,
+        output: process.stdout
+    });
+    setTimeout(()=>rl.close(),20000);
+    rl.question('按任意键继续...', () => rl.close());
+}
+main()

package/src/Command/{BuildMacro.ts → ExpandMacro.ts}

@@ -2,10 +2,10 @@ import { Command } from "commander";
 import { UtilDT } from "@src/UtilDevTool";
 
 /**构造macro */
-export const CmdBuildMacro = (program:Command) => program
-    .command("Build-Macro")
-    .alias("buildmacro")
-    .description("生成根据macro生成代码")
+export const CmdExpandMacro = (program:Command) => program
+    .command("Expand-Macro")
+    .alias("expandmacro")
+    .description("根据macro生成代码")
     .option("-i, --include <glob>", "包含的glob 默认 src/**/*.macro.ts","src/**/*.macro.ts")
     .option("-g, --exclude <glob>", "忽略的glob")
     .option("-p, --project <path>", "tsconfig路径 默认tsconfig.json","tsconfig.json")

package/src/Command/{BuildSchema.ts → GenSchema.ts}

@@ -2,9 +2,9 @@ import { Command } from "commander";
 import { UtilDT } from "@src/UtilDevTool";
 
 /**生成schema */
-export const CmdBuildSchema = (program:Command) => program
-    .command("Build-Schema")
-    .alias("buildschema")
+export const CmdGenSchema = (program:Command) => program
+    .command("Gen-Schema")
+    .alias("genschema")
     .description("生成匹配的文件的所有type的schema")
     .option("-i, --include <glob>", "包含的glob 默认 src/**/*.schema.ts","src/**/*.schema.ts")
     .option("-g, --exclude <glob>", "忽略的glob")

package/src/Command/Route.ts

@@ -5,8 +5,8 @@ import { CmdNode } from './Node';
 import { CmdRelease } from './Release';
 import { CmdMapPath } from './MapPath';
 import { CmdScanDups } from './ScanDups';
-import { CmdBuildSchema } from './BuildSchema';
-import { CmdBuildMacro } from './BuildMacro';
+import { CmdGenSchema } from './GenSchema';
+import { CmdExpandMacro } from './ExpandMacro';
 
 export async function cliRoute(){
     CmdInit(program);
@@ -14,7 +14,7 @@ export async function cliRoute(){
     CmdRelease(program);
     CmdMapPath(program);
     CmdScanDups(program);
-    CmdBuildSchema(program);
-    CmdBuildMacro(program);
+    CmdGenSchema(program);
+    CmdExpandMacro(program);
     program.parse(process.argv);
 }

package/src/UtilDevTool.ts

@@ -138,7 +138,7 @@ export async function batchNode(filepath:string|string[],opt?:BatchNodeOpt) {
  * @param targetPath - 目标文件 默认为去除".macro"的同名文件
  */
 export async function $macro(regionId:string,codeText:string,targetPath?:string){
-    const loc = getFuncLoc(2);
+    const loc = UtilFunc.getFuncLoc(2);
     if(!loc){
         SLogger.error(`UtilDT.$macro 未能找到函数位置`);
         return

package/dist/Command/BuildMacro.d.ts

@@ -1,3 +0,0 @@
-import { Command } from "commander";
-/**构造macro */
-export declare const CmdBuildMacro: (program: Command) => Command;

package/dist/Command/BuildSchema.d.ts

@@ -1,3 +0,0 @@
-import { Command } from "commander";
-/**生成schema */
-export declare const CmdBuildSchema: (program: Command) => Command;