@nocobase/plugin-data-source-manager 2.1.0-alpha.4 → 2.1.0-alpha.45

package/dist/node_modules/zod/package.json

@@ -1 +1 @@
-{"name":"zod","version":"4.3.5","type":"module","license":"MIT","author":"Colin McDonnell <zod@colinhacks.com>","description":"TypeScript-first schema declaration and validation library with static type inference","homepage":"https://zod.dev","llms":"https://zod.dev/llms.txt","llmsFull":"https://zod.dev/llms-full.txt","mcpServer":"https://mcp.inkeep.com/zod/mcp","funding":"https://github.com/sponsors/colinhacks","sideEffects":false,"files":["src","**/*.js","**/*.mjs","**/*.cjs","**/*.d.ts","**/*.d.mts","**/*.d.cts","**/package.json"],"keywords":["typescript","schema","validation","type","inference"],"main":"./index.cjs","types":"./index.d.cts","module":"./index.js","zshy":{"exports":{"./package.json":"./package.json",".":"./src/index.ts","./mini":"./src/mini/index.ts","./locales":"./src/locales/index.ts","./v3":"./src/v3/index.ts","./v4":"./src/v4/index.ts","./v4-mini":"./src/v4-mini/index.ts","./v4/mini":"./src/v4/mini/index.ts","./v4/core":"./src/v4/core/index.ts","./v4/locales":"./src/v4/locales/index.ts","./v4/locales/*":"./src/v4/locales/*"},"conditions":{"@zod/source":"src"}},"exports":{"./package.json":"./package.json",".":{"@zod/source":"./src/index.ts","types":"./index.d.cts","import":"./index.js","require":"./index.cjs"},"./mini":{"@zod/source":"./src/mini/index.ts","types":"./mini/index.d.cts","import":"./mini/index.js","require":"./mini/index.cjs"},"./locales":{"@zod/source":"./src/locales/index.ts","types":"./locales/index.d.cts","import":"./locales/index.js","require":"./locales/index.cjs"},"./v3":{"@zod/source":"./src/v3/index.ts","types":"./v3/index.d.cts","import":"./v3/index.js","require":"./v3/index.cjs"},"./v4":{"@zod/source":"./src/v4/index.ts","types":"./v4/index.d.cts","import":"./v4/index.js","require":"./v4/index.cjs"},"./v4-mini":{"@zod/source":"./src/v4-mini/index.ts","types":"./v4-mini/index.d.cts","import":"./v4-mini/index.js","require":"./v4-mini/index.cjs"},"./v4/mini":{"@zod/source":"./src/v4/mini/index.ts","types":"./v4/mini/index.d.cts","import":"./v4/mini/index.js","require":"./v4/mini/index.cjs"},"./v4/core":{"@zod/source":"./src/v4/core/index.ts","types":"./v4/core/index.d.cts","import":"./v4/core/index.js","require":"./v4/core/index.cjs"},"./v4/locales":{"@zod/source":"./src/v4/locales/index.ts","types":"./v4/locales/index.d.cts","import":"./v4/locales/index.js","require":"./v4/locales/index.cjs"},"./v4/locales/*":{"@zod/source":"./src/v4/locales/*","types":"./v4/locales/*","import":"./v4/locales/*","require":"./v4/locales/*"}},"repository":{"type":"git","url":"git+https://github.com/colinhacks/zod.git"},"bugs":{"url":"https://github.com/colinhacks/zod/issues"},"support":{"backing":{"npm-funding":true}},"scripts":{"clean":"git clean -xdf . -e node_modules","build":"zshy --project tsconfig.build.json","postbuild":"tsx ../../scripts/write-stub-package-jsons.ts && pnpm biome check --write .","test:watch":"pnpm vitest","test":"pnpm vitest run","prepublishOnly":"tsx ../../scripts/check-versions.ts"},"_lastModified":"2026-02-16T04:32:01.618Z"}
+{"name":"zod","version":"4.3.5","type":"module","license":"MIT","author":"Colin McDonnell <zod@colinhacks.com>","description":"TypeScript-first schema declaration and validation library with static type inference","homepage":"https://zod.dev","llms":"https://zod.dev/llms.txt","llmsFull":"https://zod.dev/llms-full.txt","mcpServer":"https://mcp.inkeep.com/zod/mcp","funding":"https://github.com/sponsors/colinhacks","sideEffects":false,"files":["src","**/*.js","**/*.mjs","**/*.cjs","**/*.d.ts","**/*.d.mts","**/*.d.cts","**/package.json"],"keywords":["typescript","schema","validation","type","inference"],"main":"./index.cjs","types":"./index.d.cts","module":"./index.js","zshy":{"exports":{"./package.json":"./package.json",".":"./src/index.ts","./mini":"./src/mini/index.ts","./locales":"./src/locales/index.ts","./v3":"./src/v3/index.ts","./v4":"./src/v4/index.ts","./v4-mini":"./src/v4-mini/index.ts","./v4/mini":"./src/v4/mini/index.ts","./v4/core":"./src/v4/core/index.ts","./v4/locales":"./src/v4/locales/index.ts","./v4/locales/*":"./src/v4/locales/*"},"conditions":{"@zod/source":"src"}},"exports":{"./package.json":"./package.json",".":{"@zod/source":"./src/index.ts","types":"./index.d.cts","import":"./index.js","require":"./index.cjs"},"./mini":{"@zod/source":"./src/mini/index.ts","types":"./mini/index.d.cts","import":"./mini/index.js","require":"./mini/index.cjs"},"./locales":{"@zod/source":"./src/locales/index.ts","types":"./locales/index.d.cts","import":"./locales/index.js","require":"./locales/index.cjs"},"./v3":{"@zod/source":"./src/v3/index.ts","types":"./v3/index.d.cts","import":"./v3/index.js","require":"./v3/index.cjs"},"./v4":{"@zod/source":"./src/v4/index.ts","types":"./v4/index.d.cts","import":"./v4/index.js","require":"./v4/index.cjs"},"./v4-mini":{"@zod/source":"./src/v4-mini/index.ts","types":"./v4-mini/index.d.cts","import":"./v4-mini/index.js","require":"./v4-mini/index.cjs"},"./v4/mini":{"@zod/source":"./src/v4/mini/index.ts","types":"./v4/mini/index.d.cts","import":"./v4/mini/index.js","require":"./v4/mini/index.cjs"},"./v4/core":{"@zod/source":"./src/v4/core/index.ts","types":"./v4/core/index.d.cts","import":"./v4/core/index.js","require":"./v4/core/index.cjs"},"./v4/locales":{"@zod/source":"./src/v4/locales/index.ts","types":"./v4/locales/index.d.cts","import":"./v4/locales/index.js","require":"./v4/locales/index.cjs"},"./v4/locales/*":{"@zod/source":"./src/v4/locales/*","types":"./v4/locales/*","import":"./v4/locales/*","require":"./v4/locales/*"}},"repository":{"type":"git","url":"git+https://github.com/colinhacks/zod.git"},"bugs":{"url":"https://github.com/colinhacks/zod/issues"},"support":{"backing":{"npm-funding":true}},"scripts":{"clean":"git clean -xdf . -e node_modules","build":"zshy --project tsconfig.build.json","postbuild":"tsx ../../scripts/write-stub-package-jsons.ts && pnpm biome check --write .","test:watch":"pnpm vitest","test":"pnpm vitest run","prepublishOnly":"tsx ../../scripts/check-versions.ts"},"_lastModified":"2026-05-29T12:50:07.759Z"}

