@nocobase/database 1.2.3-alpha → 1.2.5-alpha

package/lib/collection.js

@@ -173,6 +173,7 @@ const _Collection = class _Collection extends import_events.EventEmitter {
     this.model = class extends M {
     };
     this.model.init(null, this.sequelizeModelOptions());
+    this.model.options.modelName = this.options.name;
     if (!autoGenId) {
       this.model.removeAttribute("id");
     }

package/lib/database.d.ts

@@ -23,6 +23,7 @@ import { ArrayFieldRepository } from './field-repository/array-field-repository'
 import * as FieldTypes from './fields';
 import { Field, FieldContext, RelationField } from './fields';
 import InheritanceMap from './inherited-map';
+import { InterfaceManager } from './interface-manager';
 import { MigrationItem, Migrations } from './migration';
 import { Model } from './model';
 import { ModelHook } from './model-hook';
@@ -31,7 +32,6 @@ import { RelationRepository } from './relation-repository/relation-repository';
 import { Repository } from './repository';
 import { AfterDefineCollectionListener, BeforeDefineCollectionListener, CreateListener, CreateWithAssociationsListener, DatabaseAfterDefineCollectionEventType, DatabaseAfterRemoveCollectionEventType, DatabaseBeforeDefineCollectionEventType, DatabaseBeforeRemoveCollectionEventType, DestroyListener, EventType, ModelCreateEventTypes, ModelCreateWithAssociationsEventTypes, ModelDestroyEventTypes, ModelSaveEventTypes, ModelSaveWithAssociationsEventTypes, ModelUpdateEventTypes, ModelUpdateWithAssociationsEventTypes, ModelValidateEventTypes, RemoveCollectionListener, SaveListener, SaveWithAssociationsListener, SyncListener, UpdateListener, UpdateWithAssociationsListener, ValidateListener } from './types';
 import { BaseValueParser } from './value-parsers';
-import { InterfaceManager } from './interface-manager';
 export type MergeOptions = merge.Options;
 export interface PendingOptions {
     field: RelationField;

package/lib/database.js

@@ -52,9 +52,9 @@ var import_events = require("events");
 var import_exponential_backoff = require("exponential-backoff");
 var import_glob = __toESM(require("glob"));
 var import_lodash = __toESM(require("lodash"));
-var import_safe_json_stringify = __toESM(require("safe-json-stringify"));
 var import_nanoid = require("nanoid");
 var import_path = require("path");
+var import_safe_json_stringify = __toESM(require("safe-json-stringify"));
 var import_semver = __toESM(require("semver"));
 var import_sequelize = require("sequelize");
 var import_umzug = require("umzug");
@@ -68,16 +68,16 @@ var FieldTypes = __toESM(require("./fields"));
 var import_helpers = require("./helpers");
 var import_inherited_collection = require("./inherited-collection");
 var import_inherited_map = __toESM(require("./inherited-map"));
+var import_interface_manager = require("./interface-manager");
+var import_utils2 = require("./interfaces/utils");
 var import_listeners = require("./listeners");
 var import_migration = require("./migration");
 var import_model_hook = require("./model-hook");
 var import_operators = __toESM(require("./operators"));
 var import_query_interface_builder = __toESM(require("./query-interface/query-interface-builder"));
-var import_utils2 = require("./utils");
+var import_utils3 = require("./utils");
 var import_value_parsers = require("./value-parsers");
 var import_view_collection = require("./view-collection");
-var import_interface_manager = require("./interface-manager");
-var import_utils3 = require("./interfaces/utils");
 const DialectVersionAccessors = {
   sqlite: {
     sql: "select sqlite_version() as version",
@@ -207,7 +207,7 @@ const _Database = class _Database extends import_events.EventEmitter {
         [key]: field
       });
     }
-    (0, import_utils3.registerInterfaces)(this);
+    (0, import_utils2.registerInterfaces)(this);
     (0, import_value_parsers.registerFieldValueParsers)(this);
     this.initOperators();
     const migratorOptions = this.options.migrator || {};
@@ -246,7 +246,7 @@ const _Database = class _Database extends import_events.EventEmitter {
       })
     });
     this.initListener();
-    (0, import_utils2.patchSequelizeQueryInterface)(this);
+    (0, import_utils3.patchSequelizeQueryInterface)(this);
     this.registerCollectionType();
   }
   _instanceId;
