@etsoo/appscript 1.2.80 → 1.2.83

package/lib/cjs/app/CoreApp.d.ts

@@ -1,6 +1,6 @@
 import { INotifier, NotificationAlign, NotificationCallProps, NotificationContent, NotificationReturn } from '@etsoo/notificationbase';
 import { ApiDataError, IApi, IPData } from '@etsoo/restclient';
-import { DataTypes, DateUtils, IStorage } from '@etsoo/shared';
+import { DataTypes, DateUtils, IStorage, ListType, ListType1 } from '@etsoo/shared';
 import { AddressRegion } from '../address/AddressRegion';
 import { ProductUnit } from '../business/ProductUnit';
 import { InitCallDto } from '../dto/InitCallDto';
@@ -24,7 +24,7 @@ export declare type RefreshTokenResult = boolean | string | ApiDataError | IActi
 /**
  * Refresh token props
  */
-export interface RefreshTokenProps<D extends {}> {
+export interface RefreshTokenProps<D extends object> {
     /**
      * Callback
      */
@@ -269,7 +269,7 @@ export interface ICoreApp<U extends IUser, S extends IAppSettings, N, C extends
      * Get roles
      * @param role Combination role value
      */
-    getRoles(role: number): DataTypes.IdLabelItem[];
+    getRoles(role: number): ListType[];
     /**
      * Get status label
      * @param status Status value
@@ -279,7 +279,7 @@ export interface ICoreApp<U extends IUser, S extends IAppSettings, N, C extends
      * Get status list
      * @returns list
      */
-    getStatusList(): DataTypes.IdLabelItem[];
+    getStatusList(): ListType[];
     /**
      * Get refresh token from response headers
      * @param rawResponse Raw response from API call
@@ -337,7 +337,7 @@ export interface ICoreApp<U extends IUser, S extends IAppSettings, N, C extends
      * Refresh token
      * @param props Props
      */
-    refreshToken<D extends {} = {}>(props?: RefreshTokenProps<D>): Promise<boolean>;
+    refreshToken<D extends object = {}>(props?: RefreshTokenProps<D>): Promise<boolean>;
     /**
      * Signout
      */
@@ -348,7 +348,7 @@ export interface ICoreApp<U extends IUser, S extends IAppSettings, N, C extends
      * @param serviceId Service id
      * @returns Result
      */
-    orgList(items?: number, serviceId?: number): Promise<DataTypes.IdLabelItem[] | undefined>;
+    orgList(items?: number, serviceId?: number): Promise<ListType[] | undefined>;
     /**
      * Persist settings to source when application exit
      */
@@ -380,7 +380,7 @@ export interface ICoreApp<U extends IUser, S extends IAppSettings, N, C extends
      * UI get involved while refreshToken not intended
      * @param data Additional request data
      */
-    tryLogin<D extends {} = {}>(data?: D): Promise<boolean>;
+    tryLogin<D extends object = {}>(data?: D): Promise<boolean>;
     /**
      * User login
      * @param user User data
@@ -717,7 +717,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param filter Filter
      * @returns List
      */
-    protected getEnumList<E extends DataTypes.EnumBase = DataTypes.EnumBase>(em: E, prefix: string, filter?: (id: E[keyof E], key: keyof E & string) => E[keyof E] | undefined): DataTypes.IdLabelItem[];
+    protected getEnumList<E extends DataTypes.EnumBase = DataTypes.EnumBase>(em: E, prefix: string, filter?: (id: E[keyof E], key: keyof E & string) => E[keyof E] | undefined): ListType[];
     /**
      * Get enum item string id list
      * @param em Enum
@@ -725,7 +725,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param filter Filter
      * @returns List
      */
-    protected getEnumStrList<E extends DataTypes.EnumBase = DataTypes.EnumBase>(em: E, prefix: string, filter?: (id: E[keyof E], key: keyof E & string) => E[keyof E] | undefined): DataTypes.IdLabelItem<string>[];
+    protected getEnumStrList<E extends DataTypes.EnumBase = DataTypes.EnumBase>(em: E, prefix: string, filter?: (id: E[keyof E], key: keyof E & string) => E[keyof E] | undefined): ListType1[];
     /**
      * Get all regions
      * @returns Regions
@@ -735,12 +735,12 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * Get roles
      * @param role Combination role value
      */
-    getRoles(role: number): DataTypes.IdLabelItem<number>[];
+    getRoles(role: number): ListType[];
     /**
      * Get status list
      * @returns list
      */
-    getStatusList(): DataTypes.IdLabelItem<number>[];
+    getStatusList(): ListType[];
     /**
      * Get status label
      * @param status Status value
@@ -807,7 +807,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * Refresh token
      * @param props Props
      */
-    refreshToken<D extends {} = {}>(props?: RefreshTokenProps<D>): Promise<boolean>;
+    refreshToken<D extends object = {}>(props?: RefreshTokenProps<D>): Promise<boolean>;
     /**
      * Setup callback
      */
@@ -823,7 +823,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param serviceId Service id
      * @returns Result
      */
-    orgList(items?: number, serviceId?: number): Promise<DataTypes.IdLabelItem<number>[] | undefined>;
+    orgList(items?: number, serviceId?: number): Promise<ListType[] | undefined>;
     /**
      * Switch organization
      * @param id Organization id
@@ -847,7 +847,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param data Additional request data
      * @param showLoading Show loading bar or not during call
      */
-    tryLogin<D extends {} = {}>(_data?: D, _showLoading?: boolean): Promise<boolean>;
+    tryLogin<D extends object = {}>(_data?: D, _showLoading?: boolean): Promise<boolean>;
     /**
      * User login
      * @param user User data

package/lib/cjs/bridges/FlutterHost.d.ts

@@ -1,5 +1,6 @@
+import { DataTypes } from '@etsoo/shared';
 import { IBridgeHost } from './IBridgeHost';
-declare type CallHandlerType = (name: string, ...args: unknown[]) => PromiseLike<Record<string, unknown> | void>;
+declare type CallHandlerType = (name: string, ...args: unknown[]) => PromiseLike<DataTypes.StringRecord | void>;
 /**
  * Flutter JavaScript Host
  * https://inappwebview.dev/docs/javascript/communication/

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

@@ -1,4 +1,4 @@
-import { DataTypes } from '@etsoo/shared';
+import { DataTypes, ListType, ListType1 } from '@etsoo/shared';
 import { ICultureGet } from '../state/Culture';
 import { ProductUnit } from './ProductUnit';
 /**
@@ -19,14 +19,14 @@ export declare namespace BusinessUtils {
      * @param func Label delegate
      * @returns Collection
      */
-    function getCurrencies(currencyNames: string[], func: ICultureGet): DataTypes.IdLabelItem<string>[];
+    function getCurrencies(currencyNames: string[], func: ICultureGet): ListType1[];
     /**
      * Get 12-month items
      * @param monthLabels Month labels
      * @param startMonth Start month, 0 as Jan.
      * @returns 12 months
      */
-    function getMonths(monthLabels: string[], startMonth?: number): DataTypes.IdLabelItem<number>[];
+    function getMonths(monthLabels: string[], startMonth?: number): ListType[];
     /**
      * Get product unit's label
      * Please define the label in culture with key 'unitPC' for ProductUnit.PC like that
@@ -41,7 +41,7 @@ export declare namespace BusinessUtils {
      * @param func Label delegate
      * @returns Units
      */
-    function getUnits(func: ICultureGet): DataTypes.IdLabelItem[];
+    function getUnits(func: ICultureGet): ListType[];
     /**
      *
      * Get all product units
@@ -50,7 +50,7 @@ export declare namespace BusinessUtils {
      * @param isJoined Add the join label like 'per Kg' for Kg
      * @returns Units
      */
-    function getUnits(func: ICultureGet, options?: string[], isJoined?: boolean): DataTypes.IdLabelItem[];
+    function getUnits(func: ICultureGet, options?: string[], isJoined?: boolean): ListType[];
     /**
      *
      * Get all repeat options
@@ -59,7 +59,7 @@ export declare namespace BusinessUtils {
      * @param isJoined Add the join label like 'per Kg' for Kg
      * @returns Units
      */
-    function getRepeatOptions(func: ICultureGet, options?: string[], isJoined?: boolean): DataTypes.IdLabelItem[];
+    function getRepeatOptions(func: ICultureGet, options?: string[], isJoined?: boolean): ListType[];
     /**
      * Set id value
      * @param item QueryRQ or TiplistRQ or similiar item

package/lib/cjs/dto/IdLabelDto.d.ts

@@ -1,5 +1,5 @@
-import { DataTypes } from '@etsoo/shared';
+import { ListType, ListType1 } from '@etsoo/shared';
 /**
  * Conditional IdLabel type
  */
-export declare type IdLabelConditional<T extends boolean> = T extends true ? DataTypes.IdLabelItem<number>[] : DataTypes.IdLabelItem<string>[];
+export declare type IdLabelConditional<T extends boolean> = T extends true ? ListType[] : ListType1[];

package/lib/cjs/i18n/enUS.d.ts

@@ -4,4 +4,4 @@ import { DataTypes } from '@etsoo/shared';
  * @param localResources Local resources
  * @returns Full culture
  */
-export declare const enUS: (localResources: {}) => DataTypes.CultureDefinition;
+export declare const enUS: (localResources: object) => DataTypes.CultureDefinition;

package/lib/cjs/i18n/zhHK.d.ts

@@ -4,4 +4,4 @@ import { DataTypes } from '@etsoo/shared';
  * @param localResources Local resources
  * @returns Full culture
  */
-export declare const zhHK: (localResources: {}) => DataTypes.CultureDefinition;
+export declare const zhHK: (localResources: object) => DataTypes.CultureDefinition;

package/lib/cjs/result/ActionResult.d.ts

@@ -7,5 +7,5 @@ export declare class ActionResult {
      * Create a result from error
      * @returns Action result interface
      */
-    static create<D extends {} = {}>(error: Error): IActionResult<D>;
+    static create<D extends object = {}>(error: Error): IActionResult<D>;
 }

package/lib/cjs/result/IActionResult.d.ts

@@ -9,7 +9,7 @@ export interface IResultErrors {
 /**
  * Operation result interface
  */
-export interface IActionResult<D extends {} = {}> {
+export interface IActionResult<D extends object = {}> {
     /**
      * Status code
      */

package/lib/mjs/app/CoreApp.d.ts

@@ -1,6 +1,6 @@
 import { INotifier, NotificationAlign, NotificationCallProps, NotificationContent, NotificationReturn } from '@etsoo/notificationbase';
 import { ApiDataError, IApi, IPData } from '@etsoo/restclient';
-import { DataTypes, DateUtils, IStorage } from '@etsoo/shared';
+import { DataTypes, DateUtils, IStorage, ListType, ListType1 } from '@etsoo/shared';
 import { AddressRegion } from '../address/AddressRegion';
 import { ProductUnit } from '../business/ProductUnit';
 import { InitCallDto } from '../dto/InitCallDto';
@@ -24,7 +24,7 @@ export declare type RefreshTokenResult = boolean | string | ApiDataError | IActi
 /**
  * Refresh token props
  */
-export interface RefreshTokenProps<D extends {}> {
+export interface RefreshTokenProps<D extends object> {
     /**
      * Callback
      */
@@ -269,7 +269,7 @@ export interface ICoreApp<U extends IUser, S extends IAppSettings, N, C extends
      * Get roles
      * @param role Combination role value
      */
-    getRoles(role: number): DataTypes.IdLabelItem[];
+    getRoles(role: number): ListType[];
     /**
      * Get status label
      * @param status Status value
@@ -279,7 +279,7 @@ export interface ICoreApp<U extends IUser, S extends IAppSettings, N, C extends
      * Get status list
      * @returns list
      */
-    getStatusList(): DataTypes.IdLabelItem[];
+    getStatusList(): ListType[];
     /**
      * Get refresh token from response headers
      * @param rawResponse Raw response from API call
@@ -337,7 +337,7 @@ export interface ICoreApp<U extends IUser, S extends IAppSettings, N, C extends
      * Refresh token
      * @param props Props
      */
-    refreshToken<D extends {} = {}>(props?: RefreshTokenProps<D>): Promise<boolean>;
+    refreshToken<D extends object = {}>(props?: RefreshTokenProps<D>): Promise<boolean>;
     /**
      * Signout
      */
@@ -348,7 +348,7 @@ export interface ICoreApp<U extends IUser, S extends IAppSettings, N, C extends
      * @param serviceId Service id
      * @returns Result
      */
-    orgList(items?: number, serviceId?: number): Promise<DataTypes.IdLabelItem[] | undefined>;
+    orgList(items?: number, serviceId?: number): Promise<ListType[] | undefined>;
     /**
      * Persist settings to source when application exit
      */
@@ -380,7 +380,7 @@ export interface ICoreApp<U extends IUser, S extends IAppSettings, N, C extends
      * UI get involved while refreshToken not intended
      * @param data Additional request data
      */
-    tryLogin<D extends {} = {}>(data?: D): Promise<boolean>;
+    tryLogin<D extends object = {}>(data?: D): Promise<boolean>;
     /**
      * User login
      * @param user User data
@@ -717,7 +717,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param filter Filter
      * @returns List
      */
-    protected getEnumList<E extends DataTypes.EnumBase = DataTypes.EnumBase>(em: E, prefix: string, filter?: (id: E[keyof E], key: keyof E & string) => E[keyof E] | undefined): DataTypes.IdLabelItem[];
+    protected getEnumList<E extends DataTypes.EnumBase = DataTypes.EnumBase>(em: E, prefix: string, filter?: (id: E[keyof E], key: keyof E & string) => E[keyof E] | undefined): ListType[];
     /**
      * Get enum item string id list
      * @param em Enum
@@ -725,7 +725,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param filter Filter
      * @returns List
      */
-    protected getEnumStrList<E extends DataTypes.EnumBase = DataTypes.EnumBase>(em: E, prefix: string, filter?: (id: E[keyof E], key: keyof E & string) => E[keyof E] | undefined): DataTypes.IdLabelItem<string>[];
+    protected getEnumStrList<E extends DataTypes.EnumBase = DataTypes.EnumBase>(em: E, prefix: string, filter?: (id: E[keyof E], key: keyof E & string) => E[keyof E] | undefined): ListType1[];
     /**
      * Get all regions
      * @returns Regions
@@ -735,12 +735,12 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * Get roles
      * @param role Combination role value
      */
-    getRoles(role: number): DataTypes.IdLabelItem<number>[];
+    getRoles(role: number): ListType[];
     /**
      * Get status list
      * @returns list
      */
-    getStatusList(): DataTypes.IdLabelItem<number>[];
+    getStatusList(): ListType[];
     /**
      * Get status label
      * @param status Status value
@@ -807,7 +807,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * Refresh token
      * @param props Props
      */
-    refreshToken<D extends {} = {}>(props?: RefreshTokenProps<D>): Promise<boolean>;
+    refreshToken<D extends object = {}>(props?: RefreshTokenProps<D>): Promise<boolean>;
     /**
      * Setup callback
      */
@@ -823,7 +823,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param serviceId Service id
      * @returns Result
      */
-    orgList(items?: number, serviceId?: number): Promise<DataTypes.IdLabelItem<number>[] | undefined>;
+    orgList(items?: number, serviceId?: number): Promise<ListType[] | undefined>;
     /**
      * Switch organization
      * @param id Organization id
@@ -847,7 +847,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param data Additional request data
      * @param showLoading Show loading bar or not during call
      */
-    tryLogin<D extends {} = {}>(_data?: D, _showLoading?: boolean): Promise<boolean>;
+    tryLogin<D extends object = {}>(_data?: D, _showLoading?: boolean): Promise<boolean>;
     /**
      * User login
      * @param user User data

package/lib/mjs/bridges/FlutterHost.d.ts

@@ -1,5 +1,6 @@
+import { DataTypes } from '@etsoo/shared';
 import { IBridgeHost } from './IBridgeHost';
-declare type CallHandlerType = (name: string, ...args: unknown[]) => PromiseLike<Record<string, unknown> | void>;
+declare type CallHandlerType = (name: string, ...args: unknown[]) => PromiseLike<DataTypes.StringRecord | void>;
 /**
  * Flutter JavaScript Host
  * https://inappwebview.dev/docs/javascript/communication/

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

@@ -1,4 +1,4 @@
-import { DataTypes } from '@etsoo/shared';
+import { DataTypes, ListType, ListType1 } from '@etsoo/shared';
 import { ICultureGet } from '../state/Culture';
 import { ProductUnit } from './ProductUnit';
 /**
@@ -19,14 +19,14 @@ export declare namespace BusinessUtils {
      * @param func Label delegate
      * @returns Collection
      */
-    function getCurrencies(currencyNames: string[], func: ICultureGet): DataTypes.IdLabelItem<string>[];
+    function getCurrencies(currencyNames: string[], func: ICultureGet): ListType1[];
     /**
      * Get 12-month items
      * @param monthLabels Month labels
      * @param startMonth Start month, 0 as Jan.
      * @returns 12 months
      */
-    function getMonths(monthLabels: string[], startMonth?: number): DataTypes.IdLabelItem<number>[];
+    function getMonths(monthLabels: string[], startMonth?: number): ListType[];
     /**
      * Get product unit's label
      * Please define the label in culture with key 'unitPC' for ProductUnit.PC like that
@@ -41,7 +41,7 @@ export declare namespace BusinessUtils {
      * @param func Label delegate
      * @returns Units
      */
-    function getUnits(func: ICultureGet): DataTypes.IdLabelItem[];
+    function getUnits(func: ICultureGet): ListType[];
     /**
      *
      * Get all product units
@@ -50,7 +50,7 @@ export declare namespace BusinessUtils {
      * @param isJoined Add the join label like 'per Kg' for Kg
      * @returns Units
      */
-    function getUnits(func: ICultureGet, options?: string[], isJoined?: boolean): DataTypes.IdLabelItem[];
+    function getUnits(func: ICultureGet, options?: string[], isJoined?: boolean): ListType[];
     /**
      *
      * Get all repeat options
@@ -59,7 +59,7 @@ export declare namespace BusinessUtils {
      * @param isJoined Add the join label like 'per Kg' for Kg
      * @returns Units
      */
-    function getRepeatOptions(func: ICultureGet, options?: string[], isJoined?: boolean): DataTypes.IdLabelItem[];
+    function getRepeatOptions(func: ICultureGet, options?: string[], isJoined?: boolean): ListType[];
     /**
      * Set id value
      * @param item QueryRQ or TiplistRQ or similiar item

package/lib/mjs/dto/IdLabelDto.d.ts

@@ -1,5 +1,5 @@
-import { DataTypes } from '@etsoo/shared';
+import { ListType, ListType1 } from '@etsoo/shared';
 /**
  * Conditional IdLabel type
  */
-export declare type IdLabelConditional<T extends boolean> = T extends true ? DataTypes.IdLabelItem<number>[] : DataTypes.IdLabelItem<string>[];
+export declare type IdLabelConditional<T extends boolean> = T extends true ? ListType[] : ListType1[];

package/lib/mjs/i18n/enUS.d.ts

@@ -4,4 +4,4 @@ import { DataTypes } from '@etsoo/shared';
  * @param localResources Local resources
  * @returns Full culture
  */
-export declare const enUS: (localResources: {}) => DataTypes.CultureDefinition;
+export declare const enUS: (localResources: object) => DataTypes.CultureDefinition;

package/lib/mjs/i18n/zhHK.d.ts

@@ -4,4 +4,4 @@ import { DataTypes } from '@etsoo/shared';
  * @param localResources Local resources
  * @returns Full culture
  */
-export declare const zhHK: (localResources: {}) => DataTypes.CultureDefinition;
+export declare const zhHK: (localResources: object) => DataTypes.CultureDefinition;

package/lib/mjs/result/ActionResult.d.ts

@@ -7,5 +7,5 @@ export declare class ActionResult {
      * Create a result from error
      * @returns Action result interface
      */
-    static create<D extends {} = {}>(error: Error): IActionResult<D>;
+    static create<D extends object = {}>(error: Error): IActionResult<D>;
 }

package/lib/mjs/result/IActionResult.d.ts

@@ -9,7 +9,7 @@ export interface IResultErrors {
 /**
  * Operation result interface
  */
-export interface IActionResult<D extends {} = {}> {
+export interface IActionResult<D extends object = {}> {
     /**
      * Status code
      */

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.2.80",
+    "version": "1.2.83",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -52,9 +52,9 @@
     },
     "homepage": "https://github.com/ETSOO/AppScript#readme",
     "dependencies": {
-        "@etsoo/notificationbase": "^1.1.6",
-        "@etsoo/restclient": "^1.0.70",
-        "@etsoo/shared": "^1.1.46",
+        "@etsoo/notificationbase": "^1.1.7",
+        "@etsoo/restclient": "^1.0.71",
+        "@etsoo/shared": "^1.1.48",
         "@types/crypto-js": "^4.1.1",
         "crypto-js": "^4.1.1"
     },
@@ -64,15 +64,15 @@
         "@babel/plugin-transform-runtime": "^7.18.10",
         "@babel/preset-env": "^7.18.10",
         "@babel/runtime-corejs3": "^7.18.9",
-        "@types/jest": "^28.1.7",
-        "@typescript-eslint/eslint-plugin": "^5.34.0",
-        "@typescript-eslint/parser": "^5.34.0",
+        "@types/jest": "^28.1.8",
+        "@typescript-eslint/eslint-plugin": "^5.35.1",
+        "@typescript-eslint/parser": "^5.35.1",
         "eslint": "^8.22.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.26.0",
         "jest": "^28.1.3",
         "jest-environment-jsdom": "^28.1.3",
         "ts-jest": "^28.0.8",
-        "typescript": "^4.7.4"
+        "typescript": "^4.8.2"
     }
 }

package/src/app/CoreApp.ts

@@ -13,6 +13,8 @@ import {
     DateUtils,
     DomUtils,
     IStorage,
+    ListType,
+    ListType1,
     NumberUtils,
     Utils
 } from '@etsoo/shared';
@@ -62,7 +64,7 @@ export type RefreshTokenResult =
 /**
  * Refresh token props
  */
-export interface RefreshTokenProps<D extends {}> {
+export interface RefreshTokenProps<D extends object> {
     /**
      * Callback
      */
@@ -385,7 +387,7 @@ export interface ICoreApp<
      * Get roles
      * @param role Combination role value
      */
-    getRoles(role: number): DataTypes.IdLabelItem[];
+    getRoles(role: number): ListType[];
 
     /**
      * Get status label
@@ -397,7 +399,7 @@ export interface ICoreApp<
      * Get status list
      * @returns list
      */
-    getStatusList(): DataTypes.IdLabelItem[];
+    getStatusList(): ListType[];
 
     /**
      * Get refresh token from response headers
@@ -468,7 +470,7 @@ export interface ICoreApp<
      * Refresh token
      * @param props Props
      */
-    refreshToken<D extends {} = {}>(
+    refreshToken<D extends object = {}>(
         props?: RefreshTokenProps<D>
     ): Promise<boolean>;
 
@@ -486,7 +488,7 @@ export interface ICoreApp<
     orgList(
         items?: number,
         serviceId?: number
-    ): Promise<DataTypes.IdLabelItem[] | undefined>;
+    ): Promise<ListType[] | undefined>;
 
     /**
      * Persist settings to source when application exit
@@ -524,7 +526,7 @@ export interface ICoreApp<
      * UI get involved while refreshToken not intended
      * @param data Additional request data
      */
-    tryLogin<D extends {} = {}>(data?: D): Promise<boolean>;
+    tryLogin<D extends object = {}>(data?: D): Promise<boolean>;
 
     /**
      * User login
@@ -1620,8 +1622,8 @@ export abstract class CoreApp<
             id: E[keyof E],
             key: keyof E & string
         ) => E[keyof E] | undefined
-    ): DataTypes.IdLabelItem[] {
-        const list: DataTypes.IdLabelItem<number>[] = [];
+    ): ListType[] {
+        const list: ListType[] = [];
         const keys = DataTypes.getEnumKeys(em);
         for (const key of keys) {
             let id = em[key as keyof E];
@@ -1651,8 +1653,8 @@ export abstract class CoreApp<
             id: E[keyof E],
             key: keyof E & string
         ) => E[keyof E] | undefined
-    ): DataTypes.IdLabelItem<string>[] {
-        const list: DataTypes.IdLabelItem<string>[] = [];
+    ): ListType1[] {
+        const list: ListType1[] = [];
         const keys = DataTypes.getEnumKeys(em);
         for (const key of keys) {
             let id = em[key as keyof E];
@@ -1842,7 +1844,7 @@ export abstract class CoreApp<
      * Refresh token
      * @param props Props
      */
-    async refreshToken<D extends {} = {}>(props?: RefreshTokenProps<D>) {
+    async refreshToken<D extends object = {}>(props?: RefreshTokenProps<D>) {
         if (props && props.callback) props.callback(true, undefined);
         return true;
     }
@@ -1883,7 +1885,7 @@ export abstract class CoreApp<
      * @returns Result
      */
     async orgList(items?: number, serviceId?: number) {
-        return await this.api.post<DataTypes.IdLabelItem[]>(
+        return await this.api.post<ListType[]>(
             'Organization/List',
             {
                 items,
@@ -1951,7 +1953,7 @@ export abstract class CoreApp<
      * @param data Additional request data
      * @param showLoading Show loading bar or not during call
      */
-    async tryLogin<D extends {} = {}>(_data?: D, _showLoading?: boolean) {
+    async tryLogin<D extends object = {}>(_data?: D, _showLoading?: boolean) {
         if (this._isTryingLogin) return false;
         this._isTryingLogin = true;
         return true;

package/src/bridges/FlutterHost.ts

@@ -1,11 +1,11 @@
-import { ExtendUtils } from '@etsoo/shared';
+import { DataTypes, ExtendUtils } from '@etsoo/shared';
 import { IBridgeHost } from './IBridgeHost';
 
 // Call handler type
 type CallHandlerType = (
     name: string,
     ...args: unknown[]
-) => PromiseLike<Record<string, unknown> | void>;
+) => PromiseLike<DataTypes.StringRecord | void>;
 
 /**
  * Flutter JavaScript Host

package/src/business/BusinessUtils.ts

@@ -1,4 +1,4 @@
-import { DataTypes } from '@etsoo/shared';
+import { DataTypes, ListType, ListType1 } from '@etsoo/shared';
 import { ICultureGet } from '../state/Culture';
 import { ProductUnit } from './ProductUnit';
 import { RepeatOption } from './RepeatOption';
@@ -55,7 +55,7 @@ export namespace BusinessUtils {
     export function getCurrencies(
         currencyNames: string[],
         func: ICultureGet
-    ): DataTypes.IdLabelItem<string>[] {
+    ): ListType1[] {
         return currencyNames.map((name) => ({
             id: name,
             label: func(`currency${name}`) ?? name
@@ -69,7 +69,7 @@ export namespace BusinessUtils {
      * @returns 12 months
      */
     export function getMonths(monthLabels: string[], startMonth: number = 0) {
-        const months: DataTypes.IdLabelItem[] = [];
+        const months: ListType[] = [];
 
         for (let i = 0; i < 12; i++) {
             if (startMonth >= 12) startMonth = 0;
@@ -109,7 +109,7 @@ export namespace BusinessUtils {
      * @param func Label delegate
      * @returns Units
      */
-    export function getUnits(func: ICultureGet): DataTypes.IdLabelItem[];
+    export function getUnits(func: ICultureGet): ListType[];
 
     /**
      *
@@ -123,7 +123,7 @@ export namespace BusinessUtils {
         func: ICultureGet,
         options?: string[],
         isJoined?: boolean
-    ): DataTypes.IdLabelItem[];
+    ): ListType[];
 
     /**
      *
@@ -137,7 +137,7 @@ export namespace BusinessUtils {
         func: ICultureGet,
         options?: string[],
         isJoined?: boolean
-    ): DataTypes.IdLabelItem[] {
+    ): ListType[] {
         options ??= DataTypes.getEnumKeys(ProductUnit);
         return options.map((key) => {
             const id = DataTypes.getEnumByKey(ProductUnit, key)! as number;
@@ -160,7 +160,7 @@ export namespace BusinessUtils {
         func: ICultureGet,
         options?: string[],
         isJoined: boolean = true
-    ): DataTypes.IdLabelItem[] {
+    ): ListType[] {
         options ??= DataTypes.getEnumKeys(RepeatOption);
         isJoined ??= true;
 

package/src/dto/IdLabelDto.ts

@@ -1,8 +1,8 @@
-import { DataTypes } from '@etsoo/shared';
+import { ListType, ListType1 } from '@etsoo/shared';
 
 /**
  * Conditional IdLabel type
  */
 export type IdLabelConditional<T extends boolean> = T extends true
-    ? DataTypes.IdLabelItem<number>[]
-    : DataTypes.IdLabelItem<string>[];
+    ? ListType[]
+    : ListType1[];

package/src/i18n/enUS.ts

@@ -6,7 +6,7 @@ import enUSResources from './en-US.json';
  * @param localResources Local resources
  * @returns Full culture
  */
-export const enUS = (localResources: {}): DataTypes.CultureDefinition => ({
+export const enUS = (localResources: object): DataTypes.CultureDefinition => ({
     name: 'en-US',
     label: 'English',
     resources: { ...enUSResources, ...localResources },

package/src/i18n/zhHK.ts

@@ -6,7 +6,7 @@ import zhHKResources from './zh-HK.json';
  * @param localResources Local resources
  * @returns Full culture
  */
-export const zhHK = (localResources: {}): DataTypes.CultureDefinition => ({
+export const zhHK = (localResources: object): DataTypes.CultureDefinition => ({
     name: 'zh-HK',
     label: '繁體中文',
     resources: { ...zhHKResources, ...localResources },

package/src/result/ActionResult.ts

@@ -9,7 +9,7 @@ export class ActionResult {
      * Create a result from error
      * @returns Action result interface
      */
-    static create<D extends {} = {}>(error: Error) {
+    static create<D extends object = {}>(error: Error) {
         // If the error is ApiError, hold the status
         const status = error instanceof ApiError ? error.status : undefined;
 

package/src/result/IActionResult.ts

@@ -11,7 +11,7 @@ export interface IResultErrors {
 /**
  * Operation result interface
  */
-export interface IActionResult<D extends {} = {}> {
+export interface IActionResult<D extends object = {}> {
     /**
      * Status code
      */