@etsoo/appscript 1.6.36 → 1.6.38

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
@@ -38,11 +39,7 @@ class EntityApi extends BaseApi_1.BaseApi {
      * @returns Result
      */
     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`, BusinessUtils_1.BusinessUtils.formatQuery(rq), payload);
     }
     /**
      * Merge
@@ -61,7 +58,7 @@ class EntityApi extends BaseApi_1.BaseApi {
      * @returns Result
      */
     queryBase(rq, payload, queryKey = "") {
-        return this.api.post(`${this.flag}/Query${queryKey}`, rq, payload);
+        return this.api.post(`${this.flag}/Query${queryKey}`, BusinessUtils_1.BusinessUtils.formatQuery(rq), payload);
     }
     /**
      * Query favored country ids

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

@@ -1,5 +1,7 @@
-import { DataTypes, ListType } from "@etsoo/shared";
+import { DataTypes, IdType, ListType } from "@etsoo/shared";
 import { CustomCultureData } from "../def/CustomCulture";
+import { QueryPagingData } from "../api/rq/QueryPagingData";
+import { QueryRQ } from "../api/rq/QueryRQ";
 /**
  * Business utils
  */
@@ -12,6 +14,18 @@ export declare namespace BusinessUtils {
      * @returns Result
      */
     function formatAvatarTitle(title?: string, maxChars?: number, defaultTitle?: string): string;
+    /**
+     * Format query, dealing with paging data
+     * @param rq Query
+     * @returns Result
+     */
+    function formatQuery<T extends IdType>(rq: QueryRQ<T>): {
+        id?: T | undefined;
+        ids?: T[] | undefined;
+        excludedIds?: T[] | undefined;
+        keyword?: string;
+        queryPaging: QueryPagingData | undefined;
+    };
     /**
      * Get 12-month items
      * @param monthLabels Month labels

package/lib/cjs/business/BusinessUtils.js

@@ -39,6 +39,19 @@ var BusinessUtils;
         return defaultTitle;
     }
     BusinessUtils.formatAvatarTitle = formatAvatarTitle;
+    /**
+     * Format query, dealing with paging data
+     * @param rq Query
+     * @returns Result
+     */
+    function formatQuery(rq) {
+        let { queryPaging, ...rest } = rq;
+        if (typeof queryPaging === "number") {
+            queryPaging = { currentPage: 0, batchSize: queryPaging };
+        }
+        return { queryPaging, ...rest };
+    }
+    BusinessUtils.formatQuery = formatQuery;
     /**
      * 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
@@ -35,11 +36,7 @@ export class EntityApi extends BaseApi {
      * @returns Result
      */
     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`, BusinessUtils.formatQuery(rq), payload);
     }
     /**
      * Merge
@@ -58,7 +55,7 @@ export class EntityApi extends BaseApi {
      * @returns Result
      */
     queryBase(rq, payload, queryKey = "") {
-        return this.api.post(`${this.flag}/Query${queryKey}`, rq, payload);
+        return this.api.post(`${this.flag}/Query${queryKey}`, BusinessUtils.formatQuery(rq), payload);
     }
     /**
      * Query favored country ids

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

@@ -1,5 +1,7 @@
-import { DataTypes, ListType } from "@etsoo/shared";
+import { DataTypes, IdType, ListType } from "@etsoo/shared";
 import { CustomCultureData } from "../def/CustomCulture";
+import { QueryPagingData } from "../api/rq/QueryPagingData";
+import { QueryRQ } from "../api/rq/QueryRQ";
 /**
  * Business utils
  */
@@ -12,6 +14,18 @@ export declare namespace BusinessUtils {
      * @returns Result
      */
     function formatAvatarTitle(title?: string, maxChars?: number, defaultTitle?: string): string;
+    /**
+     * Format query, dealing with paging data
+     * @param rq Query
+     * @returns Result
+     */
+    function formatQuery<T extends IdType>(rq: QueryRQ<T>): {
+        id?: T | undefined;
+        ids?: T[] | undefined;
+        excludedIds?: T[] | undefined;
+        keyword?: string;
+        queryPaging: QueryPagingData | undefined;
+    };
     /**
      * Get 12-month items
      * @param monthLabels Month labels

package/lib/mjs/business/BusinessUtils.js

@@ -36,6 +36,19 @@ export var BusinessUtils;
         return defaultTitle;
     }
     BusinessUtils.formatAvatarTitle = formatAvatarTitle;
+    /**
+     * Format query, dealing with paging data
+     * @param rq Query
+     * @returns Result
+     */
+    function formatQuery(rq) {
+        let { queryPaging, ...rest } = rq;
+        if (typeof queryPaging === "number") {
+            queryPaging = { currentPage: 0, batchSize: queryPaging };
+        }
+        return { queryPaging, ...rest };
+    }
+    BusinessUtils.formatQuery = formatQuery;
     /**
      * Get 12-month items
      * @param monthLabels Month labels

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/appscript",
-  "version": "1.6.36",
+  "version": "1.6.38",
   "description": "Applications shared TypeScript framework",
   "main": "lib/cjs/index.js",
   "module": "lib/mjs/index.js",
@@ -42,14 +42,14 @@
   },
   "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.5.0",
+    "@vitejs/plugin-react": "^4.5.1",
     "jsdom": "^26.1.0",
     "typescript": "^5.8.3",
-    "vitest": "^3.1.4"
+    "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
@@ -66,13 +67,9 @@ export class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
     rq: RQ,
     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 },
+      BusinessUtils.formatQuery(rq),
       payload
     );
   }
@@ -102,7 +99,11 @@ 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);
+    return this.api.post(
+      `${this.flag}/Query${queryKey}`,
+      BusinessUtils.formatQuery(rq),
+      payload
+    );
   }
 
   /**

package/src/business/BusinessUtils.ts

@@ -1,5 +1,7 @@
-import { DataTypes, ListType } from "@etsoo/shared";
+import { DataTypes, IdType, ListType } from "@etsoo/shared";
 import { CustomCultureData } from "../def/CustomCulture";
+import { QueryPagingData } from "../api/rq/QueryPagingData";
+import { QueryRQ } from "../api/rq/QueryRQ";
 
 /**
  * Business utils
@@ -46,6 +48,19 @@ export namespace BusinessUtils {
     return defaultTitle;
   }
 
+  /**
+   * Format query, dealing with paging data
+   * @param rq Query
+   * @returns Result
+   */
+  export function formatQuery<T extends IdType>(rq: QueryRQ<T>) {
+    let { queryPaging, ...rest } = rq;
+    if (typeof queryPaging === "number") {
+      queryPaging = { currentPage: 0, batchSize: queryPaging };
+    }
+    return { queryPaging, ...rest };
+  }
+
   /**
    * Get 12-month items
    * @param monthLabels Month labels