@etsoo/shared 1.1.17 → 1.1.18

package/__tests__/{EColor.ts → ColorUtils.ts}

@@ -1,4 +1,5 @@
 import { EColor } from '../src/types/EColor';
+import { ColorUtils } from '../src/ColorUtils';
 
 test('Tests for parse', () => {
     // Arrange & act
@@ -13,7 +14,7 @@ test('Tests for parse', () => {
 });
 
 test('Tests for getColors', () => {
-    const colors = EColor.getColors(undefined, 128);
+    const colors = ColorUtils.getColors(undefined, 128);
     expect(colors.length).toBe(8);
 });
 

package/lib/cjs/ColorUtils.d.ts

@@ -0,0 +1,23 @@
+import { EColor } from './types/EColor';
+/**
+ * Color utils
+ */
+export declare namespace ColorUtils {
+    /**
+     * Get HEX or RGB colors
+     * @param init Initial color
+     * @param factor Increase factor
+     * @param adjustOrder Adjust order to increase difference
+     * @param hex to HEX or not
+     * @returns Result
+     */
+    function getColors(init?: string, factor?: number, adjustOrder?: boolean, hex?: boolean): string[];
+    /**
+     * Get EColors
+     * @param init Initial color
+     * @param factor Increase factor
+     * @param adjustOrder Adjust order to increase difference
+     * @returns Result
+     */
+    function getEColors(init?: string, factor?: number, adjustOrder?: boolean): EColor[];
+}

package/lib/cjs/ColorUtils.js

@@ -0,0 +1,80 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ColorUtils = void 0;
+const EColor_1 = require("./types/EColor");
+/**
+ * Color utils
+ */
+var ColorUtils;
+(function (ColorUtils) {
+    /**
+     * Get HEX or RGB colors
+     * @param init Initial color
+     * @param factor Increase factor
+     * @param adjustOrder Adjust order to increase difference
+     * @param hex to HEX or not
+     * @returns Result
+     */
+    function getColors(init = '#000', factor = 51, adjustOrder = true, hex = true) {
+        return getEColors(init, factor, adjustOrder).map((c) => hex ? c.toHEXColor() : c.toRGBColor());
+    }
+    ColorUtils.getColors = getColors;
+    /**
+     * Get EColors
+     * @param init Initial color
+     * @param factor Increase factor
+     * @param adjustOrder Adjust order to increase difference
+     * @returns Result
+     */
+    function getEColors(init = '#000', factor = 51, adjustOrder = true) {
+        var _a;
+        // Init color
+        const initColor = (_a = EColor_1.EColor.parse(init)) !== null && _a !== void 0 ? _a : new EColor_1.EColor(0, 0, 0);
+        // Factors elements
+        // 51 = '00', '33', '66', '99', 'cc', 'ff'
+        const factors = [];
+        let f = 0;
+        while (f <= 255) {
+            factors.push(f);
+            f += factor;
+        }
+        // RGB loop
+        const colors = [initColor];
+        for (const r of factors) {
+            for (const g of factors) {
+                for (const b of factors) {
+                    colors.push(initColor.clone(r, g, b));
+                }
+            }
+        }
+        // Non-nullable colors
+        const nColors = colors.filter((color) => color != null);
+        // Adjust order
+        if (adjustOrder) {
+            const firstColor = nColors.shift();
+            if (firstColor) {
+                let color = firstColor;
+                const newColors = [color];
+                while (nColors.length > 0) {
+                    const result = nColors.reduce((p, c, index) => {
+                        const delta = color.getDeltaValue(c);
+                        if (delta != null && delta > p.delta) {
+                            p.delta = delta;
+                            p.color = c;
+                            p.index = index;
+                        }
+                        return p;
+                    }, { delta: 0, color, index: -1 });
+                    if (result.delta > 0) {
+                        color = result.color;
+                        newColors.push(color);
+                        nColors.splice(result.index, 1);
+                    }
+                }
+                return newColors;
+            }
+        }
+        return nColors;
+    }
+    ColorUtils.getEColors = getEColors;
+})(ColorUtils = exports.ColorUtils || (exports.ColorUtils = {}));

package/lib/cjs/index.d.ts

@@ -4,6 +4,7 @@ export * from './types/FormData';
 export * from './storage/IStorage';
 export * from './storage/WindowStorage';
 export * from './DataTypes';
+export * from './ColorUtils';
 export * from './DateUtils';
 export * from './DomUtils';
 export * from './ExtendUtils';

package/lib/cjs/index.js

@@ -20,6 +20,7 @@ __exportStar(require("./types/FormData"), exports);
 __exportStar(require("./storage/IStorage"), exports);
 __exportStar(require("./storage/WindowStorage"), exports);
 __exportStar(require("./DataTypes"), exports);
+__exportStar(require("./ColorUtils"), exports);
 __exportStar(require("./DateUtils"), exports);
 __exportStar(require("./DomUtils"), exports);
 __exportStar(require("./ExtendUtils"), exports);

package/lib/cjs/types/EColor.d.ts

@@ -13,23 +13,6 @@ export declare class EColor {
      * @returns Adjusted value
      */
     static adjust(value: number, adjust?: number): number;
-    /**
-     * Get HEX or RGB colors
-     * @param init Initial color
-     * @param factor Increase factor
-     * @param adjustOrder Adjust order to increase difference
-     * @param hex to HEX or not
-     * @returns Result
-     */
-    static getColors(init?: string, factor?: number, adjustOrder?: boolean, hex?: boolean): string[];
-    /**
-     * Get EColors
-     * @param init Initial color
-     * @param factor Increase factor
-     * @param adjustOrder Adjust order to increase difference
-     * @returns Result
-     */
-    static getEColors(init?: string, factor?: number, adjustOrder?: boolean): EColor[];
     /**
      * HEX string to integer value
      * @param hex HEX string

package/lib/cjs/types/EColor.js

@@ -32,74 +32,6 @@ class EColor {
             return value % 255;
         return value;
     }
-    /**
-     * Get HEX or RGB colors
-     * @param init Initial color
-     * @param factor Increase factor
-     * @param adjustOrder Adjust order to increase difference
-     * @param hex to HEX or not
-     * @returns Result
-     */
-    static getColors(init = '#000', factor = 51, adjustOrder = true, hex = true) {
-        return EColor.getEColors(init, factor, adjustOrder).map((c) => hex ? c.toHEXColor() : c.toRGBColor());
-    }
-    /**
-     * Get EColors
-     * @param init Initial color
-     * @param factor Increase factor
-     * @param adjustOrder Adjust order to increase difference
-     * @returns Result
-     */
-    static getEColors(init = '#000', factor = 51, adjustOrder = true) {
-        var _a;
-        // Init color
-        const initColor = (_a = EColor.parse(init)) !== null && _a !== void 0 ? _a : new EColor(0, 0, 0);
-        // Factors elements
-        // 51 = '00', '33', '66', '99', 'cc', 'ff'
-        const factors = [];
-        let f = 0;
-        while (f <= 255) {
-            factors.push(f);
-            f += factor;
-        }
-        // RGB loop
-        const colors = [initColor];
-        for (const r of factors) {
-            for (const g of factors) {
-                for (const b of factors) {
-                    colors.push(initColor.clone(r, g, b));
-                }
-            }
-        }
-        // Non-nullable colors
-        const nColors = colors.filter((color) => color != null);
-        // Adjust order
-        if (adjustOrder) {
-            const firstColor = nColors.shift();
-            if (firstColor) {
-                let color = firstColor;
-                const newColors = [color];
-                while (nColors.length > 0) {
-                    const result = nColors.reduce((p, c, index) => {
-                        const delta = color.getDeltaValue(c);
-                        if (delta != null && delta > p.delta) {
-                            p.delta = delta;
-                            p.color = c;
-                            p.index = index;
-                        }
-                        return p;
-                    }, { delta: 0, color, index: -1 });
-                    if (result.delta > 0) {
-                        color = result.color;
-                        newColors.push(color);
-                        nColors.splice(result.index, 1);
-                    }
-                }
-                return newColors;
-            }
-        }
-        return nColors;
-    }
     /**
      * HEX string to integer value
      * @param hex HEX string
@@ -125,7 +57,7 @@ class EColor {
         // Null
         if (htmlColor == null)
             return undefined;
-        htmlColor = htmlColor.toUpperCase();
+        htmlColor = htmlColor.trim().toUpperCase();
         // HEX color
         if (htmlColor.startsWith('#')) {
             htmlColor = htmlColor.substring(1);

package/lib/mjs/ColorUtils.d.ts

@@ -0,0 +1,23 @@
+import { EColor } from './types/EColor';
+/**
+ * Color utils
+ */
+export declare namespace ColorUtils {
+    /**
+     * Get HEX or RGB colors
+     * @param init Initial color
+     * @param factor Increase factor
+     * @param adjustOrder Adjust order to increase difference
+     * @param hex to HEX or not
+     * @returns Result
+     */
+    function getColors(init?: string, factor?: number, adjustOrder?: boolean, hex?: boolean): string[];
+    /**
+     * Get EColors
+     * @param init Initial color
+     * @param factor Increase factor
+     * @param adjustOrder Adjust order to increase difference
+     * @returns Result
+     */
+    function getEColors(init?: string, factor?: number, adjustOrder?: boolean): EColor[];
+}

package/lib/mjs/ColorUtils.js

@@ -0,0 +1,77 @@
+import { EColor } from './types/EColor';
+/**
+ * Color utils
+ */
+export var ColorUtils;
+(function (ColorUtils) {
+    /**
+     * Get HEX or RGB colors
+     * @param init Initial color
+     * @param factor Increase factor
+     * @param adjustOrder Adjust order to increase difference
+     * @param hex to HEX or not
+     * @returns Result
+     */
+    function getColors(init = '#000', factor = 51, adjustOrder = true, hex = true) {
+        return getEColors(init, factor, adjustOrder).map((c) => hex ? c.toHEXColor() : c.toRGBColor());
+    }
+    ColorUtils.getColors = getColors;
+    /**
+     * Get EColors
+     * @param init Initial color
+     * @param factor Increase factor
+     * @param adjustOrder Adjust order to increase difference
+     * @returns Result
+     */
+    function getEColors(init = '#000', factor = 51, adjustOrder = true) {
+        var _a;
+        // Init color
+        const initColor = (_a = EColor.parse(init)) !== null && _a !== void 0 ? _a : new EColor(0, 0, 0);
+        // Factors elements
+        // 51 = '00', '33', '66', '99', 'cc', 'ff'
+        const factors = [];
+        let f = 0;
+        while (f <= 255) {
+            factors.push(f);
+            f += factor;
+        }
+        // RGB loop
+        const colors = [initColor];
+        for (const r of factors) {
+            for (const g of factors) {
+                for (const b of factors) {
+                    colors.push(initColor.clone(r, g, b));
+                }
+            }
+        }
+        // Non-nullable colors
+        const nColors = colors.filter((color) => color != null);
+        // Adjust order
+        if (adjustOrder) {
+            const firstColor = nColors.shift();
+            if (firstColor) {
+                let color = firstColor;
+                const newColors = [color];
+                while (nColors.length > 0) {
+                    const result = nColors.reduce((p, c, index) => {
+                        const delta = color.getDeltaValue(c);
+                        if (delta != null && delta > p.delta) {
+                            p.delta = delta;
+                            p.color = c;
+                            p.index = index;
+                        }
+                        return p;
+                    }, { delta: 0, color, index: -1 });
+                    if (result.delta > 0) {
+                        color = result.color;
+                        newColors.push(color);
+                        nColors.splice(result.index, 1);
+                    }
+                }
+                return newColors;
+            }
+        }
+        return nColors;
+    }
+    ColorUtils.getEColors = getEColors;
+})(ColorUtils || (ColorUtils = {}));

package/lib/mjs/index.d.ts

@@ -4,6 +4,7 @@ export * from './types/FormData';
 export * from './storage/IStorage';
 export * from './storage/WindowStorage';
 export * from './DataTypes';
+export * from './ColorUtils';
 export * from './DateUtils';
 export * from './DomUtils';
 export * from './ExtendUtils';

package/lib/mjs/index.js

@@ -4,6 +4,7 @@ export * from './types/FormData';
 export * from './storage/IStorage';
 export * from './storage/WindowStorage';
 export * from './DataTypes';
+export * from './ColorUtils';
 export * from './DateUtils';
 export * from './DomUtils';
 export * from './ExtendUtils';

package/lib/mjs/types/EColor.d.ts

@@ -13,23 +13,6 @@ export declare class EColor {
      * @returns Adjusted value
      */
     static adjust(value: number, adjust?: number): number;
-    /**
-     * Get HEX or RGB colors
-     * @param init Initial color
-     * @param factor Increase factor
-     * @param adjustOrder Adjust order to increase difference
-     * @param hex to HEX or not
-     * @returns Result
-     */
-    static getColors(init?: string, factor?: number, adjustOrder?: boolean, hex?: boolean): string[];
-    /**
-     * Get EColors
-     * @param init Initial color
-     * @param factor Increase factor
-     * @param adjustOrder Adjust order to increase difference
-     * @returns Result
-     */
-    static getEColors(init?: string, factor?: number, adjustOrder?: boolean): EColor[];
     /**
      * HEX string to integer value
      * @param hex HEX string

package/lib/mjs/types/EColor.js

@@ -29,74 +29,6 @@ export class EColor {
             return value % 255;
         return value;
     }
-    /**
-     * Get HEX or RGB colors
-     * @param init Initial color
-     * @param factor Increase factor
-     * @param adjustOrder Adjust order to increase difference
-     * @param hex to HEX or not
-     * @returns Result
-     */
-    static getColors(init = '#000', factor = 51, adjustOrder = true, hex = true) {
-        return EColor.getEColors(init, factor, adjustOrder).map((c) => hex ? c.toHEXColor() : c.toRGBColor());
-    }
-    /**
-     * Get EColors
-     * @param init Initial color
-     * @param factor Increase factor
-     * @param adjustOrder Adjust order to increase difference
-     * @returns Result
-     */
-    static getEColors(init = '#000', factor = 51, adjustOrder = true) {
-        var _a;
-        // Init color
-        const initColor = (_a = EColor.parse(init)) !== null && _a !== void 0 ? _a : new EColor(0, 0, 0);
-        // Factors elements
-        // 51 = '00', '33', '66', '99', 'cc', 'ff'
-        const factors = [];
-        let f = 0;
-        while (f <= 255) {
-            factors.push(f);
-            f += factor;
-        }
-        // RGB loop
-        const colors = [initColor];
-        for (const r of factors) {
-            for (const g of factors) {
-                for (const b of factors) {
-                    colors.push(initColor.clone(r, g, b));
-                }
-            }
-        }
-        // Non-nullable colors
-        const nColors = colors.filter((color) => color != null);
-        // Adjust order
-        if (adjustOrder) {
-            const firstColor = nColors.shift();
-            if (firstColor) {
-                let color = firstColor;
-                const newColors = [color];
-                while (nColors.length > 0) {
-                    const result = nColors.reduce((p, c, index) => {
-                        const delta = color.getDeltaValue(c);
-                        if (delta != null && delta > p.delta) {
-                            p.delta = delta;
-                            p.color = c;
-                            p.index = index;
-                        }
-                        return p;
-                    }, { delta: 0, color, index: -1 });
-                    if (result.delta > 0) {
-                        color = result.color;
-                        newColors.push(color);
-                        nColors.splice(result.index, 1);
-                    }
-                }
-                return newColors;
-            }
-        }
-        return nColors;
-    }
     /**
      * HEX string to integer value
      * @param hex HEX string
@@ -122,7 +54,7 @@ export class EColor {
         // Null
         if (htmlColor == null)
             return undefined;
-        htmlColor = htmlColor.toUpperCase();
+        htmlColor = htmlColor.trim().toUpperCase();
         // HEX color
         if (htmlColor.startsWith('#')) {
             htmlColor = htmlColor.substring(1);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/shared",
-    "version": "1.1.17",
+    "version": "1.1.18",
     "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.14.0",
-        "@typescript-eslint/parser": "^5.14.0",
-        "eslint": "^8.10.0",
+        "@typescript-eslint/eslint-plugin": "^5.16.0",
+        "@typescript-eslint/parser": "^5.16.0",
+        "eslint": "^8.11.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.25.4",
         "jest": "^27.5.1",
-        "ts-jest": "^27.1.3",
-        "typescript": "^4.6.2"
+        "ts-jest": "^27.1.4",
+        "typescript": "^4.6.3"
     }
 }

package/src/ColorUtils.ts

@@ -0,0 +1,99 @@
+import { EColor } from './types/EColor';
+
+/**
+ * Color utils
+ */
+export namespace ColorUtils {
+    /**
+     * Get HEX or RGB colors
+     * @param init Initial color
+     * @param factor Increase factor
+     * @param adjustOrder Adjust order to increase difference
+     * @param hex to HEX or not
+     * @returns Result
+     */
+    export function getColors(
+        init: string = '#000',
+        factor: number = 51,
+        adjustOrder: boolean = true,
+        hex: boolean = true
+    ) {
+        return getEColors(init, factor, adjustOrder).map((c) =>
+            hex ? c.toHEXColor() : c.toRGBColor()
+        );
+    }
+
+    /**
+     * Get EColors
+     * @param init Initial color
+     * @param factor Increase factor
+     * @param adjustOrder Adjust order to increase difference
+     * @returns Result
+     */
+    export function getEColors(
+        init: string = '#000',
+        factor: number = 51,
+        adjustOrder: boolean = true
+    ): EColor[] {
+        // Init color
+        const initColor = EColor.parse(init) ?? new EColor(0, 0, 0);
+
+        // Factors elements
+        // 51 = '00', '33', '66', '99', 'cc', 'ff'
+        const factors: number[] = [];
+        let f = 0;
+        while (f <= 255) {
+            factors.push(f);
+            f += factor;
+        }
+
+        // RGB loop
+        const colors: (EColor | undefined)[] = [initColor];
+        for (const r of factors) {
+            for (const g of factors) {
+                for (const b of factors) {
+                    colors.push(initColor.clone(r, g, b));
+                }
+            }
+        }
+
+        // Non-nullable colors
+        const nColors = colors.filter(
+            (color): color is EColor => color != null
+        );
+
+        // Adjust order
+        if (adjustOrder) {
+            const firstColor = nColors.shift();
+            if (firstColor) {
+                let color = firstColor;
+                const newColors: EColor[] = [color];
+
+                while (nColors.length > 0) {
+                    const result = nColors.reduce(
+                        (p, c, index) => {
+                            const delta = color.getDeltaValue(c);
+                            if (delta != null && delta > p.delta) {
+                                p.delta = delta;
+                                p.color = c;
+                                p.index = index;
+                            }
+                            return p;
+                        },
+                        { delta: 0, color, index: -1 }
+                    );
+
+                    if (result.delta > 0) {
+                        color = result.color;
+                        newColors.push(color);
+                        nColors.splice(result.index, 1);
+                    }
+                }
+
+                return newColors;
+            }
+        }
+
+        return nColors;
+    }
+}

package/src/index.ts

@@ -6,6 +6,7 @@ export * from './storage/IStorage';
 export * from './storage/WindowStorage';
 
 export * from './DataTypes';
+export * from './ColorUtils';
 export * from './DateUtils';
 export * from './DomUtils';
 export * from './ExtendUtils';

package/src/types/EColor.ts

@@ -15,99 +15,6 @@ export class EColor {
         return value;
     }
 
-    /**
-     * Get HEX or RGB colors
-     * @param init Initial color
-     * @param factor Increase factor
-     * @param adjustOrder Adjust order to increase difference
-     * @param hex to HEX or not
-     * @returns Result
-     */
-    static getColors(
-        init: string = '#000',
-        factor: number = 51,
-        adjustOrder: boolean = true,
-        hex: boolean = true
-    ) {
-        return EColor.getEColors(init, factor, adjustOrder).map((c) =>
-            hex ? c.toHEXColor() : c.toRGBColor()
-        );
-    }
-
-    /**
-     * Get EColors
-     * @param init Initial color
-     * @param factor Increase factor
-     * @param adjustOrder Adjust order to increase difference
-     * @returns Result
-     */
-    static getEColors(
-        init: string = '#000',
-        factor: number = 51,
-        adjustOrder: boolean = true
-    ): EColor[] {
-        // Init color
-        const initColor = EColor.parse(init) ?? new EColor(0, 0, 0);
-
-        // Factors elements
-        // 51 = '00', '33', '66', '99', 'cc', 'ff'
-        const factors: number[] = [];
-        let f = 0;
-        while (f <= 255) {
-            factors.push(f);
-            f += factor;
-        }
-
-        // RGB loop
-        const colors: (EColor | undefined)[] = [initColor];
-        for (const r of factors) {
-            for (const g of factors) {
-                for (const b of factors) {
-                    colors.push(initColor.clone(r, g, b));
-                }
-            }
-        }
-
-        // Non-nullable colors
-        const nColors = colors.filter(
-            (color): color is EColor => color != null
-        );
-
-        // Adjust order
-        if (adjustOrder) {
-            const firstColor = nColors.shift();
-            if (firstColor) {
-                let color = firstColor;
-                const newColors: EColor[] = [color];
-
-                while (nColors.length > 0) {
-                    const result = nColors.reduce(
-                        (p, c, index) => {
-                            const delta = color.getDeltaValue(c);
-                            if (delta != null && delta > p.delta) {
-                                p.delta = delta;
-                                p.color = c;
-                                p.index = index;
-                            }
-                            return p;
-                        },
-                        { delta: 0, color, index: -1 }
-                    );
-
-                    if (result.delta > 0) {
-                        color = result.color;
-                        newColors.push(color);
-                        nColors.splice(result.index, 1);
-                    }
-                }
-
-                return newColors;
-            }
-        }
-
-        return nColors;
-    }
-
     /**
      * HEX string to integer value
      * @param hex HEX string
@@ -134,7 +41,7 @@ export class EColor {
     static parse(htmlColor?: string | null): EColor | undefined {
         // Null
         if (htmlColor == null) return undefined;
-        htmlColor = htmlColor.toUpperCase();
+        htmlColor = htmlColor.trim().toUpperCase();
 
         // HEX color
         if (htmlColor.startsWith('#')) {