@nocobase/data-source-manager 2.1.0-beta.2 → 2.1.0-beta.20

package/README.md

@@ -1,17 +1,24 @@
 # NocoBase
 
 <video width="100%" controls>
-      <source src="https://static-docs.nocobase.com/NocoBase0510.mp4" type="video/mp4">
+  <source src="https://github.com/user-attachments/assets/4d11a87b-00e2-48f3-9bf7-389d21072d13" type="video/mp4">
 </video>
 
+<p align="center">
+<a href="https://trendshift.io/repositories/4112" target="_blank"><img src="https://trendshift.io/api/badge/repositories/4112" alt="nocobase%2Fnocobase | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
+<a href="https://www.producthunt.com/posts/nocobase?embed=true&utm_source=badge-top-post-topic-badge&utm_medium=badge&utm_souce=badge-nocobase" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/top-post-topic-badge.svg?post_id=456520&theme=light&period=weekly&topic_id=267" alt="NocoBase - Scalability&#0045;first&#0044;&#0032;open&#0045;source&#0032;no&#0045;code&#0032;platform | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
+</p>
 
 ## What is NocoBase
 
-NocoBase is a scalability-first, open-source no-code development platform.  
-Instead of investing years of time and millions of dollars in research and development, deploy NocoBase in a few minutes and you'll have a private, controllable, and extremely scalable no-code development platform!
+NocoBase is the most extensible AI-powered no-code platform.   
+Total control. Infinite extensibility. AI collaboration.  
+Enable your team to adapt quickly and cut costs dramatically.  
+No years of development. No millions wasted.  
+Deploy NocoBase in minutes — and take control of everything.
 
 Homepage:  
-https://www.nocobase.com/
+https://www.nocobase.com/  
 
 Online Demo:  
 https://demo.nocobase.com/new
@@ -19,12 +26,74 @@ https://demo.nocobase.com/new
 Documents:  
 https://docs.nocobase.com/
 
-Commericial license & plugins:  
-https://www.nocobase.com/en/commercial
+Forum:  
+https://forum.nocobase.com/
 
-License agreement:   
-https://www.nocobase.com/en/agreement
+Use Cases:  
+https://www.nocobase.com/en/blog/tags/customer-stories
 
+## Release Notes
 
