@loaders.gl/pmtiles 4.3.2 → 4.4.0-alpha.1

package/dist/pmtiles-format.d.ts

@@ -0,0 +1,12 @@
+/**
+ * PMTiles
+ */
+export declare const PMTilesFormat: {
+    readonly name: "PMTiles";
+    readonly id: "pmtiles";
+    readonly module: "pmtiles";
+    readonly extensions: ["pmtiles"];
+    readonly mimeTypes: ["application/octet-stream"];
+    readonly tests: ["PMTiles"];
+};
+//# sourceMappingURL=pmtiles-format.d.ts.map

package/dist/pmtiles-format.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pmtiles-format.d.ts","sourceRoot":"","sources":["../src/pmtiles-format.ts"],"names":[],"mappings":"AAMA;;GAEG;AACH,eAAO,MAAM,aAAa;;;;;;;CAOC,CAAC"}

package/dist/pmtiles-format.js

@@ -0,0 +1,14 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+/**
+ * PMTiles
+ */
+export const PMTilesFormat = {
+    name: 'PMTiles',
+    id: 'pmtiles',
+    module: 'pmtiles',
+    extensions: ['pmtiles'],
+    mimeTypes: ['application/octet-stream'],
+    tests: ['PMTiles']
+};

package/dist/pmtiles-loader.d.ts

@@ -1,8 +1,8 @@
 import type { LoaderOptions, ReadableFile } from '@loaders.gl/loader-utils';
 import { VectorSourceInfo, ImageSourceInfo } from "./source-info.js";
-import { PMTilesTileSourceProps } from "./pmtiles-source.js";
+import { PMTilesSourceOptions } from "./pmtiles-source.js";
 export type PMTilesLoaderOptions = LoaderOptions & {
-    pmtiles?: PMTilesTileSourceProps['pmtiles'];
+    pmtiles?: PMTilesSourceOptions['pmtiles'];
 };
 /**
  * Loader for PMTiles metadata
@@ -10,18 +10,18 @@ export type PMTilesLoaderOptions = LoaderOptions & {
  * @note For actual access to the tile data, use the PMTilesSource class.
  */
 export declare const PMTilesLoader: {
-    readonly name: "PMTiles";
-    readonly id: "pmtiles";
-    readonly module: "pmtiles";
     readonly version: any;
-    readonly extensions: ["pmtiles"];
-    readonly mimeTypes: ["application/octet-stream"];
-    readonly tests: ["PMTiles"];
     readonly options: {
         readonly pmtiles: {};
     };
     readonly parse: (arrayBuffer: ArrayBuffer, options?: PMTilesLoaderOptions) => Promise<VectorSourceInfo | ImageSourceInfo>;
     readonly parseFile: typeof parseFileAsPMTiles;
+    readonly name: "PMTiles";
+    readonly id: "pmtiles";
+    readonly module: "pmtiles";
+    readonly extensions: ["pmtiles"];
+    readonly mimeTypes: ["application/octet-stream"];
+    readonly tests: ["PMTiles"];
 };
 declare function parseFileAsPMTiles(file: ReadableFile, options?: PMTilesLoaderOptions): Promise<VectorSourceInfo | ImageSourceInfo>;
 export {};

