styled-map-package-api 5.0.0-pre.2 → 5.0.0-pre.4

package/package.json

@@ -1,112 +1,66 @@
 {
   "name": "styled-map-package-api",
-  "version": "5.0.0-pre.2",
+  "version": "5.0.0-pre.4",
   "description": "JavaScript API for reading, writing, and serving Styled Map Package (.smp) files",
   "type": "module",
-  "main": "./dist/index.cjs",
-  "module": "./dist/index.js",
+  "main": "./lib/index.js",
   "types": "./dist/index.d.ts",
   "exports": {
     ".": {
-      "import": {
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.js"
-      },
-      "require": {
-        "types": "./dist/index.d.cts",
-        "default": "./dist/index.cjs"
-      }
+      "types": "./dist/index.d.ts",
+      "default": "./lib/index.js"
     },
     "./reader": {
-      "import": {
-        "types": "./dist/reader.d.ts",
-        "default": "./dist/reader.js"
-      },
-      "require": {
-        "types": "./dist/reader.d.cts",
-        "default": "./dist/reader.cjs"
-      }
+      "types": "./dist/reader.d.ts",
+      "default": "./lib/reader.js"
     },
     "./writer": {
-      "import": {
-        "types": "./dist/writer.d.ts",
-        "default": "./dist/writer.js"
-      },
-      "require": {
-        "types": "./dist/writer.d.cts",
-        "default": "./dist/writer.cjs"
-      }
+      "types": "./dist/writer.d.ts",
+      "default": "./lib/writer.js"
     },
     "./server": {
-      "import": {
-        "types": "./dist/server.d.ts",
-        "default": "./dist/server.js"
-      },
-      "require": {
-        "types": "./dist/server.d.cts",
-        "default": "./dist/server.cjs"
-      }
+      "types": "./dist/server.d.ts",
+      "default": "./lib/server.js"
     },
     "./style-downloader": {
-      "import": {
-        "types": "./dist/style-downloader.d.ts",
-        "default": "./dist/style-downloader.js"
-      },
-      "require": {
-        "types": "./dist/style-downloader.d.cts",
-        "default": "./dist/style-downloader.cjs"
-      }
+      "types": "./dist/style-downloader.d.ts",
+      "default": "./lib/style-downloader.js"
     },
     "./tile-downloader": {
-      "import": {
-        "types": "./dist/tile-downloader.d.ts",
-        "default": "./dist/tile-downloader.js"
-      },
-      "require": {
-        "types": "./dist/tile-downloader.d.cts",
-        "default": "./dist/tile-downloader.cjs"
-      }
+      "types": "./dist/tile-downloader.d.ts",
+      "default": "./lib/tile-downloader.js"
     },
     "./download": {
-      "import": {
-        "types": "./dist/download.d.ts",
-        "default": "./dist/download.js"
-      },
-      "require": {
-        "types": "./dist/download.d.cts",
-        "default": "./dist/download.cjs"
-      }
+      "types": "./dist/download.d.ts",
+      "default": "./lib/download.js"
     },
     "./from-mbtiles": {
-      "import": {
-        "types": "./dist/from-mbtiles.d.ts",
-        "default": "./dist/from-mbtiles.js"
-      },
-      "require": {
-        "types": "./dist/from-mbtiles.d.cts",
-        "default": "./dist/from-mbtiles.cjs"
-      }
+      "types": "./dist/from-mbtiles.d.ts",
+      "default": "./lib/from-mbtiles.js"
+    },
+    "./fallbacks": {
+      "types": "./dist/fallbacks.d.ts",
+      "default": "./lib/fallbacks.js"
+    },
+    "./validator": {
+      "types": "./dist/validator.d.ts",
+      "default": "./lib/validator.js"
     },
     "./utils/mapbox": {
-      "import": {
-        "types": "./dist/utils/mapbox.d.ts",
-        "default": "./dist/utils/mapbox.js"
-      },
-      "require": {
-        "types": "./dist/utils/mapbox.d.cts",
-        "default": "./dist/utils/mapbox.cjs"
-      }
+      "types": "./dist/utils/mapbox.d.ts",
+      "default": "./lib/utils/mapbox.js"
     },
     "./package.json": "./package.json"
   },
   "files": [
+    "lib",
     "dist"
   ],
   "scripts": {
     "test": "npm run build && npm run types && vitest run",
     "test:watch": "vitest",
     "test:coverage": "vitest run --coverage",
-    "build": "tsup",
+    "build": "tsc -p tsconfig.build.json",
     "types": "tsc",
     "bench": "vitest bench --project node",
     "prepack": "npm run build"
@@ -143,14 +97,12 @@
     "@vitest/browser": "^3.2.4",
     "@vitest/coverage-v8": "^3.2.4",
     "@whatwg-node/server": "^0.10.17",
-    "esbuild-fix-imports-plugin": "^1.0.20",
     "execa": "^9.4.0",
     "fast-png": "^6.3.0",
     "pixel-stream": "^1.0.3",
     "playwright": "^1.50.1",
     "sharp": "^0.33.5",
     "tempy": "^3.1.0",
-    "tsup": "^8.4.0",
     "type-fest": "^4.35.0",
     "typescript": "^5.9.3",
     "vite": "^6.4.1",

package/dist/download.cjs

@@ -1,100 +0,0 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var download_exports = {};
-__export(download_exports, {
-  download: () => download
-});
-module.exports = __toCommonJS(download_exports);
-var import_style_downloader = require('./style-downloader.cjs');
-var import_streams = require('./utils/streams.cjs');
-var import_writer = require('./writer.cjs');
-function download({ bbox, maxzoom, styleUrl, onprogress, accessToken }) {
-  const downloader = new import_style_downloader.StyleDownloader(styleUrl, {
-    concurrency: 24,
-    mapboxAccessToken: accessToken
-  });
-  let start = Date.now();
-  let progress = {
-    tiles: { downloaded: 0, totalBytes: 0, total: 0, skipped: 0, done: false },
-    style: { done: false },
-    sprites: { downloaded: 0, done: false },
-    glyphs: { downloaded: 0, total: 0, totalBytes: 0, done: false },
-    output: { totalBytes: 0, done: false },
-    elapsedMs: 0
-  };
-  function handleProgress(update) {
-    progress = { ...progress, ...update, elapsedMs: Date.now() - start };
-    onprogress?.(progress);
-  }
-  const sizeCounter = new TransformStream({
-    transform(chunk, controller) {
-      handleProgress({
-        output: {
-          totalBytes: progress.output.totalBytes + chunk.byteLength,
-          done: false
-        }
-      });
-      controller.enqueue(chunk);
-    },
-    flush() {
-      handleProgress({ output: { ...progress.output, done: true } });
-    }
-  });
-  (async () => {
-    const style = await downloader.getStyle();
-    const writer = new import_writer.Writer(style);
-    handleProgress({ style: { done: true } });
-    writer.outputStream.pipeTo(sizeCounter.writable).catch(() => {
-    });
-    try {
-      for await (const spriteInfo of downloader.getSprites()) {
-        await writer.addSprite(spriteInfo);
-        handleProgress({
-          sprites: { downloaded: progress.sprites.downloaded + 1, done: false }
-        });
-      }
-      handleProgress({ sprites: { ...progress.sprites, done: true } });
-      const tiles = downloader.getTiles({
-        bounds: bbox,
-        maxzoom,
-        onprogress: (tileStats) => handleProgress({ tiles: { ...tileStats, done: false } })
-      });
-      await (0, import_streams.readableFromAsync)(tiles).pipeTo(
-        writer.createTileWriteStream({ concurrency: 24 })
-      );
-      handleProgress({ tiles: { ...progress.tiles, done: true } });
-      const glyphs = downloader.getGlyphs({
-        onprogress: (glyphStats) => handleProgress({ glyphs: { ...glyphStats, done: false } })
-      });
-      await (0, import_streams.readableFromAsync)(glyphs).pipeTo(writer.createGlyphWriteStream());
-      handleProgress({ glyphs: { ...progress.glyphs, done: true } });
-      writer.finish();
-    } catch (err) {
-      writer.abort(
-        /** @type {Error} */
-        err
-      );
-    }
-  })();
-  return sizeCounter.readable;
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  download
-});

package/dist/download.d.cts

@@ -1,63 +0,0 @@
-import { GlyphDownloadStats } from './style-downloader.cjs';
-import { TileDownloadStats } from './tile-downloader.cjs';
-import { D as DownloadStream } from './types-qfyJk4ot.cjs';
-import { BBox } from './utils/geo.cjs';
-import 'ky';
-import '@maplibre/maplibre-gl-style-spec';
-import './utils/fetch.cjs';
-import './utils/streams.cjs';
-import 'stream/web';
-import 'geojson';
-import 'type-fest';
-
-/**
- * @typedef {object} DownloadProgress
- * @property {import('./tile-downloader.js').TileDownloadStats & { done: boolean }} tiles
- * @property {{ done: boolean }} style
- * @property {{ downloaded: number, done: boolean }} sprites
- * @property {import('./style-downloader.js').GlyphDownloadStats & { done: boolean }} glyphs
- * @property {{ totalBytes: number, done: boolean }} output
- * @property {number} elapsedMs
- */
-/**
- * Download a map style and its resources for a given bounding box and max zoom
- * level. Returns a readable stream of a "styled map package", a zip file
- * containing all the resources needed to serve the style offline.
- *
- * @param {object} opts
- * @param {import("./utils/geo.js").BBox} opts.bbox Bounding box to download tiles for
- * @param {number} opts.maxzoom Max zoom level to download tiles for
- * @param {string} opts.styleUrl URL of the style to download
- * @param { (progress: DownloadProgress) => void } [opts.onprogress] Optional callback for reporting progress
- * @param {string} [opts.accessToken]
- * @returns {import('./types.js').DownloadStream} Readable stream of the output styled map file
- */
-declare function download({ bbox, maxzoom, styleUrl, onprogress, accessToken }: {
-    bbox: BBox;
-    maxzoom: number;
-    styleUrl: string;
-    onprogress?: ((progress: DownloadProgress) => void) | undefined;
-    accessToken?: string | undefined;
-}): DownloadStream;
-type DownloadProgress = {
-    tiles: TileDownloadStats & {
-        done: boolean;
-    };
-    style: {
-        done: boolean;
-    };
-    sprites: {
-        downloaded: number;
-        done: boolean;
-    };
-    glyphs: GlyphDownloadStats & {
-        done: boolean;
-    };
-    output: {
-        totalBytes: number;
-        done: boolean;
-    };
-    elapsedMs: number;
-};
-
-export { type DownloadProgress, download };

package/dist/download.js

@@ -1,76 +0,0 @@
-import { StyleDownloader } from "./style-downloader.js";
-import { readableFromAsync } from "./utils/streams.js";
-import { Writer } from "./writer.js";
-function download({ bbox, maxzoom, styleUrl, onprogress, accessToken }) {
-  const downloader = new StyleDownloader(styleUrl, {
-    concurrency: 24,
-    mapboxAccessToken: accessToken
-  });
-  let start = Date.now();
-  let progress = {
-    tiles: { downloaded: 0, totalBytes: 0, total: 0, skipped: 0, done: false },
-    style: { done: false },
-    sprites: { downloaded: 0, done: false },
-    glyphs: { downloaded: 0, total: 0, totalBytes: 0, done: false },
-    output: { totalBytes: 0, done: false },
-    elapsedMs: 0
-  };
-  function handleProgress(update) {
-    progress = { ...progress, ...update, elapsedMs: Date.now() - start };
-    onprogress?.(progress);
-  }
-  const sizeCounter = new TransformStream({
-    transform(chunk, controller) {
-      handleProgress({
-        output: {
-          totalBytes: progress.output.totalBytes + chunk.byteLength,
-          done: false
-        }
-      });
-      controller.enqueue(chunk);
-    },
-    flush() {
-      handleProgress({ output: { ...progress.output, done: true } });
-    }
-  });
-  (async () => {
-    const style = await downloader.getStyle();
-    const writer = new Writer(style);
-    handleProgress({ style: { done: true } });
-    writer.outputStream.pipeTo(sizeCounter.writable).catch(() => {
-    });
-    try {
-      for await (const spriteInfo of downloader.getSprites()) {
-        await writer.addSprite(spriteInfo);
-        handleProgress({
-          sprites: { downloaded: progress.sprites.downloaded + 1, done: false }
-        });
-      }
-      handleProgress({ sprites: { ...progress.sprites, done: true } });
-      const tiles = downloader.getTiles({
-        bounds: bbox,
-        maxzoom,
-        onprogress: (tileStats) => handleProgress({ tiles: { ...tileStats, done: false } })
-      });
-      await readableFromAsync(tiles).pipeTo(
-        writer.createTileWriteStream({ concurrency: 24 })
-      );
-      handleProgress({ tiles: { ...progress.tiles, done: true } });
-      const glyphs = downloader.getGlyphs({
-        onprogress: (glyphStats) => handleProgress({ glyphs: { ...glyphStats, done: false } })
-      });
-      await readableFromAsync(glyphs).pipeTo(writer.createGlyphWriteStream());
-      handleProgress({ glyphs: { ...progress.glyphs, done: true } });
-      writer.finish();
-    } catch (err) {
-      writer.abort(
-        /** @type {Error} */
-        err
-      );
-    }
-  })();
-  return sizeCounter.readable;
-}
-export {
-  download
-};

package/dist/from-mbtiles.cjs

@@ -1,108 +0,0 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var from_mbtiles_exports = {};
-__export(from_mbtiles_exports, {
-  fromMBTiles: () => fromMBTiles
-});
-module.exports = __toCommonJS(from_mbtiles_exports);
-var import_mbtiles_reader = require("mbtiles-reader");
-var import_streams = require('./utils/streams.cjs');
-var import_writer = require('./writer.cjs');
-const SOURCE_ID = "mbtiles-source";
-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");
-      }
-      const style = {
-        version: 8,
-        name: reader.metadata.name,
-        sources: {
-          [SOURCE_ID]: {
-            ...reader.metadata,
-            type: "raster"
-          }
-        },
-        layers: [
-          {
-            id: "background",
-            type: "background",
-            paint: {
-              "background-color": "white"
-            }
-          },
-          {
-            id: "raster",
-            type: "raster",
-            source: SOURCE_ID,
-            paint: {
-              "raster-opacity": 1
-            }
-          }
-        ]
-      };
-      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);
-      }
-    },
-    async cancel(reason) {
-      pipeAbort.abort(reason);
-      await conversionDone;
-      await /** @type {ReadableStreamDefaultReader<Uint8Array>} */
-      outputReader.cancel(reason).catch(() => {
-      });
-    }
-  });
-}
-async function* mbtilesToTileArgs(mbtiles) {
-  for (const { z, x, y, data, format } of mbtiles) {
-    yield [data, { z, x, y, format, sourceId: SOURCE_ID }];
-  }
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  fromMBTiles
-});

