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

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

@@ -1,6 +1,6 @@
-import { Schema, GeoJSONTable } from '@loaders.gl/schema';
-import type { VectorSourceProps, VectorSourceMetadata, GetFeaturesParameters, LoaderWithParser } from '@loaders.gl/loader-utils';
-import { VectorSource } from '@loaders.gl/loader-utils';
+import type { Schema, GeoJSONTable } from '@loaders.gl/schema';
+import type { DataSourceOptions, VectorSourceMetadata, GetFeaturesParameters, VectorSource } from '@loaders.gl/loader-utils';
+import { DataSource } from '@loaders.gl/loader-utils';
 export type ArcGISImageServiceQueryOptions = {
     returnGeometry: boolean;
     where: '1%3D1';
@@ -14,6 +14,9 @@ export type ArcGISImageServiceQueryOptions = {
     resultType: 'tile';
     f?: 'geojson';
 };
+export type ArcGIFeatureServerSourceOptions = DataSourceOptions & {
+    'arcgis-feature-server'?: {};
+};
 /**
  * @ndeprecated This is a WIP, not fully implemented
  * @see https://developers.arcgis.com/rest/services-reference/enterprise/feature-service.htm
@@ -25,34 +28,24 @@ export declare const ArcGISFeatureServerSource: {
     readonly version: "0.0.0";
     readonly extensions: [];
     readonly mimeTypes: [];
-    readonly options: {
-        readonly url: never;
-        readonly 'arcgis-feature-server': {
-            /** Tabular loaders, normally the GeoJSONLoader */
-            readonly loaders: [];
-        };
-    };
     readonly type: "arcgis-feature-server";
     readonly fromUrl: true;
     readonly fromBlob: false;