package/dist/pmtiles-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pmtiles-loader.d.ts","sourceRoot":"","sources":["../src/pmtiles-loader.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAmB,aAAa,EAAE,YAAY,EAAC,MAAM,0BAA0B,CAAC;AAI5F,OAAO,EAAC,gBAAgB,EAAE,eAAe,EAAC,yBAAsB;AAChE,OAAO,EAAoB,sBAAsB,EAAC,4BAAyB;AAE3E,MAAM,MAAM,oBAAoB,GAAG,aAAa,GAAG;IACjD,OAAO,CAAC,EAAE,sBAAsB,CAAC,SAAS,CAAC,CAAC;CAC7C,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,aAAa;;;;;;;;;;;kCAWG,WAAW,YAAY,oBAAoB;;CAOvE,CAAC;AAEF,iBAAe,kBAAkB,CAC/B,IAAI,EAAE,YAAY,EAClB,OAAO,CAAC,EAAE,oBAAoB,GAC7B,OAAO,CAAC,gBAAgB,GAAG,eAAe,CAAC,CAqB7C"}
+{"version":3,"file":"pmtiles-loader.d.ts","sourceRoot":"","sources":["../src/pmtiles-loader.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAmB,aAAa,EAAE,YAAY,EAAC,MAAM,0BAA0B,CAAC;AAI5F,OAAO,EAAC,gBAAgB,EAAE,eAAe,EAAC,yBAAsB;AAChE,OAAO,EAAoB,oBAAoB,EAAC,4BAAyB;AAGzE,MAAM,MAAM,oBAAoB,GAAG,aAAa,GAAG;IACjD,OAAO,CAAC,EAAE,oBAAoB,CAAC,SAAS,CAAC,CAAC;CAC3C,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,aAAa;;;;;kCAMG,WAAW,YAAY,oBAAoB;;;;;;;;CAOvE,CAAC;AAEF,iBAAe,kBAAkB,CAC/B,IAAI,EAAE,YAAY,EAClB,OAAO,CAAC,EAAE,oBAAoB,GAC7B,OAAO,CAAC,gBAAgB,GAAG,eAAe,CAAC,CAqB7C"}

package/dist/pmtiles-loader.js

@@ -4,19 +4,15 @@
 import { BlobFile } from '@loaders.gl/loader-utils';
 import { VERSION } from "./lib/version.js";
 import { PMTilesTileSource } from "./pmtiles-source.js";
+import { PMTilesFormat } from "./pmtiles-format.js";
 /**
  * Loader for PMTiles metadata
  * @note This loader is intended to allow PMTiles to be treated like other file types in top-level loading logic.
  * @note For actual access to the tile data, use the PMTilesSource class.
  */
 export const PMTilesLoader = {
-    name: 'PMTiles',
-    id: 'pmtiles',
-    module: 'pmtiles',
+    ...PMTilesFormat,
     version: VERSION,
-    extensions: ['pmtiles'],
-    mimeTypes: ['application/octet-stream'],
-    tests: ['PMTiles'],
     options: {
         pmtiles: {}
     },

package/dist/pmtiles-source.d.ts

@@ -1,47 +1,45 @@
 import type { Schema } from '@loaders.gl/schema';
 import type { VectorTileSource, GetTileParameters, GetTileDataParameters, ImageTileSource, ImageType } from '@loaders.gl/loader-utils';
-import { DataSource, DataSourceProps } from '@loaders.gl/loader-utils';
+import { DataSource, DataSourceOptions } from '@loaders.gl/loader-utils';
 import { ImageLoaderOptions } from '@loaders.gl/images';
 import { MVTLoaderOptions, TileJSONLoaderOptions } from '@loaders.gl/mvt';
 import * as pmtiles from 'pmtiles';
 import type { PMTilesMetadata } from "./lib/parse-pmtiles.js";
+export type PMTilesSourceOptions = DataSourceOptions & {
+    core?: DataSourceOptions['core'] & {
+        loadOptions?: TileJSONLoaderOptions & MVTLoaderOptions & ImageLoaderOptions;
+    };
+    pmtiles?: {};
+};
 /**
  * Creates vector tile data sources for PMTiles urls or blobs
  */
 export declare const PMTilesSource: {
-    readonly name: "PMTiles";
-    readonly id: "pmtiles";
-    readonly module: "pmtiles";
     readonly version: "1.0.0";
-    readonly extensions: ["pmtiles"];
-    readonly mimeTypes: ["application/octet-stream"];
-    readonly options: {
-        readonly url: never;
-        readonly pmtiles: {};
-    };
     readonly type: "pmtiles";
     readonly fromUrl: true;
     readonly fromBlob: true;
-    readonly testURL: (url: string) => boolean;
-    readonly createDataSource: (url: string | Blob, props: PMTilesTileSourceProps) => PMTilesTileSource;
-};
-export type PMTilesTileSourceProps = DataSourceProps & {
-    attributions?: string[];
-    pmtiles?: {
-        loadOptions?: TileJSONLoaderOptions & MVTLoaderOptions & ImageLoaderOptions;
+    readonly defaultOptions: {
+        readonly pmtiles: {};
     };
+    readonly testURL: (url: string) => boolean;
+    readonly createDataSource: (url: string | Blob, options: PMTilesSourceOptions) => PMTilesTileSource;
+    readonly name: "PMTiles";
+    readonly id: "pmtiles";
+    readonly module: "pmtiles";
+    readonly extensions: ["pmtiles"];
+    readonly mimeTypes: ["application/octet-stream"];
+    readonly tests: ["PMTiles"];
 };
 /**
  * A PMTiles data source
  * @note Can be either a raster or vector tile source depending on the contents of the PMTiles file.
  */
-export declare class PMTilesTileSource extends DataSource implements ImageTileSource, VectorTileSource {
-    data: string | Blob;
-    props: PMTilesTileSourceProps;
+export declare class PMTilesTileSource extends DataSource<string | Blob, PMTilesSourceOptions> implements ImageTileSource, VectorTileSource {
     mimeType: string | null;
     pmtiles: pmtiles.PMTiles;
     metadata: Promise<PMTilesMetadata>;
-    constructor(data: string | Blob, props: PMTilesTileSourceProps);
+    constructor(data: string | Blob, options: PMTilesSourceOptions);
     getSchema(): Promise<Schema>;
     getMetadata(): Promise<PMTilesMetadata>;
     getTile(tileParams: GetTileParameters): Promise<ArrayBuffer | null>;

package/dist/pmtiles-source.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pmtiles-source.d.ts","sourceRoot":"","sources":["../src/pmtiles-source.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,oBAAoB,CAAC;AAC/C,OAAO,KAAK,EAEV,gBAAgB,EAChB,iBAAiB,EACjB,qBAAqB,EACrB,eAAe,EACf,SAAS,EACV,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAC,UAAU,EAAE,eAAe,EAAc,MAAM,0BAA0B,CAAC;AAClF,OAAO,EAAc,kBAAkB,EAAC,MAAM,oBAAoB,CAAC;AACnE,OAAO,EAAY,gBAAgB,EAAE,qBAAqB,EAAC,MAAM,iBAAiB,CAAC;AAEnF,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AAGnC,OAAO,KAAK,EAAC,eAAe,EAAC,+BAA4B;AAMzD;;GAEG;AACH,eAAO,MAAM,aAAa;;;;;;;;;;;;;;4BAYT,MAAM;qCACG,MAAM,GAAG,IAAI,SAAS,sBAAsB;CAEA,CAAC;AAEvE,MAAM,MAAM,sBAAsB,GAAG,eAAe,GAAG;IACrD,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,OAAO,CAAC,EAAE;QACR,WAAW,CAAC,EAAE,qBAAqB,GAAG,gBAAgB,GAAG,kBAAkB,CAAC;KAE7E,CAAC;CACH,CAAC;AAEF;;;GAGG;AACH,qBAAa,iBAAkB,SAAQ,UAAW,YAAW,eAAe,EAAE,gBAAgB;IAC5F,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,KAAK,EAAE,sBAAsB,CAAC;IAC9B,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAQ;IAC/B,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC;IACzB,QAAQ,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;gBAEvB,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,KAAK,EAAE,sBAAsB;IAUxD,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC;IAI5B,WAAW,IAAI,OAAO,CAAC,eAAe,CAAC;IAoBvC,OAAO,CAAC,UAAU,EAAE,iBAAiB,GAAG,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC;IAcnE,WAAW,CAAC,UAAU,EAAE,qBAAqB,GAAG,OAAO,CAAC,GAAG,CAAC;IAa5D,YAAY,CAAC,UAAU,EAAE,iBAAiB,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC;IAOtE,aAAa,CAAC,UAAU,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;CAc5E"}
+{"version":3,"file":"pmtiles-source.d.ts","sourceRoot":"","sources":["../src/pmtiles-source.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,oBAAoB,CAAC;AAC/C,OAAO,KAAK,EAEV,gBAAgB,EAChB,iBAAiB,EACjB,qBAAqB,EACrB,eAAe,EACf,SAAS,EACV,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAC,UAAU,EAAE,iBAAiB,EAAc,MAAM,0BAA0B,CAAC;AACpF,OAAO,EAAc,kBAAkB,EAAC,MAAM,oBAAoB,CAAC;AACnE,OAAO,EAAY,gBAAgB,EAAE,qBAAqB,EAAC,MAAM,iBAAiB,CAAC;AAGnF,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AAGnC,OAAO,KAAK,EAAC,eAAe,EAAC,+BAA4B;AAMzD,MAAM,MAAM,oBAAoB,GAAG,iBAAiB,GAAG;IACrD,IAAI,CAAC,EAAE,iBAAiB,CAAC,MAAM,CAAC,GAAG;QACjC,WAAW,CAAC,EAAE,qBAAqB,GAAG,gBAAgB,GAAG,kBAAkB,CAAC;KAC7E,CAAC;IACF,OAAO,CAAC,EAAE,EAAE,CAAC;CACd,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,aAAa;;;;;;;;4BAWT,MAAM;qCACG,MAAM,GAAG,IAAI,WAAW,oBAAoB;;;;;;;CAExB,CAAC;AAE/C;;;GAGG;AACH,qBAAa,iBACX,SAAQ,UAAU,CAAC,MAAM,GAAG,IAAI,EAAE,oBAAoB,CACtD,YAAW,eAAe,EAAE,gBAAgB;IAE5C,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAQ;IAC/B,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC;IACzB,QAAQ,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;gBAEvB,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,OAAO,EAAE,oBAAoB;IASxD,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC;IAI5B,WAAW,IAAI,OAAO,CAAC,eAAe,CAAC;IAuBvC,OAAO,CAAC,UAAU,EAAE,iBAAiB,GAAG,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC;IAcnE,WAAW,CAAC,UAAU,EAAE,qBAAqB,GAAG,OAAO,CAAC,GAAG,CAAC;IAa5D,YAAY,CAAC,UAAU,EAAE,iBAAiB,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC;IAOtE,aAAa,CAAC,UAAU,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;CAc5E"}

package/dist/pmtiles-source.js

@@ -4,6 +4,7 @@
 import { DataSource, resolvePath } from '@loaders.gl/loader-utils';
 import { ImageLoader } from '@loaders.gl/images';
 import { MVTLoader } from '@loaders.gl/mvt';
+import { PMTilesFormat } from "./pmtiles-format.js";
 import * as pmtiles from 'pmtiles';
 const { PMTiles } = pmtiles;
 import { parsePMTilesHeader } from "./lib/parse-pmtiles.js";
@@ -13,35 +14,29 @@ const VERSION = '1.0.0';
  * Creates vector tile data sources for PMTiles urls or blobs
  */
 export const PMTilesSource = {
-    name: 'PMTiles',
-    id: 'pmtiles',
-    module: 'pmtiles',
+    ...PMTilesFormat,
     version: VERSION,
-    extensions: ['pmtiles'],
-    mimeTypes: ['application/octet-stream'],
-    options: { url: undefined, pmtiles: {} },
     type: 'pmtiles',
     fromUrl: true,
     fromBlob: true,
+    defaultOptions: {
+        pmtiles: {}
+    },
     testURL: (url) => url.endsWith('.pmtiles'),
-    createDataSource: (url, props) => new PMTilesTileSource(url, props)
+    createDataSource: (url, options) => new PMTilesTileSource(url, options)
 };
 /**
  * A PMTiles data source
  * @note Can be either a raster or vector tile source depending on the contents of the PMTiles file.
  */
 export class PMTilesTileSource extends DataSource {
-    data;
-    props;
     mimeType = null;
     pmtiles;
     metadata;
-    constructor(data, props) {
-        super(props);
-        this.props = props;
-        const url = typeof data === 'string' ? resolvePath(data) : new BlobSource(data, 'pmtiles');
-        this.data = data;
-        this.pmtiles = new PMTiles(url);
+    constructor(data, options) {
+        super(data, options, PMTilesSource.defaultOptions);
+        const urlOrBlob = typeof data === 'string' ? resolvePath(data) : new BlobSource(data, 'pmtiles');
+        this.pmtiles = new PMTiles(urlOrBlob);
         this.getTileData = this.getTileData.bind(this);
         this.metadata = this.getMetadata();
     }
@@ -53,8 +48,11 @@ export class PMTilesTileSource extends DataSource {
         const pmtilesMetadata = (await this.pmtiles.getMetadata()) || {};
         const metadata = parsePMTilesHeader(pmtilesHeader, pmtilesMetadata, { includeFormatHeader: false }, this.loadOptions);
         // Add additional attribution if necessary
-        if (this.props.attributions) {
-            metadata.attributions = [...this.props.attributions, ...(metadata.attributions || [])];
+        if (this.options.attributions) {
+            metadata.attributions = [
+                ...(this.options.core?.attributions || []),
+                ...(metadata.attributions || [])
+            ];
         }
         if (metadata?.tileMIMEType) {
             this.mimeType = metadata?.tileMIMEType;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/pmtiles",
-  "version": "4.3.2",
+  "version": "4.4.0-alpha.1",
   "description": "Framework-independent loader for the pmtiles format",
   "license": "MIT",
   "type": "module",
@@ -46,14 +46,14 @@
     "build-bundle-dev": "ocular-bundle ./bundle.ts --env=dev --output=dist/dist.dev.js"
   },
   "dependencies": {
-    "@loaders.gl/images": "4.3.2",
-    "@loaders.gl/loader-utils": "4.3.2",
-    "@loaders.gl/mvt": "4.3.2",
-    "@loaders.gl/schema": "4.3.2",
+    "@loaders.gl/images": "4.4.0-alpha.1",
+    "@loaders.gl/loader-utils": "4.4.0-alpha.1",
+    "@loaders.gl/mvt": "4.4.0-alpha.1",
+    "@loaders.gl/schema": "4.4.0-alpha.1",
     "pmtiles": "^3.0.4"
   },
   "peerDependencies": {
-    "@loaders.gl/core": "^4.3.0"
+    "@loaders.gl/core": "4.4.0-alpha.0"
   },
-  "gitHead": "b4203b8703f64a38d6f79a3113bc7bb51d45c93a"
+  "gitHead": "f1732de45907bd500bf4eedb4803beca8bf4bfb0"
 }

package/src/index.ts

@@ -5,7 +5,7 @@
 export {PMTilesSource} from './pmtiles-source';
 
 export type {PMTilesMetadata} from './lib/parse-pmtiles';
-export type {PMTilesTileSourceProps} from './pmtiles-source';
+export type {PMTilesSourceOptions} from './pmtiles-source';
 export {PMTilesTileSource} from './pmtiles-source';
 
 export {PMTilesLoader as _PMTilesLoader} from './pmtiles-loader';

package/src/pmtiles-format.ts

@@ -0,0 +1,17 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
+import type {Format} from '@loaders.gl/loader-utils';
+
+/**
+ * PMTiles
+ */
+export const PMTilesFormat = {
+  name: 'PMTiles',
+  id: 'pmtiles',
+  module: 'pmtiles',
+  extensions: ['pmtiles'],
+  mimeTypes: ['application/octet-stream'],
+  tests: ['PMTiles']
+} as const satisfies Format;

package/src/pmtiles-loader.ts

@@ -7,10 +7,11 @@ import {BlobFile} from '@loaders.gl/loader-utils';
 import {VERSION} from './lib/version';
 
 import {VectorSourceInfo, ImageSourceInfo} from './source-info';
-import {PMTilesTileSource, PMTilesTileSourceProps} from './pmtiles-source';
+import {PMTilesTileSource, PMTilesSourceOptions} from './pmtiles-source';
+import {PMTilesFormat} from './pmtiles-format';
 
 export type PMTilesLoaderOptions = LoaderOptions & {
-  pmtiles?: PMTilesTileSourceProps['pmtiles'];
+  pmtiles?: PMTilesSourceOptions['pmtiles'];
 };
 
 /**
@@ -19,13 +20,8 @@ export type PMTilesLoaderOptions = LoaderOptions & {
  * @note For actual access to the tile data, use the PMTilesSource class.
  */
 export const PMTilesLoader = {
-  name: 'PMTiles',
-  id: 'pmtiles',
-  module: 'pmtiles',
+  ...PMTilesFormat,
   version: VERSION,
-  extensions: ['pmtiles'],
-  mimeTypes: ['application/octet-stream'],
-  tests: ['PMTiles'],
   options: {
     pmtiles: {}
   },

package/src/pmtiles-source.ts

@@ -11,9 +11,10 @@ import type {
   ImageTileSource,
   ImageType
 } from '@loaders.gl/loader-utils';
-import {DataSource, DataSourceProps, resolvePath} from '@loaders.gl/loader-utils';
+import {DataSource, DataSourceOptions, resolvePath} from '@loaders.gl/loader-utils';
 import {ImageLoader, ImageLoaderOptions} from '@loaders.gl/images';
 import {MVTLoader, MVTLoaderOptions, TileJSONLoaderOptions} from '@loaders.gl/mvt';
+import {PMTilesFormat} from './pmtiles-format';
 
 import * as pmtiles from 'pmtiles';
 const {PMTiles} = pmtiles;
@@ -24,51 +25,49 @@ import {BlobSource} from './lib/blob-source';
 
 const VERSION = '1.0.0';
 
+export type PMTilesSourceOptions = DataSourceOptions & {
+  core?: DataSourceOptions['core'] & {
+    loadOptions?: TileJSONLoaderOptions & MVTLoaderOptions & ImageLoaderOptions;
+  };
+  pmtiles?: {};
+};
+
 /**
  * Creates vector tile data sources for PMTiles urls or blobs
  */
 export const PMTilesSource = {
-  name: 'PMTiles',
-  id: 'pmtiles',
-  module: 'pmtiles',
+  ...PMTilesFormat,
   version: VERSION,
-  extensions: ['pmtiles'],
-  mimeTypes: ['application/octet-stream'],
-  options: {url: undefined!, pmtiles: {}},
   type: 'pmtiles',
   fromUrl: true,
   fromBlob: true,
 
-  testURL: (url: string) => url.endsWith('.pmtiles'),
-  createDataSource: (url: string | Blob, props: PMTilesTileSourceProps) =>
-    new PMTilesTileSource(url, props)
-} as const satisfies Source<PMTilesTileSource, PMTilesTileSourceProps>;
+  defaultOptions: {
+    pmtiles: {}
+  },
 
-export type PMTilesTileSourceProps = DataSourceProps & {
-  attributions?: string[];
-  pmtiles?: {
-    loadOptions?: TileJSONLoaderOptions & MVTLoaderOptions & ImageLoaderOptions;
-    // TODO - add options here
-  };
-};
+  testURL: (url: string) => url.endsWith('.pmtiles'),
+  createDataSource: (url: string | Blob, options: PMTilesSourceOptions) =>
+    new PMTilesTileSource(url, options)
+} as const satisfies Source<PMTilesTileSource>;
 
 /**
  * A PMTiles data source
  * @note Can be either a raster or vector tile source depending on the contents of the PMTiles file.
  */
-export class PMTilesTileSource extends DataSource implements ImageTileSource, VectorTileSource {
-  data: string | Blob;
-  props: PMTilesTileSourceProps;
+export class PMTilesTileSource
+  extends DataSource<string | Blob, PMTilesSourceOptions>
+  implements ImageTileSource, VectorTileSource
+{
   mimeType: string | null = null;
   pmtiles: pmtiles.PMTiles;
   metadata: Promise<PMTilesMetadata>;
 
-  constructor(data: string | Blob, props: PMTilesTileSourceProps) {
-    super(props);
-    this.props = props;
-    const url = typeof data === 'string' ? resolvePath(data) : new BlobSource(data, 'pmtiles');
-    this.data = data;
-    this.pmtiles = new PMTiles(url);
+  constructor(data: string | Blob, options: PMTilesSourceOptions) {
+    super(data, options, PMTilesSource.defaultOptions);
+    const urlOrBlob =
+      typeof data === 'string' ? resolvePath(data) : new BlobSource(data, 'pmtiles');
+    this.pmtiles = new PMTiles(urlOrBlob);
     this.getTileData = this.getTileData.bind(this);
     this.metadata = this.getMetadata();
   }
@@ -87,8 +86,11 @@ export class PMTilesTileSource extends DataSource implements ImageTileSource, Ve
       this.loadOptions
     );
     // Add additional attribution if necessary
-    if (this.props.attributions) {
-      metadata.attributions = [...this.props.attributions, ...(metadata.attributions || [])];
+    if (this.options.attributions) {
+      metadata.attributions = [
+        ...(this.options.core?.attributions || []),
+        ...(metadata.attributions || [])
+      ];
     }
     if (metadata?.tileMIMEType) {
       this.mimeType = metadata?.tileMIMEType;