@versatiles/style 5.8.4 → 5.9.1

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@versatiles/style",
-  "version": "5.8.4",
+  "version": "5.9.1",
   "description": "Generate StyleJSON for MapLibre",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "devEngines": {
     "runtime": {
       "name": "node",
-      "version": ">=20.0.0 <24.0.0"
+      "version": ">= 20.0.0"
     }
   },
   "scripts": {
@@ -44,12 +44,11 @@
     "brace-expansion": "^4.0.1"
   },
   "files": [
-    "dist/*",
-    "src/*"
+    "dist/*"
   ],
   "devDependencies": {
-    "@maplibre/maplibre-gl-native": "^6.2.0",
-    "@maplibre/maplibre-gl-style-spec": "^24.3.1",
+    "@maplibre/maplibre-gl-native": "^6.3.0",
+    "@maplibre/maplibre-gl-style-spec": "^24.4.1",
     "@rollup/plugin-commonjs": "^29.0.0",
     "@rollup/plugin-node-resolve": "^16.0.3",
     "@rollup/plugin-terser": "^0.4.4",
@@ -57,26 +56,26 @@
     "@types/bin-pack": "^1.0.3",
     "@types/brace-expansion": "^1.1.2",
     "@types/inquirer": "^9.0.9",
-    "@types/node": "^24.10.2",
+    "@types/node": "^25.2.1",
     "@types/tar-stream": "^3.1.4",
-    "@typescript-eslint/eslint-plugin": "^8.49.0",
-    "@typescript-eslint/parser": "^8.49.0",
-    "@versatiles/release-tool": "^2.5.0",
-    "@vitest/coverage-v8": "^4.0.15",
+    "@typescript-eslint/eslint-plugin": "^8.54.0",
+    "@typescript-eslint/parser": "^8.54.0",
+    "@versatiles/release-tool": "^2.7.0",
+    "@vitest/coverage-v8": "^4.0.18",
     "bin-pack": "^1.0.2",
-    "esbuild": "^0.27.1",
-    "eslint": "^9.39.1",
+    "esbuild": "^0.27.3",
+    "eslint": "^9.39.2",
     "husky": "^9.1.7",
-    "inquirer": "^13.0.2",
-    "prettier": "^3.7.4",
-    "rollup": "^4.53.3",
+    "inquirer": "^13.2.2",
+    "prettier": "^3.8.1",
+    "rollup": "^4.57.1",
     "rollup-plugin-dts": "^6.3.0",
     "rollup-plugin-sourcemaps2": "^0.5.4",
     "sharp": "^0.34.5",
     "tar-stream": "^3.1.7",
     "tsx": "^4.21.0",
     "typescript": "^5.9.3",
-    "typescript-eslint": "^8.49.0",
-    "vitest": "^4.0.15"
+    "typescript-eslint": "^8.54.0",
+    "vitest": "^4.0.18"
   }
 }

package/src/color/abstract.ts

