@nocobase/database 1.8.0-beta.8 → 1.8.0

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/database.d.ts

@@ -48,6 +48,7 @@ export interface IDatabaseOptions extends Options {
     logger?: LoggerOptions | Logger;
     customHooks?: any;
     instanceId?: string;
+    addAllCollections?: boolean;
 }
 export type DatabaseOptions = IDatabaseOptions;
 interface RegisterOperatorsContext {

package/lib/fields/password-field.js

@@ -72,27 +72,32 @@ const _PasswordField = class _PasswordField extends import_field.Field {
   }
   init() {
     const { name } = this.options;
-    this.listener = async (model) => {
-      if (!model.changed(name)) {
-        return;
-      }
-      const value = model.get(name);
-      if (value) {
-        const hash = await this.hash(value);
-        model.set(name, hash);
-      } else {
-        model.set(name, model.previous(name));
+    this.listener = async (instances) => {
+      instances = Array.isArray(instances) ? instances : [instances];
+      for (const instance of instances) {
+        if (!instance.changed(name)) {
+          continue;
+        }
+        const value = instance.get(name);
+        if (value) {
+          const hash = await this.hash(value);
+          instance.set(name, hash);
+        } else {
+          instance.set(name, instance.previous(name));
+        }
       }
     };
   }
   bind() {
     super.bind();
     this.on("beforeCreate", this.listener);
+    this.on("beforeBulkCreate", this.listener);
     this.on("beforeUpdate", this.listener);
   }
   unbind() {
     super.unbind();
     this.off("beforeCreate", this.listener);
+    this.off("beforeBulkCreate", this.listener);
     this.off("beforeUpdate", this.listener);
   }
 };

package/lib/fields/uid-field.js

@@ -40,16 +40,19 @@ const _UidField = class _UidField extends import_field.Field {
   init() {
     const { name, prefix = "", pattern } = this.options;
     const re = new RegExp(pattern || "^[A-Za-z0-9_][A-Za-z0-9_-]*$");
-    this.listener = async (instance) => {
-      const value = instance.get(name);
-      if (!value) {
-        instance.set(name, `${prefix}${(0, import_utils.uid)()}`);
-      } else if (re.test(value)) {
-        instance.set(name, value);
-      } else {
-        throw new Error(
-          `${this.collection.name}.${this.options.name} can only include A-Z, a-z, 0-9, _-*$, '${value}' is invalid`
-        );
+    this.listener = async (instances) => {
+      instances = Array.isArray(instances) ? instances : [instances];
+      for (const instance of instances) {
+        const value = instance.get(name);
+        if (!value) {
+          instance.set(name, `${prefix}${(0, import_utils.uid)()}`);
+        } else if (re.test(value)) {
+          instance.set(name, value);
+        } else {
+          throw new Error(
+            `${this.collection.name}.${this.options.name} can only include A-Z, a-z, 0-9, _-*$, '${value}' is invalid`
+          );
+        }
       }
     };
   }
@@ -57,11 +60,13 @@ const _UidField = class _UidField extends import_field.Field {
     super.bind();
     this.on("beforeCreate", this.listener);
     this.on("beforeUpdate", this.listener);
+    this.on("beforeBulkCreate", this.listener);
   }
   unbind() {
     super.unbind();
     this.off("beforeCreate", this.listener);
     this.off("beforeUpdate", this.listener);
+    this.off("beforeBulkCreate", this.listener);
   }
 };
 __name(_UidField, "UidField");

package/lib/helpers.js

@@ -96,6 +96,29 @@ function extractSSLOptionsFromEnv() {
   });
 }
 __name(extractSSLOptionsFromEnv, "extractSSLOptionsFromEnv");
+function getPoolOptions() {
+  const options = {};
+  if (process.env.DB_POOL_MAX) {
+    options.max = Number.parseInt(process.env.DB_POOL_MAX, 10);
+  }
+  if (process.env.DB_POOL_MIN) {
+    options.min = Number.parseInt(process.env.DB_POOL_MIN, 10);
+  }
+  if (process.env.DB_POOL_IDLE) {
+    options.idle = Number.parseInt(process.env.DB_POOL_IDLE, 10);
+  }
+  if (process.env.DB_POOL_ACQUIRE) {
+    options.acquire = Number.parseInt(process.env.DB_POOL_ACQUIRE, 10);
+  }
+  if (process.env.DB_POOL_EVICT) {
+    options.evict = Number.parseInt(process.env.DB_POOL_EVICT, 10);
+  }
+  if (process.env.DB_POOL_MAX_USES) {
+    options.maxUses = Number.parseInt(process.env.DB_POOL_MAX_USES, 10) || Number.POSITIVE_INFINITY;
+  }
+  return options;
+}
+__name(getPoolOptions, "getPoolOptions");
 async function parseDatabaseOptionsFromEnv() {
   const databaseOptions = {
     logging: process.env.DB_LOGGING == "on" ? customLogger : false,
@@ -109,7 +132,8 @@ async function parseDatabaseOptionsFromEnv() {
     timezone: process.env.DB_TIMEZONE,
     tablePrefix: process.env.DB_TABLE_PREFIX,
     schema: process.env.DB_SCHEMA,
-    underscored: process.env.DB_UNDERSCORED === "true"
+    underscored: process.env.DB_UNDERSCORED === "true",
+    pool: getPoolOptions()
   };
   const sslOptions = await extractSSLOptionsFromEnv();
   if (Object.keys(sslOptions).length) {

package/lib/operators/date.js

@@ -61,7 +61,7 @@ const toDate = /* @__PURE__ */ __name((date, options = {}) => {
     val = (0, import_moment.default)(val).utcOffset("+00:00").format("YYYY-MM-DD HH:mm:ss");
   }
   if (field.constructor.name === "DateOnlyField") {
-    val = (0, import_moment.default)(val).format("YYYY-MM-DD HH:mm:ss");
+    val = import_moment.default.utc(val).format("YYYY-MM-DD HH:mm:ss");
   }
   const eventObj = {
     val,
@@ -95,6 +95,9 @@ var date_default = {
       };
     }
     if (Array.isArray(r)) {
+      console.log(11111111, {
+        [import_sequelize.Op.and]: [{ [import_sequelize.Op.gte]: toDate(r[0], { ctx }) }, { [import_sequelize.Op.lt]: toDate(r[1], { ctx }) }]
+      });
       return {
         [import_sequelize.Op.and]: [{ [import_sequelize.Op.gte]: toDate(r[0], { ctx }) }, { [import_sequelize.Op.lt]: toDate(r[1], { ctx }) }]
       };

package/lib/operators/eq.js

@@ -31,7 +31,20 @@ __export(eq_exports, {
 module.exports = __toCommonJS(eq_exports);
 var import_sequelize = require("sequelize");
 var eq_default = {
-  $eq(val) {
+  $eq(val, ctx) {
+    if (ctx == null ? void 0 : ctx.fieldPath) {
+      const field = ctx.db.getFieldByPath(ctx.fieldPath);
+      if ((field == null ? void 0 : field.type) === "string" && typeof val !== "string") {
+        if (Array.isArray(val)) {
+          return {
+            [import_sequelize.Op.in]: val.map((v) => String(v))
+          };
+        }
+        return {
+          [import_sequelize.Op.eq]: String(val)
+        };
+      }
+    }
     if (Array.isArray(val)) {
       return {
         [import_sequelize.Op.in]: val

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.8",
+  "version": "1.8.0",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/logger": "1.8.0-beta.8",
-    "@nocobase/utils": "1.8.0-beta.8",
+    "@nocobase/logger": "1.8.0",
+    "@nocobase/utils": "1.8.0",
     "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": "b8871f494a7c9f21f7ed474a4e4fb3ccc38c23dd"
+  "gitHead": "043de5b0f70cbeac2a0f83e992eaa0e09c90d53d"
 }