@loaders.gl/xml 4.0.0-alpha.23 → 4.0.0-alpha.25

package/dist/dist.min.js

@@ -3096,7 +3096,7 @@ Actual: ${this.attribValue}`);
   function mergeOptionsRecursively(baseOptions, newOptions) {
     const options = { ...baseOptions };
     for (const [key, newValue] of Object.entries(newOptions)) {
-      if (newValue && typeof newValue === "object") {
+      if (newValue && typeof newValue === "object" && !Array.isArray(newValue)) {
         options[key] = mergeOptionsRecursively(options[key] || {}, newOptions[key]);
       } else {
         options[key] = newOptions[key];

package/dist/es5/xml-loader.js

@@ -11,7 +11,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _parseXml = require("./lib/parsers/parse-xml");
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-var VERSION = typeof "4.0.0-alpha.23" !== 'undefined' ? "4.0.0-alpha.23" : 'latest';
+var VERSION = typeof "4.0.0-alpha.25" !== 'undefined' ? "4.0.0-alpha.25" : 'latest';
 var XMLLoader = {
   name: 'XML',
   id: 'xml',

package/dist/esm/xml-loader.js

@@ -1,5 +1,5 @@
 import { parseXMLSync } from './lib/parsers/parse-xml';
-const VERSION = typeof "4.0.0-alpha.23" !== 'undefined' ? "4.0.0-alpha.23" : 'latest';
+const VERSION = typeof "4.0.0-alpha.25" !== 'undefined' ? "4.0.0-alpha.25" : 'latest';
 export const XMLLoader = {
   name: 'XML',
   id: 'xml',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/xml",
-  "version": "4.0.0-alpha.23",
+  "version": "4.0.0-alpha.25",
   "description": "Framework-independent loaders for the XML (eXtensible Markup Language) format",
   "license": "MIT",
   "publishConfig": {
@@ -33,9 +33,9 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.3.1",
-    "@loaders.gl/loader-utils": "4.0.0-alpha.23",
-    "@loaders.gl/schema": "4.0.0-alpha.23",
+    "@loaders.gl/loader-utils": "4.0.0-alpha.25",
+    "@loaders.gl/schema": "4.0.0-alpha.25",
     "fast-xml-parser": "^4.2.5"
   },
-  "gitHead": "e212f2a0c0e342f7cb65ce84fa2ff39f64b7d94b"
+  "gitHead": "40135f391b869388dbbcd615bbe51178d0c370be"
 }

package/dist/bundle.js

@@ -1,5 +0,0 @@
-"use strict";
-// @ts-nocheck
-const moduleExports = require('./index');
-globalThis.loaders = globalThis.loaders || {};
-module.exports = Object.assign(globalThis.loaders, moduleExports);

package/dist/html-loader.js

@@ -1,40 +0,0 @@
-"use strict";
-// loaders.gl, MIT license
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.HTMLLoader = void 0;
-const loader_utils_1 = require("@loaders.gl/loader-utils");
-const xml_loader_1 = require("./xml-loader");
-/**
- * Loader for HTML files
- * Essentially a copy of the XMLLoader with different mime types, file extensions and content tests.
- * This split enables applications can control whether they want HTML responses to be parsed by the XML loader or not.
- * This loader does not have any additional understanding of the structure of HTML or the document.
- */
-exports.HTMLLoader = {
-    ...xml_loader_1.XMLLoader,
-    name: 'HTML',
-    id: 'html',
-    extensions: ['html', 'htm'],
-    mimeTypes: ['text/html'],
-    testText: testHTMLFile,
-    parse: async (arrayBuffer, options) => parseTextSync(new TextDecoder().decode(arrayBuffer), options),
-    parseTextSync: (text, options) => parseTextSync(text, options)
-};
-function testHTMLFile(text) {
-    // TODO - There could be space first.
-    return text.startsWith('<html');
-}
-function parseTextSync(text, options) {
-    // fast-xml-parser can recognize HTML entities
-    // https://github.com/NaturalIntelligence/fast-xml-parser/blob/master/docs/v4/2.XMLparseOptions.md#htmlentities
-    // https://github.com/NaturalIntelligence/fast-xml-parser/blob/master/docs/v4/5.Entities.md
-    options = (0, loader_utils_1.mergeLoaderOptions)(options, {
-        xml: {
-            _parser: 'fast-xml-parser',
-            _fastXML: {
-                htmlEntities: true
-            }
-        }
-    });
-    return xml_loader_1.XMLLoader.parseTextSync?.(text, options);
-}

package/dist/index.js

@@ -1,18 +0,0 @@
-"use strict";
-// loaders.gl, MIT license
-Object.defineProperty(exports, "__esModule", { value: true });
-exports._uncapitalizeKeys = exports._uncapitalize = exports.convertXMLFieldToArrayInPlace = exports.convertXMLValueToArray = exports.SAXParser = exports.HTMLLoader = exports.XMLLoader = void 0;
-var xml_loader_1 = require("./xml-loader");
-Object.defineProperty(exports, "XMLLoader", { enumerable: true, get: function () { return xml_loader_1.XMLLoader; } });
-var html_loader_1 = require("./html-loader");
-Object.defineProperty(exports, "HTMLLoader", { enumerable: true, get: function () { return html_loader_1.HTMLLoader; } });
-var sax_1 = require("./sax-ts/sax");
-Object.defineProperty(exports, "SAXParser", { enumerable: true, get: function () { return sax_1.SAXParser; } });
-// Utilities
-var xml_utils_1 = require("./lib/xml-utils/xml-utils");
-Object.defineProperty(exports, "convertXMLValueToArray", { enumerable: true, get: function () { return xml_utils_1.convertXMLValueToArray; } });
-Object.defineProperty(exports, "convertXMLFieldToArrayInPlace", { enumerable: true, get: function () { return xml_utils_1.convertXMLFieldToArrayInPlace; } });
-// Experimental
-var uncapitalize_1 = require("./lib/xml-utils/uncapitalize");
-Object.defineProperty(exports, "_uncapitalize", { enumerable: true, get: function () { return uncapitalize_1.uncapitalize; } });
-Object.defineProperty(exports, "_uncapitalizeKeys", { enumerable: true, get: function () { return uncapitalize_1.uncapitalizeKeys; } });

package/dist/lib/parsers/parse-xml.js

@@ -1,60 +0,0 @@
-"use strict";
-// loaders.gl, MIT license
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseXMLInBatches = exports.fastParseXML = exports.parseXMLSync = void 0;
-const streaming_xml_parser_1 = require("./streaming-xml-parser");
-const uncapitalize_1 = require("../xml-utils/uncapitalize");
-const fast_xml_parser_1 = require("fast-xml-parser");
-function parseXMLSync(text, options) {
-    if (options?._parser && options._parser !== 'fast-xml-parser') {
-        throw new Error(options?._parser);
-    }
-    const fastXMLOptions = {
-        // Default FastXML options
-        // https://github.com/NaturalIntelligence/fast-xml-parser/blob/master/docs/v4/2.XMLparseOptions.md#allowbooleanattributes
-        allowBooleanAttributes: true,
-        // https://github.com/NaturalIntelligence/fast-xml-parser/blob/master/docs/v4/2.XMLparseOptions.md#ignoredeclaration
-        ignoreDeclaration: true,
-        // https://github.com/NaturalIntelligence/fast-xml-parser/blob/master/docs/v4/2.XMLparseOptions.md#removensprefix
-        removeNSPrefix: options?.removeNSPrefix,
-        // https://github.com/NaturalIntelligence/fast-xml-parser/blob/master/docs/v4/2.XMLparseOptions.md#textnodename
-        textNodeName: options?.textNodeName,
-        // Let's application specify keys that are always arrays
-        isArray: (name, jpath, isLeafNode, isAttribute) => {
-            const array = Boolean(options?.arrayPaths?.some((path) => jpath === path));
-            return array;
-        },
-        // Application overrides
-        ...options?._fastXML
-    };
-    const xml = fastParseXML(text, fastXMLOptions);
-    // Note - could be done with FastXML tag processing
-    return options?.uncapitalizeKeys ? (0, uncapitalize_1.uncapitalizeKeys)(xml) : xml;
-}
-exports.parseXMLSync = parseXMLSync;
-function fastParseXML(text, options) {
-    const parser = new fast_xml_parser_1.XMLParser({
-        ignoreAttributes: false,
-        attributeNamePrefix: '',
-        ...options
-    });
-    const parsedXML = parser.parse(text);
-    return parsedXML;
-}
-exports.fastParseXML = fastParseXML;
-/**
- * @todo Build a streaming XML parser based on sax-js
- * @param text
- * @param options
- * @returns
- */
-function parseXMLInBatches(text, options = {}) {
-    const parser = new streaming_xml_parser_1.StreamingXMLParser({
-        ...options,
-        strict: true
-    });
-    parser.write(text);
-    parser.close();
-    return parser.result;
-}
-exports.parseXMLInBatches = parseXMLInBatches;

package/dist/lib/parsers/streaming-xml-parser.js

@@ -1,98 +0,0 @@
-"use strict";
-// @ts-nocheck
-/* eslint-disable */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.StreamingXMLParser = void 0;
-const sax_1 = require("../../sax-ts/sax");
-/**
- * StreamingXMLParser builds a JSON object using the events emitted by the SAX parser
- */
-class StreamingXMLParser {
-    // jsonpath: JSONPath = new JSONPath();
-    constructor(options) {
-        this.result = undefined;
-        this.previousStates = [];
-        this.currentState = Object.freeze({ container: [], key: null });
-        this.reset();
-        this.parser = new sax_1.SAXParser({
-            onready: () => {
-                this.previousStates.length = 0;
-                this.currentState.container.length = 0;
-            },
-            onopentag: ({ name, attributes, isSelfClosing }) => {
-                this._openObject({});
-                if (typeof name !== 'undefined') {
-                    this.parser.emit('onkey', name);
-                }
-            },
-            onkey: (name) => {
-                this.currentState.key = name;
-            },
-            onclosetag: () => {
-                this._closeObject();
-            },
-            onopenarray: () => {
-                this._openArray();
-            },
-            onclosearray: () => {
-                this._closeArray();
-            },
-            ontext: (value) => {
-                this._pushOrSet(value);
-            },
-            onerror: (error) => {
-                throw error;
-            },
-            onend: () => {
-                this.result = this.currentState.container.pop();
-            },
-            ...options
-        });
-    }
-    reset() {
-        this.result = undefined;
-        this.previousStates = [];
-        this.currentState = Object.freeze({ container: [], key: null });
-    }
-    write(chunk) {
-        this.parser.write(chunk);
-    }
-    close() {
-        this.parser.close();
-    }
-    // PRIVATE METHODS
-    _pushOrSet(value) {
-        const { container, key } = this.currentState;
-        if (key !== null) {
-            container[key] = value;
-            this.currentState.key = null;
-        }
-        else if (Array.isArray(container)) {
-            container.push(value);
-        }
-        else if (container) {
-            // debugger
-        }
-    }
-    _openArray(newContainer = []) {
-        // this.jsonpath.push(null);
-        this._pushOrSet(newContainer);
-        this.previousStates.push(this.currentState);
-        this.currentState = { container: newContainer, isArray: true, key: null };
-    }
-    _closeArray() {
-        // this.jsonpath.pop();
-        this.currentState = this.previousStates.pop();
-    }
-    _openObject(newContainer = {}) {
-        // this.jsonpath.push(null);
-        this._pushOrSet(newContainer);
-        this.previousStates.push(this.currentState);
-        this.currentState = { container: newContainer, isArray: false, key: null };
-    }
-    _closeObject() {
-        // this.jsonpath.pop();
-        this.currentState = this.previousStates.pop();
-    }
-}
-exports.StreamingXMLParser = StreamingXMLParser;

package/dist/lib/xml-utils/uncapitalize.js

@@ -1,32 +0,0 @@
-"use strict";
-// loaders.gl, MIT license
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.uncapitalizeKeys = exports.uncapitalize = void 0;
-/**
- * Uncapitalize first letter of a string
- * @param str
- * @returns
- */
-function uncapitalize(str) {
-    return typeof str === 'string' ? str.charAt(0).toLowerCase() + str.slice(1) : str;
-}
-exports.uncapitalize = uncapitalize;
-/**
- * Recursively uncapitalize all keys in a nested object
- * @param object
- * @returns
- */
-function uncapitalizeKeys(object) {
-    if (Array.isArray(object)) {
-        return object.map((element) => uncapitalizeKeys(element));
-    }
-    if (object && typeof object === 'object') {
-        const newObject = {};
-        for (const [key, value] of Object.entries(object)) {
-            newObject[uncapitalize(key)] = uncapitalizeKeys(value);
-        }
-        return newObject;
-    }
-    return object;
-}
-exports.uncapitalizeKeys = uncapitalizeKeys;

package/dist/lib/xml-utils/xml-utils.js

@@ -1,30 +0,0 @@
-"use strict";
-// TODO - these utilities could be moved to the XML parser.
-// uncapitalizeKeys could be an XMLLoader option
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertXMLFieldToArrayInPlace = exports.convertXMLValueToArray = void 0;
-/**
- * Extracts a value or array and always return an array
- * Useful since XML parses to object instead of array when only a single value is provided
- */
-function convertXMLValueToArray(xmlValue) {
-    if (Array.isArray(xmlValue)) {
-        return xmlValue;
-    }
-    if (xmlValue && typeof xmlValue === 'object' && xmlValue['0']) {
-        // Error this is an objectified array
-    }
-    if (xmlValue) {
-        return [xmlValue];
-    }
-    return [];
-}
-exports.convertXMLValueToArray = convertXMLValueToArray;
-/**
- * Mutates a field in place, converting it to array
- * Useful since XML parses to object instead of array when only a single value is provided
- */
-function convertXMLFieldToArrayInPlace(xml, key) {
-    xml[key] = convertXMLValueToArray(xml[key]);
-}
-exports.convertXMLFieldToArrayInPlace = convertXMLFieldToArrayInPlace;