@nocobase/plugin-data-source-main 2.1.0-beta.30 → 2.1.0-beta.33

package/dist/externalVersion.js

@@ -8,16 +8,16 @@
  */
 
 module.exports = {
-  "@nocobase/client": "2.1.0-beta.30",
+  "@nocobase/client": "2.1.0-beta.33",
   "lodash": "4.18.1",
-  "@nocobase/ai": "2.1.0-beta.30",
-  "@nocobase/database": "2.1.0-beta.30",
-  "@nocobase/plugin-error-handler": "2.1.0-beta.30",
-  "@nocobase/server": "2.1.0-beta.30",
+  "@nocobase/ai": "2.1.0-beta.33",
+  "@nocobase/database": "2.1.0-beta.33",
+  "@nocobase/plugin-error-handler": "2.1.0-beta.33",
+  "@nocobase/server": "2.1.0-beta.33",
   "sequelize": "6.35.2",
   "@formily/json-schema": "2.3.7",
-  "@nocobase/test": "2.1.0-beta.30",
-  "@nocobase/utils": "2.1.0-beta.30",
-  "@nocobase/actions": "2.1.0-beta.30",
+  "@nocobase/test": "2.1.0-beta.33",
+  "@nocobase/utils": "2.1.0-beta.33",
+  "@nocobase/actions": "2.1.0-beta.33",
   "dayjs": "1.11.13"
 };

package/dist/server/modeling/collections.d.ts

@@ -63,6 +63,20 @@ export declare function buildTemplateBaseline(input: PlainObject): {
     tree?: undefined;
     schema?: undefined;
     inherits?: undefined;
+} | {
+    template: "comment";
+    logging: any;
+    autoGenId: boolean;
+    fields: PlainObject[];
+    view?: undefined;
+    tree?: undefined;
+    createdBy?: undefined;
+    updatedBy?: undefined;
+    createdAt?: undefined;
+    updatedAt?: undefined;
+    sortable?: undefined;
+    schema?: undefined;
+    inherits?: undefined;
 } | {
     template: "view";
     view: boolean;

package/dist/server/modeling/collections.js

@@ -209,6 +209,29 @@ function buildTemplateBaseline(input) {
           })
         ]
       };
+    case "comment":
+      return {
+        template,
+        logging: input.logging ?? true,
+        autoGenId: false,
+        fields: [
+          (0, import_fields.normalizeFieldInput)({
+            name: "content",
+            interface: "vditor",
+            type: "text",
+            length: "long",
+            deletable: false,
+            title: "Comment Content"
+          }),
+          ...buildPresetFields({
+            includeId: true,
+            includeCreatedAt: true,
+            includeCreatedBy: true,
+            includeUpdatedAt: true,
+            includeUpdatedBy: true
+          })
+        ]
+      };
     case "view":
       return { template, view: true, schema: input.schema || "public" };
     case "inherit":

package/dist/server/modeling/constants.d.ts

@@ -7,7 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 export type PlainObject = Record<string, any>;
-export type TemplateName = 'general' | 'tree' | 'file' | 'calendar' | 'sql' | 'view' | 'inherit';
+export type TemplateName = 'general' | 'tree' | 'file' | 'calendar' | 'comment' | 'sql' | 'view' | 'inherit';
 export declare const TEMPLATE_NAMES: TemplateName[];
 export declare const MULTI_COMPONENT_INTERFACES: Set<string>;
 export declare const ARRAY_DEFAULT_INTERFACES: Set<string>;

package/dist/server/modeling/constants.js

@@ -51,7 +51,16 @@ __export(constants_exports, {
 });
 module.exports = __toCommonJS(constants_exports);
 var import_lodash = __toESM(require("lodash"));
