@zwa73/utils 1.0.74 → 1.0.76

package/dist/UtilFunctions.d.ts

@@ -1,4 +1,4 @@
-import { ComposedClass, ComposedMixinable, JToken, Mixinable, PromiseProcFn, PromiseVerifyFn } from "./UtilInterfaces";
+import { ComposedClass, ComposedMixinable, JObject, JToken, Mixinable, PromiseProcFn, PromiseVerifyFn } from "./UtilInterfaces";
 /**常用函数 */
 export declare namespace UtilFunc {
     /**获取当前时间戳
@@ -12,7 +12,15 @@ export declare namespace UtilFunc {
      * @param defaultVal - 默认值
      * @returns 最终值
      */
-    function initField<T>(obj: Record<string, T>, field: string, defaultVal: T): T;
+    function initField<T extends object, K extends keyof T>(obj: T, field: K, defaultVal: T[K]): T[K];
+    /**初始化一个数据对象
+     * @param obj       - 目标对象
+     * @param checkObj  - 用于检测的对象 在对应key缺失时赋予对应值 如果值为函数, 则赋予执行结果 如果结果为 undefined 则不赋值
+     * @returns 完成初始化的对象
+     */
+    function initObject<T extends JObject>(obj: T, checkObj: {
+        [P in keyof T]: T[P] | (() => void | T[P]);
+    }): any;
     /**生成一串uuid
      * @returns uuid
      */

package/dist/UtilFunctions.js

@@ -27,6 +27,28 @@ var UtilFunc;
         return obj[field];
     }
     UtilFunc.initField = initField;
+    /**初始化一个数据对象
+     * @param obj       - 目标对象
+     * @param checkObj  - 用于检测的对象 在对应key缺失时赋予对应值 如果值为函数, 则赋予执行结果 如果结果为 undefined 则不赋值
+     * @returns 完成初始化的对象
+     */
+    function initObject(obj, checkObj) {
+        const fixobj = obj;
+        for (const key in checkObj) {
+            if (obj[key] !== undefined)
+                continue;
+            const checkVal = checkObj[key];
+            if (typeof checkVal === "function") {
+                const val = checkVal();
+                if (val !== undefined)
+                    fixobj[key] = val;
+            }
+            else
+                fixobj[key] = checkVal;
+        }
+        return fixobj;
+    }
+    UtilFunc.initObject = initObject;
     /**生成一串uuid
      * @returns uuid
      */

package/dist/test/composeTest.js

@@ -86,3 +86,10 @@ insd.getB(); //?
 insd.getNum(); //?
 insd.__a = new A(3);
 insd.getNum(); //?
+let jot = {
+    c: 1
+};
+__1.UtilFunc.initObject(jot, {
+    c: () => console.log("缺少c" + insd.getNum())
+});
+jot; //?

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zwa73/utils",
-  "version": "1.0.74",
+  "version": "1.0.76",
   "description": "my utils",
   "main": "index.js",
   "scripts": {

package/src/UtilFunctions.ts

@@ -1,5 +1,5 @@
 import * as crypto from "crypto";
-import { ComposedClass, ComposedMixinable, FuncPropNames, JToken, Mixinable, PromiseProcFn, PromiseStat, PromiseVerifyFn } from "@src/UtilInterfaces";
+import { ComposedClass, ComposedMixinable, FuncPropNames, JObject, JToken, Mixinable, PromiseProcFn, PromiseStat, PromiseVerifyFn } from "@src/UtilInterfaces";
 import * as cp from "child_process";
 import { SLogger } from "@src/UtilLogger";
 
@@ -19,15 +19,36 @@ export function getTime(): number {
  * @param defaultVal - 默认值
  * @returns 最终值
  */
-export function initField<T>(
-    obj: Record<string, T>,
-    field: string,
-    defaultVal: T
-): T {
+export function initField<T extends object,K extends keyof T>(
+    obj: T,
+    field: K,
+    defaultVal: T[K]
+): T[K] {
     if (!(field in obj)) obj[field] = defaultVal;
     return obj[field];
 }
 
+/**初始化一个数据对象
+ * @param obj       - 目标对象
+ * @param checkObj  - 用于检测的对象 在对应key缺失时赋予对应值 如果值为函数, 则赋予执行结果 如果结果为 undefined 则不赋值
+ * @returns 完成初始化的对象
+ */
+export function initObject<T extends JObject>
+    (obj:T,checkObj:{[P in keyof T]:T[P]|(()=>void|T[P])}){
+    const fixobj = obj as any;
+    for(const key in checkObj){
+        if(obj[key]!==undefined) continue;
+
+        const checkVal = checkObj[key];
+        if(typeof checkVal === "function"){
+            const val = checkVal();
+            if(val!==undefined) fixobj[key] = val;
+        }
+        else fixobj[key] = checkVal;
+    }
+    return fixobj
+}
+
 /**生成一串uuid  
  * @returns uuid
  */

package/src/test/composeTest.ts

@@ -91,3 +91,17 @@ insd.getNum()//?
 insd.__a = new A(3);
 insd.getNum()//?
 
+
+
+type jo = {
+    a?:number,
+    b?:string,
+    c:number,
+}
+let jot = {
+    c:1
+} as jo;
+UtilFunc.initObject(jot,{
+    c:()=>console.log("缺少c"+insd.getNum())
+})
+jot//?