package/dist/server/mcp-post-processors.d.ts

@@ -0,0 +1,24 @@
+/**
+ * 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 type { McpToolsManager } from '@nocobase/ai';
+export declare function simplifyDataSourceListResult(result: any): {
+    data: any;
+    meta: any;
+};
+export declare function simplifyDataSourceCollectionsListResult(result: any): {
+    data: any;
+    meta: any;
+};
+export declare function simplifyDataSourceFieldsListResult(result: any, options?: {
+    args?: Record<string, any>;
+}): {
+    data: any;
+    meta: any;
+};
+export declare function registerDataSourceManagerMcpPostProcessors(manager: McpToolsManager): void;

package/dist/server/mcp-post-processors.js

@@ -0,0 +1,158 @@
+/**
+ * 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 mcp_post_processors_exports = {};
+__export(mcp_post_processors_exports, {
+  registerDataSourceManagerMcpPostProcessors: () => registerDataSourceManagerMcpPostProcessors,
+  simplifyDataSourceCollectionsListResult: () => simplifyDataSourceCollectionsListResult,
+  simplifyDataSourceFieldsListResult: () => simplifyDataSourceFieldsListResult,
+  simplifyDataSourceListResult: () => simplifyDataSourceListResult
+});
+module.exports = __toCommonJS(mcp_post_processors_exports);
+function toArray(value) {
+  if (Array.isArray(value)) {
+    return value;
+  }
+  if (Array.isArray(value == null ? void 0 : value.data)) {
+    return value.data;
+  }
+  return [];
+}
+function parseAssociatedIndex(value) {
+  if (typeof value !== "string") {
+    return {};
+  }
+  const separatorIndex = value.indexOf(".");
+  if (separatorIndex === -1) {
+    return {};
+  }
+  return {
+    dataSourceKey: value.slice(0, separatorIndex),
+    collectionName: value.slice(separatorIndex + 1)
+  };
+}
+function pickDataSourceSummary(item) {
+  const summary = {
+    displayName: item == null ? void 0 : item.displayName,
+    key: item == null ? void 0 : item.key,
+    type: item == null ? void 0 : item.type,
+    status: item == null ? void 0 : item.status
+  };
+  if (Array.isArray(item == null ? void 0 : item.collections)) {
+    summary.collections = item.collections.map((collection) => {
+      const nextCollection = pickCollectionSummary({
+        ...collection,
+        dataSourceKey: (collection == null ? void 0 : collection.dataSourceKey) ?? (item == null ? void 0 : item.key)
+      });
+      if (Array.isArray(collection == null ? void 0 : collection.fields)) {
+        nextCollection.fields = collection.fields.map(
+          (field) => pickRemoteFieldSummary(field, {
+            dataSourceKey: (collection == null ? void 0 : collection.dataSourceKey) ?? (item == null ? void 0 : item.key),
+            collectionName: collection == null ? void 0 : collection.name
+          })
+        );
+      }
+      return nextCollection;
+    });
+  }
+  return summary;
+}
+function pickCollectionSummary(item) {
+  var _a, _b;
+  return {
+    name: item == null ? void 0 : item.name,
+    title: (item == null ? void 0 : item.title) ?? ((_a = item == null ? void 0 : item.options) == null ? void 0 : _a.title) ?? (item == null ? void 0 : item.displayName),
+    description: (item == null ? void 0 : item.description) ?? ((_b = item == null ? void 0 : item.options) == null ? void 0 : _b.description),
+    dataSourceKey: item == null ? void 0 : item.dataSourceKey
+  };
+}
+function pickFieldSummary(item) {
+  var _a;
+  return {
+    name: item == null ? void 0 : item.name,
+    type: item == null ? void 0 : item.type,
+    title: (_a = item == null ? void 0 : item.uiSchema) == null ? void 0 : _a.title,
+    description: item == null ? void 0 : item.description,
+    dataSourceKey: item == null ? void 0 : item.dataSourceKey,
+    collectionName: item == null ? void 0 : item.collectionName
+  };
+}
+function pickRemoteFieldSummary(item, defaults) {
+  var _a;
+  return {
+    name: item == null ? void 0 : item.name,
+    type: item == null ? void 0 : item.type,
+    title: (_a = item == null ? void 0 : item.uiSchema) == null ? void 0 : _a.title,
+    description: item == null ? void 0 : item.description,
+    dataSourceKey: item == null ? void 0 : item.dataSourceKey,
+    collectionName: item == null ? void 0 : item.collectionName,
+    ...defaults
+  };
+}
+function simplifyDataSourceListResult(result) {
+  const items = toArray(result);
+  return {
+    data: items.map((item) => pickDataSourceSummary(item)),
+    meta: result == null ? void 0 : result.meta
+  };
+}
+function simplifyDataSourceCollectionsListResult(result) {
+  const items = toArray(result);
+  return {
+    data: items.map((item) => pickCollectionSummary(item)),
+    meta: result == null ? void 0 : result.meta
+  };
+}
+function simplifyDataSourceFieldsListResult(result, options) {
+  var _a;
+  const items = toArray(result);
+  const defaults = parseAssociatedIndex((_a = options == null ? void 0 : options.args) == null ? void 0 : _a.associatedIndex);
+  return {
+    data: items.map(
+      (item) => (item == null ? void 0 : item.dataSourceKey) || (item == null ? void 0 : item.collectionName) ? pickFieldSummary(item) : pickRemoteFieldSummary(item, defaults)
+    ),
+    meta: result == null ? void 0 : result.meta
+  };
+}
+function registerDataSourceManagerMcpPostProcessors(manager) {
+  manager.registerToolResultPostProcessor("dataSources", "list", simplifyDataSourceListResult);
+  manager.registerToolResultPostProcessor("dataSources", "listEnabled", simplifyDataSourceListResult);
+  manager.registerToolResultPostProcessor("dataSources.collections", "list", simplifyDataSourceCollectionsListResult);
+  manager.registerToolResultPostProcessor(
+    "dataSourcesCollections.fields",
+    "list",
+    (result, context) => simplifyDataSourceFieldsListResult(result, {
+      args: context == null ? void 0 : context.args
+    })
+  );
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  registerDataSourceManagerMcpPostProcessors,
+  simplifyDataSourceCollectionsListResult,
+  simplifyDataSourceFieldsListResult,
+  simplifyDataSourceListResult
+});

package/dist/server/models/data-source.js

@@ -7,11 +7,9 @@
  * 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 __export = (target, all) => {
   for (var name in all)
@@ -25,14 +23,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   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 data_source_exports = {};
 __export(data_source_exports, {
@@ -41,7 +31,7 @@ __export(data_source_exports, {
 module.exports = __toCommonJS(data_source_exports);
 var import_database = require("@nocobase/database");
 var import_plugin_acl = require("@nocobase/plugin-acl");
-var import_path = __toESM(require("path"));
+var import_utils = require("@nocobase/utils");
 const availableActions = {
   create: {
     displayName: '{{t("Add new")}}',
@@ -62,7 +52,7 @@ const availableActions = {
   view: {
     displayName: '{{t("View")}}',
     type: "old-data",
-    aliases: ["get", "list"],
+    aliases: ["get", "list", "query"],
     allowConfigureFields: true
   },
   update: {
@@ -117,7 +107,7 @@ class DataSourceModel extends import_database.Model {
         logger: app.logger.child({ dataSourceKey }),
         sqlLogger: app.sqlLogger.child({ dataSourceKey }),
         cache: app.cache,
-        storagePath: import_path.default.join(process.cwd(), "storage", "cache", "apps", app.name),
+        storagePath: (0, import_utils.storagePathJoin)("cache", "apps", app.name),
         databaseInstance
       });
       dataSource.on("loadingProgress", (progress) => {

package/dist/server/plugin.js

@@ -57,6 +57,7 @@ var import_data_source = require("./models/data-source");
 var import_data_sources_roles_model = require("./models/data-sources-roles-model");
 var import_acl = require("@nocobase/acl");
 var import_load_tables = require("./middlewares/load-tables");
+var import_mcp_post_processors = require("./mcp-post-processors");
 class PluginDataSourceManagerServer extends import_server.Plugin {
   dataSourceErrors = {};
   dataSourceStatus = {};
@@ -313,6 +314,7 @@ class PluginDataSourceManagerServer extends import_server.Plugin {
       await next();
     });
     this.app.resourceManager.use(import_load_tables.loadDataSourceTablesIntoCollections);
+    (0, import_mcp_post_processors.registerDataSourceManagerMcpPostProcessors)(this.ai.mcpToolsManager);
     this.app.use(async function handleAppendDataSourceCollection(ctx, next) {
       await next();
       if (!ctx.action) {

package/dist/server/resourcers/data-sources-collections-fields.d.ts

@@ -13,6 +13,7 @@ declare const _default: {
         get(ctx: any, next: any): Promise<void>;
         update(ctx: any, next: any): Promise<void>;
         create(ctx: any, next: any): Promise<void>;
+        apply(ctx: any, next: any): Promise<void>;
         destroy(ctx: any, next: any): Promise<void>;
     };
 };

package/dist/server/resourcers/data-sources-collections-fields.js

@@ -40,6 +40,7 @@ __export(data_sources_collections_fields_exports, {
 });
 module.exports = __toCommonJS(data_sources_collections_fields_exports);
 var import_lodash = __toESM(require("lodash"));
+var import_external_field_apply = require("../services/external-field-apply");
 var data_sources_collections_fields_default = {
   name: "dataSourcesCollections.fields",
   actions: {
@@ -130,6 +131,14 @@ var data_sources_collections_fields_default = {
       ctx.body = fieldRecord.toJSON();
       await next();
     },
+    async apply(ctx, next) {
+      const rawValues = ctx.action.params.values || ctx.request.body || {};
+      const defaults = (0, import_external_field_apply.parseCollectionNameWithDataSourceKey)(ctx.action.params.associatedIndex);
+      ctx.body = {
+        data: await (0, import_external_field_apply.applyExternalFieldDefinition)(ctx, rawValues, defaults)
+      };
+      await next();
+    },
     async destroy(ctx, next) {
       const { associatedIndex: collectionNameWithDataSourceKey, filterByTk: name } = ctx.action.params;
       const [dataSourceKey, collectionName] = collectionNameWithDataSourceKey.split(".");

package/dist/server/services/external-field-apply.d.ts

@@ -0,0 +1,23 @@
+/**
+ * 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.
+ */
+export declare function parseCollectionNameWithDataSourceKey(value?: string): {
+    dataSourceKey?: undefined;
+    collectionName?: undefined;
+} | {
+    dataSourceKey: string;
+    collectionName: string;
+};
+export declare function normalizeExternalFieldInput(rawValues: any, defaults: {
+    dataSourceKey?: string;
+    collectionName?: string;
+}): any;
+export declare function applyExternalFieldDefinition(ctx: any, rawValues: any, defaults?: {
+    dataSourceKey?: string;
+    collectionName?: string;
+}): Promise<any>;

