@nocobase/database 2.0.0-alpha.5 → 2.0.0-alpha.50

package/lib/belongs-to-array/belongs-to-array-repository.d.ts

@@ -12,7 +12,6 @@ import { FindOptions } from '../repository';
 import { MultipleRelationRepository } from '../relation-repository/multiple-relation-repository';
 import Database from '../database';
 import { Model } from '../model';
-import { UpdateAssociationOptions } from '../update-associations';
 export declare class BelongsToArrayAssociation {
     db: Database;
     associationType: string;
@@ -35,7 +34,6 @@ export declare class BelongsToArrayAssociation {
     generateInclude(parentAs?: string): {
         on: void;
     };
-    update(instance: Model, value: any, options?: UpdateAssociationOptions): Promise<void>;
 }
 export declare class BelongsToArrayRepository extends MultipleRelationRepository {
     private belongsToArrayAssociation;

package/lib/belongs-to-array/belongs-to-array-repository.js

@@ -94,19 +94,6 @@ const _BelongsToArrayAssociation = class _BelongsToArrayAssociation {
       on: this.db.queryInterface.generateJoinOnForJSONArray(left, right)
     };
   }
-  async update(instance, value, options = {}) {
-    await instance.update(
-      {
-        [this.as]: value
-      },
-      {
-        values: {
-          [this.as]: value
-        },
-        transaction: options == null ? void 0 : options.transaction
-      }
-    );
-  }
 };
 __name(_BelongsToArrayAssociation, "BelongsToArrayAssociation");
 let BelongsToArrayAssociation = _BelongsToArrayAssociation;

package/lib/collection.d.ts

@@ -93,9 +93,6 @@ export declare class Collection<TModelAttributes extends {} = any, TCreationAttr
     validate(options: {
         values: Record<string, any> | Record<string, any>[];
         operation: 'create' | 'update';
-        context: {
-            t: Function;
-        };
     }): void;
     isMultiFilterTargetKey(): boolean;
     tableName(): any;
@@ -129,6 +126,7 @@ export declare class Collection<TModelAttributes extends {} = any, TCreationAttr
     updateOptions(options: CollectionOptions, mergeOptions?: any): this;
     setSortable(sortable: any): void;
     updateField(name: string, options: FieldOptions): void;
