@etsoo/shared 1.1.37 → 1.1.40

package/README.md

@@ -147,7 +147,7 @@ DOM/window related utilities
 |Name|Description|
 |---:|---|
 |clearFormData|Clear form data|
-|dataAs|Cast data to target type|
+|dataAs|Cast data as template format|
 |detectedCountry|Current detected country|
 |detectedCulture|Current detected culture|
 |dimensionEqual|Check two rectangles equality|

package/__tests__/tsconfig.json

@@ -1,6 +1,6 @@
 {
     "compilerOptions": {
-        "target": "ES2019",
+        "target": "ES6",
         "module": "ESNext",
         "allowJs": true,
         "skipLibCheck": true,

package/lib/cjs/DomUtils.d.ts

@@ -20,7 +20,14 @@ export declare namespace DomUtils {
      * @param keepFields Fields need to be kept
      */
     function clearFormData(data: IFormData, source?: {}, keepFields?: string[]): IFormData;
-    function dataAs<T extends DataTypes.BasicTemplate>(source: IFormData | {}, template: T, keepSource?: boolean): DataTypes.BasicTemplateType<T>;
+    /**
+     * Cast data as template format
+     * @param source Source data
+     * @param template Format template
+     * @param keepSource Keep other source properties
+     * @returns Result
+     */
+    function dataAs<T extends DataTypes.BasicTemplate>(source: unknown, template: T, keepSource?: boolean): DataTypes.BasicTemplateType<T>;
     /**
      * Cast data to target type
      * @param source Source data

package/lib/cjs/DomUtils.js

@@ -134,12 +134,21 @@ var DomUtils;
             Reflect.set(data, property, propertyValue);
         }
     }
+    /**
+     * Cast data as template format
+     * @param source Source data
+     * @param template Format template
+     * @param keepSource Keep other source properties
+     * @returns Result
+     */
     function dataAs(source, template, keepSource = false) {
         // New data
         // Object.create(...)
         const data = {};
-        // Travel all properties
-        dataAsTraveller(source, data, template, keepSource, false);
+        if (source != null && typeof source === 'object') {
+            // Travel all properties
+            dataAsTraveller(source, data, template, keepSource, false);
+        }
         // Return
         return data;
     }

package/lib/cjs/Utils.d.ts

@@ -114,13 +114,13 @@ export declare namespace Utils {
      * @param minLength Minimum length
      * @returns Result
      */
-    const isDigits: (input?: string | undefined, minLength?: number | undefined) => boolean;
+    const isDigits: (input?: string, minLength?: number) => boolean;
     /**
      * Is email string
      * @param input Input string
      * @returns Result
      */
-    const isEmail: (input?: string | undefined) => boolean;
+    const isEmail: (input?: string) => boolean;
     /**
      * Join items as a string
      * @param items Items
@@ -188,7 +188,7 @@ export declare namespace Utils {
      * @param input Input string
      * @returns Result
      */
-    const removeNonLetters: (input?: string | undefined) => string | undefined;
+    const removeNonLetters: (input?: string) => string | undefined;
     /**
      * Replace null or empty with default value
      * @param input Input string
@@ -202,7 +202,7 @@ export declare namespace Utils {
      * @param labels Labels
      * @param reference Key reference dictionary
      */
-    const setLabels: (source: {}, labels: DataTypes.StringRecord, reference?: Readonly<DataTypes.StringDictionary> | undefined) => void;
+    const setLabels: (source: {}, labels: DataTypes.StringRecord, reference?: Readonly<DataTypes.StringDictionary>) => void;
     /**
      * Snake name to works, 'snake_name' to 'Snake Name'
      * @param name Name text

package/lib/mjs/DomUtils.d.ts

@@ -20,7 +20,14 @@ export declare namespace DomUtils {
      * @param keepFields Fields need to be kept
      */
     function clearFormData(data: IFormData, source?: {}, keepFields?: string[]): IFormData;
-    function dataAs<T extends DataTypes.BasicTemplate>(source: IFormData | {}, template: T, keepSource?: boolean): DataTypes.BasicTemplateType<T>;
+    /**
+     * Cast data as template format
+     * @param source Source data
+     * @param template Format template
+     * @param keepSource Keep other source properties
+     * @returns Result
+     */
+    function dataAs<T extends DataTypes.BasicTemplate>(source: unknown, template: T, keepSource?: boolean): DataTypes.BasicTemplateType<T>;
     /**
      * Cast data to target type
      * @param source Source data

package/lib/mjs/DomUtils.js

@@ -131,12 +131,21 @@ export var DomUtils;
             Reflect.set(data, property, propertyValue);
         }
     }
+    /**
+     * Cast data as template format
+     * @param source Source data
+     * @param template Format template
+     * @param keepSource Keep other source properties
+     * @returns Result
+     */
     function dataAs(source, template, keepSource = false) {
         // New data
         // Object.create(...)
         const data = {};
-        // Travel all properties
-        dataAsTraveller(source, data, template, keepSource, false);
+        if (source != null && typeof source === 'object') {
+            // Travel all properties
+            dataAsTraveller(source, data, template, keepSource, false);
+        }
         // Return
         return data;
     }

package/lib/mjs/Utils.d.ts

@@ -114,13 +114,13 @@ export declare namespace Utils {
      * @param minLength Minimum length
      * @returns Result
      */
-    const isDigits: (input?: string | undefined, minLength?: number | undefined) => boolean;
+    const isDigits: (input?: string, minLength?: number) => boolean;
     /**
      * Is email string
      * @param input Input string
      * @returns Result
      */
-    const isEmail: (input?: string | undefined) => boolean;
+    const isEmail: (input?: string) => boolean;
     /**
      * Join items as a string
      * @param items Items
@@ -188,7 +188,7 @@ export declare namespace Utils {
      * @param input Input string
      * @returns Result
      */
-    const removeNonLetters: (input?: string | undefined) => string | undefined;
+    const removeNonLetters: (input?: string) => string | undefined;
     /**
      * Replace null or empty with default value
      * @param input Input string
@@ -202,7 +202,7 @@ export declare namespace Utils {
      * @param labels Labels
      * @param reference Key reference dictionary
      */
-    const setLabels: (source: {}, labels: DataTypes.StringRecord, reference?: Readonly<DataTypes.StringDictionary> | undefined) => void;
+    const setLabels: (source: {}, labels: DataTypes.StringRecord, reference?: Readonly<DataTypes.StringDictionary>) => void;
     /**
      * Snake name to works, 'snake_name' to 'Snake Name'
      * @param name Name text

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/shared",
-    "version": "1.1.37",
+    "version": "1.1.40",
     "description": "TypeScript shared utilities and functions",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -55,15 +55,15 @@
     "homepage": "https://github.com/ETSOO/Shared#readme",
     "dependencies": {},
     "devDependencies": {
-        "@types/jest": "^27.5.0",
-        "@typescript-eslint/eslint-plugin": "^5.23.0",
-        "@typescript-eslint/parser": "^5.23.0",
-        "eslint": "^8.15.0",
+        "@types/jest": "^27.5.1",
+        "@typescript-eslint/eslint-plugin": "^5.26.0",
+        "@typescript-eslint/parser": "^5.26.0",
+        "eslint": "^8.16.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.26.0",
         "jest": "^28.1.0",
         "jest-environment-jsdom": "^28.1.0",
-        "ts-jest": "^28.0.2",
-        "typescript": "^4.6.4"
+        "ts-jest": "^28.0.3",
+        "typescript": "^4.7.2"
     }
 }

package/src/DomUtils.ts

@@ -151,8 +151,15 @@ export namespace DomUtils {
         }
     }
 
+    /**
+     * Cast data as template format
+     * @param source Source data
+     * @param template Format template
+     * @param keepSource Keep other source properties
+     * @returns Result
+     */
     export function dataAs<T extends DataTypes.BasicTemplate>(
-        source: IFormData | {},
+        source: unknown,
         template: T,
         keepSource: boolean = false
     ): DataTypes.BasicTemplateType<T> {
@@ -160,8 +167,10 @@ export namespace DomUtils {
         // Object.create(...)
         const data = <DataTypes.BasicTemplateType<T>>{};
 
-        // Travel all properties
-        dataAsTraveller(source, data, template, keepSource, false);
+        if (source != null && typeof source === 'object') {
+            // Travel all properties
+            dataAsTraveller(source, data, template, keepSource, false);
+        }
 
         // Return
         return data;