@tachybase/database 0.23.20 → 0.23.35

package/lib/eager-loading/eager-loading-tree.js

@@ -107,17 +107,17 @@ const _EagerLoadingTree = class _EagerLoadingTree {
           children: [],
           includeOption: include.options || {}
         });
-        if (associationType == "HasOne" || associationType == "HasMany") {
+        if (associationType === "HasOne" || associationType === "HasMany") {
           const { sourceKey, foreignKey } = association;
           pushAttribute(eagerLoadingTreeParent, sourceKey);
           pushAttribute(child, foreignKey);
         }
-        if (associationType == "BelongsTo") {
+        if (associationType === "BelongsTo") {
           const { targetKey, foreignKey } = association;
           pushAttribute(eagerLoadingTreeParent, foreignKey);
           pushAttribute(child, targetKey);
         }
-        if (associationType == "BelongsToMany") {
+        if (associationType === "BelongsToMany") {
           const { sourceKey } = association;
           pushAttribute(eagerLoadingTreeParent, sourceKey);
         }
@@ -144,21 +144,40 @@ const _EagerLoadingTree = class _EagerLoadingTree {
       return order;
     }, "orderOption");
     const loadRecursive = /* @__PURE__ */ __name(async (node, ids = []) => {
-      var _a;
+      var _a, _b;
       let instances = [];
       if (!node.parent) {
         const rootInclude = ((_a = this.rootQueryOptions) == null ? void 0 : _a.include) || node.includeOption;
         const includeForFilter = rootInclude.filter((include) => {
-          var _a2, _b;
-          return Object.keys(include.where || {}).length > 0 || ((_b = JSON.stringify((_a2 = this.rootQueryOptions) == null ? void 0 : _a2.filter)) == null ? void 0 : _b.includes(include.association));
+          var _a2, _b2;
+          return Object.keys(include.where || {}).length > 0 || ((_b2 = JSON.stringify((_a2 = this.rootQueryOptions) == null ? void 0 : _a2.filter)) == null ? void 0 : _b2.includes(include.association));
         });
+        const sortModelSet = /* @__PURE__ */ new Set();
+        if ((_b = this.rootQueryOptions) == null ? void 0 : _b.order) {
+          for (const order of this.rootQueryOptions.order) {
+            for (const field of order) {
+              if (field.as) {
+                sortModelSet.add(field.as);
+              }
+            }
+          }
+        }
+        const inCludeForSort = [];
+        for (const sortModel of sortModelSet) {
+          if (includeForFilter.find((v) => v.association === sortModel)) {
+            continue;
+          }
+          inCludeForSort.push({
+            association: sortModel
+          });
+        }
         const isBelongsToAssociationOnly = /* @__PURE__ */ __name((includes, model) => {
           for (const include of includes) {
             const association = model.associations[include.association];
             if (!association) {
               return false;
             }
-            if (association.associationType != "BelongsTo") {
+            if (association.associationType !== "BelongsTo") {
               return false;
             }
             if (!isBelongsToAssociationOnly(include.include || [], association.target)) {
@@ -173,7 +192,7 @@ const _EagerLoadingTree = class _EagerLoadingTree {
             ...this.rootQueryOptions,
             attributes: node.attributes,
             distinct: true,
-            include: includeForFilter,
+            include: includeForFilter.concat(inCludeForSort),
             transaction
           });
         } else {
@@ -187,7 +206,7 @@ const _EagerLoadingTree = class _EagerLoadingTree {
             attributes: [primaryKeyField],
             group: `${node.model.name}.${primaryKeyField}`,
             transaction,
-            include: includeForFilter
+            include: includeForFilter.concat(inCludeForSort)
           })).map((row) => {
             return { row, pk: row[primaryKeyField] };
           });
@@ -222,7 +241,7 @@ const _EagerLoadingTree = class _EagerLoadingTree {
           });
           params = parser.toSequelizeParams();
         }
-        if (associationType == "HasOne" || associationType == "HasMany") {
+        if (associationType === "HasOne" || associationType === "HasMany") {
           const foreignKey = association.foreignKey;
           const foreignKeyValues = node.parent.instances.map((instance) => instance.get(association.sourceKey));
           let where = { [foreignKey]: foreignKeyValues };
@@ -239,7 +258,7 @@ const _EagerLoadingTree = class _EagerLoadingTree {
           };
           instances = await node.model.findAll(findOptions);
         }
-        if (associationType == "BelongsTo") {
+        if (associationType === "BelongsTo") {
           const foreignKey = association.foreignKey;
           const parentInstancesForeignKeyValues = node.parent.instances.map((instance) => instance.get(foreignKey));
           const collection2 = this.db.modelCollection.get(node.model);
@@ -272,7 +291,7 @@ const _EagerLoadingTree = class _EagerLoadingTree {
             });
             const setInstanceParent = /* @__PURE__ */ __name((instance) => {
               const parentInstance = parentInstances.find(
-                (parentInstance2) => parentInstance2.get(targetKey) == instance.get(foreignKey)
+                (parentInstance2) => parentInstance2.get(targetKey) === instance.get(foreignKey)
               );
               if (!parentInstance) {
                 return;
@@ -285,7 +304,7 @@ const _EagerLoadingTree = class _EagerLoadingTree {
             }
           }
         }
-        if (associationType == "BelongsToMany") {
+        if (associationType === "BelongsToMany") {
           const foreignKeyValues = node.parent.instances.map((instance) => instance.get(association.sourceKey));
           const hasOneOptions = {
             as: "_pivot_",
@@ -329,19 +348,19 @@ const _EagerLoadingTree = class _EagerLoadingTree {
             const isEmpty = !children;
             parentInstance[key] = parentInstance.dataValues[key] = isEmpty ? null : children;
           } else {
-            const isEmpty = !children || children.length == 0;
+            const isEmpty = !children || children.length === 0;
             parentInstance[key] = parentInstance.dataValues[key] = isEmpty ? [] : children;
           }
         }, "setParentAccessor");
-        if (associationType == "HasMany" || associationType == "HasOne") {
+        if (associationType === "HasMany" || associationType === "HasOne") {
           const foreignKey = association.foreignKey;
           const sourceKey = association.sourceKey;
           for (const instance of node.instances) {
             const parentInstance = node.parent.instances.find(
-              (parentInstance2) => parentInstance2.get(sourceKey) == instance.get(foreignKey)
+              (parentInstance2) => parentInstance2.get(sourceKey) === instance.get(foreignKey)
             );
             if (parentInstance) {
-              if (associationType == "HasMany") {
+              if (associationType === "HasMany") {
                 const children = parentInstance.getDataValue(association.as);
                 if (!children) {
                   parentInstance.setDataValue(association.as, [instance]);
@@ -349,26 +368,26 @@ const _EagerLoadingTree = class _EagerLoadingTree {
                   children.push(instance);
                 }
               }
-              if (associationType == "HasOne") {
+              if (associationType === "HasOne") {
                 const key = association.options.realAs || association.as;
                 parentInstance[key] = parentInstance.dataValues[key] = instance;
               }
             }
           }
         }
-        if (associationType == "BelongsTo") {
+        if (associationType === "BelongsTo") {
           const foreignKey = association.foreignKey;
           const targetKey = association.targetKey;
           for (const instance of node.instances) {
             const parentInstances = node.parent.instances.filter(
-              (parentInstance) => parentInstance.get(foreignKey) == instance.get(targetKey)
+              (parentInstance) => parentInstance.get(foreignKey) === instance.get(targetKey)
             );
             for (const parentInstance of parentInstances) {
               parentInstance.setDataValue(association.as, instance);
             }
           }
         }
-        if (associationType == "BelongsToMany") {
+        if (associationType === "BelongsToMany") {
           const sourceKey = association.sourceKey;
           const foreignKey = association.foreignKey;
           const as = association.oneFromTarget.as;
@@ -377,7 +396,7 @@ const _EagerLoadingTree = class _EagerLoadingTree {
             delete instance.dataValues["_pivot_"];
             delete instance["_pivot_"];
             const parentInstance = node.parent.instances.find(
-              (parentInstance2) => parentInstance2.get(sourceKey) == instance.dataValues[as].get(foreignKey)
+              (parentInstance2) => parentInstance2.get(sourceKey) === instance.dataValues[as].get(foreignKey)
             );
             if (parentInstance) {
               const children = parentInstance.getDataValue(association.as);
@@ -405,7 +424,7 @@ const _EagerLoadingTree = class _EagerLoadingTree {
           dataCollection: this.db.modelCollection.get(node.model)
         });
       }
-      if (((_a = node.association) == null ? void 0 : _a.as) == "_pivot_") {
+      if (((_a = node.association) == null ? void 0 : _a.as) === "_pivot_") {
         return;
       }
       const nodeRawAttributes = node.rawAttributes || [];

package/lib/options-parser.d.ts

@@ -18,6 +18,7 @@ export declare class OptionsParser {
     static appendInheritInspectAttribute(include: any, collection: any): any;
     isAssociation(key: string): boolean;
     isAssociationPath(path: string): boolean;
+    filterByTkToWhereOption(): {};
     toSequelizeParams(): any;
     /**
      * parser sort options

package/lib/options-parser.js

@@ -81,20 +81,40 @@ const _OptionsParser = class _OptionsParser {
   isAssociationPath(path) {
     return this.isAssociation(path.split(".")[0]);
   }
+  filterByTkToWhereOption() {
+    var _a;
+    const filterByTkOption = (_a = this.options) == null ? void 0 : _a.filterByTk;
+    if (!filterByTkOption) {
+      return {};
+    }
+    if (import_lodash.default.isPlainObject(this.options.filterByTk)) {
+      const where = {};
+      for (const [key, value] of Object.entries(filterByTkOption)) {
+        where[key] = value;
+      }
+      return where;
+    }
+    const filterTargetKey = this.context.targetKey || this.collection.filterTargetKey;
+    if (Array.isArray(filterTargetKey)) {
+      throw new Error("multi filter target key value must be object");
+    }
+    return {
+      [filterTargetKey]: filterByTkOption
+    };
+  }
   toSequelizeParams() {
-    var _a, _b;
+    var _a, _b, _c;
     const queryParams = this.filterParser.toSequelizeParams();
     if ((_a = this.options) == null ? void 0 : _a.filterByTk) {
+      const filterByTkWhere = this.filterByTkToWhereOption();
       queryParams.where = {
-        [import_sequelize.Op.and]: [
-          queryParams.where,
-          {
-            [this.context.targetKey || this.collection.filterTargetKey]: this.options.filterByTk
-          }
-        ]
+        [import_sequelize.Op.and]: [queryParams.where, filterByTkWhere]
       };
     }
-    if ((_b = this.options) == null ? void 0 : _b.include) {
+    if (queryParams.include && !((_b = this.options) == null ? void 0 : _b.include)) {
+      this.options.include = [];
+    }
+    if ((_c = this.options) == null ? void 0 : _c.include) {
       if (!queryParams.include) {
         queryParams.include = [];
       }
@@ -108,32 +128,66 @@ const _OptionsParser = class _OptionsParser {
    * @protected
    */
   parseSort(filterParams) {
-    var _a;
+    var _a, _b;
     let sort = ((_a = this.options) == null ? void 0 : _a.sort) || [];
     if (typeof sort === "string") {
       sort = sort.split(",");
     }
+    let defaultSortField = this.model.primaryKeyAttribute;
+    if (Array.isArray(this.collection.filterTargetKey)) {
+      defaultSortField = this.collection.filterTargetKey;
+    }
+    if (!defaultSortField && this.collection.filterTargetKey && !Array.isArray(this.collection.filterTargetKey)) {
+      defaultSortField = this.collection.filterTargetKey;
+    }
+    if (defaultSortField && !((_b = this.options) == null ? void 0 : _b.group)) {
+      defaultSortField = import_lodash.default.castArray(defaultSortField);
+      for (const key of defaultSortField) {
+        if (!sort.includes(key)) {
+          sort.push(key);
+        }
+      }
+    }
     const orderParams = [];
     for (const sortKey of sort) {
       let direction = sortKey.startsWith("-") ? "DESC" : "ASC";
-      const sortField = sortKey.replace("-", "").split(".");
+      const sortField = sortKey.startsWith("-") ? sortKey.replace("-", "").split(".") : sortKey.split(".");
       if (this.database.inDialect("postgres", "sqlite")) {
         direction = `${direction} NULLS LAST`;
       }
+      let valid = true;
       if (sortField.length > 1) {
         let associationModel = this.model;
         for (let i = 0; i < sortField.length - 1; i++) {
           const associationKey = sortField[i];
-          sortField[i] = associationModel.associations[associationKey].target;
-          associationModel = sortField[i];
+          const associationEntity = associationModel.associations[associationKey];
+          if (!associationEntity) {
+            valid = false;
+            break;
+          }
+          if (!["BelongsTo", "HasOne"].includes(associationEntity.associationType)) {
+            continue;
+          }
+          const model = associationEntity.target;
+          sortField[i] = {
+            model,
+            as: associationKey
+          };
+          associationModel = model;
         }
       } else {
         const rawField = this.model.rawAttributes[sortField[0]];
         sortField[0] = (rawField == null ? void 0 : rawField.field) || sortField[0];
       }
+      if (!valid) {
+        continue;
+      }
       sortField.push(direction);
       if (this.database.isMySQLCompatibleDialect()) {
-        orderParams.push([import_sequelize.Sequelize.fn("ISNULL", import_sequelize.Sequelize.col(`${this.model.name}.${sortField[0]}`))]);
+        const fieldName = sortField[0];
+        if (this.model.fieldRawAttributesMap[fieldName]) {
+          orderParams.push([import_sequelize.Sequelize.fn("ISNULL", import_sequelize.Sequelize.col(`${this.model.name}.${sortField[0]}`))]);
+        }
       }
       orderParams.push(sortField);
     }
@@ -195,8 +249,8 @@ const _OptionsParser = class _OptionsParser {
       const exceptPath = except2.split(".");
       const association = exceptPath[0];
       const lastLevel = exceptPath.length <= 2;
-      const existIncludeIndex = queryParams["include"].findIndex((include) => include["association"] == association);
-      if (existIncludeIndex == -1) {
+      const existIncludeIndex = queryParams["include"].findIndex((include) => include["association"] === association);
+      if (existIncludeIndex === -1) {
         return;
       }
       if (lastLevel) {
@@ -240,10 +294,10 @@ const _OptionsParser = class _OptionsParser {
       const appendAssociation = appendFields[0];
       const associations = model.associations;
       let lastLevel = false;
-      if (appendFields.length == 1) {
+      if (appendFields.length === 1) {
         lastLevel = true;
       }
-      if (appendFields.length == 2) {
+      if (appendFields.length === 2) {
         const association = associations[appendFields[0]];
         if (!association) {
           throw new Error(`association ${appendFields[0]} in ${model.name} not found`);
@@ -253,24 +307,24 @@ const _OptionsParser = class _OptionsParser {
           lastLevel = true;
         }
       }
-      if (queryParams["include"] == void 0) {
+      if (queryParams["include"] === void 0) {
         queryParams["include"] = [];
       }
       let existIncludeIndex = queryParams["include"].findIndex(
-        (include) => include["association"] == appendAssociation
+        (include) => include["association"] === appendAssociation
       );
-      if (existIncludeIndex != -1) {
+      if (existIncludeIndex !== -1) {
         delete queryParams["include"][existIncludeIndex]["fromFilter"];
-        if (Array.isArray(queryParams["include"][existIncludeIndex]["attributes"]) && queryParams["include"][existIncludeIndex]["attributes"].length == 0) {
+        if (Array.isArray(queryParams["include"][existIncludeIndex]["attributes"]) && queryParams["include"][existIncludeIndex]["attributes"].length === 0) {
           queryParams["include"][existIncludeIndex]["attributes"] = {
             include: []
           };
         }
       }
-      if (lastLevel && existIncludeIndex != -1 && ((_a = import_lodash.default.get(queryParams, ["include", existIncludeIndex, "attributes", "include"])) == null ? void 0 : _a.length) == 0) {
+      if (lastLevel && existIncludeIndex !== -1 && ((_a = import_lodash.default.get(queryParams, ["include", existIncludeIndex, "attributes", "include"])) == null ? void 0 : _a.length) === 0) {
         return;
       }
-      if (existIncludeIndex == -1) {
+      if (existIncludeIndex === -1) {
         queryParams["include"].push({
           association: appendAssociation,
           options: appendWithOptions.options || {}
@@ -282,14 +336,14 @@ const _OptionsParser = class _OptionsParser {
           include: []
           // all fields are output by default
         };
-        if (appendFields.length == 2) {
+        if (appendFields.length === 2) {
           if (!Array.isArray(attributes)) {
             attributes = [];
           }
           const attributeName = appendFields[1];
           attributes.push(attributeName);
         } else {
-          if (Array.isArray(attributes) && attributes.length == 0) {
+          if (Array.isArray(attributes) && attributes.length === 0) {
             attributes = {
               include: []
             };
@@ -301,7 +355,7 @@ const _OptionsParser = class _OptionsParser {
         };
       } else {
         const existInclude = queryParams["include"][existIncludeIndex];
-        if (existInclude.attributes && Array.isArray(existInclude.attributes) && existInclude.attributes.length == 0) {
+        if (existInclude.attributes && Array.isArray(existInclude.attributes) && existInclude.attributes.length === 0) {
           existInclude.attributes = {
             include: []
           };

package/lib/update-associations.js

@@ -62,7 +62,7 @@ function belongsToManyAssociations(instance) {
   const associations = modelAssociations(instance);
   return Object.entries(associations).filter((entry) => {
     const [key, association] = entry;
-    return association.associationType == "BelongsToMany";
+    return association.associationType === "BelongsToMany";
   }).map((association) => {
     return association[1];
   });
@@ -155,12 +155,12 @@ function isReverseAssociationPair(a, b) {
   const typeSet = /* @__PURE__ */ new Set();
   typeSet.add(a.associationType);
   typeSet.add(b.associationType);
-  if (typeSet.size == 1 && typeSet.has("BelongsToMany")) {
+  if (typeSet.size === 1 && typeSet.has("BelongsToMany")) {
     return a.through.tableName === b.through.tableName && a.target.name === b.source.name && b.target.name === a.source.name && a.foreignKey === b.otherKey && a.sourceKey === b.targetKey && a.otherKey === b.foreignKey && a.targetKey === b.sourceKey;
   }
   if (typeSet.has("HasOne") && typeSet.has("BelongsTo") || typeSet.has("HasMany") && typeSet.has("BelongsTo")) {
-    const sourceAssoc = a.associationType == "BelongsTo" ? b : a;
-    const targetAssoc = sourceAssoc == a ? b : a;
+    const sourceAssoc = a.associationType === "BelongsTo" ? b : a;
+    const targetAssoc = sourceAssoc === a ? b : a;
     return sourceAssoc.source.name === targetAssoc.target.name && sourceAssoc.target.name === targetAssoc.source.name && sourceAssoc.foreignKey === targetAssoc.foreignKey && sourceAssoc.sourceKey === targetAssoc.targetKey;
   }
   return false;
@@ -204,7 +204,10 @@ async function updateSingleAssociation(model, key, value, options = {}) {
     return true;
   }, "removeAssociation");
   if (isUndefinedOrNull(value)) {
-    return await removeAssociation();
+    if (!isUndefinedOrNull(await model[association.accessors.get]())) {
+      return await removeAssociation();
+    }
+    return true;
   }
   if (association.associationType === "HasOne" && !model.get(association.sourceKeyAttribute)) {
     throw new Error(`The source key ${association.sourceKeyAttribute} is not set in ${model.constructor.name}`);
@@ -244,7 +247,7 @@ async function updateSingleAssociation(model, key, value, options = {}) {
       transaction
     });
     if (instance2) {
-      await model[setAccessor](instance2, { context, transaction });
+      await model[setAccessor](instance2, { context, transaction, hooks: false });
       if (!recursive) {
         return;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tachybase/database",
-  "version": "0.23.20",
+  "version": "0.23.35",
   "description": "",
   "license": "Apache-2.0",
   "main": "./lib/index.js",
@@ -24,8 +24,8 @@
     "semver": "^7.6.3",
     "sequelize": "^6.37.5",
     "umzug": "^3.8.2",
-    "@tachybase/logger": "0.23.20",
-    "@tachybase/utils": "0.23.20"
+    "@tachybase/logger": "0.23.35",
+    "@tachybase/utils": "0.23.35"
   },
   "devDependencies": {
     "@types/flat": "^5.0.5",