package/dist/from-mbtiles.d.cts

@@ -1,14 +0,0 @@
-/**
- * Convert a MBTiles file to a styled map package, returned as a web
- * ReadableStream. The async MBTiles.open() happens lazily inside the
- * stream's start(), so this function is synchronous.
- *
- * 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(source: string | ArrayBuffer | Uint8Array): ReadableStream<Uint8Array>;
-
-export { fromMBTiles };

package/dist/from-mbtiles.js

@@ -1,84 +0,0 @@
-import { MBTiles } from "mbtiles-reader";
-import { readableFromAsync } from "./utils/streams.js";
-import { Writer } from "./writer.js";
-const SOURCE_ID = "mbtiles-source";
-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");
-      }
-      const style = {
-        version: 8,
-        name: reader.metadata.name,
-        sources: {
-          [SOURCE_ID]: {
-            ...reader.metadata,
-            type: "raster"
-          }
-        },
-        layers: [
-          {
-            id: "background",
-            type: "background",
-            paint: {
-              "background-color": "white"
-            }
-          },
-          {
-            id: "raster",
-            type: "raster",
-            source: SOURCE_ID,
-            paint: {
-              "raster-opacity": 1
-            }
-          }
-        ]
-      };
-      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);
-      }
-    },
-    async cancel(reason) {
-      pipeAbort.abort(reason);
-      await conversionDone;
-      await /** @type {ReadableStreamDefaultReader<Uint8Array>} */
-      outputReader.cancel(reason).catch(() => {
-      });
-    }
-  });
-}
-async function* mbtilesToTileArgs(mbtiles) {
-  for (const { z, x, y, data, format } of mbtiles) {
-    yield [data, { z, x, y, format, sourceId: SOURCE_ID }];
-  }
-}
-export {
-  fromMBTiles
-};

