@versatiles/style 5.0.0 → 5.2.0

package/dist/styles/neutrino.js

@@ -293,7 +293,7 @@ export default class Neutrino extends StyleBuilder {
                 size: { 5: 8, 8: 12 },
             },
             'label-place-*': {
-                color: colors.label.rotate(-15).saturate(1).darken(0.05),
+                color: colors.label.rotateHue(-15).saturate(1).darken(0.05),
                 font: fonts.regular,
                 textHaloColor: colors.label.lighten(0.5),
                 textHaloWidth: 0.1,
@@ -329,24 +329,24 @@ export default class Neutrino extends StyleBuilder {
                 minzoom: 11,
                 size: { 11: 11, 13: 14 },
                 textTransform: 'uppercase',
-                color: colors.label.rotate(-30).saturate(1).darken(0.05),
+                color: colors.label.rotateHue(-30).saturate(1).darken(0.05),
             },
             'label-place-quarter': {
                 minzoom: 13,
                 size: { 13: 13 },
                 textTransform: 'uppercase',
-                color: colors.label.rotate(-40).saturate(1).darken(0.05),
+                color: colors.label.rotateHue(-40).saturate(1).darken(0.05),
             },
             'label-place-neighbourhood': {
                 minzoom: 14,
                 size: { 14: 12 },
                 textTransform: 'uppercase',
-                color: colors.label.rotate(-50).saturate(1).darken(0.05),
+                color: colors.label.rotateHue(-50).saturate(1).darken(0.05),
             },
             'label-motorway-shield': {
                 color: colors.label,
                 font: fonts.regular,
-                textHaloColor: colors.label.desaturate(0.5).lighten(0.1),
+                textHaloColor: colors.label.saturate(-0.5).lighten(0.1),
                 textHaloWidth: 0.1,
                 textHaloBlur: 1,
                 symbolPlacement: 'line',
@@ -357,7 +357,7 @@ export default class Neutrino extends StyleBuilder {
             'label-street-*': {
                 color: colors.label,
                 font: fonts.regular,
-                textHaloColor: colors.label.desaturate(0.5).lighten(0.1),
+                textHaloColor: colors.label.saturate(-0.5).lighten(0.1),
                 textHaloWidth: 0.1,
                 textHaloBlur: 1,
                 symbolPlacement: 'line',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@versatiles/style",
-  "version": "5.0.0",
+  "version": "5.2.0",
   "description": "Generate StyleJSON for MapLibre",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -29,45 +29,43 @@
   "license": "MIT",
   "type": "module",
   "dependencies": {
-    "@types/color": "^4.2.0",
-    "brace-expansion": "^4.0.0",
-    "color": "^4.2.3"
+    "brace-expansion": "^4.0.0"
   },
   "files": [
     "dist/**/*.js",
     "dist/**/*.d.ts"
   ],
   "devDependencies": {
-    "@maplibre/maplibre-gl-style-spec": "^21.2.0",
-    "@rollup/plugin-commonjs": "^28.0.1",
-    "@rollup/plugin-node-resolve": "^15.3.0",
+    "@maplibre/maplibre-gl-style-spec": "^23.1.0",
+    "@rollup/plugin-commonjs": "^28.0.2",
+    "@rollup/plugin-node-resolve": "^16.0.0",
     "@rollup/plugin-terser": "^0.4.4",
-    "@rollup/plugin-typescript": "^12.1.1",
+    "@rollup/plugin-typescript": "^12.1.2",
     "@types/bin-pack": "^1.0.3",
     "@types/brace-expansion": "^1.1.2",
     "@types/inquirer": "^9.0.7",
     "@types/jest": "^29.5.14",
-    "@types/node": "^22.9.0",
+    "@types/node": "^22.10.7",
     "@types/tar-stream": "^3.1.3",
-    "@typescript-eslint/eslint-plugin": "^8.14.0",
-    "@typescript-eslint/parser": "^8.14.0",
+    "@typescript-eslint/eslint-plugin": "^8.20.0",
+    "@typescript-eslint/parser": "^8.20.0",
     "@versatiles/container": "^1.2.3",
     "@versatiles/release-tool": "^1.2.6",
     "bin-pack": "^1.0.2",
-    "eslint": "^9.14.0",
-    "inquirer": "^12.1.0",
+    "eslint": "^9.18.0",
+    "inquirer": "^12.3.2",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
     "jest-ts-webcompat-resolver": "^1.0.0",
-    "npm-check-updates": "^17.1.11",
-    "rollup": "^4.26.0",
+    "npm-check-updates": "^17.1.14",
+    "rollup": "^4.30.1",
     "rollup-plugin-dts": "^6.1.1",
     "sharp": "^0.33.5",
     "tar-stream": "^3.1.7",
     "ts-jest": "^29.2.5",
     "ts-node": "^10.9.2",
     "tsx": "^4.19.2",
-    "typescript": "^5.6.3",
-    "typescript-eslint": "^8.14.0"
+    "typescript": "^5.7.3",
+    "typescript-eslint": "^8.20.0"
   }
 }

package/dist/guess_style/random_color.js

@@ -1,148 +0,0 @@
-export default function randomColorGenerator(startSeed) {
-    let seed = inputToSeed(startSeed);
-    const colorDictionary = initColorDictionary();
-    return randomColor;
-    function randomColor(options) {
-        options ??= {};
-        if (options.seed != null) {
-            seed = inputToSeed(options.seed);
-        }
-        options.opacity ??= 1;
-        const H = pickHue(options);
-        const S = pickSaturation(H, options);
-        const V = pickBrightness(H, S, options);
-        const hsl = HSVtoHSL([H, S, V]).map(v => v.toFixed(0));
-        if (options.opacity === 1) {
-            return `hsl(${hsl[0]},${hsl[1]}%,${hsl[2]}%)`;
-        }
-        else {
-            return `hsla(${hsl[0]},${hsl[1]}%,${hsl[2]}%,${options.opacity})`;
-        }
-    }
-    function pickHue(options) {
-        let hue = randomWithin(getHueRange(options.hue));
-        if (hue < 0)
-            hue = 360 + hue;
-        return hue;
-    }
-    function pickSaturation(hue, options) {
-        if (options.hue === 'monochrome')
-            return 0;
-        if (options.luminosity === 'random')
-            return randomWithin([0, 100]);
-        const { saturationRange } = getColorInfo(hue);
-        let [sMin, sMax] = saturationRange;
-        if (options.saturation === 'strong')
-            return sMax;
-        switch (options.luminosity) {
-            case 'bright':
-                sMin = 55;
-                break;
-            case 'dark':
-                sMin = sMax - 10;
-                break;
-            case 'light':
-                sMax = 55;
-                break;
-            default:
-        }
-        return randomWithin([sMin, sMax]);
-    }
-    function pickBrightness(h, s, options) {
-        let bMin = getMinimumBrightness(h, s), bMax = 100;
-        switch (options.luminosity) {
-            case 'dark':
-                bMax = Math.min(100, bMin + 20);
-                break;
-            case 'light':
-                bMin = (bMax + bMin) / 2;
-                break;
-            case 'random':
-                bMin = 0;
-                bMax = 100;
-                break;
-            default:
-        }
-        return randomWithin([bMin, bMax]);
-    }
-    function getMinimumBrightness(h, s) {
-        const { lowerBounds } = getColorInfo(h);
-        for (let i = 0; i < lowerBounds.length - 1; i++) {
-            const [s1, v1] = lowerBounds[i];
-            const [s2, v2] = lowerBounds[i + 1];
-            if (s >= s1 && s <= s2) {
-                const m = (v2 - v1) / (s2 - s1), b = v1 - m * s1;
-                return m * s + b;
-            }
-        }
-        return 0;
-    }
-    function getHueRange(hue) {
-        if (typeof hue === 'number') {
-            if (hue < 360 && hue > 0)
-                return [hue, hue];
-        }
-        if (typeof hue === 'string') {
-            const color = colorDictionary[hue];
-            if (color?.hueRange)
-                return color.hueRange;
-        }
-        return [0, 360];
-    }
-    function getColorInfo(hue) {
-        // Maps red colors to make picking hue easier
-        if (hue >= 334 && hue <= 360)
-            hue -= 360;
-        for (const colorName in colorDictionary) {
-            const color = colorDictionary[colorName];
-            if (color.hueRange && hue >= color.hueRange[0] && hue <= color.hueRange[1]) {
-                return colorDictionary[colorName];
-            }
-        }
-        throw Error('Color not found');
-    }
-    function randomWithin(range) {
-        //Seeded random algorithm from http://indiegamr.com/generate-repeatable-random-numbers-in-js/
-        const max = range[1] || 1;
-        const min = range[0] || 0;
-        seed = (seed * 9301 + 49297) % 233280;
-        const rnd = seed / 233280.0;
-        return Math.floor(min + rnd * (max - min));
-    }
-    function initColorDictionary() {
-        const dic = {};
-        const defineColor = (name, hueRange, lowerBounds) => {
-            const [greyest] = lowerBounds;
-            const colorful = lowerBounds[lowerBounds.length - 1];
-            dic[name] = {
-                hueRange,
-                lowerBounds,
-                saturationRange: [greyest[0], colorful[0]],
-                brightnessRange: [colorful[1], greyest[1]],
-            };
-        };
-        defineColor('monochrome', null, [[0, 0], [100, 0]]);
-        defineColor('red', [-26, 18], [[20, 100], [30, 92], [40, 89], [50, 85], [60, 78], [70, 70], [80, 60], [90, 55], [100, 50]]);
-        defineColor('orange', [18, 46], [[20, 100], [30, 93], [40, 88], [50, 86], [60, 85], [70, 70], [100, 70]]);
-        defineColor('yellow', [46, 62], [[25, 100], [40, 94], [50, 89], [60, 86], [70, 84], [80, 82], [90, 80], [100, 75]]);
-        defineColor('green', [62, 178], [[30, 100], [40, 90], [50, 85], [60, 81], [70, 74], [80, 64], [90, 50], [100, 40]]);
-        defineColor('blue', [178, 257], [[20, 100], [30, 86], [40, 80], [50, 74], [60, 60], [70, 52], [80, 44], [90, 39], [100, 35]]);
-        defineColor('purple', [257, 282], [[20, 100], [30, 87], [40, 79], [50, 70], [60, 65], [70, 59], [80, 52], [90, 45], [100, 42]]);
-        defineColor('pink', [282, 334], [[20, 100], [30, 90], [40, 86], [60, 84], [80, 80], [90, 75], [100, 73]]);
-        return dic;
-    }
-    function HSVtoHSL(hsv) {
-        const s = hsv[1] / 100, v = hsv[2] / 100, k = (2 - s) * v;
-        return [hsv[0], 100 * s * v / (k < 1 ? k : 2 - k), 100 * k / 2];
-    }
-    function inputToSeed(input) {
-        if (input == null)
-            return 0;
-        if (typeof input === 'number')
-            return input;
-        let i = 0;
-        for (let p = 0; p < input.length; p++)
-            i = (i * 0x101 + input.charCodeAt(p)) % 0x100000000;
-        return i;
-    }
-}