als-document 1.0.1-alpha → 1.0.3-alpha

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "als-document",
-  "version": "1.0.1-alpha",
+  "version": "1.0.3-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,8 @@ const { readFileSync, writeFileSync, watchFile, watch } = require('fs')
 const { join,basename } = require('path')
 
 function optimizeCode(content) {
-   content = content.replace(/(?<!\\)\/\/.*$/gm, '') // remove comments
+   // 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, ']') // 

package/src/node/node.js

@@ -83,7 +83,7 @@ class Node {
    $(query) {return this.querySelector(query)}
    querySelector(query) {
       const selectors = Query.get(query)
-      return find(selectors, this, new Set(), true)[0]
+      return find(selectors, this, new Set(), true)[0] || null
    }
 
    getElementsByClassName(query) { return this.querySelectorAll('.' + query) }
@@ -111,7 +111,10 @@ class Node {
 
    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/node/single-node.js

@@ -6,7 +6,7 @@ class SingleNode extends Node {
    }
    
    get outerHTML() { // Переопределение outerHTML для одиночного узла
-      if (this.tagName === "#cdata-section") return `<![CDATA[${this.textContent}]]>`;
+      if (this.tagName === "#cdata-section") return `<![CDATA[${this.nodeValue}]]>`;
       const attrs = Object.entries(this.attributes).map(([key, val]) => `${key}="${val}"`).join(" ");
       return `<${this.tagName} ${attrs}${this.tagName === '?xml' ? '?' : ''}>`;
    }

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)) {
@@ -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('/');

package/src/query/check-element.js

@@ -1,9 +1,8 @@
 function checkElement(el,selector) {
    if(selector == undefined) return true
    if(el == null) return false
-   let {tag,classList,attribs,id,prev,ancestors,parents,prevAny} = selector
+   let {tag,classList,attributes,id,prev,ancestors,parents,prevAny} = selector
    if(typeof el === 'string') return false
-   if(el.isSpecial) return false
    if(id !== undefined && el.id === null) return false
    if(id && id !== el.id) return false
    if(tag && el.tagName === undefined) return false
@@ -13,7 +12,7 @@ function checkElement(el,selector) {
    else if(classList !== undefined) {
       if(classList.every(e => el.classList.contains(e)) === false) return false
    }
-   if(checkattributes(attribs,el) === false) return false
+   if(checkattributes(attributes,el) === false) return false
    if(checkElement(el.prev,prev) === false) return false
    if(checkAncestors(el.ancestors,ancestors) === false) return false
    if(checkParents(el.ancestors,parents) === false) return false