package/dist/index.cjs

@@ -1,46 +0,0 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var index_exports = {};
-__export(index_exports, {
-  Reader: () => import_reader.Reader,
-  StyleDownloader: () => import_style_downloader.StyleDownloader,
-  Writer: () => import_writer.Writer,
-  createServer: () => import_server.createServer,
-  download: () => import_download.download,
-  downloadTiles: () => import_tile_downloader.downloadTiles,
-  fromMBTiles: () => import_from_mbtiles.fromMBTiles
-});
-module.exports = __toCommonJS(index_exports);
-var import_reader = require('./reader.cjs');
-var import_writer = require('./writer.cjs');
-var import_server = require('./server.cjs');
-var import_style_downloader = require('./style-downloader.cjs');
-var import_tile_downloader = require('./tile-downloader.cjs');
-var import_download = require('./download.cjs');
-var import_from_mbtiles = require('./from-mbtiles.cjs');
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  Reader,
-  StyleDownloader,
-  Writer,
-  createServer,
-  download,
-  downloadTiles,
-  fromMBTiles
-});

package/dist/index.d.cts

@@ -1,24 +0,0 @@
-import { S as SMPSource$1, a as SMPStyle$1 } from './types-qfyJk4ot.cjs';
-export { W as Writer } from './types-qfyJk4ot.cjs';
-export { Reader } from './reader.cjs';
-export { createServer } from './server.cjs';
-export { StyleDownloader } from './style-downloader.cjs';
-export { downloadTiles } from './tile-downloader.cjs';
-export { download } from './download.cjs';
-export { fromMBTiles } from './from-mbtiles.cjs';
-import '@maplibre/maplibre-gl-style-spec';
-import 'geojson';
-import 'type-fest';
-import '@gmaclennan/zip-reader';
-import 'itty-router';
-import 'itty-router/IttyRouter';
-import 'ky';
-import './utils/geo.cjs';
-import './utils/fetch.cjs';
-import './utils/streams.cjs';
-import 'stream/web';
-
-type SMPSource = SMPSource$1;
-type SMPStyle = SMPStyle$1;
-
-export type { SMPSource, SMPStyle };