@nocobase/database 1.8.0-beta.1 → 1.8.0-beta.12

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/fields/context-field.d.ts

@@ -10,7 +10,7 @@ import { Model } from '../model';
 import { BaseColumnFieldOptions, Field } from './field';
 export declare class ContextField extends Field {
     get dataType(): any;
-    listener: (model: Model, options: any) => Promise<void>;
+    listener: (instances: Model[], options: any) => Promise<void>;
     bind(): void;
     unbind(): void;
 }

package/lib/fields/context-field.js

@@ -48,16 +48,20 @@ const _ContextField = class _ContextField extends import_field.Field {
     const type = this.options.dataType || "string";
     return import_sequelize.DataTypes[type.toUpperCase()] || import_sequelize.DataTypes.STRING;
   }
-  listener = /* @__PURE__ */ __name(async (model, options) => {
+  listener = /* @__PURE__ */ __name(async (instances, options) => {
+    instances = Array.isArray(instances) ? instances : [instances];
     const { name, dataIndex } = this.options;
     const { context } = options;
-    model.set(name, import_lodash.default.get(context, dataIndex));
-    model.changed(name, true);
+    for (const instance of instances) {
+      instance.set(name, import_lodash.default.get(context, dataIndex));
+      instance.changed(name, true);
+    }
   }, "listener");
   bind() {
     super.bind();
     const { createOnly } = this.options;
     this.on("beforeCreate", this.listener);
+    this.on("beforeBulkCreate", this.listener);
     if (!createOnly) {
       this.on("beforeUpdate", this.listener);
     }
@@ -66,6 +70,7 @@ const _ContextField = class _ContextField extends import_field.Field {
     super.unbind();
     const { createOnly } = this.options;
     this.off("beforeCreate", this.listener);
+    this.off("beforeBulkCreate", this.listener);
     if (!createOnly) {
       this.off("beforeUpdate", this.listener);
     }

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

@@ -32,6 +32,7 @@ export * from './relation-repository/hasone-repository';
 export * from './relation-repository/multiple-relation-repository';
 export * from './relation-repository/single-relation-repository';
 export * from './repository';
+export * from './relation-repository/relation-repository';
 export { default as sqlParser, SQLParserTypes } from './sql-parser';
 export * from './update-associations';
 export { snakeCase } from './utils';

package/lib/index.js

@@ -87,6 +87,7 @@ __reExport(src_exports, require("./relation-repository/hasone-repository"), modu
 __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("./repository"), module.exports);
+__reExport(src_exports, require("./relation-repository/relation-repository"), module.exports);
 var import_sql_parser = __toESM(require("./sql-parser"));
 __reExport(src_exports, require("./update-associations"), module.exports);
 var import_utils = require("./utils");
@@ -141,6 +142,7 @@ __reExport(src_exports, require("./update-guard"), module.exports);
   ...require("./relation-repository/multiple-relation-repository"),
   ...require("./relation-repository/single-relation-repository"),
   ...require("./repository"),
+  ...require("./relation-repository/relation-repository"),
   ...require("./update-associations"),
   ...require("./value-parsers"),
   ...require("./view-collection"),

package/lib/interfaces/index.d.ts

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

package/lib/interfaces/index.js

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

package/lib/interfaces/textarea-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 TextareaInterface extends BaseInterface {
+    toValue(value: any): any;
+    validate(value: any): boolean;
+}

package/lib/interfaces/textarea-interface.js

@@ -0,0 +1,64 @@
+/**
+ * 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 textarea_interface_exports = {};
+__export(textarea_interface_exports, {
+  TextareaInterface: () => TextareaInterface
+});
+module.exports = __toCommonJS(textarea_interface_exports);
+var import_lodash = __toESM(require("lodash"));
+var import_base_interface = require("./base-interface");
+const _TextareaInterface = class _TextareaInterface extends import_base_interface.BaseInterface {
+  toValue(value) {
+    if (value === null || value === void 0 || typeof value === "string") {
+      return value;
+    }
+    if (this.validate(value)) {
+      return value.toString();
+    }
+    throw new Error(`Invalid value ${value}, expected textarea value`);
+  }
+  validate(value) {
+    return import_lodash.default.isString(value) || import_lodash.default.isNumber(value);
+  }
+};
+__name(_TextareaInterface, "TextareaInterface");
+let TextareaInterface = _TextareaInterface;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  TextareaInterface
+});

package/lib/interfaces/utils.js

@@ -65,7 +65,8 @@ const interfaces = {
   m2o: import_many_to_one_interface.ManyToOneInterface,
   m2m: import_many_to_many_interface.ManyToManyInterface,
   time: import_index.TimeInterface,
-  input: import_input_interface.InputInterface
+  input: import_input_interface.InputInterface,
+  textarea: import_index.TextareaInterface
 };
 function registerInterfaces(db) {
   for (const [interfaceName, type] of Object.entries(interfaces)) {

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/relation-repository/multiple-relation-repository.d.ts

@@ -23,6 +23,6 @@ export declare abstract class MultipleRelationRepository extends RelationReposit
         filterByTk?: TargetKey | TargetKey[];
     }, transaction?: Transaction): Promise<boolean>;
     protected filterHasInclude(filter: Filter, options?: any): boolean;
-    protected accessors(): MultiAssociationAccessors;
+    accessors(): MultiAssociationAccessors;
     updateOrCreate(options: FirstOrCreateOptions): Promise<any>;
 }

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

@@ -43,7 +43,7 @@ export declare abstract class RelationRepository {
     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;
+    accessors(): import("sequelize").SingleAssociationAccessors | import("sequelize").MultiAssociationAccessors;
     protected buildQueryOptions(options: FindOptions): any;
     protected parseFilter(filter: Filter, options?: any): any;
     protected getTransaction(options: any, autoGen?: boolean): Promise<Transaction | null>;

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