@nocobase/database 2.0.0-alpha.13 → 2.0.0-alpha.15

package/lib/collection.d.ts

@@ -93,9 +93,6 @@ export declare class Collection<TModelAttributes extends {} = any, TCreationAttr
     validate(options: {
         values: Record<string, any> | Record<string, any>[];
         operation: 'create' | 'update';
-        context: {
-            t: Function;
-        };
     }): void;
     isMultiFilterTargetKey(): boolean;
     tableName(): any;

package/lib/collection.js

@@ -58,6 +58,7 @@ var import_model = require("./model");
 var import_repository = require("./repository");
 var import_utils = require("./utils");
 var import_field_validation = require("./utils/field-validation");
+var import_joi = __toESM(require("joi"));
 function EnsureAtomicity(target, propertyKey, descriptor) {
   const originalMethod = descriptor.value;
   descriptor.value = function(...args) {
@@ -161,50 +162,33 @@ const _Collection = class _Collection extends import_events.EventEmitter {
     }
   }
   validate(options) {
-    const { values: updateValues, context, operation } = options;
+    const { values: updateValues, operation } = options;
     if (!updateValues) {
       return;
     }
     const values = Array.isArray(updateValues) ? updateValues : [updateValues];
-    const { t } = context || { t: /* @__PURE__ */ __name((key, options2) => key, "t") };
-    const unwrapTplLabel = /* @__PURE__ */ __name((label) => {
-      if (typeof label !== "string") return label;
-      const m = label.match(/^[\s\t]*\{\{\s*t\(\s*(['"])(.*?)\1(?:\s*,[\s\S]*)?\)\s*\}\}[\s\t]*$/);
-      return m ? m[2] : label;
-    }, "unwrapTplLabel");
     const helper = /* @__PURE__ */ __name((field, value) => {
-      var _a, _b, _c;
+      var _a, _b;
       const val = value[field.name];
       if (!field.options.validation) {
         return;
       }
-      const fieldLabel = unwrapTplLabel(((_a = field.options.uiSchema) == null ? void 0 : _a.title) || field.name);
       if (field instanceof import_fields.RelationField) {
-        if ((_b = field.options) == null ? void 0 : _b.validation.rules) {
-          const isRequired = (_c = field.options) == null ? void 0 : _c.validation.rules.some((rule) => rule.name === "required");
-          if (isRequired && !val) {
-            throw new Error(
-              t("{{#label}} is required", {
-                ns: "client",
-                "#label": `${t("Collection", { ns: "client" })}: ${this.name}, ${t("Field", { ns: "client" })}: ${t(
-                  fieldLabel,
-                  { ns: "client" }
-                )}`
-              })
-            );
+        const rules = ((_b = (_a = field.options) == null ? void 0 : _a.validation) == null ? void 0 : _b.rules) || [];
+        const required = rules.some((rule) => rule.name === "required");
+        if (required) {
+          const { error: error2 } = import_joi.default.any().empty(null).required().label(`${this.name}.${field.name}`).validate(val);
+          if (error2) {
+            throw error2;
           }
         }
         return;
       }
       const joiSchema = (0, import_field_validation.buildJoiSchema)(field.options.validation, {
-        label: `${t("Collection", { ns: "client" })}: ${this.name}, ${t("Field", { ns: "client" })}: ${t(fieldLabel, {
-          ns: "client"
-        })}`,
+        label: `${this.name}.${field.name}`,
         value: val
       });
-      const { error } = joiSchema.validate(val, {
-        messages: (0, import_field_validation.getJoiErrorMessage)(t)
-      });
+      const { error } = joiSchema.validate(val);
       if (error) {
         throw error;
       }

package/lib/database.js

@@ -287,8 +287,8 @@ const _Database = class _Database extends import_events.EventEmitter {
    */
   initListener() {
     this.on("afterConnect", async (client) => {
-      if (this.inDialect("postgres")) {
-        await client.query("SET search_path = public");
+      if (this.isPostgresCompatibleDialect()) {
+        await client.query("SET search_path TO public");
       }
     });
     this.on("beforeDefine", (model, options) => {
@@ -797,12 +797,12 @@ const _Database = class _Database extends import_events.EventEmitter {
     if (!finalSQL.replace(/\s+/g, " ").trim()) {
       throw new Error("SQL cannot be empty");
     }
+    const queryGenerator = this.sequelize.getQueryInterface().queryGenerator;
     if (filter) {
       let where = {};
       const tmpCollection = new import_collection.Collection({ name: "tmp", underscored: false }, { database: this });
       const r = tmpCollection.repository;
       where = r.buildQueryOptions({ filter }).where;
-      const queryGenerator = this.sequelize.getQueryInterface().queryGenerator;
       const wSQL = queryGenerator.getWhereConditions(where, null, null, { bindParam: true });
       if (wSQL) {
         let normalizedSQL = sql.replace(/\s+/g, " ").trim();
@@ -812,6 +812,9 @@ const _Database = class _Database extends import_events.EventEmitter {
         finalSQL = `SELECT * FROM (${normalizedSQL}) AS tmp WHERE ${wSQL}`;
       }
     }
+    if (this.options.schema && this.isPostgresCompatibleDialect()) {
+      finalSQL = `${queryGenerator.setSearchPath(this.options.schema)} ${finalSQL}`;
+    }
     this.logger.debug("runSQL", { finalSQL });
     const result = await this.sequelize.query(finalSQL, { bind, transaction });
     let data = result[0];

package/lib/dialects/postgres-dialect.js

@@ -52,9 +52,6 @@ const _PostgresDialect = class _PostgresDialect extends import_base_dialect.Base
     if (!options.hooks["afterConnect"]) {
       options.hooks["afterConnect"] = [];
     }
-    options.hooks["afterConnect"].push(async (connection) => {
-      await connection.query("SET search_path TO public;");
-    });
     return options;
   }
   getVersionGuard() {

package/lib/index.d.ts

@@ -7,6 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 export { BaseError, BelongsToGetAssociationMixin, DataTypes, fn, HasManyCountAssociationsMixin, HasManyCreateAssociationMixin, HasManyGetAssociationsMixin, literal, ModelStatic, Op, SyncOptions, Transaction, UniqueConstraintError, ValidationError, ValidationErrorItem, where, } from 'sequelize';
+export { ValidationError as JoiValidationError } from 'joi';
 export * from './belongs-to-array/belongs-to-array-repository';
 export * from './collection';
 export * from './collection-group-manager';

package/lib/index.js

@@ -44,6 +44,7 @@ __export(src_exports, {
   HasManyCountAssociationsMixin: () => import_sequelize.HasManyCountAssociationsMixin,
   HasManyCreateAssociationMixin: () => import_sequelize.HasManyCreateAssociationMixin,
   HasManyGetAssociationsMixin: () => import_sequelize.HasManyGetAssociationsMixin,
+  JoiValidationError: () => import_joi.ValidationError,
   ModelStatic: () => import_sequelize.ModelStatic,
   Op: () => import_sequelize.Op,
   SQLParserTypes: () => import_sql_parser.SQLParserTypes,
@@ -65,6 +66,7 @@ __export(src_exports, {
 });
 module.exports = __toCommonJS(src_exports);
 var import_sequelize = require("sequelize");
+var import_joi = require("joi");
 __reExport(src_exports, require("./belongs-to-array/belongs-to-array-repository"), module.exports);
 __reExport(src_exports, require("./collection"), module.exports);
 __reExport(src_exports, require("./collection-group-manager"), module.exports);
@@ -110,6 +112,7 @@ var import_filter_include = require("./utils/filter-include");
   HasManyCountAssociationsMixin,
   HasManyCreateAssociationMixin,
   HasManyGetAssociationsMixin,
+  JoiValidationError,
   ModelStatic,
   Op,
   SQLParserTypes,

package/lib/operators/in.d.ts

@@ -0,0 +1,10 @@
+/**
+ * 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.
+ */
+declare const _default: Record<string, any>;
+export default _default;

package/lib/operators/in.js

@@ -0,0 +1,40 @@
+/**
+ * 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 __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var in_exports = {};
+__export(in_exports, {
+  default: () => in_default
+});
+module.exports = __toCommonJS(in_exports);
+var import_lodash = require("lodash");
+var import_sequelize = require("sequelize");
+var in_default = {
+  $in(val, ctx) {
+    return {
+      [import_sequelize.Op.in]: val == null ? [] : (0, import_lodash.castArray)(val)
+    };
+  }
+};

package/lib/operators/index.js

@@ -46,6 +46,7 @@ var import_empty = __toESM(require("./empty"));
 var import_string = __toESM(require("./string"));
 var import_eq = __toESM(require("./eq"));
 var import_ne = __toESM(require("./ne"));
+var import_in = __toESM(require("./in"));
 var import_notIn = __toESM(require("./notIn"));
 var import_boolean = __toESM(require("./boolean"));
 var import_child_collection = __toESM(require("./child-collection"));
@@ -57,6 +58,7 @@ var operators_default = {
   ...import_string.default,
   ...import_eq.default,
   ...import_ne.default,
+  ...import_in.default,
   ...import_notIn.default,
   ...import_boolean.default,
   ...import_child_collection.default

package/lib/relation-repository/belongs-to-many-repository.js

@@ -88,8 +88,7 @@ const _BelongsToManyRepository = class _BelongsToManyRepository extends import_m
     };
     this.collection.validate({
       values,
-      operation: "create",
-      context: options.context
+      operation: "create"
     });
     const instance = await sourceModel[createAccessor](values, createOptions);
     await (0, import_update_associations.updateAssociations)(instance, values, { ...options, transaction: transaction2 });

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

@@ -178,7 +178,7 @@ const _RelationRepository = class _RelationRepository {
     const values = options.values;
     const transaction2 = await this.getTransaction(options);
     const sourceModel = await this.getSourceModel(transaction2);
-    this.collection.validate({ values, context: options.context, operation: "create" });
+    this.collection.validate({ values, operation: "create" });
     const instance = await sourceModel[createAccessor](guard.sanitize(options.values), { ...options, transaction: transaction2 });
     await (0, import_update_associations.updateAssociations)(instance, values, { ...options, transaction: transaction2 });
     if (options.hooks !== false) {

package/lib/repository.js

@@ -453,7 +453,7 @@ const _Repository = class _Repository {
       underscored: this.collection.options.underscored
     });
     const values = this.model.callSetters(guard.sanitize(options.values || {}), options);
-    this.validate({ values, context: options.context, operation: "create" });
+    this.validate({ values, operation: "create" });
     const instance = await this.model.create(values, {
       ...options,
       transaction: transaction2
@@ -498,7 +498,7 @@ const _Repository = class _Repository {
     const transaction2 = await this.getTransaction(options);
     const guard = import_update_guard.UpdateGuard.fromOptions(this.model, { ...options, underscored: this.collection.options.underscored });
     const values = this.model.callSetters(guard.sanitize(options.values || {}), options);
-    this.validate({ values, context: options.context, operation: "update" });
+    this.validate({ values, operation: "update" });
     if (options.individualHooks === false) {
       const { model: Model2 } = this.collection;
       const primaryKeyField = Model2.primaryKeyField || Model2.primaryKeyAttribute;

package/lib/update-associations.js

@@ -81,8 +81,7 @@ async function updateModelByValues(instance, values, options) {
   }
   instance.constructor.collection.validate({
     values,
-    operation: "update",
-    context: options == null ? void 0 : options.context
+    operation: "update"
   });
   await instance.update(values, options);
   await updateAssociations(instance, values, options);
@@ -273,7 +272,6 @@ async function updateSingleAssociation(model, key, value, options = {}) {
   }
   association.target.collection.validate({
     values: value,
-    context: options.context,
     operation: "create"
   });
   const instance = await model[createAccessor](value, { context, transaction });
@@ -368,7 +366,6 @@ async function updateMultipleAssociation(model, key, value, options = {}) {
     if ((0, import_utils.isUndefinedOrNull)(item[targetKey])) {
       association.target.collection.validate({
         values: item,
-        context: options.context,
         operation: "create"
       });
       const instance = await model[createAccessor](item, accessorOptions);
@@ -390,7 +387,6 @@ async function updateMultipleAssociation(model, key, value, options = {}) {
       if (!instance) {
         association.target.collection.validate({
           values: item,
-          context: options.context,
           operation: "create"
         });
         instance = await model[createAccessor](item, accessorOptions);
@@ -414,7 +410,6 @@ async function updateMultipleAssociation(model, key, value, options = {}) {
         }
         association.target.collection.validate({
           values: item,
-          context: options.context,
           operation: "update"
         });
         await instance.update(item, { ...options, transaction });

package/lib/utils/field-validation.d.ts

@@ -12,48 +12,3 @@ export declare function buildJoiSchema(validation: ValidationOptions, options: {
     label?: string;
     value: string;
 }): AnySchema;
-export declare function getJoiErrorMessage(t: Function): {
-    'string.base': any;
-    'string.empty': any;
-    'string.min': any;
-    'string.max': any;
-    'string.length': any;
-    'string.alphanum': any;
-    'string.token': any;
-    'string.regex': any;
-    'string.email': any;
-    'string.uri': any;
-    'string.uriCustomScheme': any;
-    'string.isoDate': any;
-    'string.guid': any;
-    'string.hex': any;
-    'string.hostname': any;
-    'string.lowercase': any;
-    'string.uppercase': any;
-    'string.trim': any;
-    'string.creditCard': any;
-    'string.pattern.base': any;
-    'string.pattern.name': any;
-    'string.pattern.invert.base': any;
-    'string.pattern.invert.name': any;
-    'any.required': any;
-    'number.base': any;
-    'number.min': any;
-    'number.max': any;
-    'number.less': any;
-    'number.greater': any;
-    'number.float': any;
-    'number.integer': any;
-    'number.negative': any;
-    'number.positive': any;
-    'number.precision': any;
-    'number.multiple': any;
-    'number.port': any;
-    'number.unsafe': any;
-    'date.base': any;
-    'date.format': any;
-    'date.greater': any;
-    'date.less': any;
-    'date.max': any;
-    'date.min': any;
-};

package/lib/utils/field-validation.js

@@ -37,8 +37,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var field_validation_exports = {};
 __export(field_validation_exports, {
-  buildJoiSchema: () => buildJoiSchema,
-  getJoiErrorMessage: () => getJoiErrorMessage
+  buildJoiSchema: () => buildJoiSchema
 });
 module.exports = __toCommonJS(field_validation_exports);
 var import_joi = __toESM(require("joi"));
@@ -80,64 +79,7 @@ function buildJoiSchema(validation, options) {
   return schema;
 }
 __name(buildJoiSchema, "buildJoiSchema");
-function getJoiErrorMessage(t) {
-  const tOptions = { ns: "client" };
-  const JoiErrorMessages = {
-    "string.base": t("{{#label}} must be a string", tOptions),
-    "string.empty": t("{{#label}} is not allowed to be empty", tOptions),
-    "string.min": t("{{#label}} length must be at least {{#limit}} characters long", tOptions),
-    "string.max": t("{{#label}} length must be less than or equal to {{#limit}} characters long", tOptions),
-    "string.length": t("{{#label}} length must be {{#limit}} characters long", tOptions),
-    "string.alphanum": t("{{#label}} must only contain alpha-numeric characters", tOptions),
-    "string.token": t("{{#label}} must only contain alpha-numeric and underscore characters", tOptions),
-    "string.regex": t("{{#label}} with value {{#value}} fails to match the required pattern", tOptions),
-    "string.email": t("{{#label}} email address doesn\u2019t meet the required format", tOptions),
-    "string.uri": t("{{#label}} must be a valid uri", tOptions),
-    "string.uriCustomScheme": t(
-      "{{#label}} must be a valid uri with a scheme matching the {{#scheme}} pattern",
-      tOptions
-    ),
-    "string.isoDate": t("{{#label}} must be a valid ISO 8601 date", tOptions),
-    "string.guid": t("{{#label}} must be a valid UUID", tOptions),
-    "string.hex": t("{{#label}} must only contain hexadecimal characters", tOptions),
-    "string.hostname": t("{{#label}} must be a valid hostname", tOptions),
-    "string.lowercase": t("{{#label}} must only contain lowercase characters", tOptions),
-    "string.uppercase": t("{{#label}} must only contain uppercase characters", tOptions),
-    "string.trim": t("{{#label}} must not have leading or trailing whitespace", tOptions),
-    "string.creditCard": t("{{#label}} must be a credit card", tOptions),
-    "string.pattern.base": t('{{#label}} with value "{{#value}}" fails to match the required pattern', tOptions),
-    "string.pattern.name": t('{{#label}} with value "{{#value}}" fails to match the {{#name}} pattern', tOptions),
-    "string.pattern.invert.base": t('{{#label}} with value "{{#value}}" matches the inverted pattern', tOptions),
-    "string.pattern.invert.name": t(
-      '{{#label}} with value "{{#value}}" matches the inverted {{#name}} pattern',
-      tOptions
-    ),
-    "any.required": t("{{#label}} is required", tOptions),
-    "number.base": t("{{#label}} must be a number", tOptions),
-    "number.min": t("{{#label}} must be greater than or equal to {{#limit}}", tOptions),
-    "number.max": t("{{#label}} must be less than or equal to {{#limit}}", tOptions),
-    "number.less": t("{{#label}} must be less than {{#limit}}", tOptions),
-    "number.greater": t("{{#label}} must be greater than {{#limit}}", tOptions),
-    "number.float": t("{{#label}} must be a float or double", tOptions),
-    "number.integer": t("{{#label}} must be an integer", tOptions),
-    "number.negative": t("{{#label}} must be a negative number", tOptions),
-    "number.positive": t("{{#label}} must be a positive number", tOptions),
-    "number.precision": t("{{#label}} must not have more than {{#limit}} decimal places", tOptions),
-    "number.multiple": t("{{#label}} must be a multiple of {{#multiple}}", tOptions),
-    "number.port": t("{{#label}} must be a valid port", tOptions),
-    "number.unsafe": t("{{#label}} must be a safe number", tOptions),
-    "date.base": t("{{#label}} must be a valid date", tOptions),
-    "date.format": t("{{#label}} must be in {{#format}} format", tOptions),
-    "date.greater": t("{{#label}} must be greater than {{#limit}}", tOptions),
-    "date.less": t("{{#label}} must be less than {{#limit}}", tOptions),
-    "date.max": t("{{#label}} must be less than or equal to {{#limit}}", tOptions),
-    "date.min": t("{{#label}} must be greater than or equal to {{#limit}}", tOptions)
-  };
-  return JoiErrorMessages;
-}
-__name(getJoiErrorMessage, "getJoiErrorMessage");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  buildJoiSchema,
-  getJoiErrorMessage
+  buildJoiSchema
 });

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "2.0.0-alpha.13",
+  "version": "2.0.0-alpha.15",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/logger": "2.0.0-alpha.13",
-    "@nocobase/utils": "2.0.0-alpha.13",
+    "@nocobase/logger": "2.0.0-alpha.15",
+    "@nocobase/utils": "2.0.0-alpha.15",
     "async-mutex": "^0.3.2",
     "chalk": "^4.1.1",
     "cron-parser": "4.4.0",
@@ -39,5 +39,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/database"
   },
-  "gitHead": "b5b60c6ddb996b96bdc1e6d21604ef6585ae01e8"
+  "gitHead": "62569ef83962291d3cf09f0758bf7ffec3625dfa"
 }