@@ -363,13 +363,13 @@ const _Database = class _Database extends import_events.EventEmitter {
       }
       if (options.underscored) {
         if (import_lodash.default.get(options, "sortable.scopeKey")) {
-          options.sortable.scopeKey = (0, import_utils2.snakeCase)(options.sortable.scopeKey);
+          options.sortable.scopeKey = (0, import_utils3.snakeCase)(options.sortable.scopeKey);
         }
         if (import_lodash.default.get(options, "indexes")) {
           options.indexes = options.indexes.map((index) => {
             if (index.fields) {
               index.fields = index.fields.map((field) => {
-                return (0, import_utils2.snakeCase)(field);
+                return (0, import_utils3.snakeCase)(field);
               });
             }
             return index;
@@ -573,7 +573,7 @@ const _Database = class _Database extends import_events.EventEmitter {
     }
     const { collection } = context;
     if (options.field && collection.options.underscored && !collection.isView()) {
-      options.field = (0, import_utils2.snakeCase)(options.field);
+      options.field = (0, import_utils3.snakeCase)(options.field);
     }
     if (Object.prototype.hasOwnProperty.call(options, "defaultValue") && options.defaultValue === null) {
       delete options.defaultValue;
@@ -626,7 +626,7 @@ const _Database = class _Database extends import_events.EventEmitter {
   }
   /* istanbul ignore next -- @preserve */
   async auth(options = {}) {
-    const { retry = 5, ...others } = options;
+    const { retry = 9, ...others } = options;
     const startingDelay = 50;
     const timeMultiple = 2;
     let attemptNumber = 1;

package/lib/fields/sort-field.d.ts

@@ -12,9 +12,7 @@ export declare class SortField extends Field {
     get dataType(): DataTypes.BigIntDataTypeConstructor;
     setSortValue: (instance: any, options: any) => Promise<void>;
     onScopeChange: (instance: any, options: any) => Promise<void>;
-    initRecordsSortValue: ({ transaction }: {
-        transaction: any;
-    }) => Promise<void>;
+    initRecordsSortValue: (options: any) => Promise<void>;
     bind(): void;
     unbind(): void;
 }

package/lib/fields/sort-field.js

@@ -64,7 +64,8 @@ const _SortField = class _SortField extends import_field.Field {
       await this.setSortValue(instance, options);
     }
   };
-  initRecordsSortValue = async ({ transaction }) => {
+  initRecordsSortValue = async (options) => {
+    const { transaction } = options;
     const orderField = (() => {
       const model = this.collection.model;
       if (model.primaryKeyAttribute) {

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/lib/model-hook.js

@@ -56,7 +56,6 @@ const _ModelHook = class _ModelHook {
     return type in hooks ? type : null;
   }
   findModelName(hookArgs) {
-    var _a, _b;
     for (const arg of hookArgs) {
       if (arg == null ? void 0 : arg._previousDataValues) {
         return arg.constructor.name;
@@ -65,13 +64,9 @@ const _ModelHook = class _ModelHook {
         if (arg["model"]) {
           return arg["model"].name;
         }
-        const plural = (_a = arg == null ? void 0 : arg.name) == null ? void 0 : _a.plural;
-        if (this.database.sequelize.isDefined(plural)) {
-          return plural;
-        }
-        const singular = (_b = arg == null ? void 0 : arg.name) == null ? void 0 : _b.singular;
-        if (this.database.sequelize.isDefined(singular)) {
-          return singular;
+        const modelName = arg["modelName"];
+        if (this.database.sequelize.isDefined(modelName)) {
+          return modelName;
         }
       }
     }

package/lib/view/field-type-map.d.ts

@@ -46,7 +46,9 @@ declare const _default: {
         varchar: string[];
         date: string;
         time: string;
+        tinytext: string;
         text: string;
+        mediumtext: string;
         longtext: string;
         int: string[];
         'int unsigned': string[];
@@ -85,7 +87,9 @@ declare const _default: {
         varchar: string[];
         date: string;
         time: string;
+        tinytext: string;
         text: string;
+        mediumtext: string;
         longtext: string;
         int: string[];
         'int unsigned': string[];

package/lib/view/field-type-map.js

@@ -68,7 +68,9 @@ const mysql = {
   varchar: ["string", "uuid", "nanoid"],
   date: "date",
   time: "time",
+  tinytext: "text",
   text: "text",
+  mediumtext: "text",
   longtext: "text",
   int: ["integer", "sort"],
   "int unsigned": ["integer", "sort"],

package/package.json

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