@nocobase/data-source-manager 2.1.0-beta.13 → 2.1.0-beta.15

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,20 +100,77 @@ const _DatabaseDataSource = class _DatabaseDataSource extends import_data_source
       ...fieldOptions,
       ...modelOptions
     };
+    const dbSyncedKeys = ["allowNull"];
     const incomingPossibleTypes = Array.isArray(fieldOptions.possibleTypes) ? fieldOptions.possibleTypes : fieldOptions.type ? [fieldOptions.type] : [];
-    const shouldUseIncomingType = Boolean(fieldOptions.rawType) && (modelOptions.rawType ? fieldOptions.rawType !== modelOptions.rawType : !incomingPossibleTypes.includes(modelOptions.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/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@nocobase/data-source-manager",
-  "version": "2.1.0-beta.13",
+  "version": "2.1.0-beta.15",
   "description": "",
   "license": "Apache-2.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/actions": "2.1.0-beta.13",
-    "@nocobase/cache": "2.1.0-beta.13",
-    "@nocobase/database": "2.1.0-beta.13",
-    "@nocobase/resourcer": "2.1.0-beta.13",
-    "@nocobase/utils": "2.1.0-beta.13",
+    "@nocobase/actions": "2.1.0-beta.15",
+    "@nocobase/cache": "2.1.0-beta.15",
+    "@nocobase/database": "2.1.0-beta.15",
+    "@nocobase/resourcer": "2.1.0-beta.15",
+    "@nocobase/utils": "2.1.0-beta.15",
     "@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": "691716e5f4e5f8bd3859d65bc8a29b4e3c32209b"
+  "gitHead": "dc1aceea6357e6ab149976c2a236fc4b6bee1370"
 }