@loaders.gl/wms 3.4.0-alpha.1 → 3.4.0-alpha.2

package/dist/lib/{wms/wms-types.d.ts → parsers/wms/parse-wms-capabilities.d.ts}

@@ -25,24 +25,6 @@ export type WMSRequest = {
     name: string;
     mimeTypes: string[];
 };
-/** WMS Feature info - response to a WMS `GetFeatureInfo` request */
-export type WMSFeatureInfo = {
-    features: WMSFeature[];
-};
-export type WMSFeature = {
-    attributes: Record<string, number | string>;
-    type: string;
-    bounds: {
-        top: number;
-        bottom: number;
-        left: number;
-        right: number;
-    };
-};
-/** Layer description - response to a WMS `DescribeLayer` request  */
-export type WMSLayerDescription = {
-    layers: {}[];
-};
 /**
  * <EX_GeographicBoundingBox>
  *     <westBoundLongitude>-180</westBoundLongitude>
@@ -97,4 +79,9 @@ export type WMSService = {
     capabilities: {};
     untypedData: unknown;
 };
-//# sourceMappingURL=wms-types.d.ts.map
+/**
+ * Parses a typed data structure from raw XML for `GetCapabilities` response
+ * @note Error handlings is fairly weak
+ */
+export declare function parseWMSCapabilities(text: string, options: any): WMSCapabilities;
+//# sourceMappingURL=parse-wms-capabilities.d.ts.map

package/dist/lib/parsers/wms/parse-wms-capabilities.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"parse-wms-capabilities.d.ts","sourceRoot":"","sources":["../../../../src/lib/parsers/wms/parse-wms-capabilities.ts"],"names":[],"mappings":"AAIA,gHAAgH;AAChH,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,KAAK,EAAE;QACL,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC;QACf,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QAC/C,MAAM,EAAE,QAAQ,EAAE,CAAC;KACpB,CAAC;IACF,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IACrC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC;IACf,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/C,MAAM,EAAE,QAAQ,EAAE,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC;AAEF;;;;;;;;;GASG;AACH,MAAM,MAAM,KAAK,GAAG;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,qBAAqB,EAAE,MAAM,EAAE,CAAC;IAChC,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,KAAK,EAAE,CAAC;CACjB,CAAC;AAEF;;;;;;;;;GASG;AACH,MAAM,MAAM,KAAK,GAAG;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE;QACV,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,EAAE,MAAM,CAAC;QACf,cAAc,EAAE,MAAM,CAAC;KACxB,CAAC;CACH,CAAC;AAIF,MAAM,MAAM,UAAU,GAAG;IACvB,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,EAIb,CAAC;IAEF,WAAW,EAAE,OAAO,CAAC;CACtB,CAAC;AAo3DF;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,KAAA,GAAG,eAAe,CAK3E"}

package/dist/lib/{wms/wms-types.js → parsers/wms/parse-wms-capabilities.js}

@@ -1,6 +1,8 @@
 "use strict";
-// loaders.gl, MIT licenses
+// loaders.gl, MIT license
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseWMSCapabilities = void 0;
+const xml_1 = require("@loaders.gl/xml");
 /*
 <Capability>
   <Request>
@@ -1906,3 +1908,61 @@ Object.defineProperty(exports, "__esModule", { value: true });
 </Capability>
 </WMS_Capabilities>
 */
