@zwa73/dev-utils 1.0.69 → 1.0.71

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

@@ -1,19 +1,34 @@
-import { assertType } from "@zwa73/utils";
+import { AllExtends, JToken, UtilFT } from "@zwa73/utils";
 import { IpcMainInvokeEvent, app } from "electron";
 
+/**桥函数化 */
+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),
     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/InitElectron.js

@@ -58,7 +58,7 @@ const CmdInitElectron = (program) => program
     utils_1.SLogger.info(`开始初始化设置当前目录 ${RouteInterface_1.PROJECT_PATH}`);
     await Promise.all([
         copyData(),
-        utils_1.UtilFunc.exec(`npm install`, { outlvl: 'info', errlvl: 'warn' })
+        utils_1.UtilFunc.exec(`npm ci`, { outlvl: 'info', errlvl: 'warn' })
     ]);
 });
 exports.CmdInitElectron = CmdInitElectron;

package/package.json

@@ -1,14 +1,13 @@
 {
 	"name": "@zwa73/dev-utils",
-	"version": "1.0.69",
+	"version": "1.0.71",
 	"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/InitElectron.ts

@@ -37,6 +37,6 @@ export const CmdInitElectron = (program:Command)=>program
         SLogger.info(`开始初始化设置当前目录 ${PROJECT_PATH}`);
         await Promise.all([
             copyData(),
-            UtilFunc.exec(`npm install`,{outlvl:'info',errlvl:'warn'})
+            UtilFunc.exec(`npm ci`,{outlvl:'info',errlvl:'warn'})
         ]);
     });