als-document 1.0.3-alpha → 1.0.5-alpha

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "als-document",
-  "version": "1.0.3-alpha",
+  "version": "1.0.5-alpha",
   "description": "A powerful HTML parser & DOM manipulation library for both backend and frontend.",
   "main": "index.js",
   "module": "index.mjs",

package/src/node/node.js

@@ -1,3 +1,9 @@
+function insertBefore(arr, index, newItem) {
+   const existingIndex = arr.indexOf(newItem);
+   if (existingIndex !== -1) arr.splice(existingIndex, 1);
+   arr.splice(index, 0, newItem);
+}
+
 class Node {
    constructor(tagName, attributes = {}, parent = null) {
       this.isSingle = false;
@@ -11,10 +17,12 @@ class Node {
       this._dataset = null
    }
 
-   get id() { return this.attributes.id || null; }
+   get id() { return this.attributes.id ? this.attributes.id : null; }
+   set id(newValue) { this.attributes.id = newValue; }
    get className() {return this.attributes.class || null}
    get parentNode() { return this.parent }
    get ancestors() {
+      if(!this.parent) return []
       const ancestors = []
       let element = this.parent
       while (element.tagName !== 'ROOT') {
@@ -24,17 +32,25 @@ class Node {
       return ancestors.reverse()
    }
 
-   get childIndex() { return this.parent.childNodes ? this.parent.childNodes.indexOf(this) : null }
+   get childNodeIndex() {
+      if(!this.parent) return null
+      return this.parent.childNodes ? this.parent.childNodes.indexOf(this) : null 
+   }
+
+   get childIndex() { 
+      if(!this.parent) return null
+      return this.parent.children ? this.parent.children.indexOf(this) : null 
+   }
    get previousElementSibling() { return this.prev }
    get prev() {
       if (!this.childIndex) return null // if no index or index == 0
-      return this.parent.childNodes[this.childIndex - 1]
+      return this.parent.children[this.childIndex - 1]
    }
 
    get nextElementSibling() { return this.next }
    get next() {
       if (!this.childIndex) return null
-      return this.parent.childNodes[this.childIndex + 1] || null
+      return this.parent.children[this.childIndex + 1] || null
    }
 
    get dataset() {
@@ -54,7 +70,7 @@ class Node {
 
    get outerHTML() {
       const attrs = Object.entries(this.attributes).map(([key, val]) => `${key}="${val}"`).join(" ");
-      return `<${this.tagName} ${attrs}>${this.innerHTML}</${this.tagName}>`;
+      return `<${this.tagName}${attrs ? ' '+attrs : ''}>${this.innerHTML}</${this.tagName}>`;
    }
 
    getAttribute(attrName) { return this.attributes[attrName] || null }
@@ -103,9 +119,11 @@ class Node {
       const pos = position.toLowerCase();
       if (pos === "afterbegin") this.childNodes.unshift(newElement);
       else if (pos === "beforeend") this.childNodes.push(newElement);
+      newElement.parent = this
       if (!this.parent) return newElement
-      if (pos === "beforebegin") this.parent.childNodes.unshift(newElement);
-      else if (pos === "afterend") this.parent.childNodes.splice(this.childIndex + 1, 0, newElement);
+      if (pos === "beforebegin") insertBefore(this.parent.childNodes, this.childNodeIndex, newElement)
+      else if (pos === "afterend") this.parent.childNodes.splice(this.childNodeIndex + 1, 0, newElement);
+      newElement.parent = this.parent
       return newElement
    }
 

package/src/parse/parser.js

@@ -51,8 +51,8 @@ function parseHTML(html) {
       }
 
       if (html.startsWith("<", i)) {
-         if (currentText.trim()) {
-            stack[stack.length - 1].childNodes.push(new TextNode(currentText.trim()));
+         if (currentText && stack[stack.length - 1]) {
+            stack[stack.length - 1].childNodes.push(new TextNode(currentText));
             currentText = "";
          }
 
@@ -91,6 +91,6 @@ function parseHTML(html) {
          i++;
       }
    }
-   if (currentText.trim()) stack[stack.length - 1].childNodes.push(new TextNode(currentText.trim()));
+   if (currentText.trim() && stack[stack.length - 1]) stack[stack.length - 1].childNodes.push(new TextNode(currentText));
    return root;
 }

package/src/query/check-element.js

@@ -1,7 +1,7 @@
 function checkElement(el,selector) {
    if(selector == undefined) return true
    if(el == null) return false
-   let {tag,classList,attributes,id,prev,ancestors,parents,prevAny} = selector
+   let {tag,classList,attribs:attributes,id,prev,ancestors,parents,prevAny} = selector
    if(typeof el === 'string') return false
    if(id !== undefined && el.id === null) return false
    if(id && id !== el.id) return false

package/tests/index.html

@@ -5,7 +5,7 @@
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>Document</title>
    <script src="/node_modules/als-simple-test/test.js"></script>
-   <script src="/document.js"></script>
+   <script src="../document.js"></script>
    <script src="./data/html1.js"></script>
    <!-- <script src="./data/html2.js"></script> -->
    <script src="./data/svg.js"></script>
@@ -14,8 +14,8 @@
       let {describe,it,beforeEach,runTests,expect,delay,assert,beforeAll} = SimpleTest
       SimpleTest.showFullError = true
    </script>
-   <script src="./query.js"></script>
    <script src="utils.js"></script>
+   <script src="./query.js"></script>
    <script src="parser.js"></script>
    <script src="node.js"></script>
 </head>

package/tests/node.js

@@ -130,7 +130,7 @@ describe('Content Manipulation', () => {
       expect(rootNode.childNodes[2].tagName).equalTo('a');
       
       childNode.insertAdjacentHTML('beforebegin', '<strong></strong>');
-      expect(rootNode.childNodes[0].tagName).equalTo('strong');
+      expect(rootNode.childNodes[1].tagName).equalTo('strong');
 
       childNode.insertAdjacentText('afterend', 'Some text');
       expect(typeof rootNode.childNodes[3].nodeValue).equalTo('string');

package/tests/parser.js

@@ -225,11 +225,11 @@ describe('signle tags, script and style', () => {
 <link rel="stylesheet" href="styles.css">
 `;
         const rootMetaLink = parseHTML(testMetaLink);
-        assert(rootMetaLink.childNodes[0].tagName === "meta", "Test Meta/Link 1: Meta tag not created");
-        assert(rootMetaLink.childNodes[0].getAttribute("charset") === "UTF-8", "Test Meta/Link 1: Meta content not correct");
-        assert(rootMetaLink.childNodes[1].tagName === "link", "Test Meta/Link 2: Link tag not created");
-        assert(rootMetaLink.childNodes[1].getAttribute("rel") === "stylesheet", "Test Meta/Link 2: Link rel attribute not correct");
-        assert(rootMetaLink.childNodes[1].getAttribute("href") === "styles.css", "Test Meta/Link 2: Link href attribute not correct");
+        assert(rootMetaLink.children[0].tagName === "meta", "Test Meta/Link 1: Meta tag not created");
+        assert(rootMetaLink.children[0].getAttribute("charset") === "UTF-8", "Test Meta/Link 1: Meta content not correct");
+        assert(rootMetaLink.children[1].tagName === "link", "Test Meta/Link 2: Link tag not created");
+        assert(rootMetaLink.children[1].getAttribute("rel") === "stylesheet", "Test Meta/Link 2: Link rel attribute not correct");
+        assert(rootMetaLink.children[1].getAttribute("href") === "styles.css", "Test Meta/Link 2: Link href attribute not correct");
     })
 
     it('broken html structure', () => {