@loaders.gl/xml 4.2.0-alpha.5 → 4.2.0-beta.1

package/dist/sax-ts/sax.js

@@ -335,89 +335,104 @@ Object.keys(ENTITIES).forEach((key) => {
  * Internal helper class
  */
 class SAX {
+    EVENTS = EVENTS;
+    ENTITIES = {
+        // TODO: make it readonly, needed for entity-mega test
+        // amp, gt, lt, quot and apos are resolved to strings instead of numerical
+        // codes, IDK why
+        ...ENTITIES
+    };
+    XML_ENTITIES = {
+        amp: '&',
+        gt: '>',
+        lt: '<',
+        quot: '"',
+        apos: "'"
+    };
+    S = 0;
+    opt;
+    trackPosition = false;
+    column = 0;
+    line = 0;
+    c = '';
+    error;
+    q = '';
+    bufferCheckPosition;
+    closed = false;
+    tags = [];
+    looseCase = '';
+    closedRoot = false;
+    sawRoot = false;
+    strict = false;
+    tag;
+    strictEntities;
+    state;
+    noscript = false;
+    attribList = [];
+    ns;
+    position = 0;
+    STATE = {
+        BEGIN: this.S++, // leading byte order mark or whitespace
+        BEGIN_WHITESPACE: this.S++, // leading whitespace
+        TEXT: this.S++, // general stuff
+        TEXT_ENTITY: this.S++, // &amp and such.
+        OPEN_WAKA: this.S++, // <
+        SGML_DECL: this.S++, // <!BLARG
+        SGML_DECL_QUOTED: this.S++, // <!BLARG foo "bar
+        DOCTYPE: this.S++, // <!DOCTYPE
+        DOCTYPE_QUOTED: this.S++, // <!DOCTYPE "//blah
+        DOCTYPE_DTD: this.S++, // <!DOCTYPE "//blah" [ ...
+        DOCTYPE_DTD_QUOTED: this.S++, // <!DOCTYPE "//blah" [ "foo
+        COMMENT_STARTING: this.S++, // <!-
+        COMMENT: this.S++, // <!--
+        COMMENT_ENDING: this.S++, // <!-- blah -
+        COMMENT_ENDED: this.S++, // <!-- blah --
+        CDATA: this.S++, // <![CDATA[ something
+        CDATA_ENDING: this.S++, // ]
+        CDATA_ENDING_2: this.S++, // ]]
+        PROC_INST: this.S++, // <?hi
+        PROC_INST_BODY: this.S++, // <?hi there
+        PROC_INST_ENDING: this.S++, // <?hi "there" ?
+        OPEN_TAG: this.S++, // <strong
+        OPEN_TAG_SLASH: this.S++, // <strong /
+        ATTRIB: this.S++, // <a
+        ATTRIB_NAME: this.S++, // <a foo
+        ATTRIB_NAME_SAW_WHITE: this.S++, // <a foo _
+        ATTRIB_VALUE: this.S++, // <a foo=
+        ATTRIB_VALUE_QUOTED: this.S++, // <a foo="bar
+        ATTRIB_VALUE_CLOSED: this.S++, // <a foo="bar"
+        ATTRIB_VALUE_UNQUOTED: this.S++, // <a foo=bar
+        ATTRIB_VALUE_ENTITY_Q: this.S++, // <foo bar="&quot;"
+        ATTRIB_VALUE_ENTITY_U: this.S++, // <foo bar=&quot
+        CLOSE_TAG: this.S++, // </a
+        CLOSE_TAG_SAW_WHITE: this.S++, // </a   >
+        SCRIPT: this.S++, // <script> ...
+        SCRIPT_ENDING: this.S++ // <script> ... <
+    };
+    BUFFERS = BUFFERS;
+    // private parser: (strict: boolean, opt: any) => SAXParser;
+    CDATA = '[CDATA[';
+    DOCTYPE = 'DOCTYPE';
+    XML_NAMESPACE = 'http://www.w3.org/XML/1998/namespace';
+    XMLNS_NAMESPACE = 'http://www.w3.org/2000/xmlns/';
+    rootNS = {
+        xml: this.XML_NAMESPACE,
+        xmlns: this.XMLNS_NAMESPACE
+    };
+    comment;
+    sgmlDecl;
+    textNode = '';
+    tagName;
+    doctype;
+    procInstName;
+    procInstBody;
+    entity = '';
+    attribName;
+    attribValue;
+    cdata = '';
+    script = '';
+    startTagPosition = 0;
     constructor() {
-        this.EVENTS = EVENTS;
-        this.ENTITIES = {
-            // TODO: make it readonly, needed for entity-mega test
-            // amp, gt, lt, quot and apos are resolved to strings instead of numerical
-            // codes, IDK why
-            ...ENTITIES
-        };
-        this.XML_ENTITIES = {
-            amp: '&',
-            gt: '>',
-            lt: '<',
-            quot: '"',
-            apos: "'"
-        };
-        this.S = 0;
-        this.trackPosition = false;
-        this.column = 0;
-        this.line = 0;
-        this.c = '';
-        this.q = '';
-        this.closed = false;
-        this.tags = [];
-        this.looseCase = '';
-        this.closedRoot = false;
-        this.sawRoot = false;
-        this.strict = false;
-        this.noscript = false;
-        this.attribList = [];
-        this.position = 0;
-        this.STATE = {
-            BEGIN: this.S++, // leading byte order mark or whitespace
-            BEGIN_WHITESPACE: this.S++, // leading whitespace
-            TEXT: this.S++, // general stuff
-            TEXT_ENTITY: this.S++, // &amp and such.
-            OPEN_WAKA: this.S++, // <
-            SGML_DECL: this.S++, // <!BLARG
-            SGML_DECL_QUOTED: this.S++, // <!BLARG foo "bar
-            DOCTYPE: this.S++, // <!DOCTYPE
-            DOCTYPE_QUOTED: this.S++, // <!DOCTYPE "//blah
-            DOCTYPE_DTD: this.S++, // <!DOCTYPE "//blah" [ ...
-            DOCTYPE_DTD_QUOTED: this.S++, // <!DOCTYPE "//blah" [ "foo
-            COMMENT_STARTING: this.S++, // <!-
-            COMMENT: this.S++, // <!--
-            COMMENT_ENDING: this.S++, // <!-- blah -
-            COMMENT_ENDED: this.S++, // <!-- blah --
-            CDATA: this.S++, // <![CDATA[ something
-            CDATA_ENDING: this.S++, // ]
-            CDATA_ENDING_2: this.S++, // ]]
-            PROC_INST: this.S++, // <?hi
-            PROC_INST_BODY: this.S++, // <?hi there
-            PROC_INST_ENDING: this.S++, // <?hi "there" ?
-            OPEN_TAG: this.S++, // <strong
-            OPEN_TAG_SLASH: this.S++, // <strong /
-            ATTRIB: this.S++, // <a
-            ATTRIB_NAME: this.S++, // <a foo
-            ATTRIB_NAME_SAW_WHITE: this.S++, // <a foo _
-            ATTRIB_VALUE: this.S++, // <a foo=
-            ATTRIB_VALUE_QUOTED: this.S++, // <a foo="bar
-            ATTRIB_VALUE_CLOSED: this.S++, // <a foo="bar"
-            ATTRIB_VALUE_UNQUOTED: this.S++, // <a foo=bar
-            ATTRIB_VALUE_ENTITY_Q: this.S++, // <foo bar="&quot;"
-            ATTRIB_VALUE_ENTITY_U: this.S++, // <foo bar=&quot
-            CLOSE_TAG: this.S++, // </a
-            CLOSE_TAG_SAW_WHITE: this.S++, // </a   >
-            SCRIPT: this.S++, // <script> ...
-            SCRIPT_ENDING: this.S++ // <script> ... <
-        };
-        this.BUFFERS = BUFFERS;
-        // private parser: (strict: boolean, opt: any) => SAXParser;
-        this.CDATA = '[CDATA[';
-        this.DOCTYPE = 'DOCTYPE';
-        this.XML_NAMESPACE = 'http://www.w3.org/XML/1998/namespace';
-        this.XMLNS_NAMESPACE = 'http://www.w3.org/2000/xmlns/';
-        this.rootNS = {
-            xml: this.XML_NAMESPACE,
-            xmlns: this.XMLNS_NAMESPACE
-        };
-        this.textNode = '';
-        this.entity = '';
-        this.cdata = '';
-        this.script = '';
-        this.startTagPosition = 0;
         this.S = 0;
         for (const s in this.STATE) {
             if (this.STATE.hasOwnProperty(s)) {
@@ -1389,10 +1404,11 @@ class SAX {
  * @todo Weird inheritance, with some variables initialized in subclass
  */
 export class SAXParser extends SAX {
+    static ENTITIES = ENTITIES;
+    opt = DEFAULT_SAX_PARSER_OPTIONS;
+    events = DEFAULT_SAX_EVENTS;
     constructor(opt) {
         super();
-        this.opt = DEFAULT_SAX_PARSER_OPTIONS;
-        this.events = DEFAULT_SAX_EVENTS;
         this.clearBuffers();
         this.opt = opt = { ...this.opt, ...opt };
         this.events = { ...this.events, ...opt };
@@ -1435,4 +1451,3 @@ export class SAXParser extends SAX {
         this.flushBuffers();
     }
 }
-SAXParser.ENTITIES = ENTITIES;

package/dist/xml-loader.d.ts

@@ -1,4 +1,4 @@
-import type { LoaderWithParser, LoaderOptions } from '@loaders.gl/loader-utils';
+import type { LoaderOptions } from '@loaders.gl/loader-utils';
 import type { ParseXMLOptions } from "./lib/parsers/parse-xml.js";
 export type XMLLoaderOptions = LoaderOptions & {
     xml?: ParseXMLOptions;
@@ -6,5 +6,5 @@ export type XMLLoaderOptions = LoaderOptions & {
 /**
  * Loader for XML files
  */
-export declare const XMLLoader: LoaderWithParser<any, never, XMLLoaderOptions>;
+export declare const XMLLoader: any;
 //# sourceMappingURL=xml-loader.d.ts.map

package/dist/xml-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"xml-loader.d.ts","sourceRoot":"","sources":["../src/xml-loader.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,gBAAgB,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAC9E,OAAO,KAAK,EAAC,eAAe,EAAC,mCAAgC;AAO7D,MAAM,MAAM,gBAAgB,GAAG,aAAa,GAAG;IAC7C,GAAG,CAAC,EAAE,eAAe,CAAC;CACvB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,SAAS,EAAE,gBAAgB,CAAC,GAAG,EAAE,KAAK,EAAE,gBAAgB,CAyBpE,CAAC"}
+{"version":3,"file":"xml-loader.d.ts","sourceRoot":"","sources":["../src/xml-loader.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAmB,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAC9E,OAAO,KAAK,EAAC,eAAe,EAAC,mCAAgC;AAO7D,MAAM,MAAM,gBAAgB,GAAG,aAAa,GAAG;IAC7C,GAAG,CAAC,EAAE,eAAe,CAAC;CACvB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,SAAS,KA2B6C,CAAC"}

package/dist/xml-loader.js

@@ -4,11 +4,13 @@
 import { parseXMLSync } from "./lib/parsers/parse-xml.js";
 // __VERSION__ is injected by babel-plugin-version-inline
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.
-const VERSION = typeof "4.2.0-alpha.4" !== 'undefined' ? "4.2.0-alpha.4" : 'latest';
+const VERSION = typeof "4.2.0-alpha.6" !== 'undefined' ? "4.2.0-alpha.6" : 'latest';
 /**
  * Loader for XML files
  */
 export const XMLLoader = {
+    dataType: null,
+    batchType: null,
     name: 'XML',
     id: 'xml',
     module: 'xml',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/xml",
-  "version": "4.2.0-alpha.5",
+  "version": "4.2.0-beta.1",
   "description": "Framework-independent loaders for the XML (eXtensible Markup Language) format",
   "license": "MIT",
   "type": "module",
@@ -41,12 +41,12 @@
     "build-bundle-dev": "ocular-bundle ./bundle.ts --env=dev --output=dist/dist.dev.js"
   },
   "dependencies": {
-    "@loaders.gl/loader-utils": "4.2.0-alpha.5",
-    "@loaders.gl/schema": "4.2.0-alpha.5",
+    "@loaders.gl/loader-utils": "4.2.0-beta.1",
+    "@loaders.gl/schema": "4.2.0-beta.1",
     "fast-xml-parser": "^4.2.5"
   },
   "peerDependencies": {
     "@loaders.gl/core": "^4.0.0"
   },
-  "gitHead": "32d95a81971f104e4dfeb88ab57065f05321a76a"
+  "gitHead": "c386a9196516fe3ff24847b40e6c77be039cf905"
 }

package/src/html-loader.ts

@@ -14,7 +14,7 @@ export type HTMLLoaderOptions = XMLLoaderOptions;
  * 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.
  */
-export const HTMLLoader: LoaderWithParser<any, never, HTMLLoaderOptions> = {
+export const HTMLLoader = {
   ...XMLLoader,
   name: 'HTML',
   id: 'html',
@@ -24,7 +24,7 @@ export const HTMLLoader: LoaderWithParser<any, never, HTMLLoaderOptions> = {
   parse: async (arrayBuffer: ArrayBuffer, options?: XMLLoaderOptions) =>
     parseTextSync(new TextDecoder().decode(arrayBuffer), options),
   parseTextSync: (text: string, options?: XMLLoaderOptions) => parseTextSync(text, options)
-};
+} as const satisfies LoaderWithParser<any, never, HTMLLoaderOptions>;
 
 function testHTMLFile(text: string): boolean {
   // TODO - There could be space first.

package/src/xml-loader.ts

@@ -17,7 +17,9 @@ export type XMLLoaderOptions = LoaderOptions & {
 /**
  * Loader for XML files
  */
-export const XMLLoader: LoaderWithParser<any, never, XMLLoaderOptions> = {
+export const XMLLoader = {
+  dataType: null as any,
+  batchType: null as never,
   name: 'XML',
   id: 'xml',
   module: 'xml',
@@ -42,7 +44,7 @@ export const XMLLoader: LoaderWithParser<any, never, XMLLoaderOptions> = {
     }),
   parseTextSync: (text: string, options?: XMLLoaderOptions) =>
     parseXMLSync(text, {...XMLLoader.options.xml, ...options?.xml})
-};
+} as const satisfies LoaderWithParser<any, never, XMLLoaderOptions>;
 
 function testXMLFile(text: string): boolean {
   // TODO - There could be space first.