package/dist/server/services/external-field-apply.js

@@ -0,0 +1,208 @@
+/**
+ * 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 __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 external_field_apply_exports = {};
+__export(external_field_apply_exports, {
+  applyExternalFieldDefinition: () => applyExternalFieldDefinition,
+  normalizeExternalFieldInput: () => normalizeExternalFieldInput,
+  parseCollectionNameWithDataSourceKey: () => parseCollectionNameWithDataSourceKey
+});
+module.exports = __toCommonJS(external_field_apply_exports);
+var import_lodash = __toESM(require("lodash"));
+var import_sequelize = require("sequelize");
+const RELATION_INTERFACE_TYPE_MAP = {
+  m2o: "belongsTo",
+  obo: "belongsTo",
+  o2m: "hasMany",
+  oho: "hasOne",
+  m2m: "belongsToMany"
+};
+const RELATION_TYPES = /* @__PURE__ */ new Set(["belongsTo", "hasMany", "hasOne", "belongsToMany"]);
+function parseCollectionNameWithDataSourceKey(value) {
+  if (!value) {
+    return {};
+  }
+  const separatorIndex = value.indexOf(".");
+  if (separatorIndex === -1) {
+    return {};
+  }
+  return {
+    dataSourceKey: value.slice(0, separatorIndex),
+    collectionName: value.slice(separatorIndex + 1)
+  };
+}
+function mergeSettings(input = {}) {
+  const { settings, ...rest } = input;
+  return {
+    ...settings || {},
+    ...rest
+  };
+}
+function buildRelationKeyName(name, key = "id") {
+  return import_sequelize.Utils.camelize([import_sequelize.Utils.singularize(name || ""), key].join("_"));
+}
+function buildThroughName(source, target) {
+  return import_sequelize.Utils.camelize(
+    [source, target].filter(Boolean).map((name) => String(name).toLowerCase()).sort().join("_")
+  );
+}
+function normalizeExternalFieldInput(rawValues, defaults) {
+  var _a;
+  const values = mergeSettings(rawValues);
+  const dataSourceKey = values.dataSourceKey || defaults.dataSourceKey;
+  const collectionName = values.collectionName || defaults.collectionName;
+  if (!dataSourceKey) {
+    throw new Error("dataSourcesCollections.fields:apply requires dataSourceKey");
+  }
+  if (!collectionName) {
+    throw new Error("dataSourcesCollections.fields:apply requires collectionName");
+  }
+  if (!values.name) {
+    throw new Error("dataSourcesCollections.fields:apply requires name");
+  }
+  const interfaceType = values.interface;
+  const type = values.type || RELATION_INTERFACE_TYPE_MAP[interfaceType];
+  const normalized = {
+    ...values,
+    dataSourceKey,
+    collectionName,
+    type
+  };
+  if (RELATION_TYPES.has(normalized.type)) {
+    if (!normalized.target) {
+      throw new Error(`Relation field ${normalized.name} requires target`);
+    }
+    normalized.interface = normalized.interface || {
+      belongsTo: "m2o",
+      hasMany: "o2m",
+      hasOne: "oho",
+      belongsToMany: "m2m"
+    }[normalized.type];
+    normalized.sourceKey = normalized.sourceKey || "id";
+    normalized.targetKey = normalized.targetKey || "id";
+    if (normalized.type === "belongsTo") {
+      normalized.foreignKey = normalized.foreignKey || buildRelationKeyName(normalized.name, normalized.targetKey);
+    }
+    if (normalized.type === "hasMany" || normalized.type === "hasOne") {
+      normalized.foreignKey = normalized.foreignKey || buildRelationKeyName(collectionName, normalized.sourceKey);
+    }
+    if (normalized.type === "belongsToMany") {
+      normalized.foreignKey = normalized.foreignKey || buildRelationKeyName(collectionName, normalized.sourceKey);
+      normalized.otherKey = normalized.otherKey || buildRelationKeyName(normalized.target, normalized.targetKey);
+      normalized.through = normalized.through || buildThroughName(collectionName, normalized.target);
+    }
+    normalized.uiSchema = import_lodash.default.merge(
+      {
+        type: normalized.type === "belongsTo" || normalized.type === "hasOne" ? "object" : "array",
+        title: normalized.title || ((_a = normalized.uiSchema) == null ? void 0 : _a.title) || normalized.name,
+        "x-component": "AssociationField",
+        "x-component-props": {
+          multiple: normalized.type === "hasMany" || normalized.type === "belongsToMany",
+          fieldNames: {
+            value: normalized.targetKey,
+            label: normalized.targetTitleField || normalized.titleField || normalized.targetKey
+          }
+        }
+      },
+      normalized.uiSchema || {}
+    );
+  }
+  delete normalized.settings;
+  delete normalized.title;
+  delete normalized.titleField;
+  delete normalized.targetTitleField;
+  return normalized;
+}
+function validateExternalRelationField(values) {
+  if (!RELATION_TYPES.has(values.type)) {
+    return;
+  }
+  const validatePresent = (name) => {
+    if (!values[name]) {
+      throw new Error(`"${name}" is required`);
+    }
+  };
+  const validatePresents = (names) => names.forEach((name) => validatePresent(name));
+  if (values.type === "belongsTo") {
+    validatePresents(["foreignKey", "targetKey", "target"]);
+  }
+  if (values.type === "hasMany" || values.type === "hasOne") {
+    validatePresents(["foreignKey", "sourceKey", "target"]);
+  }
+  if (values.type === "belongsToMany") {
+    validatePresents(["foreignKey", "otherKey", "sourceKey", "targetKey", "through", "target"]);
+  }
+}
+function getFieldOptions(ctx, values) {
+  var _a;
+  return (_a = ctx.app.dataSourceManager.dataSources.get(values.dataSourceKey).collectionManager.getCollection(values.collectionName).getField(values.name)) == null ? void 0 : _a.options;
+}
+async function applyExternalFieldDefinition(ctx, rawValues, defaults = {}) {
+  const values = normalizeExternalFieldInput(rawValues, defaults);
+  validateExternalRelationField(values);
+  const dataSource = ctx.app.dataSourceManager.dataSources.get(values.dataSourceKey);
+  if (!dataSource) {
+    throw new Error(`dataSource ${values.dataSourceKey} not found`);
+  }
+  const collection = dataSource.collectionManager.getCollection(values.collectionName);
+  if (!collection) {
+    throw new Error(`collection ${values.collectionName} not found in dataSource ${values.dataSourceKey}`);
+  }
+  const repository = ctx.app.db.getRepository("dataSourcesFields");
+  const filter = {
+    name: values.name,
+    collectionName: values.collectionName,
+    dataSourceKey: values.dataSourceKey
+  };
+  const existing = await repository.findOne({ filter });
+  if (existing) {
+    await repository.update({
+      filter,
+      values
+    });
+  } else {
+    await repository.create({
+      values
+    });
+  }
+  return getFieldOptions(ctx, values);
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  applyExternalFieldDefinition,
+  normalizeExternalFieldInput,
+  parseCollectionNameWithDataSourceKey
+});

package/dist/server/utils.js

@@ -30,13 +30,18 @@ __export(utils_exports, {
   mergeOptions: () => mergeOptions
 });
 module.exports = __toCommonJS(utils_exports);
+const nullableOverrideConfig = {
+  sort: ["scopeKey"]
+};
 function mergeOptions(fieldOptions, modelOptions) {
   const newOptions = {
     ...fieldOptions,
     ...modelOptions
   };
+  const fieldType = modelOptions.type || fieldOptions.type;
+  const nullableOverrideKeys = nullableOverrideConfig[fieldType] || [];
   for (const key of Object.keys(modelOptions)) {
-    if (modelOptions[key] === null && fieldOptions[key]) {
+    if (modelOptions[key] === null && fieldOptions[key] && !nullableOverrideKeys.includes(key)) {
       newOptions[key] = fieldOptions[key];
     }
   }