-const TEMPLATE_NAMES = ["general", "tree", "file", "calendar", "sql", "view", "inherit"];
+const TEMPLATE_NAMES = [
+  "general",
+  "tree",
+  "file",
+  "calendar",
+  "comment",
+  "sql",
+  "view",
+  "inherit"
+];
 const MULTI_COMPONENT_INTERFACES = /* @__PURE__ */ new Set([
   "multipleSelect",
   "checkboxGroup",
@@ -108,6 +117,11 @@ const PLUGIN_REQUIREMENTS = {
     packageName: "@nocobase/plugin-field-attachment-url",
     capability: "attachmentURL field"
   },
+  comment: {
+    runtimeName: "comments",
+    packageName: "@nocobase/plugin-comments",
+    capability: "comment collection template"
+  },
   vditor: {
     runtimeName: "field-markdown-vditor",
     packageName: "@nocobase/plugin-field-markdown-vditor",

package/dist/server/modeling/fields.js

@@ -44,6 +44,7 @@ __export(fields_exports, {
 module.exports = __toCommonJS(fields_exports);
 var import_lodash = __toESM(require("lodash"));
 var import_sequelize = require("sequelize");
+var import_utils = require("@nocobase/utils");
 var import_constants = require("./constants");
 function normalizeInterfaceName(value) {
   if (!value) {
@@ -159,6 +160,39 @@ const ALLOWED_FIELD_TYPES = {
   tableoid: ["virtual"],
   mbm: ["belongsToArray"]
 };
+const VALIDATION_TYPE_BY_INTERFACE = {
+  input: "string",
+  phone: "string",
+  email: "string",
+  color: "string",
+  icon: "string",
+  url: "string",
+  textarea: "string",
+  markdown: "string",
+  vditor: "string",
+  richText: "string",
+  password: "string",
+  uuid: "string",
+  nanoid: "string",
+  code: "string",
+  sequence: "string",
+  encryption: "string",
+  integer: "number",
+  number: "number",
+  percent: "number",
+  unixTimestamp: "number",
+  snowflakeId: "number",
+  id: "number",
+  sort: "number",
+  checkbox: "boolean",
+  json: "object",
+  datetime: "date",
+  createdAt: "date",
+  updatedAt: "date",
+  datetimeNoTz: "date",
+  dateOnly: "date",
+  time: "date"
+};
 function buildRelationComponentProps(field) {
   return {
     multiple: import_constants.MULTI_COMPONENT_INTERFACES.has(field.interface),
@@ -380,6 +414,36 @@ function validateFieldType(field) {
     );
   }
 }
+function inferValidationType(field) {
+  var _a;
+  return ((_a = field.validation) == null ? void 0 : _a.type) || VALIDATION_TYPE_BY_INTERFACE[field.interface] || "string";
+}
+function normalizeValidationRule(rule) {
+  if (typeof rule === "string") {
+    return {
+      key: `r_${(0, import_utils.uid)()}`,
+      name: rule
+    };
+  }
+  return {
+    ...rule,
+    key: (rule == null ? void 0 : rule.key) || `r_${(0, import_utils.uid)()}`
+  };
+}
+function normalizeFieldValidation(field) {
+  var _a;
+  const rulesInput = field.validators || ((_a = field.validation) == null ? void 0 : _a.rules);
+  if (!rulesInput) {
+    return;
+  }
+  const rules = (Array.isArray(rulesInput) ? rulesInput : [rulesInput]).map(normalizeValidationRule);
+  field.validation = {
+    ...field.validation || {},
+    type: inferValidationType(field),
+    rules
+  };
+  delete field.validators;
+}
 function buildRelationKeyName(name, key = "id") {
   return import_sequelize.Utils.camelize([import_sequelize.Utils.singularize(name || ""), key].join("_"));
 }
@@ -471,6 +535,7 @@ function normalizeFieldInput(input, context = {}) {
     throw new Error(`Field ${field.name || "(unknown)"} is missing interface`);
   }
   validateFieldType(field);
+  normalizeFieldValidation(field);
   if (import_constants.RELATION_INTERFACES.has(field.interface) && !field.target) {
     throw new Error(`Relation field ${field.name} requires target`);
   }

package/dist/swagger/index.d.ts

@@ -1269,6 +1269,63 @@ declare const _default: {
                     };
                     additionalProperties: boolean;
                 };
+                validationRule: {
+                    type: string;
+                    description: string;
+                    properties: {
+                        key: {
+                            type: string;
+                            description: string;
+                        };
+                        name: {
+                            type: string;
+                            description: string;
+                        };
+                        args: {
+                            type: string;
+                            description: string;
+                            additionalProperties: boolean;
+                        };
+                        paramsType: {
+                            type: string;
+                            enum: string[];
+                            description: string;
+                        };
+                    };
+                    required: string[];
+                    additionalProperties: boolean;
+                };
+                validation: {
+                    type: string;
+                    description: string;
+                    properties: {
+                        type: {
+                            type: string;
+                            description: string;
+                        };
+                        rules: {
+                            type: string;
+                            items: {
+                                $ref: string;
+                            };
+                        };
+                    };
+                    required: string[];
+                    additionalProperties: boolean;
+                };
+                validators: {
+                    type: string;
+                    description: string;
+                    items: {
+                        anyOf: ({
+                            type: string;
+                            $ref?: undefined;
+                        } | {
+                            $ref: string;
+                            type?: undefined;
+                        })[];
+                    };
+                };
                 model: {
                     type: string;
                     properties: {
@@ -1364,6 +1421,9 @@ declare const _default: {
                             type: string;
                             nullable: boolean;
                         };
+                        validation: {
+                            $ref: string;
+                        };
                         defaultValue: {
                             nullable: boolean;
                         };
@@ -1483,6 +1543,9 @@ declare const _default: {
                         allowNull: {
                             type: string;
                         };
+                        validation: {
+                            $ref: string;
+                        };
                         defaultValue: {};
                         enum: {
                             type: string;
@@ -1548,6 +1611,12 @@ declare const _default: {
                         target: {
                             type: string;
                         };
+                        validation: {
+                            $ref: string;
+                        };
+                        validators: {
+                            $ref: string;
+                        };
                         defaultValue: {
                             description: string;
                         };
@@ -1616,6 +1685,12 @@ declare const _default: {
                         target: {
                             type: string;
                         };
+                        validation: {
+                            $ref: string;
+                        };
+                        validators: {
+                            $ref: string;
+                        };
                         settings: {
                             type: string;
                             additionalProperties: boolean;
@@ -1642,6 +1717,12 @@ declare const _default: {
                         target: {
                             type: string;
                         };
+                        validation: {
+                            $ref: string;
+                        };
+                        validators: {
+                            $ref: string;
+                        };
                         defaultValue: {
                             description: string;
                         };

package/dist/swagger/index.js

@@ -1188,6 +1188,64 @@ var swagger_default = {
           },
           additionalProperties: true
         },
+        validationRule: {
+          type: "object",
+          description: "One server-side Joi validation rule for repository create/update.",
+          properties: {
+            key: {
+              type: "string",
+              description: "Stable rule key. Generated by fields:apply when omitted."
+            },
+            name: {
+              type: "string",
+              description: "Joi rule name, for example `required`, `min`, `max`, `length`, `pattern`, `email`, or `precision`."
+            },
+            args: {
+              type: "object",
+              description: 'Rule arguments. Common examples: `{ "limit": 2 }`, `{ "regex": "^[A-Z]+$" }`, `{ "allowUnicode": true }`.',
+              additionalProperties: true
+            },
+            paramsType: {
+              type: "string",
+              enum: ["object"],
+              description: "Use `object` when the Joi rule expects a single options object, such as `email` or `uuid`."
+            }
+          },
+          required: ["name"],
+          additionalProperties: true
+        },
+        validation: {
+          type: "object",
+          description: [
+            "Server-side field validation executed by repository create/update.",
+            "",
+            "Validation is based on Joi. The `type` selects the Joi schema type, and `rules` are applied in order."
+          ].join("\n"),
+          properties: {
+            type: {
+              type: "string",
+              description: "Joi schema type, commonly `string`, `number`, `date`, `boolean`, or `object`."
+            },
+            rules: {
+              type: "array",
+              items: { $ref: "#/components/schemas/field/validationRule" }
+            }
+          },
+          required: ["type", "rules"],
+          additionalProperties: true
+        },
+        validators: {
+          type: "array",
+          description: [
+            "AI-friendly shorthand for server-side validation rules.",
+            "",
+            "Each item can be a Joi rule name string or a validation rule object.",
+            "fields:apply converts this to `validation.rules`, fills missing rule keys, and infers `validation.type` from the field interface when omitted."
+          ].join("\n"),
+          items: {
+            anyOf: [{ type: "string" }, { $ref: "#/components/schemas/field/validationRule" }]
+          }
+        },
         model: {
           type: "object",
           properties: {
@@ -1218,6 +1276,7 @@ var swagger_default = {
             autoIncrement: { type: "boolean", nullable: true },
             unique: { type: "boolean", nullable: true },
             allowNull: { type: "boolean", nullable: true },
+            validation: { $ref: "#/components/schemas/field/validation" },
             defaultValue: {
               nullable: true
             },
@@ -1286,6 +1345,7 @@ var swagger_default = {
             autoIncrement: { type: "boolean" },
             unique: { type: "boolean" },
             allowNull: { type: "boolean" },
+            validation: { $ref: "#/components/schemas/field/validation" },
             defaultValue: {},
             enum: {
               type: "array",
@@ -1333,6 +1393,8 @@ var swagger_default = {
             interface: { type: "string" },
             description: { type: "string" },
             target: { type: "string" },
+            validation: { $ref: "#/components/schemas/field/validation" },
+            validators: { $ref: "#/components/schemas/field/validators" },
             defaultValue: {
               description: "Optional default value JSON. Structure depends on the selected interface."
             },
@@ -1379,6 +1441,8 @@ var swagger_default = {
             title: { type: "string" },
             interface: { type: "string" },
             target: { type: "string" },
+            validation: { $ref: "#/components/schemas/field/validation" },
+            validators: { $ref: "#/components/schemas/field/validators" },
             settings: {
               type: "object",
               additionalProperties: true
@@ -1395,6 +1459,8 @@ var swagger_default = {
             interface: { type: "string" },
             description: { type: "string" },
             target: { type: "string" },
+            validation: { $ref: "#/components/schemas/field/validation" },
+            validators: { $ref: "#/components/schemas/field/validators" },
             defaultValue: {
               description: "Optional default value JSON. Structure depends on the selected interface."
             },

package/package.json

@@ -6,7 +6,7 @@
   "description": "NocoBase main database, supports relational databases such as PostgreSQL, MySQL, MariaDB and so on.",
   "description.ru-RU": "Основная база данных NocoBase: поддерживает реляционные СУБД, включая PostgreSQL, MySQL, MariaDB и другие.",
   "description.zh-CN": "NocoBase 主数据库，支持 PostgreSQL、MySQL、MariaDB 等关系型数据库。",
-  "version": "2.1.0-beta.30",
+  "version": "2.1.0-beta.33",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/data-source-main",
   "homepage.ru-RU": "https://docs-ru.nocobase.com/handbook/data-source-main",
@@ -25,7 +25,7 @@
     "@nocobase/test": "2.x",
     "@nocobase/utils": "2.x"
   },
-  "gitHead": "1a493069cd0d8a4f403668bfe592879678c894b2",
+  "gitHead": "4815c394e80a264fa8ed619246280923c47aeb72",
   "keywords": [
     "Data sources"
   ]