@nocobase/database 1.7.0-beta.8 → 1.7.0

package/lib/repository.js

@@ -70,6 +70,8 @@ var import_hasone_repository = require("./relation-repository/hasone-repository"
 var import_update_associations = require("./update-associations");
 var import_update_guard = require("./update-guard");
 var import_filter_utils = require("./utils/filter-utils");
+var import_lodash2 = __toESM(require("lodash"));
+var import_cursor_builder = require("./cursor-builder");
 var import_sequelize2 = require("sequelize");
 const debug = require("debug")("noco-database");
 const transaction = (0, import_transaction_decorator.transactionWrapperBuilder)(function() {
@@ -121,10 +123,12 @@ const _Repository = class _Repository {
   database;
   collection;
   model;
+  cursorBuilder;
   constructor(collection) {
     this.database = collection.context.database;
     this.collection = collection;
     this.model = collection.model;
+    this.cursorBuilder = new import_cursor_builder.SmartCursorBuilder(this.database.sequelize, this.model.tableName, this.collection);
   }
   /**
    * return count by filter
@@ -205,18 +209,25 @@ const _Repository = class _Repository {
     return await this.model.aggregate(field, method, queryOptions);
   }
   async chunk(options) {
-    const { chunkSize, callback, limit: overallLimit } = options;
+    const { chunkSize, callback, limit: overallLimit, beforeFind, afterFind } = options;
     const transaction2 = await this.getTransaction(options);
     let offset = 0;
     let totalProcessed = 0;
     while (true) {
       const currentLimit = overallLimit !== void 0 ? Math.min(chunkSize, overallLimit - totalProcessed) : chunkSize;
-      const rows = await this.find({
+      const findOptions = {
         ...options,
         limit: currentLimit,
         offset,
         transaction: transaction2
-      });
+      };
+      if (beforeFind) {
+        await beforeFind(findOptions);
+      }
+      const rows = await this.find(findOptions);
+      if (afterFind) {
+        await afterFind(rows, { ...findOptions, offset });
+      }
       if (rows.length === 0) {
         break;
       }
@@ -228,6 +239,21 @@ const _Repository = class _Repository {
       }
     }
   }
+  /**
+   * Cursor-based pagination query function.
+   * Ideal for large datasets (e.g., millions of rows)
+   * Note:
+   *  1. does not support jumping to arbitrary pages (e.g., "Page 5")
+   *  2. Requires a stable, indexed sort field (e.g. ID, createdAt)
+   *  3. If custom orderBy is used, it must match the cursor field(s) and direction, otherwise results may be incorrect or unstable.
+   * @param options
+   */
+  async chunkWithCursor(options) {
+    return await this.cursorBuilder.chunk({
+      ...options,
+      find: this.find.bind(this)
+    });
+  }
   /**
    * find
    * @param options
@@ -535,7 +561,7 @@ const _Repository = class _Repository {
     const parser = new import_options_parser.OptionsParser(options, {
       collection: this.collection
     });
-    const params = parser.toSequelizeParams();
+    const params = parser.toSequelizeParams({ parseSort: import_lodash2.default.isBoolean(options == null ? void 0 : options.parseSort) ? options.parseSort : true });
     debug("sequelize query params %o", params);
     if (options.where && params.where) {
       params.where = {

package/lib/view-collection.js

@@ -44,7 +44,7 @@ const _ViewCollection = class _ViewCollection extends import_collection.Collecti
     if (this.options.writableView) {
       return [];
     }
-    return ["create", "update", "destroy"];
+    return ["create", "update", "destroy", "importXlsx", "destroyMany", "updateMany"];
   }
   sequelizeModelOptions() {
     const modelOptions = super.sequelizeModelOptions();

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "1.7.0-beta.8",
+  "version": "1.7.0",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/logger": "1.7.0-beta.8",
-    "@nocobase/utils": "1.7.0-beta.8",
+    "@nocobase/logger": "1.7.0",
+    "@nocobase/utils": "1.7.0",
     "async-mutex": "^0.3.2",
     "chalk": "^4.1.1",
     "cron-parser": "4.4.0",
@@ -20,12 +20,12 @@
     "graphlib": "^2.1.8",
     "lodash": "^4.17.21",
     "mathjs": "^10.6.1",
-    "nanoid": "^3.3.6",
+    "nanoid": "^3.3.11",
     "node-fetch": "^2.6.7",
     "node-sql-parser": "^4.18.0",
     "qs": "^6.11.2",
     "safe-json-stringify": "^1.2.0",
-    "semver": "^7.3.7",
+    "semver": "^7.7.1",
     "sequelize": "^6.26.0",
     "umzug": "^3.1.1",
     "uuid": "^9.0.1"
@@ -38,5 +38,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/database"
   },
-  "gitHead": "9ad35ee90db98d95dfa660645d155f4f4e81b47c"
+  "gitHead": "767ae089e404a104d718962272289c0bec01803a"
 }