@versatiles/style 5.8.3 → 5.8.4

package/src/color/rgb.test.ts

@@ -4,7 +4,6 @@ import { HSL } from './hsl.js';
 import { HSV } from './hsv.js';
 
 describe('RGB Class', () => {
-
 	it('constructor initializes values correctly with clamping', () => {
 		const color = new RGB(300, -50, 500, 2);
 		expect(color.asArray()).toStrictEqual([255, 0, 255, 1]);
@@ -46,8 +45,7 @@ describe('RGB Class', () => {
 		it('asHSL converts RGB to HSL correctly', () => {
 			const hsl = new RGB(255, 0, 0).asHSL();
 			expect(hsl).toBeInstanceOf(HSL);
-			expect(hsl.asArray().map(value => Math.round(value)))
-				.toStrictEqual([0, 100, 50, 1]);
+			expect(hsl.asArray().map((value) => Math.round(value))).toStrictEqual([0, 100, 50, 1]);
 
 			expect(RGB.parse('#000000').asHSL().round().asArray()).toStrictEqual([0, 0, 0, 1]);
 			expect(RGB.parse('#FFFFFF').asHSL().round().asArray()).toStrictEqual([0, 0, 100, 1]);
@@ -68,8 +66,7 @@ describe('RGB Class', () => {
 		it('asHSV converts RGB to HSV correctly', () => {
 			const hsv = new RGB(255, 0, 0).asHSV();
 			expect(hsv).toBeInstanceOf(HSV);
-			expect(hsv.asArray().map(value => Math.round(value)))
-				.toStrictEqual([0, 100, 100, 1]);
+			expect(hsv.asArray().map((value) => Math.round(value))).toStrictEqual([0, 100, 100, 1]);
 
 			expect(RGB.parse('#000000').asHSV().round().asArray()).toStrictEqual([0, 0, 0, 1]);
 			expect(RGB.parse('#FFFFFF').asHSV().round().asArray()).toStrictEqual([0, 0, 100, 1]);
@@ -95,14 +92,34 @@ describe('RGB Class', () => {
 
 		it('handles black correctly', () => {
 			const color = new RGB(0, 0, 0);
-			expect(color.asHSL().asArray().map(value => Math.round(value))).toStrictEqual([0, 0, 0, 1]);
-			expect(color.asHSV().asArray().map(value => Math.round(value))).toStrictEqual([0, 0, 0, 1]);
+			expect(
+				color
+					.asHSL()
+					.asArray()
+					.map((value) => Math.round(value))
+			).toStrictEqual([0, 0, 0, 1]);
+			expect(
+				color
+					.asHSV()
+					.asArray()
+					.map((value) => Math.round(value))
+			).toStrictEqual([0, 0, 0, 1]);
 		});
 
 		it('handles white correctly', () => {
 			const color = new RGB(255, 255, 255);
-			expect(color.asHSL().asArray().map(value => Math.round(value))).toStrictEqual([0, 0, 100, 1]);
-			expect(color.asHSV().asArray().map(value => Math.round(value))).toStrictEqual([0, 0, 100, 1]);
+			expect(
+				color
+					.asHSL()
+					.asArray()
+					.map((value) => Math.round(value))
+			).toStrictEqual([0, 0, 100, 1]);
+			expect(
+				color
+					.asHSV()
+					.asArray()
+					.map((value) => Math.round(value))
+			).toStrictEqual([0, 0, 100, 1]);
 		});
 	});
 
@@ -132,62 +149,64 @@ describe('RGB Class', () => {
 
 	describe('filter methods', () => {
 		function pc(cb: (c: RGB) => RGB): [number, number, number, number] {
-			return cb(new RGB(50, 150, 200, 0.8)).round().asArray();
+			return cb(new RGB(50, 150, 200, 0.8))
+				.round()
+				.asArray();
 		}
 
 		it('adjusts gamma correctly', () => {
-			expect(pc(c => c.gamma(2.2))).toStrictEqual([7, 79, 149, 0.8]);
-			expect(pc(c => c.gamma(0.001))).toStrictEqual([255, 255, 255, 0.8]);
-			expect(pc(c => c.gamma(1000))).toStrictEqual([0, 0, 0, 0.8]);
+			expect(pc((c) => c.gamma(2.2))).toStrictEqual([7, 79, 149, 0.8]);
+			expect(pc((c) => c.gamma(0.001))).toStrictEqual([255, 255, 255, 0.8]);
+			expect(pc((c) => c.gamma(1000))).toStrictEqual([0, 0, 0, 0.8]);
 		});
 
 		it('inverts RGB values correctly', () => {
-			expect(pc(c => c.invert())).toStrictEqual([205, 105, 55, 0.8]);
+			expect(pc((c) => c.invert())).toStrictEqual([205, 105, 55, 0.8]);
 		});
 
 		it('adjusts contrast correctly', () => {
-			expect(pc(c => c.contrast(1.5))).toStrictEqual([11, 161, 236, 0.8]);
-			expect(pc(c => c.contrast(1e6))).toStrictEqual([0, 255, 255, 0.8]);
-			expect(pc(c => c.contrast(0))).toStrictEqual([128, 128, 128, 0.8]);
+			expect(pc((c) => c.contrast(1.5))).toStrictEqual([11, 161, 236, 0.8]);
+			expect(pc((c) => c.contrast(1e6))).toStrictEqual([0, 255, 255, 0.8]);
+			expect(pc((c) => c.contrast(0))).toStrictEqual([128, 128, 128, 0.8]);
 		});
 
 		it('increases brightness correctly', () => {
-			expect(pc(c => c.brightness(0.5))).toStrictEqual([153, 203, 228, 0.8]);
-			expect(pc(c => c.brightness(-0.5))).toStrictEqual([25, 75, 100, 0.8]);
-			expect(pc(c => c.brightness(2))).toStrictEqual([255, 255, 255, 0.8]);
-			expect(pc(c => c.brightness(-2))).toStrictEqual([0, 0, 0, 0.8]);
+			expect(pc((c) => c.brightness(0.5))).toStrictEqual([153, 203, 228, 0.8]);
+			expect(pc((c) => c.brightness(-0.5))).toStrictEqual([25, 75, 100, 0.8]);
+			expect(pc((c) => c.brightness(2))).toStrictEqual([255, 255, 255, 0.8]);
+			expect(pc((c) => c.brightness(-2))).toStrictEqual([0, 0, 0, 0.8]);
 		});
 
 		it('tints color correctly', () => {
 			const tintColor = new RGB(255, 0, 0);
-			expect(pc(c => c.tint(0.5, tintColor))).toStrictEqual([125, 100, 125, 0.8]);
-			expect(pc(c => c.tint(1, tintColor))).toStrictEqual([200, 50, 50, 0.8]);
-			expect(pc(c => c.tint(0, tintColor))).toStrictEqual([50, 150, 200, 0.8]);
+			expect(pc((c) => c.tint(0.5, tintColor))).toStrictEqual([125, 100, 125, 0.8]);
+			expect(pc((c) => c.tint(1, tintColor))).toStrictEqual([200, 50, 50, 0.8]);
+			expect(pc((c) => c.tint(0, tintColor))).toStrictEqual([50, 150, 200, 0.8]);
 		});
 
 		it('blends color correctly', () => {
 			const blendColor = new RGB(255, 0, 0);
-			expect(pc(c => c.blend(0.2, blendColor))).toStrictEqual([91, 120, 160, 0.8]);
-			expect(pc(c => c.blend(0.5, blendColor))).toStrictEqual([153, 75, 100, 0.8]);
-			expect(pc(c => c.blend(0.8, blendColor))).toStrictEqual([214, 30, 40, 0.8]);
-			expect(pc(c => c.blend(1, blendColor))).toStrictEqual([255, 0, 0, 0.8]);
-			expect(pc(c => c.blend(0, blendColor))).toStrictEqual([50, 150, 200, 0.8]);
+			expect(pc((c) => c.blend(0.2, blendColor))).toStrictEqual([91, 120, 160, 0.8]);
+			expect(pc((c) => c.blend(0.5, blendColor))).toStrictEqual([153, 75, 100, 0.8]);
+			expect(pc((c) => c.blend(0.8, blendColor))).toStrictEqual([214, 30, 40, 0.8]);
+			expect(pc((c) => c.blend(1, blendColor))).toStrictEqual([255, 0, 0, 0.8]);
+			expect(pc((c) => c.blend(0, blendColor))).toStrictEqual([50, 150, 200, 0.8]);
 		});
 
 		it('lightens the color correctly', () => {
-			expect(pc(c => c.lighten(0.5))).toStrictEqual([153, 203, 228, 0.8]);
-			expect(pc(c => c.lighten(2))).toStrictEqual([255, 255, 255, 0.8]);
+			expect(pc((c) => c.lighten(0.5))).toStrictEqual([153, 203, 228, 0.8]);
+			expect(pc((c) => c.lighten(2))).toStrictEqual([255, 255, 255, 0.8]);
 		});
 
 		it('darkens the color correctly', () => {
-			expect(pc(c => c.darken(0.5))).toStrictEqual([25, 75, 100, 0.8]);
-			expect(pc(c => c.darken(1))).toStrictEqual([0, 0, 0, 0.8]);
-			expect(pc(c => c.darken(2))).toStrictEqual([0, 0, 0, 0.8]);
+			expect(pc((c) => c.darken(0.5))).toStrictEqual([25, 75, 100, 0.8]);
+			expect(pc((c) => c.darken(1))).toStrictEqual([0, 0, 0, 0.8]);
+			expect(pc((c) => c.darken(2))).toStrictEqual([0, 0, 0, 0.8]);
 		});
 
 		it('fades color correctly', () => {
-			expect(pc(c => c.fade(0.5))).toStrictEqual([50, 150, 200, 0.4]);
-			expect(pc(c => c.fade(1))).toStrictEqual([50, 150, 200, 0]);
+			expect(pc((c) => c.fade(0.5))).toStrictEqual([50, 150, 200, 0.4]);
+			expect(pc((c) => c.fade(1))).toStrictEqual([50, 150, 200, 0]);
 
 			const fullyOpaque = new RGB(50, 150, 200, 1);
 			expect(fullyOpaque.fade(0).asArray()).toStrictEqual([50, 150, 200, 1]);

package/src/color/rgb.ts

@@ -5,7 +5,7 @@ import { clamp, formatFloat } from './utils.js';
 
 /**
  * Represents an RGB color with optional alpha transparency.
- * 
+ *
  * @extends Color
  */
 export class RGB extends Color {
@@ -31,7 +31,7 @@ export class RGB extends Color {
 
 	/**
 	 * Creates an instance of RGB.
-	 * 
+	 *
 	 * @param r - Red component (0-255).
 	 * @param g - Green component (0-255).
 	 * @param b - Blue component (0-255).
@@ -47,7 +47,7 @@ export class RGB extends Color {
 
 	/**
 	 * Creates a clone of the current RGB color.
-	 * 
+	 *
 	 * @returns A new RGB instance with the same color values.
 	 */
 	clone(): RGB {
@@ -56,7 +56,7 @@ export class RGB extends Color {
 
 	/**
 	 * Returns the RGB color as an array.
-	 * 
+	 *
 	 * @returns An array containing the red, green, blue, and alpha components.
 	 */
 	asArray(): [number, number, number, number] {
@@ -65,21 +65,16 @@ export class RGB extends Color {
 
 	/**
 	 * Rounds the RGB color components to the nearest integer.
-	 * 
+	 *
 	 * @returns A new RGB instance with rounded color values.
 	 */
 	round(): RGB {
-		return new RGB(
-			Math.round(this.r),
-			Math.round(this.g),
-			Math.round(this.b),
-			Math.round(this.a * 1000) / 1000,
-		);
+		return new RGB(Math.round(this.r), Math.round(this.g), Math.round(this.b), Math.round(this.a * 1000) / 1000);
 	}
 
 	/**
 	 * Returns the RGB color as a string.
-	 * 
+	 *
 	 * @returns A string representation of the RGB color in either `rgb` or `rgba` format.
 	 */
 	asString(): string {
@@ -92,7 +87,7 @@ export class RGB extends Color {
 
 	/**
 	 * Returns the RGB color as a hexadecimal string.
-	 * 
+	 *
 	 * @returns A string representation of the RGB color in hexadecimal format.
 	 */
 	asHex(): string {
@@ -103,14 +98,16 @@ export class RGB extends Color {
 		if (this.a === 1) {
 			return `#${r}${g}${b}`.toUpperCase();
 		} else {
-			const a = Math.round(this.a * 255).toString(16).padStart(2, '0');
+			const a = Math.round(this.a * 255)
+				.toString(16)
+				.padStart(2, '0');
 			return `#${r}${g}${b}${a}`.toUpperCase();
 		}
 	}
 
 	/**
 	 * Converts the RGB color to an HSL color.
-	 * 
+	 *
 	 * @returns An HSL instance representing the same color.
 	 */
 	asHSL(): HSL {
@@ -138,11 +135,11 @@ export class RGB extends Color {
 		else s = delta / (2 - max - min);
 
 		return new HSL(h, s * 100, l * 100, this.a);
-	};
+	}
 
 	/**
 	 * Converts the RGB color to an HSV color.
-	 * 
+	 *
 	 * @returns An HSV instance representing the same color.
 	 */
 	asHSV(): HSV {
@@ -157,7 +154,7 @@ export class RGB extends Color {
 		if (diff !== 0) {
 			function diffc(c: number): number {
 				return (v - c) / 6 / diff + 1 / 2;
-			};
+			}
 
 			s = diff / v;
 			const rdif = diffc(r);
@@ -165,8 +162,8 @@ export class RGB extends Color {
 			const bdif = diffc(b);
 
 			if (r === v) h = bdif - gdif;
-			else if (g === v) h = (1 / 3) + rdif - bdif;
-			else if (b === v) h = (2 / 3) + gdif - rdif;
+			else if (g === v) h = 1 / 3 + rdif - bdif;
+			else if (b === v) h = 2 / 3 + gdif - rdif;
 
 			if (h < 0) h += 1;
 			else if (h > 1) h -= 1;
@@ -177,7 +174,7 @@ export class RGB extends Color {
 
 	/**
 	 * Returns the RGB color.
-	 * 
+	 *
 	 * @returns The current RGB instance.
 	 */
 	asRGB(): RGB {
@@ -186,7 +183,7 @@ export class RGB extends Color {
 
 	/**
 	 * Returns the RGB color.
-	 * 
+	 *
 	 * @returns The current RGB instance.
 	 */
 	toRGB(): RGB {
@@ -195,7 +192,7 @@ export class RGB extends Color {
 
 	/**
 	 * Parses a string or Color instance into an RGB color.
-	 * 
+	 *
 	 * @param input - The input string or Color instance to parse.
 	 * @returns A new RGB instance representing the parsed color.
 	 * @throws Will throw an error if the input string is not a valid RGB color string.
@@ -203,7 +200,7 @@ export class RGB extends Color {
 	static parse(input: string | Color): RGB {
 		if (input instanceof Color) return input.asRGB();
 
-		input = input.toLowerCase().replaceAll(/[^0-9a-z.#,()]/g, '')
+		input = input.toLowerCase().replaceAll(/[^0-9a-z.#,()]/g, '');
 
 		let match;
 
@@ -249,7 +246,7 @@ export class RGB extends Color {
 
 	/**
 	 * Adjusts the gamma of the RGB color.
-	 * 
+	 *
 	 * @param value - The gamma value to apply.
 	 * @returns A new RGB instance with the adjusted gamma.
 	 */
@@ -266,21 +263,16 @@ export class RGB extends Color {
 
 	/**
 	 * Inverts the RGB color.
-	 * 
+	 *
 	 * @returns A new RGB instance with the inverted color values.
 	 */
 	invert(): RGB {
-		return new RGB(
-			255 - this.r,
-			255 - this.g,
-			255 - this.b,
-			this.a
-		);
+		return new RGB(255 - this.r, 255 - this.g, 255 - this.b, this.a);
 	}
 
 	/**
 	 * Adjusts the contrast of the RGB color.
-	 * 
+	 *
 	 * @param value - The contrast value to apply.
 	 * @returns A new RGB instance with the adjusted contrast.
 	 */
@@ -297,7 +289,7 @@ export class RGB extends Color {
 
 	/**
 	 * Adjusts the brightness of the RGB color.
-	 * 
+	 *
 	 * @param value - The brightness value to apply.
 	 * @returns A new RGB instance with the adjusted brightness.
 	 */
@@ -305,18 +297,13 @@ export class RGB extends Color {
 		if (value < -1) value = -1;
 		if (value > 1) value = 1;
 		const a = 1 - Math.abs(value);
-		const b = (value < 0) ? 0 : 255 * value;
-		return new RGB(
-			this.r * a + b,
-			this.g * a + b,
-			this.b * a + b,
-			this.a
-		);
+		const b = value < 0 ? 0 : 255 * value;
+		return new RGB(this.r * a + b, this.g * a + b, this.b * a + b, this.a);
 	}
 
 	/**
 	 * Tints the RGB color with another color.
-	 * 
+	 *
 	 * @param value - The tint value to apply.
 	 * @param tintColor - The color to use for tinting.
 	 * @returns A new RGB instance with the applied tint.
@@ -330,12 +317,12 @@ export class RGB extends Color {
 			this.g * (1 - value) + value * rgbNew.g,
 			this.b * (1 - value) + value * rgbNew.b,
 			this.a
-		)
+		);
 	}
 
 	/**
 	 * Blends the RGB color with another color.
-	 * 
+	 *
 	 * @param value - The blend value to apply.
 	 * @param blendColor - The color to blend with.
 	 * @returns A new RGB instance with the blended color.
@@ -353,7 +340,7 @@ export class RGB extends Color {
 
 	/**
 	 * Lightens the RGB color.
-	 * 
+	 *
 	 * @param ratio - The ratio to lighten the color by.
 	 * @returns A new RGB instance with the lightened color.
 	 */
@@ -368,7 +355,7 @@ export class RGB extends Color {
 
 	/**
 	 * Darkens the RGB color.
-	 * 
+	 *
 	 * @param ratio - The ratio to darken the color by.
 	 * @returns A new RGB instance with the darkened color.
 	 */
@@ -383,11 +370,11 @@ export class RGB extends Color {
 
 	/**
 	 * Fades the RGB color by reducing its alpha value.
-	 * 
+	 *
 	 * @param value - The fade value to apply.
 	 * @returns A new RGB instance with the faded color.
 	 */
 	fade(value: number): RGB {
 		return new RGB(this.r, this.g, this.b, this.a * (1 - value));
 	}
-}
+}

package/src/color/utils.test.ts

@@ -58,7 +58,7 @@ describe('formatFloat function', () => {
 
 	it('handles trailing zeros correctly', () => {
 		expect(formatFloat(0.000123, 6)).toBe('0.000123');
-		expect(formatFloat(0.000100, 6)).toBe('0.0001');
+		expect(formatFloat(0.0001, 6)).toBe('0.0001');
 		expect(formatFloat(10.0, 1)).toBe('10');
 	});
 
@@ -79,9 +79,7 @@ describe('formatFloat function', () => {
 	});
 
 	it('handles no unnecessary decimal points', () => {
-		expect(formatFloat(10.000, 3)).toBe('10');
-		expect(formatFloat(10.010, 3)).toBe('10.01');
+		expect(formatFloat(10.0, 3)).toBe('10');
+		expect(formatFloat(10.01, 3)).toBe('10.01');
 	});
-})
-
-
+});

package/src/color/utils.ts

@@ -1,5 +1,3 @@
-
-
 export function clamp(value: number, min: number, max: number): number {
 	if (value == null || isNaN(value)) return min;
 	if (value < min) return min;
@@ -16,4 +14,4 @@ export function mod(value: number, max: number): number {
 
 export function formatFloat(num: number, precision: number): string {
 	return num.toFixed(precision).replace(/0+$/, '').replace(/\.$/, '');
-}
+}

package/src/guess_style/guess_style.test.ts

@@ -10,52 +10,55 @@ describe('guessStyle', () => {
 	const vectorLayersShortbread: VectorLayer[] = getShortbreadVectorLayers();
 
 	it('should build raster styles', () => {
-		expect(guessStyle({ tiles }))
-			.toStrictEqual({
-				version: 8,
-				sources: { rasterSource: { tiles, type: 'raster' } },
-				layers: [{ id: 'raster', source: 'rasterSource', type: 'raster' }],
-			});
+		expect(guessStyle({ tiles })).toStrictEqual({
+			version: 8,
+			sources: { rasterSource: { tiles, type: 'raster' } },
+			layers: [{ id: 'raster', source: 'rasterSource', type: 'raster' }],
+		});
 	});
 
 	it('should build vector inspector styles', () => {
-		expect(guessStyle({ tiles, vector_layers: vectorLayersSomething }))
-			.toStrictEqual({
-				version: 8,
-				sources: { vectorSource: { tiles, type: 'vector' } },
-				layers: [
-					{
-						id: 'background',
-						type: 'background',
-						paint: { 'background-color': '#fff' },
-					},
-					{
-						id: 'vectorSource-geometry-fill',
-						type: 'fill',
-						source: 'vectorSource',
-						'source-layer': 'geometry',
-						filter: ['==', '$type', 'Polygon'],
-						paint: { 'fill-antialias': true, 'fill-color': 'hsla(7,57%,56%,0.6)', 'fill-opacity': 0.3, 'fill-outline-color': 'hsla(7,57%,56%,0.6)' },
-					},
-					{
-						id: 'vectorSource-geometry-line',
-						type: 'line',
-						source: 'vectorSource',
-						'source-layer': 'geometry',
-						filter: ['==', '$type', 'LineString'],
-						layout: { 'line-cap': 'round', 'line-join': 'round' },
-						paint: { 'line-color': 'hsla(7,57%,56%,0.6)' },
-					},
-					{
-						id: 'vectorSource-geometry-circle',
-						type: 'circle',
-						source: 'vectorSource',
-						'source-layer': 'geometry',
-						filter: ['==', '$type', 'Point'],
-						paint: { 'circle-color': 'hsla(7,57%,56%,0.6)', 'circle-radius': 2 },
+		expect(guessStyle({ tiles, vector_layers: vectorLayersSomething })).toStrictEqual({
+			version: 8,
+			sources: { vectorSource: { tiles, type: 'vector' } },
+			layers: [
+				{
+					id: 'background',
+					type: 'background',
+					paint: { 'background-color': '#fff' },
+				},
+				{
+					id: 'vectorSource-geometry-fill',
+					type: 'fill',
+					source: 'vectorSource',
+					'source-layer': 'geometry',
+					filter: ['==', '$type', 'Polygon'],
+					paint: {
+						'fill-antialias': true,
+						'fill-color': 'hsla(7,57%,56%,0.6)',
+						'fill-opacity': 0.3,
+						'fill-outline-color': 'hsla(7,57%,56%,0.6)',
 					},
-				],
-			});
+				},
+				{
+					id: 'vectorSource-geometry-line',
+					type: 'line',
+					source: 'vectorSource',
+					'source-layer': 'geometry',
+					filter: ['==', '$type', 'LineString'],
+					layout: { 'line-cap': 'round', 'line-join': 'round' },
+					paint: { 'line-color': 'hsla(7,57%,56%,0.6)' },
+				},
+				{
+					id: 'vectorSource-geometry-circle',
+					type: 'circle',
+					source: 'vectorSource',
+					'source-layer': 'geometry',
+					filter: ['==', '$type', 'Point'],
+					paint: { 'circle-color': 'hsla(7,57%,56%,0.6)', 'circle-radius': 2 },
+				},
+			],
+		});
 	});
 
 	it('should build shortbread vector styles', () => {
@@ -115,7 +118,10 @@ describe('guessStyle', () => {
 	describe('absolute tile urls override baseUrl', () => {
 		cases.forEach(({ type, tilejson }) => {
 			it(type, () => {
-				const style = guessStyle({ ...tilejson, tiles: ['https://example1.org/tiles/{z}/{x}/{y}'] }, { baseUrl: 'https://example2.org/' });
+				const style = guessStyle(
+					{ ...tilejson, tiles: ['https://example1.org/tiles/{z}/{x}/{y}'] },
+					{ baseUrl: 'https://example2.org/' }
+				);
 				const source = Object.values(style.sources)[0] as VectorSourceSpecification;
 				expect(source.tiles).toEqual(['https://example1.org/tiles/{z}/{x}/{y}']);
 			});