@nocobase/database 2.1.0-alpha.6 → 2.1.0-alpha.8

package/lib/collection.js

@@ -188,7 +188,7 @@ const _Collection = class _Collection extends import_events.EventEmitter {
         label: `${this.name}.${field.name}`,
         value: val
       });
-      const { error } = joiSchema.validate(val);
+      const { error } = joiSchema.validate(val, { convert: false });
       if (error) {
         throw error;
       }

package/lib/eager-loading/eager-loading-tree.js

@@ -149,6 +149,11 @@ const _EagerLoadingTree = class _EagerLoadingTree {
           const { sourceKey } = association;
           pushAttribute(eagerLoadingTreeParent, sourceKey);
         }
+        if (associationType == "BelongsToArray") {
+          const { foreignKey, targetKey } = association;
+          pushAttribute(eagerLoadingTreeParent, foreignKey);
+          pushAttribute(child, targetKey);
+        }
         eagerLoadingTreeParent.children.push(child);
         if (include.include) {
           traverseIncludeOption(include.include, child);

package/lib/utils/field-validation.js

@@ -58,16 +58,17 @@ function buildJoiSchema(validation, options) {
   }
   if (rules) {
     rules.forEach((rule) => {
-      if (!import_lodash.default.isEmpty(rule.args)) {
-        if (rule.name === "pattern" && !import_lodash.default.isRegExp(rule.args.regex)) {
-          const lastSlash = rule.args.regex.lastIndexOf("/");
-          const isRegExpStr = rule.args.regex.startsWith("/") && lastSlash > 0;
+      const args = import_lodash.default.cloneDeep(rule.args);
+      if (!import_lodash.default.isEmpty(args)) {
+        if (rule.name === "pattern" && !import_lodash.default.isRegExp(args.regex)) {
+          const lastSlash = args.regex.lastIndexOf("/");
+          const isRegExpStr = args.regex.startsWith("/") && lastSlash > 0;
           if (isRegExpStr) {
-            rule.args.regex = rule.args.regex.slice(1, lastSlash);
+            args.regex = args.regex.slice(1, lastSlash);
           }
-          rule.args.regex = new RegExp(rule.args.regex);
+          args.regex = new RegExp(args.regex);
         }
-        schema = rule.paramsType === "object" ? schema[rule.name](rule.args) : schema[rule.name](...Object.values(rule.args));
+        schema = rule.paramsType === "object" ? schema[rule.name](args) : schema[rule.name](...Object.values(args));
       } else {
         schema = schema[rule.name]();
       }

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "2.1.0-alpha.6",
+  "version": "2.1.0-alpha.8",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
   "dependencies": {
-    "@nocobase/logger": "2.1.0-alpha.6",
-    "@nocobase/utils": "2.1.0-alpha.6",
+    "@nocobase/logger": "2.1.0-alpha.8",
+    "@nocobase/utils": "2.1.0-alpha.8",
     "async-mutex": "^0.3.2",
     "chalk": "^4.1.1",
     "cron-parser": "4.4.0",
@@ -38,5 +38,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/database"
   },
-  "gitHead": "189dc0eb7683a8330db1e4c5fd46ee871b8b4e1f"
+  "gitHead": "eda3bfb9df40d4394905e178f1c5331adbec4e76"
 }