@nocobase/plugin-data-source-main 2.1.0-alpha.21 → 2.1.0-alpha.22

package/dist/externalVersion.js

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

package/dist/server/modeling/collections.js

@@ -219,6 +219,7 @@ function buildTemplateBaseline(input) {
   }
 }
 function normalizeCollectionInput(input, options = {}) {
+  var _a, _b;
   const values = import_lodash.default.cloneDeep(input || {});
   if ((options.mode || "create") === "create") {
     values.template = values.template || "general";
@@ -227,6 +228,12 @@ function normalizeCollectionInput(input, options = {}) {
   if (Array.isArray(values.fields)) {
     values.fields = values.fields.map((field) => (0, import_fields.normalizeFieldInput)(field, { collectionName: values.name }));
   }
+  if ((options.mode || "create") === "create" && !values.titleField) {
+    const primaryKeyField = (_b = (_a = values.fields) == null ? void 0 : _a.find) == null ? void 0 : _b.call(_a, (field) => (field == null ? void 0 : field.primaryKey) === true);
+    if (primaryKeyField == null ? void 0 : primaryKeyField.name) {
+      values.titleField = primaryKeyField.name;
+    }
+  }
   return values;
 }
 function composeCollectionDefinition(input, options = {}) {

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

@@ -14,6 +14,7 @@ export declare const ARRAY_DEFAULT_INTERFACES: Set<string>;
 export declare const CHOICE_INTERFACES: Set<string>;
 export declare const RELATION_INTERFACES: Set<string>;
 export declare const INTERFACE_ALIASES: Record<string, string>;
+export declare const CHOICE_COLOR_OPTIONS: string[];
 export declare const PLUGIN_REQUIREMENTS: Record<string, {
     runtimeName: string;
     packageName: string;
@@ -21,4 +22,5 @@ export declare const PLUGIN_REQUIREMENTS: Record<string, {
 }>;
 export declare function toDisplayTitle(value?: string): string;
 export declare function normalizeChoiceEnum(enumValues?: any[]): any[];
+export declare function validateChoiceEnumColors(enumValues?: any[], fieldName?: string): void;
 export declare function uniqueByName(fields: PlainObject[]): PlainObject[];

package/dist/server/modeling/constants.js

@@ -37,6 +37,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var constants_exports = {};
 __export(constants_exports, {
   ARRAY_DEFAULT_INTERFACES: () => ARRAY_DEFAULT_INTERFACES,
+  CHOICE_COLOR_OPTIONS: () => CHOICE_COLOR_OPTIONS,
   CHOICE_INTERFACES: () => CHOICE_INTERFACES,
   INTERFACE_ALIASES: () => INTERFACE_ALIASES,
   MULTI_COMPONENT_INTERFACES: () => MULTI_COMPONENT_INTERFACES,
@@ -45,7 +46,8 @@ __export(constants_exports, {
   TEMPLATE_NAMES: () => TEMPLATE_NAMES,
   normalizeChoiceEnum: () => normalizeChoiceEnum,
   toDisplayTitle: () => toDisplayTitle,
-  uniqueByName: () => uniqueByName
+  uniqueByName: () => uniqueByName,
+  validateChoiceEnumColors: () => validateChoiceEnumColors
 });
 module.exports = __toCommonJS(constants_exports);
 var import_lodash = __toESM(require("lodash"));
@@ -75,6 +77,21 @@ const INTERFACE_ALIASES = {
   unixTs: "unixTimestamp",
   o2o: "obo"
 };
+const CHOICE_COLOR_OPTIONS = [
+  "red",
+  "magenta",
+  "volcano",
+  "orange",
+  "gold",
+  "lime",
+  "green",
+  "cyan",
+  "blue",
+  "geekblue",
+  "purple",
+  "default"
+];
+const CHOICE_COLOR_OPTION_SET = new Set(CHOICE_COLOR_OPTIONS);
 const PLUGIN_REQUIREMENTS = {
   file: {
     runtimeName: "file-manager",
@@ -169,12 +186,32 @@ function normalizeChoiceEnum(enumValues = []) {
     };
   });
 }
+function validateChoiceEnumColors(enumValues = [], fieldName = "(unknown)") {
+  const allowedColors = CHOICE_COLOR_OPTIONS.join(", ");
+  enumValues.forEach((item, index) => {
+    if (!import_lodash.default.isPlainObject(item)) {
+      throw new Error(
+        `Field ${fieldName} enum item #${index + 1} must be an object with value, label, and color; string shorthand is not allowed`
+      );
+    }
+    const optionName = item.value ?? item.label ?? `#${index + 1}`;
+    if (!item.color) {
+      throw new Error(`Field ${fieldName} enum item ${optionName} requires color`);
+    }
+    if (!CHOICE_COLOR_OPTION_SET.has(item.color)) {
+      throw new Error(
+        `Field ${fieldName} enum item ${optionName} color ${item.color} is invalid. Allowed colors: ${allowedColors}`
+      );
+    }
+  });
+}
 function uniqueByName(fields) {
   return import_lodash.default.uniqBy(fields.filter(Boolean).reverse(), "name").reverse();
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ARRAY_DEFAULT_INTERFACES,
+  CHOICE_COLOR_OPTIONS,
   CHOICE_INTERFACES,
   INTERFACE_ALIASES,
   MULTI_COMPONENT_INTERFACES,
@@ -183,5 +220,6 @@ function uniqueByName(fields) {
   TEMPLATE_NAMES,
   normalizeChoiceEnum,
   toDisplayTitle,
-  uniqueByName
+  uniqueByName,
+  validateChoiceEnumColors
 });

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

@@ -8,5 +8,6 @@
  */
 import { PlainObject } from './constants';
 export declare function normalizeInterfaceName(value?: string): string;
+export declare function validateChoiceFieldInput(field?: PlainObject): void;
 export declare function normalizeFieldInput(input: PlainObject, context?: PlainObject): PlainObject;
 export declare function normalizeFieldList(fields?: PlainObject[], collectionName?: string): PlainObject[];

package/dist/server/modeling/fields.js

@@ -38,7 +38,8 @@ var fields_exports = {};
 __export(fields_exports, {
   normalizeFieldInput: () => normalizeFieldInput,
   normalizeFieldList: () => normalizeFieldList,
-  normalizeInterfaceName: () => normalizeInterfaceName
+  normalizeInterfaceName: () => normalizeInterfaceName,
+  validateChoiceFieldInput: () => validateChoiceFieldInput
 });
 module.exports = __toCommonJS(fields_exports);
 var import_lodash = __toESM(require("lodash"));
@@ -438,6 +439,27 @@ function buildReverseField(field) {
     { collectionName: field.target }
   );
 }
+function getChoiceEnumInput(field) {
+  var _a;
+  if (Array.isArray(field == null ? void 0 : field.enum)) {
+    return field.enum;
+  }
+  if (Array.isArray((_a = field == null ? void 0 : field.uiSchema) == null ? void 0 : _a.enum)) {
+    return field.uiSchema.enum;
+  }
+  return [];
+}
+function validateChoiceFieldInput(field = {}) {
+  const interfaceName = normalizeInterfaceName(field.interface);
+  if (!import_constants.CHOICE_INTERFACES.has(interfaceName)) {
+    return;
+  }
+  const enumValues = getChoiceEnumInput(field);
+  if (!enumValues.length) {
+    return;
+  }
+  (0, import_constants.validateChoiceEnumColors)(enumValues, field.name || "(unknown)");
+}
 function normalizeFieldInput(input, context = {}) {
   var _a, _b;
   const field = import_lodash.default.cloneDeep(input || {});
@@ -539,5 +561,6 @@ function normalizeFieldList(fields = [], collectionName) {
 0 && (module.exports = {
   normalizeFieldInput,
   normalizeFieldList,
-  normalizeInterfaceName
+  normalizeInterfaceName,
+  validateChoiceFieldInput
 });

package/dist/server/modeling/service.js

@@ -44,6 +44,12 @@ function mergeSettings(input = {}) {
     ...rest
   };
 }
+function validateApplyFieldInputs(fields) {
+  if (!Array.isArray(fields)) {
+    return;
+  }
+  fields.forEach((field) => (0, import_fields.validateChoiceFieldInput)(field));
+}
 async function findCollection(ctx, collectionName) {
   return ctx.app.db.getRepository("collections").findOne({
     filter: {
@@ -67,6 +73,7 @@ async function upsertFieldDefinition(ctx, rawInput) {
   if (!collectionName) {
     throw new Error("field apply requires collectionName");
   }
+  (0, import_fields.validateChoiceFieldInput)(input);
   const values = (0, import_fields.normalizeFieldInput)(input, { collectionName });
   await (0, import_capabilities.assertModelingSupport)(ctx.app, { fields: [values] });
   const repository = ctx.app.db.getRepository("fields");
@@ -111,6 +118,7 @@ async function applyCollectionDefinition(ctx, rawInput, syncCollectionFields) {
   if (!collectionName) {
     throw new Error("collections:apply requires name");
   }
+  validateApplyFieldInputs(input.fields);
   const existing = await findCollection(ctx, collectionName);
   if (!existing) {
     const values = (0, import_collections.composeCollectionDefinition)({ ...input, name: collectionName }, { mode: "create" });

package/dist/server/server.js

@@ -406,6 +406,7 @@ class PluginDataSourceMainServer extends import_server.Plugin {
     this.db.getRepository("collections").setApp(this.app);
     this.registerErrorHandler();
     (0, import_mcp_post_processors.registerDataSourceMainMcpPostProcessors)(this.ai.mcpToolsManager);
+    this.app.auditManager.registerActions(["collections:apply", "fields:apply"]);
     this.app.resourceManager.use(async function mergeReverseFieldWhenSaveCollectionField(ctx, next) {
       if (ctx.action.resourceName === "collections.fields" && ["create", "update"].includes(ctx.action.actionName)) {
         ctx.action.mergeParams({

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-alpha.21",
+  "version": "2.1.0-alpha.22",
   "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": "b4c2b469f321ecaec7863a8ae371a02fe6a35aa2",
+  "gitHead": "81ed83f158f172cca607b36beaf8428b14ba16ad",
   "keywords": [
     "Data sources"
   ]