@loaders.gl/wms 4.3.2 → 4.4.0-alpha.2

package/dist/wip/wcs-capabilities-loader.js

@@ -2,7 +2,7 @@
 import { parseWCSCapabilities } from "./lib/wcs/parse-wcs-capabilities.js";
 // __VERSION__ is injected by babel-plugin-version-inline
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.
-const VERSION = typeof "4.3.1" !== 'undefined' ? "4.3.1" : 'latest';
+const VERSION = typeof "4.4.0-alpha.1" !== 'undefined' ? "4.4.0-alpha.1" : 'latest';
 /**
  * Loader for the response to the WCS GetCapability request
  */

package/dist/wip/wmts-capabilities-loader.js

@@ -3,7 +3,7 @@
 import { parseWMTSCapabilities } from "./lib/wmts/parse-wmts-capabilities.js";
 // __VERSION__ is injected by babel-plugin-version-inline
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.
-const VERSION = typeof "4.3.1" !== 'undefined' ? "4.3.1" : 'latest';
+const VERSION = typeof "4.4.0-alpha.1" !== 'undefined' ? "4.4.0-alpha.1" : 'latest';
 /**
  * Loader for the response to the WMTS GetCapability request
  */

package/dist/wms-capabilities-loader.js

@@ -4,7 +4,7 @@
 import { parseWMSCapabilities } from "./lib/parsers/wms/parse-wms-capabilities.js";
 // __VERSION__ is injected by babel-plugin-version-inline
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.
-const VERSION = typeof "4.3.1" !== 'undefined' ? "4.3.1" : 'latest';
+const VERSION = typeof "4.4.0-alpha.1" !== 'undefined' ? "4.4.0-alpha.1" : 'latest';
 /**
  * Loader for the response to the WMS GetCapability request
  */

package/dist/wms-error-loader.js

@@ -4,7 +4,7 @@
 import { parseWMSError } from "./lib/parsers/wms/parse-wms-error.js";
 // __VERSION__ is injected by babel-plugin-version-inline
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.
-const VERSION = typeof "4.3.1" !== 'undefined' ? "4.3.1" : 'latest';
+const VERSION = typeof "4.4.0-alpha.1" !== 'undefined' ? "4.4.0-alpha.1" : 'latest';
 /**
  * Loader for the response to the WMS GetCapability request
  */

package/dist/{services/ogc/wms-service.d.ts → wms-source.d.ts}

@@ -1,9 +1,20 @@
+import type { DataSourceOptions, ImageSourceMetadata, GetImageParameters } from '@loaders.gl/loader-utils';
+import { DataSource, ImageSource } from '@loaders.gl/loader-utils';
 import type { ImageType } from '@loaders.gl/images';
