als-document 0.6.11 → 0.7.0

package/document.js

@@ -103,8 +103,8 @@ class HtmlSelector {
       let passedTests = 0
       if(attribs) for(let i=0; i<attribs.length; i++) {
          let {name,value,check} = attribs[i]
-         if(name == 'inner' && value !== undefined && check && el.innerText) {
-            if(check(el.innerText)) passedTests++
+         if(name == 'inner' && value !== undefined && check && el.inner) {
+            if(check(el.inner)) passedTests++
          }
          
          if(!names.includes(name)) continue
@@ -118,7 +118,6 @@ class HtmlSelector {
       else return false
    }
 }
-
 class Query {
    static get(query) {
       let q = new Query(query)
@@ -265,7 +264,6 @@ class Query {
       return selector
    }
 }
-
 class HtmlParser {
    static parse(html) {
       let result = new HtmlParser(html)
@@ -319,7 +317,6 @@ class HtmlParser {
    }
 
    removeEventStrings() {
-      // let eventsWithHtml = this.htmlString.match(/on\w*\s*?\=\s*?["|'|`](.*?(<[^>]*>)(\'|\`).*?)["|'|`]/g)
       let eventsWithHtml = this.htmlString.match(/\son\w*\s*?\=\s*?\"(.*?)\"/g)
       if(eventsWithHtml !== null) {
          eventsWithHtml.forEach(event => {
@@ -335,7 +332,6 @@ class HtmlParser {
 
    parse(htmlString=this.htmlString) {
    // Parse tags
-      // let elements = htmlString.match(/<[^>]*>/g)
       let elements = htmlString.match(/<("[^"]*"|'[^']*'|[^'">])*>/g)
       elements.forEach((tag,index) => {
          elements[index] = this.parseElement(tag)
@@ -515,6 +511,16 @@ class HtmlParser {
 
    innerText(element) {
       Object.defineProperty(element, 'innerText', { get() {
+         if(element.children)
+            return element.children.map(child => 
+               child.type == 'text' ? child.text.trim() 
+               : child.type == 'tag' 
+                  ? child.innerText
+                  : ''
+            ).join(' ')
+         else return ''
+      }})
+      Object.defineProperty(element, 'inner', { get() {
          if(element.children)
             return element.children.map(child => child.type == 'text' ? child.text : '').join('')
          else return ''
@@ -568,13 +574,14 @@ class HtmlParser {
 
    parseAttributes(tagString,classList=[],attribs={},style={},id=null) {
       let text = tagString
-      let attributes = tagString.match(/(?<=\s)(\w*\-?)*(\s*?\=\s*?\"[\s\S]*?\")?/g)
-      if(attributes) attributes.forEach(attribString => {
+      let attributes = tagString.match(/(\w+)(?:\s*=\s*(['"]?)(.*?)\2)?/g)
+      if(attributes) attributes.forEach((attribString,i) => {
+         if(i == 0) return
          let array = attribString.split('=')
          let name = array[0]
          if(array.length>1 && name !== '') {
             let value = array.filter((v,i) => i>0).join('=')
-            value = value.trim().replace(/^\"/,'').replace(/\"$/m,'')
+            value = value.trim().replace(/^\"|\'/,'').replace(/\"|\'$/m,'')
             let eventIndex = value.match(/(?<=\{\{\{\{event\s)(\d*)?/)
             if(eventIndex !== null) {
                value = this.events[eventIndex[0]]
@@ -648,6 +655,7 @@ class Document extends HtmlSelector {
             obj[prop] = value
             element.attribs.style = Object.keys(obj).map(key => `${convertProp(key)}:${obj[key]};`).join('')
             self.changeElementText(this)
+            return true
          },
          deleteProperty(obj, prop) {
             if (prop in obj) {
@@ -655,6 +663,7 @@ class Document extends HtmlSelector {
                element.attribs.style = Object.keys(obj).map(key => `${convertProp(key)}:${obj[key]};`).join('')
             }
             self.changeElementText(this)
+            return true
          }
       };
       element.style = new Proxy(obj, handler);
@@ -792,4 +801,6 @@ class Document extends HtmlSelector {
          element.text = `<${tag}${atts}>`
       }
    }
-}
+}
+
+try {module.exports = {HtmlSelector,Query,HtmlParser,Document}} catch (error) {}