@@ -1,202 +0,0 @@
-import type { HSL } from './hsl.js';
-import type { HSV } from './hsv.js';
-import type { RGB } from './rgb.js';
-
-/**
- * The abstract `Color` class provides a blueprint for color manipulation and conversion.
- * It includes methods for converting between different color models ({@link HSL}, {@link HSV}, {@link RGB}),
- * as well as various color transformations such as inversion, rotation, saturation, and blending.
- *
- * @abstract
- */
-/**
- * Abstract class representing a color.
- */
-export abstract class Color {
-	/**
-	 * Parses a color from a string or another Color instance.
-	 * @param input - The input color as a string or Color instance.
-	 * @returns The parsed Color instance.
-	 */
-	static parse: (input: Color | string) => Color;
-
-	/**
-	 * The HSL color model.
-	 */
-	static HSL: typeof HSL;
-
-	/**
-	 * The HSV color model.
-	 */
-	static HSV: typeof HSV;
-
-	/**
-	 * The RGB color model.
-	 */
-	static RGB: typeof RGB;
-
-	/**
-	 * Creates a clone of the current color instance.
-	 * @returns A new Color instance that is a clone of the current instance.
-	 */
-	abstract clone(): Color;
-
-	/**
-	 * Converts the color to a hexadecimal string.
-	 * @returns The hexadecimal representation of the color.
-	 */
-	asHex(): string {
-		return this.asRGB().asHex();
-	}
-
-	/**
-	 * Converts the color to a string representation.
-	 * @returns The string representation of the color.
-	 */
-	abstract asString(): string;
-
-	/**
-	 * Rounds the color values.
-	 * @returns A new Color instance with rounded values.
-	 */
-	abstract round(): Color;
-
-	/**
-	 * Converts the color to an array of numbers.
-	 * @returns An array representing the color.
-	 */
-	abstract asArray(): number[];
-
-	/**
-	 * Converts the color to the HSL color model.
-	 * @returns The HSL representation of the color.
-	 */
-	abstract asHSL(): HSL;
-
-	/**
-	 * Converts the color to the HSV color model.
-	 * @returns The HSV representation of the color.
-	 */
-	abstract asHSV(): HSV;
-
-	/**
-	 * Converts the color to the RGB color model.
-	 * @returns The RGB representation of the color.
-	 */
-	abstract asRGB(): RGB;
-
-	/**
-	 * Inverts the luminosity of the color.
-	 * @returns A new HSL color with inverted luminosity.
-	 */
-	invertLuminosity(): HSL {
-		return this.asHSL().invertLuminosity();
-	}
-
-	/**
-	 * Rotates the hue of the color by a given offset.
-	 * @param offset - The amount to rotate the hue.
-	 * @returns A new HSL color with the hue rotated.
-	 */
-	rotateHue(offset: number): HSL {
-		return this.asHSL().rotateHue(offset);
-	}
-
-	/**
-	 * Saturates the color by a given ratio.
-	 * @param ratio - The ratio to saturate the color.
-	 * @returns A new HSL color with increased saturation.
-	 */
-	saturate(ratio: number): HSL {
-		return this.asHSL().saturate(ratio);
-	}
-
-	/**
-	 * Applies gamma correction to the color.
-	 * @param value - The gamma correction value.
-	 * @returns A new RGB color with gamma correction applied.
-	 */
-	gamma(value: number): RGB {
-		return this.asRGB().gamma(value);
-	}
-
-	/**
-	 * Inverts the color.
-	 * @returns A new RGB color with inverted values.
-	 */
-	invert(): RGB {
-		return this.asRGB().invert();
-	}
-
-	/**
-	 * Adjusts the contrast of the color.
-	 * @param value - The contrast adjustment value.
-	 * @returns A new RGB color with adjusted contrast.
-	 */
-	contrast(value: number): RGB {
-		return this.asRGB().contrast(value);
-	}
-
-	/**
-	 * Adjusts the brightness of the color.
-	 * @param value - The brightness adjustment value.
-	 * @returns A new RGB color with adjusted brightness.
-	 */
-	brightness(value: number): RGB {
-		return this.asRGB().brightness(value);
-	}
-
-	/**
-	 * Lightens the color by a given value.
-	 * @param value - The amount to lighten the color.
-	 * @returns A new RGB color that is lightened.
-	 */
-	lighten(value: number): RGB {
-		return this.asRGB().lighten(value);
-	}
-
-	/**
-	 * Darkens the color by a given value.
-	 * @param value - The amount to darken the color.
-	 * @returns A new RGB color that is darkened.
-	 */
-	darken(value: number): RGB {
-		return this.asRGB().darken(value);
-	}
-
-	/**
-	 * Tints the color by blending it with another color.
-	 * @param value - The blend ratio.
-	 * @param tintColor - The color to blend with.
-	 * @returns A new RGB color that is tinted.
-	 */
-	tint(value: number, tintColor: Color): RGB {
-		return this.asRGB().tint(value, tintColor);
-	}
-
-	/**
-	 * Blends the color with another color.
-	 * @param value - The blend ratio.
-	 * @param blendColor - The color to blend with.
-	 * @returns A new RGB color that is blended.
-	 */
-	blend(value: number, blendColor: Color): RGB {
-		return this.asRGB().blend(value, blendColor);
-	}
-
-	/**
-	 * Sets the hue of the color.
-	 * @param value - The new hue value.
-	 * @returns A new HSV color with the hue set.
-	 */
-	setHue(value: number): HSV {
-		return this.asHSV().setHue(value);
-	}
-
-	/**
-	 * Fades the color by a given value.
-	 * @param value - The fade value.
-	 * @returns A new Color instance that is faded.
-	 */
-	abstract fade(value: number): Color;
-}

