@etsoo/shared 1.1.20 → 1.1.23

package/README.md

@@ -122,6 +122,7 @@ DOM/window related utilities
 |detectedCountry|Current detected country|
 |detectedCulture|Current detected culture|
 |dimensionEqual|Check two rectangles equality|
+|fileToDataURL|File to data URL|
 |formDataToObject|Form data to object|
 |getCulture|Get the available culture definition|
 |getDataChanges|Get data changed fields with input data updated|

package/lib/cjs/DataTypes.d.ts

@@ -183,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

@@ -43,6 +43,12 @@ export declare namespace DomUtils {
      * @param d2 Dimension 2
      */
     function dimensionEqual(d1?: DOMRect, d2?: DOMRect): boolean;
+    /**
+     * File to data URL
+     * @param file File
+     * @returns Data URL
+     */
+    function fileToDataURL(file: File): Promise<string>;
     /**
      * Form data to object
      * @param form Form data
@@ -54,17 +60,16 @@ export declare namespace DomUtils {
      * @param items Available cultures
      * @param culture Detected culture
      */
-    const getCulture: (items: DataTypes.CultureDefinition[], culture: string) => Readonly<{
-        readonly name: string; /**
-         * Cast data to target type
-         * @param source Source data
-         * @param template Template for generation
-         * @param keepSource Means even the template does not include the definition, still keep the item
-         * @returns Result
-         */
-        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/cjs/DomUtils.js

@@ -213,6 +213,27 @@ var DomUtils;
         return false;
     }
     DomUtils.dimensionEqual = dimensionEqual;
+    /**
+     * File to data URL
+     * @param file File
+     * @returns Data URL
+     */
+    async function fileToDataURL(file) {
+        return new Promise((resolve, reject) => {
+            const reader = new FileReader();
+            reader.onerror = reject;
+            reader.onload = () => {
+                const data = reader.result;
+                if (data == null) {
+                    reject();
+                    return;
+                }
+                resolve(data);
+            };
+            reader.readAsDataURL(file);
+        });
+    }
+    DomUtils.fileToDataURL = fileToDataURL;
     /**
      * Form data to object
      * @param form Form data

package/lib/mjs/DataTypes.d.ts

@@ -183,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

@@ -43,6 +43,12 @@ export declare namespace DomUtils {
      * @param d2 Dimension 2
      */
     function dimensionEqual(d1?: DOMRect, d2?: DOMRect): boolean;
+    /**
+     * File to data URL
+     * @param file File
+     * @returns Data URL
+     */
+    function fileToDataURL(file: File): Promise<string>;
     /**
      * Form data to object
      * @param form Form data
@@ -54,17 +60,16 @@ export declare namespace DomUtils {
      * @param items Available cultures
      * @param culture Detected culture
      */
-    const getCulture: (items: DataTypes.CultureDefinition[], culture: string) => Readonly<{
-        readonly name: string; /**
-         * Cast data to target type
-         * @param source Source data
-         * @param template Template for generation
-         * @param keepSource Means even the template does not include the definition, still keep the item
-         * @returns Result
-         */
-        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/DomUtils.js

@@ -210,6 +210,27 @@ export var DomUtils;
         return false;
     }
     DomUtils.dimensionEqual = dimensionEqual;
+    /**
+     * File to data URL
+     * @param file File
+     * @returns Data URL
+     */
+    async function fileToDataURL(file) {
+        return new Promise((resolve, reject) => {
+            const reader = new FileReader();
+            reader.onerror = reject;
+            reader.onload = () => {
+                const data = reader.result;
+                if (data == null) {
+                    reject();
+                    return;
+                }
+                resolve(data);
+            };
+            reader.readAsDataURL(file);
+        });
+    }
+    DomUtils.fileToDataURL = fileToDataURL;
     /**
      * Form data to object
      * @param form Form data

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/shared",
-    "version": "1.1.20",
+    "version": "1.1.23",
     "description": "TypeScript shared utilities and functions",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -55,13 +55,13 @@
     "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.21.0",
+        "@typescript-eslint/parser": "^5.21.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"
+        "typescript": "^4.6.4"
     }
 }

package/src/DataTypes.ts

@@ -237,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

@@ -261,6 +261,28 @@ export namespace DomUtils {
         return false;
     }
 
+    /**
+     * File to data URL
+     * @param file File
+     * @returns Data URL
+     */
+    export async function fileToDataURL(file: File) {
+        return new Promise<string>((resolve, reject) => {
+            const reader = new FileReader();
+            reader.onerror = reject;
+            reader.onload = () => {
+                const data = reader.result;
+                if (data == null) {
+                    reject();
+                    return;
+                }
+
+                resolve(data as string);
+            };
+            reader.readAsDataURL(file);
+        });
+    }
+
     /**
      * Form data to object
      * @param form Form data
@@ -281,8 +303,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) {