@tileflow/core 0.1.0-alpha.5 → 0.1.0-alpha.6

package/dist/index.js

@@ -461,8 +461,7 @@ function normalizeColorAliases(colors) {
     ...colors,
     background: colors.background ?? colors.canvas,
     park: colors.park ?? colors.greenspace ?? colors.nature,
-    greenspace: colors.greenspace ?? colors.park ?? colors.nature,
-    roadMajor: colors.roadMajor ?? colors.accent
+    greenspace: colors.greenspace ?? colors.park ?? colors.nature
   };
 }
 function resolveBaseColors(overrides, defaults) {
@@ -3973,7 +3972,7 @@ function shouldThemeWaterLabels(theme) {
 }
 function osmBrightRoadLineColor(id, colors, theme) {
   if (hasModuleColorGroup(theme, "roads")) {
-    return osmBrightModuleRoadLineColor(id, colors);
+    return osmBrightModuleRoadLineColor(id, colors, theme);
   }
   if (isNonRoadThemeTarget(id)) {
     return void 0;
@@ -3989,42 +3988,49 @@ function osmBrightRoadLineColor(id, colors, theme) {
   }
   return void 0;
 }
-function osmBrightModuleRoadLineColor(id, colors) {
+function osmBrightModuleRoadLineColor(id, colors, theme) {
+  const roadColor = (key) => hasNestedModuleColor(theme, "roads", key) ? colors.roads[key] : void 0;
   if (isRoadCasing(id)) {
-    return colors.roads.casing;
+    return roadColor("casing");
   }
   if (id.includes("ferry")) {
-    return colors.roads.ferry;
+    return roadColor("ferry");
   }
   if (id.includes("rail")) {
-    return colors.roads.rail;
+    return roadColor("rail");
   }
   if (id.includes("path") || id.includes("track") || id.includes("steps")) {
-    return colors.roads.path;
+    return roadColor("path");
   }
   if (id.includes("bridge")) {
-    return colors.roads.bridge;
+    const bridge = roadColor("bridge");
+    if (bridge) {
+      return bridge;
+    }
   }
   if (id.includes("tunnel")) {
-    return colors.roads.tunnel;
+    const tunnel = roadColor("tunnel");
+    if (tunnel) {
+      return tunnel;
+    }
   }
   if (id.includes("motorway")) {
-    return colors.roads.motorway;
+    return roadColor("motorway");
   }
   if (id.includes("trunk")) {
-    return colors.roads.trunk;
+    return roadColor("trunk") ?? roadColor("primary");
   }
   if (id.includes("primary")) {
-    return colors.roads.primary;
+    return roadColor("primary");
   }
   if (id.includes("secondary") || id.includes("tertiary")) {
-    return colors.roads.secondary;
+    return roadColor("secondary");
   }
   if (id.includes("link")) {
-    return colors.roads.primary;
+    return roadColor("primary");
   }
   if (id.includes("minor") || id.includes("service")) {
-    return colors.roads.minor;
+    return roadColor("minor");
   }
   return void 0;
 }
@@ -4355,7 +4361,24 @@ function resolveSourceLayers(mapLayers, tilesetLayers) {
 }
 function shouldUseOsmBrightTemplate(config, basemap, theme) {
   const templateTheme = theme.custom || theme.name === "light" || theme.name === "dark";
-  return basemap.type === "osm" && templateTheme && !config.colors && !config.typography && !config.density && !config.roads && !config.labels && !config.poi && !config.buildings && !config.modules?.some((moduleConfig) => moduleConfig.type !== "styleOverride") && !basemap.sourceLayers && !config.tiles?.sourceLayers;
+  return basemap.type === "osm" && templateTheme && !hasEffectiveColorOverrides(config.colors) && !config.typography && !config.density && !config.roads && !config.labels && !config.poi && !config.buildings && !config.modules?.some((moduleConfig) => moduleConfig.type !== "styleOverride") && !basemap.sourceLayers && !config.tiles?.sourceLayers;
+}
+function hasEffectiveColorOverrides(colors) {
+  if (!colors) {
+    return false;
+  }
+  return Object.entries(colors).some(([key, value]) => {
+    if (key === "accent" || value === void 0) {
+      return false;
+    }
+    if (isRecord4(value)) {
+      return Object.values(value).some((nestedValue) => typeof nestedValue === "string");
+    }
+    return typeof value === "string";
+  });
+}
+function isRecord4(value) {
+  return Boolean(value && typeof value === "object" && !Array.isArray(value));
 }
 function normalizeBaseUrl(value) {
   return normalizeUrl(value ?? defaultTileBaseUrl);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tileflow/core",
-  "version": "0.1.0-alpha.5",
+  "version": "0.1.0-alpha.6",
   "description": "Typed Tileflow config and MapLibre style compiler.",
   "type": "module",
   "homepage": "https://tileflow.dev",