@e-mc/document 0.10.1 → 0.10.2

package/package.json

@@ -1,31 +1,31 @@
-{
-  "name": "@e-mc/document",
-  "version": "0.10.1",
-  "description": "Document constructor for E-mc.",
-  "main": "index.js",
-  "types": "index.d.ts",
-  "publishConfig": {
-    "access": "public"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/anpham6/e-mc.git",
-    "directory": "src/document"
-  },
-  "keywords": [
-    "squared",
-    "squared-functions"
-  ],
-  "author": "An Pham <anpham6@gmail.com>",
-  "license": "BSD 3-Clause",
-  "homepage": "https://github.com/anpham6/e-mc#readme",
-  "dependencies": {
-    "@e-mc/core": "0.10.1",
-    "@e-mc/db": "0.10.1",
-    "@e-mc/types": "0.10.1",
-    "chalk": "4.1.2",
-    "htmlparser2": "^9.1.0",
-    "js-yaml": "^4.1.0",
-    "picomatch": "^4.0.2"
-  }
-}
+{
+  "name": "@e-mc/document",
+  "version": "0.10.2",
+  "description": "Document constructor for E-mc.",
+  "main": "index.js",
+  "types": "index.d.ts",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/anpham6/e-mc.git",
+    "directory": "src/document"
+  },
+  "keywords": [
+    "squared",
+    "squared-functions"
+  ],
+  "author": "An Pham <anpham6@gmail.com>",
+  "license": "BSD 3-Clause",
+  "homepage": "https://github.com/anpham6/e-mc#readme",
+  "dependencies": {
+    "@e-mc/core": "0.10.2",
+    "@e-mc/db": "0.10.2",
+    "@e-mc/types": "0.10.2",
+    "chalk": "4.1.2",
+    "htmlparser2": "^9.1.0",
+    "js-yaml": "^4.1.0",
+    "picomatch": "^4.0.2"
+  }
+}

package/parse/dom.d.ts

@@ -1,9 +1,9 @@
-import type { DomWriterConstructor, HtmlElementConstructor, IGNORE_FLAG } from './types';
-
-declare namespace dom {
-    const IGNORE_FLAG: IGNORE_FLAG;
-    const DomWriter: DomWriterConstructor;
-    const HtmlElement: HtmlElementConstructor;
-}
-
+import type { DomWriterConstructor, HtmlElementConstructor, IGNORE_FLAG } from './types';
+
+declare namespace dom {
+    const IGNORE_FLAG: IGNORE_FLAG;
+    const DomWriter: DomWriterConstructor;
+    const HtmlElement: HtmlElementConstructor;
+}
+
 export = dom;

package/parse/dom.js

@@ -9,7 +9,7 @@ const types_1 = require("@e-mc/types");
 const util_1 = require("@e-mc/document/util");
 const Parser = htmlparser2.Parser;
 const DomHandler = domhandler.DomHandler;
-const TAG_VOID = ['area', 'base', 'br', 'col', 'embed', 'hr', 'img', 'input', 'link', 'meta', 'param', 'source', 'track', 'wbr'];
+const TAG_VOID = ['area', 'base', 'basefont', 'br', 'col', 'command', 'embed', 'frame', 'isindex', 'keygen', 'hr', 'img', 'input', 'link', 'meta', 'param', 'source', 'track', 'wbr'];
 const REGEXP_VOID = TAG_VOID.map(tagName => new RegExp(`(\\s*)</${tagName}\\s*>` + index_1.XmlWriter.PATTERN_TRAILINGSPACE, 'gi'));
 const REGEXP_TAGNAME = new RegExp(`^${index_1.XmlWriter.PATTERN_TAGNAME}$`);
 const PARSER_OPTIONS = Object.freeze({ xmlMode: false, decodeEntities: false });
