@tileflow/core 0.1.0-alpha.12 → 0.1.0-alpha.13

package/README.md

@@ -51,7 +51,7 @@ export default defineTileflow({
       icons: 'brand',
       theme: 'light',
       modules: [
-        labels({roads: 'minimal'}),
+        labels({roads: 'major'}),
         poi({categories: ['food', 'coffee', 'culture', 'transit'], icons: 'essential'}),
         roads({detail: 'streets', hierarchy: 'clear', outline: 'subtle', weight: 'regular'}),
       ],
@@ -113,7 +113,28 @@ Without options, `roads()` uses `detail: 'streets'`, `hierarchy: 'clear'`,
 `weight: 'regular'`, `outline: 'subtle'`, and all extras disabled. Named visual recipes belong
 in examples rather than the runtime API, so the resolved behavior is always visible in config.
 
-Colors never belong in `roads()`. Put common colors in `theme.colors` and granular road colors in `theme.modules.roads`. Road-label density remains a `labels({roads: ...})` concern.
+Colors never belong in `roads()`. Put common colors in `theme.colors` and granular road colors in `theme.modules.roads`. Road-label detail remains a `labels({roads: ...})` concern.
+
+## Labels module
+
+Control label families independently without a preset:
+
+```ts
+labels({
+  language: 'auto',
+  places: 'major',
+  roads: 'major',
+  water: 'major',
+});
+```
+
+`places`, `roads`, and `water` accept `none`, `major`, or `all`. Each value is progressive:
+`major` keeps the important labels for orientation and `all` adds local or secondary labels at
+their natural zoom. Road labels are automatically limited to road classes currently visible through
+`roads({detail})`. `language` accepts `auto`, `local`, or a language code such as `en` or `es`.
+
+Without options, `labels()` uses `language: 'auto'` and `major` for all three label families.
+Label colors remain in `theme.modules.labels`; font family and weight remain in `typography`.
 
 ## Public API
 

package/dist/index.d.ts

@@ -4,7 +4,7 @@ type TileflowDensity = 'clean' | 'balanced' | 'dense';
 type TileflowRoads = 'hidden' | 'soft' | 'standard' | 'detailed';
 type TileflowLabels = 'none' | 'essential' | 'balanced' | 'full';
 type TileflowPoi = 'none' | 'minimal' | 'balanced' | 'full';
-type TileflowLabelDensity = 'none' | 'minimal' | 'balanced' | 'detailed';
+type TileflowLabelDetail = 'none' | 'major' | 'all';
 type TileflowLabelLanguage = 'auto' | 'local' | 'en' | (string & {});
 type TileflowPoiCategory = 'food' | 'coffee' | 'culture' | 'transit' | 'shopping' | 'lodging' | 'health' | 'education' | 'services' | (string & {});
 type TileflowPoiIcons = boolean | 'essential' | 'full';
@@ -151,7 +151,10 @@ type TileflowSourceLayers = {
     landuse?: string;
     park?: string;
     water?: string;
+    waterName?: string;
+    waterway?: string;
     road?: string;
+    roadName?: string;
     building?: string;
     boundary?: string;
     place?: string;
@@ -212,10 +215,9 @@ type TileflowRoadsModuleOptions = Omit<TileflowRoadsModuleConfig, 'type'>;
 type TileflowLabelsModuleConfig = {
     type: 'labels';
     language?: TileflowLabelLanguage;
-    places?: TileflowLabelDensity;
-    preset?: TileflowLabels;
-    roads?: TileflowLabelDensity;
-    water?: TileflowLabelDensity;
+    places?: TileflowLabelDetail;
+    roads?: TileflowLabelDetail;
+    water?: TileflowLabelDetail;
 };
 type TileflowLabelsModuleOptions = Omit<TileflowLabelsModuleConfig, 'type'>;
 type TileflowPoiModuleConfig = {
@@ -543,7 +545,10 @@ declare const tileflowMapSchema: z.ZodObject<{
             landuse: z.ZodOptional<z.ZodString>;
             park: z.ZodOptional<z.ZodString>;
             water: z.ZodOptional<z.ZodString>;
+            waterName: z.ZodOptional<z.ZodString>;
+            waterway: z.ZodOptional<z.ZodString>;
             road: z.ZodOptional<z.ZodString>;
+            roadName: z.ZodOptional<z.ZodString>;
             building: z.ZodOptional<z.ZodString>;
             boundary: z.ZodOptional<z.ZodString>;
             place: z.ZodOptional<z.ZodString>;
@@ -752,28 +757,19 @@ declare const tileflowMapSchema: z.ZodObject<{
         type: z.ZodLiteral<"labels">;
         language: z.ZodOptional<z.ZodString>;
         places: z.ZodOptional<z.ZodEnum<{
-            balanced: "balanced";
             none: "none";
-            minimal: "minimal";
-            detailed: "detailed";
-        }>>;
-        preset: z.ZodOptional<z.ZodEnum<{
-            balanced: "balanced";
-            none: "none";
-            essential: "essential";
-            full: "full";
+            major: "major";
+            all: "all";
         }>>;
         roads: z.ZodOptional<z.ZodEnum<{
-            balanced: "balanced";
             none: "none";
-            minimal: "minimal";
-            detailed: "detailed";
+            major: "major";
+            all: "all";
         }>>;
         water: z.ZodOptional<z.ZodEnum<{
-            balanced: "balanced";
             none: "none";
-            minimal: "minimal";
-            detailed: "detailed";
+            major: "major";
+            all: "all";
         }>>;
     }, z.core.$strict>, z.ZodObject<{
         type: z.ZodLiteral<"poi">;
@@ -1015,7 +1011,10 @@ declare const tileflowMapSchema: z.ZodObject<{
             landuse: z.ZodOptional<z.ZodString>;
             park: z.ZodOptional<z.ZodString>;
             water: z.ZodOptional<z.ZodString>;
+            waterName: z.ZodOptional<z.ZodString>;
+            waterway: z.ZodOptional<z.ZodString>;
             road: z.ZodOptional<z.ZodString>;
+            roadName: z.ZodOptional<z.ZodString>;
             building: z.ZodOptional<z.ZodString>;
             boundary: z.ZodOptional<z.ZodString>;
             place: z.ZodOptional<z.ZodString>;
@@ -1039,7 +1038,10 @@ declare const configSchema: z.ZodObject<{
             landuse: z.ZodOptional<z.ZodString>;
             park: z.ZodOptional<z.ZodString>;
             water: z.ZodOptional<z.ZodString>;
+            waterName: z.ZodOptional<z.ZodString>;
+            waterway: z.ZodOptional<z.ZodString>;
             road: z.ZodOptional<z.ZodString>;
+            roadName: z.ZodOptional<z.ZodString>;
             building: z.ZodOptional<z.ZodString>;
             boundary: z.ZodOptional<z.ZodString>;
             place: z.ZodOptional<z.ZodString>;
@@ -1248,28 +1250,19 @@ declare const configSchema: z.ZodObject<{
         type: z.ZodLiteral<"labels">;
         language: z.ZodOptional<z.ZodString>;
         places: z.ZodOptional<z.ZodEnum<{
-            balanced: "balanced";
-            none: "none";
-            minimal: "minimal";
-            detailed: "detailed";
-        }>>;
-        preset: z.ZodOptional<z.ZodEnum<{
-            balanced: "balanced";
             none: "none";
-            essential: "essential";
-            full: "full";
+            major: "major";
+            all: "all";
         }>>;
         roads: z.ZodOptional<z.ZodEnum<{
-            balanced: "balanced";
             none: "none";
-            minimal: "minimal";
-            detailed: "detailed";
+            major: "major";
+            all: "all";
         }>>;
         water: z.ZodOptional<z.ZodEnum<{
-            balanced: "balanced";
             none: "none";
-            minimal: "minimal";
-            detailed: "detailed";
+            major: "major";
+            all: "all";
         }>>;
     }, z.core.$strict>, z.ZodObject<{
         type: z.ZodLiteral<"poi">;
@@ -1511,7 +1504,10 @@ declare const configSchema: z.ZodObject<{
             landuse: z.ZodOptional<z.ZodString>;
             park: z.ZodOptional<z.ZodString>;
             water: z.ZodOptional<z.ZodString>;
+            waterName: z.ZodOptional<z.ZodString>;
+            waterway: z.ZodOptional<z.ZodString>;
             road: z.ZodOptional<z.ZodString>;
+            roadName: z.ZodOptional<z.ZodString>;
             building: z.ZodOptional<z.ZodString>;
             boundary: z.ZodOptional<z.ZodString>;
             place: z.ZodOptional<z.ZodString>;
@@ -1728,7 +1724,10 @@ declare const tileflowProjectSchema: z.ZodObject<{
             landuse: z.ZodOptional<z.ZodString>;
             park: z.ZodOptional<z.ZodString>;
             water: z.ZodOptional<z.ZodString>;
+            waterName: z.ZodOptional<z.ZodString>;
+            waterway: z.ZodOptional<z.ZodString>;
             road: z.ZodOptional<z.ZodString>;
+            roadName: z.ZodOptional<z.ZodString>;
             building: z.ZodOptional<z.ZodString>;
             boundary: z.ZodOptional<z.ZodString>;
             place: z.ZodOptional<z.ZodString>;
@@ -1745,7 +1744,10 @@ declare const tileflowProjectSchema: z.ZodObject<{
                 landuse: z.ZodOptional<z.ZodString>;
                 park: z.ZodOptional<z.ZodString>;
                 water: z.ZodOptional<z.ZodString>;
+                waterName: z.ZodOptional<z.ZodString>;
+                waterway: z.ZodOptional<z.ZodString>;
                 road: z.ZodOptional<z.ZodString>;
+                roadName: z.ZodOptional<z.ZodString>;
                 building: z.ZodOptional<z.ZodString>;
                 boundary: z.ZodOptional<z.ZodString>;
                 place: z.ZodOptional<z.ZodString>;
@@ -1954,28 +1956,19 @@ declare const tileflowProjectSchema: z.ZodObject<{
             type: z.ZodLiteral<"labels">;
             language: z.ZodOptional<z.ZodString>;
             places: z.ZodOptional<z.ZodEnum<{
-                balanced: "balanced";
-                none: "none";
-                minimal: "minimal";
-                detailed: "detailed";
-            }>>;
-            preset: z.ZodOptional<z.ZodEnum<{
-                balanced: "balanced";
                 none: "none";
-                essential: "essential";
-                full: "full";
+                major: "major";
+                all: "all";
             }>>;
             roads: z.ZodOptional<z.ZodEnum<{
-                balanced: "balanced";
                 none: "none";
-                minimal: "minimal";
-                detailed: "detailed";
+                major: "major";
+                all: "all";
             }>>;
             water: z.ZodOptional<z.ZodEnum<{
-                balanced: "balanced";
                 none: "none";
-                minimal: "minimal";
-                detailed: "detailed";
+                major: "major";
+                all: "all";
             }>>;
         }, z.core.$strict>, z.ZodObject<{
             type: z.ZodLiteral<"poi">;
@@ -2217,7 +2210,10 @@ declare const tileflowProjectSchema: z.ZodObject<{
                 landuse: z.ZodOptional<z.ZodString>;
                 park: z.ZodOptional<z.ZodString>;
                 water: z.ZodOptional<z.ZodString>;
+                waterName: z.ZodOptional<z.ZodString>;
+                waterway: z.ZodOptional<z.ZodString>;
                 road: z.ZodOptional<z.ZodString>;
+                roadName: z.ZodOptional<z.ZodString>;
                 building: z.ZodOptional<z.ZodString>;
                 boundary: z.ZodOptional<z.ZodString>;
                 place: z.ZodOptional<z.ZodString>;
@@ -2241,12 +2237,12 @@ declare function defineTileflow<const TConfig extends TileflowProjectConfig>(con
 
 declare function osm(options?: TileflowOsmBasemapOptions): TileflowOsmBasemapConfig;
 
+declare function roads(options?: TileflowRoadsModuleOptions): TileflowRoadsModuleConfig;
+
 declare function labels(options?: TileflowLabelsModuleOptions): TileflowLabelsModuleConfig;
 
 declare function poi(options?: TileflowPoiModuleOptions): TileflowPoiModuleConfig;
 
-declare function roads(options?: TileflowRoadsModuleOptions): TileflowRoadsModuleConfig;
-
 declare function styleOverride(options?: TileflowStyleOverrideOptions): TileflowStyleOverrideModuleConfig;
 
 declare const defaultTileflowManifestUrl = "/tileflow/manifest.json";
@@ -2357,4 +2353,4 @@ declare function normalizeTileflowStaticImageSize(input: {
 };
 declare function inferTileflowAnalyticsFromStyleUrl(styleUrl: string): TileflowAnalytics | undefined;
 
-export { type MapLibreSprite, type MapLibreStyle, type TileflowAdvancedColorConfig, type TileflowAnalytics, type TileflowBaseColors, type TileflowBasemapConfig, type TileflowBoundaryColorConfig, type TileflowBuildingColorConfig, type TileflowBuildings, type TileflowColor, type TileflowColorConfig, type TileflowColors, type TileflowConfig, type TileflowDensity, type TileflowFontWeight, type TileflowFonts, type TileflowHydroColorConfig, type TileflowIconSet, type TileflowIconSetConfig, type TileflowLabelColorConfig, type TileflowLabelDensity, type TileflowLabelLanguage, type TileflowLabels, type TileflowLabelsModuleConfig, type TileflowLabelsModuleOptions, type TileflowLandcoverColorConfig, type TileflowLanduseColorConfig, type TileflowManifest, type TileflowManifestLoadOptions, type TileflowMapConfig, type TileflowMapMarker, type TileflowMapMode, type TileflowMapModeOptions, type TileflowModuleConfig, type TileflowOsmBasemapConfig, type TileflowOsmBasemapOptions, type TileflowPoi, type TileflowPoiCategory, type TileflowPoiColorConfig, type TileflowPoiIcons, type TileflowPoiLabels, type TileflowPoiModuleConfig, type TileflowPoiModuleOptions, type TileflowProjectConfig, type TileflowProjectIconSets, type TileflowProjectThemes, type TileflowRenderer, type TileflowRoadColorConfig, type TileflowRoadDetail, type TileflowRoadExtras, type TileflowRoadHierarchy, type TileflowRoadOutline, type TileflowRoadWeight, type TileflowRoads, type TileflowRoadsModuleConfig, type TileflowRoadsModuleOptions, type TileflowRuntimeManifest, type TileflowRuntimeManifestMap, type TileflowRuntimeManifestMapEntry, type TileflowRuntimeStyle, type TileflowRuntimeStyleOptions, type TileflowSourceLayers, type TileflowStyleLayerOverride, type TileflowStyleOptions, type TileflowStyleOverrideModuleConfig, type TileflowStyleOverrideOptions, type TileflowTerrain, type TileflowTerrainConfig, type TileflowTerrainEncoding, type TileflowTerrainMode, type TileflowTheme, type TileflowThemeConfig, type TileflowThemeMode, type TileflowThemeModulesConfig, type TileflowThemeName, type TileflowTiles, type TileflowTilesetConfig, type TileflowTypography, type TileflowViewConfig, type ValidationMessage, type ValidationResult, configSchema, createManifest, createStyle, createStyleFromProject, createTileflowSessionId, defaultTileflowManifestUrl, defaultTileflowStyleBaseUrl, defineTileflow, getDefaultColors, getDefaultTileflowStyleBaseUrl, getTileflowAnalyticsApiUrl, inferTileflowAnalyticsFromStyleUrl, isTileflowLocalDevHost, labels, loadTileflowManifest, mergeTileflowAnalytics, normalizeTileflowStaticImageSize, normalizeTileflowUrl, osm, parseTileflowMap, parseTileflowProject, poi, resolveTileflowAnalyticsRequestUrl, resolveTileflowManifestMap, resolveTileflowMapMode, resolveTileflowRuntimeStyle, resolveTileflowStaticImageUrl, resolveTileflowStyleUrl, roads, shouldLoadTileflowManifest, startTileflowSession, styleOverride, tileflowMapSchema, tileflowProjectSchema, tileflowThemeSchema, validateConfig, validateTileflowConfig };
+export { type MapLibreSprite, type MapLibreStyle, type TileflowAdvancedColorConfig, type TileflowAnalytics, type TileflowBaseColors, type TileflowBasemapConfig, type TileflowBoundaryColorConfig, type TileflowBuildingColorConfig, type TileflowBuildings, type TileflowColor, type TileflowColorConfig, type TileflowColors, type TileflowConfig, type TileflowDensity, type TileflowFontWeight, type TileflowFonts, type TileflowHydroColorConfig, type TileflowIconSet, type TileflowIconSetConfig, type TileflowLabelColorConfig, type TileflowLabelDetail, type TileflowLabelLanguage, type TileflowLabels, type TileflowLabelsModuleConfig, type TileflowLabelsModuleOptions, type TileflowLandcoverColorConfig, type TileflowLanduseColorConfig, type TileflowManifest, type TileflowManifestLoadOptions, type TileflowMapConfig, type TileflowMapMarker, type TileflowMapMode, type TileflowMapModeOptions, type TileflowModuleConfig, type TileflowOsmBasemapConfig, type TileflowOsmBasemapOptions, type TileflowPoi, type TileflowPoiCategory, type TileflowPoiColorConfig, type TileflowPoiIcons, type TileflowPoiLabels, type TileflowPoiModuleConfig, type TileflowPoiModuleOptions, type TileflowProjectConfig, type TileflowProjectIconSets, type TileflowProjectThemes, type TileflowRenderer, type TileflowRoadColorConfig, type TileflowRoadDetail, type TileflowRoadExtras, type TileflowRoadHierarchy, type TileflowRoadOutline, type TileflowRoadWeight, type TileflowRoads, type TileflowRoadsModuleConfig, type TileflowRoadsModuleOptions, type TileflowRuntimeManifest, type TileflowRuntimeManifestMap, type TileflowRuntimeManifestMapEntry, type TileflowRuntimeStyle, type TileflowRuntimeStyleOptions, type TileflowSourceLayers, type TileflowStyleLayerOverride, type TileflowStyleOptions, type TileflowStyleOverrideModuleConfig, type TileflowStyleOverrideOptions, type TileflowTerrain, type TileflowTerrainConfig, type TileflowTerrainEncoding, type TileflowTerrainMode, type TileflowTheme, type TileflowThemeConfig, type TileflowThemeMode, type TileflowThemeModulesConfig, type TileflowThemeName, type TileflowTiles, type TileflowTilesetConfig, type TileflowTypography, type TileflowViewConfig, type ValidationMessage, type ValidationResult, configSchema, createManifest, createStyle, createStyleFromProject, createTileflowSessionId, defaultTileflowManifestUrl, defaultTileflowStyleBaseUrl, defineTileflow, getDefaultColors, getDefaultTileflowStyleBaseUrl, getTileflowAnalyticsApiUrl, inferTileflowAnalyticsFromStyleUrl, isTileflowLocalDevHost, labels, loadTileflowManifest, mergeTileflowAnalytics, normalizeTileflowStaticImageSize, normalizeTileflowUrl, osm, parseTileflowMap, parseTileflowProject, poi, resolveTileflowAnalyticsRequestUrl, resolveTileflowManifestMap, resolveTileflowMapMode, resolveTileflowRuntimeStyle, resolveTileflowStaticImageUrl, resolveTileflowStyleUrl, roads, shouldLoadTileflowManifest, startTileflowSession, styleOverride, tileflowMapSchema, tileflowProjectSchema, tileflowThemeSchema, validateConfig, validateTileflowConfig };

package/dist/index.js

@@ -513,40 +513,75 @@ function rgbToHex(r, g, b) {
 }
 
 // src/modules/labels/index.ts
+var moduleLabelDefaults = {
+  language: "auto",
+  places: "major",
+  roads: "major",
+  water: "major"
+};
+var majorPlaceClasses = ["continent", "country", "state", "city", "town"];
+var highwayRoadClasses = ["motorway", "trunk"];
+var arterialRoadClasses = ["primary", "secondary", "tertiary"];
+var majorRoadClasses = [...highwayRoadClasses, ...arterialRoadClasses];
+var majorRoadClassSet = new Set(majorRoadClasses);
+var streetRoadClasses = ["minor"];
+var serviceRoadClasses = ["service", "track"];
+var majorWaterClasses = ["ocean", "sea", "lake"];
+var majorWaterwayClasses = ["river"];
 function labels(options = {}) {
   return {
     type: "labels",
     ...options.language ? { language: options.language } : {},
     ...options.places ? { places: options.places } : {},
-    ...options.preset ? { preset: options.preset } : {},
     ...options.roads ? { roads: options.roads } : {},
     ...options.water ? { water: options.water } : {}
   };
 }
 function resolveLabels(legacyLabels, moduleConfig, fallback) {
-  const mode = moduleConfig?.preset ?? legacyLabels ?? fallback;
-  const density = labelDensityFromMode(mode);
+  const fallbackMode = legacyLabels ?? fallback;
+  const defaults = moduleConfig ? moduleLabelDefaults : labelDefaultsFromLegacyMode(fallbackMode);
+  const resolved = {
+    language: moduleConfig?.language ?? defaults.language,
+    places: moduleConfig?.places ?? defaults.places,
+    roads: moduleConfig?.roads ?? defaults.roads,
+    water: moduleConfig?.water ?? defaults.water
+  };
   return {
-    language: moduleConfig?.language ?? "auto",
-    mode,
-    places: moduleConfig?.places ?? density,
-    roads: moduleConfig?.roads ?? density,
-    water: moduleConfig?.water ?? density
+    ...resolved,
+    mode: moduleConfig ? legacyModeFromResolvedLabels(resolved) : fallbackMode
   };
 }
-function labelLayers(source, sourceLayer, colors, labelsConfig, typography) {
-  if (labelsConfig.mode === "none" || labelsConfig.places === "none") {
-    return [];
-  }
-  const maxRank = labelsConfig.places === "minimal" ? 3 : labelsConfig.places === "balanced" ? 7 : 12;
+function labelLayers(source, sourceLayers, colors, labelsConfig, roadsConfig, typography) {
+  return [
+    ...placeLabelLayers(source, sourceLayers.place, colors, labelsConfig, typography),
+    ...roadLabelLayers(
+      source,
+      sourceLayers.roadName,
+      colors,
+      labelsConfig,
+      roadsConfig,
+      typography
+    ),
+    ...waterLabelLayers(
+      source,
+      sourceLayers.waterName,
+      sourceLayers.waterway,
+      colors,
+      labelsConfig,
+      typography
+    )
+  ];
+}
+function placeLabelLayers(source, sourceLayer, colors, labelsConfig, typography) {
+  if (labelsConfig.places === "none") return [];
   return [
     {
       id: "place-labels",
       type: "symbol",
       source,
       "source-layer": sourceLayer,
-      minzoom: 3,
-      filter: ["<=", ["coalesce", ["get", "rank"], 10], maxRank],
+      minzoom: 0,
+      filter: labelsConfig.places === "major" ? ["all", ["has", "name"], classFilter(majorPlaceClasses)] : ["has", "name"],
       layout: {
         "text-field": labelTextField(labelsConfig.language),
         "text-font": textFont(typography),
@@ -562,12 +597,160 @@ function labelLayers(source, sourceLayer, colors, labelsConfig, typography) {
     }
   ];
 }
-function labelDensityFromMode(mode) {
-  if (mode === "none") return "none";
-  if (mode === "essential") return "minimal";
-  if (mode === "full") return "detailed";
+function roadLabelLayers(source, sourceLayer, colors, labelsConfig, roadsConfig, typography) {
+  const classes = visibleRoadLabelClasses(labelsConfig.roads, roadsConfig);
+  const majorClasses = classes.filter((roadClass) => majorRoadClassSet.has(roadClass));
+  const minorClasses = classes.filter((roadClass) => !majorRoadClassSet.has(roadClass));
+  if (classes.length === 0) return [];
+  const layers = [];
+  const sharedLayout = {
+    "symbol-placement": "line",
+    "text-field": labelTextField(labelsConfig.language),
+    "text-font": textFont(typography),
+    "text-rotation-alignment": "map",
+    "text-size": ["interpolate", ["linear"], ["zoom"], 11, 11, 14, 13, 17, 15]
+  };
+  const sharedPaint = {
+    "text-color": colors.labels.road,
+    "text-halo-color": colors.labels.halo,
+    "text-halo-width": 1
+  };
+  if (majorClasses.length > 0) {
+    const namedMajorClasses = majorClasses.filter((roadClass) => roadClass !== "motorway");
+    layers.push({
+      id: "road-shields",
+      type: "symbol",
+      source,
+      "source-layer": sourceLayer,
+      minzoom: 8,
+      filter: ["all", ["has", "ref"], classFilter(majorClasses)],
+      layout: {
+        "symbol-placement": "line",
+        "symbol-spacing": 240,
+        "text-field": ["get", "ref"],
+        "text-font": textFont(typography),
+        "text-rotation-alignment": "viewport",
+        "text-size": 10
+      },
+      paint: sharedPaint
+    });
+    if (namedMajorClasses.length > 0) {
+      layers.unshift({
+        id: "road-labels-major",
+        type: "symbol",
+        source,
+        "source-layer": sourceLayer,
+        minzoom: 10,
+        filter: ["all", ["has", "name"], classFilter(namedMajorClasses)],
+        layout: sharedLayout,
+        paint: sharedPaint
+      });
+    }
+  }
+  if (minorClasses.length > 0) {
+    layers.push({
+      id: "road-labels-minor",
+      type: "symbol",
+      source,
+      "source-layer": sourceLayer,
+      minzoom: 14,
+      filter: ["all", ["has", "name"], classFilter(minorClasses)],
+      layout: sharedLayout,
+      paint: sharedPaint
+    });
+  }
+  return layers;
+}
+function waterLabelLayers(source, waterNameSourceLayer, waterwaySourceLayer, colors, labelsConfig, typography) {
+  if (labelsConfig.water === "none") return [];
+  const waterFilter = labelsConfig.water === "major" ? ["all", ["has", "name"], classFilter(majorWaterClasses)] : ["has", "name"];
+  const waterwayFilter = labelsConfig.water === "major" ? ["all", ["has", "name"], classFilter(majorWaterwayClasses)] : ["has", "name"];
+  const paint = {
+    "text-color": colors.labels.water,
+    "text-halo-color": colors.labels.halo,
+    "text-halo-width": 1
+  };
+  return [
+    {
+      id: "water-labels",
+      type: "symbol",
+      source,
+      "source-layer": waterNameSourceLayer,
+      minzoom: 3,
+      filter: ["all", ["==", ["geometry-type"], "Point"], waterFilter],
+      layout: {
+        "text-field": labelTextField(labelsConfig.language),
+        "text-font": textFont(typography),
+        "text-size": ["interpolate", ["linear"], ["zoom"], 3, 11, 8, 14]
+      },
+      paint
+    },
+    {
+      id: "water-line-labels",
+      type: "symbol",
+      source,
+      "source-layer": waterNameSourceLayer,
+      minzoom: 5,
+      filter: ["all", ["==", ["geometry-type"], "LineString"], waterFilter],
+      layout: {
+        "symbol-placement": "line",
+        "text-field": labelTextField(labelsConfig.language),
+        "text-font": textFont(typography),
+        "text-size": 13
+      },
+      paint
+    },
+    {
+      id: "waterway-labels",
+      type: "symbol",
+      source,
+      "source-layer": waterwaySourceLayer,
+      minzoom: 10,
+      filter: ["all", ["==", ["geometry-type"], "LineString"], waterwayFilter],
+      layout: {
+        "symbol-placement": "line",
+        "symbol-spacing": 320,
+        "text-field": labelTextField(labelsConfig.language),
+        "text-font": textFont(typography),
+        "text-size": 12
+      },
+      paint
+    }
+  ];
+}
+function visibleRoadLabelClasses(detail, roadsConfig) {
+  if (detail === "none" || roadsConfig.detail === "none") return [];
+  const visibleRoadClasses = roadsConfig.detail === "highways" ? [...highwayRoadClasses] : [
+    ...majorRoadClasses,
+    ...roadsConfig.detail === "streets" || roadsConfig.detail === "all" ? streetRoadClasses : [],
+    ...roadsConfig.detail === "all" ? serviceRoadClasses : [],
+    ...roadsConfig.extras.paths ? ["path"] : []
+  ];
+  const requestedClasses = detail === "major" ? [...majorRoadClasses] : [...majorRoadClasses, ...streetRoadClasses, ...serviceRoadClasses, "path"];
+  const visible = new Set(visibleRoadClasses);
+  return requestedClasses.filter((roadClass) => visible.has(roadClass));
+}
+function labelDefaultsFromLegacyMode(mode) {
+  if (mode === "none") {
+    return { language: "auto", places: "none", roads: "none", water: "none" };
+  }
+  if (mode === "essential") {
+    return { language: "auto", places: "major", roads: "major", water: "major" };
+  }
+  return { language: "auto", places: "all", roads: "all", water: "all" };
+}
+function legacyModeFromResolvedLabels(options) {
+  if (options.places === "none" && options.roads === "none" && options.water === "none") {
+    return "none";
+  }
+  if (options.places === "major" && options.roads === "major" && options.water === "major") {
+    return "essential";
+  }
   return "balanced";
 }
+function classFilter(classes) {
+  return ["match", ["get", "class"], classes, true, false];
+}
 function labelTextField(language) {
   if (language === "local") {
     return ["coalesce", ["get", "name"], ["get", "name:latin"], ["get", "name:en"]];
@@ -759,11 +942,11 @@ var moduleRoadDefaults = {
   outline: "subtle",
   weight: "regular"
 };
-var highwayRoadClasses = ["motorway", "trunk"];
-var arterialRoadClasses = ["primary", "secondary", "tertiary"];
-var majorRoadClasses = [...highwayRoadClasses, ...arterialRoadClasses];
-var streetRoadClasses = ["minor"];
-var serviceRoadClasses = ["service", "track"];
+var highwayRoadClasses2 = ["motorway", "trunk"];
+var arterialRoadClasses2 = ["primary", "secondary", "tertiary"];
+var majorRoadClasses2 = [...highwayRoadClasses2, ...arterialRoadClasses2];
+var streetRoadClasses2 = ["minor"];
+var serviceRoadClasses2 = ["service", "track"];
 function roads(options = {}) {
   return {
     type: "roads",
@@ -835,13 +1018,13 @@ function roadLayers(source, sourceLayer, colors, options) {
     return [];
   }
   const metrics = roadStyleMetrics(options);
-  const selectedMajorRoadClasses = options.detail === "highways" ? [...highwayRoadClasses] : [...majorRoadClasses];
+  const selectedMajorRoadClasses = options.detail === "highways" ? [...highwayRoadClasses2] : [...majorRoadClasses2];
   const showsStreetRoads = options.detail === "streets" || options.detail === "all";
   const showsServiceRoads = options.detail === "all";
   const roadClasses = [
     ...selectedMajorRoadClasses,
-    ...showsStreetRoads ? streetRoadClasses : [],
-    ...showsServiceRoads ? serviceRoadClasses : []
+    ...showsStreetRoads ? streetRoadClasses2 : [],
+    ...showsServiceRoads ? serviceRoadClasses2 : []
   ];
   const transportClasses = [
     ...roadClasses,
@@ -851,11 +1034,11 @@ function roadLayers(source, sourceLayer, colors, options) {
   ];
   const roadClassColor = roadClassColorExpression(colors);
   const nonTunnelRoadFilter = ["!=", ["get", "brunnel"], "tunnel"];
-  const majorFilter = classFilter(selectedMajorRoadClasses);
-  const streetFilter = classFilter(streetRoadClasses);
-  const serviceFilter = classFilter(serviceRoadClasses);
-  const roadFilter = classFilter(roadClasses);
-  const transportFilter = classFilter(transportClasses);
+  const majorFilter = classFilter2(selectedMajorRoadClasses);
+  const streetFilter = classFilter2(streetRoadClasses2);
+  const serviceFilter = classFilter2(serviceRoadClasses2);
+  const roadFilter = classFilter2(roadClasses);
+  const transportFilter = classFilter2(transportClasses);
   const layers = [];
   if (options.outline !== "none") {
     layers.push({
@@ -936,7 +1119,7 @@ function roadLayers(source, sourceLayer, colors, options) {
       source,
       "source-layer": sourceLayer,
       minzoom: 5,
-      filter: ["all", nonTunnelRoadFilter, classFilter(["ferry"])],
+      filter: ["all", nonTunnelRoadFilter, classFilter2(["ferry"])],
       paint: {
         "line-color": colors.roads.ferry,
         "line-dasharray": [1.2, 1.1],
@@ -959,7 +1142,7 @@ function roadLayers(source, sourceLayer, colors, options) {
       source,
       "source-layer": sourceLayer,
       minzoom: 10,
-      filter: ["all", nonTunnelRoadFilter, classFilter(["path"])],
+      filter: ["all", nonTunnelRoadFilter, classFilter2(["path"])],
       paint: {
         "line-color": colors.roads.path,
         "line-dasharray": [0.7, 0.7],
@@ -982,7 +1165,7 @@ function roadLayers(source, sourceLayer, colors, options) {
       source,
       "source-layer": sourceLayer,
       minzoom: 7,
-      filter: ["all", nonTunnelRoadFilter, classFilter(["rail", "transit"])],
+      filter: ["all", nonTunnelRoadFilter, classFilter2(["rail", "transit"])],
       paint: {
         "line-color": colors.roads.rail,
         "line-opacity": metrics.minorOpacity * 0.65,
@@ -1125,17 +1308,17 @@ function legacyModeFromResolvedRoads(options) {
   if (options.hierarchy === "strong" || options.detail === "all") return "detailed";
   return "standard";
 }
-function classFilter(classes) {
+function classFilter2(classes) {
   return ["match", ["get", "class"], classes, true, false];
 }
 function roadOpacityExpression(majorOpacity, minorOpacity) {
   return [
     "case",
-    classFilter(majorRoadClasses),
+    classFilter2(majorRoadClasses2),
     majorOpacity,
-    classFilter(streetRoadClasses),
+    classFilter2(streetRoadClasses2),
     ["step", ["zoom"], 0, 12, minorOpacity],
-    classFilter(serviceRoadClasses),
+    classFilter2(serviceRoadClasses2),
     ["step", ["zoom"], 0, 14, minorOpacity],
     minorOpacity
   ];
@@ -1143,7 +1326,7 @@ function roadOpacityExpression(majorOpacity, minorOpacity) {
 function roadWidthExpression(stops, metrics) {
   return [
     "case",
-    classFilter(majorRoadClasses),
+    classFilter2(majorRoadClasses2),
     zoomWidth(stops, metrics.weightScale * metrics.majorWidthScale),
     zoomWidth(stops, metrics.weightScale * metrics.minorWidthScale)
   ];
@@ -1204,7 +1387,7 @@ function openMapTilesLayers(source, sourceLayers, colors, options) {
     ...buildingLayers(source, sourceLayers.building, colors, options.density, options.buildings),
     ...roadLayers(source, sourceLayers.road, colors, options.roads),
     ...boundaryLayers(source, sourceLayers.boundary, colors),
-    ...labelLayers(source, sourceLayers.place, colors, options.labels, options.typography),
+    ...labelLayers(source, sourceLayers, colors, options.labels, options.roads, options.typography),
     ...poiLayers(
       source,
       sourceLayers.poi,
@@ -1568,7 +1751,10 @@ var sourceLayersSchema = z.object({
   landuse: z.string().optional(),
   park: z.string().optional(),
   water: z.string().optional(),
+  waterName: z.string().optional(),
+  waterway: z.string().optional(),
   road: z.string().optional(),
+  roadName: z.string().optional(),
   building: z.string().optional(),
   boundary: z.string().optional(),
   place: z.string().optional(),
@@ -1596,14 +1782,13 @@ var roadsModuleSchema = z.object({
   outline: z.enum(["none", "subtle", "strong"]).optional(),
   weight: z.enum(["thin", "regular", "bold"]).optional()
 }).strict();
-var labelDensitySchema = z.enum(["none", "minimal", "balanced", "detailed"]);
+var labelDetailSchema = z.enum(["none", "major", "all"]);
 var labelsModuleSchema = z.object({
   type: z.literal("labels"),
   language: z.string().trim().min(1).optional(),
-  places: labelDensitySchema.optional(),
-  preset: z.enum(["none", "essential", "balanced", "full"]).optional(),
-  roads: labelDensitySchema.optional(),
-  water: labelDensitySchema.optional()
+  places: labelDetailSchema.optional(),
+  roads: labelDetailSchema.optional(),
+  water: labelDetailSchema.optional()
 }).strict();
 var poiModuleSchema = z.object({
   type: z.literal("poi"),
@@ -1956,7 +2141,7 @@ function applyOsmBrightControls(layers, options) {
       );
     }
     if (isLabelLayer(id, sourceLayer)) {
-      return applyLabelLayerControls(layer, options.labels);
+      return applyLabelLayerControls(layer, options.labels, options.roads);
     }
     return layer;
   });
@@ -2043,12 +2228,12 @@ function scaleStyleValue(value, scale, fallback) {
   }
   return fallback * scale;
 }
-function applyLabelLayerControls(layer, labels2) {
+function applyLabelLayerControls(layer, labels2, roads2) {
   const id = stringValue(layer.id);
   const sourceLayer = stringValue(layer["source-layer"]);
   const group = labelGroup(id, sourceLayer);
-  const density = labelGroupDensity(labels2, group);
-  if (labels2.mode === "none" || density === "none") {
+  const detail = labelGroupDetail(labels2, group);
+  if (detail === "none" || detail === "major" && isMinorLabelLayer(id, group)) {
     return setLayerVisibility(layer, "none");
   }
   const nextLayer = setLayerVisibility(layer, "visible");
@@ -2056,13 +2241,20 @@ function applyLabelLayerControls(layer, labels2) {
   if ("text-field" in layout && !isHighwayShieldLayer(id)) {
     layout["text-field"] = labelTextField(labels2.language);
   }
-  if (density === "minimal") {
-    nextLayer.minzoom = Math.max(numberValue(nextLayer.minzoom) ?? 0, minimalMinZoom(group));
+  if (group === "roads" && roads2) {
+    const allowedClasses = visibleRoadLabelClasses(detail, roads2).filter(
+      (roadClass) => roadLabelLayerClasses(id).includes(roadClass)
+    );
+    if (allowedClasses.length === 0) {
+      return setLayerVisibility(layer, "none");
+    }
+    nextLayer.filter = combineFilters(nextLayer.filter, ["in", "class", ...allowedClasses]);
   }
-  if (density === "detailed") {
-    const currentMinZoom = numberValue(nextLayer.minzoom);
-    if (currentMinZoom !== void 0) {
-      nextLayer.minzoom = Math.max(0, currentMinZoom - 1);
+  if (group === "water" && detail === "major") {
+    if (sourceLayer === "waterway") {
+      nextLayer.filter = combineFilters(nextLayer.filter, ["==", "class", "river"]);
+    } else if (id === "water-name-other") {
+      nextLayer.filter = combineFilters(nextLayer.filter, ["in", "class", "sea", "lake"]);
     }
   }
   nextLayer.layout = layout;
@@ -2092,7 +2284,7 @@ function applyPoiLayerControls(layer, poi2, customIconSpriteId2, customIconMappi
   nextLayer.layout = layout;
   return nextLayer;
 }
-function labelGroupDensity(labels2, group) {
+function labelGroupDetail(labels2, group) {
   if (group === "roads") return labels2.roads;
   if (group === "water") return labels2.water;
   return labels2.places;
@@ -2106,10 +2298,15 @@ function labelGroup(id, sourceLayer) {
   }
   return "places";
 }
-function minimalMinZoom(group) {
-  if (group === "roads") return 13;
-  if (group === "water") return 5;
-  return 4;
+function isMinorLabelLayer(id, group) {
+  if (group === "places") return id === "place-other" || id === "place-village";
+  if (group === "roads") return id.includes("path") || id.includes("minor");
+  return false;
+}
+function roadLabelLayerClasses(id) {
+  if (id.includes("path")) return ["path"];
+  if (id.includes("minor")) return ["minor", "service", "track"];
+  return ["motorway", "trunk", "primary", "secondary", "tertiary"];
 }
 function isLabelLayer(id, sourceLayer) {
   return sourceLayer === "place" || sourceLayer === "transportation_name" || sourceLayer === "water_name" || sourceLayer === "waterway" || id.includes("highway-name") || id.includes("highway-shield") || id.includes("water-name");
@@ -5041,7 +5238,10 @@ var defaultSourceLayers = {
   landuse: "landuse",
   park: "park",
   water: "water",
+  waterName: "water_name",
+  waterway: "waterway",
   road: "transportation",
+  roadName: "transportation_name",
   building: "building",
   boundary: "boundary",
   place: "place",
@@ -5105,8 +5305,9 @@ function createStyle(input = {}, options = {}) {
     labelsModule,
     theme.preset.labels ?? defaultConfig.labels
   );
+  const { mode: resolvedLabelsMode, ...resolvedLabelsModule } = resolvedLabels;
   const resolvedPoi = resolvePoi(config.poi, poiModule, theme.preset.poi ?? defaultConfig.poi);
-  const labels2 = resolvedLabels.mode;
+  const labels2 = resolvedLabelsMode;
   const poi2 = resolvedPoi.mode;
   const buildings = config.buildings ?? "flat";
   const colors = resolveColors(config.colors, theme.colors, {}, theme.modules);
@@ -5139,7 +5340,7 @@ function createStyle(input = {}, options = {}) {
     "tileflow:roads": resolvedRoadMode,
     "tileflow:roadsModule": roadModule ? resolvedRoadModule : void 0,
     "tileflow:labels": labels2,
-    "tileflow:labelsModule": labelsModule,
+    "tileflow:labelsModule": labelsModule ? resolvedLabelsModule : void 0,
     "tileflow:poi": poi2,
     "tileflow:poiModule": poiModule,
     "tileflow:icons": iconSet ? {
@@ -5177,7 +5378,6 @@ function createStyle(input = {}, options = {}) {
       theme,
       tilesUrl,
       typography,
-      labels: labels2,
       labelsModule: resolvedLabels,
       poi: poi2,
       poiModule: resolvedPoi,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tileflow/core",
-  "version": "0.1.0-alpha.12",
+  "version": "0.1.0-alpha.13",
   "description": "Typed Tileflow config and MapLibre style compiler.",
   "type": "module",
   "sideEffects": false,