Merge pull request #5 from hildjj/conformance-ns

Switch namespacing off as appropriate in conformance tests
hildjj · May 10, 2023 · c238765 · c238765
2 parents 7282b14 + 569841b
commit c238765
Show file tree

Hide file tree

Showing 49 changed files with 295 additions and 429 deletions.
diff --git a/docs/AttlistDecl.html b/docs/AttlistDecl.html
diff --git a/docs/Attribute.html b/docs/Attribute.html
diff --git a/docs/AttributeDecl.html b/docs/AttributeDecl.html
diff --git a/docs/CdataSection.html b/docs/CdataSection.html
diff --git a/docs/Comment.html b/docs/Comment.html
diff --git a/docs/DoctypeDecl.html b/docs/DoctypeDecl.html
diff --git a/docs/Document.html b/docs/Document.html
diff --git a/docs/DomParser.html b/docs/DomParser.html
diff --git a/docs/Element.html b/docs/Element.html
diff --git a/docs/ElementDecl.html b/docs/ElementDecl.html
diff --git a/docs/EntityDecl.html b/docs/EntityDecl.html
diff --git a/docs/Namespace.html b/docs/Namespace.html
diff --git a/docs/Namespace_Namespace.html b/docs/Namespace_Namespace.html
diff --git a/docs/Node.html b/docs/Node.html
diff --git a/docs/NotationDecl.html b/docs/NotationDecl.html
diff --git a/docs/ParentNode.html b/docs/ParentNode.html
diff --git a/docs/ProcessingInstruction.html b/docs/ProcessingInstruction.html
diff --git a/docs/Text.html b/docs/Text.html
diff --git a/docs/XPath.html b/docs/XPath.html
diff --git a/docs/XPathSyntaxError.html b/docs/XPathSyntaxError.html
diff --git a/docs/XmlDeclaration.html b/docs/XmlDeclaration.html
diff --git a/docs/dom.js.html b/docs/dom.js.html
diff --git a/docs/domParser.js.html b/docs/domParser.js.html
diff --git a/docs/external-ConstructorParameters.html b/docs/external-ConstructorParameters.html
diff --git a/docs/external-Exclude.html b/docs/external-Exclude.html
diff --git a/docs/external-Extract.html b/docs/external-Extract.html
diff --git a/docs/external-InstanceType.html b/docs/external-InstanceType.html
diff --git a/docs/external-NonNullable.html b/docs/external-NonNullable.html
diff --git a/docs/external-Omit.html b/docs/external-Omit.html
diff --git a/docs/external-OmitThisParameter.html b/docs/external-OmitThisParameter.html
diff --git a/docs/external-Parameters.html b/docs/external-Parameters.html
diff --git a/docs/external-Partial.html b/docs/external-Partial.html
diff --git a/docs/external-Pick.html b/docs/external-Pick.html
diff --git a/docs/external-Readonly.html b/docs/external-Readonly.html
diff --git a/docs/external-Record.html b/docs/external-Record.html
diff --git a/docs/external-Required.html b/docs/external-Required.html
diff --git a/docs/external-ReturnType.html b/docs/external-ReturnType.html
diff --git a/docs/external-ThisParameterType.html b/docs/external-ThisParameterType.html
diff --git a/docs/external-ThisType.html b/docs/external-ThisType.html
diff --git a/docs/global.html b/docs/global.html
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/xpath.js.html b/docs/xpath.js.html
diff --git a/lib/dom.js b/lib/dom.js
@@ -462,6 +462,7 @@ export class Element extends ParentNode {
    * @param {string} [ns] the namespace to search for.  If not given, match
    *   attributes in any namespace.
    * @returns {Attribute|undefined} Attribute, if one that matches is found
+   * @private
    */
   _attribute(local, ns) {
     return this.att.find(a => (
@@ -574,9 +575,9 @@ export class Element extends ParentNode {
       ret += color(this.name.prefix, NAME, options)
       ret += color(':', PUNCTUATION, options)
     }
-    ret += color(this.name.local, NAME, options) +
-      this.ns.map(n => n.toString(options)).join('') +
-      this.att.map(a => a.toString(options)).join('')
+    ret += color(this.name.local, NAME, options)
+    ret += this.ns.map(n => n.toString(options)).join('')
+    ret += this.att.map(a => a.toString(options)).join('')
     if (this.children.length > 0) {
       ret += color('>', PUNCTUATION, options)
       ret += super.toString(options) // All children
@@ -646,11 +647,11 @@ export class Attribute extends Node {
    */
   constructor(name, value) {
     super()
-    if (typeof name === 'string') {
-      this.name = {local: name}
-    } else {
-      this.name = name
-    }
+
+    /** @type {Pieces} */
+    this.name = (typeof name === 'string') ? {local: name} : name
+
+    /** @type {string} */
     this.value = value
   }
 

diff --git a/lib/domParser.js b/lib/domParser.js
@@ -76,8 +76,6 @@ export class DomParser {
    *   Encoding to expect from Buffers/etc that are passed to parse()
    */
   constructor(options) {
-    // Separator is always '|'.  We're always going to take care of namespace
-    // triples before the user sees them.
     this.#parser = new XmlParser(options)
 
     if (options?.xmlBase) {

diff --git a/lib/xpath.js b/lib/xpath.js
@@ -55,6 +55,7 @@ export class XPathSyntaxError extends Error {
 
 /**
  * @type {Record<string,XPathFun>}
+ * @private
  */
 const XPathFunctions = {
   count(context) {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -27,11 +27,11 @@
   "author": "Joe Hildebrand <joe-github@cursive.net>",
   "license": "MIT",
   "dependencies": {
-    "expat-wasm": "3.1.0"
+    "expat-wasm": "3.1.2"
   },
   "devDependencies": {
-    "@cto.af/eslint-config": "1.0.5",
-    "@types/node": "20.1.0",
+    "@cto.af/eslint-config": "1.1.0",
+    "@types/node": "20.1.2",
     "ava": "^5.2.0",
     "c8": "7.13.0",
     "docdash": "2.0.1",

diff --git a/test/conformance.ava.js b/test/conformance.ava.js
@@ -1,5 +1,6 @@
 import {DomParser, NS} from '../lib/index.js'
 import {fileURLToPath, pathToFileURL} from 'url'
+import {XmlParser} from 'expat-wasm'
 import fs from 'fs'
 import path from 'path'
 import test from 'ava'
@@ -9,10 +10,11 @@ const __dirname = path.dirname(__filename)
 
 const root = pathToFileURL(__dirname).toString()
 
-function parseFile(name) {
+function parseFile(name, noNS) {
   return fs.promises.readFile(name).then(buf => DomParser.parseFull(buf, {
     base: name.toString(),
     xmlBase: true,
+    separator: noNS ? XmlParser.NO_NAMESPACES : '|',
     systemEntity(base, sysId, pubId) {
       const newBase = new URL(sysId, base)
       const bs = newBase.toString()
@@ -34,8 +36,7 @@ const confnameURL = new URL(
 const conf = await parseFile(confnameURL)
 
 const skip = {
-  'valid-sa-012': 'expat issue 1, always uses 1.1 rules for attribute name containing only colon',
-  'rmt-e2e-50': 'potential expat issue 4, does not allow U+0085 as whitespace',
+  'rmt-e2e-50': 'this can only be tested effectively in XML 1.1, since CR is in the S production; in 1.1 we can use NEL which isn\'t.',
 }
 
 /**
@@ -57,19 +58,20 @@ async function execTests(el, base, t) {
       'XML1.0-errata2e',
       'XML1.0-errata3e',
       // 'NS1.1',
-      // 'XML1.0-errata4e', See: https://github.com/libexpat/libexpat/issues/171
-      // 'XML1.1',          See: https://github.com/libexpat/libexpat/issues/378
-      //
+      // 'XML1.0-errata4e', // See: https://github.com/libexpat/libexpat/issues/171
+      // 'XML1.1', // See: https://github.com/libexpat/libexpat/issues/378
     ].indexOf(rec) !== -1) {
       const id = el.attr('ID')
       const reason = skip[id]
+      const noNS = el.attr('NAMESPACE').toUpperCase() === 'NO'
+
       if (reason) {
         const uri = new URL(el.attr('URI'), base)
-        t.throwsAsync(() => parseFile(uri), undefined, id)
+        t.throwsAsync(() => parseFile(uri, noNS), undefined, id)
       } else {
         const uri = new URL(el.attr('URI'), base)
         if (el.attr('TYPE') === 'valid') {
-          const doc = await parseFile(uri)
+          const doc = await parseFile(uri, noNS)
           t.truthy(doc, id)
         }
       }

diff --git a/types/dom.d.ts b/types/dom.d.ts
@@ -175,8 +175,9 @@ export class Element extends ParentNode {
      * @param {string} [ns] the namespace to search for.  If not given, match
      *   attributes in any namespace.
      * @returns {Attribute|undefined} Attribute, if one that matches is found
+     * @private
      */
-    _attribute(local: string, ns?: string | undefined): Attribute | undefined;
+    private _attribute;
     /**
      * Find the value of an attribute that matches the given local name and
      * namespace.
@@ -243,7 +244,9 @@ export class Attribute extends Node {
      * @param {string} value The value
      */
     constructor(name: string | Pieces, value: string);
+    /** @type {Pieces} */
     name: Pieces;
+    /** @type {string} */
     value: string;
 }
 /**