Add strict to tsconfig.json

Author: wooorm

lib/index.js

@@ -24,14 +24,14 @@ const search = /\r?\n|\r/g
  * @param {string|Uint8Array} doc
  */
 export function fromXml(doc) {
-  // @ts-ignore `strictEntities` is most definitely fine.
+  // @ts-expect-error `strictEntities` is most definitely fine.
   const parser = new Parser(true, {position: true, strictEntities: true})
   /** @type {Array.<Node>} */
   const stack = [{type: 'root', children: []}]
   let position = now()
 
   parser.ondoctype = ondoctype
-  // @ts-ignore `onsgmldeclaration` is most definitely fine.
+  // @ts-expect-error `onsgmldeclaration` is most definitely fine.
   parser.onsgmldeclaration = onsgmldeclaration
   parser.onprocessinginstruction = onprocessinginstruction
   parser.ontext = ontext
@@ -43,7 +43,7 @@ export function fromXml(doc) {
   parser.onclosetag = exit
   parser.onerror = onerror
 
-  // @ts-ignore Buffers are most definitely fine.
+  // @ts-expect-error Buffers are most definitely fine.
   parser.write(doc).close()
 
   return stack[0]
@@ -74,18 +74,19 @@ export function fromXml(doc) {
   // eslint-disable-next-line complexity
   function ondoctype(value) {
     /** @type {Doctype} */
+    // @ts-expect-error: `null`s are fine.
     const node = {type: 'doctype', name: '', public: null, system: null}
     let index = -1
     let state = 'BEGIN'
-    /** @type {string} */
+    /** @type {string|undefined} */
     let returnState
-    /** @type {string} */
+    /** @type {string|undefined} */
     let buffer
-    /** @type {number} */
+    /** @type {number|undefined} */
     let bufferIndex
-    /** @type {number} */
+    /** @type {number|undefined} */
     let start
-    /** @type {number} */
+    /** @type {number|undefined} */
     let marker
 
     while (++index <= value.length) {
@@ -169,7 +170,12 @@ export function fromXml(doc) {
 
           break
         case 'IN_EID':
-          if (code === buffer.charCodeAt(++bufferIndex)) {
+          if (
+            returnState &&
+            buffer &&
+            bufferIndex !== undefined &&
+            code === buffer.charCodeAt(++bufferIndex)
+          ) {
             if (bufferIndex === buffer.length - 1) {
               state = returnState
             }
@@ -314,12 +320,20 @@ export function fromXml(doc) {
     // Comment has a positional bug… 😢
     // They end right before the last character (`>`), so let’s add that:
     const actualEnd = now()
+
+    /* c8 ignore next 3 */
+    if (typeof actualEnd.offset !== 'number') {
+      throw new TypeError('Expected offset')
+    }
+
     actualEnd.column++
     actualEnd.offset++
 
     enter(node)
     exit()
 
+    /* c8 ignore next */
+    if (!node.position) throw new Error('Expected position')
     node.position.end = Object.assign({}, actualEnd)
     position = actualEnd
   }
@@ -367,11 +381,16 @@ export function fromXml(doc) {
       }
     }
 
+    /* c8 ignore next */
+    if (typeof actualEnd.offset !== 'number') throw new Error('Expected offset')
+
     actualEnd.offset += value.length
 
     enter(node)
     exit()
 
+    /* c8 ignore next */
+    if (!node.position) throw new Error('Expected position')
     node.position.end = Object.assign({}, actualEnd)
     position = actualEnd
   }
@@ -394,8 +413,9 @@ export function fromXml(doc) {
    * @returns {void}
    */
   function enter(node) {
+    // @ts-expect-error Set later.
     node.position = {start: Object.assign({}, position), end: undefined}
-    // @ts-ignore Assume valid child.
+    // @ts-expect-error Assume valid child.
     stack[stack.length - 1].children.push(node)
     stack.push(node)
     position = now()
@@ -405,8 +425,11 @@ export function fromXml(doc) {
    * @returns {void}
    */
   function exit() {
+    const tail = stack.pop()
+    /* c8 ignore next */
+    if (!tail || !tail.position) throw new Error('Expected tail')
     position = now()
-    stack.pop().position.end = Object.assign({}, position)
+    tail.position.end = Object.assign({}, position)
   }
 
   /**
@@ -433,42 +456,46 @@ export function fromXml(doc) {
 /**
  * See: <https://www.w3.org/TR/xml/#NT-NameStartChar>
  *
- * @param {number} code
+ * @param {number|null} code
  * @returns {boolean}
  */
 function isNameStartChar(code) {
-  // eslint-disable-next-line no-misleading-character-class
-  return /[:A-Z_a-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD]/.test(
-    fromCharCode(code)
+  return (
+    code !== null &&
+    // eslint-disable-next-line no-misleading-character-class
+    /[:A-Z_a-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD]/.test(
+      fromCharCode(code)
+    )
   )
 }
 
 /**
  * See: <https://www.w3.org/TR/xml/#NT-NameChar>
  *
- * @param {number} code
+ * @param {number|null} code
  * @returns {boolean}
  */
 function isNameChar(code) {
   return (
-    isNameStartChar(code) ||
-    // eslint-disable-next-line no-misleading-character-class
-    /[-.\d\u00B7\u0300-\u036F\u203F\u2040]/.test(fromCharCode(code))
+    code !== null &&
+    (isNameStartChar(code) ||
+      // eslint-disable-next-line no-misleading-character-class
+      /[-.\d\u00B7\u0300-\u036F\u203F\u2040]/.test(fromCharCode(code)))
   )
 }
 
 /**
- * @param {number} code
+ * @param {number|null} code
  * @returns {boolean}
  */
 function isSpace(code) {
-  return /[\t\n\r ]/.test(fromCharCode(code))
+  return code !== null && /[\t\n\r ]/.test(fromCharCode(code))
 }
 
 /**
- * @param {number} code
+ * @param {number|null} code
  * @returns {boolean}
  */
 function isPubidChar(code) {
-  return /[\n\r !#$%'-;=?-Z_a-z]/.test(fromCharCode(code))
+  return code !== null && /[\n\r !#$%'-;=?-Z_a-z]/.test(fromCharCode(code))
 }

tsconfig.json

@@ -10,6 +10,7 @@
     "declaration": true,
     "emitDeclarationOnly": true,
     "allowSyntheticDefaultImports": true,
-    "skipLibCheck": true
+    "skipLibCheck": true,
+    "strict": true
   }
 }