styled-map-package-api 5.0.0-pre.1 → 5.0.0-pre.3

package/README.md

@@ -58,10 +58,17 @@ const stream = download({
 
 ### Converting from MBTiles
 
+> **Note:** MBTiles conversion requires Node >= 20 (uses `better-sqlite3` which dropped Node 18 support).
+
 ```js
 import { fromMBTiles } from 'styled-map-package-api/from-mbtiles'
 
+// From a file path (Node.js)
 const stream = fromMBTiles('path/to/tiles.mbtiles')
+
+// From an ArrayBuffer or Uint8Array (Node.js and browsers)
+const stream = fromMBTiles(buffer)
+
 // Pipe the ReadableStream to an .smp file
 ```
 

package/dist/download.d.cts

@@ -1,6 +1,6 @@
 import { GlyphDownloadStats } from './style-downloader.cjs';
 import { TileDownloadStats } from './tile-downloader.cjs';
-import { D as DownloadStream } from './types-DPei6PMF.cjs';
+import { D as DownloadStream } from './types-Bhn0-Ldk.cjs';
 import { BBox } from './utils/geo.cjs';
 import 'ky';
 import '@maplibre/maplibre-gl-style-spec';

package/dist/download.d.ts

@@ -1,6 +1,6 @@
 import { GlyphDownloadStats } from './style-downloader.js';
 import { TileDownloadStats } from './tile-downloader.js';
-import { D as DownloadStream } from './types-DPei6PMF.js';
+import { D as DownloadStream } from './types-Bhn0-Ldk.js';
 import { BBox } from './utils/geo.js';
 import 'ky';
 import '@maplibre/maplibre-gl-style-spec';

package/dist/from-mbtiles.cjs

@@ -22,53 +22,99 @@ __export(from_mbtiles_exports, {
 });
 module.exports = __toCommonJS(from_mbtiles_exports);
 var import_mbtiles_reader = require("mbtiles-reader");
+var import_misc = require('./utils/misc.cjs');
 var import_streams = require('./utils/streams.cjs');
 var import_writer = require('./writer.cjs');
 const SOURCE_ID = "mbtiles-source";
-function fromMBTiles(mbtilesPath) {
-  const reader = new import_mbtiles_reader.MBTiles(mbtilesPath);
-  if (reader.metadata.format === "pbf") {
-    throw new Error("Vector MBTiles are not yet supported");
-  }
-  const style = {
-    version: 8,
-    name: reader.metadata.name,
-    sources: {
-      [SOURCE_ID]: {
-        ...reader.metadata,
-        type: "raster"
+function fromMBTiles(source) {
+  let outputReader;
+  let conversionDone;
+  const pipeAbort = new AbortController();
+  return new ReadableStream({
+    async start() {
+      const reader = await import_mbtiles_reader.MBTiles.open(source);
+      if (reader.metadata.format === "pbf") {
+        throw new Error("Vector MBTiles are not yet supported");
       }
-    },
-    layers: [
-      {
-        id: "background",
-        type: "background",
-        paint: {
-          "background-color": "white"
-        }
-      },
-      {
-        id: "raster",
-        type: "raster",
-        source: SOURCE_ID,
-        paint: {
-          "raster-opacity": 1
+      const {
+        name,
+        minzoom,
+        maxzoom,
+        scheme,
+        attribution,
+        description,
+        version: tilesetVersion
+      } = reader.metadata;
+      const style = {
+        version: 8,
+        name,
+        sources: {
+          [SOURCE_ID]: {
+            type: "raster",
+            tileSize: 256,
+            minzoom,
+            maxzoom,
+            scheme,
+            attribution
+          }
+        },
+        layers: [
+          {
+            id: "background",
+            type: "background",
+            paint: {
+              "background-color": "white"
+            }
+          },
+          {
+            id: "raster",
+            type: "raster",
+            source: SOURCE_ID,
+            paint: {
+              "raster-opacity": 1
+            }
+          }
+        ]
+      };
+      if (description || tilesetVersion) {
+        style.metadata = {
+          "mbtiles:description": description,
+          "mbtiles:version": tilesetVersion
+        };
+      }
+      const writer = new import_writer.Writer(style);
+      outputReader = writer.outputStream.getReader();
+      conversionDone = (async () => {
+        try {
+          await (0, import_streams.readableFromAsync)(mbtilesToTileArgs(reader)).pipeTo(
+            writer.createTileWriteStream(),
+            { signal: pipeAbort.signal }
+          );
+          writer.finish();
+        } catch (err) {
+          try {
+            writer.abort(err instanceof Error ? err : new Error(String(err)));
+          } catch {
+          }
         }
+      })();
+    },
+    async pull(controller) {
+      const { done, value } = await /** @type {ReadableStreamDefaultReader<Uint8Array>} */
+      outputReader.read();
+      if (done) {
+        controller.close();
+      } else {
+        controller.enqueue(value);
       }
-    ]
-  };
-  const writer = new import_writer.Writer(style);
-  (async () => {
-    try {
-      await (0, import_streams.readableFromAsync)(mbtilesToTileArgs(reader)).pipeTo(
-        writer.createTileWriteStream()
-      );
-      writer.finish();
-    } catch (err) {
-      writer.abort(err instanceof Error ? err : new Error(String(err)));
+    },
+    async cancel(reason) {
+      pipeAbort.abort(reason);
+      await conversionDone;
+      await /** @type {ReadableStreamDefaultReader<Uint8Array>} */
+      outputReader.cancel(reason).catch(import_misc.noop);
     }
-  })();
-  return writer.outputStream;
+  });
 }
 async function* mbtilesToTileArgs(mbtiles) {
   for (const { z, x, y, data, format } of mbtiles) {

package/dist/from-mbtiles.d.cts

@@ -1,10 +1,14 @@
 /**
  * Convert a MBTiles file to a styled map package, returned as a web
- * ReadableStream.
+ * ReadableStream. The async MBTiles.open() happens lazily inside the
+ * stream's start(), so this function is synchronous.
  *
- * @param {string} mbtilesPath
+ * Requires Node >= 20 (uses better-sqlite3 which dropped Node 18 support).
+ *
+ * @param {string | ArrayBuffer | Uint8Array} source MBTiles source — file path
+ *   (Node), OPFS path (browser Worker), or in-memory buffer.
  * @returns {ReadableStream<Uint8Array>}
  */
-declare function fromMBTiles(mbtilesPath: string): ReadableStream<Uint8Array>;
+declare function fromMBTiles(source: string | ArrayBuffer | Uint8Array): ReadableStream<Uint8Array>;
 
 export { fromMBTiles };

package/dist/from-mbtiles.d.ts

@@ -1,10 +1,14 @@
 /**
  * Convert a MBTiles file to a styled map package, returned as a web
- * ReadableStream.
+ * ReadableStream. The async MBTiles.open() happens lazily inside the
+ * stream's start(), so this function is synchronous.
  *
- * @param {string} mbtilesPath
+ * Requires Node >= 20 (uses better-sqlite3 which dropped Node 18 support).
+ *
+ * @param {string | ArrayBuffer | Uint8Array} source MBTiles source — file path
+ *   (Node), OPFS path (browser Worker), or in-memory buffer.
  * @returns {ReadableStream<Uint8Array>}
  */
-declare function fromMBTiles(mbtilesPath: string): ReadableStream<Uint8Array>;
+declare function fromMBTiles(source: string | ArrayBuffer | Uint8Array): ReadableStream<Uint8Array>;
 
 export { fromMBTiles };

package/dist/from-mbtiles.js

@@ -1,51 +1,97 @@
 import { MBTiles } from "mbtiles-reader";
+import { noop } from "./utils/misc.js";
 import { readableFromAsync } from "./utils/streams.js";
 import { Writer } from "./writer.js";
 const SOURCE_ID = "mbtiles-source";
-function fromMBTiles(mbtilesPath) {
-  const reader = new MBTiles(mbtilesPath);
-  if (reader.metadata.format === "pbf") {
-    throw new Error("Vector MBTiles are not yet supported");
-  }
-  const style = {
-    version: 8,
-    name: reader.metadata.name,
-    sources: {
-      [SOURCE_ID]: {
-        ...reader.metadata,
-        type: "raster"
+function fromMBTiles(source) {
+  let outputReader;
+  let conversionDone;
+  const pipeAbort = new AbortController();
+  return new ReadableStream({
+    async start() {
+      const reader = await MBTiles.open(source);
+      if (reader.metadata.format === "pbf") {
+        throw new Error("Vector MBTiles are not yet supported");
       }
-    },
-    layers: [
-      {
-        id: "background",
-        type: "background",
-        paint: {
-          "background-color": "white"
-        }
-      },
-      {
-        id: "raster",
-        type: "raster",
-        source: SOURCE_ID,
-        paint: {
-          "raster-opacity": 1
+      const {
+        name,
+        minzoom,
+        maxzoom,
+        scheme,
+        attribution,
+        description,
+        version: tilesetVersion
+      } = reader.metadata;
+      const style = {
+        version: 8,
+        name,
+        sources: {
+          [SOURCE_ID]: {
+            type: "raster",
+            tileSize: 256,
+            minzoom,
+            maxzoom,
+            scheme,
+            attribution
+          }
+        },
+        layers: [
+          {
+            id: "background",
+            type: "background",
+            paint: {
+              "background-color": "white"
+            }
+          },
+          {
+            id: "raster",
+            type: "raster",
+            source: SOURCE_ID,
+            paint: {
+              "raster-opacity": 1
+            }
+          }
+        ]
+      };
+      if (description || tilesetVersion) {
+        style.metadata = {
+          "mbtiles:description": description,
+          "mbtiles:version": tilesetVersion
+        };
+      }
+      const writer = new Writer(style);
+      outputReader = writer.outputStream.getReader();
+      conversionDone = (async () => {
+        try {
+          await readableFromAsync(mbtilesToTileArgs(reader)).pipeTo(
+            writer.createTileWriteStream(),
+            { signal: pipeAbort.signal }
+          );
+          writer.finish();
+        } catch (err) {
+          try {
+            writer.abort(err instanceof Error ? err : new Error(String(err)));
+          } catch {
+          }
         }
+      })();
+    },
+    async pull(controller) {
+      const { done, value } = await /** @type {ReadableStreamDefaultReader<Uint8Array>} */
+      outputReader.read();
+      if (done) {
+        controller.close();
+      } else {
+        controller.enqueue(value);
       }
-    ]
-  };
-  const writer = new Writer(style);
-  (async () => {
-    try {
-      await readableFromAsync(mbtilesToTileArgs(reader)).pipeTo(
-        writer.createTileWriteStream()
-      );
-      writer.finish();
-    } catch (err) {
-      writer.abort(err instanceof Error ? err : new Error(String(err)));
+    },
+    async cancel(reason) {
+      pipeAbort.abort(reason);
+      await conversionDone;
+      await /** @type {ReadableStreamDefaultReader<Uint8Array>} */
+      outputReader.cancel(reason).catch(noop);
     }
-  })();
-  return writer.outputStream;
+  });
 }
 async function* mbtilesToTileArgs(mbtiles) {
   for (const { z, x, y, data, format } of mbtiles) {

package/dist/index.d.cts

@@ -1,5 +1,5 @@
-import { S as SMPSource$1, a as SMPStyle$1 } from './types-DPei6PMF.cjs';
-export { W as Writer } from './types-DPei6PMF.cjs';
+import { S as SMPSource$1, a as SMPStyle$1 } from './types-Bhn0-Ldk.cjs';
+export { W as Writer } from './types-Bhn0-Ldk.cjs';
 export { Reader } from './reader.cjs';
 export { createServer } from './server.cjs';
 export { StyleDownloader } from './style-downloader.cjs';

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { S as SMPSource$1, a as SMPStyle$1 } from './types-DPei6PMF.js';
-export { W as Writer } from './types-DPei6PMF.js';
+import { S as SMPSource$1, a as SMPStyle$1 } from './types-Bhn0-Ldk.js';
+export { W as Writer } from './types-Bhn0-Ldk.js';
 export { Reader } from './reader.js';
 export { createServer } from './server.js';
 export { StyleDownloader } from './style-downloader.js';

package/dist/reader.cjs

@@ -155,7 +155,7 @@ class Reader {
       sourcePromise.catch(import_misc.noop);
       zipPromise = sourcePromise.then((source) => {
         this.#fileSource = source;
-        return import_zip_reader.ZipReader.from(source);
+        return import_zip_reader.ZipReader.from(source, { skipUniqueEntryCheck: true });
       });
     } else {
       zipPromise = Promise.resolve(filepathOrZip);

package/dist/reader.d.cts

@@ -1,4 +1,4 @@
-import { a as SMPStyle } from './types-DPei6PMF.cjs';
+import { a as SMPStyle } from './types-Bhn0-Ldk.cjs';
 import * as _gmaclennan_zip_reader from '@gmaclennan/zip-reader';
 import '@maplibre/maplibre-gl-style-spec';
 import 'geojson';

package/dist/reader.d.ts

@@ -1,4 +1,4 @@
-import { a as SMPStyle } from './types-DPei6PMF.js';
+import { a as SMPStyle } from './types-Bhn0-Ldk.js';
 import * as _gmaclennan_zip_reader from '@gmaclennan/zip-reader';
 import '@maplibre/maplibre-gl-style-spec';
 import 'geojson';

package/dist/reader.js

@@ -128,7 +128,7 @@ class Reader {
       sourcePromise.catch(noop);
       zipPromise = sourcePromise.then((source) => {
         this.#fileSource = source;
-        return ZipReader.from(source);
+        return ZipReader.from(source, { skipUniqueEntryCheck: true });
       });
     } else {
       zipPromise = Promise.resolve(filepathOrZip);

package/dist/server.d.cts

@@ -1,7 +1,7 @@
 import { RequestLike } from 'itty-router';
 import { Reader } from './reader.cjs';
 import { IttyRouter } from 'itty-router/IttyRouter';
-import './types-DPei6PMF.cjs';
+import './types-Bhn0-Ldk.cjs';
 import '@maplibre/maplibre-gl-style-spec';
 import 'geojson';
 import 'type-fest';

package/dist/server.d.ts

@@ -1,7 +1,7 @@
 import { RequestLike } from 'itty-router';
 import { Reader } from './reader.js';
 import { IttyRouter } from 'itty-router/IttyRouter';
-import './types-DPei6PMF.js';
+import './types-Bhn0-Ldk.js';
 import '@maplibre/maplibre-gl-style-spec';
 import 'geojson';
 import 'type-fest';

package/dist/style-downloader.d.cts

@@ -1,6 +1,6 @@
 import * as ky from 'ky';
 import { BBox } from './utils/geo.cjs';
-import { b as StyleInlinedSources, G as GlyphInfo, T as TileInfo } from './types-DPei6PMF.cjs';
+import { b as StyleInlinedSources, G as GlyphInfo, T as TileInfo } from './types-Bhn0-Ldk.cjs';
 import { TileDownloadStats } from './tile-downloader.cjs';
 import { StyleSpecification } from '@maplibre/maplibre-gl-style-spec';
 import 'geojson';

package/dist/style-downloader.d.ts

@@ -1,6 +1,6 @@
 import * as ky from 'ky';
 import { BBox } from './utils/geo.js';
-import { b as StyleInlinedSources, G as GlyphInfo, T as TileInfo } from './types-DPei6PMF.js';
+import { b as StyleInlinedSources, G as GlyphInfo, T as TileInfo } from './types-Bhn0-Ldk.js';
 import { TileDownloadStats } from './tile-downloader.js';
 import { StyleSpecification } from '@maplibre/maplibre-gl-style-spec';
 import 'geojson';

package/dist/tile-downloader.d.cts

@@ -1,4 +1,4 @@
-import { T as TileInfo$1 } from './types-DPei6PMF.cjs';
+import { T as TileInfo$1 } from './types-Bhn0-Ldk.cjs';
 import { BBox } from './utils/geo.cjs';
 import { FetchQueue } from './utils/fetch.cjs';
 import '@maplibre/maplibre-gl-style-spec';

package/dist/tile-downloader.d.ts

@@ -1,4 +1,4 @@
-import { T as TileInfo$1 } from './types-DPei6PMF.js';
+import { T as TileInfo$1 } from './types-Bhn0-Ldk.js';
 import { BBox } from './utils/geo.js';
 import { FetchQueue } from './utils/fetch.js';
 import '@maplibre/maplibre-gl-style-spec';

package/dist/{types-DPei6PMF.d.cts → types-Bhn0-Ldk.d.cts}

@@ -27,6 +27,13 @@ import { SetRequired } from 'type-fest';
 /** @import { StyleSpecification } from '@maplibre/maplibre-gl-style-spec' */
 /** @import { InputSource, SMPSource } from './types.js' */
 declare const SUPPORTED_SOURCE_TYPES: readonly ["raster", "vector", "geojson"];
+/**
+ * @typedef {object} WriterOptions
+ * @property {boolean} [dedupe] When true, duplicate tiles (with identical
+ *   content) are stored only once in the archive. Additional entries in the
+ *   central directory point to the same data. This reduces file size for
+ *   tilesets with many repeated tiles (e.g. ocean tiles).
+ */
 /**
  * Write a styled map package to a stream. Stream `writer.outputStream` to a
  * destination, e.g. `fs.createWriteStream('my-map.styledmap')`. You must call
@@ -39,8 +46,9 @@ declare class Writer {
      * @param {any} style A v7 or v8 MapLibre style. v7 styles will be migrated to
      * v8. (There are currently no typescript declarations for v7 styles, hence
      * this is typed as `any` and validated internally)
+     * @param {WriterOptions} [options]
      */
-    constructor(style: any);
+    constructor(style: any, { dedupe }?: WriterOptions);
     /**
      * @returns {ReadableStream<Uint8Array>} Readable stream of the styled map package
      */
@@ -131,6 +139,15 @@ type GlyphInfo = {
     font: string;
     range: GlyphRange;
 };
+type WriterOptions = {
+    /**
+     * When true, duplicate tiles (with identical
+     * content) are stored only once in the archive. Additional entries in the
+     * central directory point to the same data. This reduces file size for
+     * tilesets with many repeated tiles (e.g. ocean tiles).
+     */
+    dedupe?: boolean | undefined;
+};
 
 type TransformInlinedSource<T extends SourceSpecification> = T extends GeoJSONSourceSpecification ? OmitUnion<T, 'data'> & {
     data: GeoJSON;
@@ -172,6 +189,7 @@ type TransformSMPStyle<T extends StyleSpecification> = Omit<T, 'sources'> & {
         'smp:sourceFolders': {
             [_: string]: string;
         };
+        [key: string]: unknown;
     };
     sources: {
         [_: string]: SMPSource;
@@ -180,4 +198,4 @@ type TransformSMPStyle<T extends StyleSpecification> = Omit<T, 'sources'> & {
 type DownloadStream = ReadableStream<Uint8Array>;
 type OmitUnion<T, K extends keyof any> = T extends unknown ? Omit<T, K> : never;
 
-export { type DownloadStream as D, type GlyphInfo as G, type InlinedSource as I, type SMPSource as S, type TileInfo as T, Writer as W, type SMPStyle as a, type StyleInlinedSources as b, type TileFormat as c, type GlyphRange as d, SUPPORTED_SOURCE_TYPES as e, type Source as f, type SourceInfo as g };
+export { type DownloadStream as D, type GlyphInfo as G, type InlinedSource as I, type SMPSource as S, type TileInfo as T, Writer as W, type SMPStyle as a, type StyleInlinedSources as b, type TileFormat as c, type GlyphRange as d, SUPPORTED_SOURCE_TYPES as e, type Source as f, type SourceInfo as g, type WriterOptions as h };

package/dist/{types-DPei6PMF.d.ts → types-Bhn0-Ldk.d.ts}

@@ -27,6 +27,13 @@ import { SetRequired } from 'type-fest';
 /** @import { StyleSpecification } from '@maplibre/maplibre-gl-style-spec' */
 /** @import { InputSource, SMPSource } from './types.js' */
 declare const SUPPORTED_SOURCE_TYPES: readonly ["raster", "vector", "geojson"];
+/**
+ * @typedef {object} WriterOptions
+ * @property {boolean} [dedupe] When true, duplicate tiles (with identical
+ *   content) are stored only once in the archive. Additional entries in the
+ *   central directory point to the same data. This reduces file size for
+ *   tilesets with many repeated tiles (e.g. ocean tiles).
+ */
 /**
  * Write a styled map package to a stream. Stream `writer.outputStream` to a
  * destination, e.g. `fs.createWriteStream('my-map.styledmap')`. You must call
@@ -39,8 +46,9 @@ declare class Writer {
      * @param {any} style A v7 or v8 MapLibre style. v7 styles will be migrated to
      * v8. (There are currently no typescript declarations for v7 styles, hence
      * this is typed as `any` and validated internally)
+     * @param {WriterOptions} [options]
      */
-    constructor(style: any);
+    constructor(style: any, { dedupe }?: WriterOptions);
     /**
      * @returns {ReadableStream<Uint8Array>} Readable stream of the styled map package
      */
@@ -131,6 +139,15 @@ type GlyphInfo = {
     font: string;
     range: GlyphRange;
 };
+type WriterOptions = {
+    /**
+     * When true, duplicate tiles (with identical
+     * content) are stored only once in the archive. Additional entries in the
+     * central directory point to the same data. This reduces file size for
+     * tilesets with many repeated tiles (e.g. ocean tiles).
+     */
+    dedupe?: boolean | undefined;
+};
 
 type TransformInlinedSource<T extends SourceSpecification> = T extends GeoJSONSourceSpecification ? OmitUnion<T, 'data'> & {
     data: GeoJSON;
@@ -172,6 +189,7 @@ type TransformSMPStyle<T extends StyleSpecification> = Omit<T, 'sources'> & {
         'smp:sourceFolders': {
             [_: string]: string;
         };
+        [key: string]: unknown;
     };
     sources: {
         [_: string]: SMPSource;
@@ -180,4 +198,4 @@ type TransformSMPStyle<T extends StyleSpecification> = Omit<T, 'sources'> & {
 type DownloadStream = ReadableStream<Uint8Array>;
 type OmitUnion<T, K extends keyof any> = T extends unknown ? Omit<T, K> : never;
 
-export { type DownloadStream as D, type GlyphInfo as G, type InlinedSource as I, type SMPSource as S, type TileInfo as T, Writer as W, type SMPStyle as a, type StyleInlinedSources as b, type TileFormat as c, type GlyphRange as d, SUPPORTED_SOURCE_TYPES as e, type Source as f, type SourceInfo as g };
+export { type DownloadStream as D, type GlyphInfo as G, type InlinedSource as I, type SMPSource as S, type TileInfo as T, Writer as W, type SMPStyle as a, type StyleInlinedSources as b, type TileFormat as c, type GlyphRange as d, SUPPORTED_SOURCE_TYPES as e, type Source as f, type SourceInfo as g, type WriterOptions as h };

package/dist/utils/file-formats.d.cts

@@ -1,4 +1,4 @@
-import { c as TileFormat } from '../types-DPei6PMF.cjs';
+import { c as TileFormat } from '../types-Bhn0-Ldk.cjs';
 import '@maplibre/maplibre-gl-style-spec';
 import 'geojson';
 import 'type-fest';

package/dist/utils/file-formats.d.ts

@@ -1,4 +1,4 @@
-import { c as TileFormat } from '../types-DPei6PMF.js';
+import { c as TileFormat } from '../types-Bhn0-Ldk.js';
 import '@maplibre/maplibre-gl-style-spec';
 import 'geojson';
 import 'type-fest';

package/dist/utils/style.d.cts

@@ -1,5 +1,5 @@
 import { BBox } from './geo.cjs';
-import { I as InlinedSource } from '../types-DPei6PMF.cjs';
+import { I as InlinedSource } from '../types-Bhn0-Ldk.cjs';
 import * as _maplibre_maplibre_gl_style_spec from '@maplibre/maplibre-gl-style-spec';
 import { StyleSpecification, ValidationError } from '@maplibre/maplibre-gl-style-spec';
 import 'geojson';

package/dist/utils/style.d.ts

@@ -1,5 +1,5 @@
 import { BBox } from './geo.js';
-import { I as InlinedSource } from '../types-DPei6PMF.js';
+import { I as InlinedSource } from '../types-Bhn0-Ldk.js';
 import * as _maplibre_maplibre_gl_style_spec from '@maplibre/maplibre-gl-style-spec';
 import { StyleSpecification, ValidationError } from '@maplibre/maplibre-gl-style-spec';
 import 'geojson';

package/dist/utils/templates.d.cts

@@ -1,5 +1,5 @@
 import * as type_fest from 'type-fest';
-import { d as GlyphRange, T as TileInfo, c as TileFormat } from '../types-DPei6PMF.cjs';
+import { d as GlyphRange, T as TileInfo, c as TileFormat } from '../types-Bhn0-Ldk.cjs';
 import '@maplibre/maplibre-gl-style-spec';
 import 'geojson';
 

package/dist/utils/templates.d.ts

@@ -1,5 +1,5 @@
 import * as type_fest from 'type-fest';
-import { d as GlyphRange, T as TileInfo, c as TileFormat } from '../types-DPei6PMF.js';
+import { d as GlyphRange, T as TileInfo, c as TileFormat } from '../types-Bhn0-Ldk.js';
 import '@maplibre/maplibre-gl-style-spec';
 import 'geojson';
 

package/dist/writer.cjs

@@ -1,7 +1,9 @@
 "use strict";
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -15,6 +17,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var writer_exports = {};
 __export(writer_exports, {
@@ -56,13 +66,20 @@ class Writer {
   #outputStream;
   /** @type {ReadableStreamDefaultController<Uint8Array>} */
   #outputController;
+  /** @type {boolean} */
+  #dedupe;
+  /** @type {Map<string, string>} hash → first entry name */
+  #tileHashes = /* @__PURE__ */ new Map();
+  /** @type {Array<{ name: string, originalName: string }>} */
+  #duplicateEntries = [];
   static SUPPORTED_SOURCE_TYPES = SUPPORTED_SOURCE_TYPES;
   /**
    * @param {any} style A v7 or v8 MapLibre style. v7 styles will be migrated to
    * v8. (There are currently no typescript declarations for v7 styles, hence
    * this is typed as `any` and validated internally)
+   * @param {WriterOptions} [options]
    */
-  constructor(style) {
+  constructor(style, { dedupe = false } = {}) {
     if (!style || !("version" in style)) {
       throw new Error("Invalid style");
     }
@@ -79,6 +96,7 @@ class Writer {
       throw new AggregateError(errors, "Invalid style");
     }
     this.#style = styleCopy;
+    this.#dedupe = dedupe;
     for (const [sourceId, source] of Object.entries(this.#style.sources)) {
       if (source.type !== "geojson") continue;
       this.#addSource(sourceId, source);
@@ -252,6 +270,23 @@ class Writer {
       source.bounds = (0, import_geo.unionBBox)([source.bounds, bbox2]);
     }
     const name = (0, import_templates.getTileFilename)({ sourceId: encodedSourceId, z, x, y, format });
+    if (this.#dedupe) {
+      const data = await toUint8Array(tileData);
+      const hash = await hashData(data);
+      if (this.#addedFiles.has(name)) {
+        throw new Error(`${name} already added`);
+      }
+      this.#addedFiles.add(name);
+      const existingName = this.#tileHashes.get(hash);
+      if (existingName) {
+        this.#duplicateEntries.push({ name, originalName: existingName });
+        return;
+      }
+      this.#tileHashes.set(hash, name);
+      const readable = toWebStream(data);
+      await this.#zipWriter.addEntry({ readable, name, store: true });
+      return;
+    }
     return this.#append(tileData, { name, store: true });
   }
   /**
@@ -316,7 +351,17 @@ class Writer {
     this.#prepareStyle();
     const style = JSON.stringify(this.#style);
     await this.#append(style, { name: import_templates.STYLE_FILE });
-    const entries = await this.#zipWriter.entries();
+    let entries = await this.#zipWriter.entries();
+    if (this.#duplicateEntries.length > 0) {
+      const entriesByName = new Map(entries.map((e) => [e.name, e]));
+      for (const { name, originalName } of this.#duplicateEntries) {
+        const original = entriesByName.get(originalName);
+        if (!original) {
+          throw new Error(`Original entry ${originalName} not found`);
+        }
+        entries.push({ ...original, name });
+      }
+    }
     const sortedEntries = sortEntries(entries);
     await this.#zipWriter.finalize({ entries: sortedEntries });
   }
@@ -430,6 +475,37 @@ function get2DBBox(bbox2) {
   if (bbox2.length === 4) return bbox2;
   return [bbox2[0], bbox2[1], bbox2[3], bbox2[4]];
 }
+async function toUint8Array(source) {
+  if (source instanceof Uint8Array) return source;
+  if (typeof source === "string") return new TextEncoder().encode(source);
+  const reader = (
+    /** @type {ReadableStream<Uint8Array>} */
+    source.getReader()
+  );
+  const chunks = [];
+  let totalLength = 0;
+  while (true) {
+    const { done, value } = await reader.read();
+    if (done) break;
+    chunks.push(value);
+    totalLength += value.byteLength;
+  }
+  const result = new Uint8Array(totalLength);
+  let offset = 0;
+  for (const chunk of chunks) {
+    result.set(chunk, offset);
+    offset += chunk.byteLength;
+  }
+  return result;
+}
+async function hashData(data) {
+  let c = globalThis.crypto;
+  if (!c) {
+    c = (await import("node:crypto")).webcrypto;
+  }
+  const buf = await c.subtle.digest("SHA-256", data);
+  return Array.from(new Uint8Array(buf)).map((b) => b.toString(16).padStart(2, "0")).join("");
+}
 function sortEntries(entries) {
   return [...entries].sort((a, b) => {
     if (a.name === import_templates.VERSION_FILE) return -1;

package/dist/writer.d.cts

@@ -1,4 +1,4 @@
-export { G as GlyphInfo, d as GlyphRange, e as SUPPORTED_SOURCE_TYPES, f as Source, g as SourceInfo, c as TileFormat, T as TileInfo, W as Writer } from './types-DPei6PMF.cjs';
+export { G as GlyphInfo, d as GlyphRange, e as SUPPORTED_SOURCE_TYPES, f as Source, g as SourceInfo, c as TileFormat, T as TileInfo, W as Writer, h as WriterOptions } from './types-Bhn0-Ldk.cjs';
 import '@maplibre/maplibre-gl-style-spec';
 import 'geojson';
 import 'type-fest';

package/dist/writer.d.ts

@@ -1,4 +1,4 @@
-export { G as GlyphInfo, d as GlyphRange, e as SUPPORTED_SOURCE_TYPES, f as Source, g as SourceInfo, c as TileFormat, T as TileInfo, W as Writer } from './types-DPei6PMF.js';
+export { G as GlyphInfo, d as GlyphRange, e as SUPPORTED_SOURCE_TYPES, f as Source, g as SourceInfo, c as TileFormat, T as TileInfo, W as Writer, h as WriterOptions } from './types-Bhn0-Ldk.js';
 import '@maplibre/maplibre-gl-style-spec';
 import 'geojson';
 import 'type-fest';

package/dist/writer.js

@@ -44,13 +44,20 @@ class Writer {
   #outputStream;
   /** @type {ReadableStreamDefaultController<Uint8Array>} */
   #outputController;
+  /** @type {boolean} */
+  #dedupe;
+  /** @type {Map<string, string>} hash → first entry name */
+  #tileHashes = /* @__PURE__ */ new Map();
+  /** @type {Array<{ name: string, originalName: string }>} */
+  #duplicateEntries = [];
   static SUPPORTED_SOURCE_TYPES = SUPPORTED_SOURCE_TYPES;
   /**
    * @param {any} style A v7 or v8 MapLibre style. v7 styles will be migrated to
    * v8. (There are currently no typescript declarations for v7 styles, hence
    * this is typed as `any` and validated internally)
+   * @param {WriterOptions} [options]
    */
-  constructor(style) {
+  constructor(style, { dedupe = false } = {}) {
     if (!style || !("version" in style)) {
       throw new Error("Invalid style");
     }
@@ -67,6 +74,7 @@ class Writer {
       throw new AggregateError(errors, "Invalid style");
     }
     this.#style = styleCopy;
+    this.#dedupe = dedupe;
     for (const [sourceId, source] of Object.entries(this.#style.sources)) {
       if (source.type !== "geojson") continue;
       this.#addSource(sourceId, source);
@@ -240,6 +248,23 @@ class Writer {
       source.bounds = unionBBox([source.bounds, bbox2]);
     }
     const name = getTileFilename({ sourceId: encodedSourceId, z, x, y, format });
+    if (this.#dedupe) {
+      const data = await toUint8Array(tileData);
+      const hash = await hashData(data);
+      if (this.#addedFiles.has(name)) {
+        throw new Error(`${name} already added`);
+      }
+      this.#addedFiles.add(name);
+      const existingName = this.#tileHashes.get(hash);
+      if (existingName) {
+        this.#duplicateEntries.push({ name, originalName: existingName });
+        return;
+      }
+      this.#tileHashes.set(hash, name);
+      const readable = toWebStream(data);
+      await this.#zipWriter.addEntry({ readable, name, store: true });
+      return;
+    }
     return this.#append(tileData, { name, store: true });
   }
   /**
@@ -304,7 +329,17 @@ class Writer {
     this.#prepareStyle();
     const style = JSON.stringify(this.#style);
     await this.#append(style, { name: STYLE_FILE });
-    const entries = await this.#zipWriter.entries();
+    let entries = await this.#zipWriter.entries();
+    if (this.#duplicateEntries.length > 0) {
+      const entriesByName = new Map(entries.map((e) => [e.name, e]));
+      for (const { name, originalName } of this.#duplicateEntries) {
+        const original = entriesByName.get(originalName);
+        if (!original) {
+          throw new Error(`Original entry ${originalName} not found`);
+        }
+        entries.push({ ...original, name });
+      }
+    }
     const sortedEntries = sortEntries(entries);
     await this.#zipWriter.finalize({ entries: sortedEntries });
   }
@@ -418,6 +453,37 @@ function get2DBBox(bbox2) {
   if (bbox2.length === 4) return bbox2;
   return [bbox2[0], bbox2[1], bbox2[3], bbox2[4]];
 }
+async function toUint8Array(source) {
+  if (source instanceof Uint8Array) return source;
+  if (typeof source === "string") return new TextEncoder().encode(source);
+  const reader = (
+    /** @type {ReadableStream<Uint8Array>} */
+    source.getReader()
+  );
+  const chunks = [];
+  let totalLength = 0;
+  while (true) {
+    const { done, value } = await reader.read();
+    if (done) break;
+    chunks.push(value);
+    totalLength += value.byteLength;
+  }
+  const result = new Uint8Array(totalLength);
+  let offset = 0;
+  for (const chunk of chunks) {
+    result.set(chunk, offset);
+    offset += chunk.byteLength;
+  }
+  return result;
+}
+async function hashData(data) {
+  let c = globalThis.crypto;
+  if (!c) {
+    c = (await import("node:crypto")).webcrypto;
+  }
+  const buf = await c.subtle.digest("SHA-256", data);
+  return Array.from(new Uint8Array(buf)).map((b) => b.toString(16).padStart(2, "0")).join("");
+}
 function sortEntries(entries) {
   return [...entries].sort((a, b) => {
     if (a.name === VERSION_FILE) return -1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "styled-map-package-api",
-  "version": "5.0.0-pre.1",
+  "version": "5.0.0-pre.3",
   "description": "JavaScript API for reading, writing, and serving Styled Map Package (.smp) files",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -114,7 +114,7 @@
   "keywords": [],
   "license": "MIT",
   "dependencies": {
-    "@gmaclennan/zip-reader": "^1.0.0-pre.2",
+    "@gmaclennan/zip-reader": "^1.0.0",
     "@mapbox/sphericalmercator": "^1.2.0",
     "@maplibre/maplibre-gl-style-spec": "^20.3.1",
     "@placemarkio/check-geojson": "^0.1.12",
@@ -124,12 +124,15 @@
     "itty-router": "^5.0.22",
     "ky": "^1.7.5",
     "map-obj": "^5.0.2",
-    "mbtiles-reader": "^1.0.0",
+    "mbtiles-reader": "^2.0.1",
     "p-limit": "^6.2.0",
     "readable-stream": "^4.7.0",
     "yocto-queue": "^1.1.1",
     "zip-writer": "^2.2.0"
   },
+  "optionalDependencies": {
+    "better-sqlite3": "^12.8.0"
+  },
   "devDependencies": {
     "@commander-js/extra-typings": "^12.1.0",
     "@types/geojson": "^7946.0.16",