@nocobase/database 1.9.36 → 1.9.38

package/lib/options-parser.js

@@ -293,7 +293,7 @@ const _OptionsParser = class _OptionsParser {
       return filterParams;
     }
     const sortedAppends = import_lodash.default.sortBy(appendList, (append) => append.split(".").length);
-    const setInclude = /* @__PURE__ */ __name((model, queryParams, append) => {
+    const setInclude = /* @__PURE__ */ __name((model, queryParams, append, parentAs) => {
       var _a;
       const appendWithOptions = this.parseAppendWithOptions(append);
       append = appendWithOptions.name;
@@ -332,10 +332,21 @@ const _OptionsParser = class _OptionsParser {
         return;
       }
       if (existIncludeIndex == -1) {
-        queryParams["include"].push({
+        const association = associations[appendAssociation];
+        if (!association) {
+          throw new Error(`association ${appendAssociation} in ${model.name} not found`);
+        }
+        let includeOptions = {
           association: appendAssociation,
           options: appendWithOptions.options || {}
-        });
+        };
+        if (association.associationType === "BelongsToArray") {
+          includeOptions = {
+            ...includeOptions,
+            ...association.generateInclude(parentAs)
+          };
+        }
+        queryParams["include"].push(includeOptions);
         existIncludeIndex = queryParams["include"].length - 1;
       }
       if (lastLevel) {
@@ -371,11 +382,8 @@ const _OptionsParser = class _OptionsParser {
         if (appendWithOptions.raw) {
           nextAppend += appendWithOptions.raw;
         }
-        setInclude(
-          model.associations[queryParams["include"][existIncludeIndex].association].target,
-          queryParams["include"][existIncludeIndex],
-          nextAppend
-        );
+        const association = model.associations[queryParams["include"][existIncludeIndex].association];
+        setInclude(association.target, queryParams["include"][existIncludeIndex], nextAppend, association.as);
       }
     }, "setInclude");
     for (const append of sortedAppends) {

package/lib/view/view-inference.js

@@ -40,7 +40,6 @@ __export(view_inference_exports, {
   ViewFieldInference: () => ViewFieldInference
 });
 module.exports = __toCommonJS(view_inference_exports);
-var import_mathjs = require("mathjs");
 var import_field_type_map = __toESM(require("./field-type-map"));
 const _ViewFieldInference = class _ViewFieldInference {
   static extractTypeFromDefinition(typeDefinition) {
@@ -137,7 +136,7 @@ const _ViewFieldInference = class _ViewFieldInference {
     }
     const queryType = this.extractTypeFromDefinition(options.type);
     const mappedType = fieldTypeMap[queryType];
-    if ((0, import_mathjs.isArray)(mappedType)) {
+    if (Array.isArray(mappedType)) {
       return {
         type: mappedType[0],
         possibleTypes: mappedType

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "1.9.36",
+  "version": "1.9.38",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/logger": "1.9.36",
-    "@nocobase/utils": "1.9.36",
+    "@nocobase/logger": "1.9.38",
+    "@nocobase/utils": "1.9.38",
     "async-mutex": "^0.3.2",
     "chalk": "^4.1.1",
     "cron-parser": "4.4.0",
@@ -20,7 +20,6 @@
     "graphlib": "^2.1.8",
     "joi": "^17.13.3",
     "lodash": "^4.17.21",
-    "mathjs": "^10.6.1",
     "nanoid": "^3.3.11",
     "node-fetch": "^2.6.7",
     "node-sql-parser": "^4.18.0",
@@ -39,5 +38,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/database"
   },
-  "gitHead": "974d939c227392b8b2fa04078f2b67a810dc48d3"
+  "gitHead": "9646a7fcd02c833a5b0c14ddf7c509a4a3e1e75c"
 }