@etsoo/shared 1.1.49 → 1.1.50

package/__tests__/DataTypes.ts

@@ -1,4 +1,4 @@
-import { DataTypes } from '../src/DataTypes';
+import { DataTypes, IdDefaultType, LabelDefaultType } from '../src/DataTypes';
 
 test('Tests for DI', () => {
     const item: DataTypes.DIS<'id', number> & DataTypes.DIS<'label', string> = {
@@ -132,3 +132,25 @@ test('Tests for isSimpleType', () => {
     expect(DataTypes.isSimpleType(['a', 'b', 'c'])).toBeTruthy();
     expect(DataTypes.isSimpleType({})).toBeFalsy();
 });
+
+test('Tests for IdDefaultType', () => {
+    const test = <T extends object, F extends keyof T = IdDefaultType<T>>(
+        obj: T,
+        field?: F
+    ) => {
+        const f = field ?? ('id' as F);
+        return obj[f];
+    };
+
+    type D = { label: string; name: string; id: number };
+    const data: D = {
+        label: 'label',
+        name: 'name',
+        id: 1
+    };
+    const v = test<D>(data);
+    expect(typeof v).toBe('number');
+
+    const v1 = test<D, LabelDefaultType<D>>(data, 'label');
+    expect(v1).toBe('label');
+});

package/lib/cjs/DataTypes.d.ts

@@ -180,7 +180,7 @@ export declare namespace DataTypes {
     /**
      * Get specific type keys
      */
-    type Keys<T, R = string | number> = {
+    type Keys<T extends object, R = string | number> = {
         [k in keyof T]: T[k] extends R ? k : never;
     }[keyof T];
     /**
@@ -333,3 +333,15 @@ export declare type ListType = DataTypes.IdLabelItem<number>;
  * List item with string id type
  */
 export declare type ListType1 = DataTypes.IdLabelItem<string>;
+/**
+ * Id default type
+ */
+export declare type IdDefaultType<T extends object> = T extends {
+    id: number | string;
+} ? DataTypes.Keys<T> & 'id' : DataTypes.Keys<T>;
+/**
+ * Label default type
+ */
+export declare type LabelDefaultType<T extends object> = T extends {
+    label: string;
+} ? DataTypes.Keys<T> & 'label' : DataTypes.Keys<T>;

package/lib/mjs/DataTypes.d.ts

@@ -180,7 +180,7 @@ export declare namespace DataTypes {
     /**
      * Get specific type keys
      */
-    type Keys<T, R = string | number> = {
+    type Keys<T extends object, R = string | number> = {
         [k in keyof T]: T[k] extends R ? k : never;
     }[keyof T];
     /**
@@ -333,3 +333,15 @@ export declare type ListType = DataTypes.IdLabelItem<number>;
  * List item with string id type
  */
 export declare type ListType1 = DataTypes.IdLabelItem<string>;
+/**
+ * Id default type
+ */
+export declare type IdDefaultType<T extends object> = T extends {
+    id: number | string;
+} ? DataTypes.Keys<T> & 'id' : DataTypes.Keys<T>;
+/**
+ * Label default type
+ */
+export declare type LabelDefaultType<T extends object> = T extends {
+    label: string;
+} ? DataTypes.Keys<T> & 'label' : DataTypes.Keys<T>;

package/package.json

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

package/src/DataTypes.ts

@@ -231,7 +231,7 @@ export namespace DataTypes {
     /**
      * Get specific type keys
      */
-    export type Keys<T, R = string | number> = {
+    export type Keys<T extends object, R = string | number> = {
         [k in keyof T]: T[k] extends R ? k : never;
     }[keyof T];
 
@@ -656,3 +656,17 @@ export type ListType = DataTypes.IdLabelItem<number>;
  * List item with string id type
  */
 export type ListType1 = DataTypes.IdLabelItem<string>;
+
+/**
+ * Id default type
+ */
+export type IdDefaultType<T extends object> = T extends { id: number | string }
+    ? DataTypes.Keys<T> & 'id'
+    : DataTypes.Keys<T>;
+
+/**
+ * Label default type
+ */
+export type LabelDefaultType<T extends object> = T extends { label: string }
+    ? DataTypes.Keys<T> & 'label'
+    : DataTypes.Keys<T>;