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

package/dist/artifacts.js

@@ -32,7 +32,7 @@ import {
   usesTileflowLineBackgroundGlyphs,
   writeTileflowArtifactPlan,
   writeTileflowBuildArtifacts
-} from "./chunk-GXLY73PD.js";
+} from "./chunk-3IHCBD7R.js";
 import {
   getTileflowAssetBasePath,
   getTileflowAssetFileName,
@@ -51,7 +51,7 @@ import {
   defaultTileflowConfigPath
 } from "./chunk-AQUGMUZW.js";
 import "./chunk-D4OE4ITL.js";
-import "./chunk-ONYQNLNA.js";
+import "./chunk-6SLT6ONM.js";
 export {
   TileflowHostedManifestOverwriteError,
   TileflowLocalTilesetProductionError,

package/dist/{chunk-GXLY73PD.js → chunk-3IHCBD7R.js}

@@ -25,7 +25,7 @@ import {
 } from "./chunk-D4OE4ITL.js";
 import {
   inspectTileflowPmtilesForLocalUse
-} from "./chunk-ONYQNLNA.js";
+} from "./chunk-6SLT6ONM.js";
 
 // src/artifacts.ts
 import { createHash as createHash5 } from "crypto";
@@ -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) {
@@ -326,6 +378,7 @@ async function prepareTileflowLocalTilesets(project, styles, options) {
       for (const [sourceId, source] of Object.entries(map.sources ?? {}).sort(
         ([left], [right]) => compareCodeUnits(left, right)
       )) {
+        if (source.kind !== "hosted-tileset") continue;
         const requestedPath = resolve2(options.baseDirectory, source.local);
         const sourcePath = await realpath(requestedPath).catch(() => requestedPath);
         if (!isPathWithin(projectRoot, sourcePath)) {
@@ -2034,8 +2087,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 +2496,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 +2511,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 +2618,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
               )
-            ])
-          )
+            )
+          ])
         )
       )
     )}
