@etsoo/shared 1.1.19 → 1.1.22

package/README.md

@@ -68,6 +68,7 @@ Data type definitions and type safe functions
 |IdType|Number and string combination id type|
 |IdItem|Item with id or id generator|
 |IdLabelItem|Item with id and label|
+|KeyCollection|Key collection, like { key1: {}, key2: {} }|
 |Simple|Basic or basic array type|
 |SimpleEnum|Simple type enum|
 |SimpleNames|Simple type names|

package/lib/cjs/DataTypes.d.ts

@@ -120,6 +120,12 @@ export declare namespace DataTypes {
     type AddOrEditType<T, Editing extends boolean> = (Editing extends true ? T : Partial<T>) & {
         changedFields?: string[];
     };
+    /**
+     * Key collection, like { key1: {}, key2: {} }
+     */
+    type KeyCollection<K extends readonly string[], I extends {}> = {
+        [index in K[number]]: I;
+    };
     /**
      * Enum value type
      */
@@ -177,23 +183,23 @@ export declare namespace DataTypes {
     /**
      * Culture definiton
      */
-    type CultureDefinition = Readonly<{
+    type CultureDefinition<T extends {} = StringRecord> = Readonly<{
         /**
          * Name, like zh-CN
          */
-        readonly name: string;
+        name: string;
         /**
          * Label for description, like Simplifined Chinese
          */
-        readonly label: string;
+        label: string;
         /**
          * Resources
          */
-        readonly resources: Readonly<StringRecord>;
+        resources: T;
         /**
          * Compatible names
          */
-        readonly compatibleName?: string[];
+        compatibleName?: string[];
     }>;
     /**
      * Convert value to target type

package/lib/cjs/DomUtils.d.ts

@@ -54,11 +54,16 @@ export declare namespace DomUtils {
      * @param items Available cultures
      * @param culture Detected culture
      */
-    const getCulture: (items: DataTypes.CultureDefinition[], culture: string) => Readonly<{
-        readonly name: string;
-        readonly label: string;
-        readonly resources: Readonly<DataTypes.StringRecord>;
-        readonly compatibleName?: string[] | undefined;
+    const getCulture: <T extends {}>(items: Readonly<{
+        name: string;
+        label: string;
+        resources: T;
+        compatibleName?: string[] | undefined;
+    }>[], culture: string) => Readonly<{
+        name: string;
+        label: string;
+        resources: T;
+        compatibleName?: string[] | undefined;
     }> | undefined;
     /**
      * Get an unique key combined with current URL

package/lib/mjs/DataTypes.d.ts

@@ -120,6 +120,12 @@ export declare namespace DataTypes {
     type AddOrEditType<T, Editing extends boolean> = (Editing extends true ? T : Partial<T>) & {
         changedFields?: string[];
     };
+    /**
+     * Key collection, like { key1: {}, key2: {} }
+     */
+    type KeyCollection<K extends readonly string[], I extends {}> = {
+        [index in K[number]]: I;
+    };
     /**
      * Enum value type
      */
@@ -177,23 +183,23 @@ export declare namespace DataTypes {
     /**
      * Culture definiton
      */
-    type CultureDefinition = Readonly<{
+    type CultureDefinition<T extends {} = StringRecord> = Readonly<{
         /**
          * Name, like zh-CN
          */
-        readonly name: string;
+        name: string;
         /**
          * Label for description, like Simplifined Chinese
          */
-        readonly label: string;
+        label: string;
         /**
          * Resources
          */
-        readonly resources: Readonly<StringRecord>;
+        resources: T;
         /**
          * Compatible names
          */
-        readonly compatibleName?: string[];
+        compatibleName?: string[];
     }>;
     /**
      * Convert value to target type

package/lib/mjs/DomUtils.d.ts

@@ -54,11 +54,16 @@ export declare namespace DomUtils {
      * @param items Available cultures
      * @param culture Detected culture
      */
-    const getCulture: (items: DataTypes.CultureDefinition[], culture: string) => Readonly<{
-        readonly name: string;
-        readonly label: string;
-        readonly resources: Readonly<DataTypes.StringRecord>;
-        readonly compatibleName?: string[] | undefined;
+    const getCulture: <T extends {}>(items: Readonly<{
+        name: string;
+        label: string;
+        resources: T;
+        compatibleName?: string[] | undefined;
+    }>[], culture: string) => Readonly<{
+        name: string;
+        label: string;
+        resources: T;
+        compatibleName?: string[] | undefined;
     }> | undefined;
     /**
      * Get an unique key combined with current URL

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/shared",
-    "version": "1.1.19",
+    "version": "1.1.22",
     "description": "TypeScript shared utilities and functions",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -55,11 +55,11 @@
     "dependencies": {},
     "devDependencies": {
         "@types/jest": "^27.4.1",
-        "@typescript-eslint/eslint-plugin": "^5.17.0",
-        "@typescript-eslint/parser": "^5.17.0",
-        "eslint": "^8.12.0",
+        "@typescript-eslint/eslint-plugin": "^5.20.0",
+        "@typescript-eslint/parser": "^5.20.0",
+        "eslint": "^8.14.0",
         "eslint-config-airbnb-base": "^15.0.0",
-        "eslint-plugin-import": "^2.25.4",
+        "eslint-plugin-import": "^2.26.0",
         "jest": "^27.5.1",
         "ts-jest": "^27.1.4",
         "typescript": "^4.6.3"

package/src/DataTypes.ts

@@ -156,6 +156,13 @@ export namespace DataTypes {
         Editing extends boolean
     > = (Editing extends true ? T : Partial<T>) & { changedFields?: string[] };
 
+    /**
+     * Key collection, like { key1: {}, key2: {} }
+     */
+    export type KeyCollection<K extends readonly string[], I extends {}> = {
+        [index in K[number]]: I;
+    };
+
     /**
      * Enum value type
      */
@@ -230,26 +237,26 @@ export namespace DataTypes {
     /**
      * Culture definiton
      */
-    export type CultureDefinition = Readonly<{
+    export type CultureDefinition<T extends {} = StringRecord> = Readonly<{
         /**
          * Name, like zh-CN
          */
-        readonly name: string;
+        name: string;
 
         /**
          * Label for description, like Simplifined Chinese
          */
-        readonly label: string;
+        label: string;
 
         /**
          * Resources
          */
-        readonly resources: Readonly<StringRecord>;
+        resources: T;
 
         /**
          * Compatible names
          */
-        readonly compatibleName?: string[];
+        compatibleName?: string[];
     }>;
 
     /**

package/src/DomUtils.ts

@@ -281,8 +281,8 @@ export namespace DomUtils {
      * @param items Available cultures
      * @param culture Detected culture
      */
-    export const getCulture = (
-        items: DataTypes.CultureDefinition[],
+    export const getCulture = <T extends {}>(
+        items: DataTypes.CultureDefinition<T>[],
         culture: string
     ) => {
         if (items.length === 0) {