@tileflow/core 0.1.0-alpha.2 → 0.1.0-alpha.4

package/dist/index.d.ts

@@ -6,7 +6,8 @@ type TileflowTheme = 'standard' | 'light' | 'dark' | 'minimal' | 'osm-bright-2';
 type TileflowBuildings = 'hidden' | 'flat' | '3d';
 type TileflowTerrainMode = 'none' | 'hillshade' | '3d';
 type TileflowTerrainEncoding = 'mapbox' | 'terrarium';
-type TileflowThemeMode = 'light' | 'dark';
+type TileflowThemeName = 'light' | 'dark';
+type TileflowThemeMode = TileflowThemeName;
 type TileflowColors = {
     canvas: string;
     land: string;
@@ -28,9 +29,13 @@ type TileflowTypography = {
     font?: string;
     weight?: TileflowFontWeight;
 };
+type TileflowFonts = {
+    body?: string;
+    labels?: string;
+};
 type TileflowThemeConfig = {
-    mode?: TileflowThemeMode;
     colors?: TileflowColorConfig;
+    fonts?: TileflowFonts;
     typography?: TileflowTypography;
 };
 type TileflowSourceLayers = {
@@ -118,13 +123,14 @@ type TileflowTilesetConfig = {
     attribution?: string;
     sourceLayers?: TileflowSourceLayers;
 };
+type TileflowProjectThemes = Partial<Record<TileflowThemeName, TileflowThemeConfig>>;
 type TileflowProjectConfig = {
-    themes?: Record<string, TileflowThemeConfig>;
+    themes?: TileflowProjectThemes;
     tilesets?: Record<string, TileflowTilesetConfig>;
     maps: Record<string, TileflowMapConfig>;
 };
 type TileflowStyleOptions = {
-    themes?: Record<string, TileflowThemeConfig>;
+    themes?: TileflowProjectThemes;
     tileBaseUrl?: string;
     tileset?: string;
 };
@@ -169,4 +175,4 @@ declare function osm(options?: TileflowOsmBasemapOptions): TileflowOsmBasemapCon
 
 declare function roads(options?: TileflowRoadsModuleOptions): TileflowRoadsModuleConfig;
 
-export { type MapLibreStyle, type TileflowBasemapConfig, type TileflowBuildings, type TileflowColorConfig, type TileflowColors, type TileflowConfig, type TileflowDensity, type TileflowFontWeight, type TileflowLabels, type TileflowManifest, type TileflowMapConfig, type TileflowModuleConfig, type TileflowOsmBasemapConfig, type TileflowOsmBasemapOptions, type TileflowPoi, type TileflowProjectConfig, type TileflowRoads, type TileflowRoadsModuleConfig, type TileflowRoadsModuleOptions, type TileflowRoadsModulePreset, type TileflowSourceLayers, type TileflowStyleOptions, type TileflowTerrain, type TileflowTerrainConfig, type TileflowTerrainEncoding, type TileflowTerrainMode, type TileflowTheme, type TileflowThemeConfig, type TileflowThemeMode, type TileflowTiles, type TileflowTilesetConfig, type TileflowTypography, type TileflowViewConfig, type ValidationMessage, type ValidationResult, createManifest, createStyle, createStyleFromProject, defineTileflow, getDefaultColors, osm, roads, validateConfig };
+export { type MapLibreStyle, type TileflowBasemapConfig, type TileflowBuildings, type TileflowColorConfig, type TileflowColors, type TileflowConfig, type TileflowDensity, type TileflowFontWeight, type TileflowFonts, type TileflowLabels, type TileflowManifest, type TileflowMapConfig, type TileflowModuleConfig, type TileflowOsmBasemapConfig, type TileflowOsmBasemapOptions, type TileflowPoi, type TileflowProjectConfig, type TileflowProjectThemes, type TileflowRoads, type TileflowRoadsModuleConfig, type TileflowRoadsModuleOptions, type TileflowRoadsModulePreset, type TileflowSourceLayers, type TileflowStyleOptions, type TileflowTerrain, type TileflowTerrainConfig, type TileflowTerrainEncoding, type TileflowTerrainMode, type TileflowTheme, type TileflowThemeConfig, type TileflowThemeMode, type TileflowThemeName, type TileflowTiles, type TileflowTilesetConfig, type TileflowTypography, type TileflowViewConfig, type ValidationMessage, type ValidationResult, createManifest, createStyle, createStyleFromProject, defineTileflow, getDefaultColors, osm, roads, validateConfig };

package/dist/index.js

@@ -2591,11 +2591,15 @@ var typographySchema = z.object({
   font: z.string().trim().min(1).optional(),
   weight: z.enum(["regular", "medium", "semibold", "bold"]).optional()
 });
+var fontsSchema = z.object({
+  body: z.string().trim().min(1).optional(),
+  labels: z.string().trim().min(1).optional()
+}).strict();
 var themeConfigSchema = z.object({
-  mode: z.enum(["light", "dark"]).optional(),
   colors: colorConfigSchema.optional(),
+  fonts: fontsSchema.optional(),
   typography: typographySchema.optional()
-});
+}).strict();
 var sourceLayersSchema = z.object({
   landuse: z.string().optional(),
   park: z.string().optional(),
@@ -2673,7 +2677,10 @@ var tilesetConfigSchema = z.object({
   sourceLayers: sourceLayersSchema.optional()
 });
 var projectConfigSchema = z.object({
-  themes: z.record(z.string(), themeConfigSchema).optional(),
+  themes: z.object({
+    light: themeConfigSchema.optional(),
+    dark: themeConfigSchema.optional()
+  }).strict().optional(),
   tilesets: z.record(z.string(), tilesetConfigSchema).optional(),
   maps: z.record(z.string(), configSchema).refine((maps) => {
     return Object.keys(maps).length > 0;
@@ -2974,6 +2981,7 @@ function createStyleFromProject(projectConfig, mapName, options = {}) {
   const resolvedTileset = tilesetConfig?.id ?? tilesetName ?? defaultTileset;
   const baseBasemap = config.basemap ?? osm();
   const { sourceLayers: tileSourceLayers, ...tileOptions } = config.tiles ?? {};
+  const resolvedBasemapSourceLayers = baseBasemap.sourceLayers || tilesetConfig?.sourceLayers ? resolveSourceLayers(baseBasemap.sourceLayers, tilesetConfig?.sourceLayers) : void 0;
   const resolvedTileSourceLayers = baseBasemap.sourceLayers || !tileSourceLayers ? void 0 : resolveSourceLayers(tileSourceLayers, tilesetConfig?.sourceLayers);
   return createStyle(
     {
@@ -2983,7 +2991,7 @@ function createStyleFromProject(projectConfig, mapName, options = {}) {
         ...baseBasemap,
         tileset: resolvedTileset,
         attribution: baseBasemap.attribution ?? tilesetConfig?.attribution,
-        sourceLayers: resolveSourceLayers(baseBasemap.sourceLayers, tilesetConfig?.sourceLayers)
+        ...resolvedBasemapSourceLayers ? { sourceLayers: resolvedBasemapSourceLayers } : {}
       },
       tiles: {
         ...tileOptions,
@@ -3021,7 +3029,7 @@ function resolveTheme(theme, projectThemes) {
     return resolveLegacyTheme("light");
   }
   if (typeof theme === "string") {
-    const projectTheme = projectThemes?.[theme];
+    const projectTheme = isProjectThemeName(theme) ? projectThemes?.[theme] : void 0;
     if (projectTheme) {
       return resolveThemeConfig(theme, projectTheme);
     }
@@ -3045,22 +3053,32 @@ function resolveLegacyTheme(theme) {
 }
 function resolveThemeConfig(name, theme) {
   const colors = normalizeColorAliases(theme.colors);
-  const preset = theme.mode === "dark" ? themePresets.dark : theme.mode === "light" ? themePresets.light : themePresets.standard;
+  const themeName = isProjectThemeName(name) ? name : "light";
+  const preset = themePresets[themeName];
   return {
     colors: {
       ...preset.colors,
       ...colors
     },
     custom: true,
-    mode: theme.mode,
+    mode: themeName,
     name,
     preset,
-    typography: resolveTypography(theme.typography, defaultTypography)
+    typography: resolveTypography(resolveThemeTypography(theme), defaultTypography)
   };
 }
 function isLegacyTheme(value) {
   return value in themePresets;
 }
+function isProjectThemeName(value) {
+  return value === "light" || value === "dark";
+}
+function resolveThemeTypography(theme) {
+  return {
+    ...theme.typography,
+    font: theme.typography?.font ?? theme.fonts?.labels ?? theme.fonts?.body
+  };
+}
 function normalizeColorAliases(colors) {
   if (!colors) {
     return {};

package/package.json

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