@tileflow/dev 0.1.0-alpha.29 → 0.1.0-alpha.30

package/README.md

@@ -123,7 +123,7 @@ Use `/artifacts` for preparation and output, `/server` for HTTP handling, `/conf
 loading, `/icons` and `/fonts` for asset preparation, `/inspect` for bounded inspection, `/tilesets`
 for local PMTiles inspection, and `/validation` for diagnostics. `/preview` is the local preview
 contract, including experimental preview-only rendering; it does not promise hosted support.
-The root retains compatibility re-exports.
+The package has no root entry point.
 
 Invalid compiled styles throw `TileflowStyleValidationError` with bounded issues. Keep diagnostics
 structured; do not return executable config, local paths, credentials, or complete generated byte
@@ -180,7 +180,9 @@ the previous complete lock intact; remove a stale `.writing` guard only after co
 writer has exited. Ordinary reads and Core validation never acquire write guards.
 
 A package supports up to 1,000 effective icons, subject to a 2,048-pixel atlas dimension,
-4 MiB per generated file, and 8 MiB per package. Larger artwork can hit those limits before
+4 MiB per generated file, and 8 MiB per package. Paired densities share a logical layout capped
+at 1,024 pixels per dimension at 1× and 2,048 at 2×. Mixed-size artwork retains matching placements
+without resampling either density. Larger artwork can hit those limits before
 1,000 icons. Several individually valid sets can exceed the effective map limit; composition
 fails explicitly instead of clipping. Cache and composition do not create Team resources or
 publish anything. Every normal entry point composes declared shared descriptors through this path;

package/THIRD_PARTY_NOTICES.md

@@ -58,28 +58,28 @@ copyright 2020 Arjun Barrett and is distributed under the MIT License.
 - PMTiles source and license: <https://github.com/protomaps/PMTiles/tree/v4.5.0/js>
 - fflate source and license: <https://github.com/101arrowz/fflate/tree/v0.8.3>
 
-## sharp 0.35.4
+## sharp 0.35.5
 
 `@tileflow/dev` declares `sharp` as an optional dependency and loads it dynamically only when local
 SVG or raster icon sources must be inspected and packed. The Tileflow build externalizes `sharp`
 rather than bundling it. `sharp` is copyright Lovell Fuller and contributors and is distributed under
 the Apache License 2.0.
 
-- Source: <https://github.com/lovell/sharp/tree/v0.35.4>
-- License: <https://github.com/lovell/sharp/blob/v0.35.4/LICENSE>
+- Source: <https://github.com/lovell/sharp/tree/v0.35.5>
+- License: <https://github.com/lovell/sharp/blob/v0.35.5/LICENSE>
 
-## sharp libvips distributions 1.3.3
+## sharp libvips distributions 1.3.4
 
 `sharp` selects a separate optional `@img/sharp-libvips-*` package for the current platform. The
 installed platform-package manifest declares `LGPL-3.0-or-later`; the packaging scripts themselves
 are distributed under Apache-2.0. The packages contain prebuilt libvips and separately licensed
-runtime dependencies. For `sharp` 0.35.4 the selected libvips ABI is 8.18.6.
+runtime dependencies. For `sharp` 0.35.5 the selected libvips ABI is 8.18.7.
 
-- Packaging source: <https://github.com/lovell/sharp-libvips/tree/v1.3.3>
-- Packaging-script license: <https://github.com/lovell/sharp-libvips/blob/v1.3.3/LICENSE>
-- libvips 8.18.6 source: <https://github.com/libvips/libvips/tree/v8.18.6>
-- libvips 8.18.6 license (LGPL-2.1-or-later):
-  <https://github.com/libvips/libvips/blob/v8.18.6/LICENSE>
+- Packaging source: <https://github.com/lovell/sharp-libvips/tree/v1.3.4>
+- Packaging-script license: <https://github.com/lovell/sharp-libvips/blob/v1.3.4/LICENSE>
+- libvips 8.18.7 source: <https://github.com/libvips/libvips/tree/v8.18.7>
+- libvips 8.18.7 license (LGPL-2.1-or-later):
+  <https://github.com/libvips/libvips/blob/v8.18.7/LICENSE>
 
 Because `sharp` remains a separately installed optional package, users can install, update, remove,
 or replace it independently of `@tileflow/dev`. Tileflow does not modify libvips and does not place a

package/dist/artifacts.js

@@ -27,8 +27,7 @@ import {
   usesTileflowLineBackgroundGlyphs,
   writeTileflowArtifactPlan,
   writeTileflowBuildArtifacts
-} from "./chunk-LXSFLPIU.js";
-import "./chunk-ONYQNLNA.js";
+} from "./chunk-L56FLV4R.js";
 import {
   getTileflowAssetBasePath,
   getTileflowAssetFileName,
@@ -36,13 +35,14 @@ import {
   normalizeTileflowBasePath,
   resolveTileflowArtifactPublicUrls
 } from "./chunk-UTRO4IBQ.js";
-import "./chunk-EJPVUSX4.js";
+import "./chunk-A2VTI43Y.js";
 import "./chunk-7C4F6GAX.js";
 import "./chunk-KDFTE4Q5.js";
 import {
   defaultTileflowConfigPath
 } from "./chunk-6MGFMKG3.js";
 import "./chunk-D4OE4ITL.js";
+import "./chunk-ONYQNLNA.js";
 export {
   TileflowHostedManifestOverwriteError,
   TileflowLocalTilesetProductionError,

package/dist/{chunk-EJPVUSX4.js → chunk-A2VTI43Y.js}

@@ -173,15 +173,16 @@ async function packTileflowRenderedIcons(input) {
 function createSpriteLayout(icons, pixelRatio) {
   const columns = Math.ceil(Math.sqrt(icons.length));
   const widest = Math.max(...icons.map((icon) => icon.width));
-  const targetWidth = Math.min(tileflowIconPackageLimits.maxAtlasDimension, columns * widest);
+  const maxDimension = tileflowIconPackageLimits.maxAtlasDimension / 2 * pixelRatio;
+  const targetWidth = Math.min(maxDimension, columns * widest);
   const placements = [];
   let left = 0;
   let rowHeight = 0;
   let top = 0;
   for (const icon of icons) {
-    if (icon.width > tileflowIconPackageLimits.maxAtlasDimension)
+    if (icon.width > maxDimension)
       throw new Error(
-        `Generated sprite exceeds ${tileflowIconPackageLimits.maxAtlasDimension} pixels per dimension`
+        `Generated sprite exceeds ${maxDimension} pixels per dimension at ${pixelRatio}x`
       );
     if (left > 0 && left + icon.width > targetWidth) {
       top += rowHeight;
@@ -194,9 +195,9 @@ function createSpriteLayout(icons, pixelRatio) {
   }
   const width = targetWidth;
   const height = top + rowHeight;
-  if (width > tileflowIconPackageLimits.maxAtlasDimension || height > tileflowIconPackageLimits.maxAtlasDimension)
+  if (width > maxDimension || height > maxDimension)
     throw new Error(
-      `Generated sprite exceeds ${tileflowIconPackageLimits.maxAtlasDimension} pixels per dimension`
+      `Generated sprite exceeds ${maxDimension} pixels per dimension at ${pixelRatio}x`
     );
   const index = Object.fromEntries(
     icons.map((icon, ordinal) => {
@@ -1741,15 +1742,13 @@ async function readTileflowIconDirectory(source, options) {
         message: `One icon contributor supports at most ${tileflowIconPackageLimits4.maxIconCount} exports`
       }
     ]);
-  const entries = inspected.icons.map(
-    (icon) => ({
-      byteLength: icon.source.byteLength,
-      format: icon.format,
-      id: icon.name,
-      kind: icon.kind,
-      path: icon.displayPath
-    })
-  );
+  const entries = inspected.icons.map((icon) => ({
+    byteLength: icon.source.byteLength,
+    format: icon.format,
+    id: icon.name,
+    kind: icon.kind,
+    path: icon.displayPath
+  }));
   return {
     containmentRoot: directory.containmentRoot,
     entries,

package/dist/{chunk-LXSFLPIU.js → chunk-L56FLV4R.js}

@@ -1,6 +1,3 @@
-import {
-  inspectTileflowPmtilesForLocalUse
-} from "./chunk-ONYQNLNA.js";
 import {
   TileflowFontCompilationError,
   getTileflowFontWatchPaths,
@@ -11,7 +8,7 @@ import {
 import {
   getTileflowIconWatchPaths,
   prepareTileflowCatalogIcons
-} from "./chunk-EJPVUSX4.js";
+} from "./chunk-A2VTI43Y.js";
 import {
   TileflowStyleValidationError,
   normalizeTileflowStyleValidationIssues,
@@ -26,6 +23,9 @@ import {
 import {
   isPathWithin
 } from "./chunk-D4OE4ITL.js";
+import {
+  inspectTileflowPmtilesForLocalUse
+} from "./chunk-ONYQNLNA.js";
 
 // src/artifacts.ts
 import { createHash as createHash4 } from "crypto";
@@ -706,6 +706,7 @@ var nativeLoweringLimits = Object.freeze({
   maximumLayers: 4096,
   maximumDashLength: 64
 });
+var overlapProperties = ["icon-overlap", "text-overlap"];
 var NativeLoweringError = class extends Error {
   constructor(path, reason = "shape") {
     super(
@@ -1156,6 +1157,21 @@ function lowerLayer(layer, index, vector) {
   }
   return { variants, properties };
 }
+function replaceSymbolOverlap(layer, index) {
+  if (layer.type !== "symbol" || !object2(layer.layout)) return;
+  const properties = overlapProperties.filter((property) => layer.layout[property] !== void 0);
+  if (!properties.length) return;
+  const layout = { ...layer.layout };
+  for (const property of properties) {
+    const mode = layout[property];
+    if (mode !== "never" && mode !== "always" && mode !== "cooperative") {
+      fail(`/layers/${index}/layout/${property}`);
+    }
+    delete layout[property];
+    layout[property === "icon-overlap" ? "icon-allow-overlap" : "text-allow-overlap"] = mode !== "never";
+  }
+  return { layer: { ...layer, layout }, properties };
+}
 function lowerNativeStyleRepresentation(input, normalizeFilter = (filter) => filter) {
   if (!Array.isArray(input.layers) || input.layers.length > nativeLoweringLimits.maximumLayers)
     fail("/layers", "budget");
@@ -1174,11 +1190,14 @@ function lowerNativeStyleRepresentation(input, normalizeFilter = (filter) => fil
   }
   const layers = [];
   const transformations = [];
+  const symbolOverlap = [];
   for (const [index, layer] of originalLayers.entries()) {
     const source = object2(input.sources) && typeof layer.source === "string" ? input.sources[layer.source] : void 0;
     const lowered = lowerLayer(layer, index, object2(source) && source.type === "vector");
     if (!lowered) {
-      layers.push(layer);
+      const replaced = replaceSymbolOverlap(layer, index);
+      if (replaced) symbolOverlap.push({ inputLayer: index, properties: replaced.properties });
+      layers.push(replaced?.layer ?? layer);
       continue;
     }
     if (layers.length + lowered.variants.length + originalLayers.length - index - 1 > nativeLoweringLimits.maximumLayers) {
@@ -1208,13 +1227,14 @@ function lowerNativeStyleRepresentation(input, normalizeFilter = (filter) => fil
       properties: lowered.properties
     });
   }
-  const changed = projection !== "none" || transformations.length > 0;
+  const changed = projection !== "none" || transformations.length > 0 || symbolOverlap.length > 0;
   const output = changed ? { ...input, layers } : input;
   if (changed && projection !== "none") delete output.projection;
   return {
     style: output,
     projection,
     layers: transformations,
+    symbolOverlap,
     inputLayers: originalLayers.length,
     outputLayers: layers.length
   };
@@ -1245,7 +1265,9 @@ function lowerTileflowNativeCompiledStyles(input, policy = {}) {
         const options = { ...urlOptions(map, theme, policy), deferFontClosure: true };
         const pending = validateTileflowNativeStyle(original, options);
         const blockers = pending.filter(
-          (issue) => issue.code !== "NATIVE_UNSUPPORTED_STYLE" || !(issue.path === "/projection" || /^\/layers\/\d+\/(?:layout\/line-cap|paint\/line-dasharray)(?:\/|$)/u.test(issue.path))
+          (issue) => issue.code !== "NATIVE_UNSUPPORTED_STYLE" || !(issue.path === "/projection" || /^\/layers\/\d+\/(?:layout\/line-cap|paint\/line-dasharray)(?:\/|$)/u.test(
+            issue.path
+          ) || /^\/layers\/\d+\/layout\/(?:icon|text)-overlap$/u.test(issue.path))
         );
         if (blockers.length)
           throw new TileflowNativeCompatibilityError(
@@ -1301,7 +1323,8 @@ function lowerTileflowNativeCompiledStyles(input, policy = {}) {
           inputLayers: lowered.inputLayers,
           outputLayers: lowered.outputLayers,
           projection: lowered.projection,
-          layers: lowered.layers
+          layers: lowered.layers,
+          symbolOverlap: lowered.symbolOverlap
         });
       } catch (error) {
         if (!(error instanceof NativeLoweringError)) throw error;
@@ -2444,9 +2467,10 @@ function createGenerationArtifactFiles(artifacts, generation, nativeUrls) {
       };
     })
   );
-  const immutableAssets = artifacts.assets.map(
-    (asset) => ({ ...asset, fileName: `${prefix}/${asset.fileName}` })
-  );
+  const immutableAssets = artifacts.assets.map((asset) => ({
+    ...asset,
+    fileName: `${prefix}/${asset.fileName}`
+  }));
   return validateArtifactFiles([...stableFiles, ...immutableStyles, ...immutableAssets]);
 }
 function createFontAwareManifest(manifest, styles) {

package/dist/icons.js

@@ -16,7 +16,7 @@ import {
   storeTileflowIconSetArtifact,
   verifyTileflowIconArtifact,
   writeTileflowIconsLockfile
-} from "./chunk-EJPVUSX4.js";
+} from "./chunk-A2VTI43Y.js";
 import "./chunk-7C4F6GAX.js";
 export {
   TileflowIconCompilationError,