@nocobase/database 1.2.2-alpha → 1.2.4-alpha

package/lib/interfaces/multiple-select-interface.js

@@ -49,7 +49,14 @@ const _MultipleSelectInterface = class _MultipleSelectInterface extends import_b
     const enumConfig = ((_a = this.options.uiSchema) == null ? void 0 : _a.enum) || [];
     return items.map((item) => {
       const option = enumConfig.find((option2) => option2.label === item);
-      return option ? option.value : item;
+      if (option) {
+        return option.value;
+      }
+      const valueOption = enumConfig.find((option2) => option2.value === item);
+      if (valueOption) {
+        return valueOption.value;
+      }
+      throw new Error(`"${item}" is not a valid option in ${ctx.field.name} field.`);
     });
   }
   toString(value, ctx) {

package/lib/interfaces/select-interface.js

@@ -34,9 +34,19 @@ var import_base_interface = require("./base-interface");
 const _SelectInterface = class _SelectInterface extends import_base_interface.BaseInterface {
   async toValue(str, ctx) {
     var _a;
+    if (!str) {
+      return null;
+    }
     const enumConfig = ((_a = this.options.uiSchema) == null ? void 0 : _a.enum) || [];
     const option = enumConfig.find((item) => item.label === str);
-    return (option == null ? void 0 : option.value) || str;
+    if (option) {
+      return option.value;
+    }
+    const valueOption = enumConfig.find((item) => item.value === str);
+    if (valueOption) {
+      return valueOption.value;
+    }
+    throw new Error(`"${str}" is not a valid option in ${ctx.field.name} field.`);
   }
   toString(value, ctx) {
     var _a;

package/lib/interfaces/to-many-interface.js

@@ -44,6 +44,11 @@ const _ToManyInterface = class _ToManyInterface extends import_base_interface.Ba
       },
       transaction
     });
+    items.forEach((item) => {
+      if (!targetInstances.find((targetInstance) => targetInstance[filterKey] === item)) {
+        throw new Error(`"${item}" not found in ${targetCollection.model.name} ${filterKey}`);
+      }
+    });
     const primaryKeyAttribute = targetCollection.model.primaryKeyAttribute;
     return targetInstances.map((targetInstance) => targetInstance[primaryKeyAttribute]);
   }

package/lib/interfaces/to-one-interface.js

@@ -36,6 +36,9 @@ const _ToOneInterface = class _ToOneInterface extends import_base_interface.Base
     return value;
   }
   async toValue(str, ctx) {
+    if (!str) {
+      return null;
+    }
     const { filterKey, targetCollection, transaction } = ctx;
     const targetInstance = await targetCollection.repository.findOne({
       filter: {
@@ -43,11 +46,11 @@ const _ToOneInterface = class _ToOneInterface extends import_base_interface.Base
       },
       transaction
     });
-    const primaryKeyAttribute = targetCollection.model.primaryKeyAttribute;
-    if (targetInstance) {
-      return targetInstance[primaryKeyAttribute];
+    if (!targetInstance) {
+      throw new Error(`"${str}" not found in ${targetCollection.model.name} ${filterKey}`);
     }
-    return null;
+    const primaryKeyAttribute = targetCollection.model.primaryKeyAttribute;
+    return targetInstance[primaryKeyAttribute];
   }
 };
 __name(_ToOneInterface, "ToOneInterface");

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "1.2.2-alpha",
+  "version": "1.2.4-alpha",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/logger": "1.2.2-alpha",
-    "@nocobase/utils": "1.2.2-alpha",
+    "@nocobase/logger": "1.2.4-alpha",
+    "@nocobase/utils": "1.2.4-alpha",
     "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": "d968839548b92e4d4c20614fdb44a17494f84439"
+  "gitHead": "bacfa9133d38339862eee143c516432c2327099e"
 }