@versatiles/style 5.2.0 → 5.2.2

package/dist/style_builder/types.d.ts

@@ -1,15 +1,13 @@
-import type Color from '../color/index.js';
-import type StyleBuilder from './style_builder.js';
+import type { Color } from '../color/index.js';
+import type { StyleBuilder } from './style_builder.js';
 import type { RecolorOptions } from './recolor.js';
+import { SpriteSpecification } from '@maplibre/maplibre-gl-style-spec';
 /** Represents language suffixes used in map styles. */
 export type Language = 'de' | 'en' | null;
 export interface StyleBuilderOptions<T extends StyleBuilder<T>> {
     baseUrl?: string;
     glyphs?: string;
-    sprite?: string | {
-        id: string;
-        url: string;
-    }[];
+    sprite?: SpriteSpecification;
     tiles?: string[];
     hideLabels?: boolean;
     language?: Language;

package/dist/styles/colorful.d.ts

@@ -1,4 +1,4 @@
-import StyleBuilder from '../style_builder/style_builder.js';
+import { StyleBuilder } from '../style_builder/style_builder.js';
 import type { StyleRules, StyleRulesOptions } from '../style_builder/types.js';
 export default class Colorful extends StyleBuilder<Colorful> {
     readonly name: string;

package/dist/styles/colorful.js

@@ -1,4 +1,4 @@
-import StyleBuilder from '../style_builder/style_builder.js';
+import { StyleBuilder } from '../style_builder/style_builder.js';
 export default class Colorful extends StyleBuilder {
     name = 'Colorful';
     defaultFonts = {

package/dist/styles/empty.d.ts

@@ -1,4 +1,4 @@
-import StyleBuilder from '../style_builder/style_builder.js';
+import { StyleBuilder } from '../style_builder/style_builder.js';
 import type { StyleRules, StyleRulesOptions } from '../style_builder/types.js';
 export default class Empty extends StyleBuilder<Empty> {
     readonly name: string;

package/dist/styles/empty.js

@@ -1,4 +1,4 @@
-import StyleBuilder from '../style_builder/style_builder.js';
+import { StyleBuilder } from '../style_builder/style_builder.js';
 export default class Empty extends StyleBuilder {
     name = 'Empty';
     defaultFonts = {

package/dist/styles/index.d.ts

@@ -1,8 +1,6 @@
-import type StyleBuilder from '../style_builder/style_builder.js';
+import type { StyleBuilder } from '../style_builder/style_builder.js';
 import type { StyleBuilderOptions } from '../style_builder/types.js';
-import type { MaplibreStyle } from '../types/maplibre.js';
-import type { RecolorOptions } from '../style_builder/recolor.js';
-export type { MaplibreStyle, RecolorOptions };
+import { StyleSpecification } from '@maplibre/maplibre-gl-style-spec';
 import Colorful from './colorful.js';
 import Eclipse from './eclipse.js';
 import Graybeard from './graybeard.js';
@@ -14,7 +12,7 @@ export type GraybeardOptions = StyleBuilderOptions<Graybeard>;
 export type NeutrinoOptions = StyleBuilderOptions<Neutrino>;
 export type EmptyOptions = StyleBuilderOptions<Empty>;
 export type SomeOptions = ColorfulOptions | EclipseOptions | EmptyOptions | GraybeardOptions | NeutrinoOptions;
-type MakeStyle<T extends StyleBuilder<T>, O extends StyleBuilderOptions<T>> = ((options?: O) => MaplibreStyle) & {
+export type MakeStyle<T extends StyleBuilder<T>, O extends StyleBuilderOptions<T>> = ((options?: O) => StyleSpecification) & {
     getOptions: () => O;
 };
 export type ColorfulBuilder = MakeStyle<Colorful, ColorfulOptions>;

package/dist/styles/neutrino.d.ts

@@ -1,4 +1,4 @@
-import StyleBuilder from '../style_builder/style_builder.js';
+import { StyleBuilder } from '../style_builder/style_builder.js';
 import type { StyleRules, StyleRulesOptions } from '../style_builder/types.js';
 export default class Neutrino extends StyleBuilder<Neutrino> {
     readonly name: string;

package/dist/styles/neutrino.js

@@ -1,4 +1,4 @@
-import StyleBuilder from '../style_builder/style_builder.js';
+import { StyleBuilder } from '../style_builder/style_builder.js';
 export default class Neutrino extends StyleBuilder {
     name = 'Neutrino';
     defaultFonts = {

package/dist/types/index.d.ts

@@ -1,5 +1,5 @@
-export type { MaplibreStyle, MaplibreStyleVector, MaplibreLayerDefinition, MaplibreLayer } from './maplibre.js';
+export type { MaplibreLayerDefinition, MaplibreLayer } from './maplibre.js';
 export type { VectorLayer } from './vector_layer.js';
 export { isTileJSONSpecification } from './tilejson.js';
-export type { TileJSONSpecification, TileJSONSpecificationBasic, TileJSONSpecificationRaster, TileJSONSpecificationVector } from './tilejson.js';
+export type { TileJSONSpecification, TileJSONSpecificationRaster, TileJSONSpecificationVector } from './tilejson.js';
 export { isVectorLayers } from './vector_layer.js';

package/dist/types/maplibre.d.ts

@@ -1,19 +1,5 @@
-import type { BackgroundLayerSpecification, FillLayerSpecification, FilterSpecification, LineLayerSpecification, StyleSpecification, SymbolLayerSpecification } from '@maplibre/maplibre-gl-style-spec';
-import type { TileJSONSpecificationRaster, TileJSONSpecificationVector } from './tilejson.js';
-/** Type for Maplibre styles specifically designed for raster sources. */
-export type MaplibreStyleRaster = Omit<StyleSpecification, 'sources'> & {
-    'sources': {
-        [_: string]: TileJSONSpecificationRaster;
-    };
-};
-/** Type for Maplibre styles specifically designed for vector sources. */
-export type MaplibreStyleVector = Omit<StyleSpecification, 'sources'> & {
-    'sources': {
-        [_: string]: TileJSONSpecificationVector;
-    };
-};
-/** Represents a Maplibre style, which can be either raster or vector. */
-export type MaplibreStyle = MaplibreStyleRaster | MaplibreStyleVector;
+import type { BackgroundLayerSpecification, FillLayerSpecification, FilterSpecification, LineLayerSpecification, SymbolLayerSpecification } from '@maplibre/maplibre-gl-style-spec';
+export type { StyleSpecification } from '@maplibre/maplibre-gl-style-spec';
 /** Type for Maplibre layers, including background, fill, line, and symbol specifications. */
 export type MaplibreLayer = BackgroundLayerSpecification | FillLayerSpecification | LineLayerSpecification | SymbolLayerSpecification;
 /** Defines the structure of Maplibre layer definitions, omitting the 'source' property for fill, line, and symbol specifications. */

package/dist/types/tilejson.d.ts

@@ -1,7 +1,7 @@
 import type { VectorLayer } from './vector_layer.js';
 /** Basic structure for TileJSON specification, applicable to both raster and vector types. */
-export interface TileJSONSpecificationBasic {
-    tilejson: '3.0.0';
+export interface TileJSONSpecificationRaster {
+    tilejson?: '3.0.0';
     tiles: string[];
     attribution?: string;
     bounds?: [number, number, number, number];
@@ -16,16 +16,10 @@ export interface TileJSONSpecificationBasic {
     name?: string;
     scheme?: 'tms' | 'xyz';
     template?: string;
-}
-/** Structure for TileJSON specification of raster type, specifying raster-specific properties. */
-export interface TileJSONSpecificationRaster extends TileJSONSpecificationBasic {
-    type: 'raster';
-    format: 'avif' | 'jpg' | 'png' | 'webp';
+    version?: string;
 }
 /** Structure for TileJSON specification of vector type, specifying vector-specific properties. */
-export interface TileJSONSpecificationVector extends TileJSONSpecificationBasic {
-    type: 'vector';
-    format: 'pbf';
+export interface TileJSONSpecificationVector extends TileJSONSpecificationRaster {
     vector_layers: VectorLayer[];
 }
 /** Represents a TileJSON specification, which can be either raster or vector. */
@@ -35,3 +29,4 @@ export type TileJSONSpecification = TileJSONSpecificationRaster | TileJSONSpecif
 * Throws errors if the object does not conform to the expected structure or types.
 */
 export declare function isTileJSONSpecification(spec: unknown): spec is TileJSONSpecification;
+export declare function isRasterTileJSONSpecification(spec: unknown): spec is TileJSONSpecificationRaster;

package/dist/types/tilejson.js

@@ -1,4 +1,3 @@
-import { isVectorLayers } from './vector_layer.js';
 /**
 * Checks if an object adheres to the TileJSON specification.
 * Throws errors if the object does not conform to the expected structure or types.
@@ -9,13 +8,13 @@ export function isTileJSONSpecification(spec) {
     }
     const obj = spec;
     // Common property validation
-    if (obj.tilejson !== '3.0.0') {
+    if (obj.data != null && obj.tilejson !== '3.0.0') {
         throw Error('spec.tilejson must be "3.0.0"');
     }
-    if (obj.attribution !== undefined && typeof obj.attribution !== 'string') {
+    if (obj.attribution != null && typeof obj.attribution !== 'string') {
         throw Error('spec.attribution must be a string if present');
     }
-    if (obj.bounds !== undefined) {
+    if (obj.bounds != null) {
         if (!Array.isArray(obj.bounds) || obj.bounds.length !== 4 || obj.bounds.some(num => typeof num !== 'number')) {
             throw Error('spec.bounds must be an array of four numbers if present');
         }
@@ -33,7 +32,7 @@ export function isTileJSONSpecification(spec) {
         if (a[1] > a[3])
             throw Error('spec.bounds[1] must be smaller than spec.bounds[3]');
     }
-    if (obj.center !== undefined) {
+    if (obj.center != null) {
         if (!Array.isArray(obj.center) || obj.center.length !== 2 || obj.center.some(num => typeof num !== 'number')) {
             throw Error('spec.center must be an array of two numbers if present');
         }
@@ -43,61 +42,45 @@ export function isTileJSONSpecification(spec) {
         if (a[1] < -90 || a[1] > 90)
             throw Error('spec.center[1] must be between -90 and 90');
     }
-    if (obj.data !== undefined && (!Array.isArray(obj.data) || obj.data.some(url => typeof url !== 'string'))) {
+    if (obj.data != null && (!Array.isArray(obj.data) || obj.data.some(url => typeof url !== 'string'))) {
         throw Error('spec.data must be an array of strings if present');
     }
-    if (obj.description !== undefined && typeof obj.description !== 'string') {
+    if (obj.description != null && typeof obj.description !== 'string') {
         throw Error('spec.description must be a string if present');
     }
-    if (obj.fillzoom !== undefined && (typeof obj.fillzoom !== 'number' || (obj.fillzoom < 0))) {
+    if (obj.fillzoom != null && (typeof obj.fillzoom !== 'number' || (obj.fillzoom < 0))) {
         throw Error('spec.fillzoom must be a positive integer if present');
     }
-    if (obj.grids !== undefined && (!Array.isArray(obj.grids) || obj.grids.some(url => typeof url !== 'string'))) {
+    if (obj.grids != null && (!Array.isArray(obj.grids) || obj.grids.some(url => typeof url !== 'string'))) {
         throw Error('spec.grids must be an array of strings if present');
     }
-    if (obj.legend !== undefined && typeof obj.legend !== 'string') {
+    if (obj.legend != null && typeof obj.legend !== 'string') {
         throw Error('spec.legend must be a string if present');
     }
-    if (obj.minzoom !== undefined && (typeof obj.minzoom !== 'number' || (obj.minzoom < 0))) {
+    if (obj.minzoom != null && (typeof obj.minzoom !== 'number' || (obj.minzoom < 0))) {
         throw Error('spec.minzoom must be a positive integer if present');
     }
-    if (obj.maxzoom !== undefined && (typeof obj.maxzoom !== 'number' || (obj.maxzoom < 0))) {
+    if (obj.maxzoom != null && (typeof obj.maxzoom !== 'number' || (obj.maxzoom < 0))) {
         throw Error('spec.maxzoom must be a positive integer if present');
     }
-    if (obj.name !== undefined && typeof obj.name !== 'string') {
+    if (obj.name != null && typeof obj.name !== 'string') {
         throw Error('spec.name must be a string if present');
     }
-    if (obj.scheme !== undefined && obj.scheme !== 'xyz' && obj.scheme !== 'tms') {
+    if (obj.scheme != null && obj.scheme !== 'xyz' && obj.scheme !== 'tms') {
         throw Error('spec.scheme must be "tms" or "xyz" if present');
     }
-    if (obj.template !== undefined && typeof obj.template !== 'string') {
+    if (obj.template != null && typeof obj.template !== 'string') {
         throw Error('spec.template must be a string if present');
     }
     if (!Array.isArray(obj.tiles) || obj.tiles.length === 0 || obj.tiles.some(url => typeof url !== 'string')) {
         throw Error('spec.tiles must be an array of strings');
     }
-    if (typeof obj.format !== 'string') {
-        throw Error('spec.format must be a string');
-    }
-    if (obj.type === 'raster') {
-        if (!['avif', 'jpg', 'png', 'webp'].includes(obj.format)) {
-            throw Error('spec.format must be "avif", "jpg", "png", or "webp" for raster sources');
-        }
-    }
-    else if (obj.type === 'vector') {
-        if (obj.format !== 'pbf') {
-            throw Error('spec.format must be "pbf" for vector sources');
-        }
-        try {
-            if (!isVectorLayers(obj.vector_layers))
-                throw Error('spec.vector_layers is invalid');
-        }
-        catch (error) {
-            throw Error('spec.vector_layers is invalid: ' + String((error instanceof Error) ? error.message : error));
-        }
-    }
-    else {
-        throw Error('spec.type must be "raster" or "vector"');
-    }
+    return true;
+}
+export function isRasterTileJSONSpecification(spec) {
+    if (!isTileJSONSpecification(spec))
+        return false;
+    if (('vector_layers' in spec) && (spec.vector_layers != null))
+        return false;
     return true;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@versatiles/style",
-  "version": "5.2.0",
+  "version": "5.2.2",
   "description": "Generate StyleJSON for MapLibre",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -49,7 +49,6 @@
     "@types/tar-stream": "^3.1.3",
     "@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.18.0",

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2024 VersaTiles
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

package/dist/browser.d.ts

@@ -1,6 +0,0 @@
-export type * from './styles/index.js';
-export * from './styles/index.js';
-export * as styles from './styles/index.js';
-export type { GuessStyleOptions } from './guess_style/index.js';
-export { guessStyle } from './guess_style/index.js';
-export { Color } from './color/index.js';

package/dist/browser.js

@@ -1,4 +0,0 @@
-export * from './styles/index.js';
-export * as styles from './styles/index.js';
-export { guessStyle } from './guess_style/index.js';
-export { Color } from './color/index.js';

package/dist/guess_style/types.d.ts

@@ -1,23 +0,0 @@
-export interface GuessContainerOptions {
-    tiles: string[];
-    attribution?: string;
-    baseUrl?: string;
-    bounds?: [number, number, number, number];
-    center?: [number, number];
-    description?: string;
-    fillzoom?: number;
-    glyphs?: string;
-    grids?: string[];
-    legend?: string;
-    maxzoom?: number;
-    minzoom?: number;
-    name?: string;
-    scheme?: 'tms' | 'xyz';
-    sprite?: string;
-    template?: string;
-}
-/** Options for creating TileJSON, extending the basic specification with format and optional vector layers. */
-export interface GuessStyleOptions extends GuessContainerOptions {
-    format: 'avif' | 'jpg' | 'pbf' | 'png' | 'webp';
-    vectorLayers?: unknown[];
-}

package/dist/guess_style/types.js

@@ -1 +0,0 @@
-export {};