@tileflow/dev 0.1.0-alpha.41 → 0.1.0-alpha.42

package/dist/artifacts.js

@@ -32,7 +32,7 @@ import {
   usesTileflowLineBackgroundGlyphs,
   writeTileflowArtifactPlan,
   writeTileflowBuildArtifacts
-} from "./chunk-GXLY73PD.js";
+} from "./chunk-OQCK4AXD.js";
 import {
   getTileflowAssetBasePath,
   getTileflowAssetFileName,

package/dist/{chunk-GXLY73PD.js → chunk-OQCK4AXD.js}

@@ -70,6 +70,58 @@ import {
 } from "@tileflow/core/native-profile";
 import { prepareTileflowStyleFamilyForRendering } from "@tileflow/core/runtime";
 
+// src/family-style-resources.ts
+function rebaseTileflowFamilyStyle(style, mapName, themeName) {
+  const rebase = (value) => {
+    let start = 0;
+    let end = value.length;
+    while (start < end && value.charCodeAt(start) <= 32) start++;
+    while (end > start && value.charCodeAt(end - 1) <= 32) end--;
+    const reference = value.slice(start, end);
+    if (/^[\\/]/u.test(reference) || /^[a-z][a-z\d+.-]*:/iu.test(reference)) return value;
+    const target = !reference || /^[?#]/u.test(reference) ? `${themeName}.json${reference}` : reference;
+    return `../styles/${mapName}/${target}`;
+  };
+  const property = (value, key2) => {
+    if (record(value) && typeof value[key2] === "string") value[key2] = rebase(value[key2]);
+  };
+  const result = structuredClone(style);
+  property(result, "glyphs");
+  if (typeof result.sprite === "string") result.sprite = rebase(result.sprite);
+  else if (Array.isArray(result.sprite))
+    for (const sprite of result.sprite) property(sprite, "url");
+  const fontFaces = result["font-faces"];
+  if (record(fontFaces))
+    for (const [family, face] of Object.entries(fontFaces)) {
+      if (typeof face === "string") fontFaces[family] = rebase(face);
+      else property(face, "url");
+    }
+  for (const source of Object.values(result.sources)) {
+    property(source, "url");
+    if (source.type === "geojson") property(source, "data");
+    for (const key2 of ["tiles", "urls"]) {
+      const value = source[key2];
+      if (Array.isArray(value))
+        source[key2] = value.map(
+          (url) => typeof url === "string" ? rebase(url) : url
+        );
+    }
+  }
+  const fonts = result.metadata?.["tileflow:fontFaces"];
+  if (Array.isArray(fonts)) for (const face of fonts) property(face, "source");
+  for (const key2 of ["tileflow:buildings", "tileflow:vegetation"]) {
+    const descriptor = result.metadata?.[key2];
+    if (!record(descriptor)) continue;
+    if (Array.isArray(descriptor.models))
+      for (const model of descriptor.models) property(model, "url");
+    property(descriptor.landmarks, "url");
+  }
+  return result;
+}
+function record(value) {
+  return value !== null && typeof value === "object" && !Array.isArray(value);
+}
+
 // src/image-source-assets.ts
 import { createHash } from "crypto";
 function prepareEmbeddedImageSources(input) {
@@ -2034,8 +2086,8 @@ function optionalDiagnosticPath(value) {
 }
 function isTileflowMapResolutionDiagnostic(value, path) {
   if (!value || typeof value !== "object" || !path) return false;
-  const record = value;
-  return record.name === "TileflowMapResolutionError" && typeof record.code === "string" && typeof record.mapId === "string" && path.startsWith("/modules/") && !/[\p{Cc}]/u.test(path) && !/~(?:[^01]|$)/u.test(path);
+  const record2 = value;
+  return record2.name === "TileflowMapResolutionError" && typeof record2.code === "string" && typeof record2.mapId === "string" && path.startsWith("/modules/") && !/[\p{Cc}]/u.test(path) && !/~(?:[^01]|$)/u.test(path);
 }
 function removeSemanticResolutionPath(message, path) {
   if (!path) return message;
@@ -2443,7 +2495,7 @@ function getStableTileflowArtifactFiles(artifacts) {
     ...!artifacts.nativeBuild ? Object.entries(artifacts.styles).map(([mapName, styles]) => ({
       contentType: "application/json; charset=utf-8",
       fileName: `families/${mapName}.json`,
-      source: `${JSON.stringify(prepareTileflowStyleFamilyForRendering(createTileflowStyleFamily(styles)))}
+      source: `${JSON.stringify(prepareArtifactStyleFamily(mapName, styles))}
 `
     })) : [],
     ...artifacts.assets,
@@ -2458,6 +2510,18 @@ function getStableTileflowArtifactFiles(artifacts) {
   ];
   return validateArtifactFiles(files);
 }
+function prepareArtifactStyleFamily(mapName, styles) {
+  return prepareTileflowStyleFamilyForRendering(
+    createTileflowStyleFamily(
+      Object.fromEntries(
+        Object.entries(styles).map(([theme, style]) => [
+          theme,
+          rebaseTileflowFamilyStyle(style, mapName, theme)
+        ])
+      )
+    )
+  );
+}
 function validateArtifactFiles(files) {
   const seen = /* @__PURE__ */ new Set();
   for (const file of files) {
@@ -2553,20 +2617,19 @@ function createGenerationArtifactFiles(artifacts, generation, nativeUrls) {
     contentType: "application/json; charset=utf-8",
     fileName: `${prefix}/families/${mapName}.json`,
     source: `${JSON.stringify(
-      prepareTileflowStyleFamilyForRendering(
-        createTileflowStyleFamily(
-          Object.fromEntries(
-            Object.keys(artifacts.styles[mapName]).map((theme) => [
-              theme,
-              JSON.parse(
-                String(
-                  immutableStyles.find(
-                    (file) => file.fileName === `${prefix}/styles/${mapName}/${theme}.json`
-                  ).source
-                )
+      prepareArtifactStyleFamily(
+        mapName,
+        Object.fromEntries(
+          Object.keys(artifacts.styles[mapName]).map((theme) => [
+            theme,
+            JSON.parse(
+              String(
+                immutableStyles.find(
+                  (file) => file.fileName === `${prefix}/styles/${mapName}/${theme}.json`
+                ).source
               )
-            ])
-          )
+            )
+          ])
         )
       )
     )}

package/dist/server.js

@@ -5,7 +5,7 @@ import {
   parseTileflowLineBackgroundGlyphPath,
   tileflowArtifactSessionSchemaVersion,
   tileflowLineBackgroundGlyphRoute
-} from "./chunk-GXLY73PD.js";
+} from "./chunk-OQCK4AXD.js";
 import {
   getTileflowAssetBasePath,
   getTileflowAssetFileName,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tileflow/dev",
-  "version": "0.1.0-alpha.41",
+  "version": "0.1.0-alpha.42",
   "license": "Apache-2.0",
   "description": "Node development utilities for Tileflow configs and builds.",
   "type": "module",
@@ -83,7 +83,7 @@
   "dependencies": {
     "@mapbox/vector-tile": "3.0.0",
     "@maplibre/maplibre-gl-style-spec": "26.4.4",
-    "@tileflow/core": ">=0.1.0-alpha.45 <0.1.0-beta.0",
+    "@tileflow/core": ">=0.1.0-alpha.46 <0.1.0-beta.0",
     "chokidar": "6.0.0",
     "fontkit": "2.0.4",
     "jiti": "^2.7.0",
@@ -102,7 +102,7 @@
   },
   "scripts": {
     "build": "tsup src/artifacts.ts src/config.ts src/fonts.ts src/icons.ts src/inspect.ts src/preview.ts src/server.ts src/tilesets.ts src/validation.ts --format esm --dts --clean --platform node --external sharp && tsup --config tsup.inspector.config.ts",
-    "test": "tsx --test test/*.test.ts",
+    "test": "tsx --test --test-concurrency=2 test/*.test.ts",
     "typecheck": "tsc -p tsconfig.json --noEmit",
     "lint": "tsc -p tsconfig.json --noEmit",
     "verify": "pnpm run typecheck && pnpm run test"