@etsoo/shared 1.2.19 → 1.2.21

package/lib/cjs/DataTypes.d.ts

@@ -133,10 +133,6 @@ export declare namespace DataTypes {
      * Placement type
      */
     type Placement = keyof typeof PlacementEnum;
-    /**
-     * Number and string combination id type
-     */
-    type IdType = number | string;
     /**
      * Add and edit data type
      * ChangedFields for editing case
@@ -240,7 +236,7 @@ export declare namespace DataTypes {
     /**
      * Get specific type keys
      */
-    type Keys<T extends object, R = string | number> = {
+    type Keys<T extends object, R = IdType> = {
         [k in keyof T]: T[k] extends R ? k : never;
     }[keyof T];
     /**
@@ -343,6 +339,18 @@ export declare namespace DataTypes {
      * @returns Keys
      */
     function getEnumKeys<T extends EnumBase, K extends keyof T & string>(input: T): K[];
+    /**
+     * Get ListType2 item label
+     * @param item Item
+     * @returns Result
+     */
+    function getListItemLabel<D extends ListType2>(item: D): string;
+    /**
+     * Get object item label
+     * @param item Item
+     * @returns Result
+     */
+    function getObjectItemLabel(item: object): string;
     /**
      * Get object field value
      * @param data Data
@@ -356,7 +364,7 @@ export declare namespace DataTypes {
      * @param key Property name
      * @returns Id value
      */
-    function getIdValue<T extends object, K extends Keys<T, string | number>>(data: T, key: K): T[K];
+    function getIdValue<T extends object, K extends Keys<T, IdType>>(data: T, key: K): T[K];
     /**
      * Get object id field value 1
      * @param data Data
@@ -396,6 +404,10 @@ export declare namespace DataTypes {
      */
     function jsonReplacer(replacer: (this: any, key: string, value: any, path: string) => any): (this: any, key: any, value: any) => any;
 }
+/**
+ * Number and string combination id type
+ */
+export type IdType = number | string;
 /**
  * List item with number id type
  */
@@ -408,7 +420,7 @@ export type ListType1 = DataTypes.IdLabelItem<string>;
  * List item with compatible id and name / label / title
  */
 export type ListType2 = {
-    id: DataTypes.IdType;
+    id: IdType;
 } & ({
     label: string;
 } | {
@@ -419,8 +431,8 @@ export type ListType2 = {
 /**
  * Id default type
  */
-export type IdDefaultType<T extends object> = T extends {
-    id: number | string;
+export type IdDefaultType<T extends object, I extends IdType = IdType> = T extends {
+    id: I;
 } ? DataTypes.Keys<T> & 'id' : DataTypes.Keys<T>;
 /**
  * Label default type
@@ -434,15 +446,3 @@ export type LabelDefaultType<T extends object> = T extends {
 export type TitleDefaultType<T extends object> = T extends {
     title: string;
 } ? DataTypes.Keys<T, string> & 'title' : DataTypes.Keys<T, string>;
-/**
- * Get ListType2 item label
- * @param item Item
- * @returns Result
- */
-export declare function getListItemLabel<D extends ListType2>(item: D): string;
-/**
- * Get object item label
- * @param item Item
- * @returns Result
- */
-export declare function getObjectItemLabel(item: object): string;

package/lib/cjs/DataTypes.js

@@ -5,7 +5,7 @@
  * Before was wrong with {}, from 4.8 unknown = {} | null | undefined
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getObjectItemLabel = exports.getListItemLabel = exports.DataTypes = void 0;
+exports.DataTypes = void 0;
 /**
  * Interface data types
  */
@@ -311,6 +311,34 @@ var DataTypes;
             .map((item) => item);
     }
     DataTypes.getEnumKeys = getEnumKeys;
+    /**
+     * Get ListType2 item label
+     * @param item Item
+     * @returns Result
+     */
+    function getListItemLabel(item) {
+        return 'label' in item
+            ? item.label
+            : 'name' in item
+                ? item.name
+                : item.title;
+    }
+    DataTypes.getListItemLabel = getListItemLabel;
+    /**
+     * Get object item label
+     * @param item Item
+     * @returns Result
+     */
+    function getObjectItemLabel(item) {
+        return 'label' in item
+            ? `${item.label}`
+            : 'name' in item
+                ? `${item.name}`
+                : 'title' in item
+                    ? `${item.title}`
+                    : `${item}`;
+    }
+    DataTypes.getObjectItemLabel = getObjectItemLabel;
     /**
      * Get object field value
      * @param data Data
@@ -429,31 +457,3 @@ var DataTypes;
     }
     DataTypes.jsonReplacer = jsonReplacer;
 })(DataTypes || (exports.DataTypes = DataTypes = {}));
-/**
- * Get ListType2 item label
- * @param item Item
- * @returns Result
- */
-function getListItemLabel(item) {
-    return 'label' in item
-        ? item.label
-        : 'name' in item
-            ? item.name
-            : item.title;
-}
-exports.getListItemLabel = getListItemLabel;
-/**
- * Get object item label
- * @param item Item
- * @returns Result
- */
-function getObjectItemLabel(item) {
-    return 'label' in item
-        ? `${item.label}`
-        : 'name' in item
-            ? `${item.name}`
-            : 'title' in item
-                ? `${item.title}`
-                : `${item}`;
-}
-exports.getObjectItemLabel = getObjectItemLabel;

package/lib/cjs/IActionResult.d.ts

@@ -1,4 +1,4 @@
-import { DataTypes } from './DataTypes';
+import { IdType } from './DataTypes';
 /**
  * Result errors
  * Indexable type
@@ -50,7 +50,7 @@ export interface IActionResult<D extends object = {}> {
 /**
  * Action result with id data
  */
-export type IdActionResult<T extends DataTypes.IdType = number> = IActionResult<{
+export type IdActionResult<T extends IdType = number> = IActionResult<{
     id: T;
 }>;
 /**

package/lib/cjs/Utils.d.ts

@@ -1,4 +1,4 @@
-import { DataTypes } from './DataTypes';
+import { DataTypes, IdType } from './DataTypes';
 import { ParsedPath } from './types/ParsedPath';
 declare global {
     interface String {
@@ -102,7 +102,7 @@ export declare namespace Utils {
      * @returns Result
      */
     function exclude<T extends {
-        [P in D]: DataTypes.IdType;
+        [P in D]: IdType;
     }, D extends string = 'id'>(items: T[], field: D, ...excludedValues: T[D][]): T[];
     /**
      * Async exclude specific items
@@ -112,7 +112,7 @@ export declare namespace Utils {
      * @returns Result
      */
     function excludeAsync<T extends {
-        [P in D]: DataTypes.IdType;
+        [P in D]: IdType;
     }, D extends string = 'id'>(items: Promise<T[] | undefined>, field: D, ...excludedValues: T[D][]): Promise<T[] | undefined>;
     /**
      * Format inital character to lower case or upper case

package/lib/mjs/DataTypes.d.ts

@@ -133,10 +133,6 @@ export declare namespace DataTypes {
      * Placement type
      */
     type Placement = keyof typeof PlacementEnum;
-    /**
-     * Number and string combination id type
-     */
-    type IdType = number | string;
     /**
      * Add and edit data type
      * ChangedFields for editing case
@@ -240,7 +236,7 @@ export declare namespace DataTypes {
     /**
      * Get specific type keys
      */
-    type Keys<T extends object, R = string | number> = {
+    type Keys<T extends object, R = IdType> = {
         [k in keyof T]: T[k] extends R ? k : never;
     }[keyof T];
     /**
@@ -343,6 +339,18 @@ export declare namespace DataTypes {
      * @returns Keys
      */
     function getEnumKeys<T extends EnumBase, K extends keyof T & string>(input: T): K[];
+    /**
+     * Get ListType2 item label
+     * @param item Item
+     * @returns Result
+     */
+    function getListItemLabel<D extends ListType2>(item: D): string;
+    /**
+     * Get object item label
+     * @param item Item
+     * @returns Result
+     */
+    function getObjectItemLabel(item: object): string;
     /**
      * Get object field value
      * @param data Data
@@ -356,7 +364,7 @@ export declare namespace DataTypes {
      * @param key Property name
      * @returns Id value
      */
-    function getIdValue<T extends object, K extends Keys<T, string | number>>(data: T, key: K): T[K];
+    function getIdValue<T extends object, K extends Keys<T, IdType>>(data: T, key: K): T[K];
     /**
      * Get object id field value 1
      * @param data Data
@@ -396,6 +404,10 @@ export declare namespace DataTypes {
      */
     function jsonReplacer(replacer: (this: any, key: string, value: any, path: string) => any): (this: any, key: any, value: any) => any;
 }
+/**
+ * Number and string combination id type
+ */
+export type IdType = number | string;
 /**
  * List item with number id type
  */
@@ -408,7 +420,7 @@ export type ListType1 = DataTypes.IdLabelItem<string>;
  * List item with compatible id and name / label / title
  */
 export type ListType2 = {
-    id: DataTypes.IdType;
+    id: IdType;
 } & ({
     label: string;
 } | {
@@ -419,8 +431,8 @@ export type ListType2 = {
 /**
  * Id default type
  */
-export type IdDefaultType<T extends object> = T extends {
-    id: number | string;
+export type IdDefaultType<T extends object, I extends IdType = IdType> = T extends {
+    id: I;
 } ? DataTypes.Keys<T> & 'id' : DataTypes.Keys<T>;
 /**
  * Label default type
@@ -434,15 +446,3 @@ export type LabelDefaultType<T extends object> = T extends {
 export type TitleDefaultType<T extends object> = T extends {
     title: string;
 } ? DataTypes.Keys<T, string> & 'title' : DataTypes.Keys<T, string>;
-/**
- * Get ListType2 item label
- * @param item Item
- * @returns Result
- */
-export declare function getListItemLabel<D extends ListType2>(item: D): string;
-/**
- * Get object item label
- * @param item Item
- * @returns Result
- */
-export declare function getObjectItemLabel(item: object): string;

package/lib/mjs/DataTypes.js

@@ -308,6 +308,34 @@ export var DataTypes;
             .map((item) => item);
     }
     DataTypes.getEnumKeys = getEnumKeys;
+    /**
+     * Get ListType2 item label
+     * @param item Item
+     * @returns Result
+     */
+    function getListItemLabel(item) {
+        return 'label' in item
+            ? item.label
+            : 'name' in item
+                ? item.name
+                : item.title;
+    }
+    DataTypes.getListItemLabel = getListItemLabel;
+    /**
+     * Get object item label
+     * @param item Item
+     * @returns Result
+     */
+    function getObjectItemLabel(item) {
+        return 'label' in item
+            ? `${item.label}`
+            : 'name' in item
+                ? `${item.name}`
+                : 'title' in item
+                    ? `${item.title}`
+                    : `${item}`;
+    }
+    DataTypes.getObjectItemLabel = getObjectItemLabel;
     /**
      * Get object field value
      * @param data Data
@@ -426,29 +454,3 @@ export var DataTypes;
     }
     DataTypes.jsonReplacer = jsonReplacer;
 })(DataTypes || (DataTypes = {}));
-/**
- * Get ListType2 item label
- * @param item Item
- * @returns Result
- */
-export function getListItemLabel(item) {
-    return 'label' in item
-        ? item.label
-        : 'name' in item
-            ? item.name
-            : item.title;
-}
-/**
- * Get object item label
- * @param item Item
- * @returns Result
- */
-export function getObjectItemLabel(item) {
-    return 'label' in item
-        ? `${item.label}`
-        : 'name' in item
-            ? `${item.name}`
-            : 'title' in item
-                ? `${item.title}`
-                : `${item}`;
-}

package/lib/mjs/IActionResult.d.ts

@@ -1,4 +1,4 @@
-import { DataTypes } from './DataTypes';
+import { IdType } from './DataTypes';
 /**
  * Result errors
  * Indexable type
@@ -50,7 +50,7 @@ export interface IActionResult<D extends object = {}> {
 /**
  * Action result with id data
  */
-export type IdActionResult<T extends DataTypes.IdType = number> = IActionResult<{
+export type IdActionResult<T extends IdType = number> = IActionResult<{
     id: T;
 }>;
 /**

package/lib/mjs/Utils.d.ts

@@ -1,4 +1,4 @@
-import { DataTypes } from './DataTypes';
+import { DataTypes, IdType } from './DataTypes';
 import { ParsedPath } from './types/ParsedPath';
 declare global {
     interface String {
@@ -102,7 +102,7 @@ export declare namespace Utils {
      * @returns Result
      */
     function exclude<T extends {
-        [P in D]: DataTypes.IdType;
+        [P in D]: IdType;
     }, D extends string = 'id'>(items: T[], field: D, ...excludedValues: T[D][]): T[];
     /**
      * Async exclude specific items
@@ -112,7 +112,7 @@ export declare namespace Utils {
      * @returns Result
      */
     function excludeAsync<T extends {
-        [P in D]: DataTypes.IdType;
+        [P in D]: IdType;
     }, D extends string = 'id'>(items: Promise<T[] | undefined>, field: D, ...excludedValues: T[D][]): Promise<T[] | undefined>;
     /**
      * Format inital character to lower case or upper case

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/shared",
-    "version": "1.2.19",
+    "version": "1.2.21",
     "description": "TypeScript shared utilities and functions",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",

package/src/DataTypes.ts

@@ -172,11 +172,6 @@ export namespace DataTypes {
      */
     export type Placement = keyof typeof PlacementEnum;
 
-    /**
-     * Number and string combination id type
-     */
-    export type IdType = number | string;
-
     /**
      * Add and edit data type
      * ChangedFields for editing case
@@ -300,7 +295,7 @@ export namespace DataTypes {
     /**
      * Get specific type keys
      */
-    export type Keys<T extends object, R = string | number> = {
+    export type Keys<T extends object, R = IdType> = {
         [k in keyof T]: T[k] extends R ? k : never;
     }[keyof T];
 
@@ -604,6 +599,34 @@ export namespace DataTypes {
             .map((item) => <K>item);
     }
 
+    /**
+     * Get ListType2 item label
+     * @param item Item
+     * @returns Result
+     */
+    export function getListItemLabel<D extends ListType2>(item: D) {
+        return 'label' in item
+            ? item.label
+            : 'name' in item
+            ? item.name
+            : item.title;
+    }
+
+    /**
+     * Get object item label
+     * @param item Item
+     * @returns Result
+     */
+    export function getObjectItemLabel(item: object): string {
+        return 'label' in item
+            ? `${item.label}`
+            : 'name' in item
+            ? `${item.name}`
+            : 'title' in item
+            ? `${item.title}`
+            : `${item}`;
+    }
+
     /**
      * Get object field value
      * @param data Data
@@ -626,10 +649,10 @@ export namespace DataTypes {
      * @param key Property name
      * @returns Id value
      */
-    export function getIdValue<
-        T extends object,
-        K extends Keys<T, string | number>
-    >(data: T, key: K): T[K] {
+    export function getIdValue<T extends object, K extends Keys<T, IdType>>(
+        data: T,
+        key: K
+    ): T[K] {
         return data[key];
     }
 
@@ -750,6 +773,11 @@ export namespace DataTypes {
     }
 }
 
+/**
+ * Number and string combination id type
+ */
+export type IdType = number | string;
+
 /**
  * List item with number id type
  */
@@ -764,15 +792,16 @@ export type ListType1 = DataTypes.IdLabelItem<string>;
  * List item with compatible id and name / label / title
  */
 export type ListType2 = {
-    id: DataTypes.IdType;
+    id: IdType;
 } & ({ label: string } | { name: string } | { title: string });
 
 /**
  * Id default type
  */
-export type IdDefaultType<T extends object> = T extends { id: number | string }
-    ? DataTypes.Keys<T> & 'id'
-    : DataTypes.Keys<T>;
+export type IdDefaultType<
+    T extends object,
+    I extends IdType = IdType
+> = T extends { id: I } ? DataTypes.Keys<T> & 'id' : DataTypes.Keys<T>;
 
 /**
  * Label default type
@@ -787,31 +816,3 @@ export type LabelDefaultType<T extends object> = T extends { label: string }
 export type TitleDefaultType<T extends object> = T extends { title: string }
     ? DataTypes.Keys<T, string> & 'title'
     : DataTypes.Keys<T, string>;
-
-/**
- * Get ListType2 item label
- * @param item Item
- * @returns Result
- */
-export function getListItemLabel<D extends ListType2>(item: D) {
-    return 'label' in item
-        ? item.label
-        : 'name' in item
-        ? item.name
-        : item.title;
-}
-
-/**
- * Get object item label
- * @param item Item
- * @returns Result
- */
-export function getObjectItemLabel(item: object): string {
-    return 'label' in item
-        ? `${item.label}`
-        : 'name' in item
-        ? `${item.name}`
-        : 'title' in item
-        ? `${item.title}`
-        : `${item}`;
-}

package/src/IActionResult.ts

@@ -1,4 +1,4 @@
-import { DataTypes } from './DataTypes';
+import { IdType } from './DataTypes';
 
 /**
  * Result errors
@@ -61,10 +61,9 @@ export interface IActionResult<D extends object = {}> {
 /**
  * Action result with id data
  */
-export type IdActionResult<T extends DataTypes.IdType = number> =
-    IActionResult<{
-        id: T;
-    }>;
+export type IdActionResult<T extends IdType = number> = IActionResult<{
+    id: T;
+}>;
 
 /**
  * Action result with dynamic data

package/src/Utils.ts

@@ -1,4 +1,4 @@
-import { DataTypes } from './DataTypes';
+import { DataTypes, IdType } from './DataTypes';
 import isEqual from 'lodash.isequal';
 import { DateUtils } from './DateUtils';
 import { ParsedPath } from './types/ParsedPath';
@@ -247,7 +247,7 @@ export namespace Utils {
      * @returns Result
      */
     export function exclude<
-        T extends { [P in D]: DataTypes.IdType },
+        T extends { [P in D]: IdType },
         D extends string = 'id'
     >(items: T[], field: D, ...excludedValues: T[D][]) {
         return items.filter((item) => !excludedValues.includes(item[field]));
@@ -261,7 +261,7 @@ export namespace Utils {
      * @returns Result
      */
     export async function excludeAsync<
-        T extends { [P in D]: DataTypes.IdType },
+        T extends { [P in D]: IdType },
         D extends string = 'id'
     >(items: Promise<T[] | undefined>, field: D, ...excludedValues: T[D][]) {
         const result = await items;