@versatiles/style 4.2.1 → 4.2.3

package/dist/browser.d.ts

@@ -1,4 +1,4 @@
-export type * from './styles';
-export * as styles from './styles';
-export type { GuessStyleOptions } from './guess_style';
-export { guessStyle } from './guess_style';
+export type * 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';

package/dist/browser.js

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

package/dist/guess_style/guess_style.d.ts

@@ -1,5 +1,5 @@
-import type { MaplibreStyle } from '../types';
+import type { MaplibreStyle } from '../types/index.js';
 import type { Container } from '@versatiles/container';
-import type { GuessContainerOptions, GuessStyleOptions } from './types';
+import type { GuessContainerOptions, GuessStyleOptions } from './types.js';
 export declare function guessStyle(opt: GuessStyleOptions): MaplibreStyle;
 export declare function guessStyleFromContainer(container: Container, options: GuessContainerOptions): Promise<MaplibreStyle>;

package/dist/guess_style/guess_style.js

@@ -1,8 +1,8 @@
 /* eslint-disable @typescript-eslint/naming-convention */
-import { isTileJSONSpecification, isVectorLayers } from '../types';
-import { resolveUrl } from '../lib/utils';
-import randomColorGenerator from './random_color';
-import { colorful } from '../styles';
+import { isTileJSONSpecification, isVectorLayers } from '../types/index.js';
+import { resolveUrl } from '../lib/utils.js';
+import randomColorGenerator from './random_color.js';
+import { colorful } from '../styles/index.js';
 export function guessStyle(opt) {
     const { format } = opt;
     const tilejsonBasic = {

package/dist/guess_style/index.d.ts

@@ -1,2 +1,2 @@
-export type { GuessStyleOptions, GuessContainerOptions } from './types';
-export { guessStyle, guessStyleFromContainer } from './guess_style';
+export type { GuessStyleOptions, GuessContainerOptions } from './types.js';
+export { guessStyle, guessStyleFromContainer } from './guess_style.js';

package/dist/guess_style/index.js

@@ -1 +1 @@
-export { guessStyle, guessStyleFromContainer } from './guess_style';
+export { guessStyle, guessStyleFromContainer } from './guess_style.js';

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-export type * from './styles';
-export * as styles from './styles';
-export { guessStyle, guessStyleFromContainer } from './guess_style';
-export type { GuessStyleOptions, GuessContainerOptions } from './guess_style';
-export type { VectorLayer } from './types';
+export type * from './styles/index.js';
+export * as styles from './styles/index.js';
+export { guessStyle, guessStyleFromContainer } from './guess_style/index.js';
+export type { GuessStyleOptions, GuessContainerOptions } from './guess_style/index.js';
+export type { VectorLayer } from './types/index.js';

package/dist/index.js

@@ -1,2 +1,2 @@
-export * as styles from './styles';
-export { guessStyle, guessStyleFromContainer } from './guess_style';
+export * as styles from './styles/index.js';
+export { guessStyle, guessStyleFromContainer } from './guess_style/index.js';

package/dist/shortbread/index.d.ts

@@ -1,2 +1,2 @@
-export { getShortbreadTemplate } from './template';
-export { getShortbreadLayers } from './layers';
+export { getShortbreadTemplate } from './template.js';
+export { getShortbreadLayers } from './layers.js';

package/dist/shortbread/index.js

@@ -1,2 +1,2 @@
-export { getShortbreadTemplate } from './template';
-export { getShortbreadLayers } from './layers';
+export { getShortbreadTemplate } from './template.js';
+export { getShortbreadLayers } from './layers.js';

package/dist/shortbread/layers.d.ts

@@ -1,5 +1,5 @@
-import type { LanguageSuffix } from '../style_builder';
-import type { MaplibreLayerDefinition } from '../types';
+import type { LanguageSuffix } from '../style_builder/index.js';
+import type { MaplibreLayerDefinition } from '../types/index.js';
 export declare function getShortbreadLayers(option: {
     readonly languageSuffix: LanguageSuffix;
 }): MaplibreLayerDefinition[];

package/dist/shortbread/template.d.ts

@@ -1,2 +1,2 @@
-import type { MaplibreStyleVector } from '../types';
+import type { MaplibreStyleVector } from '../types/index.js';
 export declare function getShortbreadTemplate(): MaplibreStyleVector;

package/dist/style_builder/decorator.d.ts

@@ -1,3 +1,3 @@
-import type { MaplibreLayer } from '../types';
-import type { StyleRules } from './types';
+import type { MaplibreLayer } from '../types/index.js';
+import type { StyleRules } from './types.js';
 export declare function decorate(layers: MaplibreLayer[], rules: StyleRules): MaplibreLayer[];

package/dist/style_builder/decorator.js

@@ -1,7 +1,7 @@
 import Color from 'color';
 import expandBraces from 'brace-expansion';
-import maplibreProperties from '../shortbread/properties';
-import { deepMerge } from '../lib/utils';
+import maplibreProperties from '../shortbread/properties.js';
+import { deepMerge } from '../lib/utils.js';
 export function decorate(layers, rules) {
     const layerIds = layers.map(l => l.id);
     const layerIdSet = new Set(layerIds);

package/dist/style_builder/index.d.ts

@@ -1 +1 @@
-export type { LanguageSuffix } from './types';
+export type { LanguageSuffix } from './types.js';

package/dist/style_builder/recolor.d.ts

@@ -1,5 +1,5 @@
-import type StyleBuilder from './style_builder';
-import type { StyleBuilderColors } from './types';
+import type StyleBuilder from './style_builder.js';
+import type { StyleBuilderColors } from './types.js';
 export interface RecolorOptions {
     /** If true, inverts the colors. */
     invert?: boolean;

package/dist/style_builder/style_builder.d.ts

@@ -1,7 +1,7 @@
 import Color from 'color';
-import type { MaplibreStyle } from '../types/maplibre';
-import type { StyleBuilderColorStrings, StyleBuilderColors, StyleBuilderFontStrings, StyleBuilderOptions } from './types';
-import type { StyleRules, StyleRulesOptions } from './types';
+import type { MaplibreStyle } from '../types/maplibre.js';
+import type { StyleBuilderColorStrings, StyleBuilderColors, StyleBuilderFontStrings, StyleBuilderOptions } from './types.js';
+import type { StyleRules, StyleRulesOptions } from './types.js';
 export default abstract class StyleBuilder<Subclass extends StyleBuilder<Subclass>> {
     #private;
     abstract readonly name: string;
@@ -9,6 +9,7 @@ export default abstract class StyleBuilder<Subclass extends StyleBuilder<Subclas
     abstract readonly defaultFonts: StyleBuilderFontStrings<Subclass>;
     build(options?: StyleBuilderOptions<Subclass>): MaplibreStyle;
     getColors(colors: StyleBuilderColorStrings<Subclass>): StyleBuilderColors<Subclass>;
+    getDefaultOptions(): StyleBuilderOptions<Subclass>;
     protected transformDefaultColors(callback: (color: Color) => Color): void;
     protected abstract getStyleRules(options: StyleRulesOptions<Subclass>): StyleRules;
 }

package/dist/style_builder/style_builder.js

@@ -1,8 +1,8 @@
 import Color from 'color';
-import { getShortbreadTemplate, getShortbreadLayers } from '../shortbread';
-import { decorate } from './decorator';
-import { getDefaultRecolorFlags, recolor } from './recolor';
-import { deepClone, resolveUrl } from '../lib/utils';
+import { getShortbreadTemplate, getShortbreadLayers } from '../shortbread/index.js';
+import { decorate } from './decorator.js';
+import { getDefaultRecolorFlags, recolor } from './recolor.js';
+import { deepClone, resolveUrl } from '../lib/utils.js';
 // StyleBuilder class definition
 export default class StyleBuilder {
     #sourceName = 'versatiles-shortbread';
@@ -23,7 +23,7 @@ export default class StyleBuilder {
         }
         // transform colors
         recolor(colors, recolorOptions);
-        const fonts = deepClone(this.defaultColors);
+        const fonts = deepClone(this.defaultFonts);
         if (options.fonts) {
             for (const key in options.fonts) {
                 const fontName = options.fonts[key];
@@ -35,7 +35,7 @@ export default class StyleBuilder {
         const style = getShortbreadTemplate();
         const styleRuleOptions = {
             colors,
-            fonts: deepClone(this.defaultFonts),
+            fonts,
             languageSuffix,
         };
         // get layer style rules from child class
@@ -76,6 +76,19 @@ export default class StyleBuilder {
         const result = Object.fromEntries(entriesColor);
         return result;
     }
+    getDefaultOptions() {
+        return {
+            baseUrl: '',
+            glyphs: '',
+            sprite: '',
+            tiles: [],
+            hideLabels: false,
+            languageSuffix: undefined,
+            colors: deepClone(this.defaultColors),
+            fonts: deepClone(this.defaultFonts),
+            recolor: getDefaultRecolorFlags(),
+        };
+    }
     transformDefaultColors(callback) {
         const colors = this.getColors(this.defaultColors);
         for (const key in colors) {

package/dist/style_builder/types.d.ts

@@ -1,6 +1,6 @@
 import type Color from 'color';
-import type StyleBuilder from './style_builder';
-import type { RecolorOptions } from './recolor';
+import type StyleBuilder from './style_builder.js';
+import type { RecolorOptions } from './recolor.js';
 /** Represents language suffixes used in map styles. */
 export type LanguageSuffix = 'de' | 'en' | undefined;
 export interface StyleBuilderOptions<T extends StyleBuilder<T>> {

package/dist/styles/colorful.d.ts

@@ -1,5 +1,5 @@
-import StyleBuilder from '../style_builder/style_builder';
-import type { StyleRules, StyleRulesOptions } from '../style_builder/types';
+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;
     defaultFonts: {

package/dist/styles/colorful.js

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/naming-convention */
-import StyleBuilder from '../style_builder/style_builder';
+import StyleBuilder from '../style_builder/style_builder.js';
 export default class Colorful extends StyleBuilder {
     name = 'Colorful';
     defaultFonts = {

package/dist/styles/graybeard.d.ts

@@ -1,4 +1,4 @@
-import Colorful from './colorful';
+import Colorful from './colorful.js';
 export default class Graybeard extends Colorful {
     readonly name: string;
     constructor();

package/dist/styles/graybeard.js

@@ -1,4 +1,4 @@
-import Colorful from './colorful';
+import Colorful from './colorful.js';
 export default class Graybeard extends Colorful {
     name = 'Graybeard';
     constructor() {

package/dist/styles/index.d.ts

@@ -1,9 +1,13 @@
-import type { StyleBuilderOptions } from '../style_builder/types';
-import type { MaplibreStyle } from '../types/maplibre';
-export type { StyleBuilderOptions, MaplibreStyle };
-import Colorful from './colorful';
-import Graybeard from './graybeard';
-import Neutrino from './neutrino';
-export declare function colorful(options?: StyleBuilderOptions<Colorful>): MaplibreStyle;
-export declare function graybeard(options?: StyleBuilderOptions<Graybeard>): MaplibreStyle;
-export declare function neutrino(options?: StyleBuilderOptions<Neutrino>): MaplibreStyle;
+import type StyleBuilder from '../style_builder/style_builder.js';
+import type { StyleBuilderOptions } from '../style_builder/types.js';
+import type { MaplibreStyle } from '../types/maplibre.js';
+export type { StyleBuilderOptions, MaplibreStyle, StyleBuilder };
+import Colorful from './colorful.js';
+import Graybeard from './graybeard.js';
+import Neutrino from './neutrino.js';
+type MakeStyle<T extends StyleBuilder<T>> = ((options?: StyleBuilderOptions<T>) => MaplibreStyle) & {
+    getOptions: () => StyleBuilderOptions<T>;
+};
+export declare const colorful: MakeStyle<Colorful>;
+export declare const graybeard: MakeStyle<Graybeard>;
+export declare const neutrino: MakeStyle<Neutrino>;

package/dist/styles/index.js

@@ -1,12 +1,13 @@
-import Colorful from './colorful';
-import Graybeard from './graybeard';
-import Neutrino from './neutrino';
-export function colorful(options) {
-    return new Colorful().build(options);
-}
-export function graybeard(options) {
-    return new Graybeard().build(options);
-}
-export function neutrino(options) {
-    return new Neutrino().build(options);
+import Colorful from './colorful.js';
+import Graybeard from './graybeard.js';
+import Neutrino from './neutrino.js';
+function makeStyle(styleBuilder) {
+    const fn = function (options) {
+        return new styleBuilder().build(options);
+    };
+    fn.getOptions = () => new styleBuilder().getDefaultOptions();
+    return fn;
 }
+export const colorful = makeStyle(Colorful);
+export const graybeard = makeStyle(Graybeard);
+export const neutrino = makeStyle(Neutrino);

package/dist/styles/neutrino.d.ts

@@ -1,5 +1,5 @@
-import StyleBuilder from '../style_builder/style_builder';
-import type { StyleRules, StyleRulesOptions } from '../style_builder/types';
+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;
     defaultFonts: {

package/dist/styles/neutrino.js

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/naming-convention */
-import StyleBuilder from '../style_builder/style_builder';
+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';
-export type { VectorLayer } from './vector_layer';
-export { isTileJSONSpecification } from './tilejson';
-export type { TileJSONSpecification, TileJSONSpecificationBasic, TileJSONSpecificationRaster, TileJSONSpecificationVector } from './tilejson';
-export { isVectorLayers } from './vector_layer';
+export type { MaplibreStyle, MaplibreStyleVector, 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 { isVectorLayers } from './vector_layer.js';

package/dist/types/index.js

@@ -1,2 +1,2 @@
-export { isTileJSONSpecification } from './tilejson';
-export { isVectorLayers } from './vector_layer';
+export { isTileJSONSpecification } from './tilejson.js';
+export { isVectorLayers } from './vector_layer.js';

package/dist/types/maplibre.d.ts

@@ -1,5 +1,5 @@
 import type { BackgroundLayerSpecification, FillLayerSpecification, FilterSpecification, LineLayerSpecification, StyleSpecification, SymbolLayerSpecification } from '@maplibre/maplibre-gl-style-spec';
-import type { TileJSONSpecificationRaster, TileJSONSpecificationVector } from './tilejson';
+import type { TileJSONSpecificationRaster, TileJSONSpecificationVector } from './tilejson.js';
 /** Type for Maplibre styles specifically designed for raster sources. */
 export type MaplibreStyleRaster = Omit<StyleSpecification, 'sources'> & {
     'sources': {

package/dist/types/tilejson.d.ts

@@ -1,4 +1,4 @@
-import type { VectorLayer } from './vector_layer';
+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';

package/dist/types/tilejson.js

@@ -1,4 +1,4 @@
-import { isVectorLayers } from './vector_layer';
+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.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@versatiles/style",
-  "version": "4.2.1",
+  "version": "4.2.3",
   "description": "Generate StyleJSON for MapLibre",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -29,7 +29,7 @@
   "type": "module",
   "dependencies": {
     "@types/color": "^3.0.6",
-    "brace-expansion": "^3.0.0",
+    "brace-expansion": "^4.0.0",
     "color": "^4.2.3"
   },
   "files": [
@@ -46,11 +46,11 @@
     "@types/brace-expansion": "^1.1.2",
     "@types/inquirer": "^9.0.7",
     "@types/jest": "^29.5.12",
-    "@types/node": "^20.11.20",
+    "@types/node": "^20.11.24",
     "@types/tar-stream": "^3.1.3",
-    "@typescript-eslint/eslint-plugin": "^7.0.2",
-    "@typescript-eslint/parser": "^7.0.2",
-    "@versatiles/container": "^1.2.0",
+    "@typescript-eslint/eslint-plugin": "^7.1.0",
+    "@typescript-eslint/parser": "^7.1.0",
+    "@versatiles/container": "^1.2.1",
     "@versatiles/release-tool": "^1.2.2",
     "bin-pack": "^1.0.2",
     "eslint": "^8.57.0",