@etsoo/appscript 1.6.43 → 1.6.45

package/lib/cjs/business/BusinessUtils.d.ts

@@ -50,4 +50,12 @@ export declare namespace BusinessUtils {
      * @param target Target collection to restore resources to, null to clear cache
      */
     function restoreResources(target?: DataTypes.StringRecord): void;
+    /**
+     * Setup paging keysets
+     * @param data Paging data
+     * @param lastItem Last item of the query
+     * @param idField Id field in data
+     * @param fields Fields map
+     */
+    function setupPagingKeysets<T, K extends IdType = number>(data: QueryRQ<K>, lastItem: T | undefined, idField: keyof T & string, fields?: Record<string, string | null | undefined>): QueryRQ<K>;
 }

package/lib/cjs/business/BusinessUtils.js

@@ -123,4 +123,38 @@ var BusinessUtils;
         }
     }
     BusinessUtils.restoreResources = restoreResources;
+    /**
+     * Setup paging keysets
+     * @param data Paging data
+     * @param lastItem Last item of the query
+     * @param idField Id field in data
+     * @param fields Fields map
+     */
+    function setupPagingKeysets(data, lastItem, idField, fields) {
+        var _a;
+        // If the id field is not set for ordering, add it with descending
+        if (typeof data.queryPaging === "object") {
+            const orderBy = ((_a = data.queryPaging).orderBy ?? (_a.orderBy = []));
+            const idUpper = idField.toUpperCase();
+            if (!orderBy.find((o) => o.field.toUpperCase() === idUpper)) {
+                orderBy.push({ field: idField, desc: true, unique: true });
+            }
+            // Format order fields, like 'name' to 'Contact.Name' when 'Contact' is a reference table name in Entity Framework
+            if (fields) {
+                data.queryPaging.orderBy?.forEach((f) => {
+                    f.field = fields[f.field] ?? f.field;
+                });
+            }
+            // Set the paging keysets
+            if (lastItem) {
+                const keysets = orderBy.map((o) => Reflect.get(lastItem, o.field));
+                data.queryPaging.keysets = keysets;
+            }
+            else {
+                data.queryPaging.keysets = undefined;
+            }
+        }
+        return data;
+    }
+    BusinessUtils.setupPagingKeysets = setupPagingKeysets;
 })(BusinessUtils || (exports.BusinessUtils = BusinessUtils = {}));

package/lib/mjs/business/BusinessUtils.d.ts

@@ -50,4 +50,12 @@ export declare namespace BusinessUtils {
      * @param target Target collection to restore resources to, null to clear cache
      */
     function restoreResources(target?: DataTypes.StringRecord): void;
+    /**
+     * Setup paging keysets
+     * @param data Paging data
+     * @param lastItem Last item of the query
+     * @param idField Id field in data
+     * @param fields Fields map
+     */
+    function setupPagingKeysets<T, K extends IdType = number>(data: QueryRQ<K>, lastItem: T | undefined, idField: keyof T & string, fields?: Record<string, string | null | undefined>): QueryRQ<K>;
 }

package/lib/mjs/business/BusinessUtils.js

@@ -120,4 +120,38 @@ export var BusinessUtils;
         }
     }
     BusinessUtils.restoreResources = restoreResources;
