@nocobase/database 1.5.0-beta.9 → 1.5.1

package/lib/{relation-repository → belongs-to-array}/belongs-to-array-repository.d.ts

@@ -9,9 +9,10 @@
 import { Transactionable } from 'sequelize/types';
 import { Collection } from '../collection';
 import { FindOptions } from '../repository';
-import { MultipleRelationRepository } from './multiple-relation-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;
@@ -33,6 +34,7 @@ export declare class BelongsToArrayAssociation {
     generateInclude(): {
         on: import("sequelize/types/utils").Literal;
     };
+    update(instance: Model, value: any, options?: UpdateAssociationOptions): Promise<void>;
 }
 export declare class BelongsToArrayRepository extends MultipleRelationRepository {
     private belongsToArrayAssociation;

package/lib/{relation-repository → belongs-to-array}/belongs-to-array-repository.js

@@ -7,9 +7,11 @@
  * 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) => {
@@ -24,6 +26,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   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 __decorateClass = (decorators, target, key, kind) => {
   var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key) : target;
@@ -39,9 +49,9 @@ __export(belongs_to_array_repository_exports, {
   BelongsToArrayRepository: () => BelongsToArrayRepository
 });
 module.exports = __toCommonJS(belongs_to_array_repository_exports);
-var import_lodash = require("lodash");
+var import_lodash = __toESM(require("lodash"));
 var import_transaction_decorator = require("../decorators/transaction-decorator");
-var import_multiple_relation_repository = require("./multiple-relation-repository");
+var import_multiple_relation_repository = require("../relation-repository/multiple-relation-repository");
 const transaction = (0, import_transaction_decorator.transactionWrapperBuilder)(function() {
   return this.collection.model.sequelize.transaction();
 });
@@ -83,6 +93,19 @@ const _BelongsToArrayAssociation = class _BelongsToArrayAssociation {
       on: this.db.sequelize.literal(`${left}=any(${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;
@@ -109,7 +132,7 @@ const _BelongsToArrayRepository = class _BelongsToArrayRepository extends import
       addFilter[targetKey] = options.filterByTk;
     }
     const findOptions = {
-      ...(0, import_lodash.omit)(options, ["filterByTk", "where", "values", "attributes"]),
+      ...import_lodash.default.omit(options, ["filterByTk", "where", "values", "attributes"]),
       filter: {
         $and: [options.filter || {}, addFilter]
       }

package/lib/collection.d.ts

@@ -40,6 +40,7 @@ export interface CollectionOptions extends Omit<ModelOptions, 'name' | 'hooks'>
     writableView?: boolean;
     filterTargetKey?: string | string[];
     fields?: FieldOptions[];
+    fieldSort?: string[];
     model?: string | ModelStatic<Model>;
     repository?: string | RepositoryType;
     sortable?: CollectionSortable;

package/lib/fields/unix-timestamp-field.js

@@ -52,7 +52,7 @@ const _UnixTimestampField = class _UnixTimestampField extends import_date_field.
     if (accuracy === "millisecond") {
       rationalNumber = 1;
     }
-    return Math.floor(new Date(val).getTime() / rationalNumber);
+    return Math.floor(typeof val === "number" ? val : new Date(val).getTime() / rationalNumber);
   }
   additionalSequelizeOptions() {
     var _a, _b, _c, _d, _e;
@@ -71,16 +71,19 @@ const _UnixTimestampField = class _UnixTimestampField extends import_date_field.
     return {
       get() {
         const value = this.getDataValue(name);
-        if (value === null || value === void 0) {
+        if (value == null) {
           return value;
         }
         return new Date(value * rationalNumber);
       },
       set(value) {
-        if (value === null || value === void 0) {
+        if (value == null) {
           this.setDataValue(name, value);
         } else {
-          this.setDataValue(name, Math.floor(new Date(value).getTime() / rationalNumber));
+          this.setDataValue(
+            name,
+            Math.floor(typeof value === "number" ? value : new Date(value).getTime() / rationalNumber)
+          );
         }
       }
     };

package/lib/filter-match.js

@@ -69,7 +69,9 @@ function filterMatch(model, where) {
     $ne: /* @__PURE__ */ __name((value, condition) => value !== condition, "$ne"),
     $in: /* @__PURE__ */ __name((value, condition) => condition.includes(value), "$in"),
     $or: /* @__PURE__ */ __name((model2, conditions) => Object.values(conditions).some((condition) => filterMatch(model2, condition)), "$or"),
-    $and: /* @__PURE__ */ __name((model2, conditions) => Object.values(conditions).every((condition) => filterMatch(model2, condition)), "$and")
+    $and: /* @__PURE__ */ __name((model2, conditions) => Object.values(conditions).every((condition) => filterMatch(model2, condition)), "$and"),
+    // boolean
+    $isFalsy: /* @__PURE__ */ __name((value) => !value, "$isFalsy")
   };
   for (const [key, value] of Object.entries(where)) {
     if (operatorFunctions[key] !== void 0) {

package/lib/index.d.ts

@@ -26,7 +26,7 @@ export * from './relation-repository/belongs-to-repository';
 export * from './relation-repository/hasmany-repository';
 export * from './relation-repository/multiple-relation-repository';
 export * from './relation-repository/single-relation-repository';
-export * from './relation-repository/belongs-to-array-repository';
+export * from './belongs-to-array/belongs-to-array-repository';
 export * from './repository';
 export * from './update-associations';
 export { snakeCase } from './utils';

package/lib/index.js

@@ -81,7 +81,7 @@ __reExport(src_exports, require("./relation-repository/belongs-to-repository"),
 __reExport(src_exports, require("./relation-repository/hasmany-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("./relation-repository/belongs-to-array-repository"), module.exports);
+__reExport(src_exports, require("./belongs-to-array/belongs-to-array-repository"), module.exports);
 __reExport(src_exports, require("./repository"), module.exports);
 __reExport(src_exports, require("./update-associations"), module.exports);
 var import_utils = require("./utils");
@@ -133,7 +133,7 @@ __reExport(src_exports, require("./dialects"), module.exports);
   ...require("./relation-repository/hasmany-repository"),
   ...require("./relation-repository/multiple-relation-repository"),
   ...require("./relation-repository/single-relation-repository"),
-  ...require("./relation-repository/belongs-to-array-repository"),
+  ...require("./belongs-to-array/belongs-to-array-repository"),
   ...require("./repository"),
   ...require("./update-associations"),
   ...require("./value-parsers"),

package/lib/interfaces/datetime-interface.js

@@ -84,6 +84,13 @@ const _DatetimeInterface = class _DatetimeInterface extends import_base_interfac
     if (!value) {
       return null;
     }
+    if (typeof value === "number") {
+      const valueStr = value.toString();
+      const dateOnlyMatch = /^(\d{4})[-/]?(\d{2})[-/]?(\d{2})$/.exec(valueStr);
+      if (dateOnlyMatch) {
+        value = valueStr;
+      }
+    }
     if (typeof value === "string") {
       const dateInfo = this.parseDateString(value);
       if (dateInfo) {

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

@@ -38,7 +38,7 @@ const _ToManyInterface = class _ToManyInterface extends import_base_interface.Ba
     }
     str = `${str}`.trim();
     const items = str.split(",");
-    const { filterKey, targetCollection, transaction } = ctx;
+    const { filterKey, targetCollection, transaction, field } = ctx;
     const targetInstances = await targetCollection.repository.find({
       filter: {
         [filterKey]: items
@@ -51,7 +51,17 @@ const _ToManyInterface = class _ToManyInterface extends import_base_interface.Ba
       }
     });
     const primaryKeyAttribute = targetCollection.model.primaryKeyAttribute;
-    return targetInstances.map((targetInstance) => targetInstance[primaryKeyAttribute]);
+    const targetKey = field.options.targetKey;
+    const values = targetInstances.map((targetInstance) => {
+      const result = {
+        [targetKey]: targetInstance[targetKey]
+      };
+      if (targetKey !== primaryKeyAttribute) {
+        result[primaryKeyAttribute] = targetInstance[primaryKeyAttribute];
+      }
+      return result;
+    });
+    return values;
   }
 };
 __name(_ToManyInterface, "ToManyInterface");

package/lib/operators/boolean.js

@@ -31,17 +31,30 @@ __export(boolean_exports, {
 module.exports = __toCommonJS(boolean_exports);
 var import_sequelize = require("sequelize");
 var boolean_default = {
-  $isFalsy() {
+  $isFalsy(value) {
+    if (value === true || value === "true") {
+      return {
+        [import_sequelize.Op.or]: {
+          [import_sequelize.Op.is]: null,
+          [import_sequelize.Op.eq]: false
+        }
+      };
+    }
+    return {
+      [import_sequelize.Op.eq]: true
+    };
+  },
+  $isTruly(value) {
+    if (value === true || value === "true") {
+      return {
+        [import_sequelize.Op.eq]: true
+      };
+    }
     return {
       [import_sequelize.Op.or]: {
         [import_sequelize.Op.is]: null,
         [import_sequelize.Op.eq]: false
       }
     };
-  },
-  $isTruly() {
-    return {
-      [import_sequelize.Op.eq]: true
-    };
   }
 };

package/lib/operators/string.js

@@ -36,6 +36,46 @@ function escapeLike(value) {
   return value.replace(/[_%]/g, "\\$&");
 }
 __name(escapeLike, "escapeLike");
+const getFieldName = /* @__PURE__ */ __name((ctx) => {
+  const fullNameSplit = ctx.fullName.split(".");
+  const fieldName = ctx.fieldName;
+  let columnName = fieldName;
+  const associationPath = [];
+  if (fullNameSplit.length > 1) {
+    for (let i = 0; i < fullNameSplit.length - 1; i++) {
+      associationPath.push(fullNameSplit[i]);
+    }
+  }
+  const getModelFromAssociationPath = /* @__PURE__ */ __name(() => {
+    let model2 = ctx.model;
+    for (const association of associationPath) {
+      model2 = model2.associations[association].target;
+    }
+    return model2;
+  }, "getModelFromAssociationPath");
+  const model = getModelFromAssociationPath();
+  let columnPrefix = model.name;
+  if (model.rawAttributes[fieldName]) {
+    columnName = model.rawAttributes[fieldName].field || fieldName;
+  }
+  if (associationPath.length > 0) {
+    const association = associationPath.join("->");
+    columnPrefix = association;
+  }
+  columnName = `${columnPrefix}.${columnName}`;
+  return columnName;
+}, "getFieldName");
+function getFieldExpression(value, ctx, operator) {
+  if ((0, import_utils.isPg)(ctx)) {
+    const fieldName = getFieldName(ctx);
+    const queryInterface = ctx.db.sequelize.getQueryInterface();
+    const quotedField = queryInterface.quoteIdentifiers(fieldName);
+    return import_sequelize.Sequelize.literal(`CAST(${quotedField} AS TEXT) ${operator} ${ctx.db.sequelize.escape(value)}`);
+  }
+  const op = operator === "LIKE" ? import_sequelize.Op.like : operator === "NOT LIKE" ? import_sequelize.Op.notLike : operator === "ILIKE" ? import_sequelize.Op.like : operator === "NOT ILIKE" ? import_sequelize.Op.notLike : import_sequelize.Op.like;
+  return { [op]: value };
+}
+__name(getFieldExpression, "getFieldExpression");
 var string_default = {
   $includes(value, ctx) {
     if (value === null) {
@@ -44,16 +84,14 @@ var string_default = {
       };
     }
     if (Array.isArray(value)) {
-      const conditions = value.map((item) => ({
-        [(0, import_utils.isPg)(ctx) ? import_sequelize.Op.iLike : import_sequelize.Op.like]: `%${escapeLike(item)}%`
-      }));
+      const conditions = value.map(
+        (item) => getFieldExpression(`%${escapeLike(item)}%`, ctx, (0, import_utils.isPg)(ctx) ? "ILIKE" : "LIKE")
+      );
       return {
         [import_sequelize.Op.or]: conditions
       };
     }
-    return {
-      [(0, import_utils.isPg)(ctx) ? import_sequelize.Op.iLike : import_sequelize.Op.like]: `%${escapeLike(value)}%`
-    };
+    return getFieldExpression(`%${escapeLike(value)}%`, ctx, (0, import_utils.isPg)(ctx) ? "ILIKE" : "LIKE");
   },
   $notIncludes(value, ctx) {
     if (value === null) {
@@ -62,67 +100,57 @@ var string_default = {
       };
     }
     if (Array.isArray(value)) {
-      const conditions = value.map((item) => ({
-        [(0, import_utils.isPg)(ctx) ? import_sequelize.Op.notILike : import_sequelize.Op.notLike]: `%${escapeLike(item)}%`
-      }));
+      const conditions = value.map(
+        (item) => getFieldExpression(`%${escapeLike(item)}%`, ctx, (0, import_utils.isPg)(ctx) ? "NOT ILIKE" : "NOT LIKE")
+      );
       return {
         [import_sequelize.Op.and]: conditions
       };
     }
-    return {
-      [(0, import_utils.isPg)(ctx) ? import_sequelize.Op.notILike : import_sequelize.Op.notLike]: `%${escapeLike(value)}%`
-    };
+    return getFieldExpression(`%${escapeLike(value)}%`, ctx, (0, import_utils.isPg)(ctx) ? "NOT ILIKE" : "NOT LIKE");
   },
   $startsWith(value, ctx) {
     if (Array.isArray(value)) {
-      const conditions = value.map((item) => ({
-        [(0, import_utils.isPg)(ctx) ? import_sequelize.Op.iLike : import_sequelize.Op.like]: `${escapeLike(item)}%`
-      }));
+      const conditions = value.map(
+        (item) => getFieldExpression(`${escapeLike(item)}%`, ctx, (0, import_utils.isPg)(ctx) ? "ILIKE" : "LIKE")
+      );
       return {
         [import_sequelize.Op.or]: conditions
       };
     }
-    return {
-      [(0, import_utils.isPg)(ctx) ? import_sequelize.Op.iLike : import_sequelize.Op.like]: `${escapeLike(value)}%`
-    };
+    return getFieldExpression(`${escapeLike(value)}%`, ctx, (0, import_utils.isPg)(ctx) ? "ILIKE" : "LIKE");
   },
   $notStartsWith(value, ctx) {
     if (Array.isArray(value)) {
-      const conditions = value.map((item) => ({
-        [(0, import_utils.isPg)(ctx) ? import_sequelize.Op.notILike : import_sequelize.Op.notLike]: `${escapeLike(item)}%`
-      }));
+      const conditions = value.map(
+        (item) => getFieldExpression(`${escapeLike(item)}%`, ctx, (0, import_utils.isPg)(ctx) ? "NOT ILIKE" : "NOT LIKE")
+      );
       return {
         [import_sequelize.Op.and]: conditions
       };
     }
-    return {
-      [(0, import_utils.isPg)(ctx) ? import_sequelize.Op.notILike : import_sequelize.Op.notLike]: `${escapeLike(value)}%`
-    };
+    return getFieldExpression(`${escapeLike(value)}%`, ctx, (0, import_utils.isPg)(ctx) ? "NOT ILIKE" : "NOT LIKE");
   },
   $endWith(value, ctx) {
     if (Array.isArray(value)) {
-      const conditions = value.map((item) => ({
-        [(0, import_utils.isPg)(ctx) ? import_sequelize.Op.iLike : import_sequelize.Op.like]: `%${escapeLike(item)}`
-      }));
+      const conditions = value.map(
+        (item) => getFieldExpression(`%${escapeLike(item)}`, ctx, (0, import_utils.isPg)(ctx) ? "ILIKE" : "LIKE")
+      );
       return {
         [import_sequelize.Op.or]: conditions
       };
     }
-    return {
-      [(0, import_utils.isPg)(ctx) ? import_sequelize.Op.iLike : import_sequelize.Op.like]: `%${escapeLike(value)}`
-    };
+    return getFieldExpression(`%${escapeLike(value)}`, ctx, (0, import_utils.isPg)(ctx) ? "ILIKE" : "LIKE");
   },
   $notEndWith(value, ctx) {
     if (Array.isArray(value)) {
-      const conditions = value.map((item) => ({
-        [(0, import_utils.isPg)(ctx) ? import_sequelize.Op.notILike : import_sequelize.Op.notLike]: `%${escapeLike(item)}`
-      }));
+      const conditions = value.map(
+        (item) => getFieldExpression(`%${escapeLike(item)}`, ctx, (0, import_utils.isPg)(ctx) ? "NOT ILIKE" : "NOT LIKE")
+      );
       return {
         [import_sequelize.Op.and]: conditions
       };
     }
-    return {
-      [(0, import_utils.isPg)(ctx) ? import_sequelize.Op.notILike : import_sequelize.Op.notLike]: `%${escapeLike(value)}`
-    };
+    return getFieldExpression(`%${escapeLike(value)}`, ctx, (0, import_utils.isPg)(ctx) ? "NOT ILIKE" : "NOT LIKE");
   }
 };

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

@@ -7,7 +7,8 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { AggregateOptions, DestroyOptions, FindOptions, TargetKey, TK } from '../repository';
-import { AssociatedOptions, MultipleRelationRepository } from './multiple-relation-repository';
+import { MultipleRelationRepository } from './multiple-relation-repository';
+import { AssociatedOptions } from './types';
 export declare class HasManyRepository extends MultipleRelationRepository {
     find(options?: FindOptions): Promise<any>;
     aggregate(options: AggregateOptions): Promise<any>;

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

@@ -6,24 +6,20 @@
  * 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 { MultiAssociationAccessors, Transaction, Transactionable } from 'sequelize';
-import { CommonFindOptions, CountOptions, DestroyOptions, Filter, FindOneOptions, FindOptions, TargetKey, TK, UpdateOptions } from '../repository';
+import { MultiAssociationAccessors, Transaction } from 'sequelize';
 import { RelationRepository } from './relation-repository';
-type FindAndCountOptions = CommonFindOptions;
-export interface AssociatedOptions extends Transactionable {
-    tk?: TK;
-}
+import { AssociatedOptions, CountOptions, DestroyOptions, Filter, FindOptions, TargetKey, UpdateOptions, FirstOrCreateOptions } from './types';
 export declare abstract class MultipleRelationRepository extends RelationRepository {
     targetRepositoryFilterOptionsBySourceValue(): Promise<any>;
     find(options?: FindOptions): Promise<any>;
-    findAndCount(options?: FindAndCountOptions): Promise<[any[], number]>;
+    findAndCount(options?: FindOptions): Promise<[any[], number]>;
     count(options?: CountOptions): Promise<number>;
-    findOne(options?: FindOneOptions): Promise<any>;
+    findOne(options?: FindOptions): Promise<any>;
     remove(options: TargetKey | TargetKey[] | AssociatedOptions): Promise<void>;
     update(options?: UpdateOptions): Promise<any>;
-    destroy(options?: TK | DestroyOptions): Promise<boolean>;
+    destroy(options?: TargetKey | DestroyOptions): Promise<boolean>;
     protected destroyByFilter(filter: Filter, transaction?: Transaction): Promise<boolean>;
     protected filterHasInclude(filter: Filter, options?: any): boolean;
     protected accessors(): MultiAssociationAccessors;
+    updateOrCreate(options: FirstOrCreateOptions): Promise<any>;
 }
-export {};

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

@@ -191,6 +191,10 @@ const _MultipleRelationRepository = class _MultipleRelationRepository extends im
   accessors() {
     return super.accessors();
   }
+  async updateOrCreate(options) {
+    const result = await super.updateOrCreate(options);
+    return Array.isArray(result) ? result[0] : result;
+  }
 };
 __name(_MultipleRelationRepository, "MultipleRelationRepository");
 __decorateClass([
@@ -205,6 +209,9 @@ __decorateClass([
   (0, import_relation_repository.transaction)(),
   import_target_collection_decorator.default
 ], _MultipleRelationRepository.prototype, "update", 1);
+__decorateClass([
+  (0, import_relation_repository.transaction)()
+], _MultipleRelationRepository.prototype, "updateOrCreate", 1);
 let MultipleRelationRepository = _MultipleRelationRepository;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -11,7 +11,7 @@ import { Collection } from '../collection';
 import Database from '../database';
 import { RelationField } from '../fields/relation-field';
 import { Model } from '../model';
-import { CreateOptions, Filter, FindOptions, TargetKey } from '../repository';
+import { CreateOptions, Filter, FindOptions, FirstOrCreateOptions, TargetKey, UpdateOptions } from './types';
 export declare const transaction: (transactionInjector?: any) => (target: any, name: any, descriptor: any) => any;
 export declare abstract class RelationRepository {
     sourceCollection: Collection;
@@ -30,6 +30,8 @@ export declare abstract class RelationRepository {
     isMultiTargetKey(value?: any): boolean;
     get collection(): Collection<any, any>;
     abstract find(options?: FindOptions): Promise<any>;
+    abstract findOne(options?: FindOptions): Promise<any>;
+    abstract update(options: UpdateOptions): Promise<any>;
     chunk(options: FindOptions & {
         chunkSize: number;
         callback: (rows: Model[], options: FindOptions) => Promise<void>;
@@ -37,6 +39,8 @@ export declare abstract class RelationRepository {
     convertTk(options: any): any;
     convertTks(options: any): any[];
     targetKey(): any;
+    firstOrCreate(options: FirstOrCreateOptions): Promise<any>;
+    updateOrCreate(options: FirstOrCreateOptions): Promise<any>;
     create(options?: CreateOptions): Promise<any>;
     getSourceModel(transaction?: Transaction): Promise<Model<any, any>>;
     protected accessors(): import("sequelize").SingleAssociationAccessors | import("sequelize").MultiAssociationAccessors;

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

@@ -55,6 +55,7 @@ var import_filter_parser = __toESM(require("../filter-parser"));
 var import_options_parser = require("../options-parser");
 var import_update_associations = require("../update-associations");
 var import_update_guard = require("../update-guard");
+var import_filter_utils = require("../utils/filter-utils");
 const transaction = (0, import_transaction_decorator.transactionWrapperBuilder)(function() {
   return this.sourceCollection.model.sequelize.transaction();
 });
@@ -141,6 +142,32 @@ const _RelationRepository = class _RelationRepository {
   targetKey() {
     return this.associationField.targetKey;
   }
+  async firstOrCreate(options) {
+    const { filterKeys, values, transaction: transaction2, hooks, context } = options;
+    const filter = (0, import_filter_utils.valuesToFilter)(values, filterKeys);
+    const instance = await this.findOne({ filter, transaction: transaction2, context });
+    if (instance) {
+      return instance;
+    }
+    return this.create({ values, transaction: transaction2, hooks, context });
+  }
+  async updateOrCreate(options) {
+    const { filterKeys, values, transaction: transaction2, hooks, context } = options;
+    const filter = (0, import_filter_utils.valuesToFilter)(values, filterKeys);
+    const instance = await this.findOne({ filter, transaction: transaction2, context });
+    if (instance) {
+      return await this.update({
+        filterByTk: instance.get(
+          this.targetCollection.filterTargetKey || this.targetCollection.model.primaryKeyAttribute
+        ),
+        values,
+        transaction: transaction2,
+        hooks,
+        context
+      });
+    }
+    return this.create({ values, transaction: transaction2, hooks, context });
+  }
   async create(options) {
     if (Array.isArray(options.values)) {
       return Promise.all(options.values.map((record) => this.create({ ...options, values: record })));
@@ -210,6 +237,12 @@ const _RelationRepository = class _RelationRepository {
   }
 };
 __name(_RelationRepository, "RelationRepository");
+__decorateClass([
+  transaction()
+], _RelationRepository.prototype, "firstOrCreate", 1);
+__decorateClass([
+  transaction()
+], _RelationRepository.prototype, "updateOrCreate", 1);
 __decorateClass([
   transaction()
 ], _RelationRepository.prototype, "create", 1);

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

@@ -8,15 +8,8 @@
  */
 import { SingleAssociationAccessors, Transactionable } from 'sequelize';
 import { Model } from '../model';
-import { Appends, Except, Fields, Filter, TargetKey, UpdateOptions } from '../repository';
+import { FindOptions, TargetKey, UpdateOptions } from './types';
 import { RelationRepository } from './relation-repository';
-export interface SingleRelationFindOption extends Transactionable {
-    fields?: Fields;
-    except?: Except;
-    appends?: Appends;
-    filter?: Filter;
-    targetCollection?: string;
-}
 interface SetOption extends Transactionable {
     tk?: TargetKey;
 }
@@ -24,8 +17,8 @@ export declare abstract class SingleRelationRepository extends RelationRepositor
     abstract filterOptions(sourceModel: any): any;
     remove(options?: Transactionable): Promise<void>;
     set(options: TargetKey | SetOption): Promise<void>;
-    find(options?: SingleRelationFindOption): Promise<any>;
-    findOne(options?: SingleRelationFindOption): Promise<Model<any>>;
+    find(options?: FindOptions): Promise<any>;
+    findOne(options?: FindOptions): Promise<Model<any>>;
     destroy(options?: Transactionable): Promise<boolean>;
     update(options: UpdateOptions): Promise<any>;
     /**

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

@@ -51,6 +51,7 @@ 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);
@@ -96,13 +97,14 @@ const _SingleRelationRepository = class _SingleRelationRepository extends import
     const transaction2 = await this.getTransaction(options);
     const target = await this.find({
       transaction: transaction2,
+      // @ts-ignore
       targetCollection: options.targetCollection
     });
     if (!target) {
       throw new Error("The record does not exist");
     }
     await (0, import_update_associations.updateModelByValues)(target, options == null ? void 0 : options.values, {
-      ...options,
+      ...import_lodash.default.omit(options, "values"),
       transaction: transaction2
     });
     if (options.hooks !== false) {

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

@@ -6,10 +6,81 @@
  * 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 { TargetKey, Values } from '../repository';
-import { Transactionable } from 'sequelize';
-export type PrimaryKeyWithThroughValues = [TargetKey, Values];
-export interface AssociatedOptions extends Transactionable {
-    tk?: TargetKey | TargetKey[] | PrimaryKeyWithThroughValues | PrimaryKeyWithThroughValues[];
+import { AssociationKeysToBeUpdate, BlackList, Values, WhiteList } from '@nocobase/database';
+import { Transaction } from 'sequelize';
+import { CreateOptions as SequelizeCreateOptions, UpdateOptions as SequelizeUpdateOptions } from 'sequelize/types/model';
+export type TargetKey = string | number | {
+    [key: string]: any;
+};
+export interface Filter {
+    [key: string]: any;
+}
+export interface Appends {
+    [key: string]: true | Appends;
+}
+export interface Except {
+    [key: string]: true | Except;
+}
+export interface CommonOptions {
+    transaction?: Transaction;
+    context?: any;
+}
+export interface FindOptions extends CommonOptions {
+    filter?: Filter;
+    filterByTk?: TargetKey;
+    fields?: string[];
+    appends?: string[];
+    except?: string[];
+    sort?: string[];
+    limit?: number;
+    offset?: number;
+    raw?: boolean;
+    targetCollection?: string;
+}
+export interface CountOptions extends CommonOptions {
+    filter?: Filter;
+}
+export interface CreateOptions extends SequelizeCreateOptions {
+    values?: Values | Values[];
+    whitelist?: WhiteList;
+    blacklist?: BlackList;
+    updateAssociationValues?: AssociationKeysToBeUpdate;
+    context?: any;
+}
+export interface UpdateOptions extends Omit<SequelizeUpdateOptions, 'where'> {
+    values: Values;
+    filter?: Filter;
+    filterByTk?: TargetKey;
+    whitelist?: WhiteList;
+    blacklist?: BlackList;
+    updateAssociationValues?: AssociationKeysToBeUpdate;
+    targetCollection?: string;
+    context?: any;
+}
+export interface DestroyOptions extends CommonOptions {
+    filter?: Filter;
+    filterByTk?: TargetKey;
+    truncate?: boolean;
+    context?: any;
+}
+export interface FirstOrCreateOptions extends CommonOptions {
+    filterKeys: string[];
+    values: any;
+    hooks?: boolean;
+    context?: any;
+}
+export interface ThroughValues {
+    [key: string]: any;
+}
+export interface AssociatedOptions extends CommonOptions {
+    tk?: TargetKey | TargetKey[];
+    transaction?: Transaction;
+}
+export interface PrimaryKeyWithThroughValues {
+    pk: any;
+    throughValues?: ThroughValues;
+}
+export interface ToggleOptions extends CommonOptions {
+    tk?: TargetKey;
+    transaction?: Transaction;
 }
-export type setAssociationOptions = TargetKey | TargetKey[] | PrimaryKeyWithThroughValues | PrimaryKeyWithThroughValues[] | AssociatedOptions;

package/lib/repository.d.ts

@@ -7,18 +7,19 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 /// <reference types="node" />
-import { Association, BulkCreateOptions, CountOptions as SequelizeCountOptions, CreateOptions as SequelizeCreateOptions, DestroyOptions as SequelizeDestroyOptions, FindAndCountOptions as SequelizeAndCountOptions, FindOptions as SequelizeFindOptions, ModelStatic, Transactionable, UpdateOptions as SequelizeUpdateOptions, WhereOperators } from 'sequelize';
+import { Association, BulkCreateOptions, ModelStatic, FindAndCountOptions as SequelizeAndCountOptions, CountOptions as SequelizeCountOptions, CreateOptions as SequelizeCreateOptions, DestroyOptions as SequelizeDestroyOptions, FindOptions as SequelizeFindOptions, UpdateOptions as SequelizeUpdateOptions, Transactionable, WhereOperators } from 'sequelize';
 import { Collection } from './collection';
 import { Database } from './database';
 import { ArrayFieldRepository } from './field-repository/array-field-repository';
 import { Model } from './model';
 import operators from './operators';
+import { BelongsToArrayRepository } from './belongs-to-array/belongs-to-array-repository';
 import { BelongsToManyRepository } from './relation-repository/belongs-to-many-repository';
 import { BelongsToRepository } from './relation-repository/belongs-to-repository';
 import { HasManyRepository } from './relation-repository/hasmany-repository';
 import { HasOneRepository } from './relation-repository/hasone-repository';
 import { RelationRepository } from './relation-repository/relation-repository';
-import { BelongsToArrayRepository } from './relation-repository/belongs-to-array-repository';
+import { valuesToFilter } from './utils/filter-utils';
 interface CreateManyOptions extends BulkCreateOptions {
     records: Values[];
 }
@@ -134,19 +135,18 @@ export interface AggregateOptions {
     filter?: Filter;
     distinct?: boolean;
 }
-interface FirstOrCreateOptions extends Transactionable {
+export interface FirstOrCreateOptions extends Transactionable {
     filterKeys: string[];
     values?: Values;
     hooks?: boolean;
+    context?: any;
 }
 export declare class Repository<TModelAttributes extends {} = any, TCreationAttributes extends {} = TModelAttributes> {
     database: Database;
     collection: Collection;
     model: ModelStatic<Model>;
     constructor(collection: Collection);
-    static valuesToFilter(values: Values, filterKeys: Array<string>): {
-        $and: any[];
-    };
+    static valuesToFilter: typeof valuesToFilter;
     /**
      * return count by filter
      */

package/lib/repository.js

@@ -13,6 +13,7 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
   for (var name in all)
@@ -43,16 +44,16 @@ var __decorateClass = (decorators, target, key, kind) => {
   if (kind && result) __defProp(target, key, result);
   return result;
 };
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 var repository_exports = {};
 __export(repository_exports, {
   Repository: () => Repository,
   Transactionable: () => import_sequelize2.Transactionable
 });
 module.exports = __toCommonJS(repository_exports);
-var import_flat = require("flat");
+var import_utils = require("@nocobase/utils");
 var import_lodash = __toESM(require("lodash"));
 var import_sequelize = require("sequelize");
-var import_utils = require("@nocobase/utils");
 var import_must_have_filter_decorator = __toESM(require("./decorators/must-have-filter-decorator"));
 var import_target_collection_decorator = __toESM(require("./decorators/target-collection-decorator"));
 var import_transaction_decorator = require("./decorators/transaction-decorator");
@@ -61,13 +62,14 @@ var import_array_field_repository = require("./field-repository/array-field-repo
 var import_fields = require("./fields");
 var import_filter_parser = __toESM(require("./filter-parser"));
 var import_options_parser = require("./options-parser");
+var import_belongs_to_array_repository = require("./belongs-to-array/belongs-to-array-repository");
 var import_belongs_to_many_repository = require("./relation-repository/belongs-to-many-repository");
 var import_belongs_to_repository = require("./relation-repository/belongs-to-repository");
 var import_hasmany_repository = require("./relation-repository/hasmany-repository");
 var import_hasone_repository = require("./relation-repository/hasone-repository");
 var import_update_associations = require("./update-associations");
 var import_update_guard = require("./update-guard");
-var import_belongs_to_array_repository = require("./relation-repository/belongs-to-array-repository");
+var import_filter_utils = require("./utils/filter-utils");
 var import_sequelize2 = require("sequelize");
 const debug = require("debug")("noco-database");
 const transaction = (0, import_transaction_decorator.transactionWrapperBuilder)(function() {
@@ -124,43 +126,6 @@ const _Repository = class _Repository {
     this.collection = collection;
     this.model = collection.model;
   }
-  static valuesToFilter(values = {}, filterKeys) {
-    const removeArrayIndexInKey = /* @__PURE__ */ __name((key) => {
-      const chunks = key.split(".");
-      return chunks.filter((chunk) => {
-        return !chunk.match(/\d+/);
-      }).join(".");
-    }, "removeArrayIndexInKey");
-    const filterAnd = [];
-    const flattedValues = (0, import_flat.flatten)(values);
-    const flattedValuesObject = {};
-    for (const key in flattedValues) {
-      const keyWithoutArrayIndex = removeArrayIndexInKey(key);
-      if (flattedValuesObject[keyWithoutArrayIndex]) {
-        if (!Array.isArray(flattedValuesObject[keyWithoutArrayIndex])) {
-          flattedValuesObject[keyWithoutArrayIndex] = [flattedValuesObject[keyWithoutArrayIndex]];
-        }
-        flattedValuesObject[keyWithoutArrayIndex].push(flattedValues[key]);
-      } else {
-        flattedValuesObject[keyWithoutArrayIndex] = [flattedValues[key]];
-      }
-    }
-    for (const filterKey of filterKeys) {
-      const filterValue = flattedValuesObject[filterKey] ? flattedValuesObject[filterKey] : import_lodash.default.get(values, filterKey);
-      if (filterValue) {
-        filterAnd.push({
-          [filterKey]: filterValue
-        });
-      } else {
-        filterAnd.push({
-          [filterKey]: null
-        });
-      }
-    }
-    return {
-      $and: filterAnd
-    };
-  }
   /**
    * return count by filter
    */
@@ -290,6 +255,9 @@ const _Repository = class _Repository {
       await eagerLoadingTree.load(transaction2);
       rows = eagerLoadingTree.root.instances;
     } else {
+      if (opts.where && model.primaryKeyAttributes.length === 0) {
+        opts.where = import_sequelize.Utils.mapWhereFieldNames(opts.where, model);
+      }
       rows = await model.findAll({
         ...opts,
         transaction: transaction2
@@ -339,27 +307,28 @@ const _Repository = class _Repository {
    * Get the first record matching the attributes or create it.
    */
   async firstOrCreate(options) {
-    const { filterKeys, values, transaction: transaction2, hooks } = options;
+    const { filterKeys, values, transaction: transaction2, hooks, context } = options;
     const filter = _Repository.valuesToFilter(values, filterKeys);
-    const instance = await this.findOne({ filter, transaction: transaction2 });
+    const instance = await this.findOne({ filter, transaction: transaction2, context });
     if (instance) {
       return instance;
     }
-    return this.create({ values, transaction: transaction2, hooks });
+    return this.create({ values, transaction: transaction2, hooks, context });
   }
   async updateOrCreate(options) {
-    const { filterKeys, values, transaction: transaction2, hooks } = options;
+    const { filterKeys, values, transaction: transaction2, hooks, context } = options;
     const filter = _Repository.valuesToFilter(values, filterKeys);
-    const instance = await this.findOne({ filter, transaction: transaction2 });
+    const instance = await this.findOne({ filter, transaction: transaction2, context });
     if (instance) {
       return await this.update({
         filterByTk: instance.get(this.collection.filterTargetKey || this.collection.model.primaryKeyAttribute),
         values,
         transaction: transaction2,
-        hooks
+        hooks,
+        context
       });
     }
-    return this.create({ values, transaction: transaction2, hooks });
+    return this.create({ values, transaction: transaction2, hooks, context });
   }
   async create(options) {
     if (Array.isArray(options.values)) {
@@ -500,7 +469,7 @@ const _Repository = class _Repository {
         throw new Error(`filterByTk is not supported for collection that has no primary key`);
       }
     }
-    if (filterByTk && !options.filter) {
+    if (filterByTk && !(0, import_utils.isValidFilter)(options.filter)) {
       const where = [];
       for (const tk of filterByTk) {
         const optionParser = new import_options_parser.OptionsParser(
@@ -595,6 +564,7 @@ const _Repository = class _Repository {
   }
 };
 __name(_Repository, "Repository");
+__publicField(_Repository, "valuesToFilter", import_filter_utils.valuesToFilter);
 __decorateClass([
   transaction()
 ], _Repository.prototype, "create", 1);

package/lib/update-associations.d.ts

@@ -13,7 +13,9 @@ 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;
+export declare function modelAssociationByKey(instance: Model, key: string): Association & {
+    update?: (instance: Model, value: any, options: UpdateAssociationOptions) => Promise<any>;
+};
 type UpdateValue = {
     [key: string]: any;
 };
@@ -26,7 +28,7 @@ interface UpdateOptions extends Transactionable {
     sanitized?: boolean;
     sourceModel?: Model;
 }
-interface UpdateAssociationOptions extends Transactionable, Hookable {
+export interface UpdateAssociationOptions extends Transactionable, Hookable {
     updateAssociationValues?: string[];
     sourceModel?: Model;
     context?: any;
@@ -49,7 +51,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<boolean>;
+export declare function updateAssociation(instance: Model, key: string, value: any, options?: UpdateAssociationOptions): Promise<any>;
 /**
  * update belongsTo and HasOne
  * @param model

package/lib/update-associations.js

@@ -51,18 +51,7 @@ module.exports = __toCommonJS(update_associations_exports);
 var import_lodash = __toESM(require("lodash"));
 var import_model = require("./model");
 var import_update_guard = require("./update-guard");
-function isUndefinedOrNull(value) {
-  return typeof value === "undefined" || value === null;
-}
-__name(isUndefinedOrNull, "isUndefinedOrNull");
-function isStringOrNumber(value) {
-  return typeof value === "string" || typeof value === "number";
-}
-__name(isStringOrNumber, "isStringOrNumber");
-function getKeysByPrefix(keys, prefix) {
-  return keys.filter((key) => key.startsWith(`${prefix}.`)).map((key) => key.substring(prefix.length + 1));
-}
-__name(getKeysByPrefix, "getKeysByPrefix");
+var import_utils = require("./utils");
 function modelAssociations(instance) {
   return instance.constructor.associations;
 }
@@ -183,6 +172,9 @@ 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":
@@ -205,14 +197,14 @@ async function updateSingleAssociation(model, key, value, options = {}) {
     throw new Error(`The value of '${key}' cannot be in array format`);
   }
   const { recursive, context, updateAssociationValues = [], transaction } = options;
-  const keys = getKeysByPrefix(updateAssociationValues, key);
+  const keys = (0, import_utils.getKeysByPrefix)(updateAssociationValues, key);
   const setAccessor = association.accessors.set;
   const removeAssociation = /* @__PURE__ */ __name(async () => {
     await model[setAccessor](null, { transaction });
     model.setDataValue(key, null);
     return true;
   }, "removeAssociation");
-  if (isUndefinedOrNull(value)) {
+  if ((0, import_utils.isUndefinedOrNull)(value)) {
     return await removeAssociation();
   }
   if (association.associationType === "HasOne" && !model.get(association.sourceKeyAttribute)) {
@@ -226,7 +218,7 @@ async function updateSingleAssociation(model, key, value, options = {}) {
       );
     }
   }, "checkBelongsToForeignKeyValue");
-  if (isStringOrNumber(value)) {
+  if ((0, import_utils.isStringOrNumber)(value)) {
     await model[setAccessor](value, { context, transaction });
     return true;
   }
@@ -245,7 +237,7 @@ async function updateSingleAssociation(model, key, value, options = {}) {
     M = association.target;
     dataKey = M.primaryKeyAttribute;
   }
-  if (isStringOrNumber(value[dataKey])) {
+  if ((0, import_utils.isStringOrNumber)(value[dataKey])) {
     const instance2 = await M.findOne({
       where: {
         [dataKey]: value[dataKey]
@@ -298,10 +290,10 @@ async function updateMultipleAssociation(model, key, value, options = {}) {
     return false;
   }
   const { recursive, context, updateAssociationValues = [], transaction } = options;
-  const keys = getKeysByPrefix(updateAssociationValues, key);
+  const keys = (0, import_utils.getKeysByPrefix)(updateAssociationValues, key);
   const setAccessor = association.accessors.set;
   const createAccessor = association.accessors.create;
-  if (isUndefinedOrNull(value)) {
+  if ((0, import_utils.isUndefinedOrNull)(value)) {
     await model[setAccessor](null, { transaction, context, individualHooks: true, validate: false });
     model.setDataValue(key, null);
     return;
@@ -309,7 +301,7 @@ async function updateMultipleAssociation(model, key, value, options = {}) {
   if (association.associationType === "HasMany" && !model.get(association.sourceKeyAttribute)) {
     throw new Error(`The source key ${association.sourceKeyAttribute} is not set in ${model.constructor.name}`);
   }
-  if (isStringOrNumber(value)) {
+  if ((0, import_utils.isStringOrNumber)(value)) {
     await model[setAccessor](value, { transaction, context, individualHooks: true, validate: false });
     return;
   }
@@ -317,10 +309,10 @@ async function updateMultipleAssociation(model, key, value, options = {}) {
   const setItems = [];
   const objectItems = [];
   for (const item of value) {
-    if (isUndefinedOrNull(item)) {
+    if ((0, import_utils.isUndefinedOrNull)(item)) {
       continue;
     }
-    if (isStringOrNumber(item)) {
+    if ((0, import_utils.isStringOrNumber)(item)) {
       setItems.push(item);
     } else if (item instanceof import_model.Model) {
       setItems.push(item);
@@ -360,10 +352,10 @@ async function updateMultipleAssociation(model, key, value, options = {}) {
     if (throughValue) {
       accessorOptions["through"] = throughValue;
     }
-    if (pk !== targetKey && !isUndefinedOrNull(item[pk]) && isUndefinedOrNull(item[targetKey])) {
+    if (pk !== targetKey && !(0, import_utils.isUndefinedOrNull)(item[pk]) && (0, import_utils.isUndefinedOrNull)(item[targetKey])) {
       throw new Error(`${targetKey} field value is empty`);
     }
-    if (isUndefinedOrNull(item[targetKey])) {
+    if ((0, import_utils.isUndefinedOrNull)(item[targetKey])) {
       const instance = await model[createAccessor](item, accessorOptions);
       await updateAssociations(instance, item, {
         ...options,

package/lib/utils/filter-utils.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.
+ */
+type Values = Record<string, any>;
+export declare function valuesToFilter(values: Values, filterKeys: Array<string>): {
+    $and: any[];
+};
+export {};

package/lib/utils/filter-utils.js

@@ -0,0 +1,86 @@
+/**
+ * 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 filter_utils_exports = {};
+__export(filter_utils_exports, {
+  valuesToFilter: () => valuesToFilter
+});
+module.exports = __toCommonJS(filter_utils_exports);
+var import_lodash = __toESM(require("lodash"));
+var import_flat = require("flat");
+function valuesToFilter(values = {}, filterKeys) {
+  const removeArrayIndexInKey = /* @__PURE__ */ __name((key) => {
+    const chunks = key.split(".");
+    return chunks.filter((chunk) => {
+      return !chunk.match(/\d+/);
+    }).join(".");
+  }, "removeArrayIndexInKey");
+  const filterAnd = [];
+  const flattedValues = (0, import_flat.flatten)(values);
+  const flattedValuesObject = {};
+  for (const key in flattedValues) {
+    const keyWithoutArrayIndex = removeArrayIndexInKey(key);
+    if (flattedValuesObject[keyWithoutArrayIndex]) {
+      if (!Array.isArray(flattedValuesObject[keyWithoutArrayIndex])) {
+        flattedValuesObject[keyWithoutArrayIndex] = [flattedValuesObject[keyWithoutArrayIndex]];
+      }
+      flattedValuesObject[keyWithoutArrayIndex].push(flattedValues[key]);
+    } else {
+      flattedValuesObject[keyWithoutArrayIndex] = [flattedValues[key]];
+    }
+  }
+  for (const filterKey of filterKeys) {
+    const filterValue = flattedValuesObject[filterKey] ? flattedValuesObject[filterKey] : import_lodash.default.get(values, filterKey);
+    if (filterValue) {
+      filterAnd.push({
+        [filterKey]: filterValue
+      });
+    } else {
+      filterAnd.push({
+        [filterKey]: null
+      });
+    }
+  }
+  return {
+    $and: filterAnd
+  };
+}
+__name(valuesToFilter, "valuesToFilter");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  valuesToFilter
+});

package/lib/utils.d.ts

@@ -13,3 +13,6 @@ export declare function getTableName(collectionName: string, options: any): any;
 export declare function snakeCase(name: string): any;
 export declare function patchSequelizeQueryInterface(db: Database): void;
 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[];

package/lib/utils.js

@@ -38,7 +38,10 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var utils_exports = {};
 __export(utils_exports, {
   checkIdentifier: () => checkIdentifier,
+  getKeysByPrefix: () => getKeysByPrefix,
   getTableName: () => getTableName,
+  isStringOrNumber: () => isStringOrNumber,
+  isUndefinedOrNull: () => isUndefinedOrNull,
   md5: () => md5,
   patchSequelizeQueryInterface: () => patchSequelizeQueryInterface,
   percent2float: () => percent2float,
@@ -125,10 +128,25 @@ function percent2float(value) {
   return parseFloat(value) * v / (100 * v);
 }
 __name(percent2float, "percent2float");
+function isUndefinedOrNull(value) {
+  return typeof value === "undefined" || value === null;
+}
+__name(isUndefinedOrNull, "isUndefinedOrNull");
+function isStringOrNumber(value) {
+  return typeof value === "string" || typeof value === "number";
+}
+__name(isStringOrNumber, "isStringOrNumber");
+function getKeysByPrefix(keys, prefix) {
+  return keys.filter((key) => key.startsWith(`${prefix}.`)).map((key) => key.substring(prefix.length + 1));
+}
+__name(getKeysByPrefix, "getKeysByPrefix");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   checkIdentifier,
+  getKeysByPrefix,
   getTableName,
+  isStringOrNumber,
+  isUndefinedOrNull,
   md5,
   patchSequelizeQueryInterface,
   percent2float,

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "1.5.0-beta.9",
+  "version": "1.5.1",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/logger": "1.5.0-beta.9",
-    "@nocobase/utils": "1.5.0-beta.9",
+    "@nocobase/logger": "1.5.1",
+    "@nocobase/utils": "1.5.1",
     "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": "fef0bcb5f95705cd83607f03a6c911550016281b"
+  "gitHead": "b16a0ff226482d0de847656ea26fd621b1d685cf"
 }