-## Contact Us:  
-hello@nocobase.com
+Our [blog](https://www.nocobase.com/en/blog/timeline) is regularly updated with release notes and provides a weekly summary.
+
+## Distinctive features
+
+### 1. Data model-driven, not form/table–driven
+
+Instead of being constrained by forms or tables, NocoBase adopts a data model–driven approach, separating data structure from user interface to unlock unlimited possibilities.
+
+- UI and data structure are fully decoupled
+- Multiple blocks and actions can be created for the same table or record in any quantity or form
+- Supports the main database, external databases, and third-party APIs as data sources
+
+![model](https://static-docs.nocobase.com/model.png)
+
+### 2. AI employees, integrated into your business systems
+Unlike standalone AI demos, NocoBase allows you to embed AI capabilities seamlessly into your interfaces, workflows, and data context, making AI truly useful in real business scenarios.
+
+- Define AI employees for roles such as translator, analyst, researcher, or assistant
+- Seamless AI–human collaboration in interfaces and workflows
+- Ensure AI usage is secure, transparent, and customizable for your business needs
+
+![AI-employee](https://static-docs.nocobase.com/ai-employee-home.png)
+
+### 3. What you see is what you get, incredibly easy to use
+
+While enabling the development of complex business systems, NocoBase keeps the experience simple and intuitive.
+
+- One-click switch between usage mode and configuration mode
+- Pages serve as a canvas to arrange blocks and actions, similar to Notion
+- Configuration mode is designed for ordinary users, not just programmers
+
+![wysiwyg](https://static-docs.nocobase.com/wysiwyg.gif)
+
+### 4. Everything is a plugin, designed for extension
+Adding more no-code features will never cover every business case. NocoBase is built for extension through its plugin-based microkernel architecture.
+
+- All functionalities are plugins, similar to WordPress
+- Plugins are ready to use upon installation
+- Pages, blocks, actions, APIs, and data sources can all be extended through custom plugins
+
+![plugins](https://static-docs.nocobase.com/plugins.png)
+
+## Installation
+
+NocoBase supports three installation methods:
+
+- <a target="_blank" href="https://docs.nocobase.com/welcome/getting-started/installation/docker-compose">Installing With Docker (👍Recommended)</a>
+
+  Suitable for no-code scenarios, no code to write. When upgrading, just download the latest image and reboot.
+
+- <a target="_blank" href="https://docs.nocobase.com/welcome/getting-started/installation/create-nocobase-app">Installing from create-nocobase-app CLI</a>
+
+  The business code of the project is completely independent and supports low-code development.
+
+- <a target="_blank" href="https://docs.nocobase.com/welcome/getting-started/installation/git-clone">Installing from Git source code</a>
+
+  If you want to experience the latest unreleased version, or want to participate in the contribution, you need to make changes and debug on the source code, it is recommended to choose this installation method, which requires a high level of development skills, and if the code has been updated, you can git pull the latest code.
+
+## How NocoBase works
+
+<video width="100%" controls>
+  <source src="https://github.com/user-attachments/assets/8d183b44-9bb5-4792-b08f-bc08fe8dfaaf" type="video/mp4">
+</video>

package/lib/collection-manager.d.ts

@@ -7,7 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { DataSource } from './data-source';
-import { CollectionOptions, ICollection, ICollectionManager, IFieldInterface, IRepository, MergeOptions } from './types';
+import { CollectionOptions, ICollection, ICollectionManager, IField, IFieldInterface, IRepository, MergeOptions } from './types';
 export declare class CollectionManager implements ICollectionManager {
     dataSource: DataSource;
     protected collections: Map<string, ICollection>;
@@ -25,6 +25,7 @@ export declare class CollectionManager implements ICollectionManager {
     getFieldInterface(name: string): {
         new (options: any): IFieldInterface | undefined;
     };
+    isNumericField(field?: IField): boolean;
     registerCollectionTemplates(): void;
     registerModels(models: Record<string, any>): void;
     registerRepositories(repositories: Record<string, any>): void;

package/lib/collection-manager.js

@@ -32,6 +32,7 @@ __export(collection_manager_exports, {
 module.exports = __toCommonJS(collection_manager_exports);
 var import_collection = require("./collection");
 var import_repository = require("./repository");
+var import_utils = require("./utils");
 const _CollectionManager = class _CollectionManager {
   dataSource;
   collections = /* @__PURE__ */ new Map();
@@ -77,6 +78,9 @@ const _CollectionManager = class _CollectionManager {
   getFieldInterface(name) {
     return;
   }
+  isNumericField(field) {
+    return (0, import_utils.isNumericField)(field);
+  }
   /* istanbul ignore next -- @preserve */
   registerCollectionTemplates() {
   }

package/lib/database-data-source.d.ts

@@ -23,4 +23,6 @@ export declare abstract class DatabaseDataSource<T extends DatabaseIntrospector
         };
     }): CollectionOptions[];
     private mergeFieldOptions;
+    private hasCompatibleStorageType;
+    private getFieldStorageType;
 }

package/lib/database-data-source.js

@@ -58,19 +58,34 @@ const _DatabaseDataSource = class _DatabaseDataSource extends import_data_source
       const loadedCollection = loadedCollections[collection.name];
       if (!loadedCollection) return collection;
       const collectionFields = collection.fields || [];
-      const loadedFieldsObj = Object.fromEntries(
-        (loadedCollection.fields || []).map((f) => [f.columnName || f.field || f.name, f])
+      const loadedFieldsByName = Object.fromEntries((loadedCollection.fields || []).map((f) => [f.name, f]));
+      const loadedFieldsByColumn = (loadedCollection.fields || []).reduce(
+        (result, field) => {
+          const key = field.columnName || field.field || field.name;
+          result[key] = result[key] || [];
+          result[key].push(field);
+          return result;
+        },
+        {}
       );
+      const isAliasField = /* @__PURE__ */ __name((field) => Boolean((field == null ? void 0 : field.field) && field.name !== field.field), "isAliasField");
       const newFields = collectionFields.map((field) => {
-        const loadedField = loadedFieldsObj[field.name];
+        var _a, _b;
+        const loadedField = loadedFieldsByName[field.name] || ((_a = loadedFieldsByColumn[field.columnName || field.field || field.name]) == null ? void 0 : _a.find(
+          (candidate) => !isAliasField(candidate)
+        )) || ((_b = loadedFieldsByColumn[field.columnName || field.field || field.name]) == null ? void 0 : _b[0]);
         if (!loadedField) return field;
         if (loadedField.possibleTypes) {
           loadedField.possibleTypes = field.possibleTypes;
         }
         return this.mergeFieldOptions(field, loadedField);
       });
+      const loadedMappedFields = (loadedCollection.fields || []).filter(
+        (field) => isAliasField(field) && !newFields.find((newField) => newField.name === field.name)
+      );
+      newFields.push(...loadedMappedFields);
       const loadedAssociationFields = (loadedCollection.fields || []).filter(
-        (field) => ["belongsTo", "belongsToMany", "hasMany", "hasOne", "belongsToArray"].includes(field.type)
+        (field) => ["belongsTo", "belongsToMany", "hasMany", "hasOne", "belongsToArray"].includes(field.type) && !newFields.find((newField) => newField.name === field.name)
       );
       newFields.push(...loadedAssociationFields);
       return {
@@ -85,18 +100,77 @@ const _DatabaseDataSource = class _DatabaseDataSource extends import_data_source
       ...fieldOptions,
       ...modelOptions
     };
-    if (fieldOptions.rawType && modelOptions.rawType && fieldOptions.rawType !== modelOptions.rawType) {
+    const dbSyncedKeys = ["allowNull"];
+    const incomingPossibleTypes = Array.isArray(fieldOptions.possibleTypes) ? fieldOptions.possibleTypes : fieldOptions.type ? [fieldOptions.type] : [];
+    const hasCompatibleStorageType = this.hasCompatibleStorageType(fieldOptions.type, modelOptions.type);
+    const shouldUseIncomingType = Boolean(fieldOptions.rawType) && Boolean(modelOptions.rawType || modelOptions.type) && (modelOptions.rawType ? fieldOptions.rawType !== modelOptions.rawType && !hasCompatibleStorageType : !incomingPossibleTypes.includes(modelOptions.type) && !hasCompatibleStorageType);
+    if (shouldUseIncomingType) {
       newOptions.type = fieldOptions.type;
       newOptions.interface = fieldOptions.interface;
       newOptions.rawType = fieldOptions.rawType;
     }
     for (const key of [.../* @__PURE__ */ new Set([...Object.keys(modelOptions), ...Object.keys(fieldOptions)])]) {
-      if (modelOptions[key] === null && fieldOptions[key]) {
+      const shouldUseIncoming = dbSyncedKeys.includes(key) || modelOptions[key] === null && key in fieldOptions;
+      if (shouldUseIncoming) {
         newOptions[key] = fieldOptions[key];
       }
     }
     return newOptions;
   }
+  hasCompatibleStorageType(incomingType, loadedType) {
+    if (!incomingType || !loadedType || incomingType === loadedType) {
+      return false;
+    }
+    const incomingStorageType = this.getFieldStorageType(incomingType);
+    const loadedStorageType = this.getFieldStorageType(loadedType);
+    if (!incomingStorageType || !loadedStorageType) {
+      return false;
+    }
+    return incomingStorageType === loadedStorageType;
+  }
+  getFieldStorageType(type) {
+    var _a, _b, _c, _d;
+    if (!type) {
+      return;
+    }
+    const db = (_a = this.collectionManager) == null ? void 0 : _a.db;
+    if (!db) {
+      return;
+    }
+    try {
+      const fieldClass = db.fieldTypes.get(type);
+      if (!fieldClass) {
+        return;
+      }
+      const descriptor = Object.getOwnPropertyDescriptor(fieldClass.prototype, "dataType");
+      const collection = {
+        name: "__sync_probe__",
+        options: {
+          underscored: false
+        },
+        isView() {
+          return false;
+        }
+      };
+      const dataType = (_b = descriptor == null ? void 0 : descriptor.get) == null ? void 0 : _b.call({
+        options: {
+          type
+        },
+        database: db,
+        collection,
+        context: {
+          database: db,
+          collection
+        }
+      });
+      if (typeof dataType === "string") {
+        return dataType;
+      }
+      return (dataType == null ? void 0 : dataType.key) || ((_c = dataType == null ? void 0 : dataType.constructor) == null ? void 0 : _c.key) || ((_d = dataType == null ? void 0 : dataType.constructor) == null ? void 0 : _d.name);
+    } catch {
+      return;
+    }
+  }
 };
 __name(_DatabaseDataSource, "DatabaseDataSource");
 let DatabaseDataSource = _DatabaseDataSource;

package/lib/load-default-actions.d.ts

@@ -6,7 +6,9 @@
  * 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 coreActions from '@nocobase/actions';
 import { list } from './default-actions/list';
 export declare function loadDefaultActions(): {
     list: typeof list;
+    query: typeof coreActions.query;
 };

package/lib/load-default-actions.js

@@ -7,9 +7,11 @@
  * 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 __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
@@ -24,12 +26,21 @@ 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 load_default_actions_exports = {};
 __export(load_default_actions_exports, {
   loadDefaultActions: () => loadDefaultActions
 });
 module.exports = __toCommonJS(load_default_actions_exports);
+var import_actions = __toESM(require("@nocobase/actions"));
 var import_list = require("./default-actions/list");
 var import_proxy_to_repository = require("./default-actions/proxy-to-repository");
 const actions = {
@@ -97,7 +108,8 @@ function loadDefaultActions() {
       carry[key] = (0, import_proxy_to_repository.proxyToRepository)(actions[key].params, actions[key].method);
       return carry;
     }, {}),
-    list: import_list.list
+    list: import_list.list,
+    query: import_actions.default.query
   };
 }
 __name(loadDefaultActions, "loadDefaultActions");

package/lib/sequelize-collection-manager.d.ts

@@ -8,7 +8,7 @@
  */
 import { Database } from '@nocobase/database';
 import { DataSource } from './data-source';
-import { CollectionOptions, ICollection, ICollectionManager, IFieldInterface, IRepository, MergeOptions } from './types';
+import { CollectionOptions, ICollection, ICollectionManager, IField, IFieldInterface, IRepository, MergeOptions } from './types';
 export declare class SequelizeCollectionManager implements ICollectionManager {
     db: Database;
     options: any;
@@ -35,4 +35,5 @@ export declare class SequelizeCollectionManager implements ICollectionManager {
     getFieldInterface(name: string): {
         new (options: any): IFieldInterface | undefined;
     };
+    isNumericField(field?: IField): boolean;
 }

package/lib/sequelize-collection-manager.js

@@ -31,6 +31,7 @@ __export(sequelize_collection_manager_exports, {
 });
 module.exports = __toCommonJS(sequelize_collection_manager_exports);
 var import_database = require("@nocobase/database");
+var import_utils = require("./utils");
 /* istanbul ignore file -- @preserve */
 const _SequelizeCollectionManager = class _SequelizeCollectionManager {
   db;
@@ -109,6 +110,9 @@ const _SequelizeCollectionManager = class _SequelizeCollectionManager {
   getFieldInterface(name) {
     return this.db.interfaceManager.getInterfaceType(name);
   }
+  isNumericField(field) {
+    return (0, import_utils.isNumericField)(field);
+  }
 };
 __name(_SequelizeCollectionManager, "SequelizeCollectionManager");
 let SequelizeCollectionManager = _SequelizeCollectionManager;

package/lib/types.d.ts

@@ -102,6 +102,7 @@ export interface ICollectionManager {
     registerFieldInterfaces(interfaces: Record<string, new (options: any) => IFieldInterface>): void;
     registerFieldInterface(name: string, fieldInterface: new (options: any) => IFieldInterface): void;
     getFieldInterface(name: string): new (options: any) => IFieldInterface | undefined;
+    isNumericField(field?: IField): boolean;
     registerCollectionTemplates(templates: Record<string, any>): void;
     registerModels(models: Record<string, any>): void;
     registerRepositories(repositories: Record<string, new (collection: ICollection) => IRepository>): void;

package/lib/utils.d.ts

@@ -8,3 +8,8 @@
  */
 export declare function parseCollectionName(collection: string): string[];
 export declare function joinCollectionName(dataSourceName: string, collectionName: string): string;
+export declare function isNumericField(field?: {
+    options?: {
+        type?: string;
+    };
+}): boolean;

package/lib/utils.js

@@ -27,6 +27,7 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var utils_exports = {};
 __export(utils_exports, {
+  isNumericField: () => isNumericField,
   joinCollectionName: () => joinCollectionName,
   parseCollectionName: () => parseCollectionName
 });
@@ -48,8 +49,16 @@ function joinCollectionName(dataSourceName, collectionName) {
   return `${dataSourceName}:${collectionName}`;
 }
 __name(joinCollectionName, "joinCollectionName");
+const NUMERIC_FIELD_TYPES = /* @__PURE__ */ new Set(["integer", "bigInt", "float", "double", "decimal"]);
+function isNumericField(field) {
+  var _a;
+  const fieldType = (_a = field == null ? void 0 : field.options) == null ? void 0 : _a.type;
+  return typeof fieldType === "string" && NUMERIC_FIELD_TYPES.has(fieldType);
+}
+__name(isNumericField, "isNumericField");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  isNumericField,
   joinCollectionName,
   parseCollectionName
 });

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@nocobase/data-source-manager",
-  "version": "2.1.0-beta.2",
+  "version": "2.1.0-beta.20",
   "description": "",
-  "license": "AGPL-3.0",
+  "license": "Apache-2.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/actions": "2.1.0-beta.2",
-    "@nocobase/cache": "2.1.0-beta.2",
-    "@nocobase/database": "2.1.0-beta.2",
-    "@nocobase/resourcer": "2.1.0-beta.2",
-    "@nocobase/utils": "2.1.0-beta.2",
+    "@nocobase/actions": "2.1.0-beta.20",
+    "@nocobase/cache": "2.1.0-beta.20",
+    "@nocobase/database": "2.1.0-beta.20",
+    "@nocobase/resourcer": "2.1.0-beta.20",
+    "@nocobase/utils": "2.1.0-beta.20",
     "@types/jsonwebtoken": "^8.5.8",
     "jsonwebtoken": "^9.0.2"
   },
@@ -19,5 +19,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/auth"
   },
-  "gitHead": "d80433799fb4a8d59ded4d7eea114d585a137ea0"
+  "gitHead": "5515f27380c0c5410f7d1e5e5858364fcd838e5e"
 }