+/**
+ * Parses a typed data structure from raw XML for `GetCapabilities` response
+ * @note Error handlings is fairly weak
+ */
+function parseWMSCapabilities(text, options) {
+    const parsedXML = xml_1.XMLLoader.parseTextSync(text, options);
+    const xmlCapabilities = parsedXML.WMT_MS_Capabilities || parsedXML.WMS_Capabilities || parsedXML;
+    return extractCapabilities(xmlCapabilities);
+}
+exports.parseWMSCapabilities = parseWMSCapabilities;
+/** Extract typed capability data from XML */
+function extractCapabilities(xml) {
+    const capabilities = {
+        name: xml.Service?.Name || 'unnamed',
+        title: xml.Service?.Title,
+        keywords: [],
+        requests: {},
+        layer: extractLayer(xml.Capability?.Layer),
+        raw: xml
+    };
+    for (const keyword of xml.Service?.KeywordList?.Keyword || []) {
+        capabilities.keywords.push(keyword);
+    }
+    for (const [name, xmlRequest] of Object.entries(xml.Capability?.Request || {})) {
+        capabilities.requests[name] = extractRequest(name, xmlRequest);
+    }
+    return capabilities;
+}
+/** Extract typed request data from XML */
+function extractRequest(name, xmlRequest) {
+    const format = xmlRequest?.Format;
+    const mimeTypes = Array.isArray(format) ? format : [format];
+    return { name, mimeTypes };
+}
+/** Extract request data */
+function extractLayer(xmlLayer) {
+    const layer = {
+        name: xmlLayer?.Name,
+        title: xmlLayer?.Title,
+        srs: xmlLayer?.SRS || [],
+        layers: []
+    };
+    // Single layer is not represented as array in XML
+    const xmlLayers = getXMLArray(xmlLayer?.Layer);
+    for (const xmlSubLayer of xmlLayers) {
+        layer.layers?.push(extractLayer(xmlSubLayer));
+    }
+    return layer;
+}
+function getXMLArray(xmlValue) {
+    if (Array.isArray(xmlValue)) {
+        return xmlValue;
+    }
+    if (xmlValue) {
+        return [xmlValue];
+    }
+    return [];
+}

package/dist/lib/parsers/wms/parse-wms-error.d.ts

@@ -0,0 +1,8 @@
+/**
+ * Extract an error message from WMS error response XML
+ * @param text
+ * @param options
+ * @returns a string with a human readable message
+ */
+export declare function parseWMSError(text: string, options: any): string;
+//# sourceMappingURL=parse-wms-error.d.ts.map

package/dist/lib/parsers/wms/parse-wms-error.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"parse-wms-error.d.ts","sourceRoot":"","sources":["../../../../src/lib/parsers/wms/parse-wms-error.ts"],"names":[],"mappings":"AAIA;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,KAAA,GAAG,MAAM,CAW3D"}

package/dist/lib/parsers/wms/parse-wms-error.js

@@ -0,0 +1,22 @@
+"use strict";
+// loaders.gl, MIT license
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseWMSError = void 0;
+const xml_1 = require("@loaders.gl/xml");
+/**
+ * Extract an error message from WMS error response XML
+ * @param text
+ * @param options
+ * @returns a string with a human readable message
+ */
+function parseWMSError(text, options) {
+    const parsedXML = xml_1.XMLLoader.parseTextSync?.(text, options);
+    const serviceExceptionXML = parsedXML?.ServiceExceptionReport?.ServiceException ||
+        parsedXML?.['ogc:ServiceExceptionReport']?.['ogc:ServiceException'];
+    // Sigh, can be either a string or an object
+    const message = typeof serviceExceptionXML === 'string'
+        ? serviceExceptionXML
+        : serviceExceptionXML.value || serviceExceptionXML.code || 'Unknown error';
+    return message;
+}
+exports.parseWMSError = parseWMSError;

package/dist/lib/parsers/wms/parse-wms-features.d.ts

@@ -0,0 +1,20 @@
+/** WMS Feature info - response to a WMS `GetFeatureInfo` request */
+export type WMSFeatureInfo = {
+    features: WMSFeature[];
+};
+export type WMSFeature = {
+    attributes: Record<string, number | string>;
+    type: string;
+    bounds: {
+        top: number;
+        bottom: number;
+        left: number;
+        right: number;
+    };
+};
+/**
+ * Parses a typed data structure from raw XML for `GetFeatureInfo` response
+ * @note Error handlings is fairly weak
+ */
+export declare function parseWMSFeatureInfo(text: string, options: any): WMSFeatureInfo;
+//# sourceMappingURL=parse-wms-features.d.ts.map

package/dist/lib/parsers/wms/parse-wms-features.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"parse-wms-features.d.ts","sourceRoot":"","sources":["../../../../src/lib/parsers/wms/parse-wms-features.ts"],"names":[],"mappings":"AAIA,oEAAoE;AACpE,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,EAAE,UAAU,EAAE,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAC,CAAC;CACpE,CAAC;AAEF;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,KAAA,GAAG,cAAc,CASzE"}

