@loaders.gl/wms 3.4.1 → 3.4.3

package/dist/wip/wms-feature-info-loader.d.ts

@@ -1,5 +1,5 @@
 import type { LoaderWithParser } from '@loaders.gl/loader-utils';
-import { WMSLoaderOptions } from '../wms-capabilities-loader';
+import type { XMLLoaderOptions } from '@loaders.gl/xml';
 import type { WMSFeatureInfo } from '../lib/parsers/wms/parse-wms-features';
 export { WMSFeatureInfo };
 /**
@@ -8,8 +8,8 @@ export { WMSFeatureInfo };
 export declare const WMSFeatureInfoLoader: {
     id: string;
     name: string;
-    parse: (arrayBuffer: ArrayBuffer, options?: WMSLoaderOptions) => Promise<WMSFeatureInfo>;
-    parseTextSync: (text: string, options?: WMSLoaderOptions) => WMSFeatureInfo;
+    parse: (arrayBuffer: ArrayBuffer, options?: XMLLoaderOptions) => Promise<WMSFeatureInfo>;
+    parseTextSync: (text: string, options?: XMLLoaderOptions) => WMSFeatureInfo;
     module: string;
     version: any;
     worker: boolean;

package/dist/wip/wms-feature-info-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wms-feature-info-loader.d.ts","sourceRoot":"","sources":["../../src/wip/wms-feature-info-loader.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAwB,gBAAgB,EAAC,MAAM,4BAA4B,CAAC;AAEnF,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,uCAAuC,CAAC;AAG1E,OAAO,EAAC,cAAc,EAAC,CAAC;AAExB;;GAEG;AACH,eAAO,MAAM,oBAAoB;;;yBAMJ,WAAW,YAAY,gBAAgB;0BAE5C,MAAM,YAAY,gBAAgB;;;;;;;;;;CACzD,CAAC;AAEF,eAAO,MAAM,8BAA8B,EAAE,gBAAuC,CAAC"}
+{"version":3,"file":"wms-feature-info-loader.d.ts","sourceRoot":"","sources":["../../src/wip/wms-feature-info-loader.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAC/D,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AAGtD,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,uCAAuC,CAAC;AAG1E,OAAO,EAAC,cAAc,EAAC,CAAC;AAExB;;GAEG;AACH,eAAO,MAAM,oBAAoB;;;yBAMJ,WAAW,YAAY,gBAAgB;0BAE5C,MAAM,YAAY,gBAAgB;;;;;;;;;;CACzD,CAAC;AAEF,eAAO,MAAM,8BAA8B,EAAE,gBAAuC,CAAC"}

package/dist/wip/wms-layer-description-loader.d.ts

@@ -1,5 +1,5 @@
 import type { LoaderWithParser } from '@loaders.gl/loader-utils';
-import type { WMSLoaderOptions } from '../wms-capabilities-loader';
+import type { XMLLoaderOptions } from '@loaders.gl/xml';
 import type { WMSLayerDescription } from '../lib/parsers/wms/parse-wms-layer-description';
 export { WMSLayerDescription };
 /**
@@ -8,8 +8,8 @@ export { WMSLayerDescription };
 export declare const WMSLayerDescriptionLoader: {
     id: string;
     name: string;
-    parse: (arrayBuffer: ArrayBuffer, options?: WMSLoaderOptions) => Promise<WMSLayerDescription>;
-    parseTextSync: (text: string, options?: WMSLoaderOptions) => WMSLayerDescription;
+    parse: (arrayBuffer: ArrayBuffer, options?: XMLLoaderOptions) => Promise<WMSLayerDescription>;
+    parseTextSync: (text: string, options?: XMLLoaderOptions) => WMSLayerDescription;
     module: string;
     version: any;
     worker: boolean;

package/dist/wip/wms-layer-description-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wms-layer-description-loader.d.ts","sourceRoot":"","sources":["../../src/wip/wms-layer-description-loader.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAC/D,OAAO,KAAI,EAAC,gBAAgB,EAAC,MAAM,4BAA4B,CAAC;AAGhE,OAAO,KAAK,EAAC,mBAAmB,EAAC,MAAM,gDAAgD,CAAC;AAGxF,OAAO,EAAC,mBAAmB,EAAC,CAAC;AAE7B;;GAEG;AACH,eAAO,MAAM,yBAAyB;;;yBAMT,WAAW,YAAY,gBAAgB;0BAE5C,MAAM,YAAY,gBAAgB;;;;;;;;;;CACzD,CAAC;AAEF,eAAO,MAAM,8BAA8B,EAAE,gBAA4C,CAAC"}
+{"version":3,"file":"wms-layer-description-loader.d.ts","sourceRoot":"","sources":["../../src/wip/wms-layer-description-loader.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAC/D,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AAGtD,OAAO,KAAK,EAAC,mBAAmB,EAAC,MAAM,gDAAgD,CAAC;AAGxF,OAAO,EAAC,mBAAmB,EAAC,CAAC;AAE7B;;GAEG;AACH,eAAO,MAAM,yBAAyB;;;yBAMT,WAAW,YAAY,gBAAgB;0BAE5C,MAAM,YAAY,gBAAgB;;;;;;;;;;CACzD,CAAC;AAEF,eAAO,MAAM,8BAA8B,EAAE,gBAA4C,CAAC"}

package/dist/wip/wmts-capabilities-loader.d.ts

@@ -1,5 +1,6 @@
-import type { LoaderWithParser, LoaderOptions } from '@loaders.gl/loader-utils';
-export type WMTSLoaderOptions = LoaderOptions & {
+import type { LoaderWithParser } from '@loaders.gl/loader-utils';
+import type { XMLLoaderOptions } from '@loaders.gl/xml';
+export type WMTSLoaderOptions = XMLLoaderOptions & {
     wmts?: {};
 };
 /**

package/dist/wip/wmts-capabilities-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wmts-capabilities-loader.d.ts","sourceRoot":"","sources":["../../src/wip/wmts-capabilities-loader.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,gBAAgB,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAU9E,MAAM,MAAM,iBAAiB,GAAG,aAAa,GAAG;IAC9C,IAAI,CAAC,EAAE,EAAE,CAAC;CACX,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,sBAAsB;;;;;;;;;;;;yBAaN,WAAW,YAAY,iBAAiB;0BAE7C,MAAM,YAAY,iBAAiB;CAC1D,CAAC;AAEF,iBAAS,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAG1C;AAED,eAAO,MAAM,gCAAgC,EAAE,gBAAyC,CAAC"}
+{"version":3,"file":"wmts-capabilities-loader.d.ts","sourceRoot":"","sources":["../../src/wip/wmts-capabilities-loader.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAC/D,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AAUtD,MAAM,MAAM,iBAAiB,GAAG,gBAAgB,GAAG;IACjD,IAAI,CAAC,EAAE,EAAE,CAAC;CACX,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,sBAAsB;;;;;;;;;;;;yBAaN,WAAW,YAAY,iBAAiB;0BAE7C,MAAM,YAAY,iBAAiB;CAC1D,CAAC;AAEF,iBAAS,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAG1C;AAED,eAAO,MAAM,gCAAgC,EAAE,gBAAyC,CAAC"}

package/dist/wms-capabilities-loader.d.ts

@@ -1,11 +1,15 @@
-import type { LoaderWithParser, LoaderOptions } from '@loaders.gl/loader-utils';
-import type { WMSCapabilities } from './lib/parsers/wms/parse-wms-capabilities';
-export type { WMSCapabilities };
-export type WMSLoaderOptions = LoaderOptions & {
+import type { LoaderWithParser } from '@loaders.gl/loader-utils';
+import type { XMLLoaderOptions } from '@loaders.gl/xml';
+export type { WMSCapabilities, WMSLayer, WMSBoundingBox, WMSDimension, WMSRequest, WMSExceptions } from './lib/parsers/wms/parse-wms-capabilities';
+export type WMSCapabilitiesLoaderOptions = XMLLoaderOptions & {
     wms?: {
         /** Add inherited layer information to sub layers */
         inheritedLayerProps?: boolean;
