@etsoo/appscript 1.2.82 → 1.2.85

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';
@@ -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
@@ -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
      */
@@ -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
@@ -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

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/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';
@@ -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
@@ -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
      */
@@ -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
@@ -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

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/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.2.82",
+    "version": "1.2.85",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -73,6 +73,6 @@
         "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';
@@ -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
@@ -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
@@ -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];
@@ -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,

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[];