package/src/color/hsl.test.ts

@@ -1,177 +0,0 @@
-import { describe, expect, it, beforeEach } from 'vitest';
-import { HSL } from './hsl.js';
-import { HSV } from './hsv.js';
-import { RGB } from './rgb.js';
-
-describe('HSL Class', () => {
-	describe('constructor', () => {
-		it('should initialize small HSL values correctly', () => {
-			const color = new HSL(10, 20, 30, 0.4);
-			expect(color.asArray()).toStrictEqual([10, 20, 30, 0.4]);
-		});
-
-		it('should initialize big HSL values correctly', () => {
-			const color = new HSL(400, 120, 120, 2);
-			expect(color.asArray()).toStrictEqual([40, 100, 100, 1]);
-		});
-
-		it('should initialize small HSL values correctly', () => {
-			const color = new HSL(-60, -10, -10, -1);
-			expect(color.asArray()).toStrictEqual([300, 0, 0, 0]);
-		});
-	});
-
-	it('clone should return a new HSL instance with identical values', () => {
-		const color = new HSL(120, 50, 50, 0.5);
-		const clone = color.clone();
-		expect(clone).toBeInstanceOf(HSL);
-		expect(clone).toEqual(color);
-		expect(clone).not.toBe(color);
-	});
-
-	describe('conversion', () => {
-		it('asString should return correct HSL and HSLA strings', () => {
-			const color1 = new HSL(120, 50, 50);
-			expect(color1.asString()).toBe('hsl(120,50%,50%)');
-
-			const color2 = new HSL(120, 50, 50, 0.5);
-			expect(color2.asString()).toBe('hsla(120,50%,50%,0.5)');
-		});
-
-		it('asHSL and toHSL should return the same instance', () => {
-			const color = new HSL(120, 50, 50);
-			expect(color.asHSL()).toStrictEqual(color);
-			expect(color.toHSL()).toStrictEqual(color);
-		});
-
-		it('asHSV should correctly convert HSL to HSV', () => {
-			function check(input: [number, number, number], output: [number, number, number]) {
-				const hsl = new HSL(...input);
-				const hsv = hsl.asHSV();
-				expect(hsv).toBeInstanceOf(HSV);
-				expect(hsv.asArray().map(Math.round)).toStrictEqual([...output, 1]);
-			}
-
-			check([10, 0, 0], [10, 0, 0]);
-			check([11, 0, 50], [11, 0, 50]);
-			check([12, 0, 100], [12, 0, 100]);
-			check([13, 50, 0], [13, 0, 0]);
-			check([14, 50, 50], [14, 67, 75]);
-			check([15, 50, 100], [15, 0, 100]);
-			check([16, 100, 0], [16, 0, 0]);
-			check([17, 100, 50], [17, 100, 100]);
-			check([18, 100, 100], [18, 0, 100]);
-		});
-
-		it('asRGB should correctly convert HSL to RGB', () => {
-			function check(input: [number, number, number], output: [number, number, number]) {
-				const hsl = new HSL(...input);
-				const rgb = hsl.asRGB();
-				expect(rgb).toBeInstanceOf(RGB);
-				expect(rgb.asArray().map(Math.round)).toStrictEqual([...output, 1]);
-			}
-
-			check([10, 0, 0], [0, 0, 0]);
-			check([11, 0, 50], [128, 128, 128]);
-			check([12, 0, 100], [255, 255, 255]);
-			check([13, 50, 0], [0, 0, 0]);
-			check([14, 50, 50], [191, 94, 64]);
-			check([15, 50, 100], [255, 255, 255]);
-			check([16, 100, 0], [0, 0, 0]);
-			check([17, 100, 50], [255, 72, 0]);
-			check([18, 100, 100], [255, 255, 255]);
-		});
-	});
-
-	describe('should parse valid HSL and HSLA strings', () => {
-		function check(str: string, result: number[]) {
-			it(`parse "${str}"`, () => {
-				const color = HSL.parse(str);
-				expect(color).toBeInstanceOf(HSL);
-				expect(color.asArray()).toStrictEqual(result);
-			});
-		}
-
-		check('hsl(240,100%,50%)', [240, 100, 50, 1]);
-		check('hsla(240,100%,50%,0.75)', [240, 100, 50, 0.75]);
-		check('hsl(400,50%,50%)', [40, 50, 50, 1]);
-
-		it('parse should throw an error for invalid strings', () => {
-			expect(() => HSL.parse('invalid')).toThrow('Invalid HSL color string');
-		});
-	});
-
-	describe('invertLuminosity', () => {
-		let color: HSL;
-		beforeEach(() => (color = new HSL(120, 50, 50, 0.8)));
-
-		it('inverts luminosity correctly', () => {
-			expect(color.invertLuminosity().asArray()).toStrictEqual([120, 50, 50, 0.8]); // Luminosity inverted to 50%
-		});
-
-		it('handles edge cases for luminosity inversion', () => {
-			const black = new HSL(0, 0, 0, 1);
-			expect(black.invertLuminosity().asArray()).toStrictEqual([0, 0, 100, 1]); // Black becomes white
-
-			const white = new HSL(0, 0, 100, 1);
-			expect(white.invertLuminosity().asArray()).toStrictEqual([0, 0, 0, 1]); // White becomes black
-		});
-	});
-
-	describe('rotateHue', () => {
-		let color: HSL;
-		beforeEach(() => (color = new HSL(120, 50, 50, 0.8)));
-
-		it('rotates hue correctly within the range of 0-360', () => {
-			expect(color.rotateHue(180).asArray()).toStrictEqual([300, 50, 50, 0.8]); // Hue rotated by 180 degrees
-		});
-
-		it('handles negative rotation correctly', () => {
-			expect(color.rotateHue(-270).asArray()).toStrictEqual([210, 50, 50, 0.8]); // Hue rotated negatively
-		});
-
-		it('handles rotations that exceed 360 degrees', () => {
-			expect(color.rotateHue(540).asArray()).toStrictEqual([300, 50, 50, 0.8]); // Hue wrapped around to 300
-		});
-	});
-
-	describe('saturate', () => {
-		let color: HSL, grey: HSL;
-		beforeEach(() => {
-			color = new HSL(120, 50, 50, 0.8);
-			grey = new HSL(120, 0, 50, 0.8);
-		});
-
-		it('increases saturation correctly', () => {
-			expect(color.saturate(0.5).asArray()).toStrictEqual([120, 75, 50, 0.8]);
-			expect(grey.saturate(0.5).asArray()).toStrictEqual([120, 0, 50, 0.8]);
-		});
-
-		it('decreases saturation correctly', () => {
-			expect(color.saturate(-0.5).asArray()).toStrictEqual([120, 25, 50, 0.8]); // Saturation decreased by 50%
-		});
-
-		it('clamps saturation to the valid range', () => {
-			expect(color.saturate(1.5).asArray()).toStrictEqual([120, 100, 50, 0.8]); // Saturation clamped to 100%
-
-			expect(color.saturate(-2).asArray()).toStrictEqual([120, 0, 50, 0.8]); // Saturation clamped to 0%
-		});
-	});
-
-	describe('fade', () => {
-		let color: HSL;
-		beforeEach(() => (color = new HSL(120, 50, 50, 0.8)));
-
-		it('reduces alpha correctly', () => {
-			expect(color.fade(0.5).asArray()).toStrictEqual([120, 50, 50, 0.4]); // Alpha reduced by 50%
-		});
-
-		it('handles edge cases for fading', () => {
-			const opaque = new HSL(0, 50, 50, 1);
-			expect(opaque.fade(1).asArray()).toStrictEqual([0, 50, 50, 0]); // Fully faded to transparent
-
-			const transparent = new HSL(0, 50, 50, 0);
-			expect(transparent.fade(0.5).asArray()).toStrictEqual([0, 50, 50, 0]); // Remains fully transparent
-		});
-	});
-});