package/dist/lib/parsers/wms/parse-wms-features.js

@@ -0,0 +1,27 @@
+"use strict";
+// loaders.gl, MIT license
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseWMSFeatureInfo = void 0;
+const xml_1 = require("@loaders.gl/xml");
+/**
+ * Parses a typed data structure from raw XML for `GetFeatureInfo` response
+ * @note Error handlings is fairly weak
+ */
+function parseWMSFeatureInfo(text, options) {
+    const parsedXML = xml_1.XMLLoader.parseTextSync(text, options);
+    const xmlFeatureInfo = parsedXML.FeatureInfoResponse?.FIELDS || [];
+    const xmlFeatures = Array.isArray(xmlFeatureInfo) ? xmlFeatureInfo : [xmlFeatureInfo];
+    return {
+        features: xmlFeatures.map((xmlFeature) => extractFeature(xmlFeature))
+    };
+}
+exports.parseWMSFeatureInfo = parseWMSFeatureInfo;
+function extractFeature(xmlFeature) {
+    const xmlFields = xmlFeature || {};
+    // TODO - not correct
+    return {
+        attributes: xmlFields,
+        type: '',
+        bounds: { bottom: 0, top: 0, left: 0, right: 0 }
+    };
+}

package/dist/lib/parsers/wms/parse-wms-layer-description.d.ts

@@ -0,0 +1,10 @@
+/** Layer description - response to a WMS `DescribeLayer` request  */
+export type WMSLayerDescription = {
+    layers: {}[];
+};
+/**
+ * Parses a typed data structure from raw XML for `GetFeatureInfo` response
+ * @note Error handlings is fairly weak
+ */
+export declare function parseWMSLayerDescription(text: string, options: any): WMSLayerDescription;
+//# sourceMappingURL=parse-wms-layer-description.d.ts.map

package/dist/lib/parsers/wms/parse-wms-layer-description.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"parse-wms-layer-description.d.ts","sourceRoot":"","sources":["../../../../src/lib/parsers/wms/parse-wms-layer-description.ts"],"names":[],"mappings":"AAIA,qEAAqE;AACrE,MAAM,MAAM,mBAAmB,GAAG;IAChC,MAAM,EAAE,EAAE,EAAE,CAAC;CACd,CAAC;AAEF;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,KAAA,GAAG,mBAAmB,CAInF"}

package/dist/lib/parsers/wms/parse-wms-layer-description.js

@@ -0,0 +1,15 @@
+"use strict";
+// loaders.gl, MIT license
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseWMSLayerDescription = void 0;
+const xml_1 = require("@loaders.gl/xml");
+/**
+ * Parses a typed data structure from raw XML for `GetFeatureInfo` response
+ * @note Error handlings is fairly weak
+ */
+function parseWMSLayerDescription(text, options) {
+    const parsedXML = xml_1.XMLLoader.parseTextSync(text, options);
+    // TODO - implement parser
+    return parsedXML;
+}
+exports.parseWMSLayerDescription = parseWMSLayerDescription;

package/dist/lib/{data-sources/image-services → services/arcgis}/arcgis-image-service.d.ts

@@ -1,16 +1,23 @@
 import { ImageType } from '@loaders.gl/images';
