@nocobase/plugin-data-source-main 2.0.0-alpha.13 → 2.0.0-alpha.14

package/dist/externalVersion.js

@@ -8,13 +8,14 @@
  */
 
 module.exports = {
-  "@nocobase/client": "2.0.0-alpha.13",
+  "@nocobase/client": "2.0.0-alpha.14",
   "lodash": "4.17.21",
-  "@nocobase/database": "2.0.0-alpha.13",
-  "@nocobase/plugin-error-handler": "2.0.0-alpha.13",
-  "@nocobase/server": "2.0.0-alpha.13",
-  "@nocobase/test": "2.0.0-alpha.13",
-  "@nocobase/utils": "2.0.0-alpha.13",
+  "@nocobase/database": "2.0.0-alpha.14",
+  "@nocobase/plugin-error-handler": "2.0.0-alpha.14",
+  "@nocobase/server": "2.0.0-alpha.14",
+  "@formily/json-schema": "2.3.7",
+  "@nocobase/test": "2.0.0-alpha.14",
+  "@nocobase/utils": "2.0.0-alpha.14",
   "sequelize": "6.35.2",
   "dayjs": "1.11.13"
 };

package/dist/locale/en-US.json

@@ -1,4 +1,48 @@
 {
   "field-name-exists": "Field name \"{{name}}\" already exists in collection \"{{collectionName}}\"",
-  "field-is-depended-on-by-other": "Can not delete field \"{{fieldName}}\" in \"{{fieldCollectionName}}\", it is used by field \"{{dependedFieldName}}\" in \"{{dependedFieldCollectionName}}\" as \"{{dependedFieldAs}}\""
+  "field-is-depended-on-by-other": "Can not delete field \"{{fieldName}}\" in \"{{fieldCollectionName}}\", it is used by field \"{{dependedFieldName}}\" in \"{{dependedFieldCollectionName}}\" as \"{{dependedFieldAs}}\"",
+  "string.base": "{{label}} must be a string",
+  "string.empty": "{{label}} is not allowed to be empty",
+  "string.min": "{{label}} length must be at least {{limit}} characters long",
+  "string.max": "{{label}} length must be less than or equal to {{limit}} characters long",
+  "string.length": "{{label}} length must be {{limit}} characters long",
+  "string.alphanum": "{{label}} must only contain alpha-numeric characters",
+  "string.token": "{{label}} must only contain alpha-numeric and underscore characters",
+  "string.regex": "{{label}} with value {{value}} fails to match the required pattern",
+  "string.email": "{{label}} email address doesn’t meet the required format",
+  "string.uri": "{{label}} must be a valid uri",
+  "string.uriCustomScheme": "{{label}} must be a valid uri with a scheme matching the {{scheme}} pattern",
+  "string.uriRelativeOnly": "{{label}} must be a valid relative uri",
+  "string.isoDate": "{{label}} must be a valid ISO 8601 date",
+  "string.guid": "{{label}} must be a valid UUID",
+  "string.hex": "{{label}} must only contain hexadecimal characters",
+  "string.hostname": "{{label}} must be a valid hostname",
+  "string.lowercase": "{{label}} must only contain lowercase characters",
+  "string.uppercase": "{{label}} must only contain uppercase characters",
+  "string.trim": "{{label}} must not have leading or trailing whitespace",
+  "string.creditCard": "{{label}} must be a credit card",
+  "string.pattern.base": "{{label}} with value \"{{value}}\" fails to match the required pattern: {{regex}}",
+  "string.pattern.name": "{{label}} with value \"{{value}}\" fails to match the {{name}} pattern",
+  "string.pattern.invert.base": "{{label}} with value \"{{value}}\" matches the inverted pattern",
+  "string.pattern.invert.name": "{{label}} with value \"{{value}}\" matches the inverted {{name}} pattern",
+  "any.required": "{{label}} is required",
+  "number.base": "{{label}} must be a number",
+  "number.min": "{{label}} must be greater than or equal to {{limit}}",
+  "number.max": "{{label}} must be less than or equal to {{limit}}",
+  "number.less": "{{label}} must be less than {{limit}}",
+  "number.greater": "{{label}} must be greater than {{limit}}",
+  "number.float": "{{label}} must be a float or double",
+  "number.integer": "{{label}} must be an integer",
+  "number.negative": "{{label}} must be a negative number",
+  "number.positive": "{{label}} must be a positive number",
+  "number.precision": "{{label}} must not have more than {{limit}} decimal places",
+  "number.multiple": "{{label}} must be a multiple of {{multiple}}",
+  "number.port": "{{label}} must be a valid port",
+  "number.unsafe": "{{label}} must be a safe number",
+  "date.base": "{{label}} must be a valid date",
+  "date.format": "{{label}} must be in {{format}} format",
+  "date.greater": "{{label}} must be greater than {{limit}}",
+  "date.less": "{{label}} must be less than {{limit}}",
+  "date.max": "{{label}} must be less than or equal to {{limit}}",
+  "date.min": "{{label}} must be greater than or equal to {{limit}}"
 }