@@ -106,7 +106,7 @@ class DomWriter extends index_1.XmlWriter {
         else {
             options = { normalize: options, escapeEntities, parser };
         }
-        parser || (parser = { ...PARSER_OPTIONS });
+        parser ||= { ...PARSER_OPTIONS };
         super(documentName, source, elements, { parser });
         this.documentElement = null;
         this.ignoreTagName = "title|style|script";
@@ -224,7 +224,7 @@ class DomWriter extends index_1.XmlWriter {
 exports.DomWriter = DomWriter;
 class HtmlElement extends index_1.XmlElement {
     constructor(documentName, node, attributes, options = {}) {
-        options.parser || (options.parser = { ...PARSER_OPTIONS });
+        options.parser ||= { ...PARSER_OPTIONS };
         super(documentName, node, attributes, { ...options, tagVoid: TAG_VOID.includes(node.tagName) });
         this._documentType = "HTML";
     }

package/parse/index.d.ts

@@ -1,9 +1,9 @@
-import type { IGNORE_FLAG, XmlElementConstructor, XmlWriterConstructor } from './types';
-
-declare namespace parse {
-    const IGNORE_FLAG: IGNORE_FLAG;
-    const XmlWriter: XmlWriterConstructor;
-    const XmlElement: XmlElementConstructor;
-}
-
+import type { IGNORE_FLAG, XmlElementConstructor, XmlWriterConstructor } from './types';
+
+declare namespace parse {
+    const IGNORE_FLAG: IGNORE_FLAG;
+    const XmlWriter: XmlWriterConstructor;
+    const XmlElement: XmlElementConstructor;
+}
+
 export = parse;

package/parse/index.js

@@ -51,9 +51,8 @@ function resetTagPosition(item) {
     item.tagCount = 0;
 }
 function findCloseIndex(source, tagName, lastIndex, ignoreCase) {
-    var _a;
     const flags = ignoreCase ? 'gi' : 'g';
-    const pattern = CACHE_TAGNAME[_a = tagName + flags + '0'] || (CACHE_TAGNAME[_a] = new RegExp(`<(?:${escapeTagName(tagName)}\\s*|/${escapeTagName(tagName)}\\s*>)`, flags));
+    const pattern = CACHE_TAGNAME[tagName + flags + '0'] ||= new RegExp(`<(?:${escapeTagName(tagName)}\\s*|/${escapeTagName(tagName)}\\s*>)`, flags);
     pattern.lastIndex = lastIndex;
     let openTag = 1, closeTag = 0, match;
     while (match = pattern.exec(source)) {
@@ -151,7 +150,7 @@ class XmlWriter {
         return leading + content + trailing;
     }
     static escapeXmlString(value, ampersand) {
-        return value.replace(ampersand ? /[<>"'&]/g : /[<>"']|&(?![a-z][a-z\d]+|#(?:\d+|x[a-f\d]+))/g, capture => {
+        return value.replace(ampersand ? /[<>"'&]/g : /[<>"']|&(?![a-z][a-z\d]+|#(?:\d+|x[a-f\d]+))/gi, capture => {
             switch (capture) {
                 case '<':
                     return '&lt;';
@@ -311,7 +310,6 @@ class XmlWriter {
         return { element, parser, outDom, error: null };
     }
     static getTagOffset(source, replacement, options) {
-        var _a, _b;
         if ((0, types_1.isObject)(replacement)) {
             options = replacement;
             replacement = undefined;
@@ -321,14 +319,14 @@ class XmlWriter {
             const { ignoreCase, ignoreTagName, ignoreTagGroup } = options;
             if (ignoreTagName) {
                 const flags = ignoreCase ? 'gi' : 'g';
-                source = source.replace(CACHE_TAGOFFSET[_a = ignoreTagName + flags] || (CACHE_TAGOFFSET[_a] = new RegExp(`<(?:${ignoreTagName.split('|').map(value => escapeTagName(value)).join('|')})${this.PATTERN_TAGOPEN}*>[\\S\\s]*?<\\/\\1\\s*>`, flags)), '');
+                source = source.replace(CACHE_TAGOFFSET[ignoreTagName + flags] ||= new RegExp(`<(?:${ignoreTagName.split('|').map(value => escapeTagName(value)).join('|')})${this.PATTERN_TAGOPEN}*>[\\S\\s]*?<\\/\\1\\s*>`, flags), '');
             }
             if (ignoreTagGroup) {
                 for (let i = 0, length = ignoreTagGroup.length; i < length; i += 2) {
                     const start = ignoreTagGroup[i];
                     const end = ignoreTagGroup[i + 1];
                     if (end) {
-                        source = source.replace(CACHE_TAGOFFSET[_b = start + end] || (CACHE_TAGOFFSET[_b] = new RegExp(escapeTagName(start) + '.*?' + escapeTagName(end), 'gs')), '');
+                        source = source.replace(CACHE_TAGOFFSET[start + end] ||= new RegExp(escapeTagName(start) + '.*?' + escapeTagName(end), 'gs'), '');
                     }
                 }
             }
@@ -368,10 +366,9 @@ class XmlWriter {
         return `data-${document}-id`;
     }
     static getPatternId(name) {
-        return CACHE_PATTERNID[name] || (CACHE_PATTERNID[name] = new RegExp(`\\s${(0, types_1.escapePattern)(name)}="([^"]+)"`));
+        return CACHE_PATTERNID[name] ||= new RegExp(`\\s${(0, types_1.escapePattern)(name)}="([^"]+)"`);
     }
     static getCommentsAndCDATA(source, tagPattern = '', ignoreCase, stripXml) {
-        var _a, _b;
         let tagGroup;
         if (stripXml) {
             if (typeof tagPattern !== 'string') {
@@ -389,7 +386,7 @@ class XmlWriter {
         }
         const result = [];
         const flags = ignoreCase ? 'gi' : 'g';
-        let pattern = CACHE_TAGNAME[_a = tagPattern + flags] || (CACHE_TAGNAME[_a] = new RegExp(`<(?:(!--[\\S\\s]*?--)|(!\\[CDATA\\[[\\S\\s]*?\\]\\])` + (tagPattern ? '|' + `(${tagPattern})${this.PATTERN_TAGOPEN}*` : '') + ')>', flags)), match;
+        let pattern = CACHE_TAGNAME[tagPattern + flags] ||= new RegExp(`<(?:(!--[\\S\\s]*?--)|(!\\[CDATA\\[[\\S\\s]*?\\]\\])` + (tagPattern ? '|' + `(${tagPattern})${this.PATTERN_TAGOPEN}*` : '') + ')>', flags), match;
         pattern.lastIndex = 0;
         while (match = pattern.exec(source)) {
             if (stripXml) {
@@ -414,7 +411,7 @@ class XmlWriter {
                 const start = tagGroup[i];
                 const end = tagGroup[i + 1];
                 if (end) {
-                    pattern = CACHE_TAGNAME[_b = start + end] || (CACHE_TAGNAME[_b] = new RegExp(escapeTagName(start) + '.*?' + escapeTagName(end), 'gs'));
+                    pattern = CACHE_TAGNAME[start + end] ||= new RegExp(escapeTagName(start) + '.*?' + escapeTagName(end), 'gs');
                     for (const tag of source.matchAll(pattern)) {
                         const startIndex = tag.index;
                         result.push({ type: 'block', outerXml: tag[0], startIndex, endIndex: startIndex + tag[0].length - 1 });
@@ -539,7 +536,7 @@ class XmlWriter {
             if (!(tagName in this._tagCount) && isCount(append.tagCount)) {
                 this._tagCount[tagName] = append.tagCount;
             }
-            append.id || (append.id = this.newId);
+            append.id ||= this.newId;
             element.setAppend(append);
         }
         return element;
@@ -570,7 +567,7 @@ class XmlWriter {
             return true;
         }
         const { node, append } = element;
-        element.parser || (element.parser = this.parser);
+        element.parser ||= this.parser;
         element.newline = this.newline;
         let output, outerXml = '', error;
         if (element.hasPosition()) {
@@ -598,7 +595,7 @@ class XmlWriter {
                 if (!prepend) {
                     node.index = nextSibling ?? -1;
                 }
-                (node.id || (node.id = {}))[this.documentName] = id;
+                (node.id ||= {})[this.documentName] = id;
                 element.id = id;
                 element.innerXml = textContent;
                 const offset = element.getInnerOffset(tagName);
@@ -958,7 +955,7 @@ class XmlWriter {
         const source = this.source;
         const match = new RegExp(`<(${tagName && escapeTagName(tagName) || '[^\\s>]+'})${XmlWriter.PATTERN_TAGOPEN}+?${(0, types_1.escapePattern)(this.nameOfId)}="${(0, types_1.escapePattern)(id)}"`, ignoreCase ? 'i' : '').exec(source);
         if (match) {
-            tagName || (tagName = match[1]);
+            tagName ||= match[1];
             const startIndex = match.index;
             let endIndex = -1, closeTag = 0;
             if (!tagVoid) {
@@ -973,7 +970,6 @@ class XmlWriter {
         }
     }
     getElementsByTagName(tagName, ignoreCase = false, options) {
-        var _a;
         let tagVoid;
         if (options) {
             ({ tagVoid } = options);
@@ -983,7 +979,7 @@ class XmlWriter {
         const result = [];
         const patternId = XmlWriter.getPatternId(this.nameOfId);
         const flags = ignoreCase ? 'gi' : 'g';
-        const pattern = CACHE_TAGNAME[_a = tagName + flags + '3'] || (CACHE_TAGNAME[_a] = new RegExp(`<${escapeTagName(tagName) + XmlWriter.PATTERN_TAGOPEN}*>`, flags));
+        const pattern = CACHE_TAGNAME[tagName + flags + '3'] ||= new RegExp(`<${escapeTagName(tagName) + XmlWriter.PATTERN_TAGOPEN}*>`, flags);
         for (const match of source.matchAll(pattern)) {
             const startIndex = match.index;
             let outerXml = match[0], endIndex = startIndex + outerXml.length - 1;
@@ -1038,7 +1034,7 @@ class XmlWriter {
         return XmlWriter.getNameOfId(this.documentName);
     }
     get patternIgnore() {
-        return this.ignoreTagName ? this._patternIgnore || (this._patternIgnore = new RegExp(`^(?:${this.ignoreTagName})$`, this.ignoreCaseTagName ? 'i' : '')) : null;
+        return this.ignoreTagName ? this._patternIgnore ||= new RegExp(`^(?:${this.ignoreTagName})$`, this.ignoreCaseTagName ? 'i' : '') : null;
     }
     set source(value) {
         if (value !== this._source) {
@@ -1153,7 +1149,7 @@ class XmlElement {
     }
     getTagOffset(replacement, options = {}) {
         if (!this.tagVoid || this._prevTagName && !XmlWriter.isTagVoid(this.documentType, this._prevTagName)) {
-            options.parser || (options.parser = this.parser);
+            options.parser ||= this.parser;
             if (!this.node.append) {
                 return XmlWriter.getTagOffset(this.innerXml, replacement, options);
             }
@@ -1265,7 +1261,6 @@ class XmlElement {
         return [source.substring(0, startIndex) + leading + outerXml + trailing + source.substring(endIndex), outerXml];
     }
     write(source, invalid) {
-        var _a, _b;
         if (!this._modified) {
             return ['', ''];
         }
@@ -1280,7 +1275,7 @@ class XmlElement {
         let position;
         if (XmlWriter.isTagVoid(this.documentType, tagName)) {
             const openTag = [];
-            const pattern = CACHE_TAGNAME[_a = tagName + flags + '1'] || (CACHE_TAGNAME[_a] = new RegExp(`<${escapeTagName(tagName)}[\\s|>]`, flags));
+            const pattern = CACHE_TAGNAME[tagName + flags + '1'] ||= new RegExp(`<${escapeTagName(tagName)}[\\s|>]`, flags);
             let openCount = 0, match;
             pattern.lastIndex = 0;
             while (match = pattern.exec(source)) {
@@ -1303,7 +1298,7 @@ class XmlElement {
         }
         else if (id || isIndex(tagIndex) && isCount(tagCount)) {
             complete: {
-                const pattern = CACHE_TAGNAME[_b = tagName + flags + '2'] || (CACHE_TAGNAME[_b] = new RegExp(`<(?:${escapeTagName(tagName)}[\\s|>]|/${escapeTagName(tagName)}\\s*>)`, flags));
+                const pattern = CACHE_TAGNAME[tagName + flags + '2'] ||= new RegExp(`<(?:${escapeTagName(tagName)}[\\s|>]|/${escapeTagName(tagName)}\\s*>)`, flags);
                 const openTag = [];
                 let openCount = 0, found, match;
                 pattern.lastIndex = 0;
@@ -1348,7 +1343,7 @@ class XmlElement {
                 }
             }
         }
-        if (position || (position = this.findIndexOf(source))) {
+        if (position ||= this.findIndexOf(source)) {
             if (remove) {
                 position.remove = true;
             }
@@ -1408,7 +1403,7 @@ class XmlElement {
         }
         const tagName = this.tagName;
         if (value !== tagName) {
-            this._prevTagName || (this._prevTagName = tagName);
+            this._prevTagName ||= tagName;
             this._tagName = value;
             if (!CACHE_TAGVOID[this.documentType]) {
                 this._tagVoid = null;