@loaders.gl/loader-utils 4.3.2 → 4.4.0-alpha.1

package/dist/writer-types.d.ts

@@ -1,3 +1,4 @@
+import type { Format } from "./format-types.js";
 /** Options for writers */
 export type WriterOptions = {
     /** worker source. If is set will be used instead of loading worker from the Internet */
@@ -12,21 +13,23 @@ export type WriterOptions = {
 /**
  * A writer definition that can be used with `@loaders.gl/core` functions
  */
-export type Writer<DataT = unknown, BatchT = unknown, WriterOptionsT = WriterOptions> = {
+export type Writer<DataT = unknown, BatchT = unknown, WriterOptionsT = WriterOptions> = Format & {
     /** The result type of this loader  */
     dataType?: DataT;
     /** The batched result type of this loader  */
     batchType?: BatchT;
+    /** Version should be injected by build tools */
+    version: string;
+    /** A boolean, or a URL */
+    worker?: string | boolean;
+    options: WriterOptionsT;
+    deprecatedOptions?: Record<string, string>;
     /** Human readable name */
     name: string;
     /** id should be the same as the field used in LoaderOptions */
     id: string;
     /** module is used to generate worker threads, need to be the module directory name */
     module: string;
-    /** Version should be injected by build tools */
-    version: string;
-    /** A boolean, or a URL */
-    worker?: string | boolean;
     /** Which category does this loader belong to */
     category?: string;
     /** File extensions that are potential matches with this loader. */
@@ -37,9 +40,6 @@ export type Writer<DataT = unknown, BatchT = unknown, WriterOptionsT = WriterOpt
     binary?: boolean;
     /** Is the input of this loader text */
     text?: boolean;
-    /** Default options for this writer */
-    options: WriterOptionsT;
-    deprecatedOptions?: Record<string, string>;
 };
 /**
  * A writer definition that can be used with `@loaders.gl/core` functions

package/dist/writer-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"writer-types.d.ts","sourceRoot":"","sources":["../src/writer-types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"writer-types.d.ts","sourceRoot":"","sources":["../src/writer-types.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,MAAM,EAAC,0BAAuB;AAI3C,0BAA0B;AAC1B,MAAM,MAAM,aAAa,GAAG;IAC1B,wFAAwF;IACxF,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAIvB,kCAAkC;IAClC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,4GAA4G;IAC5G,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAE5B,8BAA8B;IAC9B,CAAC,QAAQ,EAAE,MAAM,GAAG,GAAG,CAAC;CACzB,CAAC;AAEF;;GAEG;AAEH,MAAM,MAAM,MAAM,CAAC,KAAK,GAAG,OAAO,EAAE,MAAM,GAAG,OAAO,EAAE,cAAc,GAAG,aAAa,IAAI,MAAM,GAAG;IAC/F,sCAAsC;IACtC,QAAQ,CAAC,EAAE,KAAK,CAAC;IACjB,8CAA8C;IAC9C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gDAAgD;IAChD,OAAO,EAAE,MAAM,CAAC;IAChB,0BAA0B;IAC1B,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAE1B,OAAO,EAAE,cAAc,CAAC;IACxB,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAE3C,0BAA0B;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,+DAA+D;IAC/D,EAAE,EAAE,MAAM,CAAC;IACX,sFAAsF;IACtF,MAAM,EAAE,MAAM,CAAC;IACf,gDAAgD;IAChD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,mEAAmE;IACnE,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,uHAAuH;IACvH,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,yCAAyC;IACzC,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,uCAAuC;IACvC,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,iBAAiB,CAC3B,KAAK,GAAG,OAAO,EACf,MAAM,GAAG,OAAO,EAChB,cAAc,GAAG,aAAa,IAC5B,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,CAAC,GAAG;IAC1C,wCAAwC;IACxC,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IACpE,sCAAsC;IACtC,UAAU,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,WAAW,CAAC;IAChE,kCAAkC;IAClC,eAAe,CAAC,CAAC,IAAI,EAAE,aAAa,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,aAAa,CAAC,WAAW,CAAC,CAAC;IAEjG,wDAAwD;IACxD,UAAU,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACrE,uDAAuD;IACvD,cAAc,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,MAAM,CAAC;IAChE,mDAAmD;IACnD,mBAAmB,CAAC,CAClB,IAAI,EAAE,aAAa,CAAC,GAAG,CAAC,EACxB,OAAO,CAAC,EAAE,cAAc,GACvB,aAAa,CAAC,WAAW,CAAC,CAAC;IAE9B,cAAc,CAAC,EAAE,CACf,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE,cAAc,KACrB,OAAO,CAAC,MAAM,CAAC,CAAC;CACtB,CAAC;AAEF,8EAA8E;AAC9E,MAAM,MAAM,iBAAiB,CAAC,CAAC,GAAG,MAAM,IACtC,CAAC,SAAS,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC,GAAG,WAAW,GAAG,KAAK,CAAC;AAC9E,sEAAsE;AACtE,MAAM,MAAM,cAAc,CAAC,CAAC,GAAG,MAAM,IACnC,CAAC,SAAS,MAAM,CAAC,MAAM,QAAQ,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,QAAQ,GAAG,KAAK,CAAC;AAChE,MAAM,MAAM,eAAe,CAAC,CAAC,GAAG,MAAM,IACpC,CAAC,SAAS,MAAM,CAAC,GAAG,EAAE,MAAM,SAAS,EAAE,GAAG,CAAC,GAAG,SAAS,GAAG,KAAK,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/loader-utils",
-  "version": "4.3.2",
+  "version": "4.4.0-alpha.1",
   "description": "Framework-independent loaders for 3D graphics formats",
   "license": "MIT",
   "type": "module",
@@ -45,13 +45,10 @@
     "stream": false
   },
   "dependencies": {
-    "@loaders.gl/schema": "4.3.2",
-    "@loaders.gl/worker-utils": "4.3.2",
+    "@loaders.gl/schema": "4.4.0-alpha.1",
+    "@loaders.gl/worker-utils": "4.4.0-alpha.1",
     "@probe.gl/log": "^4.0.2",
     "@probe.gl/stats": "^4.0.2"
   },
-  "peerDependencies": {
-    "@loaders.gl/core": "^4.3.0"
-  },
-  "gitHead": "b4203b8703f64a38d6f79a3113bc7bb51d45c93a"
+  "gitHead": "f1732de45907bd500bf4eedb4803beca8bf4bfb0"
 }

package/src/format-types.ts

@@ -0,0 +1,27 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
+/**
+ * An object that describes a format
+ */
+export type Format = {
+  /** Human readable name */
+  name: string;
+  /** Unique lower-case id string for this format. Used for e.g. LoaderOptions */
+  id: string;
+  /** loaders.gl module that contains the implementation of this format */
+  module: string;
+  /** Which category does this loader belong to */
+  category?: string;
+  /** File extensions that are potential matches with this loader. */
+  extensions: string[];
+  /** MIMETypes that indicate a match with this loader. @note Some MIMETypes are generic and supported by many loaders */
+  mimeTypes: string[];
+  /** Is this a binary format */
+  binary?: boolean;
+  /** Is this a text format */
+  text?: boolean;
+  /** Test some initial bytes of content to see if this loader might be a match */
+  tests?: (((ArrayBuffer: ArrayBuffer) => boolean) | ArrayBuffer | string)[];
+};

package/src/index.ts

@@ -20,6 +20,10 @@ export type {
   FetchLike
 } from './types';
 
+// formats
+
+export type {Format} from './format-types';
+
 // loaders
 
 export type {
@@ -63,7 +67,10 @@ export {
 export {log} from './lib/log-utils/log';
 
 // Options and modules
-export {mergeLoaderOptions} from './lib/option-utils/merge-loader-options';
+export type {RequiredOptions} from './lib/option-utils/merge-options';
+export {mergeOptions, getRequiredOptions} from './lib/option-utils/merge-options';
+
+// Modules (external libraries)
 export {registerJSModules} from './lib/module-utils/js-module-utils';
 export {checkJSModule, getJSModule, getJSModuleOrNull} from './lib/module-utils/js-module-utils';
 
@@ -150,25 +157,25 @@ export {FileHandleFile} from './lib/file-provider/file-handle-file';
 export {DataViewFile} from './lib/file-provider/data-view-file';
 
 // EXPERIMENTAL: DATA SOURCES
-export type {Source} from './source-types';
+export type {Source, SourceArrayOptionsType, SourceArrayDataSourceType} from './source-types';
 
-export type {DataSourceProps} from './lib/sources/data-source';
+export type {DataSourceOptions} from './lib/sources/data-source';
 export {DataSource} from './lib/sources/data-source';
 
 export {ImageSource} from './lib/sources/image-source';
 export type {ImageType} from './lib/sources/utils/image-type';
-export type {ImageSourceProps, ImageSourceMetadata} from './lib/sources/image-source';
+export type {ImageSourceMetadata} from './lib/sources/image-source';
 export type {GetImageParameters} from './lib/sources/image-source';
 
-export {VectorSource} from './lib/sources/vector-source';
-export type {VectorSourceProps, VectorSourceMetadata} from './lib/sources/vector-source';
+export type {VectorSource} from './lib/sources/vector-source';
+export type {VectorSourceMetadata} from './lib/sources/vector-source';
 export type {GetFeaturesParameters} from './lib/sources/vector-source';
 
-export type {TileSource, TileSourceProps} from './lib/sources/tile-source';
+export type {TileSource} from './lib/sources/tile-source';
 export type {TileSourceMetadata, GetTileParameters} from './lib/sources/tile-source';
 export type {GetTileDataParameters} from './lib/sources/tile-source';
 
 export type {ImageTileSource} from './lib/sources/image-tile-source';
 
-export type {VectorTileSource, VectorTileSourceProps} from './lib/sources/vector-tile-source';
+export type {VectorTileSource} from './lib/sources/vector-tile-source';
 export type {VectorTile} from './lib/sources/vector-tile-source';

package/src/lib/files/blob-file.ts

@@ -30,8 +30,10 @@ export class BlobFile implements ReadableFile {
     };
   }
 
-  async read(start: number, length: number): Promise<ArrayBuffer> {
-    const arrayBuffer = await this.handle.slice(start, start + length).arrayBuffer();
+  async read(start?: number | bigint, length?: number): Promise<ArrayBuffer> {
+    const arrayBuffer = await this.handle
+      .slice(Number(start), Number(start) + Number(length))
+      .arrayBuffer();
     return arrayBuffer;
   }
 }

package/src/lib/files/http-file.ts

@@ -30,7 +30,7 @@ export class HttpFile implements ReadableFile {
     };
   }
 
-  async read(offset: number | bigint, length: number): Promise<ArrayBuffer> {
+  async read(offset: number | bigint = 0, length: number = 0): Promise<ArrayBuffer> {
     const response = await this.fetchRange(offset, length);
     const arrayBuffer = await response.arrayBuffer();
     return arrayBuffer;

package/src/lib/files/node-file-facade.ts

@@ -25,7 +25,7 @@ export class NodeFileFacade implements ReadableFile, WritableFile {
     throw new Error('Can\'t instantiate NodeFile. Make sure to import @loaders.gl/polyfills first.');
   }
   /** Read data */
-  async read(start?: number | bigint, end?: number | bigint): Promise<ArrayBuffer> {
+  async read(start?: number | bigint, length?: number): Promise<ArrayBuffer> {
     throw NOT_IMPLEMENTED;
   }
   /** Write to file. The number of bytes written will be returned */

package/src/lib/option-utils/{merge-loader-options.ts → merge-options.ts}

@@ -2,7 +2,11 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {LoaderOptions} from '../../loader-types';
+export type RequiredOptions<T> = Required<{[K in keyof T]: Required<T[K]>}>;
+
+export function getRequiredOptions<T>(options: T): RequiredOptions<T> {
+  return options as RequiredOptions<T>;
+}
 
 /**
  *
@@ -10,11 +14,11 @@ import {LoaderOptions} from '../../loader-types';
  * @param newOptions
  * @returns
  */
-export function mergeLoaderOptions<Options extends LoaderOptions>(
-  baseOptions: Options | undefined,
-  newOptions: Options
-): Options {
-  return mergeOptionsRecursively(baseOptions || {}, newOptions) as Options;
+export function mergeOptions<OptionsT extends Record<string, unknown>>(
+  baseOptions: OptionsT | undefined,
+  newOptions: OptionsT
+): OptionsT {
+  return mergeOptionsRecursively(baseOptions || {}, newOptions) as OptionsT;
 }
 
 function mergeOptionsRecursively(

package/src/lib/sources/data-source.ts

@@ -2,34 +2,68 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import type {LoaderOptions} from '@loaders.gl/loader-utils';
+import type {LoaderOptions, Loader} from '../../loader-types';
+import type {RequiredOptions} from '../option-utils/merge-options';
+import {mergeOptions} from '../option-utils/merge-options';
+import {resolvePath} from '../path-utils/file-aliases';
 
 /** Common properties for all data sources */
-export type DataSourceProps = {
-  url?: string | Blob;
-  /** LoaderOptions provide an option to override `fetch`. Will also be passed to any sub loaders */
-  loadOptions?: LoaderOptions;
-};
+export type DataSourceOptions = Partial<{
+  core: {
+    /** Allows application to specify which source should be selected. Matches `Source.type`. Defaults to 'auto' */
+    type?: string;
+    /** Any dataset attributions (in case underlying metadata does not include attributions) */
+    attributions?: string[];
+    /** LoaderOptions provide an option to override `fetch`. Will also be passed to any sub loaders */
+    loadOptions?: LoaderOptions;
+    /** Make additional loaders available to the data source */
+    loaders?: Loader[];
+  };
+  [key: string]: Record<string, unknown>;
+}>;
 
 /** base class of all data sources */
-export abstract class DataSource<PropsT extends DataSourceProps = DataSourceProps> {
-  abstract data: unknown;
-  /** A resolved fetch function extracted from loadOptions prop */
-  fetch: (url: string, options?: RequestInit) => Promise<Response>;
+export abstract class DataSource<DataT, OptionsT extends DataSourceOptions> {
+  static defaultOptions: Required<DataSourceOptions> = {
+    core: {
+      type: 'auto',
+      attributions: [],
+      loadOptions: {},
+      loaders: []
+    }
+  };
+
+  optionsType?: OptionsT & DataSourceOptions;
+  options: Required<OptionsT & DataSourceOptions>;
+  readonly data: DataT;
+  readonly url: string;
+
   /** The actual load options, if calling a loaders.gl loader */
   loadOptions: LoaderOptions;
+  /** A resolved fetch function extracted from loadOptions prop */
+  fetch: (url: string, options?: RequestInit) => Promise<Response>;
   _needsRefresh: boolean = true;
 
-  props: PropsT;
-
-  constructor(props: PropsT) {
-    this.props = {...props};
-    this.loadOptions = {...props.loadOptions};
+  constructor(
+    data: DataT,
+    options: OptionsT,
+    defaultOptions?: Omit<RequiredOptions<OptionsT>, 'core'>
+  ) {
+    if (defaultOptions) {
+      // @ts-expect-error Typescript gets confused
+      this.options = mergeOptions({...defaultOptions, core: DataSource.defaultOptions}, options);
+    } else {
+      // @ts-expect-error
+      this.options = {...options};
+    }
+    this.data = data;
+    this.url = typeof data === 'string' ? resolvePath(data) : '';
+    this.loadOptions = {...this.options.core?.loadOptions};
     this.fetch = getFetchFunction(this.loadOptions);
   }
 
-  setProps(props: PropsT) {
-    this.props = Object.assign(this.props, props);
+  setProps(options: OptionsT) {
+    this.options = Object.assign(this.options, options);
     // TODO - add a shallow compare to avoid setting refresh if no change?
     this.setNeedsRefresh();
   }

package/src/lib/sources/image-source.ts

@@ -2,19 +2,14 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import type {DataSourceProps} from './data-source';
-import {DataSource} from './data-source';
 // TODO - can we import from schema?
 import {ImageType} from './utils/image-type';
-
-export type ImageSourceProps = DataSourceProps;
+// TODO - remove (this breaks WMS layer)
 
 /**
  * ImageSource - data sources that allow images to be queried by (geospatial) extents
  */
-export abstract class ImageSource<
-  PropsT extends ImageSourceProps = ImageSourceProps
-> extends DataSource<PropsT> {
+export abstract class ImageSource {
   static type: string = 'template';
   static testURL = (url: string): boolean => false;
 

package/src/lib/sources/image-tile-source.ts

@@ -16,9 +16,7 @@ export type ImageTileSourceProps = TileSourceProps;
  * MapTileSource - data sources that allow data to be queried by (geospatial) tile
  * @note If geospatial, bounding box is expected to be in web mercator coordinates
  */
-export interface ImageTileSource<
-  PropsT extends TileSourceProps = TileSourceProps,
-  MetadataT extends TileSourceMetadata = TileSourceMetadata
-> extends TileSource<PropsT, MetadataT> {
+export interface ImageTileSource extends TileSource {
+  getMetadata(): Promise<TileSourceMetadata>;
   getImageTile(parameters: GetTileParameters): Promise<ImageType | null>;
 }

package/src/lib/sources/tile-source-adapter.ts

@@ -9,12 +9,12 @@ import {ImageSource, ImageSourceMetadata} from './image-source';
  * @note
  * - If geospatial, bounding box is expected to be in web mercator coordinates
  */
-// @ts-expect-error TODO - does not implement all DataSource members
-export class TileSourceAdapter implements TileSource<ImageSourceMetadata> {
-  readonly viewportSource: ImageSource;
-  constructor(source: ImageSource) {
+export class TileSourceAdapter<ImageSourceT extends ImageSource> implements TileSource {
+  readonly viewportSource: ImageSourceT;
+  constructor(source: ImageSourceT) {
     this.viewportSource = source;
   }
+
   async getMetadata(): Promise<ImageSourceMetadata> {
     return await this.viewportSource.getMetadata();
   }

package/src/lib/sources/tile-source.ts

@@ -2,25 +2,19 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import type {DataSourceProps} from './data-source';
-import {DataSource} from './data-source';
-
 /**
  * Props for a TileSource
  */
-export type TileSourceProps = DataSourceProps;
+export type TileSourceProps = {};
 
 /**
  * MapTileSource - data sources that allow data to be queried by (geospatial) extents
  * @note
  * - If geospatial, bounding box is expected to be in web mercator coordinates
  */
-export interface TileSource<
-  PropsT extends TileSourceProps = TileSourceProps,
-  MetadataT extends TileSourceMetadata = TileSourceMetadata
-> extends DataSource<PropsT> {
+export interface TileSource {
   // extends DataSource {
-  getMetadata(): Promise<MetadataT>;
+  getMetadata(): Promise<TileSourceMetadata>;
   /** Flat parameters */
   getTile(parameters: GetTileParameters): Promise<unknown | null>;
   /** deck.gl compatibility: TileLayer and MTVLayer */

package/src/lib/sources/vector-source.ts

@@ -3,19 +3,15 @@
 // Copyright (c) vis.gl contributors
 
 import type {Schema, GeoJSONTable, BinaryFeatureCollection} from '@loaders.gl/schema';
-import type {DataSourceProps} from './data-source';
-import {DataSource} from './data-source';
 
-export type VectorSourceProps = DataSourceProps;
+export type VectorSourceProps = {};
 
 /**
  * VectorSource - data sources that allow features to be queried by (geospatial) extents
  * @note
  * - If geospatial, bounding box is expected to be in web mercator coordinates
  */
-export abstract class VectorSource<
-  PropsT extends VectorSourceProps = VectorSourceProps
-> extends DataSource<PropsT> {
+export abstract class VectorSource {
   static type: string = 'template';
   static testURL = (url: string): boolean => false;
 

package/src/lib/sources/vector-tile-source.ts

@@ -3,7 +3,7 @@
 // Copyright (c) vis.gl contributors
 
 import type {Schema, Feature, BinaryFeatureCollection} from '@loaders.gl/schema';
-import {TileSource, TileSourceProps, TileSourceMetadata, GetTileParameters} from './tile-source';
+import {TileSource, TileSourceProps, GetTileParameters} from './tile-source';
 import type {GetTileDataParameters} from './tile-source';
 
 export type VectorTile = unknown;
@@ -14,10 +14,7 @@ export type VectorTileSourceProps = TileSourceProps;
  * VectorTileSource - data sources that allow data to be queried by (geospatial) tile
  * @note If geospatial, bounding box is expected to be in web mercator coordinates
  */
-export interface VectorTileSource<
-  PropsT extends VectorTileSourceProps = VectorTileSourceProps,
-  MetadataT extends TileSourceMetadata = TileSourceMetadata
-> extends TileSource<PropsT, MetadataT> {
+export interface VectorTileSource extends TileSource {
   getSchema(): Promise<Schema>;
   getVectorTile(parameters: GetTileParameters): Promise<VectorTile | null>;
   getTileData(

package/src/loader-types.ts

@@ -2,10 +2,8 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {
-  FetchLike,
-  TransformBatches /* , DataType, SyncDataType, BatchableDataType */
-} from './types';
+import type {Format} from './format-types';
+import {FetchLike, TransformBatches} from './types';
 import {ReadableFile} from './lib/files/file';
 
 // LOADERS
@@ -113,7 +111,7 @@ type PreloadOptions = {
 /**
  * A worker loader definition that can be used with `@loaders.gl/core` functions
  */
-export type Loader<DataT = any, BatchT = any, LoaderOptionsT = LoaderOptions> = {
+export type Loader<DataT = any, BatchT = any, LoaderOptionsT = LoaderOptions> = Format & {
   /** The result type of this loader  */
   dataType?: DataT;
   /** The batched result type of this loader  */
@@ -123,6 +121,11 @@ export type Loader<DataT = any, BatchT = any, LoaderOptionsT = LoaderOptions> =
   options: LoaderOptionsT;
   /** Deprecated Options */
   deprecatedOptions?: Record<string, string | Record<string, string>>;
+  /** Version should be injected by build tools */
+  version: string;
+  /** A boolean, or a URL */
+  worker?: string | boolean;
+  // end Worker
 
   /** Human readable name */
   name: string;
@@ -130,19 +133,12 @@ export type Loader<DataT = any, BatchT = any, LoaderOptionsT = LoaderOptions> =
   id: string;
   /** module is used to generate worker threads, need to be the module directory name */
   module: string;
-  /** Version should be injected by build tools */
-  version: string;
-  /** A boolean, or a URL */
-  worker?: string | boolean;
-  // end Worker
-
   /** Which category does this loader belong to */
   category?: string;
   /** File extensions that are potential matches with this loader. */
   extensions: string[];
   /** MIMETypes that indicate a match with this loader. @note Some MIMETypes are generic and supported by many loaders */
   mimeTypes: string[];
-
   /** Is the input of this loader binary */
   binary?: boolean;
   /** Is the input of this loader text */
@@ -295,12 +291,13 @@ type Preload = (url: string, options?: PreloadOptions) => any;
 
 /** Typescript helper to extract options type from a loader type */
 export type LoaderOptionsType<T = Loader> =
-  T extends Loader<any, any, infer Options> ? Options : never;
+  T extends Loader<unknown, unknown, infer Options> ? Options : never;
 /** Typescript helper to extract data type from a loader type */
 export type LoaderReturnType<T = Loader> =
-  T extends Loader<infer Return, any, any> ? Return : never;
+  T extends Loader<infer Return, unknown, unknown> ? Return : never;
 /** Typescript helper to extract batch type from a loader type */
-export type LoaderBatchType<T = Loader> = T extends Loader<any, infer Batch, any> ? Batch : never;
+export type LoaderBatchType<T = Loader> =
+  T extends Loader<unknown, infer Batch, unknown> ? Batch : never;
 
 /** Typescript helper to extract options type from an array of loader types */
 export type LoaderArrayOptionsType<LoadersT extends Loader[] = Loader[]> =

package/src/source-types.ts

@@ -2,7 +2,8 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import type {DataSource, DataSourceProps} from './lib/sources/data-source';
+import type {Format} from './format-types';
+import type {DataSource, DataSourceOptions} from './lib/sources/data-source';
 
 /**
  * A `Source` contains metadata and a factory method for creating instances of a specific `DataSource`.
@@ -11,13 +12,15 @@ import type {DataSource, DataSourceProps} from './lib/sources/data-source';
  *  `createDataSource(... , [MVTSource, PMTilesSource, ...])
  */
 export interface Source<
-  DataSourceT extends DataSource = DataSource,
-  DataSourcePropsT extends DataSourceProps = any
-> {
+  DataSourceT extends DataSource<unknown, DataSourceOptions> = DataSource<
+    unknown,
+    DataSourceOptions
+  >
+> extends Format {
   /** Type of source created by this service */
-  source?: DataSourceT;
-  /** Type of props used when creating sources */
-  props?: DataSourcePropsT;
+  dataSource?: DataSourceT;
+  /** Type of options used when creating sources */
+  options?: DataSourceT['optionsType'];
 
   /** Name of the service */
   name: string;
@@ -30,8 +33,6 @@ export interface Source<
   extensions: string[];
   /** MIME extensions that this service uses */
   mimeTypes: string[];
-  /** Default options */
-  options: DataSourcePropsT;
 
   /** Type string identifying this service, e.g. 'wms' */
   type: string;
@@ -40,10 +41,34 @@ export interface Source<
   /** Can source be created from a Blob or File */
   fromBlob: boolean;
 
+  /** Default options */
+  defaultOptions: Omit<
+    Required<{[K in keyof DataSourceT['options']]: Required<DataSourceT['options'][K]>}>,
+    'core'
+  >;
+
   /** Check if a URL can support this service */
   testURL: (url: string) => boolean;
   /** Test data */
   testData?: (data: Blob) => boolean;
   /** Create a source  */
-  createDataSource(data: string | Blob, props: DataSourcePropsT): DataSourceT;
+  createDataSource(data: string | Blob, options: Readonly<DataSourceT['optionsType']>): DataSourceT;
 }
+
+// T extends Source<DataSource, any> ? DataSource : never;
+// T extends Source<any, infer PropsType> ? PropsType : never;
+
+/** Typescript helper to extract input data type from a source type */
+export type SourcePropsType<SourceT extends Source> = Required<SourceT['options']>;
+
+/** Typescript helper to extract the source options type from a source type */
+export type SourceDataSourceType<SourceT extends Source> = SourceT['dataSource'];
+
+/** Typescript helper to extract options type from an array of source types */
+export type SourceArrayOptionsType<SourcesT extends Source[] = Source[]> =
+  SourcesT[number]['options'] & DataSourceOptions;
+
+/** Typescript helper to extract data type from a source type */
+export type SourceArrayDataSourceType<SourcesT extends Source[] = Source[]> =
+  SourcesT[number]['dataSource'];
+/** Typescript helper to extract batch type from a source type */

package/src/writer-types.ts

@@ -2,6 +2,8 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
+import type {Format} from './format-types';
+
 // WRITERS
 
 /** Options for writers */
@@ -24,11 +26,18 @@ export type WriterOptions = {
  * A writer definition that can be used with `@loaders.gl/core` functions
  */
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-export type Writer<DataT = unknown, BatchT = unknown, WriterOptionsT = WriterOptions> = {
+export type Writer<DataT = unknown, BatchT = unknown, WriterOptionsT = WriterOptions> = Format & {
   /** The result type of this loader  */
   dataType?: DataT;
   /** The batched result type of this loader  */
   batchType?: BatchT;
+  /** Version should be injected by build tools */
+  version: string;
+  /** A boolean, or a URL */
+  worker?: string | boolean;
+  // end Worker
+  options: WriterOptionsT;
+  deprecatedOptions?: Record<string, string>;
 
   /** Human readable name */
   name: string;
@@ -36,27 +45,16 @@ export type Writer<DataT = unknown, BatchT = unknown, WriterOptionsT = WriterOpt
   id: string;
   /** module is used to generate worker threads, need to be the module directory name */
   module: string;
-  /** Version should be injected by build tools */
-  version: string;
-  /** A boolean, or a URL */
-  worker?: string | boolean;
-  // end Worker
-
   /** Which category does this loader belong to */
   category?: string;
   /** File extensions that are potential matches with this loader. */
   extensions: string[];
   /** MIMETypes that indicate a match with this loader. @note Some MIMETypes are generic and supported by many loaders */
   mimeTypes?: string[];
-
   /** Is the input of this loader binary */
   binary?: boolean;
   /** Is the input of this loader text */
   text?: boolean;
-
-  /** Default options for this writer */
-  options: WriterOptionsT;
-  deprecatedOptions?: Record<string, string>;
 };
 
 /**