@nocobase/data-source-manager 2.1.0-beta.14 → 2.1.0-beta.16

package/lib/database-data-source.js

@@ -100,16 +100,18 @@ 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 hasCompatibleStorageType = this.hasCompatibleStorageType(fieldOptions.type, modelOptions.type);
-    const shouldUseIncomingType = Boolean(fieldOptions.rawType) && (modelOptions.rawType ? fieldOptions.rawType !== modelOptions.rawType && !hasCompatibleStorageType : !incomingPossibleTypes.includes(modelOptions.type) && !hasCompatibleStorageType);
+    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];
       }
     }

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/package.json

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