fast-xml-parser 5.3.7 → 5.3.8

package/src/v6/OutputBuilders/JsArrBuilder.js

@@ -1,16 +1,16 @@
-import {buildOptions,registerCommonValueParsers} from './ParserOptionsBuilder.js';
+import { buildOptions, registerCommonValueParsers } from './ParserOptionsBuilder.js';
 
-export default class OutputBuilder{
-  constructor(options){
+export default class OutputBuilder {
+  constructor(options) {
     this.options = buildOptions(options);
-      this.registeredParsers = registerCommonValueParsers(this.options);
-    }
-    
-    registerValueParser(name,parserInstance){//existing name will override the parser without warning
-      this.registeredParsers[name] = parserInstance;
-    }
+    this.registeredParsers = registerCommonValueParsers(this.options);
+  }
+
+  registerValueParser(name, parserInstance) {//existing name will override the parser without warning
+    this.registeredParsers[name] = parserInstance;
+  }
 
-  getInstance(parserOptions){
+  getInstance(parserOptions) {
     return new JsArrBuilder(parserOptions, this.options, this.registeredParsers);
   }
 }
@@ -18,9 +18,9 @@ export default class OutputBuilder{
 const rootName = '!js_arr';
 import BaseOutputBuilder from './BaseOutputBuilder.js';
 
-class JsArrBuilder extends BaseOutputBuilder{
+class JsArrBuilder extends BaseOutputBuilder {
 
-  constructor(parserOptions, options,registeredParsers) {
+  constructor(parserOptions, options, registeredParsers) {
     super();
     this.tagsStack = [];
     this.parserOptions = parserOptions;
@@ -32,10 +32,10 @@ class JsArrBuilder extends BaseOutputBuilder{
     this.attributes = {};
   }
 
-  addTag(tag){
+  addTag(tag) {
     //when a new tag is added, it should be added as child of current node
     //TODO: shift this check to the parser
-    if(tag.name === "__proto__") tag.name = "#__proto__";
+    if (tag.name === "__proto__") tag.name = "#__proto__";
 
     this.tagsStack.push(this.currentNode);
     this.currentNode = new Node(tag.name, this.attributes);
@@ -47,23 +47,23 @@ class JsArrBuilder extends BaseOutputBuilder{
    * @param {Node} node 
    * @returns boolean: true if the node should not be added
    */
-  closeTag(){
+  closeTag() {
     const node = this.currentNode;
     this.currentNode = this.tagsStack.pop(); //set parent node in scope
-    if(this.options.onClose !== undefined){
+    if (this.options.onClose !== undefined) {
       //TODO TagPathMatcher 
-      const resultTag = this.options.onClose(node, 
-        new TagPathMatcher(this.tagsStack,node));
+      const resultTag = this.options.onClose(node,
+        new TagPathMatcher(this.tagsStack, node));
 
-      if(resultTag) return;
+      if (resultTag) return;
     }
     this.currentNode.child.push(node);  //to parent node
   }
 
   //Called by parent class methods
-  _addChild(key, val){
+  _addChild(key, val) {
     // if(key === "__proto__") tagName = "#__proto__";
-    this.currentNode.child.push( {[key]: val });
+    this.currentNode.child.push({ [key]: val });
     // this.currentNode.leafType = false;
   }
 
@@ -71,31 +71,31 @@ class JsArrBuilder extends BaseOutputBuilder{
    * Add text value child node 
    * @param {string} text 
    */
-  addValue(text){
-    this.currentNode.child.push( {[this.options.nameFor.text]: this.parseValue(text, this.options.tags.valueParsers) });
+  addValue(text) {
+    this.currentNode.child.push({ [this.options.nameFor.text]: this.parseValue(text, this.options.tags.valueParsers) });
   }
 
-  addPi(name){
+  addPi(name) {
     //TODO: set pi flag
-    if(!this.options.ignorePiTags){
+    if (!this.options.ignorePiTags) {
       const node = new Node(name, this.attributes);
       this.currentNode[":@"] = this.attributes;
       this.currentNode.child.push(node);
     }
     this.attributes = {};
   }
-  getOutput(){
+  getOutput() {
     return this.root.child[0];
   }
 }
 
 
 
-class Node{
-  constructor(tagname, attributes){
+class Node {
+  constructor(tagname, attributes) {
     this.tagname = tagname;
     this.child = []; //nested tags, text, cdata, comments
-    if(attributes && Object.keys(attributes).length > 0)
+    if (attributes && Object.keys(attributes).length > 0)
       this[":@"] = attributes;
   }
 }

package/src/v6/OutputBuilders/JsObjBuilder.js

@@ -1,18 +1,18 @@
 
 
-import {buildOptions,registerCommonValueParsers} from './ParserOptionsBuilder.js';
+import { buildOptions, registerCommonValueParsers } from './ParserOptionsBuilder.js';
 
-export default class OutputBuilder{
-  constructor(builderOptions){
-      this.options = buildOptions(builderOptions);
-      this.registeredParsers = registerCommonValueParsers(this.options);
+export default class OutputBuilder {
+  constructor(builderOptions) {
+    this.options = buildOptions(builderOptions);
+    this.registeredParsers = registerCommonValueParsers(this.options);
   }
 
-  registerValueParser(name,parserInstance){//existing name will override the parser without warning
+  registerValueParser(name, parserInstance) {//existing name will override the parser without warning
     this.registeredParsers[name] = parserInstance;
   }
 
-  getInstance(parserOptions){
+  getInstance(parserOptions) {
     return new JsObjBuilder(parserOptions, this.options, this.registeredParsers);
   }
 }
@@ -20,9 +20,9 @@ export default class OutputBuilder{
 import BaseOutputBuilder from './BaseOutputBuilder.js';
 const rootName = '^';
 
-class JsObjBuilder extends BaseOutputBuilder{
+class JsObjBuilder extends BaseOutputBuilder {
 
-  constructor(parserOptions, builderOptions,registeredParsers) {
+  constructor(parserOptions, builderOptions, registeredParsers) {
     super();
     //hold the raw detail of a tag and sequence with reference to the output
     this.tagsStack = [];
@@ -38,14 +38,14 @@ class JsObjBuilder extends BaseOutputBuilder{
     this.attributes = {};
   }
 
-  addTag(tag){
+  addTag(tag) {
 
     let value = "";
-    if( !isEmpty(this.attributes)){
+    if (!isEmpty(this.attributes)) {
       value = {};
-      if(this.options.attributes.groupBy){
+      if (this.options.attributes.groupBy) {
         value[this.options.attributes.groupBy] = this.attributes;
-      }else{
+      } else {
         value = this.attributes;
       }
     }
@@ -62,44 +62,44 @@ class JsObjBuilder extends BaseOutputBuilder{
    * @param {Node} node 
    * @returns boolean: true if the node should not be added
    */
-  closeTag(){
+  closeTag() {
     const tagName = this.tagName;
     let value = this.value;
     let textValue = this.textValue;
 
     //update tag text value
-    if(typeof value !== "object" && !Array.isArray(value)){
+    if (typeof value !== "object" && !Array.isArray(value)) {
       value = this.parseValue(textValue.trim(), this.options.tags.valueParsers);
-    }else if(textValue.length > 0){
+    } else if (textValue.length > 0) {
       value[this.options.nameFor.text] = this.parseValue(textValue.trim(), this.options.tags.valueParsers);
     }
 
-    
-    let resultTag= {
+
+    let resultTag = {
       tagName: tagName,
       value: value
     };
 
-    if(this.options.onTagClose !== undefined){
+    if (this.options.onTagClose !== undefined) {
       //TODO TagPathMatcher 
-      resultTag = this.options.onClose(tagName, value, this.textValue, new TagPathMatcher(this.tagsStack,node));
+      resultTag = this.options.onClose(tagName, value, this.textValue, new TagPathMatcher(this.tagsStack, node));
 
-      if(!resultTag) return;
+      if (!resultTag) return;
     }
 
     //set parent node in scope
-    let arr = this.tagsStack.pop(); 
+    let arr = this.tagsStack.pop();
     let parentTag = arr[2];
-    parentTag=this._addChildTo(resultTag.tagName, resultTag.value, parentTag);
+    parentTag = this._addChildTo(resultTag.tagName, resultTag.value, parentTag);
 
     this.tagName = arr[0];
     this.textValue = arr[1];
     this.value = parentTag;
   }
 
-  _addChild(key, val){
-    if(typeof this.value === "string"){
-      this.value = { [this.options.nameFor.text] : this.value };
+  _addChild(key, val) {
+    if (typeof this.value === "string") {
+      this.value = { [this.options.nameFor.text]: this.value };
     }
 
     this._addChildTo(key, val, this.value);
@@ -107,12 +107,12 @@ class JsObjBuilder extends BaseOutputBuilder{
     this.attributes = {};
   }
 
-  _addChildTo(key, val, node){
-    if(typeof node === 'string') node = {};
-    if(!node[key]){
+  _addChildTo(key, val, node) {
+    if (typeof node === 'string') node = {};
+    if (!node[key]) {
       node[key] = val;
-    }else{ //Repeated
-      if(!Array.isArray(node[key])){ //but not stored as array
+    } else { //Repeated
+      if (!Array.isArray(node[key])) { //but not stored as array
         node[key] = [node[key]];
       }
       node[key].push(val);
@@ -125,26 +125,26 @@ class JsObjBuilder extends BaseOutputBuilder{
    * Add text value child node 
    * @param {string} text 
    */
-  addValue(text){
+  addValue(text) {
     //TODO: use bytes join
-    if(this.textValue.length > 0) this.textValue += " " + text;
+    if (this.textValue.length > 0) this.textValue += " " + text;
     else this.textValue = text;
   }
 
-  addPi(name){
+  addPi(name) {
     let value = "";
-    if( !isEmpty(this.attributes)){
+    if (!isEmpty(this.attributes)) {
       value = {};
-      if(this.options.attributes.groupBy){
+      if (this.options.attributes.groupBy) {
         value[this.options.attributes.groupBy] = this.attributes;
-      }else{
+      } else {
         value = this.attributes;
       }
     }
     this._addChild(name, value);
-    
+
   }
-  getOutput(){
+  getOutput() {
     return this.value;
   }
 }

package/src/v6/OutputBuilders/ParserOptionsBuilder.js

@@ -3,8 +3,8 @@ import booleanParser from "../valueParsers/booleanParser.js";
 import currencyParser from "../valueParsers/currency.js";
 import numberParser from "../valueParsers/number.js";
 
-const defaultOptions={
-  nameFor:{
+const defaultOptions = {
+  nameFor: {
     text: "#text",
     comment: "",
     cdata: "",
@@ -22,11 +22,11 @@ const defaultOptions={
       // "date",
     ]
   },
-  attributes:{
+  attributes: {
     prefix: "@_",
     suffix: "",
     groupBy: "",
-    
+
     valueParsers: [
       // "trim",
       // "boolean",
@@ -35,35 +35,35 @@ const defaultOptions={
       // "date",
     ]
   },
-  dataType:{
+  dataType: {
 
   }
 }
 
 //TODO
-const withJoin = ["trim","join", /*"entities",*/"number","boolean","currency"/*, "date"*/]
-const withoutJoin = ["trim", /*"entities",*/"number","boolean","currency"/*, "date"*/]
+const withJoin = ["trim", "join", /*"entities",*/"number", "boolean", "currency"/*, "date"*/]
+const withoutJoin = ["trim", /*"entities",*/"number", "boolean", "currency"/*, "date"*/]
 
-export function buildOptions(options){
+export function buildOptions(options) {
   //clone
-  const finalOptions = { ... defaultOptions};
+  const finalOptions = { ...defaultOptions };
 
   //add config missed in cloning
   finalOptions.tags.valueParsers.push(...withJoin)
-  if(!this.preserveOrder)
+  if (!this.preserveOrder)
     finalOptions.tags.valueParsers.push(...withoutJoin);
 
   //add config missed in cloning
   finalOptions.attributes.valueParsers.push(...withJoin)
 
   //override configuration
-  copyProperties(finalOptions,options);
+  copyProperties(finalOptions, options);
   return finalOptions;
 }
 
 function copyProperties(target, source) {
   for (let key in source) {
-    if (source.hasOwnProperty(key)) {
+    if (Object.prototype.hasOwnProperty.call(source, key)) {
       if (typeof source[key] === 'object' && !Array.isArray(source[key])) {
         // Recursively copy nested properties
         if (typeof target[key] === 'undefined') {
@@ -78,16 +78,16 @@ function copyProperties(target, source) {
   }
 }
 
-export function registerCommonValueParsers(options){
+export function registerCommonValueParsers(options) {
   return {
     "trim": new trimParser(),
     // "join": this.entityParser.parse,
     "boolean": new booleanParser(),
     "number": new numberParser({
-          hex: true,
-          leadingZeros: true,
-          eNotation: true
-        }),
+      hex: true,
+      leadingZeros: true,
+      eNotation: true
+    }),
     "currency": new currencyParser(),
     // "date": this.entityParser.parse,
   }

package/src/v6/XMLParser.js

@@ -1,9 +1,9 @@
-import { buildOptions} from './OptionsBuilder.js';
+import { buildOptions } from './OptionsBuilder.js';
 import Xml2JsParser from './Xml2JsParser.js';
 
-export default class XMLParser{
-    
-    constructor(options){
+export default class XMLParser {
+
+    constructor(options) {
         this.externalEntities = {};
         this.options = buildOptions(options);
         // console.log(this.options)
@@ -13,17 +13,17 @@ export default class XMLParser{
      * @param {string|Buffer} xmlData 
      * @param {boolean|Object} validationOption 
      */
-    parse(xmlData){
-        if(Array.isArray(xmlData) && xmlData.byteLength !== undefined){
+    parse(xmlData) {
+        if (Array.isArray(xmlData) && xmlData.byteLength !== undefined) {
             return this.parse(xmlData);
-        }else if( xmlData.toString){
+        } else if (xmlData.toString) {
             xmlData = xmlData.toString();
-        }else{
+        } else {
             throw new Error("XML data is accepted in String or Bytes[] form.")
         }
         // if( validationOption){
         //     if(validationOption === true) validationOption = {}; //validate with default options
-            
+
         //     const result = validator.validate(xmlData, validationOption);
         //     if (result !== true) {
         //       throw Error( `${result.err.msg}:${result.err.line}:${result.err.col}` )
@@ -38,9 +38,9 @@ export default class XMLParser{
      * @param {string|Buffer} xmlData 
      * @param {boolean|Object} validationOption 
      */
-    parseBytesArr(xmlData){
-        if(Array.isArray(xmlData) && xmlData.byteLength !== undefined){
-        }else{
+    parseBytesArr(xmlData) {
+        if (Array.isArray(xmlData) && xmlData.byteLength !== undefined) {
+        } else {
             throw new Error("XML data is accepted in Bytes[] form.")
         }
         const parser = new Xml2JsParser(this.options);
@@ -51,9 +51,9 @@ export default class XMLParser{
      * Parse XML data stream to JS object 
      * @param {fs.ReadableStream} xmlDataStream 
      */
-    parseStream(xmlDataStream){
-        if(!isStream(xmlDataStream)) throw new Error("FXP: Invalid stream input");
-        
+    parseStream(xmlDataStream) {
+        if (!isStream(xmlDataStream)) throw new Error("FXP: Invalid stream input");
+
         const orderedObjParser = new Xml2JsParser(this.options);
         orderedObjParser.entityParser.addExternalEntities(this.externalEntities);
         return orderedObjParser.parseStream(xmlDataStream);
@@ -64,20 +64,20 @@ export default class XMLParser{
      * @param {string} key 
      * @param {string} value 
      */
-    addEntity(key, value){
-        if(value.indexOf("&") !== -1){
+    addEntity(key, value) {
+        if (value.indexOf("&") !== -1) {
             throw new Error("Entity value can't have '&'")
-        }else if(key.indexOf("&") !== -1 || key.indexOf(";") !== -1){
+        } else if (key.indexOf("&") !== -1 || key.indexOf(";") !== -1) {
             throw new Error("An entity must be set without '&' and ';'. Eg. use '#xD' for '
'")
-        }else if(value === "&"){
+        } else if (value === "&") {
             throw new Error("An entity with value '&' is not permitted");
-        }else{
+        } else {
             this.externalEntities[key] = value;
         }
     }
 }
 
-function isStream(stream){
-    if(stream && typeof stream.read === "function" && typeof stream.on === "function" && typeof stream.readableEnded === "boolean") return true;
+function isStream(stream) {
+    if (stream && typeof stream.read === "function" && typeof stream.on === "function" && typeof stream.readableEnded === "boolean") return true;
     return false;
 }

package/src/v6/valueParsers/EntitiesParser.js

@@ -1,105 +1,105 @@
-const ampEntity = { regex: /&(amp|#38|#x26);/g, val : "&"};
+const ampEntity = { regex: /&(amp|#38|#x26);/g, val: "&" };
 const htmlEntities = {
-    "space": { regex: /&(nbsp|#160);/g, val: " " },
-    // "lt" : { regex: /&(lt|#60);/g, val: "<" },
-    // "gt" : { regex: /&(gt|#62);/g, val: ">" },
-    // "amp" : { regex: /&(amp|#38);/g, val: "&" },
-    // "quot" : { regex: /&(quot|#34);/g, val: "\"" },
-    // "apos" : { regex: /&(apos|#39);/g, val: "'" },
-    "cent" : { regex: /&(cent|#162);/g, val: "¢" },
-    "pound" : { regex: /&(pound|#163);/g, val: "£" },
-    "yen" : { regex: /&(yen|#165);/g, val: "¥" },
-    "euro" : { regex: /&(euro|#8364);/g, val: "€" },
-    "copyright" : { regex: /&(copy|#169);/g, val: "©" },
-    "reg" : { regex: /&(reg|#174);/g, val: "®" },
-    "inr" : { regex: /&(inr|#8377);/g, val: "₹" },
-    "num_dec": { regex: /&#([0-9]{1,7});/g, val : (_, str) => String.fromCodePoint(Number.parseInt(str, 10)) },
-    "num_hex": { regex: /&#x([0-9a-fA-F]{1,6});/g, val : (_, str) => String.fromCodePoint(Number.parseInt(str, 16)) },
+  "space": { regex: /&(nbsp|#160);/g, val: " " },
+  // "lt" : { regex: /&(lt|#60);/g, val: "<" },
+  // "gt" : { regex: /&(gt|#62);/g, val: ">" },
+  // "amp" : { regex: /&(amp|#38);/g, val: "&" },
+  // "quot" : { regex: /&(quot|#34);/g, val: "\"" },
+  // "apos" : { regex: /&(apos|#39);/g, val: "'" },
+  "cent": { regex: /&(cent|#162);/g, val: "¢" },
+  "pound": { regex: /&(pound|#163);/g, val: "£" },
+  "yen": { regex: /&(yen|#165);/g, val: "¥" },
+  "euro": { regex: /&(euro|#8364);/g, val: "€" },
+  "copyright": { regex: /&(copy|#169);/g, val: "©" },
+  "reg": { regex: /&(reg|#174);/g, val: "®" },
+  "inr": { regex: /&(inr|#8377);/g, val: "₹" },
+  "num_dec": { regex: /&#([0-9]{1,7});/g, val: (_, str) => String.fromCodePoint(Number.parseInt(str, 10)) },
+  "num_hex": { regex: /&#x([0-9a-fA-F]{1,6});/g, val: (_, str) => String.fromCodePoint(Number.parseInt(str, 16)) },
 };
 
-export default class EntitiesParser{
-    constructor(replaceHtmlEntities) {
-      this.replaceHtmlEntities = replaceHtmlEntities;
-      this.docTypeEntities = {};
-      this.lastEntities = {
-        "apos" : { regex: /&(apos|#39|#x27);/g, val : "'"},
-        "gt" : { regex: /&(gt|#62|#x3E);/g, val : ">"},
-        "lt" : { regex: /&(lt|#60|#x3C);/g, val : "<"},
-        "quot" : { regex: /&(quot|#34|#x22);/g, val : "\""},
-      };
-    }
+export default class EntitiesParser {
+  constructor(replaceHtmlEntities) {
+    this.replaceHtmlEntities = replaceHtmlEntities;
+    this.docTypeEntities = {};
+    this.lastEntities = {
+      "apos": { regex: /&(apos|#39|#x27);/g, val: "'" },
+      "gt": { regex: /&(gt|#62|#x3E);/g, val: ">" },
+      "lt": { regex: /&(lt|#60|#x3C);/g, val: "<" },
+      "quot": { regex: /&(quot|#34|#x22);/g, val: "\"" },
+    };
+  }
 
-    addExternalEntities(externalEntities){
-        const entKeys = Object.keys(externalEntities);
-        for (let i = 0; i < entKeys.length; i++) {
-          const ent = entKeys[i];
-          this.addExternalEntity(ent,externalEntities[ent])
-        }
+  addExternalEntities(externalEntities) {
+    const entKeys = Object.keys(externalEntities);
+    for (let i = 0; i < entKeys.length; i++) {
+      const ent = entKeys[i];
+      this.addExternalEntity(ent, externalEntities[ent])
     }
-    addExternalEntity(key,val){
-      validateEntityName(key);
-      if(val.indexOf("&") !== -1) {
-        reportWarning(`Entity ${key} is not added as '&' is found in value;`)
-        return;
-      }else{
-        this.lastEntities[ent] = {
-          regex: new RegExp("&"+key+";","g"),
-          val : val
-        }
+  }
+  addExternalEntity(key, val) {
+    validateEntityName(key);
+    if (val.indexOf("&") !== -1) {
+      reportWarning(`Entity ${key} is not added as '&' is found in value;`)
+      return;
+    } else {
+      this.lastEntities[ent] = {
+        regex: new RegExp("&" + key + ";", "g"),
+        val: val
       }
     }
+  }
 
-    addDocTypeEntities(entities){
-        const entKeys = Object.keys(entities);
-        for (let i = 0; i < entKeys.length; i++) {
-          const ent = entKeys[i];
-          this.docTypeEntities[ent] = {
-             regex: new RegExp("&"+ent+";","g"),
-             val : entities[ent]
-          }
-        }
+  addDocTypeEntities(entities) {
+    const entKeys = Object.keys(entities);
+    for (let i = 0; i < entKeys.length; i++) {
+      const ent = entKeys[i];
+      this.docTypeEntities[ent] = {
+        regex: new RegExp("&" + ent + ";", "g"),
+        val: entities[ent]
+      }
     }
+  }
 
-    parse(val){
-        return this.replaceEntitiesValue(val)
-    }
+  parse(val) {
+    return this.replaceEntitiesValue(val)
+  }
 
-    /**
-     * 1. Replace DOCTYPE entities 
-     * 2. Replace external entities 
-     * 3. Replace HTML entities if asked
-     * @param {string} val 
-     */
-    replaceEntitiesValue(val){
-        if(typeof val === "string" && val.length > 0){
-            for(let entityName in this.docTypeEntities){
-                const entity = this.docTypeEntities[entityName];
-                val = val.replace( entity.regx, entity.val);
-              }
-              for(let entityName in this.lastEntities){
-                const entity = this.lastEntities[entityName];
-                val = val.replace( entity.regex, entity.val);
-              }
-              if(this.replaceHtmlEntities){
-                for(let entityName in htmlEntities){
-                  const entity = htmlEntities[entityName];
-                  val = val.replace( entity.regex, entity.val);
-                }
-              }
-            val = val.replace( ampEntity.regex, ampEntity.val);
+  /**
+   * 1. Replace DOCTYPE entities 
+   * 2. Replace external entities 
+   * 3. Replace HTML entities if asked
+   * @param {string} val 
+   */
+  replaceEntitiesValue(val) {
+    if (typeof val === "string" && val.length > 0) {
+      for (let entityName in this.docTypeEntities) {
+        const entity = this.docTypeEntities[entityName];
+        val = val.replace(entity.regx, entity.val);
+      }
+      for (let entityName in this.lastEntities) {
+        const entity = this.lastEntities[entityName];
+        val = val.replace(entity.regex, entity.val);
+      }
+      if (this.replaceHtmlEntities) {
+        for (let entityName in htmlEntities) {
+          const entity = htmlEntities[entityName];
+          val = val.replace(entity.regex, entity.val);
         }
-        return val;
+      }
+      val = val.replace(ampEntity.regex, ampEntity.val);
     }
+    return val;
+  }
 };
 
 //an entity name should not contains special characters that may be used in regex
 //Eg !?\\\/[]$%{}^&*()<>
 const specialChar = "!?\\\/[]$%{}^&*()<>|+";
 
-function validateEntityName(name){
-    for (let i = 0; i < specialChar.length; i++) {
-        const ch = specialChar[i];
-        if(name.indexOf(ch) !== -1) throw new Error(`Invalid character ${ch} in entity name`);
-    }
-    return name;
+function validateEntityName(name) {
+  for (let i = 0; i < specialChar.length; i++) {
+    const ch = specialChar[i];
+    if (name.indexOf(ch) !== -1) throw new Error(`Invalid character ${ch} in entity name`);
+  }
+  return name;
 }