@nocobase/database 1.8.0-beta.7 → 1.8.0-beta.9

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

@@ -22,6 +22,7 @@ export declare class BelongsToArrayAssociation {
     targetKey: string;
     identifierField: string;
     as: string;
+    options: any;
     constructor(options: {
         db: Database;
         source: Model;

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

@@ -64,8 +64,10 @@ const _BelongsToArrayAssociation = class _BelongsToArrayAssociation {
   targetKey;
   identifierField;
   as;
+  options;
   constructor(options) {
     const { db, source, as, foreignKey, target, targetKey } = options;
+    this.options = options;
     this.associationType = "BelongsToArray";
     this.db = db;
     this.source = source;

package/lib/repository.d.ts

@@ -8,19 +8,19 @@
  */
 /// <reference types="node" />
 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 { BelongsToArrayRepository } from './belongs-to-array/belongs-to-array-repository';
 import { Collection } from './collection';
+import { SmartCursorBuilder } from './cursor-builder';
 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 { valuesToFilter } from './utils/filter-utils';
-import { SmartCursorBuilder } from './cursor-builder';
 interface CreateManyOptions extends BulkCreateOptions {
     records: Values[];
 }
@@ -141,6 +141,7 @@ export interface FirstOrCreateOptions extends Transactionable {
     values?: Values;
     hooks?: boolean;
     context?: any;
+    updateAssociationValues?: AssociationKeysToBeUpdate;
 }
 export declare class Repository<TModelAttributes extends {} = any, TCreationAttributes extends {} = TModelAttributes> {
     database: Database;

package/lib/repository.js

@@ -54,6 +54,9 @@ module.exports = __toCommonJS(repository_exports);
 var import_utils = require("@nocobase/utils");
 var import_lodash = __toESM(require("lodash"));
 var import_sequelize = require("sequelize");
+var import_lodash2 = __toESM(require("lodash"));
+var import_belongs_to_array_repository = require("./belongs-to-array/belongs-to-array-repository");
+var import_cursor_builder = require("./cursor-builder");
 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");
@@ -62,7 +65,6 @@ 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");
@@ -70,8 +72,6 @@ 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_filter_utils = require("./utils/filter-utils");
-var import_lodash2 = __toESM(require("lodash"));
-var import_cursor_builder = require("./cursor-builder");
 var import_sequelize2 = require("sequelize");
 const debug = require("debug")("noco-database");
 const transaction = (0, import_transaction_decorator.transactionWrapperBuilder)(function() {
@@ -333,16 +333,16 @@ const _Repository = class _Repository {
    * Get the first record matching the attributes or create it.
    */
   async firstOrCreate(options) {
-    const { filterKeys, values, transaction: transaction2, hooks, context } = options;
+    const { filterKeys, values, transaction: transaction2, context, ...rest } = options;
     const filter = _Repository.valuesToFilter(values, filterKeys);
     const instance = await this.findOne({ filter, transaction: transaction2, context });
     if (instance) {
       return instance;
     }
-    return this.create({ values, transaction: transaction2, hooks, context });
+    return this.create({ values, transaction: transaction2, context, ...rest });
   }
   async updateOrCreate(options) {
-    const { filterKeys, values, transaction: transaction2, hooks, context } = options;
+    const { filterKeys, values, transaction: transaction2, context, ...rest } = options;
     const filter = _Repository.valuesToFilter(values, filterKeys);
     const instance = await this.findOne({ filter, transaction: transaction2, context });
     if (instance) {
@@ -350,11 +350,11 @@ const _Repository = class _Repository {
         filterByTk: instance.get(this.collection.filterTargetKey || this.collection.model.primaryKeyAttribute),
         values,
         transaction: transaction2,
-        hooks,
-        context
+        context,
+        ...rest
       });
     }
-    return this.create({ values, transaction: transaction2, hooks, context });
+    return this.create({ values, transaction: transaction2, context, ...rest });
   }
   async create(options) {
     if (Array.isArray(options.values)) {

package/package.json

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