fix: add _hsl_s and _hsv_s, limit h to 0-360

Author: XGHeaven

src/FastColor.ts

@@ -86,7 +86,8 @@ export class FastColor {
 
   // HSV privates
   private _h?: number;
-  private _s?: number;
+  private _hsl_s?: number;
+  private _hsv_s?: number;
   private _l?: number;
   private _v?: number;
 
@@ -143,7 +144,8 @@ export class FastColor {
       this.b = input.b;
       this.a = input.a;
       this._h = input._h;
-      this._s = input._s;
+      this._hsl_s = input._hsl_s;
+      this._hsv_s = input._hsv_s;
       this._l = input._l;
       this._v = input._v;
     } else if (matchFormat('rgb')) {
@@ -235,28 +237,28 @@ export class FastColor {
   }
 
   getHSVSaturation(): number {
-    if (typeof this._s === 'undefined') {
+    if (typeof this._hsv_s === 'undefined') {
       const delta = this.getMax() - this.getMin();
       if (delta === 0) {
-        this._s = 0;
+        this._hsv_s = 0;
       } else {
-        this._s = delta / this.getMax();
+        this._hsv_s = delta / this.getMax();
       }
     }
-    return this._s;
+    return this._hsv_s;
   }
 
   getHSLSaturation(): number {
-    if (typeof this._s === 'undefined') {
+    if (typeof this._hsl_s === 'undefined') {
       const delta = this.getMax() - this.getMin();
       if (delta === 0) {
-        this._s = 0;
+        this._hsl_s = 0;
       } else {
         const l = this.getLightness();
-        this._s = (delta/255) / (1 - Math.abs(2 * l - 1));
+        this._hsl_s = (delta/255) / (1 - Math.abs(2 * l - 1));
       }
     }
-    return this._s;
+    return this._hsl_s;
   }
 
   getLightness(): number {
@@ -502,8 +504,8 @@ export class FastColor {
   }
 
   private fromHsl({ h, s, l, a }: OptionalA<HSL>): void {
-    this._h = h = h % 360;
-    this._s = s;
+    this._h = h = ((h % 360) + 360) % 360;
+    this._hsl_s = s;
     this._l = l;
     this.a = typeof a === 'number' ? a : 1;
 
@@ -550,8 +552,8 @@ export class FastColor {
   }
 
   private fromHsv({ h, s, v, a }: OptionalA<HSV>): void {
-    this._h = h % 360;
-    this._s = s;
+    this._h = h = ((h % 360) + 360) % 360;
+    this._hsv_s = s;
     this._v = v;
     this.a = typeof a === 'number' ? a : 1;
 

tests/hsl.test.ts

@@ -87,5 +87,12 @@ describe('hsl', () => {
 		expect(minCap.getLightness()).toBe(0);
 		expect(maxCap.getLightness()).toBe(1);
 	});
+
+	it('normalizes H outside range for HSL (object input)', () => {
+		// -60 -> 300 (magenta)
+		expect(new FastColor({ h: -60, s: 1, l: 0.5 }).toHexString()).toBe('#ff00ff');
+		// 420 -> 60 (yellow)
+		expect(new FastColor({ h: 420, s: 1, l: 0.5 }).toHexString()).toBe('#ffff00');
+	});
 });
 

tests/hsv.test.ts

@@ -55,4 +55,11 @@ describe('hsv', () => {
     const turn = base.setHue(233);
     expect(turn.getValue()).toBe(1);
   });
+
+  it('normalizes H outside range for HSV (object input)', () => {
+    // -60 -> 300 (magenta)
+    expect(new FastColor({ h: -60, s: 1, v: 1 }).toHexString()).toBe('#ff00ff');
+    // 420 -> 60 (yellow)
+    expect(new FastColor({ h: 420, s: 1, v: 1 }).toHexString()).toBe('#ffff00');
+  });
 });