@etsoo/shared 1.1.16 → 1.1.17

package/__tests__/EColor.ts

@@ -16,3 +16,10 @@ test('Tests for getColors', () => {
     const colors = EColor.getColors(undefined, 128);
     expect(colors.length).toBe(8);
 });
+
+test('Tests for toRGBColor', () => {
+    const color = new EColor(0, 0, 0);
+    expect(color.toRGBColor()).toBe('RGB(0, 0, 0)');
+    expect(color.toRGBColor(0.1)).toBe('RGBA(0, 0, 0, 0.1)');
+    expect(color.alpha).toBeUndefined();
+});

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

@@ -98,8 +98,8 @@ export declare class EColor {
     toLabValue(): [number, number, number];
     /**
      * To RGB color string
-     * @param includeAlpha Include alpha or not
+     * @param alpha Alpha value, false means ignore it
      * @returns RGB color string
      */
-    toRGBColor(includeAlpha?: boolean): string;
+    toRGBColor(alpha?: boolean | number): string;
 }

package/lib/cjs/types/EColor.js

@@ -250,15 +250,24 @@ class EColor {
     }
     /**
      * To RGB color string
-     * @param includeAlpha Include alpha or not
+     * @param alpha Alpha value, false means ignore it
      * @returns RGB color string
      */
-    toRGBColor(includeAlpha) {
-        var _a;
-        // Default case
-        includeAlpha !== null && includeAlpha !== void 0 ? includeAlpha : (includeAlpha = this.alpha != null);
+    toRGBColor(alpha) {
+        // Decide
+        let includeAlpha, alphaValue = this.alpha;
+        if (typeof alpha === 'number') {
+            alphaValue = alpha;
+            includeAlpha = true;
+        }
+        else if (alpha == null) {
+            includeAlpha = this.alpha != null;
+        }
+        else {
+            includeAlpha = alpha;
+        }
         if (includeAlpha)
-            return `RGBA(${this.r}, ${this.g}, ${this.b}, ${(_a = this.alpha) !== null && _a !== void 0 ? _a : 1})`;
+            return `RGBA(${this.r}, ${this.g}, ${this.b}, ${alphaValue !== null && alphaValue !== void 0 ? alphaValue : 1})`;
         return `RGB(${this.r}, ${this.g}, ${this.b})`;
     }
 }

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

@@ -98,8 +98,8 @@ export declare class EColor {
     toLabValue(): [number, number, number];
     /**
      * To RGB color string
-     * @param includeAlpha Include alpha or not
+     * @param alpha Alpha value, false means ignore it
      * @returns RGB color string
      */
-    toRGBColor(includeAlpha?: boolean): string;
+    toRGBColor(alpha?: boolean | number): string;
 }

package/lib/mjs/types/EColor.js

@@ -247,15 +247,24 @@ export class EColor {
     }
     /**
      * To RGB color string
-     * @param includeAlpha Include alpha or not
+     * @param alpha Alpha value, false means ignore it
      * @returns RGB color string
      */
-    toRGBColor(includeAlpha) {
-        var _a;
-        // Default case
-        includeAlpha !== null && includeAlpha !== void 0 ? includeAlpha : (includeAlpha = this.alpha != null);
+    toRGBColor(alpha) {
+        // Decide
+        let includeAlpha, alphaValue = this.alpha;
+        if (typeof alpha === 'number') {
+            alphaValue = alpha;
+            includeAlpha = true;
+        }
+        else if (alpha == null) {
+            includeAlpha = this.alpha != null;
+        }
+        else {
+            includeAlpha = alpha;
+        }
         if (includeAlpha)
-            return `RGBA(${this.r}, ${this.g}, ${this.b}, ${(_a = this.alpha) !== null && _a !== void 0 ? _a : 1})`;
+            return `RGBA(${this.r}, ${this.g}, ${this.b}, ${alphaValue !== null && alphaValue !== void 0 ? alphaValue : 1})`;
         return `RGB(${this.r}, ${this.g}, ${this.b})`;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/shared",
-    "version": "1.1.16",
+    "version": "1.1.17",
     "description": "TypeScript shared utilities and functions",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -55,8 +55,8 @@
     "dependencies": {},
     "devDependencies": {
         "@types/jest": "^27.4.1",
-        "@typescript-eslint/eslint-plugin": "^5.13.0",
-        "@typescript-eslint/parser": "^5.13.0",
+        "@typescript-eslint/eslint-plugin": "^5.14.0",
+        "@typescript-eslint/parser": "^5.14.0",
         "eslint": "^8.10.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.25.4",

package/src/types/EColor.ts

@@ -309,15 +309,25 @@ export class EColor {
 
     /**
      * To RGB color string
-     * @param includeAlpha Include alpha or not
+     * @param alpha Alpha value, false means ignore it
      * @returns RGB color string
      */
-    toRGBColor(includeAlpha?: boolean) {
-        // Default case
-        includeAlpha ??= this.alpha != null;
+    toRGBColor(alpha?: boolean | number) {
+        // Decide
+        let includeAlpha: boolean,
+            alphaValue: number | undefined = this.alpha;
+
+        if (typeof alpha === 'number') {
+            alphaValue = alpha;
+            includeAlpha = true;
+        } else if (alpha == null) {
+            includeAlpha = this.alpha != null;
+        } else {
+            includeAlpha = alpha;
+        }
 
         if (includeAlpha)
-            return `RGBA(${this.r}, ${this.g}, ${this.b}, ${this.alpha ?? 1})`;
+            return `RGBA(${this.r}, ${this.g}, ${this.b}, ${alphaValue ?? 1})`;
 
         return `RGB(${this.r}, ${this.g}, ${this.b})`;
     }