wenay-common 1.0.141 → 1.0.142

package/lib/Exchange/CParams.d.ts

@@ -193,6 +193,7 @@ export type IParamsExpandable = {
 export type IParamsExpandableReadonly = ReadonlyFull<IParamsExpandable>;
 export declare function isParamGroupOrArray<TParam extends IParamReadonly>(param: TParam): param is Extract<TParam, ReadonlyFull<IParamGroup | IParamArr<any>>>;
 export declare function isParamGroup<TParam extends IParamReadonly>(param: TParam): param is Extract<TParam, ReadonlyFull<IParamGroup>>;
+export declare function isSimpleParams(params: IParams | SimpleParams): boolean;
 type ObjectKeyPath<TObject extends object = object, TValue = unknown> = readonly string[];
 export declare function iterateParams<TObj extends IParamsReadonly, TVal extends IParamReadonly = TObj[string]>(obj: TObj, currentPath?: ObjectKeyPath<TObj, TVal>): Generator<[key: string, value: TVal, path: ObjectKeyPath<TObj, TVal>]>;
 export declare function enableAllParams<T extends IParamsReadonly>(params: T, enabled?: boolean): T;
@@ -212,5 +213,5 @@ export type SimpleParamsMutable<T> = T extends const_Date ? const_Date : Mutable
 };
 export type SimpleParams<T = IParams> = ReadonlyFull<SimpleParamsMutable<T>>;
 export declare function GetSimpleParams<T extends ReadonlyFull<IParams>>(params: T): SimpleParamsMutable<T>;
-export declare function mergeParamValuesToInfos<TParams extends IParamsReadonly>(srcObj: TParams, valuesObj: SimpleParams): TParams;
+export declare function mergeParamValuesToInfos<TParams extends IParamsReadonly>(srcObj: IParams, valuesObj: SimpleParams | IParams): TParams;
 export {};

package/lib/Exchange/CParams.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mergeParamValuesToInfos = exports.GetSimpleParams = exports.enableAllParams = exports.iterateParams = exports.isParamGroup = exports.isParamGroupOrArray = exports.CParamsReadonly = exports.CParams = exports.isParamBase = void 0;
+exports.mergeParamValuesToInfos = exports.GetSimpleParams = exports.enableAllParams = exports.iterateParams = exports.isSimpleParams = exports.isParamGroup = exports.isParamGroupOrArray = exports.CParamsReadonly = exports.CParams = exports.isParamBase = void 0;
 const common_1 = require("../Common/common");
 {
     let ts = "2025-06-01 16:25:25";
@@ -27,6 +27,23 @@ function isParamGroup(param) {
     return isParamGroupOrArray(param) && !Array.isArray(param.value);
 }
 exports.isParamGroup = isParamGroup;
+function isSimpleParams(params) {
+    let t = false;
+    for (let key in params) {
+        const tr = params[key]["volume"];
+        if (!tr)
+            return true;
+        else {
+            if (typeof tr == "object") {
+                const r = isSimpleParams(tr);
+                if (r)
+                    return true;
+            }
+        }
+    }
+    return false;
+}
+exports.isSimpleParams = isSimpleParams;
 function* iterateParams(obj, currentPath = []) {
     for (let [key, param] of Object.entries(obj)) {
         let keyPath = currentPath.concat(key);
@@ -174,6 +191,6 @@ function convert_(valuesObj, srcObj) {
     return resObj;
 }
 function mergeParamValuesToInfos(srcObj, valuesObj) {
-    return convert_(valuesObj, srcObj);
+    return convert_(isSimpleParams(valuesObj) ? valuesObj : GetSimpleParams(valuesObj), srcObj);
 }
 exports.mergeParamValuesToInfos = mergeParamValuesToInfos;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wenay-common",
-  "version": "1.0.141",
+  "version": "1.0.142",
   "description": "Common library",
   "strict": true,
   "main": "lib/index.js",