@e-mc/document 0.12.14 → 0.12.16

package/README.md

@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.12.14/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.12.16/lib/index.d.ts)
 
 ```typescript
 import type { DataSource, ViewEngine } from "./squared";
@@ -76,7 +76,9 @@ interface DocumentConstructor extends ModuleConstructor {
     createSourceMap(code: string, remove: boolean): SourceMap;
     createSourceMap(code: string, uri?: string, remove?: boolean): SourceMap;
     writeSourceMap(uri: string, data: SourceCode, options?: SourceMapOptions): string | undefined;
+    /** @deprecated */
     updateGradle(source: string, namespaces: string[], value: string, upgrade: boolean): string;
+    /** @deprecated */
     updateGradle(source: string, namespaces: string[], value: string, options?: UpdateGradleOptions): string;
     generateLintTable(messages: LintMessage[], options: GenerateLintTableOptions): LogComponent[];
     cleanup?(this: IFileManager, instance: IDocument): Promise<unknown>;
@@ -185,14 +187,14 @@ NOTE: **@e-mc/document** is an abstract base class and cannot be instantiated. *
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.12.14/lib/squared.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.14/lib/asset.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.14/lib/core.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.14/lib/document.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.14/lib/filemanager.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.14/lib/logger.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.14/lib/settings.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.14/lib/watch.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.16/lib/squared.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.16/lib/asset.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.16/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.16/lib/document.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.16/lib/filemanager.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.16/lib/logger.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.16/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.16/lib/watch.d.ts
 
 ## LICENSE
 

package/index.js

@@ -687,7 +687,7 @@ class Document extends core_1.Client {
             let instance;
             if (handler && handler !== "@e-mc/db") {
                 try {
-                    const Module = require(handler);
+                    const Module = (0, types_1.requireESM)(handler);
                     if (core_1.Client.constructorOf(Module, 'clientdb')) {
                         instance = new Module(db, database);
                     }
@@ -828,33 +828,25 @@ class Document extends core_1.Client {
         let encoding, cache;
         if (typeof options === 'boolean') {
             cache = options;
+            options = undefined;
         }
-        else if ((0, types_1.isObject)(options)) {
+        else if (options) {
             ({ encoding, cache } = options);
         }
-        let result;
-        if ((value = value.trim()).startsWith('npm:')) {
-            if (!core_1.Client.enabled("node.require.npm")) {
-                return null;
-            }
-            const pkgName = value.substring(4);
-            if (!result) {
-                try {
-                    result = require(pkgName);
-                    if (typeof result === 'function') {
-                        return Object.defineProperty(result, "__cjs__", { value: true });
-                    }
-                }
-                catch (err) {
-                    this.checkPackage(err, pkgName, "Unknown");
-                }
-                if (!result) {
+        let result, pkgName;
+        try {
+            if (value.startsWith('npm:')) {
+                if (!core_1.Client.enabled("node.require.npm")) {
                     return null;
                 }
+                pkgName = value.substring(4);
+                result = options?.default ? (0, types_1.requireESM)(pkgName, options.url) : require(pkgName);
+                if (typeof result === 'function') {
+                    return Object.defineProperty(result, "__cjs__", { value: true, writable: false, enumerable: false });
+                }
+                return result;
             }
-        }
-        try {
-            const source = (result || this.readFile(value, { ownPermissionOnly: true, absolutePath: this.hasEval('absolute'), requireExt: true, encoding: (0, types_1.getEncoding)(encoding), cache })) || value;
+            const source = 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;
             }
@@ -870,7 +862,9 @@ class Document extends core_1.Client {
             }
         }
         catch (err) {
-            this.writeFail(["Unable to read file", path.basename(value)], err, 8192);
+            if (!pkgName || this.checkPackage(err, pkgName)) {
+                this.writeFail(["Unable to read file", path.basename(value)], err, 8192);
+            }
         }
         return null;
     }
@@ -1058,7 +1052,12 @@ class Document extends core_1.Client {
                 case 'xml':
                     return new (require('fast-xml-parser').XMLParser)(options).parse(source);
                 case 'toml':
-                    return require('toml').parse(source);
+                    try {
+                        return require('smol-toml').parse(source, options);
+                    }
+                    catch {
+                        return require('toml').parse(source);
+                    }
                 default:
                     return JSON.parse(source);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/document",
-  "version": "0.12.14",
+  "version": "0.12.16",
   "description": "Document constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -19,14 +19,14 @@
   "license": "BSD-3-Clause",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/core": "0.12.14",
-    "@e-mc/db": "0.12.14",
-    "@e-mc/types": "0.12.14",
+    "@e-mc/core": "0.12.16",
+    "@e-mc/db": "0.12.16",
+    "@e-mc/types": "0.12.16",
     "chalk": "4.1.2",
     "domhandler": "^5.0.3",
     "domutils": "^3.2.2",
     "htmlparser2": "^10.0.0",
     "js-yaml": "^4.1.1",
-    "picomatch": "^4.0.3"
+    "picomatch": "^4.0.4"
   }
 }

package/parse/index.js

@@ -179,12 +179,13 @@ class XmlWriter {
         });
     }
     static escapeAttributes(source) {
-        let escaped, match, attribute;
+        let match, attribute;
         while (match = REGEXP_TAGATTR.exec(source)) {
             let output = match[0], modified = false;
-            while (attribute = REGEXP_ATTRVALUE.exec(match[1])) {
+            while (attribute = REGEXP_ATTRVALUE.exec(output)) {
                 const value = attribute[2] || attribute[3] || attribute[4];
-                if (value && (escaped = this.escapeXmlString(value)) !== value) {
+                const escaped = this.escapeXmlString(value);
+                if (value !== escaped) {
                     output = (0, util_1.spliceMatch)(output, attribute, attribute[1] + `="${escaped}"`, REGEXP_ATTRVALUE);
                     modified = true;
                 }
@@ -400,7 +401,6 @@ class XmlWriter {
         const result = [];
         const flags = ignoreCase ? 'gi' : 'g';
         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) {
                 source = this.replaceMatch(match, source, '', { pattern, trimLeading: true });
@@ -417,6 +417,7 @@ class XmlWriter {
                 }
             }
         }
+        pattern.lastIndex = 0;
         if (stripXml) {
             return source;
         }
@@ -1135,7 +1136,6 @@ class XmlElement {
                 }
                 this._tagVoid = isVoid;
                 REGEXP_ATTRVALUE.lastIndex = 0;
-                REGEXP_ATTRNAME.lastIndex = 0;
             }
             else if (tagVoid) {
                 this._tagVoid = true;

package/util.js

@@ -42,7 +42,7 @@ function loadPlugins(plugins, map) {
     });
     for (const plugin of items) {
         if (plugin) {
-            let method = typeof plugin[0] === 'function' ? plugin[0] : require(plugin[0]), options = plugin[1];
+            let method = typeof plugin[0] === 'function' ? plugin[0] : (0, types_1.requireESM)(plugin[0]), options = plugin[1];
             if ((0, types_1.isPlainObject)(method)) {
                 const attr = options?.__default__;
                 if ((0, types_1.isString)(attr)) {