@tachybase/database 0.23.40 → 0.23.47

package/lib/collection-factory.js

@@ -25,9 +25,9 @@ var import_collection = require("./collection");
 const _CollectionFactory = class _CollectionFactory {
   constructor(database) {
     this.database = database;
+    // Using a Map with the collection subclass as the key and options as the value
+    this.collectionTypes = /* @__PURE__ */ new Map();
   }
-  // Using a Map with the collection subclass as the key and options as the value
-  collectionTypes = /* @__PURE__ */ new Map();
   registerCollectionType(collectionClass, options) {
     this.collectionTypes.set(collectionClass, options);
   }

package/lib/collection-importer.js

@@ -37,8 +37,6 @@ var import_path = __toESM(require("path"));
 var import_utils = require("@tachybase/utils");
 var import_lodash = require("lodash");
 const _ImporterReader = class _ImporterReader {
-  directory;
-  extensions;
   constructor(directory, extensions) {
     this.directory = directory;
     if (!extensions) {

package/lib/collection.js

@@ -64,7 +64,6 @@ var __decorateElement = (array, flags, name, decorators, target, extra) => {
   }
   return k || __decoratorMetadata(array, target), desc && __defProp(target, name, desc), p ? k ^ 4 ? extra : desc : target;
 };
-var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 var __accessCheck = (obj, member, msg) => member.has(obj) || __typeError("Cannot " + msg);
 var __privateIn = (member, obj) => Object(obj) !== obj ? __typeError('Cannot use the "in" operator on this value') : member.has(obj);
 var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
@@ -112,12 +111,12 @@ const _Collection = class _Collection extends (_a = import_events.EventEmitter,
   constructor(options, context) {
     super();
     __runInitializers(_init, 5, this);
-    __publicField(this, "options");
-    __publicField(this, "context");
-    __publicField(this, "isThrough");
-    __publicField(this, "fields", /* @__PURE__ */ new Map());
-    __publicField(this, "model");
-    __publicField(this, "repository");
+    this.options = void 0;
+    this.context = void 0;
+    this.isThrough = void 0;
+    this.fields = /* @__PURE__ */ new Map();
+    this.model = void 0;
+    this.repository = void 0;
     this.context = context;
     this.options = options;
     this.checkOptions(options);

package/lib/database.js

@@ -95,7 +95,6 @@ const DialectVersionAccessors = {
   }
 };
 const _DatabaseVersion = class _DatabaseVersion {
-  db;
   constructor(db) {
     this.db = db;
   }
@@ -121,33 +120,25 @@ const _DatabaseVersion = class _DatabaseVersion {
 __name(_DatabaseVersion, "DatabaseVersion");
 let DatabaseVersion = _DatabaseVersion;
 const _Database = class _Database extends import_events.EventEmitter {
-  sequelize;
-  migrator;
-  migrations;
-  fieldTypes = /* @__PURE__ */ new Map();
-  fieldValueParsers = /* @__PURE__ */ new Map();
-  options;
-  models = /* @__PURE__ */ new Map();
-  repositories = /* @__PURE__ */ new Map();
-  operators = /* @__PURE__ */ new Map();
-  collections = /* @__PURE__ */ new Map();
-  pendingFields = /* @__PURE__ */ new Map();
-  modelCollection = /* @__PURE__ */ new Map();
-  tableNameCollectionMap = /* @__PURE__ */ new Map();
-  context = {};
-  queryInterface;
-  utils = new import_database_utils.default(this);
-  referenceMap = new import_references_map.default();
-  inheritanceMap = new import_inherited_map.default();
-  importedFrom = /* @__PURE__ */ new Map();
-  modelHook;
-  version;
-  delayCollectionExtend = /* @__PURE__ */ new Map();
-  logger;
-  collectionGroupManager = new import_collection_group_manager.CollectionGroupManager(this);
-  collectionFactory = new import_collection_factory.CollectionFactory(this);
   constructor(options) {
     super();
+    this.fieldTypes = /* @__PURE__ */ new Map();
+    this.fieldValueParsers = /* @__PURE__ */ new Map();
+    this.models = /* @__PURE__ */ new Map();
+    this.repositories = /* @__PURE__ */ new Map();
+    this.operators = /* @__PURE__ */ new Map();
+    this.collections = /* @__PURE__ */ new Map();
+    this.pendingFields = /* @__PURE__ */ new Map();
+    this.modelCollection = /* @__PURE__ */ new Map();
+    this.tableNameCollectionMap = /* @__PURE__ */ new Map();
+    this.context = {};
+    this.utils = new import_database_utils.default(this);
+    this.referenceMap = new import_references_map.default();
+    this.inheritanceMap = new import_inherited_map.default();
+    this.importedFrom = /* @__PURE__ */ new Map();
+    this.delayCollectionExtend = /* @__PURE__ */ new Map();
+    this.collectionGroupManager = new import_collection_group_manager.CollectionGroupManager(this);
+    this.collectionFactory = new import_collection_factory.CollectionFactory(this);
     this.setMaxListeners(50);
     this.version = new DatabaseVersion(this);
     const opts = {
@@ -250,7 +241,6 @@ const _Database = class _Database extends import_events.EventEmitter {
     (0, import_utils2.patchSequelizeQueryInterface)(this);
     this.registerCollectionType();
   }
-  _instanceId;
   get instanceId() {
     return this._instanceId;
   }

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

@@ -36,6 +36,37 @@ var import_sequelize = require("sequelize");
 var import_append_child_collection_name_after_repository_find = require("../listeners/append-child-collection-name-after-repository-find");
 var import_options_parser = require("../options-parser");
 var import_adjacency_list_repository = require("../repositories/tree-repository/adjacency-list-repository");
+var import_sort_parser = __toESM(require("../sort-parser"));
+function mergeInclude(left, right) {
+  const merged = [];
+  left.forEach((baseItem) => {
+    var _a;
+    const updateItem = right.find((updateItem2) => updateItem2.association === baseItem.association);
+    if (updateItem) {
+      const mergedInclude = ((_a = baseItem.include) == null ? void 0 : _a.map((baseInclude) => {
+        const updateInclude = updateItem.include ? updateItem.include.find((item) => item.association === baseInclude.association) : null;
+        return updateInclude ? mergeInclude([baseInclude], [updateInclude])[0] : baseInclude;
+      })) || [];
+      merged.push({
+        ...baseItem,
+        // 合并 baseItem 的其他属性
+        ...updateItem,
+        // 覆盖 baseItem 的属性
+        include: mergedInclude
+        // 合并后的 include
+      });
+    } else {
+      merged.push(baseItem);
+    }
+  });
+  right.forEach((updateItem) => {
+    if (!left.find((baseItem) => baseItem.association === updateItem.association)) {
+      merged.push(updateItem);
+    }
+  });
+  return merged;
+}
+__name(mergeInclude, "mergeInclude");
 const pushAttribute = /* @__PURE__ */ __name((node, attribute) => {
   if (import_lodash.default.isArray(node.attributes) && !node.attributes.includes(attribute)) {
     node.attributes.push(attribute);
@@ -59,10 +90,8 @@ const EagerLoadingNodeProto = {
   }
 };
 const _EagerLoadingTree = class _EagerLoadingTree {
-  root;
-  db;
-  rootQueryOptions = {};
   constructor(root) {
+    this.rootQueryOptions = {};
     this.root = root;
   }
   static buildFromSequelizeOptions(options) {
@@ -144,7 +173,7 @@ const _EagerLoadingTree = class _EagerLoadingTree {
       return order;
     }, "orderOption");
     const loadRecursive = /* @__PURE__ */ __name(async (node, ids = []) => {
-      var _a, _b;
+      var _a, _b, _c;
       let instances = [];
       if (!node.parent) {
         const rootInclude = ((_a = this.rootQueryOptions) == null ? void 0 : _a.include) || node.includeOption;
@@ -152,24 +181,13 @@ const _EagerLoadingTree = class _EagerLoadingTree {
           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
-          });
+        let includeForSort = [];
+        let groupForSort = [];
+        if ((_b = this.rootQueryOptions) == null ? void 0 : _b.sort) {
+          const sortParser = new import_sort_parser.default((_c = this.rootQueryOptions) == null ? void 0 : _c.sort, node.model);
+          const res = sortParser.toSequelizeParams();
+          includeForSort = res.include;
+          groupForSort = res.group;
         }
         const isBelongsToAssociationOnly = /* @__PURE__ */ __name((includes, model) => {
           for (const include of includes) {
@@ -186,13 +204,14 @@ const _EagerLoadingTree = class _EagerLoadingTree {
           }
           return true;
         }, "isBelongsToAssociationOnly");
-        const belongsToAssociationsOnly = isBelongsToAssociationOnly(includeForFilter, node.model);
+        const includeForAll = mergeInclude(includeForFilter, includeForSort);
+        const belongsToAssociationsOnly = isBelongsToAssociationOnly(includeForAll, node.model);
         if (belongsToAssociationsOnly) {
           instances = await node.model.findAll({
             ...this.rootQueryOptions,
             attributes: node.attributes,
             distinct: true,
-            include: includeForFilter.concat(inCludeForSort),
+            include: includeForAll,
             transaction
           });
         } else {
@@ -200,13 +219,14 @@ const _EagerLoadingTree = class _EagerLoadingTree {
           if (!primaryKeyField) {
             throw new Error(`Model ${node.model.name} does not have primary key`);
           }
+          const group = [`${node.model.name}.${primaryKeyField}`].concat(groupForSort);
           const ids2 = (await node.model.findAll({
             ...this.rootQueryOptions,
             includeIgnoreAttributes: false,
             attributes: [primaryKeyField],
-            group: `${node.model.name}.${primaryKeyField}`,
+            group,
             transaction,
-            include: includeForFilter.concat(inCludeForSort)
+            include: includeForAll
           })).map((row) => {
             return { row, pk: row[primaryKeyField] };
           });
@@ -219,7 +239,8 @@ const _EagerLoadingTree = class _EagerLoadingTree {
           }
           instances = await node.model.findAll({
             ...findOptions,
-            transaction
+            transaction,
+            include: includeForSort
           });
         }
         const associations = node.model.associations;

package/lib/features/references-map.js

@@ -47,7 +47,9 @@ const PRIORITY_MAP = {
   user: 2
 };
 const _ReferencesMap = class _ReferencesMap {
-  map = /* @__PURE__ */ new Map();
+  constructor() {
+    this.map = /* @__PURE__ */ new Map();
+  }
   addReference(reference) {
     const existReference = this.existReference(reference);
     if (existReference && existReference.onDelete !== reference.onDelete) {

package/lib/fields/array-field.js

@@ -24,22 +24,25 @@ module.exports = __toCommonJS(array_field_exports);
 var import_sequelize = require("sequelize");
 var import_field = require("./field");
 const _ArrayField = class _ArrayField extends import_field.Field {
+  constructor() {
+    super(...arguments);
+    this.sortValue = /* @__PURE__ */ __name((model) => {
+      let oldValue = model.get(this.options.name);
+      if (oldValue) {
+        if (typeof oldValue === "string") {
+          oldValue = JSON.parse(oldValue);
+        }
+        const newValue = oldValue.sort();
+        model.set(this.options.name, newValue);
+      }
+    }, "sortValue");
+  }
   get dataType() {
     if (this.database.sequelize.getDialect() === "postgres") {
       return import_sequelize.DataTypes.JSONB;
     }
     return import_sequelize.DataTypes.JSON;
   }
-  sortValue = /* @__PURE__ */ __name((model) => {
-    let oldValue = model.get(this.options.name);
-    if (oldValue) {
-      if (typeof oldValue === "string") {
-        oldValue = JSON.parse(oldValue);
-      }
-      const newValue = oldValue.sort();
-      model.set(this.options.name, newValue);
-    }
-  }, "sortValue");
   bind() {
     super.bind();
     this.on("beforeSave", this.sortValue);

package/lib/fields/belongs-to-field.js

@@ -4,7 +4,6 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
   for (var name in all)
@@ -27,7 +26,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 var belongs_to_field_exports = {};
 __export(belongs_to_field_exports, {
   BelongsToField: () => BelongsToField
@@ -146,7 +144,7 @@ const _BelongsToField = class _BelongsToField extends import_relation_field.Rela
   }
 };
 __name(_BelongsToField, "BelongsToField");
-__publicField(_BelongsToField, "type", "belongsTo");
+_BelongsToField.type = "belongsTo";
 let BelongsToField = _BelongsToField;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/fields/context-field.js

@@ -35,16 +35,19 @@ var import_lodash = __toESM(require("lodash"));
 var import_sequelize = require("sequelize");
 var import_field = require("./field");
 const _ContextField = class _ContextField extends import_field.Field {
+  constructor() {
+    super(...arguments);
+    this.listener = /* @__PURE__ */ __name(async (model, options) => {
+      const { name, dataIndex } = this.options;
+      const { context } = options;
+      model.set(name, import_lodash.default.get(context, dataIndex));
+      model.changed(name, true);
+    }, "listener");
+  }
   get dataType() {
     const type = this.options.dataType || "string";
     return import_sequelize.DataTypes[type.toUpperCase()] || import_sequelize.DataTypes.STRING;
   }
-  listener = /* @__PURE__ */ __name(async (model, options) => {
-    const { name, dataIndex } = this.options;
-    const { context } = options;
-    model.set(name, import_lodash.default.get(context, dataIndex));
-    model.changed(name, true);
-  }, "listener");
   bind() {
     super.bind();
     const { createOnly } = this.options;

package/lib/fields/field.js

@@ -34,10 +34,6 @@ module.exports = __toCommonJS(field_exports);
 var import_lodash = __toESM(require("lodash"));
 var import_utils = require("../utils");
 const _Field = class _Field {
-  options;
-  context;
-  database;
-  collection;
   constructor(options, context) {
     this.context = context;
     this.database = this.context.database;

package/lib/fields/radio-field.js

@@ -24,29 +24,32 @@ module.exports = __toCommonJS(radio_field_exports);
 var import_sequelize = require("sequelize");
 var import_field = require("./field");
 const _RadioField = class _RadioField extends import_field.Field {
+  constructor() {
+    super(...arguments);
+    this.listener = /* @__PURE__ */ __name(async (model, { transaction }) => {
+      const { name } = this.options;
+      if (!model.changed(name)) {
+        return;
+      }
+      const value = model.get(name);
+      if (value) {
+        const M = this.collection.model;
+        await M.update(
+          { [name]: false },
+          {
+            where: {
+              [name]: true
+            },
+            transaction,
+            hooks: false
+          }
+        );
+      }
+    }, "listener");
+  }
   get dataType() {
     return import_sequelize.DataTypes.BOOLEAN;
   }
-  listener = /* @__PURE__ */ __name(async (model, { transaction }) => {
-    const { name } = this.options;
-    if (!model.changed(name)) {
-      return;
-    }
-    const value = model.get(name);
-    if (value) {
-      const M = this.collection.model;
-      await M.update(
-        { [name]: false },
-        {
-          where: {
-            [name]: true
-          },
-          transaction,
-          hooks: false
-        }
-      );
-    }
-  }, "listener");
   bind() {
     super.bind();
     this.on("beforeCreate", this.listener);

package/lib/fields/set-field.js

@@ -23,12 +23,15 @@ __export(set_field_exports, {
 module.exports = __toCommonJS(set_field_exports);
 var import_array_field = require("./array-field");
 const _SetField = class _SetField extends import_array_field.ArrayField {
-  beforeSave = /* @__PURE__ */ __name((model) => {
-    const oldValue = model.get(this.options.name);
-    if (oldValue) {
-      model.set(this.options.name, [...new Set(oldValue)]);
-    }
-  }, "beforeSave");
+  constructor() {
+    super(...arguments);
+    this.beforeSave = /* @__PURE__ */ __name((model) => {
+      const oldValue = model.get(this.options.name);
+      if (oldValue) {
+        model.set(this.options.name, [...new Set(oldValue)]);
+      }
+    }, "beforeSave");
+  }
   bind() {
     super.bind();
     this.on("beforeSave", this.beforeSave);

package/lib/fields/sort-field.js

@@ -27,87 +27,86 @@ var import_sequelize = require("sequelize");
 var import_field = require("./field");
 const sortFieldMutex = new import_async_mutex.Mutex();
 const _SortField = class _SortField extends import_field.Field {
-  get dataType() {
-    return import_sequelize.DataTypes.BIGINT;
-  }
-  setSortValue = /* @__PURE__ */ __name(async (instance, options) => {
-    const { name, scopeKey } = this.options;
-    const { model } = this.context.collection;
-    if ((0, import_lodash.isNumber)(instance.get(name)) && instance._previousDataValues[scopeKey] == instance[scopeKey]) {
-      return;
-    }
-    const where = {};
-    if (scopeKey) {
-      const value = instance.get(scopeKey);
-      if (value !== void 0 && value !== null) {
-        where[scopeKey] = value;
+  constructor() {
+    super(...arguments);
+    this.setSortValue = /* @__PURE__ */ __name(async (instance, options) => {
+      const { name, scopeKey } = this.options;
+      const { model } = this.context.collection;
+      if ((0, import_lodash.isNumber)(instance.get(name)) && instance._previousDataValues[scopeKey] == instance[scopeKey]) {
+        return;
       }
-    }
-    await sortFieldMutex.runExclusive(async () => {
-      const max = await model.max(name, { ...options, where });
-      const newValue = (max || 0) + 1;
-      instance.set(name, newValue);
-    });
-  }, "setSortValue");
-  onScopeChange = /* @__PURE__ */ __name(async (instance, options) => {
-    const { scopeKey } = this.options;
-    if (scopeKey && !instance.isNewRecord && instance._previousDataValues[scopeKey] != instance[scopeKey]) {
-      await this.setSortValue(instance, options);
-    }
-  }, "onScopeChange");
-  initRecordsSortValue = /* @__PURE__ */ __name(async ({ transaction }) => {
-    const orderField = (() => {
-      const model = this.collection.model;
-      if (model.primaryKeyAttribute) {
-        return model.primaryKeyAttribute;
-      }
-      if (model.rawAttributes["createdAt"]) {
-        return model.rawAttributes["createdAt"].field;
-      }
-      throw new Error(`can not find order key for collection ${this.collection.name}`);
-    })();
-    const needInit = /* @__PURE__ */ __name(async (scopeKey2 = null, scopeValue = null) => {
-      const filter = {};
-      if (scopeKey2 && scopeValue) {
-        filter[scopeKey2] = scopeValue;
+      const where = {};
+      if (scopeKey) {
+        const value = instance.get(scopeKey);
+        if (value !== void 0 && value !== null) {
+          where[scopeKey] = value;
+        }
       }
-      const totalCount = await this.collection.repository.count({
-        filter,
-        transaction
+      await sortFieldMutex.runExclusive(async () => {
+        const max = await model.max(name, { ...options, where });
+        const newValue = (max || 0) + 1;
+        instance.set(name, newValue);
       });
-      const emptyCount = await this.collection.repository.count({
-        filter: {
-          [this.name]: null,
-          ...filter
-        },
-        transaction
-      });
-      return emptyCount === totalCount && emptyCount > 0;
-    }, "needInit");
-    const doInit = /* @__PURE__ */ __name(async (scopeKey2 = null, scopeValue = null) => {
-      const queryInterface = this.collection.db.sequelize.getQueryInterface();
-      if (scopeKey2) {
-        const scopeAttribute = this.collection.model.rawAttributes[scopeKey2];
-        if (!scopeAttribute) {
-          throw new Error(`can not find scope field ${scopeKey2} for collection ${this.collection.name}`);
-        }
-        scopeKey2 = scopeAttribute.field;
+    }, "setSortValue");
+    this.onScopeChange = /* @__PURE__ */ __name(async (instance, options) => {
+      const { scopeKey } = this.options;
+      if (scopeKey && !instance.isNewRecord && instance._previousDataValues[scopeKey] != instance[scopeKey]) {
+        await this.setSortValue(instance, options);
       }
-      const quotedOrderField = queryInterface.quoteIdentifier(orderField);
-      const sortColumnName = queryInterface.quoteIdentifier(this.collection.model.rawAttributes[this.name].field);
-      let sql;
-      const whereClause = scopeKey2 && scopeValue ? (() => {
-        const filteredScopeValue = scopeValue.filter((v) => v !== null);
-        if (filteredScopeValue.length === 0) {
-          return "";
+    }, "onScopeChange");
+    this.initRecordsSortValue = /* @__PURE__ */ __name(async ({ transaction }) => {
+      const orderField = (() => {
+        const model = this.collection.model;
+        if (model.primaryKeyAttribute) {
+          return model.primaryKeyAttribute;
+        }
+        if (model.rawAttributes["createdAt"]) {
+          return model.rawAttributes["createdAt"].field;
+        }
+        throw new Error(`can not find order key for collection ${this.collection.name}`);
+      })();
+      const needInit = /* @__PURE__ */ __name(async (scopeKey2 = null, scopeValue = null) => {
+        const filter = {};
+        if (scopeKey2 && scopeValue) {
+          filter[scopeKey2] = scopeValue;
+        }
+        const totalCount = await this.collection.repository.count({
+          filter,
+          transaction
+        });
+        const emptyCount = await this.collection.repository.count({
+          filter: {
+            [this.name]: null,
+            ...filter
+          },
+          transaction
+        });
+        return emptyCount === totalCount && emptyCount > 0;
+      }, "needInit");
+      const doInit = /* @__PURE__ */ __name(async (scopeKey2 = null, scopeValue = null) => {
+        const queryInterface = this.collection.db.sequelize.getQueryInterface();
+        if (scopeKey2) {
+          const scopeAttribute = this.collection.model.rawAttributes[scopeKey2];
+          if (!scopeAttribute) {
+            throw new Error(`can not find scope field ${scopeKey2} for collection ${this.collection.name}`);
+          }
+          scopeKey2 = scopeAttribute.field;
         }
-        const initialClause = `
+        const quotedOrderField = queryInterface.quoteIdentifier(orderField);
+        const sortColumnName = queryInterface.quoteIdentifier(this.collection.model.rawAttributes[this.name].field);
+        let sql;
+        const whereClause = scopeKey2 && scopeValue ? (() => {
+          const filteredScopeValue = scopeValue.filter((v) => v !== null);
+          if (filteredScopeValue.length === 0) {
+            return "";
+          }
+          const initialClause = `
   WHERE ${queryInterface.quoteIdentifier(scopeKey2)} IN (${filteredScopeValue.map((v) => `'${v}'`).join(", ")})`;
-        const nullCheck = scopeValue.includes(null) ? ` OR ${queryInterface.quoteIdentifier(scopeKey2)} IS NULL` : "";
-        return initialClause + nullCheck;
-      })() : "";
-      if (this.collection.db.inDialect("postgres")) {
-        sql = `
+          const nullCheck = scopeValue.includes(null) ? ` OR ${queryInterface.quoteIdentifier(scopeKey2)} IS NULL` : "";
+          return initialClause + nullCheck;
+        })() : "";
+        if (this.collection.db.inDialect("postgres")) {
+          sql = `
     UPDATE ${this.collection.quotedTableName()}
     SET ${sortColumnName} = ordered_table.new_sequence_number
     FROM (
@@ -117,8 +116,8 @@ const _SortField = class _SortField extends import_field.Field {
     ) AS ordered_table
     WHERE ${this.collection.quotedTableName()}.${quotedOrderField} = ordered_table.${quotedOrderField};
   `;
-      } else if (this.collection.db.inDialect("sqlite")) {
-        sql = `
+        } else if (this.collection.db.inDialect("sqlite")) {
+          sql = `
     UPDATE ${this.collection.quotedTableName()}
     SET ${sortColumnName} = (
       SELECT new_sequence_number
@@ -130,8 +129,8 @@ const _SortField = class _SortField extends import_field.Field {
       WHERE ${this.collection.quotedTableName()}.${quotedOrderField} = ordered_table.${quotedOrderField}
     );
   `;
-      } else if (this.collection.db.inDialect("mysql") || this.collection.db.inDialect("mariadb")) {
-        sql = `
+        } else if (this.collection.db.inDialect("mysql") || this.collection.db.inDialect("mariadb")) {
+          sql = `
     UPDATE ${this.collection.quotedTableName()}
     JOIN (
       SELECT *, ROW_NUMBER() OVER (${scopeKey2 ? `PARTITION BY ${queryInterface.quoteIdentifier(scopeKey2)}` : ""} ORDER BY ${quotedOrderField}) AS new_sequence_number
@@ -140,32 +139,36 @@ const _SortField = class _SortField extends import_field.Field {
     ) AS ordered_table ON ${this.collection.quotedTableName()}.${quotedOrderField} = ordered_table.${quotedOrderField}
     SET ${this.collection.quotedTableName()}.${sortColumnName} = ordered_table.new_sequence_number;
   `;
-      }
-      await this.collection.db.sequelize.query(sql, {
-        transaction
-      });
-    }, "doInit");
-    const scopeKey = this.options.scopeKey;
-    if (scopeKey) {
-      const groups = await this.collection.repository.find({
-        attributes: [scopeKey],
-        group: [scopeKey],
-        raw: true,
-        transaction
-      });
-      const needInitGroups = [];
-      for (const group of groups) {
-        if (await needInit(scopeKey, group[scopeKey])) {
-          needInitGroups.push(group[scopeKey]);
         }
+        await this.collection.db.sequelize.query(sql, {
+          transaction
+        });
+      }, "doInit");
+      const scopeKey = this.options.scopeKey;
+      if (scopeKey) {
+        const groups = await this.collection.repository.find({
+          attributes: [scopeKey],
+          group: [scopeKey],
+          raw: true,
+          transaction
+        });
+        const needInitGroups = [];
+        for (const group of groups) {
+          if (await needInit(scopeKey, group[scopeKey])) {
+            needInitGroups.push(group[scopeKey]);
+          }
+        }
+        if (needInitGroups.length > 0) {
+          await doInit(scopeKey, needInitGroups);
+        }
+      } else if (await needInit()) {
+        await doInit();
       }
-      if (needInitGroups.length > 0) {
-        await doInit(scopeKey, needInitGroups);
-      }
-    } else if (await needInit()) {
-      await doInit();
-    }
-  }, "initRecordsSortValue");
+    }, "initRecordsSortValue");
+  }
+  get dataType() {
+    return import_sequelize.DataTypes.BIGINT;
+  }
   bind() {
     super.bind();
     this.on("afterSync", this.initRecordsSortValue);

package/lib/filter-parser.js

@@ -35,11 +35,6 @@ var import_flat = require("flat");
 var import_lodash = __toESM(require("lodash"));
 const debug = require("debug")("noco-database");
 const _FilterParser = class _FilterParser {
-  collection;
-  database;
-  model;
-  filter;
-  context;
   constructor(filter, context) {
     const { collection } = context;
     this.collection = collection;

package/lib/inherited-collection.js

@@ -34,7 +34,6 @@ module.exports = __toCommonJS(inherited_collection_exports);
 var import_lodash = __toESM(require("lodash"));
 var import_collection = require("./collection");
 const _InheritedCollection = class _InheritedCollection extends import_collection.Collection {
-  parents;
   constructor(options, context) {
     if (!options.inherits) {
       throw new Error("InheritedCollection must have inherits option");

package/lib/inherited-map.js

@@ -33,9 +33,6 @@ __export(inherited_map_exports, {
 module.exports = __toCommonJS(inherited_map_exports);
 var import_lodash = __toESM(require("lodash"));
 const _TableNode = class _TableNode {
-  name;
-  parents;
-  children;
   constructor(name) {
     this.name = name;
     this.parents = /* @__PURE__ */ new Set();
@@ -45,7 +42,9 @@ const _TableNode = class _TableNode {
 __name(_TableNode, "TableNode");
 let TableNode = _TableNode;
 const _InheritanceMap = class _InheritanceMap {
-  nodes = /* @__PURE__ */ new Map();
+  constructor() {
+    this.nodes = /* @__PURE__ */ new Map();
+  }
   removeNode(name) {
     const node = this.nodes.get(name);
     if (!node) return;

package/lib/migration.js

@@ -35,8 +35,6 @@ module.exports = __toCommonJS(migration_exports);
 var import_utils = require("@tachybase/utils");
 var import_lodash = __toESM(require("lodash"));
 const _Migration = class _Migration {
-  name;
-  context;
   constructor(context) {
     this.context = context;
   }
@@ -57,9 +55,8 @@ const _Migration = class _Migration {
 __name(_Migration, "Migration");
 let Migration = _Migration;
 const _Migrations = class _Migrations {
-  items = [];
-  context;
   constructor(context) {
+    this.items = [];
     this.context = context;
   }
   clear() {

package/lib/model-hook.js

@@ -34,9 +34,8 @@ module.exports = __toCommonJS(model_hook_exports);
 var import_lodash = __toESM(require("lodash"));
 const { hooks } = require("sequelize/lib/hooks");
 const _ModelHook = class _ModelHook {
-  database;
-  boundEvents = /* @__PURE__ */ new Set();
   constructor(database) {
+    this.boundEvents = /* @__PURE__ */ new Set();
     this.database = database;
   }
   match(event) {

package/lib/model.js

@@ -4,7 +4,6 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
   for (var name in all)
@@ -27,7 +26,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 var model_exports = {};
 __export(model_exports, {
   Model: () => Model
@@ -38,8 +36,11 @@ var import_sequelize = require("sequelize");
 var import_sync_runner = require("./sync-runner");
 const _ = import_lodash.default;
 const _Model = class _Model extends import_sequelize.Model {
-  _changedWithAssociations = /* @__PURE__ */ new Set();
-  _previousDataValuesWithAssociations = {};
+  constructor() {
+    super(...arguments);
+    this._changedWithAssociations = /* @__PURE__ */ new Set();
+    this._previousDataValuesWithAssociations = {};
+  }
   get db() {
     return this.constructor.database;
   }
@@ -143,8 +144,6 @@ const _Model = class _Model extends import_sequelize.Model {
   }
 };
 __name(_Model, "Model");
-__publicField(_Model, "database");
-__publicField(_Model, "collection");
 let Model = _Model;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/options-parser.js

@@ -37,12 +37,6 @@ var import_sequelize = require("sequelize");
 var import_filter_parser = __toESM(require("./filter-parser"));
 const debug = require("debug")("noco-database");
 const _OptionsParser = class _OptionsParser {
-  options;
-  database;
-  collection;
-  model;
-  filterParser;
-  context;
   constructor(options, context) {
     const { collection } = context;
     this.collection = collection;

package/lib/query-interface/query-interface.js

@@ -26,7 +26,6 @@ const _QueryInterface = class _QueryInterface {
     this.db = db;
     this.sequelizeQueryInterface = db.sequelize.getQueryInterface();
   }
-  sequelizeQueryInterface;
   async dropAll(options) {
     if (options.drop !== true) return;
     const views = await this.listViews();

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

@@ -64,7 +64,6 @@ var __decorateElement = (array, flags, name, decorators, target, extra) => {
   }
   return k || __decoratorMetadata(array, target), desc && __defProp(target, name, desc), p ? k ^ 4 ? extra : desc : target;
 };
-var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 var __accessCheck = (obj, member, msg) => member.has(obj) || __typeError("Cannot " + msg);
 var __privateIn = (member, obj) => Object(obj) !== obj ? __typeError('Cannot use the "in" operator on this value') : member.has(obj);
 var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
@@ -90,15 +89,15 @@ _create_dec = [transaction()];
 const _RelationRepository = class _RelationRepository {
   constructor(sourceCollection, association, sourceKeyValue) {
     __runInitializers(_init, 5, this);
-    __publicField(this, "sourceCollection");
-    __publicField(this, "association");
-    __publicField(this, "targetModel");
-    __publicField(this, "targetCollection");
-    __publicField(this, "associationName");
-    __publicField(this, "associationField");
-    __publicField(this, "sourceKeyValue");
-    __publicField(this, "sourceInstance");
-    __publicField(this, "db");
+    this.sourceCollection = void 0;
+    this.association = void 0;
+    this.targetModel = void 0;
+    this.targetCollection = void 0;
+    this.associationName = void 0;
+    this.associationField = void 0;
+    this.sourceKeyValue = void 0;
+    this.sourceInstance = void 0;
+    this.db = void 0;
     this.db = sourceCollection.context.database;
     this.sourceCollection = sourceCollection;
     this.sourceKeyValue = sourceKeyValue;

package/lib/repository.js

@@ -64,7 +64,6 @@ var __decorateElement = (array, flags, name, decorators, target, extra) => {
   }
   return k || __decoratorMetadata(array, target), desc && __defProp(target, name, desc), p ? k ^ 4 ? extra : desc : target;
 };
-var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 var __accessCheck = (obj, member, msg) => member.has(obj) || __typeError("Cannot " + msg);
 var __privateIn = (member, obj) => Object(obj) !== obj ? __typeError('Cannot use the "in" operator on this value') : member.has(obj);
 var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
@@ -98,17 +97,14 @@ const transaction = (0, import_transaction_decorator.transactionWrapperBuilder)(
   return this.collection.model.sequelize.transaction();
 });
 const _RelationRepositoryBuilder = class _RelationRepositoryBuilder {
-  collection;
-  associationName;
-  association;
-  builderMap = {
-    HasOne: import_hasone_repository.HasOneRepository,
-    BelongsTo: import_belongs_to_repository.BelongsToRepository,
-    BelongsToMany: import_belongs_to_many_repository.BelongsToManyRepository,
-    HasMany: import_hasmany_repository.HasManyRepository,
-    ArrayField: import_array_field_repository.ArrayFieldRepository
-  };
   constructor(collection, associationName) {
+    this.builderMap = {
+      HasOne: import_hasone_repository.HasOneRepository,
+      BelongsTo: import_belongs_to_repository.BelongsToRepository,
+      BelongsToMany: import_belongs_to_many_repository.BelongsToManyRepository,
+      HasMany: import_hasmany_repository.HasManyRepository,
+      ArrayField: import_array_field_repository.ArrayFieldRepository
+    };
     this.collection = collection;
     this.associationName = associationName;
     this.association = this.collection.model.associations[this.associationName];
@@ -143,9 +139,9 @@ _create_dec = [transaction()], _createMany_dec = [transaction()], _update_dec =
 const _Repository = class _Repository {
   constructor(collection) {
     __runInitializers(_init, 5, this);
-    __publicField(this, "database");
-    __publicField(this, "collection");
-    __publicField(this, "model");
+    this.database = void 0;
+    this.collection = void 0;
+    this.model = void 0;
     this.database = collection.context.database;
     this.collection = collection;
     this.model = collection.model;

package/lib/sort-parser.d.ts

@@ -0,0 +1,11 @@
+import { ModelStatic } from 'sequelize';
+import { Model } from './model';
+type sortType = string[];
+export default class SortParser {
+    model: ModelStatic<Model>;
+    sort: string | string[];
+    constructor(sort: sortType, model: ModelStatic<Model>);
+    toSequelizeParams(): any;
+    getGroup(): string[];
+}
+export {};

package/lib/sort-parser.js

@@ -0,0 +1,135 @@
+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) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  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 sort_parser_exports = {};
+__export(sort_parser_exports, {
+  default: () => SortParser
+});
+module.exports = __toCommonJS(sort_parser_exports);
+var import_lodash = __toESM(require("lodash"));
+const debug = require("debug")("noco-database");
+const _SortParser = class _SortParser {
+  constructor(sort, model) {
+    this.model = model;
+    this.sort = sort;
+  }
+  toSequelizeParams() {
+    debug("sort %o", this.sort);
+    if (!this.sort) {
+      return {};
+    }
+    const model = this.model;
+    const include = {};
+    const associations = model.associations;
+    const group = this.getGroup();
+    debug("associations %O", associations);
+    for (const sort of group) {
+      const keys = sort.split(".");
+      const origins = [];
+      while (keys.length) {
+        const firstKey = keys.shift();
+        origins.push(firstKey);
+        if (!import_lodash.default.isNaN(parseInt(firstKey))) {
+          continue;
+        }
+        if (!associations[firstKey]) {
+          continue;
+        }
+        const associationKeys = [];
+        associationKeys.push(firstKey);
+        debug("associationKeys %o", associationKeys);
+        const existInclude = import_lodash.default.get(include, firstKey);
+        if (!existInclude) {
+          import_lodash.default.set(include, firstKey, {
+            association: firstKey,
+            attributes: []
+            // out put empty fields by default
+          });
+        }
+        let target = associations[firstKey].target;
+        debug("association target %o", target);
+        while (target) {
+          const attr = keys.shift();
+          origins.push(attr);
+          if (target.rawAttributes[attr]) {
+            associationKeys.push(target.rawAttributes[attr].field || attr);
+            target = null;
+          } else if (target.associations[attr]) {
+            associationKeys.push(attr);
+            const assoc = [];
+            associationKeys.forEach((associationKey, index) => {
+              if (index > 0) {
+                assoc.push("include");
+              }
+              assoc.push(associationKey);
+            });
+            const existInclude2 = import_lodash.default.get(include, assoc);
+            if (!existInclude2) {
+              import_lodash.default.set(include, assoc, {
+                association: attr,
+                attributes: []
+              });
+            }
+            target = target.associations[attr].target;
+          } else {
+            throw new Error(`${attr} neither ${firstKey}'s association nor ${firstKey}'s attribute`);
+          }
+        }
+        debug("associationKeys %o", associationKeys);
+      }
+    }
+    const toInclude = /* @__PURE__ */ __name((items) => {
+      return Object.values(items).map((item) => {
+        if (item.include) {
+          item.include = toInclude(item.include);
+        }
+        return item;
+      });
+    }, "toInclude");
+    debug("include %o", include);
+    const results = { include: toInclude(include), group };
+    const traverseInclude = /* @__PURE__ */ __name((include2) => {
+      for (const item of include2) {
+        if (item.include) {
+          traverseInclude(item.include);
+        }
+      }
+    }, "traverseInclude");
+    traverseInclude(results.include);
+    return results;
+  }
+  getGroup() {
+    if (!this.sort) {
+      return [];
+    }
+    let sortList = typeof this.sort === "string" ? [this.sort] : this.sort;
+    return sortList.filter((v) => v.includes(".")).map((v) => v.startsWith("-") ? v.substring(1) : v);
+  }
+};
+__name(_SortParser, "SortParser");
+let SortParser = _SortParser;

package/lib/sql-collection/sql-model.js

@@ -4,7 +4,6 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
   for (var name in all)
@@ -27,7 +26,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 var sql_model_exports = {};
 __export(sql_model_exports, {
   SQLModel: () => SQLModel
@@ -160,7 +158,6 @@ const _SQLModel = class _SQLModel extends import_model.Model {
   }
 };
 __name(_SQLModel, "SQLModel");
-__publicField(_SQLModel, "sql");
 let SQLModel = _SQLModel;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/sync-runner.js

@@ -28,12 +28,10 @@ var import_inherited_sync_runner = require("./inherited-sync-runner");
 const _SyncRunner = class _SyncRunner {
   constructor(model) {
     this.model = model;
+    this.tableDescMap = {};
     this.collection = model.collection;
     this.database = model.database;
   }
-  collection;
-  database;
-  tableDescMap = {};
   get tableName() {
     return this.model.getTableName();
   }

package/lib/update-guard.js

@@ -34,12 +34,6 @@ module.exports = __toCommonJS(update_guard_exports);
 var import_lodash = __toESM(require("lodash"));
 var import_model = require("./model");
 const _UpdateGuard = class _UpdateGuard {
-  model;
-  action;
-  underscored;
-  associationKeysToBeUpdate;
-  blackList;
-  whiteList;
   static fromOptions(model, options) {
     const guard = new _UpdateGuard();
     guard.setModel(model);

package/lib/value-parsers/base-value-parser.js

@@ -22,11 +22,8 @@ __export(base_value_parser_exports, {
 });
 module.exports = __toCommonJS(base_value_parser_exports);
 const _BaseValueParser = class _BaseValueParser {
-  ctx;
-  field;
-  value;
-  errors = [];
   constructor(field, ctx) {
+    this.errors = [];
     this.field = field;
     this.ctx = ctx;
     this.value = null;

package/lib/value-parsers/to-many-value-parser.js

@@ -24,10 +24,13 @@ module.exports = __toCommonJS(to_many_value_parser_exports);
 var import_path = require("path");
 var import_base_value_parser = require("./base-value-parser");
 const _ToManyValueParser = class _ToManyValueParser extends import_base_value_parser.BaseValueParser {
-  setAccessors = {
-    attachment: "setAttachments",
-    chinaRegion: "setChinaRegion"
-  };
+  constructor() {
+    super(...arguments);
+    this.setAccessors = {
+      attachment: "setAttachments",
+      chinaRegion: "setChinaRegion"
+    };
+  }
   async setAttachments(value) {
     this.value = this.toArr(value).map((url) => {
       return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tachybase/database",
-  "version": "0.23.40",
+  "version": "0.23.47",
   "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.40",
-    "@tachybase/utils": "0.23.40"
+    "@tachybase/logger": "0.23.47",
+    "@tachybase/utils": "0.23.47"
   },
   "devDependencies": {
     "@types/flat": "^5.0.5",