als-document 1.0.2-alpha → 1.0.4-alpha

package/package.json

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

package/src/build.js

@@ -2,7 +2,9 @@ const { readFileSync, writeFileSync, watchFile, watch } = require('fs')
 const { join,basename } = require('path')
 
 function optimizeCode(content) {
+   // content = content.replace(/(?<!\\)\/\/.*$/gm, '') // remove comments
    content = content.replace(/^(?<!\\)\/\/.*$|(?<=\s)(?<!\\)\/\/.*$/gm, '') // remove comments
+   // content = content.replace(/\;\s*?$/gm,'') // remove ; at end of line
    content = content.replace(/\[\s*?\n\s*/gm, '[') // 
    content = content.replace(/\s*?\]/gm, ']') // 
    content = content.replace(/\s*?$/gm, '') // remove space at end of line

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,15 +119,20 @@ 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
    }
 
    insertAdjacentHTML(position, html) {
       const newNode = parseHTML(html);
-      return this.insertAdjacentElement(position, newNode);
+      newNode.childNodes.reverse().forEach(node => {
+         this.insertAdjacentElement(position, node);
+      });
+      return newNode
    }
 
    insertAdjacentText(position, text) {

package/src/parse/parser.js

@@ -2,6 +2,27 @@ function parseHTML(html) {
    const root = new Node("ROOT");
    const stack = [root];
    let currentText = "", i = 0;
+   let max = 0
+
+   function parseScript() {
+      if (!html.startsWith("<script", i)) return false;
+      const openTagEnd = html.indexOf(">", i);
+      if (openTagEnd === -1) return false; 
+
+      const attributesString = html.substring(i + 7, openTagEnd).trim();  // +7 чтобы пропустить "<script"
+      const attributes = parseAttributes(attributesString); // Извлечь атрибуты
+
+      let closeTagStart = html.indexOf("</script>", openTagEnd); // Находим закрывающий тег
+      if (closeTagStart === -1) return false;  // Если нет закрывающего тега, возвращаем ошибку
+      const content = html.substring(openTagEnd + 1, closeTagStart); // Получить содержимое тега
+
+      const scriptNode = new Node('script', attributes, stack[stack.length - 1]); // Создаем узел
+      if(content.length > 0) scriptNode.childNodes.push(content);
+
+      // Переместить указатель i к концу закрывающего тега
+      i = closeTagStart + 9;  // +9 чтобы пропустить "</script>"
+      return true;
+   }
 
    function parseSpecial(startStr, endStr, n1, n2, tag) {
       if (!html.startsWith(startStr, i)) return false
@@ -13,8 +34,10 @@ function parseHTML(html) {
    }
 
    while (i < html.length) {
+      if(i >= max) max = i;
+      else break;
+      if (parseScript()) continue
       if (parseSpecial("<!--", "-->", 4, 3, '#comment')) continue
-      if (parseSpecial("<script", "</script>", 8, 9, 'script')) continue
       if (parseSpecial("<style", "</style>", 7, 8, 'style')) continue
 
       if (html.startsWith("<![CDATA[", i)) {
@@ -28,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].childNodes.push(new TextNode(currentText));
             currentText = "";
          }
 
@@ -52,7 +75,6 @@ function parseHTML(html) {
          }
 
          const tagContent = html.substring(i + 1, tagEnd);
-
          if (tagContent.startsWith("/")) stack.pop(); // It is close tag
          else { // It is open tag
             let isSelfClosing = tagContent.endsWith('/');
@@ -69,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].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>