@e-mc/document 0.4.2 → 0.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/document",
-  "version": "0.4.2",
+  "version": "0.5.1",
   "description": "Document constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -20,9 +20,9 @@
   "license": "BSD 3-Clause",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/core": "0.4.2",
-    "@e-mc/db": "0.4.2",
-    "@e-mc/types": "0.4.2",
+    "@e-mc/core": "0.5.1",
+    "@e-mc/db": "0.5.1",
+    "@e-mc/types": "0.5.1",
     "chalk": "4.1.2",
     "htmlparser2": "^8.0.2",
     "js-yaml": "^4.1.0",

package/parse/dom.js

@@ -210,23 +210,20 @@ class DomWriter extends index_1.XmlWriter {
     }
     close() {
         if (this.documentElement || this._appendCount > 0) {
-            this.source = this.source.replace(new RegExp(this.patternId, 'g'), '');
+            this.source = this.source.replace(new RegExp(index_1.XmlWriter.getPatternId(this.nameOfId), 'g'), '');
         }
         return super.close();
     }
     newElement(node) {
         return new HtmlElement(this.documentName, node);
     }
-    get nameOfId() {
-        return index_1.XmlWriter.getNameOfId(this.documentName);
-    }
 }
 exports.DomWriter = DomWriter;
 class HtmlElement extends index_1.XmlElement {
     constructor(documentName, node, attributes, options = {}) {
         options.parser || (options.parser = { ...PARSER_OPTIONS });
         super(documentName, node, attributes, { ...options, tagVoid: TAG_VOID.includes(node.tagName) });
-        this.TAG_VOID = TAG_VOID;
+        this._documentType = "HTML" /* VALUES.DOCUMENT_TYPE */;
     }
     getTagOffset(source) {
         switch (this.node.append?.tagName || this.tagName) {
@@ -249,8 +246,6 @@ class HtmlElement extends index_1.XmlElement {
         const [tagName, items, innerXml] = this.getOuterContent();
         return '<' + tagName + HtmlElement.writeAttributes(items) + '>' + (DomWriter.hasInnerXml(tagName) && tagName !== "html" /* VALUES.ROOT */ ? (tagName === 'title' ? index_1.XmlWriter.escapeXmlString(innerXml) : innerXml) + `</${tagName}>` : '');
     }
-    get nameOfId() {
-        return index_1.XmlWriter.getNameOfId(this.documentName);
-    }
 }
 exports.HtmlElement = HtmlElement;
+index_1.XmlWriter.namesOfTagVoid("HTML" /* VALUES.DOCUMENT_TYPE */, TAG_VOID);

package/parse/index.js

@@ -15,8 +15,9 @@ var IGNORE_FLAG;
 const Parser = htmlparser2.Parser;
 const DomHandler = domhandler.DomHandler;
 const CACHE_TAGNAME = {};
-const CACHE_NAMEOFID = {};
 const CACHE_TAGOFFSET = {};
+const CACHE_TAGVOID = {};
+const CACHE_PATTERNID = {};
 const PATTERN_ATTRNAME = '([^\\s=>]+)';
 const PATTERN_ATTRVALUE = `=\\s*(?:"([^"]*)"|'([^']*)'|([^\\s>]*))`;
 const PATTERN_TAGNAME = '[A-Za-z][\\w-]*';
@@ -96,7 +97,6 @@ function getParserDOM(source, parser) {
 }
 const isIndex = (value) => typeof value === 'number' && value >= 0 && value !== Infinity;
 const isCount = (value) => typeof value === 'number' && value > 0 && value !== Infinity;
-const getPatternId = (name) => CACHE_NAMEOFID[name] || (CACHE_NAMEOFID[name] = new RegExp(`\\s${(0, types_1.escapePattern)(name)}="([^"]+)"`));
 const escapeTagName = (value) => value.replace(REGEXP_ESCAPECHAR, capture => capture === '-' ? '\\x2d' : '\\' + capture);
 class XmlWriter {
     static get PATTERN_ATTRNAME() { return PATTERN_ATTRNAME; }
@@ -342,12 +342,21 @@ class XmlWriter {
         }
         return result;
     }
+    static namesOfTagVoid(type, values) {
+        CACHE_TAGVOID[type] = values;
+    }
+    static isTagVoid(type, tagName) {
+        return !!CACHE_TAGVOID[type]?.includes(tagName);
+    }
     static getNodeId(node, document) {
         return node.id?.[document] || '';
     }
     static getNameOfId(document) {
         return `data-${document}-id`;
     }
+    static getPatternId(name) {
+        return CACHE_PATTERNID[name] || (CACHE_PATTERNID[name] = new RegExp(`\\s${(0, types_1.escapePattern)(name)}="([^"]+)"`));
+    }
     static getCommentsAndCDATA(source, tagPattern = '', ignoreCase, stripXml) {
         var _a, _b;
         let tagGroup;
@@ -438,7 +447,6 @@ class XmlWriter {
         this._ignoreFlag = 0;
         this._appendCount = 0;
         this._invalidContent = null;
-        this._patternId = null;
         this._patternIgnore = null;
         this._writeStartIndex = -1;
         this._source = source;
@@ -953,7 +961,7 @@ class XmlWriter {
         const source = this.source;
         const invalid = this.getInvalidArea();
         const result = [];
-        const patternId = this.patternId;
+        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) + PATTERN_TAGOPEN}*>`, flags));
         pattern.lastIndex = 0;
@@ -1008,8 +1016,8 @@ class XmlWriter {
     get newId() {
         return (0, types_1.generateUUID)();
     }
-    get patternId() {
-        return this._patternId || (this._patternId = getPatternId(this.nameOfId));
+    get nameOfId() {
+        return XmlWriter.getNameOfId(this.documentName);
     }
     get patternIgnore() {
         return this.ignoreTagName ? this._patternIgnore || (this._patternIgnore = new RegExp(`^(?:${this.ignoreTagName})$`, this.ignoreCaseTagName ? 'i' : '')) : null;
@@ -1043,23 +1051,23 @@ class XmlElement {
         }
         return result;
     }
-    constructor(documentName, node, attributes, tagVoid = false, parser) {
+    constructor(documentName, node, attributes, tagVoid, parser) {
         this.documentName = documentName;
         this.node = node;
         this.newline = '\n';
-        this.TAG_VOID = [];
         this._modified = true;
         this._tagName = '';
         this._innerXml = '';
         this._remove = false;
-        this._tagVoid = false;
+        this._tagVoid = null;
         this._prevTagName = null;
         this._prevInnerXml = null;
         this._append = undefined;
         this._tagOffset = undefined;
+        this._documentType = '';
         this._attributes = new Map();
         if ((0, types_1.isObject)(tagVoid)) {
-            ({ tagVoid = false, parser } = tagVoid);
+            ({ tagVoid, parser } = tagVoid);
         }
         if (parser) {
             this.parser = parser;
@@ -1069,6 +1077,7 @@ class XmlElement {
         applyAttributes(attrs, node.attributes, ignoreCase);
         applyAttributes(attrs, attributes, ignoreCase);
         this._ignoreCase = ignoreCase;
+        this._nameOfId = XmlWriter.getNameOfId(documentName);
         if (!node.append) {
             this._modified = attrs.size > 0;
             if (node.outerXml) {
@@ -1126,7 +1135,7 @@ class XmlElement {
         return [tagStart || `<${this.tagName}>`, innerXml || '', false];
     }
     getTagOffset(replacement, options = {}) {
-        if (!this.tagVoid || this._prevTagName && !this.TAG_VOID.includes(this._prevTagName)) {
+        if (!this.tagVoid || this._prevTagName && !XmlWriter.isTagVoid(this.documentType, this._prevTagName)) {
             options.parser || (options.parser = this.parser);
             if (!this.node.append) {
                 return XmlWriter.getTagOffset(this.innerXml, replacement, options);
@@ -1155,7 +1164,7 @@ class XmlElement {
             if (outerXml) {
                 const index = XmlWriter.findCloseTag(outerXml);
                 if (index !== -1) {
-                    return this.patternId.exec(outerXml.substring(0, index))?.[1] || '';
+                    return XmlWriter.getPatternId(this.nameOfId).exec(outerXml.substring(0, index))?.[1] || '';
                 }
             }
         }
@@ -1254,7 +1263,7 @@ class XmlElement {
         const hasId = (startIndex, endIndex) => source.substring(startIndex, endIndex).indexOf(id) !== -1;
         const errorResult = () => ['', '', (0, types_1.errorValue)('Element was not found', tagName.toUpperCase() + (isIndex(tagIndex) ? ' @ ' + tagIndex : ''))];
         let position;
-        if (this.TAG_VOID.includes(tagName)) {
+        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));
             let openCount = 0, match;
@@ -1386,7 +1395,10 @@ class XmlElement {
         if (value !== tagName) {
             this._prevTagName || (this._prevTagName = tagName);
             this._tagName = value;
-            if (this._tagVoid = this.TAG_VOID.includes(value)) {
+            if (!CACHE_TAGVOID[this.documentType]) {
+                this._tagVoid = null;
+            }
+            else if (this._tagVoid = XmlWriter.isTagVoid(this.documentType, value)) {
                 this.innerXml = '';
             }
             this._modified = true;
@@ -1396,8 +1408,11 @@ class XmlElement {
         const tagName = this._tagName || this.node.tagName;
         return this.node.ignoreCase ? tagName.toLowerCase() : tagName;
     }
+    get documentType() {
+        return this._documentType || this.documentName;
+    }
     get tagVoid() {
-        return this._tagVoid || this.TAG_VOID.includes(this.tagName);
+        return this._tagVoid ?? XmlWriter.isTagVoid(this.documentType, this.tagName);
     }
     set innerXml(value) {
         if (!this.tagVoid && value !== this._innerXml) {
@@ -1442,8 +1457,8 @@ class XmlElement {
     get append() {
         return this._append;
     }
-    get patternId() {
-        return this._patternId || (this._patternId = getPatternId(this.nameOfId));
+    get nameOfId() {
+        return this._nameOfId;
     }
     get modified() {
         return this._modified;

package/parse/types/index.d.ts

@@ -100,7 +100,6 @@ export class IXmlBase {
     save(...args: unknown[]): unknown;
     reset(): void;
     get nameOfId(): string;
-    get patternId(): RegExp;
     get modified(): boolean;
 }
 
@@ -162,8 +161,11 @@ export interface XmlWriterConstructor {
     findElement(source: string, node: XmlTagNode, options?: FindElementOptions): ParserResult;
     getTagOffset(source: string, options?: TagOffsetOptions): TagOffsetMap;
     getTagOffset(source: string, replacement?: string, options?: TagOffsetOptions): TagOffsetMap;
+    namesOfTagVoid(type: string, values: string[]): void;
+    isTagVoid(type: string, tagName: string): boolean;
     getNodeId(node: XmlTagNode, document: string): string;
     getNameOfId(document: string): string;
+    getPatternId(name: string): RegExp;
     getCommentsAndCDATA(source: string, tagPattern: unknown, ignoreCase: boolean, stripXml: true): string;
     getCommentsAndCDATA(source: string, tagPattern?: StringOfArray | [Undef<string>, Undef<string[]>], ignoreCase?: boolean, stripXml?: boolean): SourceContent[];
     isEqual(node: XmlTagNode, other: XmlTagNode, ignoreCase: boolean): boolean;
@@ -176,7 +178,6 @@ export interface XmlWriterConstructor {
 }
 
 export class IXmlElement extends IXmlBase {
-    TAG_VOID: string[];
     parser?: ParserOptions;
     readonly node: XmlTagNode;
     setAppend(value?: TagAppend): void;
@@ -198,6 +199,7 @@ export class IXmlElement extends IXmlBase {
     get id(): string;
     set tagName(value: string);
     get tagName(): string;
+    get documentType(): string;
     get tagVoid(): boolean;
     set innerXml(value: string);
     get innerXml(): string;