-import { ImageSource } from '@loaders.gl/loader-utils';
-import type { ImageSourceMetadata, GetImageParameters, ImageSourceProps } from '@loaders.gl/loader-utils';
-import type { WMSCapabilities } from "../../wms-capabilities-loader.js";
-import type { WMSFeatureInfo } from "../../wip/wms-feature-info-loader.js";
-import type { WMSLayerDescription } from "../../wip/wms-layer-description-loader.js";
+import type { WMSCapabilities } from "./wms-capabilities-loader.js";
+import type { WMSFeatureInfo } from "./wip/wms-feature-info-loader.js";
+import type { WMSLayerDescription } from "./wip/wms-layer-description-loader.js";
+/** Properties for creating a enw WMS service */
+export type WMSSourceOptions = DataSourceOptions & {
+    wms?: {
+        /** In 1.3.0, replaces references to EPSG:4326 with CRS:84 */
+        substituteCRS84?: boolean;
+        /** Default WMS parameters. If not provided here, must be provided in the various request */
+        wmsParameters?: WMSParameters;
+        /** Any additional service specific parameters */
+        vendorParameters?: Record<string, unknown>;
+    };
+};
 export declare const WMSSource: {
     readonly name: "Web Map Service (OGC WMS)";
     readonly id: "wms";
@@ -11,31 +22,14 @@ export declare const WMSSource: {
     readonly version: "0.0.0";
     readonly extensions: [];
     readonly mimeTypes: [];
-    readonly options: {
-        readonly wms: {};
-    };
     readonly type: "wms";
     readonly fromUrl: true;
     readonly fromBlob: false;
-    readonly testURL: (url: string) => boolean;
-    readonly createDataSource: (url: string | Blob, props: WMSImageSourceProps) => WMSImageSource;
-};
-/** Properties for creating a enw WMS service */
-export type WMSImageSourceProps = ImageSourceProps & {
-    /** @deprecated Use props.wms.substituteCRS84 */
-    substituteCRS84?: boolean;
-    /** @deprecated Use props.wms.wmsParameters */
-    wmsParameters?: WMSParameters;
-    /** @deprecated Use props.wms.vendorParameters */
-    vendorParameters?: Record<string, unknown>;
-    wms?: {
-        /** In 1.3.0, replaces references to EPSG:4326 with CRS:84 */
-        substituteCRS84?: boolean;
-        /** Default WMS parameters. If not provided here, must be provided in the various request */
-        wmsParameters?: WMSParameters;
-        /** Any additional service specific parameters */
-        vendorParameters?: Record<string, unknown>;
+    readonly defaultOptions: {
+        readonly wms: {};
     };
+    readonly testURL: (url: string) => boolean;
+    readonly createDataSource: (url: string | Blob, options: WMSSourceOptions) => WMSImageSource;
 };
 /**
  * "Static" WMS parameters (not viewport or selected pixel dependent)
@@ -154,10 +148,7 @@ export type WMSGetLegendGraphicParameters = {
  * - implements the ImageSource interface
  * @note Only the URL parameter conversion is supported. XML posts are not supported.
  */
-export declare class WMSImageSource extends ImageSource<WMSImageSourceProps> {
-    /** Base URL to the service */
-    readonly url: string;
-    readonly data: string;
+export declare class WMSImageSource extends DataSource<string, WMSSourceOptions> implements ImageSource {
     /** In WMS 1.3.0, replaces references to EPSG:4326 with CRS:84. But not always supported. Default: false */
     substituteCRS84: boolean;
     /** In WMS 1.3.0, flips x,y (lng, lat) coordinates for the supplied coordinate systems. Default: ['ESPG:4326'] */
@@ -168,7 +159,7 @@ export declare class WMSImageSource extends ImageSource<WMSImageSourceProps> {
     vendorParameters?: Record<string, unknown>;
     capabilities: WMSCapabilities | null;
     /** Create a WMSImageSource */
-    constructor(url: string, props: WMSImageSourceProps);
+    constructor(url: string, options: WMSSourceOptions);
     getMetadata(): Promise<ImageSourceMetadata>;
     getImage(parameters: GetImageParameters): Promise<ImageType>;
     normalizeMetadata(capabilities: WMSCapabilities): ImageSourceMetadata;
@@ -220,4 +211,4 @@ export declare class WMSImageSource extends ImageSource<WMSImageSourceProps> {
     /** Error situation detected */
     protected _parseError(arrayBuffer: ArrayBuffer): Error;
 }
-//# sourceMappingURL=wms-service.d.ts.map
+//# sourceMappingURL=wms-source.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"wms-source.d.ts","sourceRoot":"","sources":["../src/wms-source.ts"],"names":[],"mappings":"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"}

package/dist/{services/ogc/wms-service.js → wms-source.js}

@@ -1,12 +1,12 @@
 // loaders.gl
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
+import { DataSource, mergeOptions } from '@loaders.gl/loader-utils';
 import { ImageLoader } from '@loaders.gl/images';
-import { mergeLoaderOptions, ImageSource } from '@loaders.gl/loader-utils';
-import { WMSCapabilitiesLoader } from "../../wms-capabilities-loader.js";
-import { WMSFeatureInfoLoader } from "../../wip/wms-feature-info-loader.js";
-import { WMSLayerDescriptionLoader } from "../../wip/wms-layer-description-loader.js";
-import { WMSErrorLoader } from "../../wms-error-loader.js";
+import { WMSCapabilitiesLoader } from "./wms-capabilities-loader.js";
+import { WMSFeatureInfoLoader } from "./wip/wms-feature-info-loader.js";
+import { WMSLayerDescriptionLoader } from "./wip/wms-layer-description-loader.js";
+import { WMSErrorLoader } from "./wms-error-loader.js";
 export const WMSSource = {
     name: 'Web Map Service (OGC WMS)',
     id: 'wms',
@@ -14,16 +14,16 @@ export const WMSSource = {
     version: '0.0.0',
     extensions: [],
     mimeTypes: [],
-    options: {
+    type: 'wms',
+    fromUrl: true,
+    fromBlob: false,
+    defaultOptions: {
         wms: {
         // TODO - add options here
         }
     },
-    type: 'wms',
-    fromUrl: true,
-    fromBlob: false,
     testURL: (url) => url.toLowerCase().includes('wms'),
-    createDataSource: (url, props) => new WMSImageSource(url, props)
+    createDataSource: (url, options) => new WMSImageSource(url, options)
 };
 //
 /**
@@ -33,10 +33,7 @@ export const WMSSource = {
  * - implements the ImageSource interface
  * @note Only the URL parameter conversion is supported. XML posts are not supported.
  */
-export class WMSImageSource extends ImageSource {
-    /** Base URL to the service */
-    url;
-    data;
+export class WMSImageSource extends DataSource {
     /** In WMS 1.3.0, replaces references to EPSG:4326 with CRS:84. But not always supported. Default: false */
     substituteCRS84;
     /** In WMS 1.3.0, flips x,y (lng, lat) coordinates for the supplied coordinate systems. Default: ['ESPG:4326'] */
@@ -47,14 +44,12 @@ export class WMSImageSource extends ImageSource {
     vendorParameters;
     capabilities = null;
     /** Create a WMSImageSource */
-    constructor(url, props) {
-        super(props);
+    constructor(url, options) {
+        super(url, options, WMSSource.defaultOptions);
         // TODO - defaults such as version, layers etc could be extracted from a base URL with parameters
         // This would make pasting in any WMS URL more likely to make this class just work.
-        // const {baseUrl, parameters} = this._parseWMSUrl(props.url);
-        this.url = url;
-        this.data = url;
-        this.substituteCRS84 = props.wms?.substituteCRS84 ?? props.substituteCRS84 ?? false;
+        // const {baseUrl, parameters} = this._parseWMSUrl(options.url);
+        this.substituteCRS84 = options.wms?.substituteCRS84 ?? false;
         this.flipCRS = ['EPSG:4326'];
         this.wmsParameters = {
             layers: undefined,
@@ -67,10 +62,10 @@ export class WMSImageSource extends ImageSource {
             transparent: undefined,
             time: undefined,
             elevation: undefined,
-            ...props.wmsParameters, // deprecated
-            ...props.wms?.wmsParameters
+            ...options.wmsParameters, // deprecated
+            ...options.wms?.wmsParameters
         };
-        this.vendorParameters = props.wms?.vendorParameters || props.vendorParameters || {};
+        this.vendorParameters = options.wms?.vendorParameters || options.vendorParameters || {};
     }
     // ImageSource implementation
     async getMetadata() {
@@ -345,7 +340,7 @@ export class WMSImageSource extends ImageSource {
         const contentType = response.headers['content-type'];
         if (!response.ok || WMSErrorLoader.mimeTypes.includes(contentType)) {
             // We want error responses to throw exceptions, the WMSErrorLoader can do this
-            const loadOptions = mergeLoaderOptions(this.loadOptions, {
+            const loadOptions = mergeOptions(this.loadOptions, {
                 wms: { throwOnError: true }
             });
             const error = WMSErrorLoader.parseSync?.(arrayBuffer, loadOptions);
@@ -354,7 +349,7 @@ export class WMSImageSource extends ImageSource {
     }
     /** Error situation detected */
     _parseError(arrayBuffer) {
-        const error = WMSErrorLoader.parseSync?.(arrayBuffer, this.loadOptions);
+        const error = WMSErrorLoader.parseSync?.(arrayBuffer, this.options.core?.loadOptions);
         return new Error(error);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/wms",
-  "version": "4.3.2",
+  "version": "4.4.0-alpha.2",
   "description": "Framework-independent loaders for the WMS (Web Map Service) standard",
   "license": "MIT",
   "type": "module",
@@ -50,15 +50,15 @@
     "path": false
   },
   "dependencies": {
-    "@loaders.gl/images": "4.3.2",
-    "@loaders.gl/loader-utils": "4.3.2",
-    "@loaders.gl/schema": "4.3.2",
-    "@loaders.gl/xml": "4.3.2",
+    "@loaders.gl/images": "4.4.0-alpha.2",
+    "@loaders.gl/loader-utils": "4.4.0-alpha.2",
+    "@loaders.gl/schema": "4.4.0-alpha.2",
+    "@loaders.gl/xml": "4.4.0-alpha.2",
     "@turf/rewind": "^5.1.5",
     "deep-strict-equal": "^0.2.0"
   },
   "peerDependencies": {
-    "@loaders.gl/core": "^4.3.0"
+    "@loaders.gl/core": "4.4.0-alpha.1"
   },
-  "gitHead": "b4203b8703f64a38d6f79a3113bc7bb51d45c93a"
+  "gitHead": "3d9fed050eabdc0812ddf2f4d5fb9914a34ee0c2"
 }

package/src/{services/arcgis/arcgis-feature-server.ts → arcgis/arcgis-feature-source.ts}

@@ -2,14 +2,15 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {Schema, GeoJSONTable} from '@loaders.gl/schema';
+import type {Schema, GeoJSONTable} from '@loaders.gl/schema';
 import type {
-  VectorSourceProps,
+  DataSourceOptions,
   VectorSourceMetadata,
   GetFeaturesParameters,
+  VectorSource,
   LoaderWithParser
 } from '@loaders.gl/loader-utils';
-import {Source, VectorSource} from '@loaders.gl/loader-utils';
+import {Source, DataSource} from '@loaders.gl/loader-utils';
 
 const TEST_SERVICE =
   'https://services2.arcgis.com/CcI36Pduqd0OR4W9/ArcGIS/rest/services/Bicycle_Routes_Public/FeatureServer/0';
@@ -34,74 +35,9 @@ export type ArcGISImageServiceQueryOptions = {
   f?: 'geojson'; // TODO - look up valid values in Esri docs
 };
 
-// const DEFAULT_QUERY_OPTIONS: Required<ArcGISImageServiceQueryOptions>  = {
-//   returnGeometry:true,
-//   where: '1%3D1',
-//   outSR: 4326,
-//   outFields: '*',
-//   inSR: 4326,
-//   geometry: `${-90}%2C+${30}%2C+${-70}%2C+${50}`,
-//   geometryType: 'esriGeometryEnvelope',
-//   spatialRel: 'esriSpatialRelIntersects',
-//   geometryPrecision: 6,
-//   resultType: 'tile',
-//   f: 'geojson'
-// };
-
-// export type ArcGISFeatureServiceProps = ArcGISImageServiceQueryOptions & {
-//   url: string;
-//   loadOptions?: LoaderOptions;
-//   fetch?: typeof fetch | FetchLike;
-// };
-
-// export class ArcGISFeatureService {
-//   url: string;
-//   loadOptions: LoaderOptions;
-//   fetch: typeof fetch | FetchLike;
-
-//   constructor(props: ArcGISFeatureServiceProps) {
-//     this.url = props.url;
-//     this.loadOptions = props.loadOptions || {};
-//     this.fetch = props.fetch || fetch;
-//   }
-
-//   // URL creators
-
-//   metadataURL(options: {parameters?: Record<string, unknown>}): string {
-//     return this.getUrl({...options});
-//   }
-
-//   /**
-//    * Form a URL to an ESRI FeatureServer
-// // https://services2.arcgis.com/CcI36Pduqd0OR4W9/ArcGIS/rest/services/Bicycle_Routes_Public/FeatureServer/0/query?
-// //   returnGeometry=true&where=1%3D1&outSR=4326&outFields=*&inSR=4326&geometry=${-90}%2C+${30}%2C+${-70}%2C+${50}&
-// //   geometryType=esriGeometryEnvelope&spatialRel=esriSpatialRelIntersects&geometryPrecision=6&resultType=tile&f=geojson`
-//    */
-//   exportImageURL(options: {
-//     boundingBox: [number, number, number, number];
-//     boundingBoxSR?: string;
-//     width: number;
-//     height: number;
-//     imageSR?: string;
-//     time?: never;
-//     f?: 'geojson';
-//     resultType?: 'tile';
-//     noData?: never;
-//     noDataInterpretation?: 'esriNoDataMatchAny';
-//     interpolation?: '+RSP_NearestNeighbor';
-//     compression?: never
-//     compressionQuality?: never;
-//     bandIds?: never;
-//     mosaicRule?: never;
-//     renderingRule?: never;
-//     f?: 'image';
-//   }): string {
-//     const {boundingBox} = options;
-//     // const bbox = `bbox=${boundingBox[0]},${boundingBox[1]},${boundingBox[2]},${boundingBox[3]}`;
-//     // const size = `size=${width},${height}`
-//     return this.getUrl({path: 'exportImage', });
-//   }
-// }
+export type ArcGIFeatureServerSourceOptions = DataSourceOptions & {
+  'arcgis-feature-server'?: {};
+};
 
 /**
  * @ndeprecated This is a WIP, not fully implemented
@@ -114,42 +50,33 @@ export const ArcGISFeatureServerSource = {
   version: '0.0.0',
   extensions: [],
   mimeTypes: [],
-  options: {
-    url: undefined!,
-    'arcgis-feature-server': {
-      /** Tabular loaders, normally the GeoJSONLoader */
-      loaders: []
-    }
-  },
-
   type: 'arcgis-feature-server',
   fromUrl: true,
   fromBlob: false,
 
+  defaultOptions: {
+    url: undefined!,
+    'arcgis-feature-server': {}
+  },
+
   testURL: (url: string): boolean => url.toLowerCase().includes('FeatureServer'),
-  createDataSource: (url, props: ArcGISVectorSourceProps): ArcGISVectorSource =>
-    new ArcGISVectorSource(props)
-} as const satisfies Source<ArcGISVectorSource, ArcGISVectorSourceProps>;
-
-export type ArcGISVectorSourceProps = VectorSourceProps & {
-  url: string;
-  'arcgis-feature-server'?: {
-    loaders: LoaderWithParser[];
-  };
-};
+  createDataSource: (url: string, options: ArcGIFeatureServerSourceOptions): ArcGISVectorSource =>
+    new ArcGISVectorSource(url, options)
+} as const satisfies Source<ArcGISVectorSource>;
 
 /**
  * ArcGIS ImageServer
  * Note - exports a big API, that could be exposed here if there is a use case
  * @see https://developers.arcgis.com/rest/services-reference/enterprise/feature-service.htm
  */
-export class ArcGISVectorSource extends VectorSource<ArcGISVectorSourceProps> {
-  data: string;
+export class ArcGISVectorSource
+  extends DataSource<string, ArcGIFeatureServerSourceOptions>
+  implements VectorSource
+{
   protected formatSpecificMetadata: Promise<any>;
 
-  constructor(props: ArcGISVectorSourceProps) {
-    super(props);
-    this.data = props.url;
+  constructor(url: string, options: ArcGIFeatureServerSourceOptions) {
+    super(url, options, ArcGISFeatureServerSource.defaultOptions);
     this.formatSpecificMetadata = this._getFormatSpecificMetadata();
   }
 
@@ -177,7 +104,7 @@ export class ArcGISVectorSource extends VectorSource<ArcGISVectorSourceProps> {
     const response = await this.fetch(url);
     const arrayBuffer = await response.arrayBuffer();
     // TODO - hack - done to avoid pulling in selectLoader from core
-    const loader = this.props['arcgis-feature-server']?.loaders?.[0];
+    const loader = this.options.core?.loaders?.[0] as LoaderWithParser;
     const table = loader?.parse(arrayBuffer);
     return table;
   }
@@ -241,7 +168,7 @@ export class ArcGISVectorSource extends VectorSource<ArcGISVectorSourceProps> {
   // URL creators
 
   metadataURL(options: {parameters?: Record<string, unknown>}): string {
-    return `${this.props.url}?f=pjson`;
+    return `${this.options.url}?f=pjson`;
   }
 
   /** 
@@ -293,7 +220,7 @@ export class ArcGISVectorSource extends VectorSource<ArcGISVectorSourceProps> {
     options: Record<string, unknown>,
     extra?: Record<string, unknown>
   ): string {
-    let url = `${this.props.url}/${path}`;
+    let url = `${this.options.url}/${path}`;
     let first = true;
     for (const [key, value] of Object.entries(options)) {
       url += first ? '?' : '&';
@@ -329,6 +256,75 @@ function parseArcGISFeatureServerMetadata(json: any): VectorSourceMetadata {
   };
 }
 
+// const DEFAULT_QUERY_OPTIONS: Required<ArcGISImageServiceQueryOptions>  = {
+//   returnGeometry:true,
+//   where: '1%3D1',
+//   outSR: 4326,
+//   outFields: '*',
+//   inSR: 4326,
+//   geometry: `${-90}%2C+${30}%2C+${-70}%2C+${50}`,
+//   geometryType: 'esriGeometryEnvelope',
+//   spatialRel: 'esriSpatialRelIntersects',
+//   geometryPrecision: 6,
+//   resultType: 'tile',
+//   f: 'geojson'
+// };
+
+// export type ArcGISFeatureServiceProps = ArcGISImageServiceQueryOptions & {
+//   url: string;
+//   loadOptions?: LoaderOptions;
+//   fetch?: typeof fetch | FetchLike;
+// };
+
+// export class ArcGISFeatureService {
+//   url: string;
+//   loadOptions: LoaderOptions;
+//   fetch: typeof fetch | FetchLike;
+
+//   constructor(options: ArcGISFeatureServiceProps) {
+//     this.url = options.url;
+//     this.loadOptions = options.loadOptions || {};
+//     this.fetch = options.fetch || fetch;
+//   }
+
+//   // URL creators
+
+//   metadataURL(options: {parameters?: Record<string, unknown>}): string {
+//     return this.getUrl({...options});
+//   }
+
+//   /**
+//    * Form a URL to an ESRI FeatureServer
+// // https://services2.arcgis.com/CcI36Pduqd0OR4W9/ArcGIS/rest/services/Bicycle_Routes_Public/FeatureServer/0/query?
+// //   returnGeometry=true&where=1%3D1&outSR=4326&outFields=*&inSR=4326&geometry=${-90}%2C+${30}%2C+${-70}%2C+${50}&
+// //   geometryType=esriGeometryEnvelope&spatialRel=esriSpatialRelIntersects&geometryPrecision=6&resultType=tile&f=geojson`
+//    */
+//   exportImageURL(options: {
+//     boundingBox: [number, number, number, number];
+//     boundingBoxSR?: string;
+//     width: number;
+//     height: number;
+//     imageSR?: string;
+//     time?: never;
+//     f?: 'geojson';
+//     resultType?: 'tile';
+//     noData?: never;
+//     noDataInterpretation?: 'esriNoDataMatchAny';
+//     interpolation?: '+RSP_NearestNeighbor';
+//     compression?: never
+//     compressionQuality?: never;
+//     bandIds?: never;
+//     mosaicRule?: never;
+//     renderingRule?: never;
+//     f?: 'image';
+//   }): string {
+//     const {boundingBox} = options;
+//     // const bbox = `bbox=${boundingBox[0]},${boundingBox[1]},${boundingBox[2]},${boundingBox[3]}`;
+//     // const size = `size=${width},${height}`
+//     return this.getUrl({path: 'exportImage', });
+//   }
+// }
+
 /** Sample metadata
  * @see https://developers.arcgis.com/rest/services-reference/enterprise/feature-service.htm
  */

package/src/{services/arcgis/arcgis-image-server.ts → arcgis/arcgis-image-source.ts}

@@ -5,14 +5,17 @@
 import type {ImageType} from '@loaders.gl/images';
 import type {
   Source,
-  ImageSourceProps,
+  DataSourceOptions,
   ImageSourceMetadata,
   GetImageParameters
 } from '@loaders.gl/loader-utils';
-import {ImageSource} from '@loaders.gl/loader-utils';
+import {DataSource, ImageSource} from '@loaders.gl/loader-utils';
 
-// import type {ImageSourceProps} from '@loaders.gl/loader-utils';
-// import {ImageSource} from '@loaders.gl/loader-utils';
+export type ArcGISImageSourceProps = DataSourceOptions & {
+  'arcgis-image-server'?: {
+    // TODO - add options here
+  };
+};
 
 export const ArcGISImageServerSource = {
   name: 'ArcGISImageServer',
@@ -21,40 +24,32 @@ export const ArcGISImageServerSource = {
   version: '0.0.0',
   extensions: [],
   mimeTypes: [],
-  options: {
+  type: 'arcgis-image-server',
+  fromUrl: true,
+  fromBlob: false,
+
+  defaultOptions: {
     'arcgis-image-server': {
       // TODO - add options here
     }
   },
 
-  type: 'arcgis-image-server',
-  fromUrl: true,
-  fromBlob: false,
-
   testURL: (url: string): boolean => url.toLowerCase().includes('ImageServer'),
   createDataSource: (url, props: ArcGISImageSourceProps): ArcGISImageSource =>
     new ArcGISImageSource(url as string, props)
-} as const satisfies Source<ArcGISImageSource, ArcGISImageSourceProps>;
-
-export type ArcGISImageSourceProps = ImageSourceProps & {
-  'arcgis-image-server'?: {
-    // TODO - add options here
-  };
-};
+} as const satisfies Source<ArcGISImageSource>;
 
 /**
  * ArcGIS ImageServer
  * Note - exports a big API, that could be exposed here if there is a use case
  * @see https://developers.arcgis.com/rest/services-reference/enterprise/image-service.htm
  */
-export class ArcGISImageSource extends ImageSource<ArcGISImageSourceProps> {
-  url: string;
-  data: string;
-
+export class ArcGISImageSource
+  extends DataSource<string, ArcGISImageSourceProps>
+  implements ImageSource
+{
   constructor(url: string, props: ArcGISImageSourceProps) {
-    super(props);
-    this.url = url;
-    this.data = url;
+    super(url, props, ArcGISImageServerSource.defaultOptions);
   }
 
   // ImageSource (normalized endpoints)