@nocobase/database 1.6.0-alpha.7 → 1.6.0-alpha.8

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/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, UpdateOptions, FirstOrCreateOptions } from './types';
+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;

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

@@ -143,18 +143,18 @@ const _RelationRepository = class _RelationRepository {
     return this.associationField.targetKey;
   }
   async firstOrCreate(options) {
-    const { filterKeys, values, transaction: transaction2, hooks } = 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 });
+    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 = (0, import_filter_utils.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(
@@ -162,10 +162,11 @@ const _RelationRepository = class _RelationRepository {
         ),
         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)) {

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

@@ -6,9 +6,9 @@
  * 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 { AssociationKeysToBeUpdate, BlackList, Values, WhiteList } from '@nocobase/database';
 import { Transaction } from 'sequelize';
 import { CreateOptions as SequelizeCreateOptions, UpdateOptions as SequelizeUpdateOptions } from 'sequelize/types/model';
-import { AssociationKeysToBeUpdate, BlackList, Values, WhiteList } from '@nocobase/database';
 export type TargetKey = string | number | {
     [key: string]: any;
 };
@@ -67,6 +67,7 @@ export interface FirstOrCreateOptions extends CommonOptions {
     filterKeys: string[];
     values: any;
     hooks?: boolean;
+    context?: any;
 }
 export interface ThroughValues {
     [key: string]: any;

package/lib/repository.d.ts

@@ -7,18 +7,18 @@
  * 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 './relation-repository/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[];
@@ -139,6 +139,7 @@ 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;

package/lib/repository.js

@@ -51,9 +51,9 @@ __export(repository_exports, {
   Transactionable: () => import_sequelize2.Transactionable
 });
 module.exports = __toCommonJS(repository_exports);
+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");
@@ -62,13 +62,13 @@ 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("./relation-repository/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");
@@ -304,27 +304,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)) {
@@ -465,7 +466,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(

package/package.json

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