@nocobase/database 2.0.0-beta.1 → 2.0.0-beta.10

package/lib/options-parser.d.ts

@@ -45,6 +45,7 @@ export declare class OptionsParser {
         options?: object;
         raw?: string;
     };
+    protected normalizeAppends(appends: any): string[];
     protected parseAppends(appends: Appends, filterParams: any): any;
 }
 export {};

package/lib/options-parser.js

@@ -41,9 +41,9 @@ __export(options_parser_exports, {
 });
 module.exports = __toCommonJS(options_parser_exports);
 var import_lodash = __toESM(require("lodash"));
-var import_qs = __toESM(require("qs"));
 var import_sequelize = require("sequelize");
 var import_filter_parser = __toESM(require("./filter-parser"));
+var import_qs = __toESM(require("qs"));
 const debug = require("debug")("noco-database");
 const _OptionsParser = class _OptionsParser {
   options;
@@ -281,10 +281,26 @@ const _OptionsParser = class _OptionsParser {
     }
     return obj;
   }
+  normalizeAppends(appends) {
+    if (Array.isArray(appends)) {
+      return appends.filter((item) => typeof item === "string" && item.length > 0);
+    }
+    if (import_lodash.default.isPlainObject(appends)) {
+      return Object.values(appends).filter((item) => typeof item === "string" && item.length > 0);
+    }
+    if (typeof appends === "string" && appends.length > 0) {
+      return [appends];
+    }
+    return [];
+  }
   parseAppends(appends, filterParams) {
     if (!appends) return filterParams;
-    appends = import_lodash.default.sortBy(appends, (append) => append.split(".").length);
-    const setInclude = /* @__PURE__ */ __name((model, queryParams, append) => {
+    const appendList = this.normalizeAppends(appends);
+    if (!appendList.length) {
+      return filterParams;
+    }
+    const sortedAppends = import_lodash.default.sortBy(appendList, (append) => append.split(".").length);
+    const setInclude = /* @__PURE__ */ __name((model, queryParams, append, parentAs) => {
       var _a;
       const appendWithOptions = this.parseAppendWithOptions(append);
       append = appendWithOptions.name;
@@ -323,10 +339,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) {
@@ -362,14 +389,11 @@ 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 appends) {
+    for (const append of sortedAppends) {
       setInclude(this.model, filterParams, append);
     }
     debug("filter params: %o", filterParams);

package/lib/update-associations.js

@@ -219,16 +219,6 @@ async function updateSingleAssociation(model, key, value, options = {}) {
       );
     }
   }, "checkBelongsToForeignKeyValue");
-  if ((0, import_utils.isStringOrNumber)(value)) {
-    await model[setAccessor](value, { context, transaction });
-    return true;
-  }
-  if (value instanceof import_model.Model) {
-    await model[setAccessor](value, { context, transaction });
-    model.setDataValue(key, value);
-    return true;
-  }
-  const createAccessor = association.accessors.create;
   let dataKey;
   let M;
   if (association.associationType === "BelongsTo") {
@@ -238,6 +228,24 @@ async function updateSingleAssociation(model, key, value, options = {}) {
     M = association.target;
     dataKey = M.primaryKeyAttribute;
   }
+  if ((0, import_utils.isStringOrNumber)(value)) {
+    const instance2 = await M.findOne({
+      where: {
+        [dataKey]: value
+      },
+      transaction
+    });
+    if (instance2) {
+      await model[setAccessor](value, { context, transaction });
+    }
+    return true;
+  }
+  if (value instanceof import_model.Model) {
+    await model[setAccessor](value, { context, transaction });
+    model.setDataValue(key, value);
+    return true;
+  }
+  const createAccessor = association.accessors.create;
   if ((0, import_utils.isStringOrNumber)(value[dataKey])) {
     const instance2 = await M.findOne({
       where: {
@@ -311,7 +319,7 @@ async function updateMultipleAssociation(model, key, value, options = {}) {
     return;
   }
   value = import_lodash.default.castArray(value);
-  const setItems = [];
+  let setItems = [];
   const objectItems = [];
   for (const item of value) {
     if ((0, import_utils.isUndefinedOrNull)(item)) {
@@ -335,6 +343,25 @@ async function updateMultipleAssociation(model, key, value, options = {}) {
       objectItems.push(item);
     }
   }
+  if (setItems.length > 0) {
+    const TargetModel = association.target;
+    const pk2 = TargetModel.primaryKeyAttribute;
+    const targetKey2 = association.targetKey || association.options.targetKey || pk2;
+    const rawKeys = [];
+    const instanceItems = [];
+    for (const item of setItems) {
+      if (item instanceof import_model.Model) {
+        instanceItems.push(item);
+      } else if ((0, import_utils.isStringOrNumber)(item)) {
+        rawKeys.push(item);
+      }
+    }
+    const validInstances = rawKeys.length ? await TargetModel.findAll({
+      where: { [targetKey2]: rawKeys },
+      transaction
+    }) : [];
+    setItems = [...instanceItems, ...validInstances];
+  }
   await model[setAccessor](setItems, { transaction, context, individualHooks: true, validate: false });
   const newItems = [];
   const pk = association.target.primaryKeyAttribute;

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "2.0.0-beta.1",
+  "version": "2.0.0-beta.10",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/logger": "2.0.0-beta.1",
-    "@nocobase/utils": "2.0.0-beta.1",
+    "@nocobase/logger": "2.0.0-beta.10",
+    "@nocobase/utils": "2.0.0-beta.10",
     "async-mutex": "^0.3.2",
     "chalk": "^4.1.1",
     "cron-parser": "4.4.0",
@@ -39,5 +39,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/database"
   },
-  "gitHead": "b3d1f65848fc91e673372ee734dafe6b1cf80586"
+  "gitHead": "9943dc4b0fdedcac3f304714b58635ae441e2560"
 }