@e-mc/document 0.9.0 → 0.9.2

package/LICENSE

@@ -1,11 +1,11 @@
-Copyright 2024 An Pham
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
+Copyright 2024 An Pham
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

package/README.md

@@ -1,6 +1,6 @@
 # @e-mc/document
 
-* NodeJS 14/16
+* NodeJS 16
 * ES2020
 
 ## General Usage
@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.9.0/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.9.2/lib/index.d.ts)
 
 ```typescript
 import type { DataSource, ViewEngine } from "./squared";
@@ -181,32 +181,16 @@ instance.init(assets);
 
 NOTE: **@e-mc/document** is an abstract base class and cannot be instantiated. **Document** is more commonly called through [@pi-r/chrome](https://www.npmjs.com/package/@pi-r/chrome).
 
-## NodeJS 14 LTS
-
-Any optional fail safe dependencies were removed as of `E-mc 0.9`. The code itself will still be *ES2020* and will continue to work equivalently when self-installing these dependencies:
-
-### Under 15.4 + 16.0
-
-```sh
-npm i abort-controller event-target-shim
-```
-
-### Under 14.17 + 15.6
-
-```sh
-  npm i uuid
-```
-
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.9.0/lib/squared.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.0/lib/asset.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.0/lib/core.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.0/lib/document.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.0/lib/filemanager.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.0/lib/logger.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.0/lib/settings.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.0/lib/watch.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.2/lib/squared.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.2/lib/asset.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.2/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.2/lib/document.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.2/lib/filemanager.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.2/lib/logger.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.2/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.2/lib/watch.d.ts
 
 ## LICENSE
 

package/asset.d.ts

@@ -1,8 +1,8 @@
-import type { ExternalAsset, InitialValue } from '../types/lib/asset';
-
-declare namespace asset {
-    function isEqual(item: ExternalAsset, other: ExternalAsset): boolean;
-    function setInitialValue(file: ExternalAsset, cacheable?: boolean): InitialValue;
-}
-
+import type { ExternalAsset, InitialValue } from '../types/lib/asset';
+
+declare namespace asset {
+    function isEqual(item: ExternalAsset, other: ExternalAsset): boolean;
+    function setInitialValue(file: ExternalAsset, cacheable?: boolean): InitialValue;
+}
+
 export = asset;

package/index.d.ts

@@ -1,5 +1,5 @@
-import type { DocumentConstructor, IFileManager } from '../types/lib';
-
-declare const Document: DocumentConstructor<IFileManager>;
-
+import type { DocumentConstructor, IFileManager } from '../types/lib';
+
+declare const Document: DocumentConstructor<IFileManager>;
+
 export = Document;

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.0",
+  "version": "0.9.2",
   "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.0",
-    "@e-mc/db": "0.9.0",
-    "@e-mc/types": "0.9.0",
+    "@e-mc/core": "0.9.2",
+    "@e-mc/db": "0.9.2",
+    "@e-mc/types": "0.9.2",
     "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);

package/transform/index.d.ts

@@ -1,8 +1,8 @@
-import type { SourceMapConstructor, TransformSeriesConstructor } from '../../types/lib/document';
-
-declare namespace transform {
-    const TransformSeries: TransformSeriesConstructor;
-    const SourceMap: SourceMapConstructor;
-}
-
+import type { SourceMapConstructor, TransformSeriesConstructor } from '../../types/lib/document';
+
+declare namespace transform {
+    const TransformSeries: TransformSeriesConstructor;
+    const SourceMap: SourceMapConstructor;
+}
+
 export = transform;