styled-map-package 4.0.1 → 4.1.0

package/bin/smp-download.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-import { Command, InvalidArgumentError } from '@commander-js/extra-typings'
 import { input, number } from '@inquirer/prompts'
+import { Command, InvalidArgumentError } from 'commander'
 import fs from 'fs'
 import { pipeline } from 'stream/promises'
 

package/bin/smp-view.js

@@ -1,8 +1,9 @@
 #!/usr/bin/env node
-import fastifyStatic from '@fastify/static'
 import { createServerAdapter } from '@whatwg-node/server'
 import { Command } from 'commander'
-import fastify from 'fastify'
+import fsPromises from 'fs/promises'
+import http from 'http'
+import { AutoRouter } from 'itty-router'
 import openApp from 'open'
 
 import path from 'node:path'
@@ -28,37 +29,45 @@ program
 program.parseAsync(process.argv)
 
 /**
- * Serve a styled map package on the given port (defaults to 3000). Use the
- * fastify plugin in `./server.js` for more flexibility.
+ * Serve a styled map package on the given port (defaults to 3000).
  *
  * @param {object} opts
  * @param {number} [opts.port]
  * @param {string} opts.filepath
  * @returns
  */
-function serve({ port = 3000, filepath }) {
+async function serve({ port = 3000, filepath }) {
   const reader = new Reader(path.relative(process.cwd(), filepath))
   const smpServer = createServer({ base: '/map' })
-  const serverAdapter = createServerAdapter((request) => {
-    return smpServer.fetch(request, reader)
-  })
-
-  const server = fastify()
 
-  server.register(fastifyStatic, {
-    root: new URL('../map-viewer', import.meta.url),
-    serve: false,
+  const router = AutoRouter()
+  router.get('/', async () => {
+    const index = await fsPromises.readFile(
+      new URL('../map-viewer/index.html', import.meta.url),
+    )
+    return new Response(new Uint8Array(index), {
+      headers: {
+        'Content-Type': 'text/html',
+        'Content-Length': String(index.byteLength),
+        'Cache-Control': 'public, max-age=0',
+      },
+    })
   })
-  server.get('/', async (request, reply) => {
-    return reply.sendFile('index.html')
+  router.all('/map/*', (request) => {
+    return smpServer.fetch(request, reader)
   })
-
-  server.route({
-    url: '/map/*',
-    method: ['GET', 'HEAD', 'OPTIONS'],
-    handler: (req, reply) => {
-      return serverAdapter.handleNodeRequestAndResponse(req, reply)
-    },
+  const server = http.createServer(createServerAdapter(router.fetch))
+  return new Promise((resolve, reject) => {
+    server.listen(port, '127.0.0.1', () => {
+      const address = server.address()
+      if (typeof address === 'string') {
+        resolve(`http://${address}`)
+      } else if (address === null) {
+        reject(new Error('Failed to get server address'))
+      } else {
+        resolve(`http://${address.address}:${address.port}`)
+      }
+    })
+    server.on('error', reject)
   })
-  return server.listen({ port })
 }

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-B4Xn1F9K.cjs';
+import { D as DownloadStream } from './types-yLQy3AKR.cjs';
 import { BBox } from './utils/geo.cjs';
 import 'ky';
 import 'stream';

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-B4Xn1F9K.js';
+import { D as DownloadStream } from './types-yLQy3AKR.js';
 import { BBox } from './utils/geo.js';
 import 'ky';
 import 'stream';

package/dist/index.d.cts

@@ -1,5 +1,5 @@
-import { S as SMPSource$1, a as SMPStyle$1 } from './types-B4Xn1F9K.cjs';
-export { W as Writer } from './types-B4Xn1F9K.cjs';
+import { S as SMPSource$1, a as SMPStyle$1 } from './types-yLQy3AKR.cjs';
+export { W as Writer } from './types-yLQy3AKR.cjs';
 export { Reader } from './reader.cjs';
 export { ReaderWatch } from './reader-watch.cjs';
 export { createServer } from './server.cjs';

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { S as SMPSource$1, a as SMPStyle$1 } from './types-B4Xn1F9K.js';
-export { W as Writer } from './types-B4Xn1F9K.js';
+import { S as SMPSource$1, a as SMPStyle$1 } from './types-yLQy3AKR.js';
+export { W as Writer } from './types-yLQy3AKR.js';
 export { Reader } from './reader.js';
 export { ReaderWatch } from './reader-watch.js';
 export { createServer } from './server.js';

package/dist/reader-watch.d.cts

@@ -1,4 +1,4 @@
-import { a as SMPStyle } from './types-B4Xn1F9K.cjs';
+import { a as SMPStyle } from './types-yLQy3AKR.cjs';
 import { Reader } from './reader.cjs';
 import '@maplibre/maplibre-gl-style-spec';
 import 'geojson';

package/dist/reader-watch.d.ts

@@ -1,4 +1,4 @@
-import { a as SMPStyle } from './types-B4Xn1F9K.js';
+import { a as SMPStyle } from './types-yLQy3AKR.js';
 import { Reader } from './reader.js';
 import '@maplibre/maplibre-gl-style-spec';
 import 'geojson';

package/dist/reader.cjs

@@ -145,7 +145,8 @@ class Reader {
   async close() {
     if (this.#closePromise) return this.#closePromise;
     this.#closePromise = (async () => {
-      const zip = await this.#zipPromise;
+      const zip = await this.#zipPromise.catch(import_misc.noop);
+      if (!zip) return;
       await zip.close();
     })();
     return this.#closePromise;

package/dist/reader.d.cts

@@ -1,5 +1,5 @@
 import * as stream from 'stream';
-import { a as SMPStyle } from './types-B4Xn1F9K.cjs';
+import { a as SMPStyle } from './types-yLQy3AKR.cjs';
 import * as yauzl_promise from 'yauzl-promise';
 import '@maplibre/maplibre-gl-style-spec';
 import 'geojson';

package/dist/reader.d.ts

@@ -1,5 +1,5 @@
 import * as stream from 'stream';
-import { a as SMPStyle } from './types-B4Xn1F9K.js';
+import { a as SMPStyle } from './types-yLQy3AKR.js';
 import * as yauzl_promise from 'yauzl-promise';
 import '@maplibre/maplibre-gl-style-spec';
 import 'geojson';

package/dist/reader.js

@@ -117,7 +117,8 @@ class Reader {
   async close() {
     if (this.#closePromise) return this.#closePromise;
     this.#closePromise = (async () => {
-      const zip = await this.#zipPromise;
+      const zip = await this.#zipPromise.catch(noop);
+      if (!zip) return;
       await zip.close();
     })();
     return this.#closePromise;

package/dist/server.d.cts

@@ -2,7 +2,7 @@ import { RequestLike } from 'itty-router';
 import { Reader } from './reader.cjs';
 import { IttyRouter } from 'itty-router/IttyRouter';
 import 'stream';
-import './types-B4Xn1F9K.cjs';
+import './types-yLQy3AKR.cjs';
 import '@maplibre/maplibre-gl-style-spec';
 import 'geojson';
 import 'type-fest';

package/dist/server.d.ts

@@ -2,7 +2,7 @@ import { RequestLike } from 'itty-router';
 import { Reader } from './reader.js';
 import { IttyRouter } from 'itty-router/IttyRouter';
 import 'stream';
-import './types-B4Xn1F9K.js';
+import './types-yLQy3AKR.js';
 import '@maplibre/maplibre-gl-style-spec';
 import 'geojson';
 import 'type-fest';

package/dist/style-downloader.cjs

@@ -252,7 +252,7 @@ class StyleDownloader {
       skipped: 0,
       totalBytes: 0
     };
-    const tiles = async function* () {
+    const tiles = (async function* () {
       const inlinedStyle = await _this.getStyle();
       for await (const [sourceId, source] of Object.entries(
         inlinedStyle.sources
@@ -284,7 +284,7 @@ class StyleDownloader {
           sourceTiles.skipped.map((tile) => ({ ...tile, sourceId }))
         );
       }
-    }();
+    })();
     Object.defineProperty(tiles, "skipped", {
       get() {
         return skipped;

package/dist/style-downloader.d.cts

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

package/dist/style-downloader.d.ts

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

package/dist/style-downloader.js

@@ -229,7 +229,7 @@ class StyleDownloader {
       skipped: 0,
       totalBytes: 0
     };
-    const tiles = async function* () {
+    const tiles = (async function* () {
       const inlinedStyle = await _this.getStyle();
       for await (const [sourceId, source] of Object.entries(
         inlinedStyle.sources
@@ -261,7 +261,7 @@ class StyleDownloader {
           sourceTiles.skipped.map((tile) => ({ ...tile, sourceId }))
         );
       }
-    }();
+    })();
     Object.defineProperty(tiles, "skipped", {
       get() {
         return skipped;

package/dist/tile-downloader.cjs

@@ -77,7 +77,7 @@ function downloadTiles({
     stats.skipped = skipped.length;
     onprogress(stats);
   }
-  const tiles = async function* () {
+  const tiles = (async function* () {
     const queue = new import_yocto_queue.default();
     const tiles2 = tileIterator({
       bounds,
@@ -115,7 +115,7 @@ function downloadTiles({
       }
       yield [stream, { ...tileInfo, format }];
     }
-  }();
+  })();
   Object.defineProperty(tiles, "skipped", {
     get() {
       return skipped;

package/dist/tile-downloader.d.cts

@@ -1,4 +1,4 @@
-import { T as TileInfo$1 } from './types-B4Xn1F9K.cjs';
+import { T as TileInfo$1 } from './types-yLQy3AKR.cjs';
 import * as stream from 'stream';
 import { BBox } from './utils/geo.cjs';
 import { FetchQueue } from './utils/fetch.cjs';

package/dist/tile-downloader.d.ts

@@ -1,4 +1,4 @@
-import { T as TileInfo$1 } from './types-B4Xn1F9K.js';
+import { T as TileInfo$1 } from './types-yLQy3AKR.js';
 import * as stream from 'stream';
 import { BBox } from './utils/geo.js';
 import { FetchQueue } from './utils/fetch.js';

package/dist/tile-downloader.js

@@ -46,7 +46,7 @@ function downloadTiles({
     stats.skipped = skipped.length;
     onprogress(stats);
   }
-  const tiles = async function* () {
+  const tiles = (async function* () {
     const queue = new Queue();
     const tiles2 = tileIterator({
       bounds,
@@ -84,7 +84,7 @@ function downloadTiles({
       }
       yield [stream, { ...tileInfo, format }];
     }
-  }();
+  })();
   Object.defineProperty(tiles, "skipped", {
     get() {
       return skipped;

package/dist/{types-B4Xn1F9K.d.cts → types-yLQy3AKR.d.cts}

@@ -1,4 +1,4 @@
-import { SourceSpecification, GeoJSONSourceSpecification, VectorSourceSpecification, RasterSourceSpecification, RasterDEMSourceSpecification, StyleSpecification } from '@maplibre/maplibre-gl-style-spec';
+import { StyleSpecification, SourceSpecification, GeoJSONSourceSpecification, VectorSourceSpecification, RasterSourceSpecification, RasterDEMSourceSpecification } from '@maplibre/maplibre-gl-style-spec';
 import { GeoJSON, BBox } from 'geojson';
 import * as stream from 'stream';
 import { Readable } from 'stream';
@@ -111,9 +111,12 @@ declare class Writer extends EventEmitter<[never]> {
      * This method must be called to complete the archive.
      * You must wait for your destination write stream to 'finish' before using the output.
      */
-    finish(): void;
+    finish(): Promise<void>;
     #private;
 }
+type ZipEntry = {
+    name: string;
+};
 type Source = string | Buffer | Uint8Array | stream.Readable;
 type SourceInternal = string | Buffer | stream.Readable;
 type GlyphRange = `${number}-${number}`;
@@ -186,4 +189,4 @@ interface DownloadStream extends Readable {
 }
 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 SourceInternal as g, type SourceInfo as h };
+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 ZipEntry as Z, 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 SourceInternal as h };

package/dist/{types-B4Xn1F9K.d.ts → types-yLQy3AKR.d.ts}

@@ -1,4 +1,4 @@
-import { SourceSpecification, GeoJSONSourceSpecification, VectorSourceSpecification, RasterSourceSpecification, RasterDEMSourceSpecification, StyleSpecification } from '@maplibre/maplibre-gl-style-spec';
+import { StyleSpecification, SourceSpecification, GeoJSONSourceSpecification, VectorSourceSpecification, RasterSourceSpecification, RasterDEMSourceSpecification } from '@maplibre/maplibre-gl-style-spec';
 import { GeoJSON, BBox } from 'geojson';
 import * as stream from 'stream';
 import { Readable } from 'stream';
@@ -111,9 +111,12 @@ declare class Writer extends EventEmitter<[never]> {
      * This method must be called to complete the archive.
      * You must wait for your destination write stream to 'finish' before using the output.
      */
-    finish(): void;
+    finish(): Promise<void>;
     #private;
 }
+type ZipEntry = {
+    name: string;
+};
 type Source = string | Buffer | Uint8Array | stream.Readable;
 type SourceInternal = string | Buffer | stream.Readable;
 type GlyphRange = `${number}-${number}`;
@@ -186,4 +189,4 @@ interface DownloadStream extends Readable {
 }
 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 SourceInternal as g, type SourceInfo as h };
+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 ZipEntry as Z, 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 SourceInternal as h };

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

@@ -1,5 +1,5 @@
 import * as stream from 'stream';
-import { c as TileFormat } from '../types-B4Xn1F9K.cjs';
+import { c as TileFormat } from '../types-yLQy3AKR.cjs';
 import '@maplibre/maplibre-gl-style-spec';
 import 'geojson';
 import 'type-fest';

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

@@ -1,5 +1,5 @@
 import * as stream from 'stream';
-import { c as TileFormat } from '../types-B4Xn1F9K.js';
+import { c as TileFormat } from '../types-yLQy3AKR.js';
 import '@maplibre/maplibre-gl-style-spec';
 import 'geojson';
 import 'type-fest';

package/dist/utils/style.cjs

@@ -98,14 +98,14 @@ function assertTileJSON(tilejson) {
 }
 const validateStyle = (
   /** @type {{ (style: unknown): style is StyleSpecification, errors: ValidationError[] }} */
-  (style) => {
+  ((style) => {
     validateStyle.errors = (0, import_maplibre_gl_style_spec.validateStyleMin)(
       /** @type {StyleSpecification} */
       style
     );
     if (validateStyle.errors.length) return false;
     return true;
-  }
+  })
 );
 function isInlinedSource(source) {
   if (source.type === "geojson") {

package/dist/utils/style.d.cts

@@ -1,5 +1,5 @@
 import { BBox } from './geo.cjs';
-import { I as InlinedSource } from '../types-B4Xn1F9K.cjs';
+import { I as InlinedSource } from '../types-yLQy3AKR.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-B4Xn1F9K.js';
+import { I as InlinedSource } from '../types-yLQy3AKR.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/style.js

@@ -71,14 +71,14 @@ function assertTileJSON(tilejson) {
 }
 const validateStyle = (
   /** @type {{ (style: unknown): style is StyleSpecification, errors: ValidationError[] }} */
-  (style) => {
+  ((style) => {
     validateStyle.errors = validateStyleMin(
       /** @type {StyleSpecification} */
       style
     );
     if (validateStyle.errors.length) return false;
     return true;
-  }
+  })
 );
 function isInlinedSource(source) {
   if (source.type === "geojson") {

package/dist/utils/templates.cjs

@@ -18,7 +18,9 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var templates_exports = {};
 __export(templates_exports, {
+  FONTS_FOLDER: () => FONTS_FOLDER,
   GLYPH_URI: () => GLYPH_URI,
+  SOURCES_FOLDER: () => SOURCES_FOLDER,
   STYLE_FILE: () => STYLE_FILE,
   URI_BASE: () => URI_BASE,
   URI_SCHEME: () => URI_SCHEME,
@@ -99,7 +101,9 @@ function replaceVariables(template, variables) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  FONTS_FOLDER,
   GLYPH_URI,
+  SOURCES_FOLDER,
   STYLE_FILE,
   URI_BASE,
   URI_SCHEME,

package/dist/utils/templates.d.cts

@@ -1,5 +1,5 @@
 import * as type_fest from 'type-fest';
-import { T as TileInfo, d as GlyphRange, c as TileFormat } from '../types-B4Xn1F9K.cjs';
+import { d as GlyphRange, T as TileInfo, c as TileFormat } from '../types-yLQy3AKR.cjs';
 import '@maplibre/maplibre-gl-style-spec';
 import 'geojson';
 import 'stream';
@@ -73,6 +73,8 @@ declare function replaceVariables(template: string, variables: Record<string, st
 declare const URI_SCHEME: "smp";
 declare const URI_BASE: string;
 declare const STYLE_FILE: "style.json";
+declare const SOURCES_FOLDER: "s";
+declare const FONTS_FOLDER: "fonts";
 declare const GLYPH_URI: string;
 
-export { GLYPH_URI, STYLE_FILE, URI_BASE, URI_SCHEME, getContentType, getGlyphFilename, getResourceType, getSpriteFilename, getSpriteUri, getTileFilename, getTileUri, replaceVariables };
+export { FONTS_FOLDER, GLYPH_URI, SOURCES_FOLDER, STYLE_FILE, URI_BASE, URI_SCHEME, getContentType, getGlyphFilename, getResourceType, getSpriteFilename, getSpriteUri, getTileFilename, getTileUri, replaceVariables };

package/dist/utils/templates.d.ts

@@ -1,5 +1,5 @@
 import * as type_fest from 'type-fest';
-import { T as TileInfo, d as GlyphRange, c as TileFormat } from '../types-B4Xn1F9K.js';
+import { d as GlyphRange, T as TileInfo, c as TileFormat } from '../types-yLQy3AKR.js';
 import '@maplibre/maplibre-gl-style-spec';
 import 'geojson';
 import 'stream';
@@ -73,6 +73,8 @@ declare function replaceVariables(template: string, variables: Record<string, st
 declare const URI_SCHEME: "smp";
 declare const URI_BASE: string;
 declare const STYLE_FILE: "style.json";
+declare const SOURCES_FOLDER: "s";
+declare const FONTS_FOLDER: "fonts";
 declare const GLYPH_URI: string;
 
-export { GLYPH_URI, STYLE_FILE, URI_BASE, URI_SCHEME, getContentType, getGlyphFilename, getResourceType, getSpriteFilename, getSpriteUri, getTileFilename, getTileUri, replaceVariables };
+export { FONTS_FOLDER, GLYPH_URI, SOURCES_FOLDER, STYLE_FILE, URI_BASE, URI_SCHEME, getContentType, getGlyphFilename, getResourceType, getSpriteFilename, getSpriteUri, getTileFilename, getTileUri, replaceVariables };

package/dist/utils/templates.js

@@ -64,7 +64,9 @@ function replaceVariables(template, variables) {
   });
 }
 export {
+  FONTS_FOLDER,
   GLYPH_URI,
+  SOURCES_FOLDER,
   STYLE_FILE,
   URI_BASE,
   URI_SCHEME,

package/dist/writer.cjs

@@ -295,11 +295,12 @@ class Writer extends import_events.EventEmitter {
    * This method must be called to complete the archive.
    * You must wait for your destination write stream to 'finish' before using the output.
    */
-  finish() {
+  async finish() {
     this.#prepareStyle();
     const style = JSON.stringify(this.#style);
-    this.#append(style, { name: import_templates.STYLE_FILE });
-    this.#archive.finalize();
+    await this.#append(style, { name: import_templates.STYLE_FILE });
+    sortEntries(this.#archive);
+    await this.#archive.finalize();
   }
   /**
    * Mutates the style object to prepare it for writing to the archive.
@@ -394,6 +395,53 @@ function get2DBBox(bbox2) {
   if (bbox2.length === 4) return bbox2;
   return [bbox2[0], bbox2[1], bbox2[3], bbox2[4]];
 }
+function sortEntries(archive) {
+  const entries = (
+    /** @type {unknown} */
+    archive._module?.engine?._entries
+  );
+  if (!Array.isArray(entries)) {
+    throw new Error(
+      "Cannot find zip entries: check implementation changes in Archiver"
+    );
+  }
+  const sortedEntries = entries.sort(
+    /**
+     * @param {unknown} a
+     * @param {unknown} b
+     */
+    function(a, b) {
+      assertValidEntry(a);
+      assertValidEntry(b);
+      if (a.name === "style.json") return -1;
+      if (b.name === "style.json") return 1;
+      const foldersA = a.name.split("/");
+      const foldersB = b.name.split("/");
+      if (foldersA[0] === import_templates.FONTS_FOLDER && foldersA[2] === "0-255.pbf.gz")
+        return -1;
+      if (foldersB[0] === import_templates.FONTS_FOLDER && foldersB[2] === "0-255.pbf.gz")
+        return 1;
+      if (foldersA[0] === import_templates.SOURCES_FOLDER && foldersB[0] !== import_templates.SOURCES_FOLDER)
+        return -1;
+      if (foldersB[0] === import_templates.SOURCES_FOLDER && foldersA[0] !== import_templates.SOURCES_FOLDER)
+        return 1;
+      if (foldersA[0] === import_templates.SOURCES_FOLDER && foldersB[0] === import_templates.SOURCES_FOLDER) {
+        const zoomA = +foldersA[2];
+        const zoomB = +foldersB[2];
+        return zoomA - zoomB;
+      }
+      return 0;
+    }
+  );
+  archive._module.engine._entries = sortedEntries;
+}
+function assertValidEntry(maybeEntry) {
+  if (!maybeEntry || typeof maybeEntry !== "object" || !("name" in maybeEntry) || typeof maybeEntry.name !== "string") {
+    throw new Error(
+      "Unexpected zip entry type: check implementation changes in Archiver"
+    );
+  }
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   SUPPORTED_SOURCE_TYPES,

package/dist/writer.d.cts

@@ -1,4 +1,4 @@
-export { G as GlyphInfo, d as GlyphRange, e as SUPPORTED_SOURCE_TYPES, f as Source, h as SourceInfo, g as SourceInternal, c as TileFormat, T as TileInfo, W as Writer } from './types-B4Xn1F9K.cjs';
+export { G as GlyphInfo, d as GlyphRange, e as SUPPORTED_SOURCE_TYPES, f as Source, g as SourceInfo, h as SourceInternal, c as TileFormat, T as TileInfo, W as Writer, Z as ZipEntry } from './types-yLQy3AKR.cjs';
 import 'readable-stream';
 import 'stream';
 import 'events';

package/dist/writer.d.ts

@@ -1,4 +1,4 @@
-export { G as GlyphInfo, d as GlyphRange, e as SUPPORTED_SOURCE_TYPES, f as Source, h as SourceInfo, g as SourceInternal, c as TileFormat, T as TileInfo, W as Writer } from './types-B4Xn1F9K.js';
+export { G as GlyphInfo, d as GlyphRange, e as SUPPORTED_SOURCE_TYPES, f as Source, g as SourceInfo, h as SourceInternal, c as TileFormat, T as TileInfo, W as Writer, Z as ZipEntry } from './types-yLQy3AKR.js';
 import 'readable-stream';
 import 'stream';
 import 'events';