@nebulaaa/color 1.0.0 → 1.1.0

package/dist/color.cjs

@@ -107,15 +107,15 @@ function Hex2Rgb(hex, options = {}) {
     const green = (number >> 8) & 255;
     const blue = number & 255;
     // NaN 的 typeof 也是 'number'，须显式排除，否则 css 格式会产出 'rgb(... / NaN%)'
-    const alpha = typeof options.alpha === 'number' && !Number.isNaN(options.alpha) ? options.alpha : alphaFromHex;
-    if (options.format === 'array') {
+    const alpha = typeof options.Alpha === 'number' && !Number.isNaN(options.Alpha) ? options.Alpha : alphaFromHex;
+    if (options.Format === 'array') {
         return [red, green, blue, alpha];
     }
-    if (options.format === 'css') {
+    if (options.Format === 'css') {
         const alphaString = alpha === 1 ? '' : ` / ${Number((alpha * 100).toFixed(2))}%`;
         return `rgb(${red} ${green} ${blue}${alphaString})`;
     }
-    return { red, green, blue, alpha };
+    return { R: red, G: green, B: blue, A: alpha };
 }
 /**
 Convert RGB(A) color to HEX.

package/dist/color.d.ts

@@ -6,7 +6,7 @@ interface RgbaOptions {
   
       @default 'object'
       */
-    readonly format?: 'object' | 'array' | 'css';
+    readonly Format?: 'object' | 'array' | 'css';
     /**
       Set the alpha of the color.
   
@@ -14,15 +14,15 @@ interface RgbaOptions {
   
       The number must be in the range 0 to 1.
       */
-    readonly alpha?: number;
+    readonly Alpha?: number;
 }
 interface RgbaObject {
-    red: number;
-    green: number;
-    blue: number;
-    alpha: number;
+    R: number;
+    G: number;
+    B: number;
+    A: number;
 }
-type RgbaTuple = [red: number, green: number, blue: number, alpha: number];
+type RgbaTuple = [R: number, G: number, B: number, A: number];
 
 /**
 Convert HEX color to RGBA.

package/dist/color.min.cjs

@@ -1 +1 @@
-"use strict";const e="a-f\\d",r=`#?[${e}]{3}[${e}]?`,t=`#?[${e}]{6}([${e}]{2})?`,n=new RegExp(`[^#${e}]`,"i"),o=new RegExp(`^${r}$|^${t}$`,"i");exports.Hex2Rgb=function(e,r={}){if("string"!=typeof e||n.test(e)||!o.test(e))throw new TypeError("Expected a valid hex string");if(null===r||"object"!=typeof r)throw new TypeError("Expected options as an object");let t=1;8===(e=e.replace(/^#/,"")).length&&(t=Number.parseInt(e.slice(6,8),16)/255,e=e.slice(0,6)),4===e.length&&(t=Number.parseInt(e.slice(3,4).repeat(2),16)/255,e=e.slice(0,3)),3===e.length&&(e=e[0]+e[0]+e[1]+e[1]+e[2]+e[2]);const i=Number.parseInt(e,16),a=i>>16,s=i>>8&255,p=255&i,l="number"!=typeof r.alpha||Number.isNaN(r.alpha)?t:r.alpha;if("array"===r.format)return[a,s,p,l];if("css"===r.format){return`rgb(${a} ${s} ${p}${1===l?"":` / ${Number((100*l).toFixed(2))}%`})`}return{red:a,green:s,blue:p,alpha:l}},exports.IsValidChannel=function(e){return!(!Number.isInteger(e)||e<0||e>255)},exports.Rgb2Hex=function(e,r,t,n){let o=`${e}${null!=n?n:""}`.includes("%");if("string"!=typeof e||r)void 0!==n&&(n=Number.parseFloat(String(n)));else{const i=(e=>{const r=e.replace(/rgba?\(([^)]+)\)/,"$1").split(/[,\s/]+/).filter(Boolean);if(r.length<3)return;const t=(e,r)=>{if((e=e.trim()).endsWith("%")){const t=Number.parseFloat(e);if(!Number.isFinite(t))throw new TypeError("Invalid or unsupported color format.");return Math.min(t*r/100,r)}const t=Number.parseFloat(e);if(!Number.isFinite(t))throw new TypeError("Invalid or unsupported color format.");return Math.min(t,r)},n=t(r[0],255),o=t(r[1],255),i=t(r[2],255);let a;return 4===r.length&&(a=t(r[3],1)),[n,o,i,a]})(e);if(!i)throw new TypeError("Invalid or unsupported color format.");o=!1,[e,r,t,n]=i}const i=e=>!Number.isInteger(e)||e<0||e>255;if("number"!=typeof e||"number"!=typeof r||"number"!=typeof t||i(e)||i(r)||i(t))throw new TypeError("Expected three numbers between 0 and 255");if("number"==typeof n){if(!o&&n>=0&&n<=1)n=Math.round(255*n);else{if(!(o&&n>=0&&n<=100))throw new TypeError(`Expected alpha value (${n}) as a fraction or percentage`);n=Math.round(255*n/100)}n=(256|n).toString(16).slice(1)}else n="";return((e,r,t,n)=>(t|r<<8|e<<16|1<<24).toString(16).slice(1)+n)(e,r,t,n)};
+"use strict";const e="a-f\\d",r=`#?[${e}]{3}[${e}]?`,t=`#?[${e}]{6}([${e}]{2})?`,n=new RegExp(`[^#${e}]`,"i"),o=new RegExp(`^${r}$|^${t}$`,"i");exports.Hex2Rgb=function(e,r={}){if("string"!=typeof e||n.test(e)||!o.test(e))throw new TypeError("Expected a valid hex string");if(null===r||"object"!=typeof r)throw new TypeError("Expected options as an object");let t=1;8===(e=e.replace(/^#/,"")).length&&(t=Number.parseInt(e.slice(6,8),16)/255,e=e.slice(0,6)),4===e.length&&(t=Number.parseInt(e.slice(3,4).repeat(2),16)/255,e=e.slice(0,3)),3===e.length&&(e=e[0]+e[0]+e[1]+e[1]+e[2]+e[2]);const i=Number.parseInt(e,16),s=i>>16,a=i>>8&255,p=255&i,l="number"!=typeof r.Alpha||Number.isNaN(r.Alpha)?t:r.Alpha;if("array"===r.Format)return[s,a,p,l];if("css"===r.Format){return`rgb(${s} ${a} ${p}${1===l?"":` / ${Number((100*l).toFixed(2))}%`})`}return{R:s,G:a,B:p,A:l}},exports.IsValidChannel=function(e){return!(!Number.isInteger(e)||e<0||e>255)},exports.Rgb2Hex=function(e,r,t,n){let o=`${e}${null!=n?n:""}`.includes("%");if("string"!=typeof e||r)void 0!==n&&(n=Number.parseFloat(String(n)));else{const i=(e=>{const r=e.replace(/rgba?\(([^)]+)\)/,"$1").split(/[,\s/]+/).filter(Boolean);if(r.length<3)return;const t=(e,r)=>{if((e=e.trim()).endsWith("%")){const t=Number.parseFloat(e);if(!Number.isFinite(t))throw new TypeError("Invalid or unsupported color format.");return Math.min(t*r/100,r)}const t=Number.parseFloat(e);if(!Number.isFinite(t))throw new TypeError("Invalid or unsupported color format.");return Math.min(t,r)},n=t(r[0],255),o=t(r[1],255),i=t(r[2],255);let s;return 4===r.length&&(s=t(r[3],1)),[n,o,i,s]})(e);if(!i)throw new TypeError("Invalid or unsupported color format.");o=!1,[e,r,t,n]=i}const i=e=>!Number.isInteger(e)||e<0||e>255;if("number"!=typeof e||"number"!=typeof r||"number"!=typeof t||i(e)||i(r)||i(t))throw new TypeError("Expected three numbers between 0 and 255");if("number"==typeof n){if(!o&&n>=0&&n<=1)n=Math.round(255*n);else{if(!(o&&n>=0&&n<=100))throw new TypeError(`Expected alpha value (${n}) as a fraction or percentage`);n=Math.round(255*n/100)}n=(256|n).toString(16).slice(1)}else n="";return((e,r,t,n)=>(t|r<<8|e<<16|1<<24).toString(16).slice(1)+n)(e,r,t,n)};

package/dist/color.min.mjs

@@ -1 +1 @@
-const e="a-f\\d",r=`#?[${e}]{3}[${e}]?`,t=`#?[${e}]{6}([${e}]{2})?`,n=new RegExp(`[^#${e}]`,"i"),o=new RegExp(`^${r}$|^${t}$`,"i");function i(e,r={}){if("string"!=typeof e||n.test(e)||!o.test(e))throw new TypeError("Expected a valid hex string");if(null===r||"object"!=typeof r)throw new TypeError("Expected options as an object");let t=1;8===(e=e.replace(/^#/,"")).length&&(t=Number.parseInt(e.slice(6,8),16)/255,e=e.slice(0,6)),4===e.length&&(t=Number.parseInt(e.slice(3,4).repeat(2),16)/255,e=e.slice(0,3)),3===e.length&&(e=e[0]+e[0]+e[1]+e[1]+e[2]+e[2]);const i=Number.parseInt(e,16),a=i>>16,s=i>>8&255,p=255&i,l="number"!=typeof r.alpha||Number.isNaN(r.alpha)?t:r.alpha;if("array"===r.format)return[a,s,p,l];if("css"===r.format){return`rgb(${a} ${s} ${p}${1===l?"":` / ${Number((100*l).toFixed(2))}%`})`}return{red:a,green:s,blue:p,alpha:l}}function a(e,r,t,n){let o=`${e}${null!=n?n:""}`.includes("%");if("string"!=typeof e||r)void 0!==n&&(n=Number.parseFloat(String(n)));else{const i=(e=>{const r=e.replace(/rgba?\(([^)]+)\)/,"$1").split(/[,\s/]+/).filter(Boolean);if(r.length<3)return;const t=(e,r)=>{if((e=e.trim()).endsWith("%")){const t=Number.parseFloat(e);if(!Number.isFinite(t))throw new TypeError("Invalid or unsupported color format.");return Math.min(t*r/100,r)}const t=Number.parseFloat(e);if(!Number.isFinite(t))throw new TypeError("Invalid or unsupported color format.");return Math.min(t,r)},n=t(r[0],255),o=t(r[1],255),i=t(r[2],255);let a;return 4===r.length&&(a=t(r[3],1)),[n,o,i,a]})(e);if(!i)throw new TypeError("Invalid or unsupported color format.");o=!1,[e,r,t,n]=i}const i=e=>!Number.isInteger(e)||e<0||e>255;if("number"!=typeof e||"number"!=typeof r||"number"!=typeof t||i(e)||i(r)||i(t))throw new TypeError("Expected three numbers between 0 and 255");if("number"==typeof n){if(!o&&n>=0&&n<=1)n=Math.round(255*n);else{if(!(o&&n>=0&&n<=100))throw new TypeError(`Expected alpha value (${n}) as a fraction or percentage`);n=Math.round(255*n/100)}n=(256|n).toString(16).slice(1)}else n="";return((e,r,t,n)=>(t|r<<8|e<<16|1<<24).toString(16).slice(1)+n)(e,r,t,n)}function s(e){return!(!Number.isInteger(e)||e<0||e>255)}export{i as Hex2Rgb,s as IsValidChannel,a as Rgb2Hex};
+const e="a-f\\d",r=`#?[${e}]{3}[${e}]?`,t=`#?[${e}]{6}([${e}]{2})?`,n=new RegExp(`[^#${e}]`,"i"),o=new RegExp(`^${r}$|^${t}$`,"i");function i(e,r={}){if("string"!=typeof e||n.test(e)||!o.test(e))throw new TypeError("Expected a valid hex string");if(null===r||"object"!=typeof r)throw new TypeError("Expected options as an object");let t=1;8===(e=e.replace(/^#/,"")).length&&(t=Number.parseInt(e.slice(6,8),16)/255,e=e.slice(0,6)),4===e.length&&(t=Number.parseInt(e.slice(3,4).repeat(2),16)/255,e=e.slice(0,3)),3===e.length&&(e=e[0]+e[0]+e[1]+e[1]+e[2]+e[2]);const i=Number.parseInt(e,16),s=i>>16,a=i>>8&255,p=255&i,l="number"!=typeof r.Alpha||Number.isNaN(r.Alpha)?t:r.Alpha;if("array"===r.Format)return[s,a,p,l];if("css"===r.Format){return`rgb(${s} ${a} ${p}${1===l?"":` / ${Number((100*l).toFixed(2))}%`})`}return{R:s,G:a,B:p,A:l}}function s(e,r,t,n){let o=`${e}${null!=n?n:""}`.includes("%");if("string"!=typeof e||r)void 0!==n&&(n=Number.parseFloat(String(n)));else{const i=(e=>{const r=e.replace(/rgba?\(([^)]+)\)/,"$1").split(/[,\s/]+/).filter(Boolean);if(r.length<3)return;const t=(e,r)=>{if((e=e.trim()).endsWith("%")){const t=Number.parseFloat(e);if(!Number.isFinite(t))throw new TypeError("Invalid or unsupported color format.");return Math.min(t*r/100,r)}const t=Number.parseFloat(e);if(!Number.isFinite(t))throw new TypeError("Invalid or unsupported color format.");return Math.min(t,r)},n=t(r[0],255),o=t(r[1],255),i=t(r[2],255);let s;return 4===r.length&&(s=t(r[3],1)),[n,o,i,s]})(e);if(!i)throw new TypeError("Invalid or unsupported color format.");o=!1,[e,r,t,n]=i}const i=e=>!Number.isInteger(e)||e<0||e>255;if("number"!=typeof e||"number"!=typeof r||"number"!=typeof t||i(e)||i(r)||i(t))throw new TypeError("Expected three numbers between 0 and 255");if("number"==typeof n){if(!o&&n>=0&&n<=1)n=Math.round(255*n);else{if(!(o&&n>=0&&n<=100))throw new TypeError(`Expected alpha value (${n}) as a fraction or percentage`);n=Math.round(255*n/100)}n=(256|n).toString(16).slice(1)}else n="";return((e,r,t,n)=>(t|r<<8|e<<16|1<<24).toString(16).slice(1)+n)(e,r,t,n)}function a(e){return!(!Number.isInteger(e)||e<0||e>255)}export{i as Hex2Rgb,a as IsValidChannel,s as Rgb2Hex};

package/dist/color.mjs

@@ -105,15 +105,15 @@ function Hex2Rgb(hex, options = {}) {
     const green = (number >> 8) & 255;
     const blue = number & 255;
     // NaN 的 typeof 也是 'number'，须显式排除，否则 css 格式会产出 'rgb(... / NaN%)'
-    const alpha = typeof options.alpha === 'number' && !Number.isNaN(options.alpha) ? options.alpha : alphaFromHex;
-    if (options.format === 'array') {
+    const alpha = typeof options.Alpha === 'number' && !Number.isNaN(options.Alpha) ? options.Alpha : alphaFromHex;
+    if (options.Format === 'array') {
         return [red, green, blue, alpha];
     }
-    if (options.format === 'css') {
+    if (options.Format === 'css') {
         const alphaString = alpha === 1 ? '' : ` / ${Number((alpha * 100).toFixed(2))}%`;
         return `rgb(${red} ${green} ${blue}${alphaString})`;
     }
-    return { red, green, blue, alpha };
+    return { R: red, G: green, B: blue, A: alpha };
 }
 /**
 Convert RGB(A) color to HEX.

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nebulaaa/color",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "颜色转换扩展包",
   "author": "doooreyn",
   "license": "MIT",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nebulaaa/color",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "颜色转换扩展包",
   "main": "./dist/color.cjs",
   "module": "./dist/color.mjs",