-    readonly testURL: (url: string) => boolean;
-    readonly createDataSource: (url: string | Blob, props: ArcGISVectorSourceProps) => ArcGISVectorSource;
-};
-export type ArcGISVectorSourceProps = VectorSourceProps & {
-    url: string;
-    'arcgis-feature-server'?: {
-        loaders: LoaderWithParser[];
+    readonly defaultOptions: {
+        readonly url: never;
+        readonly 'arcgis-feature-server': {};
     };
+    readonly testURL: (url: string) => boolean;
+    readonly createDataSource: (url: string, options: ArcGIFeatureServerSourceOptions) => 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 declare class ArcGISVectorSource extends VectorSource<ArcGISVectorSourceProps> {
-    data: string;
+export declare class ArcGISVectorSource extends DataSource<string, ArcGIFeatureServerSourceOptions> implements VectorSource {
     protected formatSpecificMetadata: Promise<any>;
-    constructor(props: ArcGISVectorSourceProps);
+    constructor(url: string, options: ArcGIFeatureServerSourceOptions);
     /** TODO - not yet clear if we can find schema information in the FeatureServer metadata or if we need to request a feature */
     getSchema(): Promise<Schema>;
     getMetadata(options: {
@@ -64,4 +57,4 @@ export declare class ArcGISVectorSource extends VectorSource<ArcGISVectorSourceP
 /** Sample metadata
  * @see https://developers.arcgis.com/rest/services-reference/enterprise/feature-service.htm
  */
-//# sourceMappingURL=arcgis-feature-server.d.ts.map
+//# sourceMappingURL=arcgis-feature-source.d.ts.map

package/dist/arcgis/arcgis-feature-source.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"arcgis-feature-source.d.ts","sourceRoot":"","sources":["../../src/arcgis/arcgis-feature-source.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,MAAM,EAAE,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAC7D,OAAO,KAAK,EACV,iBAAiB,EACjB,oBAAoB,EACpB,qBAAqB,EACrB,YAAY,EAEb,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAS,UAAU,EAAC,MAAM,0BAA0B,CAAC;AAW5D,MAAM,MAAM,8BAA8B,GAAG;IAC3C,cAAc,EAAE,OAAO,CAAC;IACxB,KAAK,EAAE,OAAO,CAAC;IACf,KAAK,EAAE,IAAI,CAAC;IACZ,SAAS,EAAE,MAAM,GAAG,GAAG,CAAC;IACxB,IAAI,EAAE,IAAI,CAAC;IACX,QAAQ,EAAE,GAAG,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,OAAO,EAAE,EAAE,CAAC;IAC/C,YAAY,EAAE,sBAAsB,CAAC;IACrC,UAAU,EAAE,0BAA0B,CAAC;IACvC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,CAAC,CAAC,EAAE,SAAS,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,+BAA+B,GAAG,iBAAiB,GAAG;IAChE,uBAAuB,CAAC,EAAE,EAAE,CAAC;CAC9B,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,yBAAyB;;;;;;;;;;;;;;4BAgBrB,MAAM,KAAG,OAAO;qCACP,MAAM,WAAW,+BAA+B,KAAG,kBAAkB;CAEhD,CAAC;AAEhD;;;;GAIG;AACH,qBAAa,kBACX,SAAQ,UAAU,CAAC,MAAM,EAAE,+BAA+B,CAC1D,YAAW,YAAY;IAEvB,SAAS,CAAC,sBAAsB,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;gBAEnC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,+BAA+B;IAKjE,8HAA8H;IACxH,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC;IAK5B,WAAW,CAAC,OAAO,EAAE;QAAC,sBAAsB,MAAA;KAAC,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAa7E,WAAW,CAAC,UAAU,EAAE,qBAAqB,GAAG,OAAO,CAAC,YAAY,CAAC;cAY3D,0BAA0B;CAM3C;AAgND;;GAEG"}

package/dist/{services/arcgis/arcgis-feature-server.js → arcgis/arcgis-feature-source.js}

@@ -1,73 +1,11 @@
 // loaders.gl
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
-import { VectorSource } from '@loaders.gl/loader-utils';
+import { DataSource } from '@loaders.gl/loader-utils';
 const TEST_SERVICE = 'https://services2.arcgis.com/CcI36Pduqd0OR4W9/ArcGIS/rest/services/Bicycle_Routes_Public/FeatureServer/0';
 const TEST_QUERY = 
 // eslint-disable-next-line no-template-curly-in-string
 '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';
-// 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', });
-//   }
-// }
 /**
  * @ndeprecated This is a WIP, not fully implemented
  * @see https://developers.arcgis.com/rest/services-reference/enterprise/feature-service.htm
@@ -79,30 +17,25 @@ 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) => url.toLowerCase().includes('FeatureServer'),
-    createDataSource: (url, props) => new ArcGISVectorSource(props)
+    createDataSource: (url, options) => new ArcGISVectorSource(url, options)
 };
 /**
  * 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 {
-    data;
+export class ArcGISVectorSource extends DataSource {
     formatSpecificMetadata;
-    constructor(props) {
-        super(props);
-        this.data = props.url;
+    constructor(url, options) {
+        super(url, options, ArcGISFeatureServerSource.defaultOptions);
         this.formatSpecificMetadata = this._getFormatSpecificMetadata();
     }
     /** TODO - not yet clear if we can find schema information in the FeatureServer metadata or if we need to request a feature */
@@ -125,7 +58,7 @@ export class ArcGISVectorSource extends VectorSource {
         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];
         const table = loader?.parse(arrayBuffer);
         return table;
     }
@@ -185,7 +118,7 @@ export class ArcGISVectorSource extends VectorSource {
   // URL creators
 
   metadataURL(options: {parameters?: Record<string, unknown>}): string {
-    return `${this.props.url}?f=pjson`;
+    return `${this.options.url}?f=pjson`;
   }
 
   /**
@@ -237,7 +170,7 @@ export class ArcGISVectorSource extends VectorSource {
     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 ? '?' : '&';
@@ -270,6 +203,68 @@ function parseArcGISFeatureServerMetadata(json) {
         layers
     };
 }
+// 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/dist/{services/arcgis/arcgis-image-server.d.ts → arcgis/arcgis-image-source.d.ts}

@@ -1,6 +1,9 @@
 import type { ImageType } from '@loaders.gl/images';
-import type { ImageSourceProps, ImageSourceMetadata, GetImageParameters } from '@loaders.gl/loader-utils';
-import { ImageSource } from '@loaders.gl/loader-utils';
+import type { DataSourceOptions, ImageSourceMetadata, GetImageParameters } from '@loaders.gl/loader-utils';
+import { DataSource, ImageSource } from '@loaders.gl/loader-utils';
+export type ArcGISImageSourceProps = DataSourceOptions & {
+    'arcgis-image-server'?: {};
+};
 export declare const ArcGISImageServerSource: {
     readonly name: "ArcGISImageServer";
     readonly id: "arcgis-image-server";
@@ -8,26 +11,21 @@ export declare const ArcGISImageServerSource: {
     readonly version: "0.0.0";
     readonly extensions: [];
     readonly mimeTypes: [];
-    readonly options: {
-        readonly 'arcgis-image-server': {};
-    };
     readonly type: "arcgis-image-server";
     readonly fromUrl: true;
     readonly fromBlob: false;
+    readonly defaultOptions: {
+        readonly 'arcgis-image-server': {};
+    };
     readonly testURL: (url: string) => boolean;
     readonly createDataSource: (url: string | Blob, props: ArcGISImageSourceProps) => ArcGISImageSource;
 };
-export type ArcGISImageSourceProps = ImageSourceProps & {
-    'arcgis-image-server'?: {};
-};
 /**
  * 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 declare class ArcGISImageSource extends ImageSource<ArcGISImageSourceProps> {
-    url: string;
-    data: string;
+export declare class ArcGISImageSource extends DataSource<string, ArcGISImageSourceProps> implements ImageSource {
     constructor(url: string, props: ArcGISImageSourceProps);
     getMetadata(): Promise<ImageSourceMetadata>;
     getImage(parameters: GetImageParameters): Promise<ImageType>;
@@ -94,4 +92,4 @@ export declare class ArcGISImageSource extends ImageSource<ArcGISImageSourceProp
     /** Checks for and parses a WMS XML formatted ServiceError and throws an exception */
     protected checkResponse(response: Response): Promise<void>;
 }
-//# sourceMappingURL=arcgis-image-server.d.ts.map
+//# sourceMappingURL=arcgis-image-source.d.ts.map

package/dist/arcgis/arcgis-image-source.d.ts.map

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

package/dist/{services/arcgis/arcgis-image-server.js → arcgis/arcgis-image-source.js}

@@ -1,9 +1,7 @@
 // loaders.gl
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
-import { ImageSource } from '@loaders.gl/loader-utils';
-// import type {ImageSourceProps} from '@loaders.gl/loader-utils';
-// import {ImageSource} from '@loaders.gl/loader-utils';
+import { DataSource } from '@loaders.gl/loader-utils';
 export const ArcGISImageServerSource = {
     name: 'ArcGISImageServer',
     id: 'arcgis-image-server',
@@ -11,14 +9,14 @@ 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) => url.toLowerCase().includes('ImageServer'),
     createDataSource: (url, props) => new ArcGISImageSource(url, props)
 };
@@ -27,13 +25,9 @@ export const ArcGISImageServerSource = {
  * 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 {
-    url;
-    data;
+export class ArcGISImageSource extends DataSource {
     constructor(url, props) {
-        super(props);
-        this.url = url;
-        this.data = url;
+        super(url, props, ArcGISImageServerSource.defaultOptions);
     }
     // ImageSource (normalized endpoints)
     async getMetadata() {

package/dist/arcgis/arcgis-server.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"arcgis-server.d.ts","sourceRoot":"","sources":["../../src/arcgis/arcgis-server.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,OAAO,GAAG;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAC,CAAC;AAEhE,KAAK,SAAS,GAAG,OAAO,KAAK,CAAC;AAE9B;;;;;GAKG;AACH,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,MAAM,EACX,SAAS,GAAE,SAAiB,GAC3B,OAAO,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAM3B"}

package/dist/csw-capabilities-loader.js

@@ -4,7 +4,7 @@
 import { parseCSWCapabilities } from "./lib/parsers/csw/parse-csw-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.0" !== 'undefined' ? "4.4.0-alpha.0" : 'latest';
 /**
  * Loader for the response to the CSW GetCapability request
  */

package/dist/csw-domain-loader.js

@@ -4,7 +4,7 @@
 import { parseCSWDomain } from "./lib/parsers/csw/parse-csw-domain.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.0" !== 'undefined' ? "4.4.0-alpha.0" : 'latest';
 /**
  * Loader for the response to the CSW GetCapability request
  */

package/dist/csw-records-loader.js

@@ -4,7 +4,7 @@
 import { parseCSWRecords } from "./lib/parsers/csw/parse-csw-records.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.0" !== 'undefined' ? "4.4.0-alpha.0" : 'latest';
 /**
  * Loader for the response to the CSW GetCapability request
  */

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

@@ -1,11 +1,8 @@
-import type { DataSourceProps } from '@loaders.gl/loader-utils';
+import type { DataSourceOptions } from '@loaders.gl/loader-utils';
 import { DataSource } from '@loaders.gl/loader-utils';
-import type { CSWCapabilities } from "../../csw-capabilities-loader.js";
-import type { CSWRecords } from "../../csw-records-loader.js";
-import type { CSWDomain } from "../../csw-domain-loader.js";
-export type CSWServiceProps = DataSourceProps & {
-    url: string;
-};
+import type { CSWCapabilities } from "./csw-capabilities-loader.js";
+import type { CSWRecords } from "./csw-records-loader.js";
+import type { CSWDomain } from "./csw-domain-loader.js";
 /** Describes a service or resource exposed by the catalog */
 export type Service = {
     /** name of service or resource */
@@ -36,19 +33,36 @@ export type CSWGetDomainParameters = CSWCommonParameters & {
     /** Request type */
     request?: 'GetDomain';
 };
+export type CSWSourceOptions = DataSourceOptions & {
+    csw?: {};
+};
+export declare const CSWSource: {
+    readonly name: "CSW";
+    readonly id: "csw";
+    readonly module: "wms";
+    readonly version: "0.0.0";
+    readonly extensions: [];
+    readonly mimeTypes: [];
+    readonly type: "csw";
+    readonly fromUrl: true;
+    readonly fromBlob: false;
+    readonly defaultOptions: {
+        readonly wfs: {};
+    };
+    readonly testURL: (url: string) => boolean;
+    readonly createDataSource: (url: string, options: CSWSourceOptions) => CSWCatalogSource;
+};
 /**
- * The CSWService class
+ * The CSWCatalogSource class
  * - provides type safe methods to form URLs to a CSW service
  * - provides type safe methods to query and parse results (and errors) from a CSW service
  * @note Only the URL parameter conversion is supported. XML posts are not supported.
  */
-export declare class CSWService extends DataSource<CSWServiceProps> {
+export declare class CSWCatalogSource extends DataSource<string, CSWSourceOptions> {
     static readonly type = "csw";
     static testURL: (url: string) => boolean;
     capabilities: CSWCapabilities | null;
-    data: string;
-    url: string;
-    /** A list of loaders used by the CSWService methods */
+    /** A list of loaders used by the CSWCatalogSource methods */
     readonly loaders: ({
         readonly dataType: CSWCapabilities;
         readonly batchType: never;
@@ -63,8 +77,8 @@ export declare class CSWService extends DataSource<CSWServiceProps> {
         readonly options: {
             readonly csw: {};
         };
-        readonly parse: (arrayBuffer: ArrayBuffer, options?: import("../../csw-capabilities-loader").CSWLoaderOptions) => Promise<CSWCapabilities>;
-        readonly parseTextSync: (text: string, options?: import("../../csw-capabilities-loader").CSWLoaderOptions) => CSWCapabilities;
+        readonly parse: (arrayBuffer: ArrayBuffer, options?: import("./csw-capabilities-loader").CSWLoaderOptions) => Promise<CSWCapabilities>;
+        readonly parseTextSync: (text: string, options?: import("./csw-capabilities-loader").CSWLoaderOptions) => CSWCapabilities;
     } | {
         readonly dataType: string;
         readonly batchType: never;
@@ -81,12 +95,12 @@ export declare class CSWService extends DataSource<CSWServiceProps> {
                 readonly throwOnError: false;
             };
         };
-        readonly parse: (arrayBuffer: ArrayBuffer, options?: import("../../wms-error-loader").WMSLoaderOptions) => Promise<string>;
-        readonly parseSync: (arrayBuffer: ArrayBuffer, options?: import("../../wms-error-loader").WMSLoaderOptions) => string;
-        readonly parseTextSync: (text: string, options?: import("../../wms-error-loader").WMSLoaderOptions) => string;
+        readonly parse: (arrayBuffer: ArrayBuffer, options?: import("./wms-error-loader").WMSLoaderOptions) => Promise<string>;
+        readonly parseSync: (arrayBuffer: ArrayBuffer, options?: import("./wms-error-loader").WMSLoaderOptions) => string;
+        readonly parseTextSync: (text: string, options?: import("./wms-error-loader").WMSLoaderOptions) => string;
     })[];
-    /** Create a CSWService */
-    constructor(props: CSWServiceProps);
+    /** Create a CSWCatalogSource */
+    constructor(url: string, options: CSWSourceOptions);
     getMetadata(): Promise<CSWCapabilities>;
     normalizeMetadata(capabilities: CSWCapabilities): CSWCapabilities;
     getServiceDirectory(options?: {
@@ -97,17 +111,17 @@ export declare class CSWService extends DataSource<CSWServiceProps> {
         params: string;
     };
     /** Get Capabilities */
-    getCapabilities(wmsParameters?: CSWGetCapabilitiesParameters, vendorParameters?: Record<string, unknown>): Promise<CSWCapabilities>;
+    getCapabilities(cswParameters?: CSWGetCapabilitiesParameters, vendorParameters?: Record<string, unknown>): Promise<CSWCapabilities>;
     /** Get Records */
-    getRecords(wmsParameters?: CSWGetRecordsParameters, vendorParameters?: Record<string, unknown>): Promise<CSWRecords>;
+    getRecords(cswParameters?: CSWGetRecordsParameters, vendorParameters?: Record<string, unknown>): Promise<CSWRecords>;
     /** Get Domain */
-    getDomain(wmsParameters?: CSWGetDomainParameters, vendorParameters?: Record<string, unknown>): Promise<CSWDomain>;
+    getDomain(cswParameters?: CSWGetDomainParameters, vendorParameters?: Record<string, unknown>): Promise<CSWDomain>;
     /** Generate a URL for the GetCapabilities request */
-    getCapabilitiesURL(wmsParameters?: CSWGetCapabilitiesParameters, vendorParameters?: Record<string, unknown>): string;
+    getCapabilitiesURL(cswParameters?: CSWGetCapabilitiesParameters, vendorParameters?: Record<string, unknown>): string;
     /** Generate a URL for the GetCapabilities request */
-    getRecordsURL(wmsParameters?: CSWGetRecordsParameters, vendorParameters?: Record<string, unknown>): string;
+    getRecordsURL(cswParameters?: CSWGetRecordsParameters, vendorParameters?: Record<string, unknown>): string;
     /** Generate a URL for the GetCapabilities request */
-    getDomainURL(wmsParameters?: CSWGetDomainParameters, vendorParameters?: Record<string, unknown>): string;
+    getDomainURL(cswParameters?: CSWGetDomainParameters, vendorParameters?: Record<string, unknown>): string;
     /**
      * @note case _getCSWUrl may need to be overridden to handle certain backends?
      * */
@@ -118,4 +132,4 @@ export declare class CSWService extends DataSource<CSWServiceProps> {
     protected _parseError(arrayBuffer: ArrayBuffer): Error;
 }
 export {};
-//# sourceMappingURL=csw-service.d.ts.map
+//# sourceMappingURL=csw-source.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"csw-source.d.ts","sourceRoot":"","sources":["../src/csw-source.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAS,iBAAiB,EAAC,MAAM,0BAA0B,CAAC;AACxE,OAAO,EAAC,UAAU,EAAC,MAAM,0BAA0B,CAAC;AAEpD,OAAO,KAAK,EAAC,eAAe,EAAC,qCAAkC;AAG/D,OAAO,KAAK,EAAC,UAAU,EAAC,gCAA6B;AAGrD,OAAO,KAAK,EAAC,SAAS,EAAC,+BAA4B;AAKnD,6DAA6D;AAC7D,MAAM,MAAM,OAAO,GAAG;IACpB,kCAAkC;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,kCAAkC;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAIF,KAAK,mBAAmB,GAAG;IACzB,sDAAsD;IACtD,OAAO,CAAC,EAAE,KAAK,CAAC;IAChB,0DAA0D;IAC1D,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,GAAG,OAAO,GAAG,OAAO,CAAC;CACjD,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAAG,mBAAmB,GAAG;IAC/D,mBAAmB;IACnB,OAAO,CAAC,EAAE,iBAAiB,CAAC;CAC7B,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG,mBAAmB,GAAG;IAC1D,mBAAmB;IACnB,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB,sBAAsB;IACtB,SAAS,EAAE,YAAY,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG,mBAAmB,GAAG;IACzD,mBAAmB;IACnB,OAAO,CAAC,EAAE,WAAW,CAAC;CAEvB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,iBAAiB,GAAG;IACjD,GAAG,CAAC,EAAE,EAAE,CAAC;CACV,CAAC;AAEF,eAAO,MAAM,SAAS;;;;;;;;;;;;;4BAeL,MAAM,KAAG,OAAO;qCACP,MAAM,WAAW,gBAAgB,KAAG,gBAAgB;CAEjC,CAAC;AAE9C;;;;;GAKG;AACH,qBAAa,gBAAiB,SAAQ,UAAU,CAAC,MAAM,EAAE,gBAAgB,CAAC;IACxE,MAAM,CAAC,QAAQ,CAAC,IAAI,SAAS;IAC7B,MAAM,CAAC,OAAO,QAAS,MAAM,KAAG,OAAO,CAAsC;IAE7E,YAAY,EAAE,eAAe,GAAG,IAAI,CAAQ;IAC5C,6DAA6D;IAC7D,QAAQ,CAAC,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;SAA2C;IAE3D,gCAAgC;gBACpB,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB;IAI5C,WAAW,IAAI,OAAO,CAAC,eAAe,CAAC;IAK7C,iBAAiB,CAAC,YAAY,EAAE,eAAe,GAAG,eAAe;IAI3D,mBAAmB,CAAC,OAAO,CAAC,EAAE;QAAC,cAAc,CAAC,EAAE,OAAO,CAAA;KAAC,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAoCnF,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAC;IAUxD,uBAAuB;IACjB,eAAe,CACnB,aAAa,CAAC,EAAE,4BAA4B,EAC5C,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACzC,OAAO,CAAC,eAAe,CAAC;IAS3B,kBAAkB;IACZ,UAAU,CACd,aAAa,CAAC,EAAE,uBAAuB,EACvC,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACzC,OAAO,CAAC,UAAU,CAAC;IAQtB,iBAAiB;IACX,SAAS,CACb,aAAa,CAAC,EAAE,sBAAsB,EACtC,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACzC,OAAO,CAAC,SAAS,CAAC;IAWrB,qDAAqD;IACrD,kBAAkB,CAChB,aAAa,CAAC,EAAE,4BAA4B,EAC5C,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACzC,MAAM;IAWT,qDAAqD;IACrD,aAAa,CACX,aAAa,CAAC,EAAE,uBAAuB,EACvC,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACzC,MAAM;IAYT,qDAAqD;IACrD,YAAY,CACV,aAAa,CAAC,EAAE,sBAAsB,EACtC,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACzC,MAAM;IAaT;;SAEK;IACL,SAAS,CAAC,UAAU,CAClB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAChC,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACzC,MAAM;IAeT,qFAAqF;IACrF,SAAS,CAAC,cAAc,CAAC,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,WAAW,GAAG,IAAI;IAQ5E,+BAA+B;IAC/B,SAAS,CAAC,WAAW,CAAC,WAAW,EAAE,WAAW,GAAG,KAAK;CAIvD"}