@nocobase/database 1.9.32 → 1.9.34

package/lib/options-parser.d.ts

@@ -43,6 +43,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

@@ -274,9 +274,25 @@ 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 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) => {
       var _a;
       const appendWithOptions = this.parseAppendWithOptions(append);
@@ -362,7 +378,7 @@ const _OptionsParser = class _OptionsParser {
         );
       }
     }, "setInclude");
-    for (const append of appends) {
+    for (const append of sortedAppends) {
       setInclude(this.model, filterParams, append);
     }
     debug("filter params: %o", filterParams);

package/lib/relation-repository/multiple-relation-repository.d.ts

@@ -11,6 +11,7 @@ import { RelationRepository } from './relation-repository';
 import { AssociatedOptions, CountOptions, DestroyOptions, Filter, FindOptions, TargetKey, UpdateOptions, FirstOrCreateOptions } from './types';
 export declare abstract class MultipleRelationRepository extends RelationRepository {
     targetRepositoryFilterOptionsBySourceValue(): Promise<any>;
+    private normalizeScope;
     find(options?: FindOptions): Promise<any>;
     findAndCount(options?: FindOptions): Promise<[any[], number]>;
     count(options?: CountOptions): Promise<number>;

package/lib/relation-repository/multiple-relation-repository.js

@@ -65,6 +65,16 @@ const _MultipleRelationRepository = class _MultipleRelationRepository extends im
       [this.association.foreignKey]: filterForeignKeyValue
     };
   }
+  normalizeScope(scope, model) {
+    const result = {};
+    for (const [key, value] of Object.entries(scope)) {
+      const attr = model.getAttributes()[key];
+      if (attr == null ? void 0 : attr.field) {
+        result[attr.field] = value;
+      }
+    }
+    return result;
+  }
   async find(options) {
     const targetRepository = this.targetCollection.repository;
     const association = this.association;
@@ -74,6 +84,9 @@ const _MultipleRelationRepository = class _MultipleRelationRepository extends im
       sourceKey: association.targetKey,
       realAs: association.through.model.name
     };
+    if (association.through.scope) {
+      oneFromTargetOptions["scope"] = this.normalizeScope(association.through.scope, association.through.model);
+    }
     const pivotAssoc = new import_sequelize.HasOne(association.target, association.through.model, oneFromTargetOptions);
     const appendFilter = {
       isPivotFilter: true,

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": "1.9.32",
+  "version": "1.9.34",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/logger": "1.9.32",
-    "@nocobase/utils": "1.9.32",
+    "@nocobase/logger": "1.9.34",
+    "@nocobase/utils": "1.9.34",
     "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": "40b6cf8117d8ae2435fead40d26d12647706f852"
+  "gitHead": "8779a68face5b8f159aef726f73695f319ab7659"
 }