@@ -2788,7 +2852,9 @@ function assertNoLocalTilesetsForProduction(artifacts) {
   if (artifacts.localTilesets?.length) throw new TileflowLocalTilesetProductionError();
 }
 function hasLocalTilesetSources(project) {
-  return Object.values(project.maps).some((map) => Object.keys(map.sources ?? {}).length > 0);
+  return Object.values(project.maps).some(
+    (map) => Object.values(map.sources ?? {}).some((source) => source.kind === "hosted-tileset")
+  );
 }
 async function assertTileflowSelfHostedManifestTarget(manifestPath, options = {}) {
   if (options.overwriteHostedManifest) return;

package/dist/{chunk-ONYQNLNA.js → chunk-6SLT6ONM.js}

@@ -24,7 +24,7 @@ var inspectionLimits = Object.freeze({
   maxValuesPerField: 16
 });
 var maxArchiveBytes = 8e9;
-var maximumDecodedBytes = 4 * 1024 * 1024 * 1024;
+var maximumDecodedBytes = 8 * 1024 * 1024 * 1024;
 var minimumDecodedBytes = 64 * 1024 * 1024;
 var maxDecompressedSectionBytes = 16 * 1024 * 1024;
 var defaultMaximumDirectoryDepth = 32;
@@ -420,9 +420,20 @@ async function validatePmtilesDirectoryTree(source, header, budget, maximumDirec
   ];
   const countedDirectories = /* @__PURE__ */ new Set();
   const processedContexts = /* @__PURE__ */ new Set();
-  const clusteredContents = /* @__PURE__ */ new Set();
   const decompressDirectory = createSectionDecompressor(budget);
-  let clusteredEnd = null;
+  let clusteredEnd = 0;
+  const advanceClusteredFrontier = (offset, length) => {
+    const end = offset + length;
+    if (offset === clusteredEnd) {
+      clusteredEnd = end;
+    } else if (offset > clusteredEnd || end > clusteredEnd) {
+      throw inspectionError(
+        "TF_TILESET_ARCHIVE_INVALID",
+        "archive",
+        "PMTiles clustered contents are not contiguous in TileID order."
+      );
+    }
+  };
   let addressedTiles = 0;
   let totalEntries = 0;
   let tileEntries = 0;
@@ -430,20 +441,7 @@ async function validatePmtilesDirectoryTree(source, header, budget, maximumDirec
     signal?.throwIfAborted();
     const item = pending.pop();
     if (item.kind === "clustered-content") {
-      const key = `${item.offset}:${item.length}`;
-      if (clusteredContents.has(key)) continue;
-      if (clusteredEnd === null ? item.offset !== 0 : item.offset !== clusteredEnd) {
-        throw inspectionError(
-          "TF_TILESET_ARCHIVE_INVALID",
-          "archive",
-          "PMTiles clustered contents are not contiguous in TileID order."
-        );
-      }
-      clusteredContents.add(key);
-      clusteredEnd = item.offset + item.length;
-      assertParserMemory(
-        processedContexts.size + countedDirectories.size + clusteredContents.size + pending.length
-      );
+      advanceClusteredFrontier(item.offset, item.length);
       continue;
     }
     const current = item;
@@ -459,9 +457,7 @@ async function validatePmtilesDirectoryTree(source, header, budget, maximumDirec
     processedContexts.add(contextKey);
     const firstPhysicalVisit = !countedDirectories.has(current.key);
     countedDirectories.add(current.key);
-    assertParserMemory(
-      processedContexts.size + countedDirectories.size + clusteredContents.size + pending.length
-    );
+    assertParserMemory(processedContexts.size + countedDirectories.size + pending.length);
     const response = await source.getBytes(current.offset, current.length, signal);
     if (response.data.byteLength !== current.length) {
       throw inspectionError("TF_TILESET_ARCHIVE_INVALID", "archive", "Short PMTiles directory.");
@@ -537,11 +533,15 @@ async function validatePmtilesDirectoryTree(source, header, budget, maximumDirec
         addressedTiles += entry.runLength;
         tileEntries += 1;
         if (header.clustered) {
-          nextItems.push({
-            kind: "clustered-content",
-            length: entry.length,
-            offset: entry.offset
-          });
+          if (nextItems.length === 0) {
+            advanceClusteredFrontier(entry.offset, entry.length);
+          } else {
+            nextItems.push({
+              kind: "clustered-content",
+              length: entry.length,
+              offset: entry.offset
+            });
+          }
         }
       }
       if (!Number.isSafeInteger(addressedTiles) || !Number.isSafeInteger(tileEntries)) {
@@ -551,9 +551,7 @@ async function validatePmtilesDirectoryTree(source, header, budget, maximumDirec
     for (let index = nextItems.length - 1; index >= 0; index -= 1) {
       pending.push(nextItems[index]);
     }
-    assertParserMemory(
-      processedContexts.size + countedDirectories.size + clusteredContents.size + pending.length
-    );
+    assertParserMemory(processedContexts.size + countedDirectories.size + pending.length);
   }
   if (header.numAddressedTiles !== 0 && addressedTiles !== header.numAddressedTiles || header.numTileEntries !== 0 && tileEntries !== header.numTileEntries) {
     throw inspectionError(

package/dist/server.js

@@ -5,7 +5,7 @@ import {
   parseTileflowLineBackgroundGlyphPath,
   tileflowArtifactSessionSchemaVersion,
   tileflowLineBackgroundGlyphRoute
-} from "./chunk-GXLY73PD.js";
+} from "./chunk-3IHCBD7R.js";
 import {
   getTileflowAssetBasePath,
   getTileflowAssetFileName,
@@ -24,7 +24,7 @@ import {
   defaultTileflowConfigPath
 } from "./chunk-AQUGMUZW.js";
 import "./chunk-D4OE4ITL.js";
-import "./chunk-ONYQNLNA.js";
+import "./chunk-6SLT6ONM.js";
 
 // src/server.ts
 import { open } from "fs/promises";

package/dist/tilesets.js

@@ -1,6 +1,6 @@
 import {
   inspectTileflowPmtiles
-} from "./chunk-ONYQNLNA.js";
+} from "./chunk-6SLT6ONM.js";
 export {
   inspectTileflowPmtiles
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tileflow/dev",
-  "version": "0.1.0-alpha.41",
+  "version": "0.1.0-alpha.43",
   "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.48 <0.1.0-beta.0",
     "chokidar": "6.0.0",
     "fontkit": "2.0.4",
     "jiti": "^2.7.0",
@@ -95,14 +95,14 @@
     "three": "0.185.1"
   },
   "devDependencies": {
-    "@tileflow/maps": "0.1.0-alpha.18"
+    "@tileflow/maps": "0.1.0-alpha.20"
   },
   "optionalDependencies": {
     "sharp": "0.35.5"
   },
   "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"