@etsoo/appscript 1.6.35 → 1.6.37

package/__tests__/app/CoreApp.ts

@@ -1,5 +1,5 @@
 import { ApiDataError, ApiMethod } from "@etsoo/restclient";
-import { DataTypes, IActionResult } from "@etsoo/shared";
+import { DataTypes, ExtendUtils, IActionResult } from "@etsoo/shared";
 import {
   EntityStatus,
   ExternalEndpoint,
@@ -19,6 +19,10 @@ function EnhanceApp<TBase extends DataTypes.MConstructor<TestApp>>(
 const appClass = EnhanceApp(TestApp);
 const app = new appClass();
 
+// First make sure the default culture (here is 'en') is loaded
+await ExtendUtils.sleep(50);
+
+// Then change the culture to the first one (here is 'zh-CN')
 await app.changeCulture(app.settings.cultures[0]);
 
 test("Test for domain substitution", () => {

package/lib/cjs/api/EntityApi.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EntityApi = void 0;
 const BaseApi_1 = require("./BaseApi");
+const BusinessUtils_1 = require("../business/BusinessUtils");
 /**
  * Entity API
  * Follow com.etsoo.CoreFramework.Services.EntityServiceBase
@@ -39,10 +40,7 @@ class EntityApi extends BaseApi_1.BaseApi {
      */
     listBase(rq, payload) {
         let { queryPaging, ...rest } = rq;
-        if (typeof queryPaging === "number") {
-            queryPaging = { currentPage: 0, batchSize: queryPaging };
-        }
-        return this.api.post(`${this.flag}/List`, { queryPaging, ...rest }, payload);
+        return this.api.post(`${this.flag}/List`, { queryPaging: BusinessUtils_1.BusinessUtils.formatQueryPaging(queryPaging), ...rest }, payload);
     }
     /**
      * Merge
@@ -61,7 +59,8 @@ class EntityApi extends BaseApi_1.BaseApi {
      * @returns Result
      */
     queryBase(rq, payload, queryKey = "") {
-        return this.api.post(`${this.flag}/Query${queryKey}`, rq, payload);
+        let { queryPaging, ...rest } = rq;
+        return this.api.post(`${this.flag}/Query${queryKey}`, { queryPaging: BusinessUtils_1.BusinessUtils.formatQueryPaging(queryPaging), ...rest }, payload);
     }
     /**
      * Query favored country ids

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

@@ -1,5 +1,6 @@
 import { DataTypes, ListType } from "@etsoo/shared";
 import { CustomCultureData } from "../def/CustomCulture";
+import { QueryPagingData } from "../api/rq/QueryPagingData";
 /**
  * Business utils
  */
@@ -12,6 +13,12 @@ export declare namespace BusinessUtils {
      * @returns Result
      */
     function formatAvatarTitle(title?: string, maxChars?: number, defaultTitle?: string): string;
+    /**
+     * Format query paging data
+     * @param query Query paging data or batch size
+     * @returns Result
+     */
+    function formatQueryPaging(query: QueryPagingData | number | undefined): QueryPagingData | undefined;
     /**
      * Get 12-month items
      * @param monthLabels Month labels

package/lib/cjs/business/BusinessUtils.js

@@ -39,6 +39,18 @@ var BusinessUtils;
         return defaultTitle;
     }
     BusinessUtils.formatAvatarTitle = formatAvatarTitle;
+    /**
+     * Format query paging data
+     * @param query Query paging data or batch size
+     * @returns Result
+     */
+    function formatQueryPaging(query) {
+        if (typeof query === "number") {
+            query = { currentPage: 0, batchSize: query };
+        }
+        return query;
+    }
+    BusinessUtils.formatQueryPaging = formatQueryPaging;
     /**
      * Get 12-month items
      * @param monthLabels Month labels

package/lib/mjs/api/EntityApi.js

@@ -1,4 +1,5 @@
 import { BaseApi } from "./BaseApi";
+import { BusinessUtils } from "../business/BusinessUtils";
 /**
  * Entity API
  * Follow com.etsoo.CoreFramework.Services.EntityServiceBase
@@ -36,10 +37,7 @@ export class EntityApi extends BaseApi {
      */
     listBase(rq, payload) {
         let { queryPaging, ...rest } = rq;
-        if (typeof queryPaging === "number") {
-            queryPaging = { currentPage: 0, batchSize: queryPaging };
-        }
-        return this.api.post(`${this.flag}/List`, { queryPaging, ...rest }, payload);
+        return this.api.post(`${this.flag}/List`, { queryPaging: BusinessUtils.formatQueryPaging(queryPaging), ...rest }, payload);
     }
     /**
      * Merge
@@ -58,7 +56,8 @@ export class EntityApi extends BaseApi {
      * @returns Result
      */
     queryBase(rq, payload, queryKey = "") {
-        return this.api.post(`${this.flag}/Query${queryKey}`, rq, payload);
+        let { queryPaging, ...rest } = rq;
+        return this.api.post(`${this.flag}/Query${queryKey}`, { queryPaging: BusinessUtils.formatQueryPaging(queryPaging), ...rest }, payload);
     }
     /**
      * Query favored country ids

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

@@ -1,5 +1,6 @@
 import { DataTypes, ListType } from "@etsoo/shared";
 import { CustomCultureData } from "../def/CustomCulture";
+import { QueryPagingData } from "../api/rq/QueryPagingData";
 /**
  * Business utils
  */
@@ -12,6 +13,12 @@ export declare namespace BusinessUtils {
      * @returns Result
      */
     function formatAvatarTitle(title?: string, maxChars?: number, defaultTitle?: string): string;
+    /**
+     * Format query paging data
+     * @param query Query paging data or batch size
+     * @returns Result
+     */
+    function formatQueryPaging(query: QueryPagingData | number | undefined): QueryPagingData | undefined;
     /**
      * Get 12-month items
      * @param monthLabels Month labels

package/lib/mjs/business/BusinessUtils.js

@@ -36,6 +36,18 @@ export var BusinessUtils;
         return defaultTitle;
     }
     BusinessUtils.formatAvatarTitle = formatAvatarTitle;
+    /**
+     * Format query paging data
+     * @param query Query paging data or batch size
+     * @returns Result
+     */
+    function formatQueryPaging(query) {
+        if (typeof query === "number") {
+            query = { currentPage: 0, batchSize: query };
+        }
+        return query;
+    }
+    BusinessUtils.formatQueryPaging = formatQueryPaging;
     /**
      * Get 12-month items
      * @param monthLabels Month labels

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/appscript",
-  "version": "1.6.35",
+  "version": "1.6.37",
   "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.61",
-    "@etsoo/restclient": "^1.1.28",
-    "@etsoo/shared": "^1.2.72",
+    "@etsoo/notificationbase": "^1.1.62",
+    "@etsoo/restclient": "^1.1.29",
+    "@etsoo/shared": "^1.2.74",
     "crypto-js": "^4.2.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.27.2",
-    "@babel/core": "^7.27.1",
-    "@babel/plugin-transform-runtime": "^7.27.1",
+    "@babel/core": "^7.27.4",
+    "@babel/plugin-transform-runtime": "^7.27.4",
     "@babel/preset-env": "^7.27.2",
-    "@babel/runtime-corejs3": "^7.27.1",
+    "@babel/runtime-corejs3": "^7.27.6",
     "@types/crypto-js": "^4.2.2",
-    "@vitejs/plugin-react": "^4.4.1",
+    "@vitejs/plugin-react": "^4.5.1",
     "jsdom": "^26.1.0",
     "typescript": "^5.8.3",
-    "vitest": "^3.1.3"
+    "vitest": "^3.2.2"
   }
 }

package/src/api/EntityApi.ts

@@ -6,6 +6,7 @@ import { ResultPayload } from "./dto/ResultPayload";
 import { MergeRQ } from "./rq/MergeRQ";
 import { QueryRQ } from "./rq/QueryRQ";
 import { UpdateStatusRQ } from "./rq/UpdateStatusRQ";
+import { BusinessUtils } from "../business/BusinessUtils";
 /**
  * Entity API
  * Follow com.etsoo.CoreFramework.Services.EntityServiceBase
@@ -67,12 +68,9 @@ export class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
     payload?: IApiPayload<R[]>
   ) {
     let { queryPaging, ...rest } = rq;
-    if (typeof queryPaging === "number") {
-      queryPaging = { currentPage: 0, batchSize: queryPaging };
-    }
     return this.api.post(
       `${this.flag}/List`,
-      { queryPaging, ...rest },
+      { queryPaging: BusinessUtils.formatQueryPaging(queryPaging), ...rest },
       payload
     );
   }
@@ -102,7 +100,12 @@ export class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
     RQ extends QueryRQ<T>,
     R extends object
   >(rq: RQ, payload?: IApiPayload<R[]>, queryKey: string = "") {
-    return this.api.post(`${this.flag}/Query${queryKey}`, rq, payload);
+    let { queryPaging, ...rest } = rq;
+    return this.api.post(
+      `${this.flag}/Query${queryKey}`,
+      { queryPaging: BusinessUtils.formatQueryPaging(queryPaging), ...rest },
+      payload
+    );
   }
 
   /**

package/src/business/BusinessUtils.ts

@@ -1,5 +1,6 @@
 import { DataTypes, ListType } from "@etsoo/shared";
 import { CustomCultureData } from "../def/CustomCulture";
+import { QueryPagingData } from "../api/rq/QueryPagingData";
 
 /**
  * Business utils
@@ -46,6 +47,20 @@ export namespace BusinessUtils {
     return defaultTitle;
   }
 
+  /**
+   * Format query paging data
+   * @param query Query paging data or batch size
+   * @returns Result
+   */
+  export function formatQueryPaging(
+    query: QueryPagingData | number | undefined
+  ) {
+    if (typeof query === "number") {
+      query = { currentPage: 0, batchSize: query };
+    }
+    return query;
+  }
+
   /**
    * Get 12-month items
    * @param monthLabels Month labels