@nocobase/database 1.7.0-beta.2 → 1.7.0-beta.20

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

@@ -31,8 +31,8 @@ export declare class BelongsToArrayAssociation {
         targetKey: string;
     });
     get target(): import("sequelize/types").ModelStatic<Model<any, any>>;
-    generateInclude(): {
-        on: import("sequelize/types/utils").Literal;
+    generateInclude(parentAs?: string): {
+        on: void;
     };
     update(instance: Model, value: any, options?: UpdateAssociationOptions): Promise<void>;
 }

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

@@ -78,19 +78,18 @@ const _BelongsToArrayAssociation = class _BelongsToArrayAssociation {
   get target() {
     return this.db.getModel(this.targetName);
   }
-  generateInclude() {
-    if (this.db.sequelize.getDialect() !== "postgres") {
-      throw new Error("Filtering by many to many (array) associations is only supported on postgres");
-    }
+  generateInclude(parentAs) {
     const targetCollection = this.db.getCollection(this.targetName);
     const targetField = targetCollection.getField(this.targetKey);
     const sourceCollection = this.db.getCollection(this.source.name);
     const foreignField = sourceCollection.getField(this.foreignKey);
     const queryInterface = this.db.sequelize.getQueryInterface();
-    const left = queryInterface.quoteIdentifiers(`${this.as}.${targetField.columnName()}`);
-    const right = queryInterface.quoteIdentifiers(`${this.source.collection.name}.${foreignField.columnName()}`);
+    const asLeft = parentAs ? `${parentAs}->${this.as}` : this.as;
+    const asRight = parentAs || this.source.collection.name;
+    const left = queryInterface.quoteIdentifiers(`${asLeft}.${targetField.columnName()}`);
+    const right = queryInterface.quoteIdentifiers(`${asRight}.${foreignField.columnName()}`);
     return {
-      on: this.db.sequelize.literal(`${left}=any(${right})`)
+      on: this.db.queryInterface.generateJoinOnForJSONArray(left, right)
     };
   }
   async update(instance, value, options = {}) {

package/lib/collection.js

@@ -287,9 +287,20 @@ const _Collection = class _Collection extends import_events.EventEmitter {
     if (!field) {
       return;
     }
-    if (options.type !== field.type) {
-      throw new Error(`fields with same column must be of the same type ${JSON.stringify(options)}`);
+    if (options.type === field.type) {
+      return;
+    }
+    const isContextTypeMatch = /* @__PURE__ */ __name((data, dataType) => {
+      var _a, _b;
+      return [(_a = data.dataType) == null ? void 0 : _a.key, (_b = data.type) == null ? void 0 : _b.toUpperCase()].includes(dataType == null ? void 0 : dataType.toUpperCase());
+    }, "isContextTypeMatch");
+    if (options.type === "context" && isContextTypeMatch(field, options.dataType)) {
+      return;
+    }
+    if (field.type === "context" && isContextTypeMatch(options, field.dataType.key)) {
+      return;
     }
+    throw new Error(`fields with same column must be of the same type ${JSON.stringify(options)}`);
   }
   /**
    * @internal

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

@@ -85,6 +85,25 @@ const queryParentSQL = /* @__PURE__ */ __name((options) => {
       )
       SELECT ${q(targetKeyField)} AS ${q(targetKey)}, ${q(foreignKeyField)} AS ${q(foreignKey)} FROM cte`;
 }, "queryParentSQL");
+const processIncludes = /* @__PURE__ */ __name((includes, model, parentAs = "") => {
+  includes.forEach((include, index) => {
+    const association = model.associations[include.association];
+    if (association == null ? void 0 : association.generateInclude) {
+      includes[index] = {
+        ...include,
+        ...association.generateInclude(parentAs)
+      };
+    }
+    if (include.include && Array.isArray(include.include) && include.include.length > 0) {
+      const nextModel = association == null ? void 0 : association.target;
+      if (!nextModel) {
+        return;
+      }
+      processIncludes(include.include, nextModel, parentAs ? `${parentAs}->${association.as}` : association.as);
+    }
+  });
+  return includes;
+}, "processIncludes");
 const _EagerLoadingTree = class _EagerLoadingTree {
   root;
   db;
@@ -208,22 +227,13 @@ const _EagerLoadingTree = class _EagerLoadingTree {
           if (!primaryKeyField) {
             throw new Error(`Model ${node.model.name} does not have primary key`);
           }
-          includeForFilter.forEach((include, index) => {
-            const association = node.model.associations[include.association];
-            if ((association == null ? void 0 : association.associationType) == "BelongsToArray") {
-              includeForFilter[index] = {
-                ...include,
-                ...association.generateInclude()
-              };
-            }
-          });
           const ids2 = (await node.model.findAll({
             ...this.rootQueryOptions,
             includeIgnoreAttributes: false,
             attributes: [primaryKeyField],
             group: `${node.model.name}.${primaryKeyField}`,
             transaction,
-            include: includeForFilter
+            include: processIncludes(includeForFilter, node.model)
           })).map((row) => {
             return { row, pk: row[primaryKeyField] };
           });

package/lib/fields/datetime-no-tz-field.d.ts

@@ -13,7 +13,7 @@ declare class DatetimeNoTzTypeMySQL extends DataTypes.ABSTRACT {
 }
 export declare class DatetimeNoTzField extends Field {
     get dataType(): typeof DatetimeNoTzTypeMySQL;
-    init(): void;
+    beforeSave: (instance: any, options: any) => Promise<void>;
     additionalSequelizeOptions(): {};
     bind(): void;
     unbind(): void;

package/lib/fields/datetime-no-tz-field.js

@@ -61,48 +61,49 @@ const _DatetimeNoTzField = class _DatetimeNoTzField extends import_field.Field {
     if (this.database.isMySQLCompatibleDialect()) {
       return DatetimeNoTzTypeMySQL;
     }
-    return import_sequelize.DataTypes.STRING;
+    return import_sequelize.DataTypes.DATE;
   }
-  init() {
+  beforeSave = /* @__PURE__ */ __name(async (instance, options) => {
     const { name, defaultToCurrentTime, onUpdateToCurrentTime } = this.options;
-    this.beforeSave = async (instance, options) => {
-      const value = instance.get(name);
-      if (!value && instance.isNewRecord && defaultToCurrentTime) {
-        instance.set(name, /* @__PURE__ */ new Date());
-        return;
-      }
-      if (onUpdateToCurrentTime) {
-        instance.set(name, /* @__PURE__ */ new Date());
-        return;
-      }
-    };
-  }
+    const value = instance.get(name);
+    if (!value && instance.isNewRecord && defaultToCurrentTime) {
+      instance.set(name, /* @__PURE__ */ new Date());
+      return;
+    }
+    if (onUpdateToCurrentTime) {
+      instance.set(name, /* @__PURE__ */ new Date());
+      return;
+    }
+  }, "beforeSave");
   additionalSequelizeOptions() {
     const { name } = this.options;
     const timezone = this.database.options.rawTimezone || "+00:00";
     const isPg = this.database.inDialect("postgres");
+    const isMySQLCompatibleDialect = this.database.isMySQLCompatibleDialect();
     return {
       get() {
         const val = this.getDataValue(name);
         if (val instanceof Date) {
-          if (isPg) {
-            return (0, import_moment.default)(val).format("YYYY-MM-DD HH:mm:ss");
-          }
-          const momentVal = (0, import_moment.default)(val).utcOffset(timezone);
+          const momentVal = (0, import_moment.default)(val);
           return momentVal.format("YYYY-MM-DD HH:mm:ss");
         }
         return val;
       },
       set(val) {
-        if (typeof val === "string" && isIso8601(val)) {
-          const momentVal = (0, import_moment.default)(val).utcOffset(timezone);
-          val = momentVal.format("YYYY-MM-DD HH:mm:ss");
+        if (val == null) {
+          return this.setDataValue(name, null);
+        }
+        const dateOffset = (/* @__PURE__ */ new Date()).getTimezoneOffset();
+        const momentVal = (0, import_moment.default)(val);
+        if (typeof val === "string" && isIso8601(val) || val instanceof Date) {
+          momentVal.utcOffset(timezone);
+          momentVal.utcOffset(-dateOffset, true);
         }
-        if (val && val instanceof Date) {
-          const momentVal = (0, import_moment.default)(val).utcOffset(timezone);
-          val = momentVal.format("YYYY-MM-DD HH:mm:ss");
+        if (isMySQLCompatibleDialect) {
+          momentVal.millisecond(0);
         }
-        return this.setDataValue(name, val);
+        const date = momentVal.toDate();
+        return this.setDataValue(name, date);
       }
     };
   }

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

@@ -10,8 +10,12 @@ import { DataTypes } from 'sequelize';
 import { BaseColumnFieldOptions, Field } from './field';
 export declare class StringField extends Field {
     get dataType(): DataTypes.StringDataTypeConstructor | DataTypes.StringDataType;
+    additionalSequelizeOptions(): {
+        set(value: any): void;
+    };
 }
 export interface StringFieldOptions extends BaseColumnFieldOptions {
     type: 'string';
     length?: number;
+    trim?: boolean;
 }

package/lib/fields/string-field.js

@@ -39,6 +39,14 @@ const _StringField = class _StringField extends import_field.Field {
     }
     return import_sequelize.DataTypes.STRING;
   }
+  additionalSequelizeOptions() {
+    const { name, trim } = this.options;
+    return {
+      set(value) {
+        this.setDataValue(name, trim ? value == null ? void 0 : value.trim() : value);
+      }
+    };
+  }
 };
 __name(_StringField, "StringField");
 let StringField = _StringField;

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

@@ -11,8 +11,12 @@ import { BaseColumnFieldOptions, Field } from './field';
 export declare class TextField extends Field {
     get dataType(): DataTypes.TextDataTypeConstructor | DataTypes.TextDataType;
     init(): void;
+    additionalSequelizeOptions(): {
+        set(value: any): void;
+    };
 }
 export interface TextFieldOptions extends BaseColumnFieldOptions {
     type: 'text';
     length?: 'tiny' | 'medium' | 'long';
+    trim?: boolean;
 }

package/lib/fields/text-field.js

@@ -44,6 +44,14 @@ const _TextField = class _TextField extends import_field.Field {
       this.options.defaultValue = null;
     }
   }
+  additionalSequelizeOptions() {
+    const { name, trim } = this.options;
+    return {
+      set(value) {
+        this.setDataValue(name, trim ? value == null ? void 0 : value.trim() : value);
+      }
+    };
+  }
 };
 __name(_TextField, "TextField");
 let TextField = _TextField;

package/lib/index.d.ts

@@ -7,16 +7,20 @@
  * 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 * from './belongs-to-array/belongs-to-array-repository';
 export * from './collection';
 export * from './collection-group-manager';
 export * from './collection-importer';
 export * from './database';
 export { Database as default } from './database';
+export * from './dialects';
 export * from './field-repository/array-field-repository';
 export * from './fields';
 export * from './filter-match';
 export { default as FilterParser } from './filter-parser';
+export * from './helpers';
 export * from './inherited-collection';
+export * from './interfaces';
 export * from './magic-attribute-model';
 export * from './migration';
 export * from './mock-database';
@@ -24,17 +28,14 @@ export * from './model';
 export * from './relation-repository/belongs-to-many-repository';
 export * from './relation-repository/belongs-to-repository';
 export * from './relation-repository/hasmany-repository';
+export * from './relation-repository/hasone-repository';
 export * from './relation-repository/multiple-relation-repository';
 export * from './relation-repository/single-relation-repository';
-export * from './belongs-to-array/belongs-to-array-repository';
 export * from './repository';
+export { default as sqlParser, SQLParserTypes } from './sql-parser';
 export * from './update-associations';
 export { snakeCase } from './utils';
 export * from './value-parsers';
 export * from './view-collection';
-export * from './view/view-inference';
-export * from './helpers';
-export { default as sqlParser, SQLParserTypes } from './sql-parser';
-export * from './interfaces';
 export { default as fieldTypeMap } from './view/field-type-map';
-export * from './dialects';
+export * from './view/view-inference';

package/lib/index.js

@@ -62,16 +62,20 @@ __export(src_exports, {
 });
 module.exports = __toCommonJS(src_exports);
 var import_sequelize = require("sequelize");
+__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);
 __reExport(src_exports, require("./collection-importer"), module.exports);
 __reExport(src_exports, require("./database"), module.exports);
 var import_database = require("./database");
+__reExport(src_exports, require("./dialects"), module.exports);
 __reExport(src_exports, require("./field-repository/array-field-repository"), module.exports);
 __reExport(src_exports, require("./fields"), module.exports);
 __reExport(src_exports, require("./filter-match"), module.exports);
 var import_filter_parser = __toESM(require("./filter-parser"));
+__reExport(src_exports, require("./helpers"), module.exports);
 __reExport(src_exports, require("./inherited-collection"), module.exports);
+__reExport(src_exports, require("./interfaces"), module.exports);
 __reExport(src_exports, require("./magic-attribute-model"), module.exports);
 __reExport(src_exports, require("./migration"), module.exports);
 __reExport(src_exports, require("./mock-database"), module.exports);
@@ -79,20 +83,17 @@ __reExport(src_exports, require("./model"), module.exports);
 __reExport(src_exports, require("./relation-repository/belongs-to-many-repository"), module.exports);
 __reExport(src_exports, require("./relation-repository/belongs-to-repository"), module.exports);
 __reExport(src_exports, require("./relation-repository/hasmany-repository"), module.exports);
+__reExport(src_exports, require("./relation-repository/hasone-repository"), module.exports);
 __reExport(src_exports, require("./relation-repository/multiple-relation-repository"), module.exports);
 __reExport(src_exports, require("./relation-repository/single-relation-repository"), module.exports);
-__reExport(src_exports, require("./belongs-to-array/belongs-to-array-repository"), module.exports);
 __reExport(src_exports, require("./repository"), module.exports);
+var import_sql_parser = __toESM(require("./sql-parser"));
 __reExport(src_exports, require("./update-associations"), module.exports);
 var import_utils = require("./utils");
 __reExport(src_exports, require("./value-parsers"), module.exports);
 __reExport(src_exports, require("./view-collection"), module.exports);
-__reExport(src_exports, require("./view/view-inference"), module.exports);
-__reExport(src_exports, require("./helpers"), module.exports);
-var import_sql_parser = __toESM(require("./sql-parser"));
-__reExport(src_exports, require("./interfaces"), module.exports);
 var import_field_type_map = __toESM(require("./view/field-type-map"));
-__reExport(src_exports, require("./dialects"), module.exports);
+__reExport(src_exports, require("./view/view-inference"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   BaseError,
@@ -116,14 +117,18 @@ __reExport(src_exports, require("./dialects"), module.exports);
   snakeCase,
   sqlParser,
   where,
+  ...require("./belongs-to-array/belongs-to-array-repository"),
   ...require("./collection"),
   ...require("./collection-group-manager"),
   ...require("./collection-importer"),
   ...require("./database"),
+  ...require("./dialects"),
   ...require("./field-repository/array-field-repository"),
   ...require("./fields"),
   ...require("./filter-match"),
+  ...require("./helpers"),
   ...require("./inherited-collection"),
+  ...require("./interfaces"),
   ...require("./magic-attribute-model"),
   ...require("./migration"),
   ...require("./mock-database"),
@@ -131,15 +136,12 @@ __reExport(src_exports, require("./dialects"), module.exports);
   ...require("./relation-repository/belongs-to-many-repository"),
   ...require("./relation-repository/belongs-to-repository"),
   ...require("./relation-repository/hasmany-repository"),
+  ...require("./relation-repository/hasone-repository"),
   ...require("./relation-repository/multiple-relation-repository"),
   ...require("./relation-repository/single-relation-repository"),
-  ...require("./belongs-to-array/belongs-to-array-repository"),
   ...require("./repository"),
   ...require("./update-associations"),
   ...require("./value-parsers"),
   ...require("./view-collection"),
-  ...require("./view/view-inference"),
-  ...require("./helpers"),
-  ...require("./interfaces"),
-  ...require("./dialects")
+  ...require("./view/view-inference")
 });

package/lib/interfaces/index.d.ts

@@ -14,3 +14,4 @@ export * from './datetime-interface';
 export * from './datetime-no-tz-interface';
 export * from './boolean-interface';
 export * from './date-interface';
+export * from './time-interface';

package/lib/interfaces/index.js

@@ -31,6 +31,7 @@ __reExport(interfaces_exports, require("./datetime-interface"), module.exports);
 __reExport(interfaces_exports, require("./datetime-no-tz-interface"), module.exports);
 __reExport(interfaces_exports, require("./boolean-interface"), module.exports);
 __reExport(interfaces_exports, require("./date-interface"), module.exports);
+__reExport(interfaces_exports, require("./time-interface"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./base-interface"),
@@ -40,5 +41,6 @@ __reExport(interfaces_exports, require("./date-interface"), module.exports);
   ...require("./datetime-interface"),
   ...require("./datetime-no-tz-interface"),
   ...require("./boolean-interface"),
-  ...require("./date-interface")
+  ...require("./date-interface"),
+  ...require("./time-interface")
 });

package/lib/interfaces/time-interface.d.ts

@@ -0,0 +1,13 @@
+/**
+ * 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 { BaseInterface } from './base-interface';
+export declare class TimeInterface extends BaseInterface {
+    toValue(value: any, ctx?: any): any;
+    validate(value: any): boolean;
+}

package/lib/interfaces/time-interface.js

@@ -0,0 +1,65 @@
+/**
+ * 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 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 __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 time_interface_exports = {};
+__export(time_interface_exports, {
+  TimeInterface: () => TimeInterface
+});
+module.exports = __toCommonJS(time_interface_exports);
+var import_dayjs = __toESM(require("dayjs"));
+var import_utc = __toESM(require("dayjs/plugin/utc"));
+var import_base_interface = require("./base-interface");
+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");
+      return result;
+    }
+    return value;
+  }
+  validate(value) {
+    const result = (0, import_dayjs.default)(value).isValid();
+    return result;
+  }
+};
+__name(_TimeInterface, "TimeInterface");
+let TimeInterface = _TimeInterface;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  TimeInterface
+});

package/lib/interfaces/utils.js

@@ -62,7 +62,8 @@ const interfaces = {
   obo: import_one_belongs_to_one_interface.OneBelongsToOneInterface,
   o2m: import_one_to_many_interface.OneToManyInterface,
   m2o: import_many_to_one_interface.ManyToOneInterface,
-  m2m: import_many_to_many_interface.ManyToManyInterface
+  m2m: import_many_to_many_interface.ManyToManyInterface,
+  time: import_index.TimeInterface
 };
 function registerInterfaces(db) {
   for (const [interfaceName, type] of Object.entries(interfaces)) {

package/lib/mock-database.d.ts

@@ -6,7 +6,7 @@
  * 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 { Database, IDatabaseOptions } from './database';
+import { Database, IDatabaseOptions } from '@nocobase/database';
 export declare class MockDatabase extends Database {
     constructor(options: IDatabaseOptions);
 }
@@ -29,5 +29,6 @@ export declare function getConfigByEnv(): {
     dialectOptions: {};
 };
 declare function customLogger(queryString: any, queryObject: any): void;
+export declare function createMockDatabase(options?: IDatabaseOptions): Promise<MockDatabase>;
 export declare function mockDatabase(options?: IDatabaseOptions): MockDatabase;
 export {};

package/lib/mock-database.js

@@ -38,15 +38,16 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var mock_database_exports = {};
 __export(mock_database_exports, {
   MockDatabase: () => MockDatabase,
+  createMockDatabase: () => createMockDatabase,
   getConfigByEnv: () => getConfigByEnv,
   mockDatabase: () => mockDatabase
 });
 module.exports = __toCommonJS(mock_database_exports);
+var import_database = require("@nocobase/database");
 var import_utils = require("@nocobase/utils");
 var import_nanoid = require("nanoid");
 var import_node_fetch = __toESM(require("node-fetch"));
 var import_path = __toESM(require("path"));
-var import_database = require("./database");
 /* istanbul ignore file -- @preserve */
 const _MockDatabase = class _MockDatabase extends import_database.Database {
   constructor(options) {
@@ -91,8 +92,18 @@ function customLogger(queryString, queryObject) {
   }
 }
 __name(customLogger, "customLogger");
+async function createMockDatabase(options = {}) {
+  try {
+    const { runPluginStaticImports } = await import("@nocobase/server");
+    await runPluginStaticImports();
+  } catch (error) {
+  }
+  return mockDatabase(options);
+}
+__name(createMockDatabase, "createMockDatabase");
 function mockDatabase(options = {}) {
   const dbOptions = (0, import_utils.merge)(getConfigByEnv(), options);
+  let db;
   if (process.env["DB_TEST_PREFIX"]) {
     let configKey = "database";
     if (dbOptions.dialect === "sqlite") {
@@ -124,13 +135,14 @@ function mockDatabase(options = {}) {
       };
     }
   }
-  const db = new MockDatabase(dbOptions);
+  db = new MockDatabase(dbOptions);
   return db;
 }
 __name(mockDatabase, "mockDatabase");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   MockDatabase,
+  createMockDatabase,
   getConfigByEnv,
   mockDatabase
 });

package/lib/query-interface/mysql-query-interface.d.ts

@@ -41,4 +41,5 @@ export default class MysqlQueryInterface extends QueryInterface {
         currentVal: number;
         transaction?: Transaction;
     }): Promise<void>;
+    generateJoinOnForJSONArray(left: string, right: string): import("sequelize/types/utils").Literal;
 }

package/lib/query-interface/mysql-query-interface.js

@@ -129,6 +129,9 @@ const _MysqlQueryInterface = class _MysqlQueryInterface extends import_query_int
       await this.db.sequelize.query(sql, { transaction });
     }
   }
+  generateJoinOnForJSONArray(left, right) {
+    return this.db.sequelize.literal(`JSON_CONTAINS(${right}, JSON_ARRAY(${left}))`);
+  }
 };
 __name(_MysqlQueryInterface, "MysqlQueryInterface");
 let MysqlQueryInterface = _MysqlQueryInterface;

package/lib/query-interface/postgres-query-interface.d.ts

@@ -38,4 +38,5 @@ export default class PostgresQueryInterface extends QueryInterface {
         };
     }>;
     showTableDefinition(tableInfo: TableInfo): Promise<any>;
+    generateJoinOnForJSONArray(left: string, right: string): import("sequelize/types/utils").Literal;
 }

package/lib/query-interface/postgres-query-interface.js

@@ -202,6 +202,9 @@ $BODY$
     );
     return res[0]["show_create_table"];
   }
+  generateJoinOnForJSONArray(left, right) {
+    return this.db.sequelize.literal(`${left}=any(${right})`);
+  }
 };
 __name(_PostgresQueryInterface, "PostgresQueryInterface");
 let PostgresQueryInterface = _PostgresQueryInterface;

package/lib/query-interface/query-interface.d.ts

@@ -49,4 +49,5 @@ export default abstract class QueryInterface {
         transaction?: Transaction;
     }): Promise<void>;
     quoteIdentifier(identifier: string): any;
+    generateJoinOnForJSONArray(left: string, right: string): void;
 }

package/lib/query-interface/query-interface.js

@@ -57,6 +57,10 @@ const _QueryInterface = class _QueryInterface {
   quoteIdentifier(identifier) {
     return this.db.sequelize.getQueryInterface().queryGenerator.quoteIdentifier(identifier);
   }
+  generateJoinOnForJSONArray(left, right) {
+    const dialect = this.db.sequelize.getDialect();
+    throw new Error(`Filtering by many to many (array) associations is not supported on ${dialect}`);
+  }
 };
 __name(_QueryInterface, "QueryInterface");
 let QueryInterface = _QueryInterface;

package/lib/query-interface/sqlite-query-interface.d.ts

@@ -41,4 +41,5 @@ export default class SqliteQueryInterface extends QueryInterface {
         currentVal: number;
         transaction?: Transaction;
     }): Promise<void>;
+    generateJoinOnForJSONArray(left: string, right: string): import("sequelize/types/utils").Literal;
 }

package/lib/query-interface/sqlite-query-interface.js

@@ -136,6 +136,9 @@ const _SqliteQueryInterface = class _SqliteQueryInterface extends import_query_i
                  WHERE name = '${tableName}';`;
     await this.db.sequelize.query(sql, { transaction });
   }
+  generateJoinOnForJSONArray(left, right) {
+    return this.db.sequelize.literal(`${left} in (SELECT value from json_each(${right}))`);
+  }
 };
 __name(_SqliteQueryInterface, "SqliteQueryInterface");
 let SqliteQueryInterface = _SqliteQueryInterface;

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

@@ -56,7 +56,7 @@ var import_relation_repository = require("./relation-repository");
 const _BelongsToManyRepository = class _BelongsToManyRepository extends import_multiple_relation_repository.MultipleRelationRepository {
   async aggregate(options) {
     const targetRepository = this.targetCollection.repository;
-    const sourceModel = await this.getSourceModel();
+    const sourceModel = await this.getSourceModel(await this.getTransaction(options));
     const association = this.association;
     return await targetRepository.aggregate({
       ...options,

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

@@ -80,7 +80,13 @@ const _HasManyRepository = class _HasManyRepository extends import_multiple_rela
     if (options && options["filter"]) {
       const filterResult = this.parseFilter(options["filter"], options);
       if (filterResult.include && filterResult.include.length > 0) {
-        return await this.destroyByFilter(options["filter"], transaction2);
+        return await this.destroyByFilter(
+          {
+            filter: options["filter"],
+            filterByTk: options["filterByTk"]
+          },
+          transaction2
+        );
       }
       where.push(filterResult.where);
     }

package/lib/relation-repository/multiple-relation-repository.d.ts

@@ -18,7 +18,10 @@ export declare abstract class MultipleRelationRepository extends RelationReposit
     remove(options: TargetKey | TargetKey[] | AssociatedOptions): Promise<void>;
     update(options?: UpdateOptions): Promise<any>;
     destroy(options?: TargetKey | DestroyOptions): Promise<boolean>;
-    protected destroyByFilter(filter: Filter, transaction?: Transaction): Promise<boolean>;
+    protected destroyByFilter(options: {
+        filter?: Filter;
+        filterByTk?: TargetKey | TargetKey[];
+    }, transaction?: Transaction): Promise<boolean>;
     protected filterHasInclude(filter: Filter, options?: any): boolean;
     protected accessors(): MultiAssociationAccessors;
     updateOrCreate(options: FirstOrCreateOptions): Promise<any>;

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

@@ -174,9 +174,9 @@ const _MultipleRelationRepository = class _MultipleRelationRepository extends im
   async destroy(options) {
     return false;
   }
-  async destroyByFilter(filter, transaction2) {
+  async destroyByFilter(options, transaction2) {
     const instances = await this.find({
-      filter,
+      ...options,
       transaction: transaction2
     });
     return await this.destroy({

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "1.7.0-beta.2",
+  "version": "1.7.0-beta.20",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/logger": "1.7.0-beta.2",
-    "@nocobase/utils": "1.7.0-beta.2",
+    "@nocobase/logger": "1.7.0-beta.20",
+    "@nocobase/utils": "1.7.0-beta.20",
     "async-mutex": "^0.3.2",
     "chalk": "^4.1.1",
     "cron-parser": "4.4.0",
@@ -20,12 +20,12 @@
     "graphlib": "^2.1.8",
     "lodash": "^4.17.21",
     "mathjs": "^10.6.1",
-    "nanoid": "^3.3.6",
+    "nanoid": "^3.3.11",
     "node-fetch": "^2.6.7",
     "node-sql-parser": "^4.18.0",
     "qs": "^6.11.2",
     "safe-json-stringify": "^1.2.0",
-    "semver": "^7.3.7",
+    "semver": "^7.7.1",
     "sequelize": "^6.26.0",
     "umzug": "^3.1.1",
     "uuid": "^9.0.1"
@@ -38,5 +38,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/database"
   },
-  "gitHead": "58b206bdfca521e79a69989ca55dd19075dca523"
+  "gitHead": "178910a2afe33bd4850e2519507d32b631a380fc"
 }