package/dist/locale/zh-CN.json

@@ -1,4 +1,48 @@
 {
   "field-name-exists": "字段标识 \"{{name}}\" 已存在",
-  "field-is-depended-on-by-other": "无法删除 \"{{fieldCollectionName}}\" 中的 \"{{fieldName}}\" 字段，它被 \"{{dependedFieldCollectionName}}\" 中的 \"{{dependedFieldName}}\" 字段用作 \"{{dependedFieldAs}}\""
+  "field-is-depended-on-by-other": "无法删除 \"{{fieldCollectionName}}\" 中的 \"{{fieldName}}\" 字段，它被 \"{{dependedFieldCollectionName}}\" 中的 \"{{dependedFieldName}}\" 字段用作 \"{{dependedFieldAs}}\"",
+  "string.base": "{{label}} 必须是字符串",
+  "string.empty": "{{label}} 不能为空字符串",
+  "string.min": "{{label}} 长度不能少于 {{limit}} 个字符",
+  "string.max": "{{label}} 长度不能超过 {{limit}} 个字符",
+  "string.length": "{{label}} 长度必须为 {{limit}} 个字符",
+  "string.alphanum": "{{label}} 只能包含字母和数字",
+  "string.token": "{{label}} 只能包含字母、数字和下划线",
+  "string.regex": "{{label}} 值 {{value}} 格式不正确",
+  "string.email": "{{label}} 邮箱地址不符合要求的格式",
+  "string.uri": "{{label}} 必须是有效的URI",
+  "string.uriRelativeOnly": "{{label}} 必须是有效的相对路径",
+  "string.uriCustomScheme": "{{label}} 必须是符合 {{scheme}} 模式的有效URI",
+  "string.isoDate": "{{label}} 必须是有效的ISO日期",
+  "string.guid": "{{label}} 必须是有效的UUID",
+  "string.hex": "{{label}} 必须是有效的十六进制字符串",
+  "string.hostname": "{{label}} 必须是有效的主机名",
+  "string.lowercase": "{{label}} 必须是小写",
+  "string.uppercase": "{{label}} 必须是大写",
+  "string.trim": "{{label}} 不能包含前后空白字符",
+  "string.creditCard": "{{label}} 必须是有效的信用卡号",
+  "string.pattern.base": "{{label}} 值 \"{{value}}\" 格式不符合要求：{{regex}}",
+  "string.pattern.name": "{{label}} 值 \"{{value}}\" 不符合 {{name}} 格式",
+  "string.pattern.invert.base": "{{label}} 值 \"{{value}}\" 包含不允许的字符",
+  "string.pattern.invert.name": "{{label}} 值 \"{{value}}\" 不能符合 {{name}} 格式",
+  "any.required": "{{label}} 是必填项",
+  "number.base": "{{label}} 必须是数字",
+  "number.min": "{{label}} 必须大于或等于 {{limit}}",
+  "number.max": "{{label}} 必须小于或等于 {{limit}}",
+  "number.less": "{{label}} 必须小于 {{limit}}",
+  "number.greater": "{{label}} 必须大于 {{limit}}",
+  "number.float": "{{label}} 必须是浮点数",
+  "number.integer": "{{label}} 必须是整数",
+  "number.negative": "{{label}} 必须是负数",
+  "number.positive": "{{label}} 必须是正数",
+  "number.precision": "{{label}} 精度不能超过 {{limit}} 位小数",
+  "number.multiple": "{{label}} 必须是 {{multiple}} 的倍数",
+  "number.port": "{{label}} 必须是有效的端口号",
+  "number.unsafe": "{{label}} 必须是安全整数",
+  "date.base": "{{label}} 必须是有效日期",
+  "date.format": "{{label}} 必须是 {{format}} 格式",
+  "date.greater": "{{label}} 必须大于 {{limit}}",
+  "date.less": "{{label}} 必须小于 {{limit}}",
+  "date.max": "{{label}} 必须小于或等于 {{limit}}",
+  "date.min": "{{label}} 必须大于或等于 {{limit}}"
 }

