Use node test module

Author: oozcitak

.vscode/launch.json

@@ -29,7 +29,7 @@
   "dependencies": {
     "@oozcitak/dom": "^2.0.1",
     "@oozcitak/infra": "^2.0.1",
-    "@oozcitak/util": "^9.0.2",
+    "@oozcitak/util": "^9.0.4",
     "js-yaml": "^4.1.0"
   },
   "devDependencies": {
@@ -56,6 +56,7 @@
   "scripts": {
     "test": "tsc && tsx --test --experimental-test-coverage test/**/*test.ts",
     "cover": "tsc && tsx --test --experimental-test-coverage --test-reporter=lcov --test-reporter-destination=./coverage/lcov.info test/**/*test.ts",
-    "publish-public": "tsc && npm run cover && npm publish --access public"
+    "publish-public": "tsc && npm run cover && npm publish --access public",
+    "servedocs": "(cd docs && bundle exec jekyll serve)"
   }
 }

.vscode/settings.json

@@ -27,7 +27,7 @@ export class XMLBuilderImpl implements XMLBuilder {
 
   /**
    * Initializes a new instance of `XMLBuilderNodeImpl`.
-   * 
+   *
    * @param domNode - the DOM node to wrap
    */
   constructor(domNode: Node) {
@@ -53,19 +53,19 @@ export class XMLBuilderImpl implements XMLBuilder {
     p3?: AttributesObject): XMLBuilder {
 
     let namespace: string | null | undefined
-    let name: string | ExpandObject | undefined
+    let name: string | ExpandObject | undefined | null
     let attributes: AttributesObject | undefined
 
-    if (isObject(p1)) {
+    if (isObject<string>(p1)) {
       // ele(obj: ExpandObject)
       return new ObjectReader(this._options).parse(this, p1)
-    } else if (p1 !== null && /^\s*</.test(p1)) {
+    } else if (isString(p1) && p1 !== null && /^\s*</.test(p1)) {
       // parse XML document string
       return new XMLReader(this._options).parse(this, p1)
-    } else if (p1 !== null && /^\s*[\{\[]/.test(p1)) {
+    } else if (isString(p1) && p1 !== null && /^\s*[\{\[]/.test(p1)) {
       // parse JSON string
       return new JSONReader(this._options).parse(this, p1)
-    } else if (p1 !== null && /^(\s*|(#.*)|(%.*))*---/.test(p1)) {
+    } else if (isString(p1) && p1 !== null && /^(\s*|(#.*)|(%.*))*---/.test(p1)) {
       // parse YAML string
       return new YAMLReader(this._options).parse(this, p1)
     }
@@ -86,7 +86,7 @@ export class XMLBuilderImpl implements XMLBuilder {
 
     [namespace, name] = this._extractNamespace(
       sanitizeInput(namespace, this._options.invalidCharReplacement),
-      sanitizeInput(name, this._options.invalidCharReplacement), true)
+      sanitizeInput(name as string, this._options.invalidCharReplacement), true)
 
     // inherit namespace from parent
     if (namespace === undefined) {
@@ -130,7 +130,7 @@ export class XMLBuilderImpl implements XMLBuilder {
   /** @inheritdoc */
   att(p1: AttributesObject | string | null, p2?: string, p3?: string): XMLBuilder {
 
-    if (isMap(p1) || isObject(p1)) {
+    if (isMap<string>(p1) || isObject<string>(p1)) {
       // att(obj: AttributesObject)
       // expand if object
       forEachObject(p1, (attName, attValue) => this.att(attName, attValue), this)
@@ -228,7 +228,7 @@ export class XMLBuilderImpl implements XMLBuilder {
       throw new Error("Attribute namespace must be a string. " + this._debugInfo())
     }
 
-    if (isArray(name) || isSet(name)) {
+    if (isArray<string>(name) || isSet<string>(name)) {
       // removeAtt(names: string[])
       // removeAtt(namespace: string, names: string[])
       forEachArray(name, attName =>
@@ -316,15 +316,15 @@ export class XMLBuilderImpl implements XMLBuilder {
       }
     }
 
-    if (isArray(target) || isSet(target)) {
-      forEachArray(target, item => {
+    if (isArray<string>(target) || isSet<string>(target)) {
+      forEachArray<string>(target, item => {
         item += ""
         const insIndex = item.indexOf(' ')
         const insTarget = (insIndex === -1 ? item : item.substr(0, insIndex))
         const insValue = (insIndex === -1 ? '' : item.substr(insIndex + 1))
         this.ins(insTarget, insValue)
       }, this)
-    } else if (isMap(target) || isObject(target)) {
+    } else if (isMap<string>(target) || isObject<string>(target)) {
       forEachObject(target, (insTarget, insValue) => this.ins(insTarget, insValue), this)
     } else {
       const child = this._doc.createProcessingInstruction(
@@ -619,7 +619,7 @@ export class XMLBuilderImpl implements XMLBuilder {
    * Gets the next descendant of the given node of the tree rooted at `root`
    * in depth-first pre-order. Returns a three-tuple with
    * [descendant, descendant_index, descendant_level].
-   * 
+   *
    * @param root - root node of the tree
    * @param self - whether to visit the current node along with child nodes
    * @param recursive - whether to visit all descendant nodes in tree-order or
@@ -638,7 +638,7 @@ export class XMLBuilderImpl implements XMLBuilder {
    * Gets the next descendant of the given node of the tree rooted at `root`
    * in depth-first pre-order. Returns a three-tuple with
    * [descendant, descendant_index, descendant_level].
-   * 
+   *
    * @param root - root node of the tree
    * @param node - current node
    * @param recursive - whether to visit all descendant nodes in tree-order or
@@ -675,7 +675,7 @@ export class XMLBuilderImpl implements XMLBuilder {
 
   /**
    * Converts the node into its string or object representation.
-   * 
+   *
    * @param options - serialization options
    */
   private _serialize(writerOptions: WriterOptions): XMLSerializedValue {
@@ -701,7 +701,7 @@ export class XMLBuilderImpl implements XMLBuilder {
 
   /**
    * Extracts a namespace and name from the given string.
-   * 
+   *
    * @param namespace - namespace
    * @param name - a string containing both a name and namespace separated by an
    * `'@'` character
@@ -732,7 +732,7 @@ export class XMLBuilderImpl implements XMLBuilder {
 
   /**
    * Updates the element's namespace.
-   * 
+   *
    * @param ns - new namespace
    */
   private _updateNamespace(ns: string | null): void {
@@ -797,7 +797,7 @@ export class XMLBuilderImpl implements XMLBuilder {
 
   /**
    * Returns debug information for this node.
-   * 
+   *
    * @param name - node name
    */
   protected _debugInfo(name?: string): string {

package-lock.json

@@ -23,23 +23,23 @@ export class ObjectReader extends BaseReader<ExpandObject> {
 
     let lastChild: XMLBuilder | null = null
 
-    if (isFunction(obj)) {
+    if (isFunction<ExpandObject>(obj)) {
       // evaluate if function
-      lastChild = this.parse(node, Function.prototype.apply(obj, this))
-    } else if (isArray(obj) || isSet(obj)) {
+      lastChild = this.parse(node, obj.call(this))
+    } else if (isArray<ExpandObject>(obj) || isSet<ExpandObject>(obj)) {
       forEachArray(obj, item => lastChild = this.parse(node, item), this)
-    } else if (isMap(obj) || isObject(obj)) {
+    } else if (isMap<ExpandObject>(obj) || isObject<ExpandObject>(obj)) {
       // expand if object
-      forEachObject(obj, (key, val) => {
-        if (isFunction(val)) {
+      forEachObject<ExpandObject>(obj, (key, val) => {
+        if (isFunction<ExpandObject>(val)) {
           // evaluate if function
-          val = Function.prototype.apply(val, this)
+          val = val.call(this)
         }
 
         if (!options.ignoreConverters && key.indexOf(options.convert.att) === 0) {
           // assign attributes
           if (key === options.convert.att) {
-            if (isArray(val) || isSet(val)) {
+            if (isArray<ExpandObject>(val) || isSet<ExpandObject>(val)) {
               throw new Error("Invalid attribute: " + val.toString() + ". " + (node as any)._debugInfo())
             } else /* if (isMap(val) || isObject(val)) */ {
               forEachObject(val, (attrKey, attrVal) => {
@@ -49,30 +49,30 @@ export class ObjectReader extends BaseReader<ExpandObject> {
             }
           } else {
             lastChild = this.attribute(node, undefined,
-              this.sanitize(key.substr(options.convert.att.length)),
-              this._decodeAttributeValue(this.sanitize(val))) || lastChild
+              this.sanitize(key.substring(options.convert.att.length)),
+              this._decodeAttributeValue(this.sanitize(val?.toString()))) || lastChild
           }
         } else if (!options.ignoreConverters && key.indexOf(options.convert.text) === 0) {
           // text node
           if (isMap(val) || isObject(val)) {
             // if the key is #text expand child nodes under this node to support mixed content
             lastChild = this.parse(node, val)
           } else {
-            lastChild = this.text(node, this._decodeText(this.sanitize(val))) || lastChild
+            lastChild = this.text(node, this._decodeText(this.sanitize(val?.toString()))) || lastChild
           }
         } else if (!options.ignoreConverters && key.indexOf(options.convert.cdata) === 0) {
           // cdata node
-          if (isArray(val) || isSet(val)) {
+          if (isArray<string>(val) || isSet<string>(val)) {
             forEachArray(val, item => lastChild = this.cdata(node, this.sanitize(item)) || lastChild, this)
           } else {
-            lastChild = this.cdata(node, this.sanitize(val)) || lastChild
+            lastChild = this.cdata(node, this.sanitize(val?.toString())) || lastChild
           }
         } else if (!options.ignoreConverters && key.indexOf(options.convert.comment) === 0) {
           // comment node
-          if (isArray(val) || isSet(val)) {
+          if (isArray<string>(val) || isSet<string>(val)) {
             forEachArray(val, item => lastChild = this.comment(node, this.sanitize(item)) || lastChild, this)
           } else {
-            lastChild = this.comment(node, this.sanitize(val)) || lastChild
+            lastChild = this.comment(node, this.sanitize(val?.toString())) || lastChild
           }
         } else if (!options.ignoreConverters && key.indexOf(options.convert.ins) === 0) {
           // processing instruction
@@ -81,7 +81,7 @@ export class ObjectReader extends BaseReader<ExpandObject> {
             const insTarget = (insIndex === -1 ? val : val.substr(0, insIndex))
             const insValue = (insIndex === -1 ? '' : val.substr(insIndex + 1))
             lastChild = this.instruction(node, this.sanitize(insTarget), this.sanitize(insValue)) || lastChild
-          } else if (isArray(val) || isSet(val)) {
+          } else if (isArray<string>(val) || isSet<string>(val)) {
             forEachArray(val, item => {
               const insIndex = item.indexOf(' ')
               const insTarget = (insIndex === -1 ? item : item.substr(0, insIndex))
@@ -115,12 +115,12 @@ export class ObjectReader extends BaseReader<ExpandObject> {
             // expand child nodes under parent
             this.parse(parent, val)
           }
-        } else if (val != null && val !== '') {
+        } else if (val != null && (!isString(val) || val !== '')) {
           // leaf element node with a single text node
           const parent = this.element(node, undefined, this.sanitize(key))
           if (parent) {
             lastChild = parent
-            this.text(parent, this._decodeText(this.sanitize(val)))
+            this.text(parent, this._decodeText(this.sanitize(val?.toString())))
           }
         } else {
           // leaf element node
@@ -131,7 +131,7 @@ export class ObjectReader extends BaseReader<ExpandObject> {
       // skip null and undefined nodes
     } else {
       // text node
-      lastChild = this.text(node, this._decodeText(this.sanitize(obj))) || lastChild
+      lastChild = this.text(node, this._decodeText(this.sanitize(obj?.toString()))) || lastChild
     }
 
     return lastChild || node

package.json

@@ -16,7 +16,7 @@ export class YAMLWriter extends BaseWriter<YAMLWriterOptions, string> {
 
   /**
    * Initializes a new instance of `YAMLWriter`.
-   * 
+   *
    * @param builderOptions - XML builder options
    * @param writerOptions - serialization options
    */
@@ -42,7 +42,7 @@ export class YAMLWriter extends BaseWriter<YAMLWriterOptions, string> {
 
   /**
    * Produces an XML serialization of the given node.
-   * 
+   *
    * @param node - node to serialize
    * @param writerOptions - serialization options
    */
@@ -69,7 +69,7 @@ export class YAMLWriter extends BaseWriter<YAMLWriterOptions, string> {
 
   /**
    * Produces an XML serialization of the given object.
-   * 
+   *
    * @param obj - object to serialize
    * @param options - serialization options
    * @param level - depth of the XML tree
@@ -86,7 +86,7 @@ export class YAMLWriter extends BaseWriter<YAMLWriterOptions, string> {
         if (!isObject(val)) {
           markup += this._val(val) + this._endLine(options)
         } else if (isEmpty(val)) {
-          markup += '""' + this._endLine(options)          
+          markup += '""' + this._endLine(options)
         } else {
           markup += this._convertObject(val, options, level, true)
         }
@@ -99,7 +99,7 @@ export class YAMLWriter extends BaseWriter<YAMLWriterOptions, string> {
         } else {
           markup += this._beginLine(options, level) + this._key(key)
         }
-        if (!isObject(val)) {
+        if (!isObject(val) && !isArray(val)) {
           markup += ' ' + this._val(val) + this._endLine(options)
         } else if (isEmpty(val)) {
           markup += ' ""' + this._endLine(options)
@@ -116,7 +116,7 @@ export class YAMLWriter extends BaseWriter<YAMLWriterOptions, string> {
   /**
    * Produces characters to be prepended to a line of string in pretty-print
    * mode.
-   * 
+   *
    * @param options - serialization options
    * @param level - current depth of the XML tree
    * @param isArray - whether this line is an array item
@@ -134,7 +134,7 @@ export class YAMLWriter extends BaseWriter<YAMLWriterOptions, string> {
   /**
    * Produces characters to be appended to a line of string in pretty-print
    * mode.
-   * 
+   *
    * @param options - serialization options
    */
   private _endLine(options: Required<YAMLWriterOptions>): string {