@zwa73/dev-utils 1.0.70 → 1.0.80

package/data/InitElectron/package-lock.json

@@ -2528,9 +2528,9 @@
       }
     },
     "node_modules/@zwa73/utils": {
-      "version": "1.0.152",
-      "resolved": "https://registry.npmjs.org/@zwa73/utils/-/utils-1.0.152.tgz",
-      "integrity": "sha512-83m+F2cll2tcwU5nJW0Uo2LsTaMljNEcggjqAl7cvebLAVE2k6e/lOwg0f/NgfzPkYX/NJS8rVPBVSA8/nhnhA==",
+      "version": "1.0.155",
+      "resolved": "https://registry.npmjs.org/@zwa73/utils/-/utils-1.0.155.tgz",
+      "integrity": "sha512-n7Tb3oLA6cLi5VY2XsPmnfghPzG2iiV24twWLz4MY8Edkv13Qog/KdFVuJlNcXTlRHHyTIWb0aKeFAM5E3mDnQ==",
       "hasInstallScript": true,
       "dependencies": {
         "@deepkit/type": "^1.0.1-alpha.153",
@@ -15611,9 +15611,9 @@
       }
     },
     "@zwa73/utils": {
-      "version": "1.0.152",
-      "resolved": "https://registry.npmjs.org/@zwa73/utils/-/utils-1.0.152.tgz",
-      "integrity": "sha512-83m+F2cll2tcwU5nJW0Uo2LsTaMljNEcggjqAl7cvebLAVE2k6e/lOwg0f/NgfzPkYX/NJS8rVPBVSA8/nhnhA==",
+      "version": "1.0.155",
+      "resolved": "https://registry.npmjs.org/@zwa73/utils/-/utils-1.0.155.tgz",
+      "integrity": "sha512-n7Tb3oLA6cLi5VY2XsPmnfghPzG2iiV24twWLz4MY8Edkv13Qog/KdFVuJlNcXTlRHHyTIWb0aKeFAM5E3mDnQ==",
       "requires": {
         "@deepkit/type": "^1.0.1-alpha.153",
         "fluent-ffmpeg": "2.1.2",

package/data/InitElectron/src/Backend/BridgeBackend.ts

@@ -1,19 +1,41 @@
-import { assertType } from "@zwa73/utils";
+import { AllExtends, JToken, UtilFT } from "@zwa73/utils";
 import { IpcMainInvokeEvent, app } from "electron";
+import fs from 'fs';
+
+/**桥函数化 */
+const bridgeify = <F extends (...args: any[]) => any>(func:F):
+    F extends (...args:infer IN)=>infer OUT
+        ? AllExtends<IN,JToken> extends true
+            ? OUT extends JToken|void|Promise<JToken|void>
+                ? (e:IpcMainInvokeEvent,...args:Parameters<F>)=>ReturnType<F>
+                : Error&"返回值无法序列化"
+            : Error&"传入值无法序列化"
+        : never =>
+    ((e:IpcMainInvokeEvent,...args:Parameters<F>):ReturnType<F>=>
+        (func as any)(...args)) as any;
 
 /**后端桥对象 */
 export const BridgeBackend = {
+    loadJsonFile :bridgeify(UtilFT.writeJSONFile),
+    writeJSONFile:bridgeify(UtilFT.writeJSONFile),
+    async writeFile(e:IpcMainInvokeEvent,path:string,data:string){
+        return fs.promises.writeFile(path,data);
+    },
+    async readFile(e:IpcMainInvokeEvent,path:string){
+        return fs.promises.readFile(path,'utf-8');
+    },
     getAppPath() {
         return app.getAppPath();
     },
     test(e: IpcMainInvokeEvent, text: string) {
-        return text + " BridgeBackendTest";
+        return text + 0;
     },
 };
 export type BridgeBackend = typeof BridgeBackend;
 
 //断言确保桥符合类型
-
-assertType<{
-    [key in string|number|symbol]: (arg1: IpcMainInvokeEvent, ...args: any[]) => any;
-} & { getBridgeKeys?: never }>(BridgeBackend);
+const assertBridge = <
+    T extends {
+        [key in string|number|symbol]: (arg1: IpcMainInvokeEvent, ...args: any[]) => any;
+    } & { getBridgeKeys?: never } >(t:T) => undefined;
+assertBridge(BridgeBackend);

package/data/InitElectron/src/index.ts

@@ -84,7 +84,7 @@ type RemoveIpcEventArg<T> =
 /**前端桥对象定义 */
 export type BridgeDefine = {
     [P in keyof BridgeBackend]: BridgeBackend[P] extends (...args: infer Arg) => infer Out
-        ? RemoveIpcEventArg<(...args: Arg) => Promise<Out>>
+        ? RemoveIpcEventArg<(...args: Arg) => Out extends Promise<any> ? Out : Promise<Out>>
         : never;
 };
 //#endregion

package/dist/Command/Release.js

@@ -7,6 +7,7 @@ exports.CmdRelease = void 0;
 const pathe_1 = __importDefault(require("pathe"));
 const utils_1 = require("@zwa73/utils");
 const RouteInterface_1 = require("./RouteInterface");
+const fs_1 = __importDefault(require("fs"));
 /**解析版本号为number数组 */
 function parseVersion(version) {
     const arr = version.split(".").map(Number);
@@ -32,7 +33,7 @@ function checkVersion(oldVersion, newVersion) {
 /**更新版本号 */
 async function updateVersion(newVersion) {
     const packagePath = pathe_1.default.join(RouteInterface_1.PROJECT_PATH, "package.json");
-    const packageData = await utils_1.UtilFT.loadJSONFile(packagePath);
+    const packageData = await (0, utils_1.memoize)(utils_1.UtilFT.loadJSONFile)(packagePath);
     if (newVersion) {
         checkVersion(packageData.version, newVersion);
         packageData.version = newVersion;
@@ -45,19 +46,43 @@ async function updateVersion(newVersion) {
     await utils_1.UtilFT.writeJSONFile(packagePath, packageData);
     return packageData.version;
 }
+/**获取包名 */
+async function getPackName() {
+    const packagePath = pathe_1.default.join(RouteInterface_1.PROJECT_PATH, "package.json");
+    const packageData = await (0, utils_1.memoize)(utils_1.UtilFT.loadJSONFile)(packagePath);
+    return packageData.name
+        .replace(/\//g, '-')
+        .replace(/^@/g, '');
+}
 /**更新版本号并发布npm包 */
 const CmdRelease = (program) => program
     .command("Release")
     .alias("release")
     .description("更新版本号并发布包")
-    .option("-v, --version <version>", "指定发布的版本号 `${number}.${number}.${number}`")
-    .option("-a, --access <access>", "npm publish 的 access 参数", "public")
+    .option("-v, --version <version>", "指定发布的版本号 格式应为 `${number}.${number}.${number}`")
+    .option("-a, --access <access>", "npm publish 的 access 参数 默认 public", "public")
+    .option("-l, --local <path>", "仅打包到本地对印目录下 如./build/", undefined)
     .action(async (opt) => {
     (0, RouteInterface_1.checkProject)();
     utils_1.SLogger.info(`开始发布项目`);
     try {
         const newVersion = await updateVersion(opt.version);
         utils_1.SLogger.info(`新版本号: ${newVersion}`);
+        if (opt.local) {
+            utils_1.SLogger.info("正在打包...");
+            const fullpath = pathe_1.default.join(process.cwd(), opt.local);
+            await utils_1.UtilFT.ensurePathExists(fullpath, { dir: true });
+            await utils_1.UtilFunc.exec(`npm pack`, { errlvl: 'info' });
+            const packageName = await getPackName();
+            const filelist = await fs_1.default.promises.readdir(process.cwd());
+            await Promise.all(filelist
+                .filter(p => new RegExp(packageName).test(p))
+                .map(async (p) => {
+                const packagePath = pathe_1.default.join(fullpath, p);
+                await fs_1.default.promises.rename(p, packagePath);
+            }));
+            return;
+        }
         utils_1.SLogger.info("正在发布...");
         const cmd = `npm publish --registry ${RouteInterface_1.OFFICIAL_SOURCE} --access ${opt.access}`;
         await utils_1.UtilFunc.exec(cmd, { errlvl: 'info' });

package/dist/UtilInterface.d.ts

@@ -0,0 +1,4 @@
+/**用于辅助解析只能补全的类型
+ * 输出后替换为 ^.*$ 的 string 匹配
+ */
+export type SchemaString = `${string}SchemaString`;

package/dist/UtilInterface.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/index.d.ts

@@ -2,3 +2,4 @@ export * from './UtilDevTool';
 export * from './Command';
 export * from "./QuickFunc";
 export * from './UtilMacro';
+export * from './UtilInterface';

package/dist/index.js

@@ -18,3 +18,4 @@ __exportStar(require("./UtilDevTool"), exports);
 __exportStar(require("./Command"), exports);
 __exportStar(require("./QuickFunc"), exports);
 __exportStar(require("./UtilMacro"), exports);
+__exportStar(require("./UtilInterface"), exports);

package/package.json

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

package/src/Command/ExpandMacro.ts

@@ -1,5 +1,5 @@
 import { Command } from "commander";
-import { UtilDT } from "@src/UtilDevTool";
+import { UtilDT } from "@/src/UtilDevTool";
 
 /**构造macro */
 export const CmdExpandMacro = (program:Command) => program

package/src/Command/GenI18n.ts

@@ -1,7 +1,7 @@
 import { Command } from "commander";
 import { AnyFunc, I18nTextData, SI18n, UtilFT, ivk } from "@zwa73/utils";
 import { Project,SyntaxKind } from 'ts-morph';
-import { UtilAst } from "@src/UtilAst";
+import { UtilAst } from "@/src/UtilAst";
 import path from 'pathe';
 
 function format(str:string){

package/src/Command/GenSchema.ts

@@ -1,5 +1,5 @@
 import { Command } from "commander";
-import { UtilDT } from "@src/UtilDevTool";
+import { UtilDT } from "@/src/UtilDevTool";
 
 /**生成schema */
 export const CmdGenSchema = (program:Command) => program

package/src/Command/Release.ts

@@ -1,9 +1,10 @@
 import { Command } from 'commander';
 import path from 'pathe';
 
-import { SLogger, throwError, UtilFT, UtilFunc } from '@zwa73/utils';
+import { memoize, SLogger, throwError, UtilFT, UtilFunc } from '@zwa73/utils';
 
 import { checkProject, OFFICIAL_SOURCE, PROJECT_PATH } from './RouteInterface';
+import fs from 'fs';
 
 /**解析版本号为number数组 */
 function parseVersion(version: string){
@@ -27,10 +28,11 @@ function checkVersion(oldVersion: string, newVersion: string) {
             break;
     }
 }
+
 /**更新版本号 */
 async function updateVersion(newVersion?: string): Promise<string> {
     const packagePath = path.join(PROJECT_PATH, "package.json");
-    const packageData = await UtilFT.loadJSONFile(packagePath) as any;
+    const packageData = await memoize(UtilFT.loadJSONFile)(packagePath) as any;
     if (newVersion) {
         checkVersion(packageData.version, newVersion);
         packageData.version = newVersion;
@@ -42,19 +44,48 @@ async function updateVersion(newVersion?: string): Promise<string> {
     await UtilFT.writeJSONFile(packagePath, packageData);
     return packageData.version;
 }
+/**获取包名 */
+async function getPackName(){
+    const packagePath = path.join(PROJECT_PATH, "package.json");
+    const packageData = await memoize(UtilFT.loadJSONFile)(packagePath) as any;
+    return packageData.name
+        .replace(/\//g,'-')
+        .replace(/^@/g,'');
+}
+
 /**更新版本号并发布npm包 */
 export const CmdRelease = (program: Command) =>program
     .command("Release")
     .alias("release")
     .description("更新版本号并发布包")
-    .option("-v, --version <version>", "指定发布的版本号 `${number}.${number}.${number}`")
-    .option("-a, --access <access>", "npm publish 的 access 参数","public")
-    .action(async (opt) => {
+    .option("-v, --version <version>", "指定发布的版本号 格式应为 `${number}.${number}.${number}`")
+    .option("-a, --access <access>", "npm publish 的 access 参数 默认 public","public")
+    .option("-l, --local <path>", "仅打包到本地对印目录下 如./build/",undefined)
+    .action(async (opt:{
+        version?: string;
+        access: string;
+        local?: string;
+    }) => {
         checkProject();
         SLogger.info(`开始发布项目`);
         try {
             const newVersion = await updateVersion(opt.version);
             SLogger.info(`新版本号: ${newVersion}`);
+            if(opt.local){
+                SLogger.info("正在打包...");
+                const fullpath = path.join(process.cwd(),opt.local);
+                await UtilFT.ensurePathExists(fullpath,{dir:true});
+                await UtilFunc.exec(`npm pack`,{errlvl:'info'});
+                const packageName = await getPackName();
+                const filelist = await fs.promises.readdir(process.cwd());
+                await Promise.all(filelist
+                    .filter(p=>new RegExp(packageName).test(p))
+                    .map(async p=>{
+                        const packagePath = path.join(fullpath, p);
+                        await fs.promises.rename(p, packagePath);
+                    }))
+                return;
+            }
             SLogger.info("正在发布...");
             const cmd = `npm publish --registry ${OFFICIAL_SOURCE} --access ${opt.access}`;
             await UtilFunc.exec(cmd,{errlvl:'info'});

package/src/UtilInterface.ts

@@ -0,0 +1,5 @@
+
+/**用于辅助解析只能补全的类型  
+ * 输出后替换为 ^.*$ 的 string 匹配  
+ */
+export type SchemaString = `${string}SchemaString`;

package/src/index.ts

@@ -1,4 +1,5 @@
 export * from './UtilDevTool';
 export * from './Command';
 export * from "./QuickFunc";
-export * from './UtilMacro';
+export * from './UtilMacro';
+export * from './UtilInterface';

package/tsconfig.json

@@ -12,9 +12,9 @@
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "paths": {
-      "@src/*": ["./src/*"],
-      "@/*"   : ["./*"],
-      "@"     : ["./src/index"]
+			"@/src/*"           : ["./src/*"],
+			"@/*"               : ["./*"],
+			"@"                 : ["./src/index"]
     }
   },
   "include": ["./src/**/*.ts", "./src/**/*.js","./jest/**/*.ts"],