package/src/color/hsl.ts

@@ -1,201 +0,0 @@
-import { Color } from './abstract.js';
-import { HSV } from './hsv.js';
-import { RGB } from './rgb.js';
-import { clamp, formatFloat, mod } from './utils.js';
-
-/**
- * Represents a color in the HSL (Hue, Saturation, Lightness) color space.
- * Extends the base `Color` class.
- */
-export class HSL extends Color {
-	/**
-	 * The hue component of the color, in the range [0, 360].
-	 */
-	readonly h: number;
-
-	/**
-	 * The saturation component of the color, in the range [0, 100].
-	 */
-	readonly s: number;
-
-	/**
-	 * The lightness component of the color, in the range [0, 100].
-	 */
-	readonly l: number;
-
-	/**
-	 * The alpha (opacity) component of the color, in the range [0, 1].
-	 */
-	readonly a: number;
-
-	/**
-	 * Creates a new HSL color.
-	 * @param h - The hue component, in the range [0, 360].
-	 * @param s - The saturation component, in the range [0, 100].
-	 * @param l - The lightness component, in the range [0, 100].
-	 * @param a - The alpha (opacity) component, in the range [0, 1]. Defaults to 1.
-	 */
-	constructor(h: number, s: number, l: number, a: number = 1) {
-		super();
-		this.h = mod(h, 360);
-		this.s = clamp(s, 0, 100);
-		this.l = clamp(l, 0, 100);
-		this.a = clamp(a, 0, 1);
-	}
-
-	/**
-	 * Returns the HSL color as an array of numbers.
-	 * @returns An array containing the hue, saturation, lightness, and alpha components.
-	 */
-	asArray(): [number, number, number, number] {
-		return [this.h, this.s, this.l, this.a];
-	}
-
-	/**
-	 * Returns a new HSL color with rounded components.
-	 * @returns A new HSL color with rounded hue, saturation, lightness, and alpha components.
-	 */
-	round(): HSL {
-		return new HSL(Math.round(this.h), Math.round(this.s), Math.round(this.l), Math.round(this.a * 1000) / 1000);
-	}
-
-	/**
-	 * Creates a copy of the current HSL color.
-	 * @returns A new HSL color with the same components as the current color.
-	 */
-	clone(): HSL {
-		return new HSL(this.h, this.s, this.l, this.a);
-	}
-
-	/**
-	 * Returns the HSL color as a CSS-compatible string.
-	 * @returns A string representing the HSL color in CSS format.
-	 */
-	asString(): string {
-		if (this.a === 1) {
-			return `hsl(${this.h.toFixed(0)},${this.s.toFixed(0)}%,${this.l.toFixed(0)}%)`;
-		} else {
-			return `hsla(${this.h.toFixed(0)},${this.s.toFixed(0)}%,${this.l.toFixed(0)}%,${formatFloat(this.a, 3)})`;
-		}
-	}
-
-	/**
-	 * Returns the current HSL color.
-	 * @returns The current HSL color.
-	 */
-	asHSL(): HSL {
-		return this.clone();
-	}
-
-	/**
-	 * Returns the current HSL color.
-	 * @returns The current HSL color.
-	 */
-	toHSL(): HSL {
-		return this;
-	}
-
-	/**
-	 * Converts the HSL color to an HSV color.
-	 * @returns A new HSV color representing the same color.
-	 */
-	asHSV(): HSV {
-		const s = this.s / 100,
-			l = this.l / 100;
-		const v = l + s * Math.min(l, 1 - l);
-		const sv = v === 0 ? 0 : 2 * (1 - l / v);
-		return new HSV(this.h, sv * 100, v * 100, this.a);
-	}
-
-	/**
-	 * Converts the HSL color to an RGB color.
-	 * @returns A new RGB color representing the same color.
-	 */
-	asRGB(): RGB {
-		const h = this.h / 360;
-		const s = this.s / 100;
-		const l = this.l / 100;
-
-		// Achromatic (grey)
-		if (s === 0) return new RGB(l * 255, l * 255, l * 255, this.a);
-
-		const q = l < 0.5 ? l * (1 + s) : l + s - l * s;
-		const p = 2 * l - q;
-
-		const hueToRgb = (t: number): number => {
-			if (t < 0) t += 1;
-			if (t > 1) t -= 1;
-			if (t < 1 / 6) return p + (q - p) * 6 * t;
-			if (t < 1 / 2) return q;
-			if (t < 2 / 3) return p + (q - p) * (2 / 3 - t) * 6;
-			return p;
-		};
-
-		// Convert to RGB in the 0-255 range and return
-		return new RGB(255 * hueToRgb(h + 1 / 3), 255 * hueToRgb(h), 255 * hueToRgb(h - 1 / 3), this.a);
-	}
-
-	/**
-	 * Parses a string or Color object into an HSL color.
-	 * @param input - The input string or Color object to parse.
-	 * @returns A new HSL color parsed from the input.
-	 * @throws Will throw an error if the input string is not a valid HSL color string.
-	 */
-	static parse(input: string | Color): HSL {
-		if (input instanceof Color) return input.asHSL();
-
-		input = input.replace(/\s+/g, '').toLowerCase();
-
-		let match = input.match(/^hsl\((?<h>[-+0-9.]+)(?:deg)?,(?<s>[-+0-9.]+)%,(?<l>[-+0-9.]+)%\)$/);
-		if (match) {
-			return new HSL(parseFloat(match.groups!.h), parseFloat(match.groups!.s), parseFloat(match.groups!.l));
-		}
-
-		match = input.match(/^hsla\((?<h>[-+0-9.]+)(?:deg)?,(?<s>[-+0-9.]+)%,(?<l>[-+0-9.]+)%,(?<a>[-+0-9.]+)\)$/);
-		if (match) {
-			return new HSL(
-				parseFloat(match.groups!.h),
-				parseFloat(match.groups!.s),
-				parseFloat(match.groups!.l),
-				parseFloat(match.groups!.a)
-			);
-		}
-
-		throw new Error(`Invalid HSL color string: "${input}"`);
-	}
-
-	/**
-	 * Inverts the lightness component of the HSL color.
-	 * @returns A new HSL color with the lightness component inverted.
-	 */
-	invertLuminosity(): HSL {
-		return new HSL(this.h, this.s, 100 - this.l, this.a);
-	}
-
-	/**
-	 * Rotates the hue component of the HSL color by a given offset.
-	 * @param offset - The amount to rotate the hue by, in degrees.
-	 * @returns A new HSL color with the hue rotated by the given offset.
-	 */
-	rotateHue(offset: number): HSL {
-		return new HSL(mod(this.h + offset, 360), this.s, this.l, this.a);
-	}
-
-	/**
-	 * Increases the saturation of the HSL color by a given ratio.
-	 * @param ratio - The ratio by which to increase the saturation.
-	 * @returns A new HSL color with increased saturation.
-	 */
-	saturate(ratio: number): HSL {
-		return new HSL(this.h, clamp(this.s * (1 + ratio), 0, 100), this.l, this.a);
-	}
-
-	/**
-	 * Decreases the alpha (opacity) of the HSL color by a given value.
-	 * @param value - The value by which to decrease the alpha.
-	 * @returns A new HSL color with decreased alpha.
-	 */
-	fade(value: number): HSL {
-		return new HSL(this.h, this.s, this.l, this.a * (1 - value));
-	}
-}