-        /** Whether to include "raw" XML-derived JSON */
+        /** Include the "raw" JSON (parsed but untyped, unprocessed XML). May contain additional fields */
+        includeRawData?: boolean;
+        /** Include the original XML document text. May contain additional information. */
+        includeXMLText?: boolean;
+        /** @deprecated Use options.includeRawData` */
         raw?: boolean;
     };
 };
@@ -24,8 +28,8 @@ export declare const WMSCapabilitiesLoader: {
     options: {
         wms: {};
     };
-    parse: (arrayBuffer: ArrayBuffer, options?: WMSLoaderOptions) => Promise<WMSCapabilities>;
-    parseTextSync: (text: string, options?: WMSLoaderOptions) => WMSCapabilities;
+    parse: (arrayBuffer: ArrayBuffer, options?: WMSCapabilitiesLoaderOptions) => Promise<import("./lib/parsers/wms/parse-wms-capabilities").WMSCapabilities>;
+    parseTextSync: (text: string, options?: WMSCapabilitiesLoaderOptions) => import("./lib/parsers/wms/parse-wms-capabilities").WMSCapabilities;
 };
 declare function testXMLFile(text: string): boolean;
 export declare const _typecheckWMSCapabilitiesLoader: LoaderWithParser;

package/dist/wms-capabilities-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wms-capabilities-loader.d.ts","sourceRoot":"","sources":["../src/wms-capabilities-loader.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,gBAAgB,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAC9E,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,0CAA0C,CAAC;AAQ9E,YAAY,EAAC,eAAe,EAAC,CAAC;AAE9B,MAAM,MAAM,gBAAgB,GAAG,aAAa,GAAG;IAC7C,GAAG,CAAC,EAAE;QACJ,oDAAoD;QACpD,mBAAmB,CAAC,EAAE,OAAO,CAAC;QAC9B,gDAAgD;QAChD,GAAG,CAAC,EAAE,OAAO,CAAC;KACf,CAAC;CACH,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,qBAAqB;;;;;;;;;;;;yBAaL,WAAW,YAAY,gBAAgB;0BAE5C,MAAM,YAAY,gBAAgB;CAEzD,CAAC;AAEF,iBAAS,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAG1C;AAED,eAAO,MAAM,+BAA+B,EAAE,gBAAwC,CAAC"}
+{"version":3,"file":"wms-capabilities-loader.d.ts","sourceRoot":"","sources":["../src/wms-capabilities-loader.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAC/D,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AAQtD,YAAY,EACV,eAAe,EACf,QAAQ,EACR,cAAc,EACd,YAAY,EACZ,UAAU,EACV,aAAa,EACd,MAAM,0CAA0C,CAAC;AAElD,MAAM,MAAM,4BAA4B,GAAG,gBAAgB,GAAG;IAC5D,GAAG,CAAC,EAAE;QACJ,oDAAoD;QACpD,mBAAmB,CAAC,EAAE,OAAO,CAAC;QAC9B,kGAAkG;QAClG,cAAc,CAAC,EAAE,OAAO,CAAC;QACzB,kFAAkF;QAClF,cAAc,CAAC,EAAE,OAAO,CAAC;QACzB,8CAA8C;QAC9C,GAAG,CAAC,EAAE,OAAO,CAAC;KACf,CAAC;CACH,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,qBAAqB;;;;;;;;;;;;yBAaL,WAAW,YAAY,4BAA4B;0BAGxD,MAAM,YAAY,4BAA4B;CAGrE,CAAC;AAEF,iBAAS,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAG1C;AAED,eAAO,MAAM,+BAA+B,EAAE,gBAAwC,CAAC"}

package/dist/wms-capabilities-loader.js

@@ -21,8 +21,12 @@ exports.WMSCapabilitiesLoader = {
     options: {
         wms: {}
     },
-    parse: async (arrayBuffer, options) => (0, parse_wms_capabilities_1.parseWMSCapabilities)(new TextDecoder().decode(arrayBuffer), options?.wms),
-    parseTextSync: (text, options) => (0, parse_wms_capabilities_1.parseWMSCapabilities)(text, options?.wms)
+    parse: async (arrayBuffer, options) => 
+    // TODO pass in XML options
+    (0, parse_wms_capabilities_1.parseWMSCapabilities)(new TextDecoder().decode(arrayBuffer), options?.wms),
+    parseTextSync: (text, options) => 
+    // TODO pass in XML options
+    (0, parse_wms_capabilities_1.parseWMSCapabilities)(text, options?.wms)
 };
 function testXMLFile(text) {
     // TODO - There could be space first.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/wms",
-  "version": "3.4.1",
+  "version": "3.4.3",
   "description": "Framework-independent loaders for the WMS (Web Map Service) standard",
   "license": "MIT",
   "publishConfig": {
@@ -39,10 +39,10 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.3.1",
-    "@loaders.gl/images": "3.4.1",
-    "@loaders.gl/loader-utils": "3.4.1",
-    "@loaders.gl/schema": "3.4.1",
-    "@loaders.gl/xml": "3.4.1",
+    "@loaders.gl/images": "3.4.3",
+    "@loaders.gl/loader-utils": "3.4.3",
+    "@loaders.gl/schema": "3.4.3",
+    "@loaders.gl/xml": "3.4.3",
     "@turf/rewind": "^5.1.5",
     "deep-strict-equal": "^0.2.0",
     "lerc": "^4.0.1"
@@ -50,5 +50,5 @@
   "devDependencies": {
     "xmldom": "0.6.0"
   },
-  "gitHead": "2c39d1032c1a8b3678a6f09507b89ffe92ca9e1b"
+  "gitHead": "e60626daeaec1e08eae0009668736f85410f8323"
 }

package/src/index.ts

@@ -17,9 +17,13 @@ export {CSWRecordsLoader} from './csw-records-loader';
 
 export {WMSErrorLoader} from './wms-error-loader';
 
-export type {WMSLoaderOptions} from './wms-capabilities-loader';
-
-export type {WMSCapabilities} from './wms-capabilities-loader';
+export type {
+  WMSCapabilities,
+  WMSLayer,
+  WMSBoundingBox,
+  WMSDimension
+} from './wms-capabilities-loader';
+export type {WMSCapabilitiesLoaderOptions} from './wms-capabilities-loader';
 export {WMSCapabilitiesLoader} from './wms-capabilities-loader';
 
 export type {WMSFeatureInfo as _WMSFeatureInfo} from './wip/wms-feature-info-loader';
@@ -75,3 +79,6 @@ export {ArcGISImageServer as _ArcGISImageServer} from './lib/services/arcgis/arc
 // TODO - restore once esbuild bundling issues have been resolved
 // export type {LERCData} from './lib/lerc/lerc-types';
 // export {LERCLoader} from './lerc-loader';
+
+/** @deprecated Use WMSCapabilitiesLoaderOptions */
+export type {WMSCapabilitiesLoaderOptions as WMSLoaderOptions} from './wms-capabilities-loader';

package/src/lib/parsers/wms/parse-wms-capabilities.ts

@@ -143,7 +143,7 @@ export type WMSExceptions = {
   mimeTypes: string[];
 };
 
-export type parseWMSCapabilitiesOptions = {
+export type ParseWMSCapabilitiesOptions = {
   /** Add inherited layer information to sub layers */
   inheritedLayerProps?: boolean;
   /** Include the "raw" JSON (parsed but untyped, unprocessed XML). May contain additional fields */
@@ -152,7 +152,6 @@ export type parseWMSCapabilitiesOptions = {
   includeXMLText?: boolean;
   /** @deprecated Use includeRawData` */
   raw?: boolean;
-
   // xml options are passed through to xml loader
 };
 
@@ -162,7 +161,7 @@ export type parseWMSCapabilitiesOptions = {
  */
 export function parseWMSCapabilities(
   xmlText: string,
-  options?: parseWMSCapabilitiesOptions
+  options?: ParseWMSCapabilitiesOptions
 ): WMSCapabilities {
   const parsedXML = XMLLoader.parseTextSync(xmlText, options);
   const xmlCapabilities: any =
@@ -254,8 +253,8 @@ function extractLayer(xmlLayer: any): WMSLayer {
     // All layers must have a title
     title: String(xmlLayer?.Title || ''),
     // Name is required only if renderable
-    name: String(xmlLayer?.Name),
-    abstract: String(xmlLayer?.Abstract),
+    name: xmlLayer?.Name && String(xmlLayer?.Name),
+    abstract: xmlLayer?.Name && String(xmlLayer?.Abstract),
     keywords: getXMLStringArray(xmlLayer.KeywordList?.Keyword)
   };
 
@@ -406,19 +405,21 @@ function extractDimension(xmlDimension: any): WMSDimension {
 /** Traverse layers and inject missing props from parents */
 // eslint-disable-next-line complexity
 function addInheritedLayerProps(layer: WMSLayer, parent: WMSLayer | null): void {
-  if (parent && parent.geographicBoundingBox && !layer.geographicBoundingBox) {
+  if (parent?.geographicBoundingBox && !layer.geographicBoundingBox) {
     layer.geographicBoundingBox = [...parent.geographicBoundingBox];
   }
 
-  if (parent && parent.crs && !layer.crs) {
+  if (parent?.crs && !layer.crs) {
     layer.crs = [...parent.crs];
   }
 
-  if (parent && parent.boundingBoxes && !layer.boundingBoxes) {
+  if (parent?.boundingBoxes && !layer.boundingBoxes) {
     layer.boundingBoxes = [...parent.boundingBoxes];
   }
 
-  // TODO inherit other elements
+  if (parent?.dimensions && !layer.dimensions) {
+    layer.dimensions = [...parent.dimensions];
+  }
 
   for (const subLayer of layer.layers || []) {
     addInheritedLayerProps(subLayer, layer);

package/src/lib/parsers/wms/parse-wms-layer-description.ts

@@ -1,5 +1,6 @@
 // loaders.gl, MIT license
 
+import type {XMLLoaderOptions} from '@loaders.gl/xml';
 import {XMLLoader} from '@loaders.gl/xml';
 
 /** Layer description - response to a WMS `DescribeLayer` request  */
@@ -11,8 +12,11 @@ export type WMSLayerDescription = {
  * Parses a typed data structure from raw XML for `GetFeatureInfo` response
  * @note Error handlings is fairly weak
  */
-export function parseWMSLayerDescription(text: string, options): WMSLayerDescription {
-  const parsedXML = XMLLoader.parseTextSync(text, options);
+export function parseWMSLayerDescription(
+  text: string,
+  options?: XMLLoaderOptions
+): WMSLayerDescription {
+  const parsedXML = XMLLoader.parseTextSync?.(text, options);
   // TODO - implement parser
   return parsedXML as unknown as WMSLayerDescription;
 }

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

@@ -7,8 +7,8 @@ import {DataSource} from './data-source';
 /**
  * Normalized capabilities of an Image service
  * @example
- *  The WMSService will normalize the response to the WMS `GetCapabilities` data structure extracted from WMS XML response
- *  into an ImageSourceMetadata.
+ *  The WMSService will normalize the response to the WMS `GetCapabilities`
+ *  data structure extracted from WMS XML response into an ImageSourceMetadata.
  */
 export type ImageSourceMetadata = {
   name: string;
@@ -18,14 +18,24 @@ export type ImageSourceMetadata = {
   layers: ImageSourceLayer[];
 };
 
+/** Description of one data layer in the image source */
 export type ImageSourceLayer = {
+  /** Name of this layer */
   name?: string;
+  /** Human readable title of this layer */
   title?: string;
+  /** Coordinate systems supported by this layer */
   crs?: string[];
-  boundingBox?: [number, number, number, number];
+  /** layer limits in unspecified CRS:84-like lng/lat, for quick access w/o CRS calculations. */
+  geographicBoundingBox?: [min: [x: number, y: number], max: [x: number, y: number]];
+  /** Sub layers of this layer */
   layers?: ImageSourceLayer[];
+
+  /** @deprecated from v3.4: non-vis.gl style bounding box. Use `.geographicBoundingBox` instead */
+  boundingBox?: [number, number, number, number];
 };
 
+/** Generic parameters for requesting an image from an image source */
 export type GetImageParameters = {
   /** Layers to render */
   layers: string | string[];

package/src/wip/wms-feature-info-loader.ts

@@ -1,7 +1,8 @@
 // loaders.gl, MIT license
 
 import type {LoaderWithParser} from '@loaders.gl/loader-utils';
-import {WMSCapabilitiesLoader, WMSLoaderOptions} from '../wms-capabilities-loader';
+import type {XMLLoaderOptions} from '@loaders.gl/xml';
+import {WMSCapabilitiesLoader} from '../wms-capabilities-loader';
 
 import type {WMSFeatureInfo} from '../lib/parsers/wms/parse-wms-features';
 import {parseWMSFeatureInfo} from '../lib/parsers/wms/parse-wms-features';
@@ -17,9 +18,9 @@ export const WMSFeatureInfoLoader = {
   id: 'wms-feature-info',
   name: 'WMS FeatureInfo',
 
-  parse: async (arrayBuffer: ArrayBuffer, options?: WMSLoaderOptions) =>
+  parse: async (arrayBuffer: ArrayBuffer, options?: XMLLoaderOptions) =>
     parseWMSFeatureInfo(new TextDecoder().decode(arrayBuffer), options),
-  parseTextSync: (text: string, options?: WMSLoaderOptions) => parseWMSFeatureInfo(text, options)
+  parseTextSync: (text: string, options?: XMLLoaderOptions) => parseWMSFeatureInfo(text, options)
 };
 
 export const _typecheckWMSFeatureInfoLoader: LoaderWithParser = WMSFeatureInfoLoader;

package/src/wip/wms-layer-description-loader.ts

@@ -1,7 +1,7 @@
 // loaders.gl, MIT license
 
 import type {LoaderWithParser} from '@loaders.gl/loader-utils';
-import type{WMSLoaderOptions} from '../wms-capabilities-loader';
+import type {XMLLoaderOptions} from '@loaders.gl/xml';
 import {WMSCapabilitiesLoader} from '../wms-capabilities-loader';
 
 import type {WMSLayerDescription} from '../lib/parsers/wms/parse-wms-layer-description';
@@ -18,9 +18,9 @@ export const WMSLayerDescriptionLoader = {
   id: 'wms-layer-description',
   name: 'WMS DescribeLayer',
 
-  parse: async (arrayBuffer: ArrayBuffer, options?: WMSLoaderOptions) =>
+  parse: async (arrayBuffer: ArrayBuffer, options?: XMLLoaderOptions) =>
     parseWMSLayerDescription(new TextDecoder().decode(arrayBuffer), options),
-  parseTextSync: (text: string, options?: WMSLoaderOptions) => parseWMSLayerDescription(text, options)
+  parseTextSync: (text: string, options?: XMLLoaderOptions) => parseWMSLayerDescription(text, options)
 };
 
 export const _typecheckWMSFeatureInfoLoader: LoaderWithParser = WMSLayerDescriptionLoader;

package/src/wip/wmts-capabilities-loader.ts

@@ -1,6 +1,7 @@
 // loaders.gl, MIT license
 
-import type {LoaderWithParser, LoaderOptions} from '@loaders.gl/loader-utils';
+import type {LoaderWithParser} from '@loaders.gl/loader-utils';
+import type {XMLLoaderOptions} from '@loaders.gl/xml';
 // import type {WMTSCapabilities} from './lib/wmts/parse-wmts-capabilities';
 import {parseWMTSCapabilities} from './lib/wmts/parse-wmts-capabilities';
 
@@ -10,7 +11,7 @@ const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
 
 // export type {WMTSCapabilities};
 
-export type WMTSLoaderOptions = LoaderOptions & {
+export type WMTSLoaderOptions = XMLLoaderOptions & {
   wmts?: {};
 };
 

package/src/wms-capabilities-loader.ts

@@ -1,21 +1,32 @@
 // loaders.gl, MIT license
 
-import type {LoaderWithParser, LoaderOptions} from '@loaders.gl/loader-utils';
-import type {WMSCapabilities} from './lib/parsers/wms/parse-wms-capabilities';
+import type {LoaderWithParser} from '@loaders.gl/loader-utils';
+import type {XMLLoaderOptions} from '@loaders.gl/xml';
 import {parseWMSCapabilities} from './lib/parsers/wms/parse-wms-capabilities';
 
 // __VERSION__ is injected by babel-plugin-version-inline
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.
 const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
 
-// Parsed data type
-export type {WMSCapabilities};
-
-export type WMSLoaderOptions = LoaderOptions & {
+// Parsed data types
+export type {
+  WMSCapabilities,
+  WMSLayer,
+  WMSBoundingBox,
+  WMSDimension,
+  WMSRequest,
+  WMSExceptions
+} from './lib/parsers/wms/parse-wms-capabilities';
+
+export type WMSCapabilitiesLoaderOptions = XMLLoaderOptions & {
   wms?: {
     /** Add inherited layer information to sub layers */
     inheritedLayerProps?: boolean;
-    /** Whether to include "raw" XML-derived JSON */
+    /** Include the "raw" JSON (parsed but untyped, unprocessed XML). May contain additional fields */
+    includeRawData?: boolean;
+    /** Include the original XML document text. May contain additional information. */
+    includeXMLText?: boolean;
+    /** @deprecated Use options.includeRawData` */
     raw?: boolean;
   };
 };
@@ -36,9 +47,11 @@ export const WMSCapabilitiesLoader = {
   options: {
     wms: {}
   },
-  parse: async (arrayBuffer: ArrayBuffer, options?: WMSLoaderOptions) =>
+  parse: async (arrayBuffer: ArrayBuffer, options?: WMSCapabilitiesLoaderOptions) =>
+    // TODO pass in XML options
     parseWMSCapabilities(new TextDecoder().decode(arrayBuffer), options?.wms),
-  parseTextSync: (text: string, options?: WMSLoaderOptions) =>
+  parseTextSync: (text: string, options?: WMSCapabilitiesLoaderOptions) =>
+    // TODO pass in XML options
     parseWMSCapabilities(text, options?.wms)
 };