@e-mc/document 0.7.1 → 0.7.2

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2023 An Pham
+Copyright 2023 Wit Studio
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 

package/README.md

@@ -1,5 +1,7 @@
-### @e-mc/document
+# @e-mc/document
 
-### LICENSE
+PEP 402 - Forever Mikasa
 
-BSD 3-Clause
+## LICENSE
+
+MIT

package/index.js

@@ -5,12 +5,12 @@ const fs = require("fs");
 const pm = require("picomatch");
 const yaml = require("js-yaml");
 const chalk = require("chalk");
-const types_1 = require("../types");
-const core_1 = require("../core");
-const db_1 = require("../db");
-const util_1 = require("./util");
-const transform_1 = require("./transform");
-const parse_1 = require("./parse");
+const types_1 = require("@e-mc/types");
+const core_1 = require("@e-mc/core");
+const db_1 = require("@e-mc/db");
+const util_1 = require("@e-mc/document/util");
+const transform_1 = require("@e-mc/document/transform");
+const parse_1 = require("@e-mc/document/parse");
 const CACHE_PACKAGE = {};
 const CACHE_REQUIRE = {};
 const CACHE_ETAG = {};
@@ -34,7 +34,7 @@ function deleteTransform(map, key, timeout) {
     --CACHE_TOTAL;
 }
 function getSourceMappingURL(value, css) {
-    if (value.indexOf(' ') !== -1) {
+    if (value.includes(' ')) {
         value = encodeURIComponent(value);
     }
     return css ? `\n/*# sourceMappingURL=${value} */\n` : `\n//# sourceMappingURL=${value}\n`;
@@ -94,17 +94,16 @@ class Document extends core_1.Client {
             }
             try {
                 const args = [instance];
-                // @ts-ignore
-                if (ext["__cjs__" /* INTERNAL.CJS */]) {
+                if (ext["__cjs__"]) {
                     args.push(__dirname);
                 }
-                else if (core_1.Client.enabled("node.require.inline" /* KEY_NAME.NODE_REQUIRE_INLINE */)) {
+                else if (core_1.Client.enabled("node.require.inline")) {
                     args.push(require);
                 }
                 await ext.apply(this, args);
             }
             catch (err) {
-                instance.writeFail(["Unknown" /* ERR_MESSAGE.UNKNOWN */, this.moduleName], err);
+                instance.writeFail(["Unknown", this.moduleName], err);
             }
         }
     }
@@ -126,7 +125,7 @@ class Document extends core_1.Client {
             map.sources = [""];
         }
         try {
-            let css = mimeType === 'text/css', flags = 0 /* SOURCEMAP.NONE */;
+            let css = mimeType === 'text/css', flags = 0;
             const output = JSON.stringify(map);
             const toBase64 = () => 'data:application/json;base64,' + Buffer.from(output).toString('base64');
             if (!inlineMap) {
@@ -147,24 +146,24 @@ class Document extends core_1.Client {
                 }
             }
             let code = data.code.replace(transform_1.SourceMap.RE_SOURCE_MAPPING_URL, (...capture) => {
-                flags |= 1 /* SOURCEMAP.FOUND */;
+                flags |= 1;
                 if (capture[2] && capture[5]) {
                     css = true;
                 }
                 if (inlineMap || capture[3]) {
-                    flags |= 2 /* SOURCEMAP.INLINE */;
+                    flags |= 2;
                     return getSourceMappingURL(toBase64(), css);
                 }
                 return capture[1] || css ? getSourceMappingURL(sourceMappingURL, css) : capture[0];
             });
-            if (inlineMap || flags & 2 /* SOURCEMAP.INLINE */) {
-                if (flags === 0 /* SOURCEMAP.NONE */) {
+            if (inlineMap || flags & 2) {
+                if (flags === 0) {
                     code += getSourceMappingURL(toBase64(), css);
                 }
                 data.code = code;
             }
             else {
-                if (flags === 0 /* SOURCEMAP.NONE */) {
+                if (flags === 0) {
                     code += getSourceMappingURL(sourceMappingURL, css);
                 }
                 const result = path.join(path.dirname(uri), sourceMappingURL);
@@ -275,7 +274,7 @@ class Document extends core_1.Client {
         for (const { severity, line, column, ruleId, message, fatal } of messages) {
             let error;
             if (severity) {
-                if (error = severity === 2 /* LINT_SEVERITY.ERROR */ || severity === "error" /* LINT_SEVERITY.ERROR_TEXT */) {
+                if (error = severity === 2 || severity === "error") {
                     ++errorCount;
                 }
                 else {
@@ -353,20 +352,18 @@ class Document extends core_1.Client {
                         for (const pattern in pages) {
                             const item = pages[pattern];
                             if ((0, types_1.isPlainObject)(item)) {
-                                let isMatch;
-                                if (!(isMatch = CACHE_PICOMATCH.get(pattern)) && (0, types_1.hasGlob)(pattern)) {
-                                    isMatch = pm(pattern, { matchBase: true });
-                                    CACHE_PICOMATCH.set(pattern, isMatch);
-                                }
-                                else {
-                                    continue;
-                                }
-                                if (isMatch(baseUrl)) {
+                                if (pattern === baseUrl) {
                                     items.push(item);
                                 }
-                            }
-                            else {
-                                delete pages[pattern];
+                                else if ((0, types_1.hasGlob)(pattern)) {
+                                    let isMatch = CACHE_PICOMATCH.get(pattern);
+                                    if (!isMatch) {
+                                        CACHE_PICOMATCH.set(pattern, isMatch = pm(pattern, { matchBase: true }));
+                                    }
+                                    if (isMatch(baseUrl)) {
+                                        items.push(item);
+                                    }
+                                }
                             }
                         }
                         if (items.length > 1) {
@@ -395,19 +392,18 @@ class Document extends core_1.Client {
             const handler = db.handler;
             const database = this.dataSource.filter(this.forDb.bind(this));
             let instance;
-            if ((0, types_1.isString)(handler) && handler !== "@e-mc/db" /* PACKAGE_NAME.DB */) {
+            if ((0, types_1.isString)(handler) && handler !== "@e-mc/db") {
                 try {
                     const Handler = require(handler);
                     if (isFunction(Handler) && Handler.prototype instanceof core_1.ClientDb) {
-                        // @ts-ignore
                         instance = new Handler(db, database);
                     }
                     else {
-                        throw (0, types_1.errorMessage)(this.moduleName, "Not a Db constructor" /* ERR_DB.CONSTRUCTOR */, handler);
+                        throw (0, types_1.errorMessage)(this.moduleName, "Not a Db constructor", handler);
                     }
                 }
                 catch (err) {
-                    this.checkPackage(err, handler, ["Unable to load handler" /* ERR_MESSAGE.LOAD_HANDLER */, this.moduleName], 65536 /* LOG_TYPE.DB */);
+                    this.checkPackage(err, handler, ["Unable to load handler", this.moduleName], 65536);
                 }
             }
             else {
@@ -581,7 +577,7 @@ class Document extends core_1.Client {
                     return getObject(result, false);
                 }
                 else {
-                    warning(path.isAbsolute(value) ? "Unsupported access" /* ERR_MESSAGE.UNSUPPORTED_ACCESS */ + ` (${value})` : "Unknown" /* ERR_MESSAGE.UNKNOWN */);
+                    warning(path.isAbsolute(value) ? "Unsupported access" + ` (${value})` : "Unknown");
                 }
                 break;
             }
@@ -624,7 +620,7 @@ class Document extends core_1.Client {
                 result = CACHE_REQUIRE[pkgName];
             }
             if (!result) {
-                if (!core_1.Client.enabled("node.require.npm" /* KEY_NAME.NODE_REQUIRE_NPM */)) {
+                if (!core_1.Client.enabled("node.require.npm")) {
                     return null;
                 }
                 try {
@@ -636,11 +632,11 @@ class Document extends core_1.Client {
                         CACHE_REQUIRE[pkgName] = result;
                     }
                     if (typeof result === 'function') {
-                        return Object.defineProperty(result, "__cjs__" /* INTERNAL.CJS */, { value: true });
+                        return Object.defineProperty(result, "__cjs__", { value: true });
                     }
                 }
                 catch (err) {
-                    this.checkPackage(err, pkgName, "Unknown" /* ERR_MESSAGE.UNKNOWN */);
+                    this.checkPackage(err, pkgName, "Unknown");
                 }
                 if (!result) {
                     return null;
@@ -659,13 +655,12 @@ class Document extends core_1.Client {
                 catch {
                 }
             }
-            // @ts-ignore
-            if ((0, types_1.isObject)(result) || typeof result === 'function' && (result["__cjs__" /* INTERNAL.CJS */] || this.hasEval('function'))) {
+            if ((0, types_1.isObject)(result) || typeof result === 'function' && (result["__cjs__"] || this.hasEval('function'))) {
                 return result;
             }
         }
         catch (err) {
-            this.writeFail(["Unable to read file" /* ERR_MESSAGE.READ_FILE */, path.basename(value)], err, 8192 /* LOG_TYPE.PERMISSION */);
+            this.writeFail(["Unable to read file", path.basename(value)], err, 8192);
         }
         return null;
     }
@@ -690,7 +685,7 @@ class Document extends core_1.Client {
         if (imports) {
             const normalizeDir = (value) => {
                 const sep = value.includes('\\') && !value.includes('/') ? '\\' : '/';
-                return value + (value[value.length - 1] !== sep ? sep : '');
+                return value + (!value.endsWith(sep) ? sep : '');
             };
             for (const url in imports) {
                 if (uri === url || normalizeDir(uri) === normalizeDir(url)) {
@@ -743,7 +738,7 @@ class Document extends core_1.Client {
                                 }
                             }
                             catch (err) {
-                                this.writeFail(["Unable to read file" /* ERR_MESSAGE.READ_FILE */, localUri && path.basename(localUri)], 32 /* LOG_TYPE.FILE */);
+                                this.writeFail(["Unable to read file", localUri && path.basename(localUri)], 32);
                             }
                         }
                         else if (bundleContent) {
@@ -799,7 +794,7 @@ class Document extends core_1.Client {
         catch (err) {
             const name = (0, util_1.getModuleName)(err);
             if (name) {
-                this.checkPackage(err, (0, util_1.getModuleName)(err), "Unknown" /* ERR_MESSAGE.UNKNOWN */);
+                this.checkPackage(err, (0, util_1.getModuleName)(err), "Unknown");
             }
             throw err;
         }
@@ -838,7 +833,7 @@ class Document extends core_1.Client {
         if (!((0, types_1.isPlainObject)(target) && target.name)) {
             this.abort('view_engine');
             const from = typeof viewEngine === 'string' ? viewEngine : this.moduleName;
-            this.writeFail(["Unable to load configuration" /* ERR_MESSAGE.LOAD_CONFIG */, from], (0, types_1.errorMessage)('view-engine', from, "Unknown" /* ERR_MESSAGE.UNKNOWN */));
+            this.writeFail(["Unable to load configuration", from], (0, types_1.errorMessage)('view-engine', from, "Unknown"));
             return null;
         }
         const length = data.length;
@@ -866,10 +861,10 @@ class Document extends core_1.Client {
             const cacheKey = username + core_1.Client.asHash(template + (compile ? core_1.Client.asString(compile) : ''));
             let result = '', render, valid;
             if (!(render = cache[cacheKey])) {
-                render = await context.compile(template, compile); // eslint-disable-line @typescript-eslint/await-thenable
+                render = await context.compile(template, compile);
                 cache[cacheKey] = render;
-                if (!core_1.Client.enabled("memory.settings.users" /* KEY_NAME.MEMORY_SETTINGS_USERS */, username)) {
-                    setTimeout(() => delete cache[cacheKey], 60000 /* VALUES.TEMPLATE_EXPIRES */);
+                if (!core_1.Client.enabled("memory.settings.users", username)) {
+                    setTimeout(() => delete cache[cacheKey], 60000);
                 }
             }
             for (let i = 0, j = 0, row; i < length; ++i) {
@@ -880,11 +875,11 @@ class Document extends core_1.Client {
                     }
                 }
                 else if (!(0, types_1.isObject)(row)) {
-                    this.addLog(types_1.STATUS_TYPE.WARN, joinString(`view engine[${name}]`, `row #${i + 1}`, core_1.Client.asString(row) || "Unknown" /* ERR_MESSAGE.UNKNOWN */));
+                    this.addLog(types_1.STATUS_TYPE.WARN, joinString(`view engine[${name}]`, `row #${i + 1}`, core_1.Client.asString(row) || "Unknown"));
                     continue;
                 }
                 if (!singleRow) {
-                    const content = await render.call(context, row); // eslint-disable-line @typescript-eslint/await-thenable
+                    const content = await render.call(context, row);
                     if (content !== undefined && content !== null) {
                         result += content;
                         valid = true;
@@ -895,7 +890,7 @@ class Document extends core_1.Client {
         }
         catch (err) {
             this.abort('view_engine');
-            this.checkPackage(err, name, "Unknown" /* ERR_MESSAGE.UNKNOWN */, 4 /* LOG_TYPE.PROCESS */);
+            this.checkPackage(err, name, "Unknown", 4);
         }
         return null;
     }
@@ -909,7 +904,7 @@ class Document extends core_1.Client {
         const username = this.host?.username || '';
         const config = this._transformConfig;
         const cacheData = config && options.cacheData;
-        const cacheType = username && core_1.Client.enabled("memory.settings.users" /* KEY_NAME.MEMORY_SETTINGS_USERS */, username) ? true : this.cacheDir || core_1.Client.enabled("memory.settings.users" /* KEY_NAME.MEMORY_SETTINGS_USERS */);
+        const cacheType = username && core_1.Client.enabled("memory.settings.users", username) ? true : this.cacheDir || core_1.Client.enabled("memory.settings.users");
         let formatKey, hashKey, excludeKey;
         if (cacheData && cacheType && !CACHE_EXTERNAL[excludeKey = moduleName + '_' + type + '_' + format] && (!config.exclude[type] || Array.isArray(config.exclude[type]) && !format.some(value => config.exclude[type].includes(value)) || Array.isArray(config.include[type]) && format.every(value => config.include[type].includes(value)))) {
             const { uri, etag } = cacheData;
@@ -985,7 +980,7 @@ class Document extends core_1.Client {
             }
             if (result) {
                 result.storedLog?.forEach(log => this.addLog(log));
-                this.formatMessage(4 /* LOG_TYPE.PROCESS */, type, [joinString(cacheName, format.filter(value => value).join(' | '), options.filename), 'cache'], uri, { ...core_1.Client.LOG_STYLE_NOTICE, hintBold: true });
+                this.formatMessage(4, type, [joinString(cacheName, format.filter(value => value).join(' | '), options.filename), 'cache'], uri, { ...core_1.Client.LOG_STYLE_NOTICE, hintBold: true });
                 return result;
             }
         }
@@ -1063,7 +1058,7 @@ class Document extends core_1.Client {
                     if (typeof value !== 'string' || (0, types_1.isArray)(out.sourceFiles) && this.hasOwnPermission() && out.sourceFiles.some(item => !this.canRead(item, { ownPermissionOnly: true }))) {
                         failed = true;
                         ignoreCache = true;
-                        this.writeFail(["Unable to transform document" /* ERR_MESSAGE.TRANSFORM_DOCUMENT */, plugin], (0, types_1.errorMessage)(plugin, name, typeof value === 'string' ? "Unsupported access" /* ERR_MESSAGE.UNSUPPORTED_ACCESS */ : 'Empty'), { type: 4 /* LOG_TYPE.PROCESS */, startTime });
+                        this.writeFail(["Unable to transform document", plugin], (0, types_1.errorMessage)(plugin, name, typeof value === 'string' ? "Unsupported access" : 'Empty'), { type: 4, startTime });
                     }
                     else if (source !== value) {
                         series.code = value;
@@ -1095,19 +1090,18 @@ class Document extends core_1.Client {
                     }
                     this.writeTimeProcess(failed ? 'CHECK' : type, joinString(hint, options.filename) + (series.out.messageAppend || ''), startTime, { failed, bypassLog });
                 };
-                this.formatMessage(4 /* LOG_TYPE.PROCESS */, type, ['Transforming source...', hint], options.filename, { hintColor: 'cyan' });
+                this.formatMessage(4, type, ['Transforming source...', hint], options.filename, { hintColor: 'cyan' });
                 try {
                     let context = require(plugin);
                     series.packageName = plugin;
                     if (typeof baseConfig === 'function') {
                         series.baseConfig = outputConfig;
-                        // @ts-ignore
-                        if (baseConfig["__cjs__" /* INTERNAL.CJS */]) {
+                        if (baseConfig["__cjs__"]) {
                             next(await baseConfig(context, source, series));
                         }
                         else {
-                            const thisArg = core_1.Client.enabled("node.process.inline" /* KEY_NAME.NODE_PROCESS_INLINE */) ? process : null;
-                            const inline = core_1.Client.enabled("node.require.inline" /* KEY_NAME.NODE_REQUIRE_INLINE */);
+                            const thisArg = core_1.Client.enabled("node.process.inline") ? process : null;
+                            const inline = core_1.Client.enabled("node.require.inline");
                             const args = [context, source, series];
                             if (baseConfig.toString().startsWith('async')) {
                                 if (inline) {
@@ -1141,7 +1135,7 @@ class Document extends core_1.Client {
                                 }
                                 else {
                                     transformer = context;
-                                    context = this; // eslint-disable-line @typescript-eslint/no-this-alias
+                                    context = this;
                                     pkg = undefined;
                                 }
                                 if (transformer && typeof transformer !== 'function') {
@@ -1156,7 +1150,7 @@ class Document extends core_1.Client {
                             }
                             catch (err) {
                                 abort();
-                                this.writeFail(["Unknown" /* ERR_MESSAGE.UNKNOWN */, username ? plugin + ':' + username : hint], err, { type: 4 /* LOG_TYPE.PROCESS */, startTime });
+                                this.writeFail(["Unknown", username ? plugin + ':' + username : hint], err, { type: 4, startTime });
                                 continue;
                             }
                         }
@@ -1166,7 +1160,7 @@ class Document extends core_1.Client {
                 }
                 catch (err) {
                     abort();
-                    this.checkPackage(err, (0, util_1.getModuleName)(err), ["Unable to transform document" /* ERR_MESSAGE.TRANSFORM_DOCUMENT */, hint], { type: 4 /* LOG_TYPE.PROCESS */, startTime });
+                    this.checkPackage(err, (0, util_1.getModuleName)(err), ["Unable to transform document", hint], { type: 4, startTime });
                     if (i < length - 1) {
                         series.reset();
                     }
@@ -1175,10 +1169,10 @@ class Document extends core_1.Client {
             else {
                 abort();
                 if (plugin) {
-                    this.writeFail("Unable to load configuration" /* ERR_MESSAGE.LOAD_CONFIG */, (0, types_1.errorMessage)(plugin, name, 'Invalid config'), 4 /* LOG_TYPE.PROCESS */);
+                    this.writeFail("Unable to load configuration", (0, types_1.errorMessage)(plugin, name, 'Invalid config'), 4);
                 }
                 else {
-                    this.writeFail('Format method was not found', (0, types_1.errorValue)(name, "Unknown" /* ERR_MESSAGE.UNKNOWN */), 4 /* LOG_TYPE.PROCESS */);
+                    this.writeFail('Format method was not found', (0, types_1.errorValue)(name, "Unknown"), 4);
                 }
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/document",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "description": "Document constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -9,7 +9,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/anpham6/e-mc.git",
+    "url": "git+https://github.com/anpham6/e-mc.git",
     "directory": "src/document"
   },
   "keywords": [
@@ -17,12 +17,12 @@
     "squared-functions"
   ],
   "author": "An Pham <anpham6@gmail.com>",
-  "license": "BSD 3-Clause",
+  "license": "MIT",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/core": "0.7.1",
-    "@e-mc/db": "0.7.1",
-    "@e-mc/types": "0.7.1",
+    "@e-mc/core": "0.7.2",
+    "@e-mc/db": "0.7.2",
+    "@e-mc/types": "0.7.2",
     "chalk": "4.1.2",
     "htmlparser2": "^9.0.0",
     "js-yaml": "^4.1.0",

package/parse/dom.js

@@ -4,9 +4,9 @@ exports.IGNORE_FLAG = exports.HtmlElement = exports.DomWriter = void 0;
 const htmlparser2 = require("htmlparser2");
 const domhandler = require("domhandler");
 const domutils = require("domutils");
-const types_1 = require("../../types");
-const util_1 = require("../util");
-const index_1 = require("./index");
+const types_1 = require("@e-mc/types");
+const util_1 = require("@e-mc/document/util");
+const index_1 = require("@e-mc/document/parse");
 Object.defineProperty(exports, "IGNORE_FLAG", { enumerable: true, get: function () { return index_1.IGNORE_FLAG; } });
 const Parser = htmlparser2.Parser;
 const DomHandler = domhandler.DomHandler;
@@ -30,7 +30,7 @@ class DomWriter extends index_1.XmlWriter {
         if (ignoreTagGroup) {
             for (let i = 0, length = ignoreTagGroup.length; i < length; i += 2) {
                 const start = ignoreTagGroup[i];
-                if (start[0] === '<') {
+                if (start.startsWith('<')) {
                     tagGroup.push(new RegExp('^' + (0, types_1.escapePattern)(start)));
                 }
                 const end = ignoreTagGroup[i + 1];
@@ -89,7 +89,7 @@ class DomWriter extends index_1.XmlWriter {
         const result = { element: null, error: null };
         new Parser(new DomHandler((err, dom) => {
             if (!err) {
-                result.element = domutils.findOne(elem => elem.tagName === "html" /* VALUES.ROOT */, dom);
+                result.element = domutils.findOne(elem => elem.tagName === "html", dom);
             }
             else {
                 result.error = err;
@@ -111,8 +111,8 @@ class DomWriter extends index_1.XmlWriter {
         parser || (parser = { ...PARSER_OPTIONS });
         super(documentName, source, elements, { parser });
         this.documentElement = null;
-        this.ignoreTagName = "title|style|script" /* VALUES.IGNORE_TAGNAME */;
-        this.rootName = "html" /* VALUES.ROOT */;
+        this.ignoreTagName = "title|style|script";
+        this.rootName = "html";
         this.ignoreCaseTagName = true;
         const items = [];
         let outerXml = '', documentElement, offsetMap, startIndex = -1;
@@ -121,7 +121,7 @@ class DomWriter extends index_1.XmlWriter {
                 item.tagName = item.tagName.toLowerCase();
                 item.ignoreCase = true;
             }
-            if (item.tagName === "html" /* VALUES.ROOT */) {
+            if (item.tagName === "html") {
                 items.push(item);
                 if (!documentElement && item.innerXml) {
                     documentElement = item;
@@ -198,7 +198,7 @@ class DomWriter extends index_1.XmlWriter {
         if (this.modified && this.documentElement) {
             let innerXml;
             for (const item of this.elements) {
-                if (item.tagName === "html" /* VALUES.ROOT */) {
+                if (item.tagName === "html") {
                     if (!innerXml && index_1.XmlWriter.isIndex(item.endIndex)) {
                         innerXml = this.source.substring(item.endIndex + 1, this.source.length - 7).trim();
                     }
@@ -223,7 +223,7 @@ 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._documentType = "HTML" /* VALUES.DOCUMENT_TYPE */;
+        this._documentType = "HTML";
     }
     getTagOffset(source) {
         switch (this.node.append?.tagName || this.tagName) {
@@ -233,7 +233,7 @@ class HtmlElement extends index_1.XmlElement {
             case 'script':
                 return;
             default:
-                return super.getTagOffset(source, { ignoreCase: this.ignoreCase, ignoreTagName: "title|style|script" /* VALUES.IGNORE_TAGNAME */, parser: this.parser });
+                return super.getTagOffset(source, { ignoreCase: this.ignoreCase, ignoreTagName: "title|style|script", parser: this.parser });
         }
     }
     findIndexOf(source) {
@@ -244,8 +244,8 @@ class HtmlElement extends index_1.XmlElement {
     }
     get outerXml() {
         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}>` : '');
+        return '<' + tagName + HtmlElement.writeAttributes(items) + '>' + (DomWriter.hasInnerXml(tagName) && tagName !== "html" ? (tagName === 'title' ? index_1.XmlWriter.escapeXmlString(innerXml) : innerXml) + `</${tagName}>` : '');
     }
 }
 exports.HtmlElement = HtmlElement;
-index_1.XmlWriter.namesOfTagVoid("HTML" /* VALUES.DOCUMENT_TYPE */, TAG_VOID);
+index_1.XmlWriter.namesOfTagVoid("HTML", TAG_VOID);

package/parse/index.js

@@ -4,8 +4,8 @@ exports.XmlElement = exports.XmlWriter = exports.IGNORE_FLAG = void 0;
 const htmlparser2 = require("htmlparser2");
 const domhandler = require("domhandler");
 const domutils = require("domutils");
-const types_1 = require("../../types");
-const module_1 = require("../../module");
+const types_1 = require("@e-mc/types");
+const module_1 = require("@e-mc/module");
 var IGNORE_FLAG;
 (function (IGNORE_FLAG) {
     IGNORE_FLAG[IGNORE_FLAG["NONE"] = 0] = "NONE";
@@ -174,7 +174,7 @@ class XmlWriter {
     }
     static getNewlineString(leading, trailing, newline) {
         const value = leading + trailing;
-        return getNewlineCount(value) > 1 ? newline || (value.indexOf('\r') !== -1 ? '\r\n' : '\n') : '';
+        return getNewlineCount(value) > 1 ? newline || (value.includes('\r') ? '\r\n' : '\n') : '';
     }
     static findCloseTag(source, startIndex = 0) {
         const length = source.length;
@@ -910,11 +910,11 @@ class XmlWriter {
         }
         let tagName = this.ignoreTagName || '';
         if (tagName) {
-            if (value[0] !== '|' && tagName[tagName.length - 1] !== '|') {
+            if (!value.startsWith('|') && !tagName.endsWith('|')) {
                 tagName += '|';
             }
         }
-        else if (value[0] === '|') {
+        else if (value.startsWith('|')) {
             value = value.substring(1);
         }
         this.ignoreTagName = tagName + value;
@@ -1260,7 +1260,7 @@ class XmlElement {
         const { tagName, tagIndex = -1, tagCount = Infinity, ignoreCase } = node;
         const id = this.id;
         const flags = ignoreCase ? 'gi' : 'g';
-        const hasId = (startIndex, endIndex) => source.substring(startIndex, endIndex).indexOf(id) !== -1;
+        const hasId = (startIndex, endIndex) => source.substring(startIndex, endIndex).includes(id);
         const errorResult = () => ['', '', (0, types_1.errorValue)('Element was not found', tagName.toUpperCase() + (isIndex(tagIndex) ? ' @ ' + tagIndex : ''))];
         let position;
         if (XmlWriter.isTagVoid(this.documentType, tagName)) {

package/transform/index.js

@@ -3,8 +3,8 @@ var _a, _b, _c, _d;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SourceMap = exports.TransformSeries = void 0;
 const path = require("path");
-const types_1 = require("../../types");
-const core_1 = require("../../core");
+const types_1 = require("@e-mc/types");
+const core_1 = require("@e-mc/core");
 const kCode = Symbol('code');
 const kMap = Symbol('map');
 const kOut = Symbol('out');
@@ -16,7 +16,7 @@ const kUsername = Symbol('username');
 const kProductionRelease = Symbol('productionRelease');
 function parseMap(data, value) {
     let [mimeType, encoding] = data.split(';');
-    if (!encoding && mimeType.indexOf('/') === -1) {
+    if (!encoding && !mimeType.includes('/')) {
         encoding = mimeType;
     }
     return encoding.includes('base64') ? Buffer.from(value, 'base64').toString() : value;
@@ -185,20 +185,16 @@ class TransformSeries extends core_1.Module {
         return this.options.external;
     }
     set version(value) {
-        // @ts-ignore
         this.metadata.__version__ = value;
     }
     get version() {
-        // @ts-ignore
         return this.metadata.__version__ || '';
     }
     set packageName(value) {
-        // @ts-ignore
         this.metadata.__packagename__ = value;
         this.version = 'latest';
     }
     get packageName() {
-        // @ts-ignore
         return this.metadata.__packagename__ || '';
     }
     get packageVersion() {

package/util.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isObject = exports.removeInternalProperties = exports.getModuleName = exports.hasValue = exports.getHashData = exports.getNewline = exports.getIndent = exports.appendSuffix = exports.splitEnclosing = exports.concatString = exports.replaceAll = exports.loadPlugins = exports.IMPORTS = void 0;
 const path = require("path");
-const types_1 = require("../types");
+const types_1 = require("@e-mc/types");
 Object.defineProperty(exports, "isObject", { enumerable: true, get: function () { return types_1.isObject; } });
 exports.IMPORTS = {
     "@babel/core": "@pi-r/babel",