-import type { ImageSourceMetadata, GetImageParameters } from '../image-source';
-import { ImageSource } from '../image-source';
-import { ImageServiceProps } from './image-service';
-export declare class ArcGISImageService extends ImageSource {
+import type { ImageSourceMetadata, GetImageParameters } from '../../sources/image-source';
+import type { ImageSourceProps } from '../../sources/image-source';
+import { ImageSource } from '../../sources/image-source';
+export type ArcGISImageServerProps = ImageSourceProps & {
+    url: string;
+};
+/**
+ * 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 ArcGISImageServer extends ImageSource {
     static type: 'arcgis-image-server';
     static testURL: (url: string) => boolean;
-    props: Required<ImageServiceProps>;
-    fetch: (url: string, options?: RequestInit) => Promise<Response>;
-    constructor(props: ImageServiceProps);
+    props: ArcGISImageServerProps;
+    constructor(props: ArcGISImageServerProps);
     getMetadata(): Promise<ImageSourceMetadata>;
     getImage(parameters: GetImageParameters): Promise<ImageType>;
-    info(): Promise<unknown>;
+    metadata(): Promise<unknown>;
     /**
      * Form a URL to an ESRI ImageServer
      // https://sampleserver6.arcgisonline.com/arcgis/rest/services/NLCDLandCover2001/ImageServer/exportImage?bbox=${bounds[0]},${bounds[1]},${bounds[2]},${bounds[3]}&bboxSR=4326&size=${width},${height}&imageSR=102100&time=&format=jpgpng&pixelType=U8&noData=&noDataInterpretation=esriNoDataMatchAny&interpolation=+RSP_NearestNeighbor&compression=&compressionQuality=&bandIds=&mosaicRule=&renderingRule=&f=image`,
@@ -34,16 +41,21 @@ export declare class ArcGISImageService extends ImageSource {
         renderingRule?: never;
         f?: 'image';
     }): Promise<ImageType>;
-    infoURL(options: {
+    metadataURL(options: {
         parameters?: Record<string, unknown>;
     }): string;
     /**
      * Form a URL to an ESRI ImageServer
-     // https://sampleserver6.arcgisonline.com/arcgis/rest/services/NLCDLandCover2001/ImageServer/exportImage?bbox=${bounds[0]},${bounds[1]},${bounds[2]},${bounds[3]}&bboxSR=4326&size=${width},${height}&imageSR=102100&time=&format=jpgpng&pixelType=U8&noData=&noDataInterpretation=esriNoDataMatchAny&interpolation=+RSP_NearestNeighbor&compression=&compressionQuality=&bandIds=&mosaicRule=&renderingRule=&f=image`,
+     // https://sampleserver6.arcgisonline.com/arcgis/rest/services/NLCDLandCover2001/ImageServer/exportImage?
+     //   bbox=${bounds[0]},${bounds[1]},${bounds[2]},${bounds[3]}&bboxSR=4326&
+     //   size=${width},${height}&imageSR=102100&time=&format=jpgpng&pixelType=U8&
+     //   noData=&noDataInterpretation=esriNoDataMatchAny&interpolation=+RSP_NearestNeighbor&compression=&
+     //   compressionQuality=&bandIds=&mosaicRule=&renderingRule=&
+     //   f=image
      */
     exportImageURL(options: {
-        boundingBox: [number, number, number, number];
-        boundingBoxSR?: string;
+        bbox: [number, number, number, number];
+        boxSR?: string;
         width: number;
         height: number;
         imageSR?: string;
@@ -64,7 +76,7 @@ export declare class ArcGISImageService extends ImageSource {
      * @note protected, since perhaps getWMSUrl may need to be overridden to handle certain backends?
      * @note if override is common, maybe add a callback prop?
      * */
-    protected getUrl(options: Record<string, unknown>, extra?: Record<string, unknown>): string;
+    protected getUrl(path: string, options: Record<string, unknown>, extra?: Record<string, unknown>): string;
     /** Checks for and parses a WMS XML formatted ServiceError and throws an exception */
     protected checkResponse(response: Response): Promise<void>;
 }

package/dist/lib/services/arcgis/arcgis-image-service.d.ts.map

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

package/dist/lib/{data-sources → services/arcgis}/arcgis-image-service.js

@@ -1,18 +1,21 @@
 "use strict";
 // loaders.gl, MIT license
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ArcGISImageService = void 0;
-const image_source_1 = require("./image-source");
-class ArcGISImageService extends image_source_1.ImageSource {
+exports.ArcGISImageServer = void 0;
+const image_source_1 = require("../../sources/image-source");
+/**
+ * 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
+ */
+class ArcGISImageServer extends image_source_1.ImageSource {
     constructor(props) {
-        super();
-        this.url = props.url;
-        this.loadOptions = props.loadOptions || {};
-        this.fetch = props.fetch || fetch;
+        super(props);
+        this.props = props;
     }
     // ImageSource (normalized endpoints)
     async getMetadata() {
-        return (await this.info());
+        return (await this.metadata());
         // TODO - normalize metadata
     }
     async getImage(parameters) {
@@ -21,7 +24,7 @@ class ArcGISImageService extends image_source_1.ImageSource {
         // return await this.exportImage(parameters);
     }
     // ImageServer endpoints
-    async info() {
+    async metadata() {
         // We just need a JSON parsing...
         // return this.getUrl({path: '', ...options});
         throw new Error('not implemented');
@@ -35,28 +38,35 @@ class ArcGISImageService extends image_source_1.ImageSource {
         throw new Error('not implemented');
     }
     // URL creators
-    infoURL(options) {
-        return this.url;
-        // return this.getUrl({path: '', ...options});
+    metadataURL(options) {
+        return `${this.props.url}?f=pjson`;
     }
     /**
      * Form a URL to an ESRI ImageServer
-     // https://sampleserver6.arcgisonline.com/arcgis/rest/services/NLCDLandCover2001/ImageServer/exportImage?bbox=${bounds[0]},${bounds[1]},${bounds[2]},${bounds[3]}&bboxSR=4326&size=${width},${height}&imageSR=102100&time=&format=jpgpng&pixelType=U8&noData=&noDataInterpretation=esriNoDataMatchAny&interpolation=+RSP_NearestNeighbor&compression=&compressionQuality=&bandIds=&mosaicRule=&renderingRule=&f=image`,
+     // https://sampleserver6.arcgisonline.com/arcgis/rest/services/NLCDLandCover2001/ImageServer/exportImage?
+     //   bbox=${bounds[0]},${bounds[1]},${bounds[2]},${bounds[3]}&bboxSR=4326&
+     //   size=${width},${height}&imageSR=102100&time=&format=jpgpng&pixelType=U8&
+     //   noData=&noDataInterpretation=esriNoDataMatchAny&interpolation=+RSP_NearestNeighbor&compression=&
+     //   compressionQuality=&bandIds=&mosaicRule=&renderingRule=&
+     //   f=image
      */
     exportImageURL(options) {
-        // const {boundingBox} = options;
-        // const bbox = `bbox=${boundingBox[0]},${boundingBox[1]},${boundingBox[2]},${boundingBox[3]}`;
-        // const size = `size=${width},${height}`;
-        // return this.getUrl({path: 'exportImage'});
-        return this.url;
+        const bbox = `bbox=${options.bbox[0]},${options.bbox[1]},${options.bbox[2]},${options.bbox[3]}`;
+        const size = `size=${options.width},${options.height}`;
+        const arcgisOptions = { ...options, bbox, size };
+        // @ts-expect-error
+        delete arcgisOptions.width;
+        // @ts-expect-error
+        delete arcgisOptions.height;
+        return this.getUrl('exportImage', arcgisOptions);
     }
     // INTERNAL METHODS
     /**
      * @note protected, since perhaps getWMSUrl may need to be overridden to handle certain backends?
      * @note if override is common, maybe add a callback prop?
      * */
-    getUrl(options, extra) {
-        let url = `${this.url}`;
+    getUrl(path, options, extra) {
+        let url = `${this.props.url}/${path}`;
         let first = true;
         for (const [key, value] of Object.entries(options)) {
             url += first ? '?' : '&';
@@ -80,6 +90,6 @@ class ArcGISImageService extends image_source_1.ImageSource {
         }
     }
 }
-exports.ArcGISImageService = ArcGISImageService;
-ArcGISImageService.type = 'arcgis-image-server';
-ArcGISImageService.testURL = (url) => url.toLowerCase().includes('ImageServer');
+exports.ArcGISImageServer = ArcGISImageServer;
+ArcGISImageServer.type = 'arcgis-image-server';
+ArcGISImageServer.testURL = (url) => url.toLowerCase().includes('ImageServer');

package/dist/lib/services/arcgis/arcgis-server.d.ts

@@ -0,0 +1,15 @@
+export type Service = {
+    name: string;
+    type: string;
+    url: string;
+};
+type FetchLike = typeof fetch;
+/**
+ * (Recursively) load the service directory from an ArcGIS Server URL
+ * @param url
+ * @param fetchFile= Optional fetch function override
+ * @returns
+ */
+export declare function getArcGISServices(url: string, fetchFile?: FetchLike): Promise<Service[] | null>;
+export {};
+//# sourceMappingURL=arcgis-server.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"arcgis-server.d.ts","sourceRoot":"","sources":["../../../../src/lib/services/arcgis/arcgis-server.ts"],"names":[],"mappings":"AAEA,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/lib/services/arcgis/arcgis-server.js

@@ -0,0 +1,42 @@
+"use strict";
+// loaders.gl, MIT license
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getArcGISServices = void 0;
+/**
+ * (Recursively) load the service directory from an ArcGIS Server URL
+ * @param url
+ * @param fetchFile= Optional fetch function override
+ * @returns
+ */
+async function getArcGISServices(url, fetchFile = fetch) {
+    if (url.includes('rest/services')) {
+        const serverUrl = url.replace(/rest\/services.*$/i, 'rest/services');
+        return loadServiceDirectory(serverUrl, fetchFile, []);
+    }
+    return null;
+}
+exports.getArcGISServices = getArcGISServices;
+async function loadServiceDirectory(serverUrl, fetch, path) {
+    const serviceUrl = `${serverUrl}/${path.join('/')}`;
+    const response = await fetch(`${serviceUrl}?f=pjson`);
+    const directory = await response.json();
+    const services = extractServices(directory, serviceUrl);
+    const folders = (directory.folders || []);
+    const promises = folders.map((folder) => loadServiceDirectory(`${serverUrl}`, fetch, [...path, folder]));
+    for (const folderServices of await Promise.all(promises)) {
+        services.push(...folderServices);
+    }
+    return services;
+}
+function extractServices(directory, url) {
+    const arcgisServices = (directory.services || []);
+    const services = [];
+    for (const service of arcgisServices) {
+        services.push({
+            name: service.name,
+            type: `arcgis-${service.type.toLocaleLowerCase().replace('server', '-server')}`,
+            url: `${url}${service.name}/${service.type}`
+        });
+    }
+    return services;
+}

package/dist/lib/{data-sources/image-services → services/generic}/image-service.d.ts

@@ -1,7 +1,7 @@
 import { LoaderOptions } from '@loaders.gl/loader-utils';
 import type { ImageType } from '@loaders.gl/images';
-import type { ImageSourceMetadata, GetImageParameters } from '../image-source';
-import { ImageSource } from '../image-source';
+import type { ImageSourceMetadata, GetImageParameters } from '../../sources/image-source';
+import { ImageSource } from '../../sources/image-source';
 /** Template URL string should contain `${width}` etc which will be substituted. */
 export type ImageServiceProps = {
     /** Base URL to the service */
@@ -17,8 +17,7 @@ export type ImageServiceProps = {
 export declare class ImageService extends ImageSource {
     static type: 'template';
     static testURL: (url: string) => boolean;
-    props: Required<ImageServiceProps>;
-    fetch: (url: string, options?: RequestInit) => Promise<Response>;
+    props: ImageServiceProps;
     constructor(props: ImageServiceProps);
     getMetadata(): Promise<ImageSourceMetadata>;
     getImage(parameters: GetImageParameters): Promise<ImageType>;
@@ -27,13 +26,4 @@ export declare class ImageService extends ImageSource {
     /** Supports both ${} and {} notations */
     protected getURLFromTemplate(parameters: Record<string, unknown>): string;
 }
-/**
- * Gets the current fetch function from options
- * @todo - move to loader-utils module
- * @todo - use in core module counterpart
- * @param options
- * @param context
- */
-export declare function getFetchFunction(options?: LoaderOptions): (url: string, fetchOptions?: RequestInit) => Promise<Response>;
-export declare function mergeImageServiceProps(props: ImageServiceProps): Required<ImageServiceProps>;
 //# sourceMappingURL=image-service.d.ts.map

package/dist/lib/services/generic/image-service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"image-service.d.ts","sourceRoot":"","sources":["../../../../src/lib/services/generic/image-service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAC;AACvD,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,oBAAoB,CAAC;AAGlD,OAAO,KAAK,EAAC,mBAAmB,EAAE,kBAAkB,EAAC,MAAM,4BAA4B,CAAC;AACxF,OAAO,EAAC,WAAW,EAAC,MAAM,4BAA4B,CAAC;AAEvD,mFAAmF;AACnF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,8BAA8B;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,gFAAgF;IAChF,WAAW,CAAC,EAAE,aAAa,CAAC;CAC7B,CAAC;AAEF;;;;GAIG;AACH,qBAAa,YAAa,SAAQ,WAAW;IAC3C,MAAM,CAAC,IAAI,EAAE,UAAU,CAAc;IACrC,MAAM,CAAC,OAAO,QAAS,MAAM,KAAG,OAAO,CAAoC;IAE3E,KAAK,EAAE,iBAAiB,CAAC;gBAEb,KAAK,EAAE,iBAAiB;IAO9B,WAAW,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAI3C,QAAQ,CAAC,UAAU,EAAE,kBAAkB,GAAG,OAAO,CAAC,SAAS,CAAC;IAUlE,wDAAwD;IACxD,SAAS,CAAC,qBAAqB,CAAC,UAAU,EAAE,kBAAkB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAKxF,yCAAyC;IACzC,SAAS,CAAC,kBAAkB,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM;CAU1E"}

package/dist/lib/{data-sources/adhoc-image-service.js → services/generic/image-service.js}

@@ -1,18 +1,18 @@
 "use strict";
 // loaders.gl, MIT license
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AdHocImageService = void 0;
+exports.ImageService = void 0;
 const images_1 = require("@loaders.gl/images");
-const image_source_1 = require("./image-source");
+const image_source_1 = require("../../sources/image-source");
 /**
  * Quickly connect to "ad hoc" image sources without subclassing ImageSource.
  * ImageSource allows template url strings to be used to ad hoc connect to arbitrary image data sources
  * Accepts a template url string and builds requests URLs
  */
-class AdHocImageService extends image_source_1.ImageSource {
+class ImageService extends image_source_1.ImageSource {
     constructor(props) {
-        super();
-        this.templateUrl = props.templateUrl;
+        super(props);
+        this.props = props;
     }
     // IMAGE SOURCE API
     async getMetadata() {
@@ -21,7 +21,7 @@ class AdHocImageService extends image_source_1.ImageSource {
     async getImage(parameters) {
         const granularParameters = this.getGranularParameters(parameters);
         const url = this.getURLFromTemplate(granularParameters);
-        const response = await fetch(url);
+        const response = await this.fetch(url);
         const arrayBuffer = await response.arrayBuffer();
         return await images_1.ImageLoader.parse(arrayBuffer);
     }
@@ -31,16 +31,18 @@ class AdHocImageService extends image_source_1.ImageSource {
         const [east, north, west, south] = parameters.bbox;
         return { ...parameters, east, north, south, west };
     }
+    /** Supports both ${} and {} notations */
     getURLFromTemplate(parameters) {
-        let url = this.templateUrl;
+        let url = this.props.url;
         for (const [key, value] of Object.entries(parameters)) {
             // TODO - parameter could be repeated
             // const regex = new RegExp(`\${${key}}`, 'g');
             url = url.replace(`\${${key}}`, String(value));
+            url = url.replace(`{${key}}`, String(value));
         }
         return url;
     }
 }
-exports.AdHocImageService = AdHocImageService;
-AdHocImageService.type = 'template';
-AdHocImageService.testURL = (url) => url.toLowerCase().includes('{');
+exports.ImageService = ImageService;
+ImageService.type = 'template';
+ImageService.testURL = (url) => url.toLowerCase().includes('{');

package/dist/lib/services/generic/tile-service.d.ts

@@ -0,0 +1 @@
+//# sourceMappingURL=tile-service.d.ts.map

package/dist/lib/services/generic/tile-service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tile-service.d.ts","sourceRoot":"","sources":["../../../../src/lib/services/generic/tile-service.ts"],"names":[],"mappings":""}

package/dist/lib/services/generic/tile-service.js

@@ -0,0 +1 @@
+"use strict";