+    private normalizeFieldName;
     addIndex(index: string | string[] | {
         fields: string[];
         unique?: boolean;

package/lib/collection.js

@@ -58,6 +58,7 @@ var import_model = require("./model");
 var import_repository = require("./repository");
 var import_utils = require("./utils");
 var import_field_validation = require("./utils/field-validation");
+var import_joi = __toESM(require("joi"));
 function EnsureAtomicity(target, propertyKey, descriptor) {
   const originalMethod = descriptor.value;
   descriptor.value = function(...args) {
@@ -161,50 +162,33 @@ const _Collection = class _Collection extends import_events.EventEmitter {
     }
   }
   validate(options) {
-    const { values: updateValues, context, operation } = options;
+    const { values: updateValues, operation } = options;
     if (!updateValues) {
       return;
     }
     const values = Array.isArray(updateValues) ? updateValues : [updateValues];
-    const { t } = context || { t: /* @__PURE__ */ __name((key, options2) => key, "t") };
-    const unwrapTplLabel = /* @__PURE__ */ __name((label) => {
-      if (typeof label !== "string") return label;
-      const m = label.match(/^[\s\t]*\{\{\s*t\(\s*(['"])(.*?)\1(?:\s*,[\s\S]*)?\)\s*\}\}[\s\t]*$/);
-      return m ? m[2] : label;
-    }, "unwrapTplLabel");
     const helper = /* @__PURE__ */ __name((field, value) => {
-      var _a, _b, _c;
+      var _a, _b;
       const val = value[field.name];
       if (!field.options.validation) {
         return;
       }
-      const fieldLabel = unwrapTplLabel(((_a = field.options.uiSchema) == null ? void 0 : _a.title) || field.name);
       if (field instanceof import_fields.RelationField) {
-        if ((_b = field.options) == null ? void 0 : _b.validation.rules) {
-          const isRequired = (_c = field.options) == null ? void 0 : _c.validation.rules.some((rule) => rule.name === "required");
-          if (isRequired && !val) {
-            throw new Error(
-              t("{{#label}} is required", {
-                ns: "client",
-                "#label": `${t("Collection", { ns: "client" })}: ${this.name}, ${t("Field", { ns: "client" })}: ${t(
-                  fieldLabel,
-                  { ns: "client" }
-                )}`
-              })
-            );
+        const rules = ((_b = (_a = field.options) == null ? void 0 : _a.validation) == null ? void 0 : _b.rules) || [];
+        const required = rules.some((rule) => rule.name === "required");
+        if (required) {
+          const { error: error2 } = import_joi.default.any().empty(null).required().label(`${this.name}.${field.name}`).validate(val);
+          if (error2) {
+            throw error2;
           }
         }
         return;
       }
       const joiSchema = (0, import_field_validation.buildJoiSchema)(field.options.validation, {
-        label: `${t("Collection", { ns: "client" })}: ${this.name}, ${t("Field", { ns: "client" })}: ${t(fieldLabel, {
-          ns: "client"
-        })}`,
+        label: `${this.name}.${field.name}`,
         value: val
       });
-      const { error } = joiSchema.validate(val, {
-        messages: (0, import_field_validation.getJoiErrorMessage)(t)
-      });
+      const { error } = joiSchema.validate(val);
       if (error) {
         throw error;
       }
@@ -613,6 +597,12 @@ const _Collection = class _Collection extends import_events.EventEmitter {
     }
     this.setField(options.name || name, options);
   }
+  normalizeFieldName(val) {
+    if (!this.options.underscored) {
+      return val;
+    }
+    return Array.isArray(val) ? val.map((v) => (0, import_utils.snakeCase)(v)) : (0, import_utils.snakeCase)(val);
+  }
   addIndex(index) {
     if (!index) {
       return;
@@ -642,7 +632,7 @@ const _Collection = class _Collection extends import_events.EventEmitter {
       return;
     }
     for (const item of indexes) {
-      if (import_lodash.default.isEqual(item.fields, indexName)) {
+      if (import_lodash.default.isEqual(this.normalizeFieldName(item.fields), this.normalizeFieldName(indexName))) {
         return;
       }
       const name2 = item.fields.join(",");
@@ -678,11 +668,21 @@ const _Collection = class _Collection extends import_events.EventEmitter {
    */
   refreshIndexes() {
     const indexes = this.model._indexes;
+    const attributes = {};
+    for (const [name, field] of Object.entries(this.model.getAttributes())) {
+      attributes[this.normalizeFieldName(name)] = field;
+    }
     this.model._indexes = import_lodash.default.uniqBy(
       indexes.filter((item) => {
-        return item.fields.every((field) => this.model.rawAttributes[field]);
+        return item.fields.every((field) => {
+          const name = this.normalizeFieldName(field);
+          return attributes[name];
+        });
       }).map((item) => {
-        item.fields = item.fields.map((field) => this.model.rawAttributes[field].field);
+        item.fields = item.fields.map((field) => {
+          const name = this.normalizeFieldName(field);
+          return attributes[name].field;
+        });
         return item;
       }),
       "name"

package/lib/database.d.ts

@@ -215,6 +215,7 @@ export declare class Database extends EventEmitter implements AsyncEmitter {
     private registerCollectionType;
     quoteIdentifier(identifier: string): string;
     quoteTable(tableName: string): string;
+    private runSQLWithSchema;
     runSQL(sql: string, options?: RunSQLOptions): Promise<any>;
 }
 export declare function extendCollection(collectionOptions: CollectionOptions, mergeOptions?: MergeOptions): {

package/lib/database.js

@@ -287,8 +287,8 @@ const _Database = class _Database extends import_events.EventEmitter {
    */
   initListener() {
     this.on("afterConnect", async (client) => {
-      if (this.inDialect("postgres")) {
-        await client.query("SET search_path = public");
+      if (this.isPostgresCompatibleDialect()) {
+        await client.query("SET search_path TO public");
       }
     });
     this.on("beforeDefine", (model, options) => {
@@ -431,11 +431,7 @@ const _Database = class _Database extends import_events.EventEmitter {
    */
   collection(options) {
     options = import_lodash.default.cloneDeep(options);
-    if (typeof options.underscored !== "boolean") {
-      if (this.options.underscored) {
-        options.underscored = true;
-      }
-    }
+    options.underscored = options.underscored ?? this.options.underscored;
     this.logger.trace(`beforeDefineCollection: ${(0, import_safe_json_stringify.default)(options)}`, {
       databaseInstanceId: this.instanceId
     });
@@ -791,18 +787,28 @@ const _Database = class _Database extends import_events.EventEmitter {
   quoteTable(tableName) {
     return this.sequelize.getQueryInterface().quoteIdentifiers(tableName);
   }
+  async runSQLWithSchema(finalSQL, bind, transaction) {
+    if (!this.options.schema || !this.isPostgresCompatibleDialect()) {
+      return this.sequelize.query(finalSQL, { bind, transaction });
+    }
+    const execute = /* @__PURE__ */ __name(async (t) => {
+      await this.sequelize.query(`SET LOCAL search_path TO ${this.options.schema}`, { transaction: t });
+      return this.sequelize.query(finalSQL, { bind, transaction: t });
+    }, "execute");
+    return transaction ? execute(transaction) : this.sequelize.transaction(execute);
+  }
   async runSQL(sql, options = {}) {
     const { filter, bind, type, transaction } = options;
     let finalSQL = sql;
     if (!finalSQL.replace(/\s+/g, " ").trim()) {
       throw new Error("SQL cannot be empty");
     }
+    const queryGenerator = this.sequelize.getQueryInterface().queryGenerator;
     if (filter) {
       let where = {};
       const tmpCollection = new import_collection.Collection({ name: "tmp", underscored: false }, { database: this });
       const r = tmpCollection.repository;
       where = r.buildQueryOptions({ filter }).where;
-      const queryGenerator = this.sequelize.getQueryInterface().queryGenerator;
       const wSQL = queryGenerator.getWhereConditions(where, null, null, { bindParam: true });
       if (wSQL) {
         let normalizedSQL = sql.replace(/\s+/g, " ").trim();
@@ -813,7 +819,7 @@ const _Database = class _Database extends import_events.EventEmitter {
       }
     }
     this.logger.debug("runSQL", { finalSQL });
-    const result = await this.sequelize.query(finalSQL, { bind, transaction });
+    const result = await this.runSQLWithSchema(finalSQL, bind, transaction);
     let data = result[0];
     if (type === "selectVar") {
       if (Array.isArray(data)) {

package/lib/dialects/mariadb-dialect.js

@@ -35,7 +35,12 @@ module.exports = __toCommonJS(mariadb_dialect_exports);
 var import_base_dialect = require("./base-dialect");
 const _MariadbDialect = class _MariadbDialect extends import_base_dialect.BaseDialect {
   getSequelizeOptions(options) {
-    options.dialectOptions = { ...options.dialectOptions || {}, supportBigNumbers: true, bigNumberStrings: true };
+    options.dialectOptions = {
+      ...options.dialectOptions || {},
+      multipleStatements: true,
+      supportBigNumbers: true,
+      bigNumberStrings: true
+    };
     return options;
   }
   getVersionGuard() {

package/lib/dialects/postgres-dialect.js

@@ -52,9 +52,6 @@ const _PostgresDialect = class _PostgresDialect extends import_base_dialect.Base
     if (!options.hooks["afterConnect"]) {
       options.hooks["afterConnect"] = [];
     }
-    options.hooks["afterConnect"].push(async (connection) => {
-      await connection.query("SET search_path TO public;");
-    });
     return options;
   }
   getVersionGuard() {

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

@@ -215,7 +215,8 @@ const _EagerLoadingTree = class _EagerLoadingTree {
             attributes: [primaryKeyField],
             group: `${node.model.name}.${primaryKeyField}`,
             transaction,
-            include: (0, import_utils.processIncludes)(includeForFilter, node.model)
+            include: (0, import_utils.processIncludes)(includeForFilter, node.model),
+            raw: true
           })).map((row) => {
             return { row, pk: row[primaryKeyField] };
           });

package/lib/fields/index.d.ts

@@ -27,7 +27,6 @@ import { UidFieldOptions } from './uid-field';
 import { UUIDFieldOptions } from './uuid-field';
 import { VirtualFieldOptions } from './virtual-field';
 import { NanoidFieldOptions } from './nanoid-field';
-import { EncryptionField } from './encryption-field';
 import { UnixTimestampFieldOptions } from './unix-timestamp-field';
 import { DateOnlyFieldOptions } from './date-only-field';
 import { DatetimeNoTzFieldOptions } from './datetime-no-tz-field';
@@ -59,7 +58,6 @@ export * from './uid-field';
 export * from './uuid-field';
 export * from './virtual-field';
 export * from './nanoid-field';
-export * from './encryption-field';
 export * from './unix-timestamp-field';
 export * from './snowflake-id-field';
-export type FieldOptions = BaseFieldOptions | StringFieldOptions | IntegerFieldOptions | FloatFieldOptions | DecimalFieldOptions | DoubleFieldOptions | RealFieldOptions | JsonFieldOptions | JsonbFieldOptions | BooleanFieldOptions | RadioFieldOptions | TextFieldOptions | VirtualFieldOptions | ArrayFieldOptions | SetFieldOptions | TimeFieldOptions | DateFieldOptions | DatetimeTzFieldOptions | DatetimeNoTzFieldOptions | DateOnlyFieldOptions | UnixTimestampFieldOptions | UidFieldOptions | UUIDFieldOptions | NanoidFieldOptions | PasswordFieldOptions | ContextFieldOptions | BelongsToFieldOptions | HasOneFieldOptions | HasManyFieldOptions | BelongsToManyFieldOptions | EncryptionField | SnowflakeIdFieldOptions;
+export type FieldOptions = BaseFieldOptions | StringFieldOptions | IntegerFieldOptions | FloatFieldOptions | DecimalFieldOptions | DoubleFieldOptions | RealFieldOptions | JsonFieldOptions | JsonbFieldOptions | BooleanFieldOptions | RadioFieldOptions | TextFieldOptions | VirtualFieldOptions | ArrayFieldOptions | SetFieldOptions | TimeFieldOptions | DateFieldOptions | DatetimeTzFieldOptions | DatetimeNoTzFieldOptions | DateOnlyFieldOptions | UnixTimestampFieldOptions | UidFieldOptions | UUIDFieldOptions | NanoidFieldOptions | PasswordFieldOptions | ContextFieldOptions | BelongsToFieldOptions | HasOneFieldOptions | HasManyFieldOptions | BelongsToManyFieldOptions | SnowflakeIdFieldOptions;

package/lib/fields/index.js

@@ -49,7 +49,6 @@ __reExport(fields_exports, require("./uid-field"), module.exports);
 __reExport(fields_exports, require("./uuid-field"), module.exports);
 __reExport(fields_exports, require("./virtual-field"), module.exports);
 __reExport(fields_exports, require("./nanoid-field"), module.exports);
-__reExport(fields_exports, require("./encryption-field"), module.exports);
 __reExport(fields_exports, require("./unix-timestamp-field"), module.exports);
 __reExport(fields_exports, require("./snowflake-id-field"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
@@ -80,7 +79,6 @@ __reExport(fields_exports, require("./snowflake-id-field"), module.exports);
   ...require("./uuid-field"),
   ...require("./virtual-field"),
   ...require("./nanoid-field"),
-  ...require("./encryption-field"),
   ...require("./unix-timestamp-field"),
   ...require("./snowflake-id-field")
 });

package/lib/index.d.ts

@@ -7,6 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 export { BaseError, BelongsToGetAssociationMixin, DataTypes, fn, HasManyCountAssociationsMixin, HasManyCreateAssociationMixin, HasManyGetAssociationsMixin, literal, ModelStatic, Op, SyncOptions, Transaction, UniqueConstraintError, ValidationError, ValidationErrorItem, where, } from 'sequelize';
+export { ValidationError as JoiValidationError } from 'joi';
 export * from './belongs-to-array/belongs-to-array-repository';
 export * from './collection';
 export * from './collection-group-manager';
@@ -35,11 +36,12 @@ export * from './repository';
 export * from './relation-repository/relation-repository';
 export { default as sqlParser, SQLParserTypes } from './sql-parser';
 export * from './update-associations';
-export { snakeCase } from './utils';
+export { snakeCase, extractTypeFromDefinition } from './utils';
 export * from './value-parsers';
 export * from './view-collection';
 export { default as fieldTypeMap } from './view/field-type-map';
 export * from './view/view-inference';
 export * from './update-guard';
+export { TableInfo } from './query-interface/query-interface';
 export { default as operators } from './operators';
 export { filterIncludes, mergeIncludes } from './utils/filter-include';

package/lib/index.js

@@ -44,15 +44,18 @@ __export(src_exports, {
   HasManyCountAssociationsMixin: () => import_sequelize.HasManyCountAssociationsMixin,
   HasManyCreateAssociationMixin: () => import_sequelize.HasManyCreateAssociationMixin,
   HasManyGetAssociationsMixin: () => import_sequelize.HasManyGetAssociationsMixin,
+  JoiValidationError: () => import_joi.ValidationError,
   ModelStatic: () => import_sequelize.ModelStatic,
   Op: () => import_sequelize.Op,
   SQLParserTypes: () => import_sql_parser.SQLParserTypes,
   SyncOptions: () => import_sequelize.SyncOptions,
+  TableInfo: () => import_query_interface.TableInfo,
   Transaction: () => import_sequelize.Transaction,
   UniqueConstraintError: () => import_sequelize.UniqueConstraintError,
   ValidationError: () => import_sequelize.ValidationError,
   ValidationErrorItem: () => import_sequelize.ValidationErrorItem,
   default: () => import_database.Database,
+  extractTypeFromDefinition: () => import_utils.extractTypeFromDefinition,
   fieldTypeMap: () => import_field_type_map.default,
   filterIncludes: () => import_filter_include.filterIncludes,
   fn: () => import_sequelize.fn,
@@ -65,6 +68,7 @@ __export(src_exports, {
 });
 module.exports = __toCommonJS(src_exports);
 var import_sequelize = require("sequelize");
+var import_joi = require("joi");
 __reExport(src_exports, require("./belongs-to-array/belongs-to-array-repository"), module.exports);
 __reExport(src_exports, require("./collection"), module.exports);
 __reExport(src_exports, require("./collection-group-manager"), module.exports);
@@ -99,6 +103,7 @@ __reExport(src_exports, require("./view-collection"), module.exports);
 var import_field_type_map = __toESM(require("./view/field-type-map"));
 __reExport(src_exports, require("./view/view-inference"), module.exports);
 __reExport(src_exports, require("./update-guard"), module.exports);
+var import_query_interface = require("./query-interface/query-interface");
 var import_operators = __toESM(require("./operators"));
 var import_filter_include = require("./utils/filter-include");
 // Annotate the CommonJS export names for ESM import in node:
@@ -110,14 +115,17 @@ var import_filter_include = require("./utils/filter-include");
   HasManyCountAssociationsMixin,
   HasManyCreateAssociationMixin,
   HasManyGetAssociationsMixin,
+  JoiValidationError,
   ModelStatic,
   Op,
   SQLParserTypes,
   SyncOptions,
+  TableInfo,
   Transaction,
   UniqueConstraintError,
   ValidationError,
   ValidationErrorItem,
+  extractTypeFromDefinition,
   fieldTypeMap,
   filterIncludes,
   fn,

package/lib/interfaces/time-interface.js

@@ -47,7 +47,7 @@ import_dayjs.default.extend(import_utc.default);
 const _TimeInterface = class _TimeInterface extends import_base_interface.BaseInterface {
   toValue(value, ctx) {
     if (this.validate(value)) {
-      const result = import_dayjs.default.utc(value).format("HH:mm:ss");
+      const result = (0, import_dayjs.default)(value).format("HH:mm:ss");
       return result;
     }
     return value;

package/lib/{fields/encryption-field/index.d.ts → operators/in.d.ts}

@@ -6,6 +6,5 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-export * from './encryption-field';
-export * from './utils';
-export * from './errors/EncryptionError';
+declare const _default: Record<string, any>;
+export default _default;

package/lib/{fields/encryption-field/errors/EncryptionError.js → operators/in.js}

@@ -11,7 +11,6 @@ var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -25,20 +24,17 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var EncryptionError_exports = {};
-__export(EncryptionError_exports, {
-  EncryptionError: () => EncryptionError
+var in_exports = {};
+__export(in_exports, {
+  default: () => in_default
 });
-module.exports = __toCommonJS(EncryptionError_exports);
-const _EncryptionError = class _EncryptionError extends Error {
-  constructor(message, options) {
-    super(message, options);
-    this.name = "EncryptionError";
+module.exports = __toCommonJS(in_exports);
+var import_lodash = require("lodash");
+var import_sequelize = require("sequelize");
+var in_default = {
+  $in(val, ctx) {
+    return {
+      [import_sequelize.Op.in]: val == null ? [] : (0, import_lodash.castArray)(val)
+    };
   }
 };
-__name(_EncryptionError, "EncryptionError");
-let EncryptionError = _EncryptionError;
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  EncryptionError
-});

package/lib/operators/index.js

@@ -46,6 +46,7 @@ var import_empty = __toESM(require("./empty"));
 var import_string = __toESM(require("./string"));
 var import_eq = __toESM(require("./eq"));
 var import_ne = __toESM(require("./ne"));
+var import_in = __toESM(require("./in"));
 var import_notIn = __toESM(require("./notIn"));
 var import_boolean = __toESM(require("./boolean"));
 var import_child_collection = __toESM(require("./child-collection"));
@@ -57,6 +58,7 @@ var operators_default = {
   ...import_string.default,
   ...import_eq.default,
   ...import_ne.default,
+  ...import_in.default,
   ...import_notIn.default,
   ...import_boolean.default,
   ...import_child_collection.default

package/lib/relation-repository/belongs-to-many-repository.js

@@ -88,8 +88,7 @@ const _BelongsToManyRepository = class _BelongsToManyRepository extends import_m
     };
     this.collection.validate({
       values,
-      operation: "create",
-      context: options.context
+      operation: "create"
     });
     const instance = await sourceModel[createAccessor](values, createOptions);
     await (0, import_update_associations.updateAssociations)(instance, values, { ...options, transaction: transaction2 });

package/lib/relation-repository/relation-repository.js

@@ -178,7 +178,7 @@ const _RelationRepository = class _RelationRepository {
     const values = options.values;
     const transaction2 = await this.getTransaction(options);
     const sourceModel = await this.getSourceModel(transaction2);
-    this.collection.validate({ values, context: options.context, operation: "create" });
+    this.collection.validate({ values, operation: "create" });
     const instance = await sourceModel[createAccessor](guard.sanitize(options.values), { ...options, transaction: transaction2 });
     await (0, import_update_associations.updateAssociations)(instance, values, { ...options, transaction: transaction2 });
     if (options.hooks !== false) {

package/lib/relation-repository/single-relation-repository.js

@@ -51,7 +51,6 @@ module.exports = __toCommonJS(single_relation_repository_exports);
 var import_target_collection_decorator = __toESM(require("../decorators/target-collection-decorator"));
 var import_update_associations = require("../update-associations");
 var import_relation_repository = require("./relation-repository");
-var import_lodash = __toESM(require("lodash"));
 const _SingleRelationRepository = class _SingleRelationRepository extends import_relation_repository.RelationRepository {
   async remove(options) {
     const transaction2 = await this.getTransaction(options);
@@ -104,7 +103,7 @@ const _SingleRelationRepository = class _SingleRelationRepository extends import
       throw new Error("The record does not exist");
     }
     await (0, import_update_associations.updateModelByValues)(target, options == null ? void 0 : options.values, {
-      ...import_lodash.default.omit(options, "values"),
+      ...options,
       transaction: transaction2
     });
     if (options.hooks !== false) {

package/lib/repository.js

@@ -453,7 +453,7 @@ const _Repository = class _Repository {
       underscored: this.collection.options.underscored
     });
     const values = this.model.callSetters(guard.sanitize(options.values || {}), options);
-    this.validate({ values, context: options.context, operation: "create" });
+    this.validate({ values, operation: "create" });
     const instance = await this.model.create(values, {
       ...options,
       transaction: transaction2
@@ -498,7 +498,7 @@ const _Repository = class _Repository {
     const transaction2 = await this.getTransaction(options);
     const guard = import_update_guard.UpdateGuard.fromOptions(this.model, { ...options, underscored: this.collection.options.underscored });
     const values = this.model.callSetters(guard.sanitize(options.values || {}), options);
-    this.validate({ values, context: options.context, operation: "update" });
+    this.validate({ values, operation: "update" });
     if (options.individualHooks === false) {
       const { model: Model2 } = this.collection;
       const primaryKeyField = Model2.primaryKeyField || Model2.primaryKeyAttribute;

package/lib/sync-runner.js

@@ -162,6 +162,9 @@ const _SyncRunner = class _SyncRunner {
     }, "isJSONColumn");
     for (const columnName in columns) {
       const column = columns[columnName];
+      if (isJSONColumn(column) && this.database.inDialect("mysql")) {
+        continue;
+      }
       const isPrimaryKey = /* @__PURE__ */ __name(() => {
         const attribute = this.findAttributeByColumnName(columnName);
         return attribute && attribute.primaryKey || column.primaryKey;

package/lib/update-associations.d.ts

@@ -13,9 +13,7 @@ export declare function modelAssociations(instance: Model): {
     [key: string]: Association<import("sequelize").Model<any, any>, import("sequelize").Model<any, any>>;
 };
 export declare function belongsToManyAssociations(instance: Model): Array<BelongsToMany>;
-export declare function modelAssociationByKey(instance: Model, key: string): Association & {
-    update?: (instance: Model, value: any, options: UpdateAssociationOptions) => Promise<any>;
-};
+export declare function modelAssociationByKey(instance: Model, key: string): Association;
 type UpdateValue = {
     [key: string]: any;
 };
@@ -51,7 +49,7 @@ export declare function updateAssociations(instance: Model, values: any, options
  * @param value
  * @param options
  */
-export declare function updateAssociation(instance: Model, key: string, value: any, options?: UpdateAssociationOptions): Promise<any>;
+export declare function updateAssociation(instance: Model, key: string, value: any, options?: UpdateAssociationOptions): Promise<boolean>;
 /**
  * update belongsTo and HasOne
  * @param model

package/lib/update-associations.js

@@ -81,8 +81,7 @@ async function updateModelByValues(instance, values, options) {
   }
   instance.constructor.collection.validate({
     values,
-    operation: "update",
-    context: options == null ? void 0 : options.context
+    operation: "update"
   });
   await instance.update(values, options);
   await updateAssociations(instance, values, options);
@@ -177,9 +176,6 @@ async function updateAssociation(instance, key, value, options = {}) {
   if (options.associationContext && isReverseAssociationPair(association, options.associationContext)) {
     return false;
   }
-  if (association.update) {
-    return association.update(instance, value, options);
-  }
   switch (association.associationType) {
     case "HasOne":
     case "BelongsTo":
@@ -259,7 +255,7 @@ async function updateSingleAssociation(model, key, value, options = {}) {
         if (association.associationType === "HasOne") {
           delete updateValues[association.foreignKey];
         }
-        await instance2.update(updateValues, { ...options, transaction });
+        await instance2.update(updateValues, { ...options, transaction, inputValues: updateValues });
       }
       await updateAssociations(instance2, value, {
         ...options,
@@ -273,10 +269,9 @@ async function updateSingleAssociation(model, key, value, options = {}) {
   }
   association.target.collection.validate({
     values: value,
-    context: options.context,
     operation: "create"
   });
-  const instance = await model[createAccessor](value, { context, transaction });
+  const instance = await model[createAccessor](value, { context, transaction, inputValues: value });
   await updateAssociations(instance, value, {
     ...options,
     transaction,
@@ -368,10 +363,9 @@ async function updateMultipleAssociation(model, key, value, options = {}) {
     if ((0, import_utils.isUndefinedOrNull)(item[targetKey])) {
       association.target.collection.validate({
         values: item,
-        context: options.context,
         operation: "create"
       });
-      const instance = await model[createAccessor](item, accessorOptions);
+      const instance = await model[createAccessor](item, { ...accessorOptions, inputValues: item });
       await updateAssociations(instance, item, {
         ...options,
         transaction,
@@ -390,10 +384,9 @@ async function updateMultipleAssociation(model, key, value, options = {}) {
       if (!instance) {
         association.target.collection.validate({
           values: item,
-          context: options.context,
           operation: "create"
         });
-        instance = await model[createAccessor](item, accessorOptions);
+        instance = await model[createAccessor](item, { ...accessorOptions, inputValues: item });
         await updateAssociations(instance, item, {
           ...options,
           transaction,
@@ -414,10 +407,9 @@ async function updateMultipleAssociation(model, key, value, options = {}) {
         }
         association.target.collection.validate({
           values: item,
-          context: options.context,
           operation: "update"
         });
-        await instance.update(item, { ...options, transaction });
+        await instance.update(item, { ...options, transaction, inputValues: item });
       }
       await updateAssociations(instance, item, {
         ...options,

package/lib/utils/field-validation.d.ts

@@ -12,48 +12,3 @@ export declare function buildJoiSchema(validation: ValidationOptions, options: {
     label?: string;
     value: string;
 }): AnySchema;
-export declare function getJoiErrorMessage(t: Function): {
-    'string.base': any;
-    'string.empty': any;
-    'string.min': any;
-    'string.max': any;
-    'string.length': any;
-    'string.alphanum': any;
-    'string.token': any;
-    'string.regex': any;
-    'string.email': any;
-    'string.uri': any;
-    'string.uriCustomScheme': any;
-    'string.isoDate': any;
-    'string.guid': any;
-    'string.hex': any;
-    'string.hostname': any;
-    'string.lowercase': any;
-    'string.uppercase': any;
-    'string.trim': any;
-    'string.creditCard': any;
-    'string.pattern.base': any;
-    'string.pattern.name': any;
-    'string.pattern.invert.base': any;
-    'string.pattern.invert.name': any;
-    'any.required': any;
-    'number.base': any;
-    'number.min': any;
-    'number.max': any;
-    'number.less': any;
-    'number.greater': any;
-    'number.float': any;
-    'number.integer': any;
-    'number.negative': any;
-    'number.positive': any;
-    'number.precision': any;
-    'number.multiple': any;
-    'number.port': any;
-    'number.unsafe': any;
-    'date.base': any;
-    'date.format': any;
-    'date.greater': any;
-    'date.less': any;
-    'date.max': any;
-    'date.min': any;
-};

package/lib/utils/field-validation.js

@@ -37,8 +37,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var field_validation_exports = {};
 __export(field_validation_exports, {
-  buildJoiSchema: () => buildJoiSchema,
-  getJoiErrorMessage: () => getJoiErrorMessage
+  buildJoiSchema: () => buildJoiSchema
 });
 module.exports = __toCommonJS(field_validation_exports);
 var import_joi = __toESM(require("joi"));
@@ -80,64 +79,7 @@ function buildJoiSchema(validation, options) {
   return schema;
 }
 __name(buildJoiSchema, "buildJoiSchema");
-function getJoiErrorMessage(t) {
-  const tOptions = { ns: "client" };
-  const JoiErrorMessages = {
-    "string.base": t("{{#label}} must be a string", tOptions),
-    "string.empty": t("{{#label}} is not allowed to be empty", tOptions),
-    "string.min": t("{{#label}} length must be at least {{#limit}} characters long", tOptions),
-    "string.max": t("{{#label}} length must be less than or equal to {{#limit}} characters long", tOptions),
-    "string.length": t("{{#label}} length must be {{#limit}} characters long", tOptions),
-    "string.alphanum": t("{{#label}} must only contain alpha-numeric characters", tOptions),
-    "string.token": t("{{#label}} must only contain alpha-numeric and underscore characters", tOptions),
-    "string.regex": t("{{#label}} with value {{#value}} fails to match the required pattern", tOptions),
-    "string.email": t("{{#label}} email address doesn\u2019t meet the required format", tOptions),
-    "string.uri": t("{{#label}} must be a valid uri", tOptions),
-    "string.uriCustomScheme": t(
-      "{{#label}} must be a valid uri with a scheme matching the {{#scheme}} pattern",
-      tOptions
-    ),
-    "string.isoDate": t("{{#label}} must be a valid ISO 8601 date", tOptions),
-    "string.guid": t("{{#label}} must be a valid UUID", tOptions),
-    "string.hex": t("{{#label}} must only contain hexadecimal characters", tOptions),
-    "string.hostname": t("{{#label}} must be a valid hostname", tOptions),
-    "string.lowercase": t("{{#label}} must only contain lowercase characters", tOptions),
-    "string.uppercase": t("{{#label}} must only contain uppercase characters", tOptions),
-    "string.trim": t("{{#label}} must not have leading or trailing whitespace", tOptions),
-    "string.creditCard": t("{{#label}} must be a credit card", tOptions),
-    "string.pattern.base": t('{{#label}} with value "{{#value}}" fails to match the required pattern', tOptions),
-    "string.pattern.name": t('{{#label}} with value "{{#value}}" fails to match the {{#name}} pattern', tOptions),
-    "string.pattern.invert.base": t('{{#label}} with value "{{#value}}" matches the inverted pattern', tOptions),
-    "string.pattern.invert.name": t(
-      '{{#label}} with value "{{#value}}" matches the inverted {{#name}} pattern',
-      tOptions
-    ),
-    "any.required": t("{{#label}} is required", tOptions),
-    "number.base": t("{{#label}} must be a number", tOptions),
-    "number.min": t("{{#label}} must be greater than or equal to {{#limit}}", tOptions),
-    "number.max": t("{{#label}} must be less than or equal to {{#limit}}", tOptions),
-    "number.less": t("{{#label}} must be less than {{#limit}}", tOptions),
-    "number.greater": t("{{#label}} must be greater than {{#limit}}", tOptions),
-    "number.float": t("{{#label}} must be a float or double", tOptions),
-    "number.integer": t("{{#label}} must be an integer", tOptions),
-    "number.negative": t("{{#label}} must be a negative number", tOptions),
-    "number.positive": t("{{#label}} must be a positive number", tOptions),
-    "number.precision": t("{{#label}} must not have more than {{#limit}} decimal places", tOptions),
-    "number.multiple": t("{{#label}} must be a multiple of {{#multiple}}", tOptions),
-    "number.port": t("{{#label}} must be a valid port", tOptions),
-    "number.unsafe": t("{{#label}} must be a safe number", tOptions),
-    "date.base": t("{{#label}} must be a valid date", tOptions),
-    "date.format": t("{{#label}} must be in {{#format}} format", tOptions),
-    "date.greater": t("{{#label}} must be greater than {{#limit}}", tOptions),
-    "date.less": t("{{#label}} must be less than {{#limit}}", tOptions),
-    "date.max": t("{{#label}} must be less than or equal to {{#limit}}", tOptions),
-    "date.min": t("{{#label}} must be greater than or equal to {{#limit}}", tOptions)
-  };
-  return JoiErrorMessages;
-}
-__name(getJoiErrorMessage, "getJoiErrorMessage");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  buildJoiSchema,
-  getJoiErrorMessage
+  buildJoiSchema
 });

package/lib/utils.d.ts

@@ -16,4 +16,5 @@ export declare function percent2float(value: string): number;
 export declare function isUndefinedOrNull(value: any): boolean;
 export declare function isStringOrNumber(value: any): boolean;
 export declare function getKeysByPrefix(keys: string[], prefix: string): string[];
+export declare function extractTypeFromDefinition(rawType: string): string;
 export declare function processIncludes(includes: any[], model: any, parentAs?: string): any[];

package/lib/utils.js

@@ -38,6 +38,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var utils_exports = {};
 __export(utils_exports, {
   checkIdentifier: () => checkIdentifier,
+  extractTypeFromDefinition: () => extractTypeFromDefinition,
   getKeysByPrefix: () => getKeysByPrefix,
   getTableName: () => getTableName,
   isStringOrNumber: () => isStringOrNumber,
@@ -141,6 +142,14 @@ function getKeysByPrefix(keys, prefix) {
   return keys.filter((key) => key.startsWith(`${prefix}.`)).map((key) => key.substring(prefix.length + 1));
 }
 __name(getKeysByPrefix, "getKeysByPrefix");
+function extractTypeFromDefinition(rawType) {
+  const leftParenIndex = rawType.indexOf("(");
+  if (leftParenIndex === -1) {
+    return rawType.toLowerCase();
+  }
+  return rawType.substring(0, leftParenIndex).toLowerCase().trim();
+}
+__name(extractTypeFromDefinition, "extractTypeFromDefinition");
 function processIncludes(includes, model, parentAs = "") {
   includes.forEach((include, index) => {
     const association = model.associations[include.association];
@@ -164,6 +173,7 @@ __name(processIncludes, "processIncludes");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   checkIdentifier,
+  extractTypeFromDefinition,
   getKeysByPrefix,
   getTableName,
   isStringOrNumber,

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

@@ -39,7 +39,7 @@ const postgres = {
   name: "string",
   smallint: ["integer", "sort"],
   integer: ["integer", "unixTimestamp", "sort"],
-  bigint: ["bigInt", "unixTimestamp", "sort"],
+  bigint: ["bigInt", "snowflakeId", "unixTimestamp", "sort"],
   decimal: "decimal",
   numeric: "float",
   real: "float",
@@ -77,7 +77,7 @@ const mysql = {
   int: ["integer", "unixTimestamp", "sort"],
   "int unsigned": ["integer", "unixTimestamp", "sort"],
   integer: ["integer", "unixTimestamp", "sort"],
-  bigint: ["bigInt", "unixTimestamp", "sort"],
+  bigint: ["bigInt", "snowflakeId", "unixTimestamp", "sort"],
   "bigint unsigned": ["bigInt", "unixTimestamp", "sort"],
   float: "float",
   double: "float",

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "2.0.0-alpha.5",
+  "version": "2.0.0-alpha.50",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/logger": "2.0.0-alpha.5",
-    "@nocobase/utils": "2.0.0-alpha.5",
+    "@nocobase/logger": "2.0.0-alpha.50",
+    "@nocobase/utils": "2.0.0-alpha.50",
     "async-mutex": "^0.3.2",
     "chalk": "^4.1.1",
     "cron-parser": "4.4.0",
@@ -39,5 +39,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/database"
   },
-  "gitHead": "943e035bbec27f9ecfe8ce8857955945f20976f3"
+  "gitHead": "a6eb64abf3632e116ad0b295a7f410270a1059d1"
 }

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

@@ -1,20 +0,0 @@
-/**
- * This file is part of the NocoBase (R) project.
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
- * Authors: NocoBase Team.
- *
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
- * For more information, please refer to: https://www.nocobase.com/agreement.
- */
-import { DataTypes } from 'sequelize';
-import { BaseColumnFieldOptions, Field } from '../field';
-export interface EncryptionFieldOptions extends BaseColumnFieldOptions {
-    type: 'encryption';
-    hidden?: boolean;
-}
-export declare class EncryptionField extends Field {
-    get dataType(): DataTypes.StringDataTypeConstructor;
-    init(): void;
-    bind(): void;
-    unbind(): void;
-}

package/lib/fields/encryption-field/encryption-field.js

@@ -1,110 +0,0 @@
-/**
- * This file is part of the NocoBase (R) project.
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
- * Authors: NocoBase Team.
- *
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
- * For more information, please refer to: https://www.nocobase.com/agreement.
- */
-
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var encryption_field_exports = {};
-__export(encryption_field_exports, {
-  EncryptionField: () => EncryptionField
-});
-module.exports = __toCommonJS(encryption_field_exports);
-var import_sequelize = require("sequelize");
-var import_EncryptionError = require("./errors/EncryptionError");
-var import_utils = require("./utils");
-var import_field = require("../field");
-const _EncryptionField = class _EncryptionField extends import_field.Field {
-  get dataType() {
-    return import_sequelize.DataTypes.STRING;
-  }
-  init() {
-    (0, import_utils.aesCheckKey)();
-    const { name, iv } = this.options;
-    this.writeListener = async (model) => {
-      (0, import_utils.aesCheckKey)();
-      if (!model.changed(name)) {
-        return;
-      }
-      const value = model.get(name);
-      if (value !== void 0 && value !== null) {
-        try {
-          const encrypted = await (0, import_utils.aesEncrypt)(value, iv);
-          model.set(name, encrypted);
-        } catch (error) {
-          console.error(error);
-          if (error instanceof import_EncryptionError.EncryptionError) {
-            throw error;
-          } else {
-            throw new import_EncryptionError.EncryptionError("Encryption failed");
-          }
-        }
-      } else {
-        model.set(name, null);
-      }
-    };
-    this.findListener = async (instances, options) => {
-      (0, import_utils.aesCheckKey)();
-      instances = Array.isArray(instances) ? instances : [instances];
-      await Promise.all(
-        instances.map(async (instance) => {
-          var _a;
-          const value = (_a = instance.get) == null ? void 0 : _a.call(instance, name);
-          if (value !== void 0 && value !== null) {
-            try {
-              instance.set(name, await (0, import_utils.aesDecrypt)(value, iv));
-            } catch (error) {
-              console.error(error);
-              if (error instanceof import_EncryptionError.EncryptionError) {
-                throw error;
-              } else {
-                throw new import_EncryptionError.EncryptionError(
-                  "Decryption failed, the environment variable `ENCRYPTION_FIELD_KEY` may be incorrect"
-                );
-              }
-            }
-          }
-          return instance;
-        })
-      );
-    };
-  }
-  bind() {
-    super.bind();
-    this.on("afterFind", this.findListener);
-    this.on("beforeSave", this.writeListener);
-    this.on("beforeBulkCreate", this.writeListener);
-  }
-  unbind() {
-    super.unbind();
-    this.off("afterFind", this.findListener);
-    this.off("beforeSave", this.writeListener);
-    this.off("beforeBulkCreate", this.writeListener);
-  }
-};
-__name(_EncryptionField, "EncryptionField");
-let EncryptionField = _EncryptionField;
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  EncryptionField
-});

package/lib/fields/encryption-field/errors/EncryptionError.d.ts

@@ -1,11 +0,0 @@
-/**
- * This file is part of the NocoBase (R) project.
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
- * Authors: NocoBase Team.
- *
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
- * For more information, please refer to: https://www.nocobase.com/agreement.
- */
-export declare class EncryptionError extends Error {
-    constructor(message?: string, options?: ErrorOptions);
-}

package/lib/fields/encryption-field/index.js

@@ -1,34 +0,0 @@
-/**
- * This file is part of the NocoBase (R) project.
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
- * Authors: NocoBase Team.
- *
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
- * For more information, please refer to: https://www.nocobase.com/agreement.
- */
-
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var encryption_field_exports = {};
-module.exports = __toCommonJS(encryption_field_exports);
-__reExport(encryption_field_exports, require("./encryption-field"), module.exports);
-__reExport(encryption_field_exports, require("./utils"), module.exports);
-__reExport(encryption_field_exports, require("./errors/EncryptionError"), module.exports);
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  ...require("./encryption-field"),
-  ...require("./utils"),
-  ...require("./errors/EncryptionError")
-});

package/lib/fields/encryption-field/utils.d.ts

@@ -1,6 +0,0 @@
-export declare function aesEncrypt(text: string, ivString?: string): Promise<unknown>;
-export declare function aesDecrypt(encrypted: string, ivString?: string): Promise<unknown>;
-export declare function aesEncryptSync(text: string, ivString?: string): string;
-export declare function aseDecryptSync(encrypted: string, ivString?: string): string;
-export declare function aesCheckKey(): void;
-export declare function checkValueAndIv(type: 'Decrypt' | 'Encrypt', value: string, iv: string): void;

package/lib/fields/encryption-field/utils.js

@@ -1,152 +0,0 @@
-/**
- * This file is part of the NocoBase (R) project.
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
- * Authors: NocoBase Team.
- *
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
- * For more information, please refer to: https://www.nocobase.com/agreement.
- */
-
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key2 of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key2) && key2 !== except)
-        __defProp(to, key2, { get: () => from[key2], enumerable: !(desc = __getOwnPropDesc(from, key2)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var utils_exports = {};
-__export(utils_exports, {
-  aesCheckKey: () => aesCheckKey,
-  aesDecrypt: () => aesDecrypt,
-  aesEncrypt: () => aesEncrypt,
-  aesEncryptSync: () => aesEncryptSync,
-  aseDecryptSync: () => aseDecryptSync,
-  checkValueAndIv: () => checkValueAndIv
-});
-module.exports = __toCommonJS(utils_exports);
-var import_crypto = __toESM(require("crypto"));
-var import_EncryptionError = require("./errors/EncryptionError");
-const algorithm = "aes-256-cbc";
-const keyString = process.env.ENCRYPTION_FIELD_KEY || "";
-const defaultIvString = process.env.ENCRYPTION_FIELD_IV || "Vc53-4G(rTi0vg@a";
-const key = Buffer.from(keyString, "utf8");
-function aesEncrypt(text, ivString = defaultIvString) {
-  checkValueAndIv("Encrypt", text, ivString);
-  return new Promise((resolve, reject) => {
-    const iv = Buffer.from(ivString, "utf8");
-    const cipher = import_crypto.default.createCipheriv(algorithm, key, iv);
-    let encrypted = "";
-    cipher.setEncoding("hex");
-    cipher.on("data", (chunk) => {
-      encrypted += chunk;
-    });
-    cipher.on("end", () => {
-      resolve(encrypted);
-    });
-    cipher.on("error", (err) => {
-      reject(err);
-    });
-    cipher.write(text);
-    cipher.end();
-  });
-}
-__name(aesEncrypt, "aesEncrypt");
-function aesDecrypt(encrypted, ivString = defaultIvString) {
-  checkValueAndIv("Decrypt", encrypted, ivString);
-  return new Promise((resolve, reject) => {
-    const iv = Buffer.from(ivString, "utf8");
-    const decipher = import_crypto.default.createDecipheriv(algorithm, key, iv);
-    let decrypted = "";
-    decipher.setEncoding("utf8");
-    decipher.on("data", (chunk) => {
-      decrypted += chunk;
-    });
-    decipher.on("end", () => {
-      resolve(decrypted);
-    });
-    decipher.on("error", (err) => {
-      reject(err);
-    });
-    decipher.write(encrypted, "hex");
-    decipher.end();
-  });
-}
-__name(aesDecrypt, "aesDecrypt");
-function aesEncryptSync(text, ivString = defaultIvString) {
-  checkValueAndIv("Encrypt", text, ivString);
-  const iv = Buffer.from(ivString, "utf8");
-  const cipher = import_crypto.default.createCipheriv(algorithm, key, iv);
-  let encrypted = cipher.update(text, "utf8", "hex");
-  encrypted += cipher.final("hex");
-  return encrypted;
-}
-__name(aesEncryptSync, "aesEncryptSync");
-function aseDecryptSync(encrypted, ivString = defaultIvString) {
-  checkValueAndIv("Decrypt", encrypted, ivString);
-  const iv = Buffer.from(ivString, "utf8");
-  const decipher = import_crypto.default.createDecipheriv(algorithm, key, iv);
-  let decrypted = decipher.update(encrypted, "hex", "utf8");
-  decrypted += decipher.final("utf8");
-  return decrypted;
-}
-__name(aseDecryptSync, "aseDecryptSync");
-function aesCheckKey() {
-  if (!keyString) {
-    throw new import_EncryptionError.EncryptionError("The environment variable `ENCRYPTION_FIELD_KEY` is required, please set it");
-  }
-  if (typeof keyString !== "string") {
-    throw new import_EncryptionError.EncryptionError("The environment variable `ENCRYPTION_FIELD_KEY` must be a string");
-  }
-  if (keyString.length !== 32) {
-    throw new import_EncryptionError.EncryptionError("The environment variable `ENCRYPTION_FIELD_KEY` must be a 32-character string");
-  }
-}
-__name(aesCheckKey, "aesCheckKey");
-function checkValueAndIv(type, value, iv) {
-  const msg = `${type} Failed: `;
-  if (typeof value !== "string") {
-    throw new import_EncryptionError.EncryptionError(msg + "The value must be a string, but got " + typeof value);
-  }
-  if (type === "Decrypt") {
-    if (value.length % 2 !== 0) {
-      throw new import_EncryptionError.EncryptionError(msg + `The encrypted value is invalid, not a hex string. The value is "${value}"`);
-    }
-  }
-  if (typeof iv !== "string") {
-    throw new import_EncryptionError.EncryptionError(msg + "The `iv` must be a string, but got " + typeof iv);
-  }
-  if (iv.length !== 16) {
-    throw new import_EncryptionError.EncryptionError(msg + "The `iv` must be a 16-character string");
-  }
-}
-__name(checkValueAndIv, "checkValueAndIv");
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  aesCheckKey,
-  aesDecrypt,
-  aesEncrypt,
-  aesEncryptSync,
-  aseDecryptSync,
-  checkValueAndIv
-});