package/dist/server/server.d.ts

@@ -16,6 +16,7 @@ export declare class PluginDataSourceMainServer extends Plugin {
     beforeLoad(): Promise<void>;
     private db2cm;
     load(): Promise<void>;
+    registerErrorHandler(): void;
     install(): Promise<void>;
 }
 export default PluginDataSourceMainServer;

package/dist/server/server.js

@@ -55,6 +55,8 @@ var import_beforeDestoryField = require("./hooks/beforeDestoryField");
 var import_models = require("./models");
 var import_collections = __toESM(require("./resourcers/collections"));
 var import_views = __toESM(require("./resourcers/views"));
+var import_json_schema = require("@formily/json-schema");
+var import_lodash2 = __toESM(require("lodash"));
 class PluginDataSourceMainServer extends import_server.Plugin {
   loadFilter = {};
   db2cmCollections = [];
@@ -382,52 +384,7 @@ class PluginDataSourceMainServer extends import_server.Plugin {
   }
   async load() {
     this.db.getRepository("collections").setApp(this.app);
-    const errorHandlerPlugin = this.app.getPlugin("error-handler");
-    errorHandlerPlugin.errorHandler.register(
-      (err) => {
-        return err instanceof import_database.UniqueConstraintError;
-      },
-      (err, ctx) => {
-        return ctx.throw(400, ctx.t(`The value of ${Object.keys(err.fields)} field duplicated`));
-      }
-    );
-    errorHandlerPlugin.errorHandler.register(
-      (err) => err instanceof import_field_is_depended_on_by_other.FieldIsDependedOnByOtherError,
-      (err, ctx) => {
-        ctx.status = 400;
-        ctx.body = {
-          errors: [
-            {
-              message: ctx.i18n.t("field-is-depended-on-by-other", {
-                fieldName: err.options.fieldName,
-                fieldCollectionName: err.options.fieldCollectionName,
-                dependedFieldName: err.options.dependedFieldName,
-                dependedFieldCollectionName: err.options.dependedFieldCollectionName,
-                dependedFieldAs: err.options.dependedFieldAs,
-                ns: "data-source-main"
-              })
-            }
-          ]
-        };
-      }
-    );
-    errorHandlerPlugin.errorHandler.register(
-      (err) => err instanceof import_field_name_exists_error.FieldNameExistsError,
-      (err, ctx) => {
-        ctx.status = 400;
-        ctx.body = {
-          errors: [
-            {
-              message: ctx.i18n.t("field-name-exists", {
-                name: err.value,
-                collectionName: err.collectionName,
-                ns: "data-source-main"
-              })
-            }
-          ]
-        };
-      }
-    );
+    this.registerErrorHandler();
     this.app.resourceManager.use(async function mergeReverseFieldWhenSaveCollectionField(ctx, next) {
       if (ctx.action.resourceName === "collections.fields" && ["create", "update"].includes(ctx.action.actionName)) {
         ctx.action.mergeParams({
@@ -482,6 +439,95 @@ class PluginDataSourceMainServer extends import_server.Plugin {
       origin: this.options.packageName
     });
   }
+  registerErrorHandler() {
+    const errorHandlerPlugin = this.app.pm.get("error-handler");
+    errorHandlerPlugin.errorHandler.register(
+      (err) => {
+        return err instanceof import_database.UniqueConstraintError;
+      },
+      (err, ctx) => {
+        return ctx.throw(400, ctx.t(`The value of ${Object.keys(err.fields)} field duplicated`));
+      }
+    );
+    errorHandlerPlugin.errorHandler.register(
+      (err) => err instanceof import_field_is_depended_on_by_other.FieldIsDependedOnByOtherError,
+      (err, ctx) => {
+        ctx.status = 400;
+        ctx.body = {
+          errors: [
+            {
+              message: ctx.i18n.t("field-is-depended-on-by-other", {
+                fieldName: err.options.fieldName,
+                fieldCollectionName: err.options.fieldCollectionName,
+                dependedFieldName: err.options.dependedFieldName,
+                dependedFieldCollectionName: err.options.dependedFieldCollectionName,
+                dependedFieldAs: err.options.dependedFieldAs,
+                ns: "data-source-main"
+              })
+            }
+          ]
+        };
+      }
+    );
+    errorHandlerPlugin.errorHandler.register(
+      (err) => err instanceof import_field_name_exists_error.FieldNameExistsError,
+      (err, ctx) => {
+        ctx.status = 400;
+        ctx.body = {
+          errors: [
+            {
+              message: ctx.i18n.t("field-name-exists", {
+                name: err.value,
+                collectionName: err.collectionName,
+                ns: "data-source-main"
+              })
+            }
+          ]
+        };
+      }
+    );
+    errorHandlerPlugin.errorHandler.register(
+      (err) => err instanceof import_database.JoiValidationError,
+      (err, ctx) => {
+        const t = ctx.i18n.t;
+        ctx.status = 400;
+        ctx.body = {
+          errors: err.details.map((detail) => {
+            const context = detail.context;
+            const label = context.label;
+            if (label) {
+              const [collectionName, fieldName] = label.split(".");
+              const collection = this.db.getCollection(collectionName);
+              if (collection) {
+                const collectionTitle = import_json_schema.Schema.compile(collection.options.title, { t });
+                const field = collection.getField(fieldName);
+                const fieldOptions = import_json_schema.Schema.compile(field == null ? void 0 : field.options, { t });
+                const fieldTitle = import_lodash2.default.get(fieldOptions, "uiSchema.title", fieldName);
+                context.label = `${t(collectionTitle, {
+                  ns: ["lm-collections", "client"]
+                })}: ${t(fieldTitle, {
+                  ns: ["lm-collections", "client"]
+                })}`;
+              }
+            }
+            if (context.regex) {
+              context.regex = context.regex.source;
+            }
+            let message = ctx.i18n.t(detail.type, {
+              ...context,
+              ns: "data-source-main"
+            });
+            if (message === detail.type) {
+              message = err.message.replace(`"${label}"`, context.label);
+            }
+            return {
+              message
+            };
+          })
+        };
+      }
+    );
+  }
   async install() {
     const dataSourcesCollection = this.app.db.getCollection("dataSources");
     if (dataSourcesCollection) {

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "数据源：主数据库",
   "description": "NocoBase main database, supports relational databases such as PostgreSQL, MySQL, MariaDB and so on.",
   "description.zh-CN": "NocoBase 主数据库，支持 PostgreSQL、MySQL、MariaDB 等关系型数据库。",
-  "version": "2.0.0-alpha.13",
+  "version": "2.0.0-alpha.14",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/data-source-main",
   "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/data-source-main",
@@ -22,7 +22,7 @@
     "@nocobase/test": "2.x",
     "@nocobase/utils": "2.x"
   },
-  "gitHead": "b5b60c6ddb996b96bdc1e6d21604ef6585ae01e8",
+  "gitHead": "6b4785d03d0a551f1fe6815e9bcbc7a9f38901df",
   "keywords": [
     "Data sources"
   ]