@e-mc/document 0.9.1 → 0.9.3

package/README.md

@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.9.1/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.9.3/lib/index.d.ts)
 
 ```typescript
 import type { DataSource, ViewEngine } from "./squared";
@@ -183,14 +183,14 @@ NOTE: **@e-mc/document** is an abstract base class and cannot be instantiated. *
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.9.1/lib/squared.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.1/lib/asset.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.1/lib/core.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.1/lib/document.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.1/lib/filemanager.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.1/lib/logger.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.1/lib/settings.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.1/lib/watch.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.3/lib/squared.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.3/lib/asset.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.3/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.3/lib/document.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.3/lib/filemanager.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.3/lib/logger.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.3/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.3/lib/watch.d.ts
 
 ## LICENSE
 

package/index.js

@@ -657,14 +657,14 @@ class Document extends core_1.Client {
         }
         let result;
         if ((value = value.trim()).startsWith('npm:')) {
+            if (!core_1.Client.enabled("node.require.npm")) {
+                return null;
+            }
             const pkgName = value.substring(4);
             if (persist) {
                 result = CACHE_REQUIRE[pkgName];
             }
             if (!result) {
-                if (!core_1.Client.enabled("node.require.npm")) {
-                    return null;
-                }
                 try {
                     result = require(pkgName);
                     if (persist && result) {
@@ -683,7 +683,7 @@ class Document extends core_1.Client {
             }
         }
         try {
-            const source = result || this.readFile(value, { ownPermissionOnly: true, absolutePath: this.hasEval('absolute'), requireExt: true, encoding, cache }) || value;
+            const source = (result || this.readFile(value, { ownPermissionOnly: true, absolutePath: this.hasEval('absolute'), requireExt: true, encoding: (0, types_1.getEncoding)(encoding), cache })) || value;
             if (typeof source !== 'string') {
                 result = source;
             }
@@ -1364,7 +1364,10 @@ class Document extends core_1.Client {
         }
     }
     get imports() {
-        return this._imports || (this._imports = {});
+        if (!this._imports) {
+            this.imports = {};
+        }
+        return this._imports;
     }
     get watching() {
         return this.assets.some(item => item.watch);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/document",
-  "version": "0.9.1",
+  "version": "0.9.3",
   "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.9.1",
-    "@e-mc/db": "0.9.1",
-    "@e-mc/types": "0.9.1",
+    "@e-mc/core": "0.9.3",
+    "@e-mc/db": "0.9.3",
+    "@e-mc/types": "0.9.3",
     "chalk": "4.1.2",
     "htmlparser2": "^9.1.0",
     "js-yaml": "^4.1.0",

package/parse/dom.js

@@ -139,7 +139,7 @@ class DomWriter extends index_1.XmlWriter {
         else {
             setNewline(documentElement.innerXml);
         }
-        const html = /<html[\s>]/i.exec(source);
+        const html = /^(\s*(?:<\?xml[^>]+>\s*)?(?:<!DOCTYPE[^>]+>\s*)?)<html[\s>]/i.exec(source) || /^(.*)<html[\s>]/is.exec(source);
         if (html) {
             const endIndex = index_1.XmlWriter.findCloseTag(source, html.index);
             if (endIndex !== -1) {
@@ -168,7 +168,7 @@ class DomWriter extends index_1.XmlWriter {
         else {
             const trailing = items.filter(item => item.textContent);
             if (trailing.length) {
-                const match = /<\/body\s*>/i.exec(source);
+                const match = /<\/body\s*>\s*<\/html\s*>.*$/is.exec(source) || /<\/body\s*>.*$/is.exec(source);
                 if (match) {
                     const textContent = trailing.reduce((a, b) => a + b.textContent, '');
                     offsetMap = index_1.XmlWriter.getTagOffset(textContent, { ignoreCase: this.ignoreCaseTagName, ignoreTagName: this.ignoreTagName, parser: this.parser });

package/parse/index.js

@@ -401,10 +401,9 @@ class XmlWriter {
                 const end = tagGroup[i + 1];
                 if (end) {
                     pattern = CACHE_TAGNAME[_b = start + end] || (CACHE_TAGNAME[_b] = new RegExp(escapeTagName(start) + '[\\S\\s]*?' + escapeTagName(end), 'g'));
-                    pattern.lastIndex = 0;
-                    while (match = pattern.exec(source)) {
-                        const startIndex = match.index;
-                        result.push({ type: 'block', outerXml: match[0], startIndex, endIndex: startIndex + match[0].length - 1 });
+                    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 });
                     }
                 }
             }
@@ -963,9 +962,7 @@ class XmlWriter {
         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;
-        let match;
-        while (match = pattern.exec(source)) {
+        for (const match of source.matchAll(pattern)) {
             const startIndex = match.index;
             let outerXml = match[0], endIndex = startIndex + outerXml.length - 1;
             if (!invalid || isValidIndex(invalid, startIndex, endIndex)) {
@@ -1081,15 +1078,15 @@ class XmlElement {
             this._modified = attrs.size > 0;
             if (node.outerXml) {
                 const [tagStart, innerXml, isVoid] = this.parseOuterXml(node.outerXml, tagVoid);
-                let source = tagStart, match;
-                while (match = REGEXP_ATTRVALUE.exec(tagStart)) {
+                let source = tagStart;
+                for (const match of tagStart.matchAll(REGEXP_ATTRVALUE)) {
                     const attr = ignoreCase ? match[1].toLowerCase() : match[1];
                     if (!attrs.has(attr)) {
                         attrs.set(attr, match[2] || match[3] || match[4] || '');
                     }
                     source = source.replace(match[0], '');
                 }
-                while (match = REGEXP_ATTRNAME.exec(source)) {
+                for (const match of source.matchAll(REGEXP_ATTRNAME)) {
                     const attr = ignoreCase ? match[1].toLowerCase() : match[1];
                     if (!attrs.has(attr)) {
                         attrs.set(attr, null);