@nocobase/utils 1.7.0-beta.13 → 1.7.0-beta.15

package/lib/assign.js

@@ -53,8 +53,14 @@ function getKeys(target) {
 }
 __name(getKeys, "getKeys");
 const mergeStrategies = /* @__PURE__ */ new Map();
-mergeStrategies.set("overwrite", (_, y) => {
-  if (typeof y === "string") {
+mergeStrategies.set("overwrite", (x, y) => {
+  if (y === void 0) {
+    if (typeof x === "string" && x.includes(",")) {
+      return x.split(",");
+    }
+    return x;
+  }
+  if (typeof y === "string" && y.includes(",")) {
     y = y.split(",");
   }
   return y;
@@ -123,15 +129,22 @@ mergeStrategies.set(
   })().filter(Boolean)
 );
 function assign(target, source, strategies = {}) {
-  getKeys(source).forEach((sourceKey) => {
+  const sourceKeys = getKeys(source);
+  const targetKeys = getKeys(target);
+  import_lodash.default.uniq([...sourceKeys, ...targetKeys]).forEach((sourceKey) => {
     const strategy = strategies[sourceKey];
-    let func = mergeStrategies.get("deepMerge");
+    let func;
     if (typeof strategy === "function") {
       func = strategy;
     } else if (typeof strategy === "string" && mergeStrategies.has(strategy)) {
       func = mergeStrategies.get(strategy);
     }
-    target[sourceKey] = func(target[sourceKey], source[sourceKey]);
+    if (func) {
+      target[sourceKey] = func(target[sourceKey], source[sourceKey]);
+    } else if (sourceKeys.includes(sourceKey)) {
+      const func2 = mergeStrategies.get("deepMerge");
+      target[sourceKey] = func2(target[sourceKey], source[sourceKey]);
+    }
   });
   return target;
 }

package/lib/dayjs.js

@@ -42,6 +42,7 @@ module.exports = __toCommonJS(dayjs_exports);
 var import_dayjs = __toESM(require("dayjs"));
 var import_advancedFormat = __toESM(require("dayjs/plugin/advancedFormat"));
 var import_customParseFormat = __toESM(require("dayjs/plugin/customParseFormat"));
+var import_duration = __toESM(require("dayjs/plugin/duration"));
 var import_isBetween = __toESM(require("dayjs/plugin/isBetween"));
 var import_isSameOrAfter = __toESM(require("dayjs/plugin/isSameOrAfter"));
 var import_isSameOrBefore = __toESM(require("dayjs/plugin/isSameOrBefore"));
@@ -66,6 +67,7 @@ import_dayjs.default.extend(import_weekOfYear.default);
 import_dayjs.default.extend(import_weekYear.default);
 import_dayjs.default.extend(import_customParseFormat.default);
 import_dayjs.default.extend(import_advancedFormat.default);
+import_dayjs.default.extend(import_duration.default);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   dayjs

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/utils",
-  "version": "1.7.0-beta.13",
+  "version": "1.7.0-beta.15",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
@@ -16,5 +16,5 @@
     "multer": "^1.4.5-lts.1",
     "object-path": "^0.11.8"
   },
-  "gitHead": "e5c152b727dbedd54b67e450b11523df5acc51c6"
+  "gitHead": "b0792740852a55981b2f23ad622faeee332cf678"
 }