+    /**
+     * Setup paging keysets
+     * @param data Paging data
+     * @param lastItem Last item of the query
+     * @param idField Id field in data
+     * @param fields Fields map
+     */
+    function setupPagingKeysets(data, lastItem, idField, fields) {
+        var _a;
+        // If the id field is not set for ordering, add it with descending
+        if (typeof data.queryPaging === "object") {
+            const orderBy = ((_a = data.queryPaging).orderBy ?? (_a.orderBy = []));
+            const idUpper = idField.toUpperCase();
+            if (!orderBy.find((o) => o.field.toUpperCase() === idUpper)) {
+                orderBy.push({ field: idField, desc: true, unique: true });
+            }
+            // Format order fields, like 'name' to 'Contact.Name' when 'Contact' is a reference table name in Entity Framework
+            if (fields) {
+                data.queryPaging.orderBy?.forEach((f) => {
+                    f.field = fields[f.field] ?? f.field;
+                });
+            }
+            // Set the paging keysets
+            if (lastItem) {
+                const keysets = orderBy.map((o) => Reflect.get(lastItem, o.field));
+                data.queryPaging.keysets = keysets;
+            }
+            else {
+                data.queryPaging.keysets = undefined;
+            }
+        }
+        return data;
+    }
+    BusinessUtils.setupPagingKeysets = setupPagingKeysets;
 })(BusinessUtils || (BusinessUtils = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/appscript",
-  "version": "1.6.43",
+  "version": "1.6.45",
   "description": "Applications shared TypeScript framework",
   "main": "lib/cjs/index.js",
   "module": "lib/mjs/index.js",
@@ -35,21 +35,21 @@
   },
   "homepage": "https://github.com/ETSOO/AppScript#readme",
   "dependencies": {
-    "@etsoo/notificationbase": "^1.1.63",
-    "@etsoo/restclient": "^1.1.30",
-    "@etsoo/shared": "^1.2.75",
+    "@etsoo/notificationbase": "^1.1.64",
+    "@etsoo/restclient": "^1.1.31",
+    "@etsoo/shared": "^1.2.76",
     "crypto-js": "^4.2.0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.28.0",
-    "@babel/core": "^7.28.0",
-    "@babel/plugin-transform-runtime": "^7.28.0",
-    "@babel/preset-env": "^7.28.0",
-    "@babel/runtime-corejs3": "^7.28.0",
+    "@babel/cli": "^7.28.3",
+    "@babel/core": "^7.28.4",
+    "@babel/plugin-transform-runtime": "^7.28.3",
+    "@babel/preset-env": "^7.28.3",
+    "@babel/runtime-corejs3": "^7.28.4",
     "@types/crypto-js": "^4.2.2",
-    "@vitejs/plugin-react": "^4.6.0",
-    "jsdom": "^26.1.0",
-    "typescript": "^5.8.3",
+    "@vitejs/plugin-react": "^5.0.2",
+    "jsdom": "^27.0.0",
+    "typescript": "^5.9.2",
     "vitest": "^3.2.4"
   }
 }

package/src/business/BusinessUtils.ts

@@ -142,4 +142,44 @@ export namespace BusinessUtils {
       target[key] = resourcesCache[key];
     }
   }
+
+  /**
+   * Setup paging keysets
+   * @param data Paging data
+   * @param lastItem Last item of the query
+   * @param idField Id field in data
+   * @param fields Fields map
+   */
+  export function setupPagingKeysets<T, K extends IdType = number>(
+    data: QueryRQ<K>,
+    lastItem: T | undefined,
+    idField: keyof T & string,
+    fields?: Record<string, string | null | undefined>
+  ) {
+    // If the id field is not set for ordering, add it with descending
+    if (typeof data.queryPaging === "object") {
+      const orderBy = (data.queryPaging.orderBy ??= []);
+      const idUpper = idField.toUpperCase();
+      if (!orderBy.find((o) => o.field.toUpperCase() === idUpper)) {
+        orderBy.push({ field: idField, desc: true, unique: true });
+      }
+
+      // Format order fields, like 'name' to 'Contact.Name' when 'Contact' is a reference table name in Entity Framework
+      if (fields) {
+        data.queryPaging.orderBy?.forEach((f) => {
+          f.field = fields[f.field] ?? f.field;
+        });
+      }
+
+      // Set the paging keysets
+      if (lastItem) {
+        const keysets = orderBy.map((o) => Reflect.get(lastItem, o.field));
+        data.queryPaging.keysets = keysets;
+      } else {
+        data.queryPaging.keysets = undefined;
+      }
+    }
+
+    return data;
+  }
 }