@e-mc/document 0.7.3 → 0.7.4

package/index.js

@@ -253,6 +253,7 @@ class Document extends core_1.Client {
         return lastIndex > 0 ? spliceSource(source, lastIndex, lastIndex, content) : source + newline + content;
     }
     static generateLintTable(messages, options) {
+        var _a, _b, _c;
         const { leadingText, trailingText, pathname, filename, ruleWidth = 30, messageWidth = 60 } = options;
         const result = [];
         const truncate = (value, width) => value.length > width ? value.substring(0, width - 3) + '...' : value.padStart(width);
@@ -298,9 +299,9 @@ class Document extends core_1.Client {
         maxWidth += maxLine + maxColumn;
         const title = (leadingText || '') + (pathname || filename ? (leadingText ? ': ' : '') + (pathname && filename ? path.join(pathname, filename) : pathname || filename) : '');
         const divider = { type: types_1.STATUS_TYPE.INFO, value: '-'.repeat(maxWidth), timeStamp };
-        errorCount = (options.errorCount ?? errorCount).toString();
-        warningCount = (options.warningCount ?? warningCount).toString();
-        fatalErrorCount = (options.fatalErrorCount ?? fatalErrorCount).toString();
+        errorCount = ((_a = options.errorCount) !== null && _a !== void 0 ? _a : errorCount).toString();
+        warningCount = ((_b = options.warningCount) !== null && _b !== void 0 ? _b : warningCount).toString();
+        fatalErrorCount = ((_c = options.fatalErrorCount) !== null && _c !== void 0 ? _c : fatalErrorCount).toString();
         const hasFatal = fatalErrorCount !== '0';
         result.unshift(divider, { type: types_1.STATUS_TYPE.INFO, value: title + ' '.repeat(maxWidth - title.length - (hasFatal ? fatalErrorCount.length + 9 : 0)) + (hasFatal ? `fatal(${chalk.bold.bgRed.white(` ${fatalErrorCount} `)})` : ''), timeStamp, duration: currentTime - timeStamp }, divider);
         result.push(divider);
@@ -326,14 +327,15 @@ class Document extends core_1.Client {
     }
     restart() { }
     init(assets, config) {
-        var _a;
+        var _a, _b;
+        var _c;
         let ignoreModules, ignoreExtensions;
         if (config) {
             let baseUrl;
             ({ baseUrl, ignoreModules, ignoreExtensions } = config);
             let username, users;
-            if (username = this.host?.username) {
-                if (!(0, types_1.isPlainObject)(users = this.settings.users?.[username])) {
+            if (username = (_a = this.host) === null || _a === void 0 ? void 0 : _a.username) {
+                if (!(0, types_1.isPlainObject)(users = (_b = this.settings.users) === null || _b === void 0 ? void 0 : _b[username])) {
                     users = undefined;
                 }
                 else if (Array.isArray(users.extensions)) {
@@ -390,8 +392,8 @@ class Document extends core_1.Client {
                 }
             }
         }
-        if (this.dataSource.length && !ignoreModules?.includes('db')) {
-            const db = (_a = this.module).db || (_a.db = {});
+        if (this.dataSource.length && !(ignoreModules === null || ignoreModules === void 0 ? void 0 : ignoreModules.includes('db'))) {
+            const db = (_c = this.module).db || (_c.db = {});
             const handler = db.handler;
             const database = this.dataSource.filter(this.forDb.bind(this));
             let instance;
@@ -470,7 +472,7 @@ class Document extends core_1.Client {
                 this._transformConfig = null;
                 return;
             }
-            switch (algorithm = algorithm?.toLowerCase()) {
+            switch (algorithm = algorithm === null || algorithm === void 0 ? void 0 : algorithm.toLowerCase()) {
                 case 'md5':
                 case 'sha1':
                 case 'sha224':
@@ -588,11 +590,12 @@ class Document extends core_1.Client {
         delete data[name];
     }
     resolveDir(name, ...paths) {
-        let baseDir = this.settings.directory?.[name];
+        var _a, _b;
+        let baseDir = (_a = this.settings.directory) === null || _a === void 0 ? void 0 : _a[name];
         if (baseDir) {
             try {
                 baseDir = path.resolve(baseDir);
-                const username = this.host?.username;
+                const username = (_b = this.host) === null || _b === void 0 ? void 0 : _b.username;
                 let result;
                 if (username) {
                     const leading = path.join(baseDir, 'users', username);
@@ -668,6 +671,7 @@ class Document extends core_1.Client {
         return null;
     }
     findVersion(name, fallback = '') {
+        var _a;
         let result;
         const versions = this.module.versions;
         if (versions) {
@@ -679,7 +683,7 @@ class Document extends core_1.Client {
                 }
             }
             else {
-                result = this.module.versions?.[name];
+                result = (_a = this.module.versions) === null || _a === void 0 ? void 0 : _a[name];
             }
         }
         return result || fallback;
@@ -709,6 +713,7 @@ class Document extends core_1.Client {
     }
     locateSourceFiles(file, code, bundleContent) {
         return (imports = this.imports) => {
+            var _a;
             const href = file.uri;
             const sourceFile = [];
             let mainFile, invalid;
@@ -751,7 +756,7 @@ class Document extends core_1.Client {
                             invalid = true;
                             break;
                         }
-                        sourceFile.push(['', this.resolveImports?.(item, source, localFile) || source, localFile]);
+                        sourceFile.push(['', ((_a = this.resolveImports) === null || _a === void 0 ? void 0 : _a.call(this, item, source, localFile)) || source, localFile]);
                     }
                 }
             }
@@ -762,10 +767,11 @@ class Document extends core_1.Client {
     }
     resolveSourceFile(file) {
         return (code, imports = this.imports) => {
+            var _a;
             const uri = file.uri;
             let source, sourceFile;
             if (code && imports && Object.keys(imports).length) {
-                const output = this.resolveImports?.(file, code, uri && this.findSourceRoot(uri, imports));
+                const output = (_a = this.resolveImports) === null || _a === void 0 ? void 0 : _a.call(this, file, code, uri && this.findSourceRoot(uri, imports));
                 if (output) {
                     source = output;
                 }
@@ -806,20 +812,23 @@ class Document extends core_1.Client {
         return item.source !== 'cloud';
     }
     hasEval(name) {
-        return !!this.module.eval?.[name];
+        var _a;
+        return !!((_a = this.module.eval) === null || _a === void 0 ? void 0 : _a[name]);
     }
     settingsOf(name, option) {
-        const options = this.settings.options?.[name];
+        var _a;
+        const options = (_a = this.settings.options) === null || _a === void 0 ? void 0 : _a[name];
         if ((0, types_1.isObject)(options)) {
             return options[option];
         }
     }
     async parseTemplate(viewEngine, template, data) {
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         let target, stored;
         if (typeof viewEngine === 'string') {
-            target = this.settings.view_engine?.[viewEngine];
-            const username = this.host?.username;
-            const userConfig = username && this.settings.users?.[username]?.view_engine?.[viewEngine];
+            target = (_a = this.settings.view_engine) === null || _a === void 0 ? void 0 : _a[viewEngine];
+            const username = (_b = this.host) === null || _b === void 0 ? void 0 : _b.username;
+            const userConfig = username && ((_e = (_d = (_c = this.settings.users) === null || _c === void 0 ? void 0 : _c[username]) === null || _d === void 0 ? void 0 : _d.view_engine) === null || _e === void 0 ? void 0 : _e[viewEngine]);
             if ((0, types_1.isPlainObject)(userConfig)) {
                 if ((0, types_1.isPlainObject)(target)) {
                     (0, types_1.cloneObject)(userConfig, { target, deep: true, preserve: true });
@@ -859,7 +868,7 @@ class Document extends core_1.Client {
                     (0, types_1.coerceObject)(output, stored);
                 }
             }
-            const username = this.host?.username || '';
+            const username = ((_f = this.host) === null || _f === void 0 ? void 0 : _f.username) || '';
             const cache = CACHE_TEMPLATE[name] || (CACHE_TEMPLATE[name] = {});
             const cacheKey = username + core_1.Client.asHash(template + (compile ? core_1.Client.asString(compile) : ''));
             let result = '', render, valid;
@@ -872,7 +881,7 @@ class Document extends core_1.Client {
             }
             for (let i = 0, j = 0, row; i < length; ++i) {
                 if ((0, types_1.isPlainObject)(row = data[i])) {
-                    row.__index__ ?? (row.__index__ = ++j);
+                    (_g = row.__index__) !== null && _g !== void 0 ? _g : (row.__index__ = ++j);
                     if (output) {
                         row = { ...output, ...row };
                     }
@@ -889,7 +898,7 @@ class Document extends core_1.Client {
                     }
                 }
             }
-            return singleRow ? render.call(context, data) ?? null : valid ? result : null;
+            return singleRow ? (_h = render.call(context, data)) !== null && _h !== void 0 ? _h : null : valid ? result : null;
         }
         catch (err) {
             this.abort('view_engine');
@@ -898,13 +907,14 @@ class Document extends core_1.Client {
         return null;
     }
     async transform(type, code, format, options = {}) {
+        var _a, _b, _c, _d;
         let transform = this.settings.transform, data;
         if (!transform || !(0, types_1.isObject)(data = transform[type])) {
             return;
         }
         format = typeof format === 'string' ? format.trim().split(/\s*\+\s*/) : format.map(item => typeof item === 'string' ? item.trim() : '');
         const moduleName = this.moduleName;
-        const username = this.host?.username || '';
+        const username = ((_a = this.host) === null || _a === void 0 ? void 0 : _a.username) || '';
         const config = this._transformConfig;
         const cacheData = config && options.cacheData;
         const cacheType = username && core_1.Client.enabled("memory.settings.users", username) ? true : this.cacheDir || core_1.Client.enabled("memory.settings.users");
@@ -982,7 +992,7 @@ class Document extends core_1.Client {
                 }
             }
             if (result) {
-                result.storedLog?.forEach(log => this.addLog(log));
+                (_b = result.storedLog) === null || _b === void 0 ? void 0 : _b.forEach(log => this.addLog(log));
                 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;
             }
@@ -994,7 +1004,7 @@ class Document extends core_1.Client {
         const series = new transform_1.TransformSeries(type, code, options);
         series.init(this, __dirname);
         let valid, excluded, userData, userImports, ignoreCache, storedLog, sourceFiles;
-        if (username && (transform = this.settings.users?.[username]?.transform)) {
+        if (username && (transform = (_d = (_c = this.settings.users) === null || _c === void 0 ? void 0 : _c[username]) === null || _d === void 0 ? void 0 : _d.transform)) {
             userData = transform[type];
             userImports = transform.imports;
         }
@@ -1003,12 +1013,12 @@ class Document extends core_1.Client {
             this.abort('transform');
         };
         const includes = (name) => {
-            const include = config?.include[type];
-            if (include === true || include?.includes(name)) {
+            const include = config === null || config === void 0 ? void 0 : config.include[type];
+            if (include === true || (include === null || include === void 0 ? void 0 : include.includes(name))) {
                 const exclude = config.exclude[type];
                 return !exclude || exclude === true && include !== true || Array.isArray(exclude) && !exclude.includes(name);
             }
-            return cacheData?.override === true;
+            return (cacheData === null || cacheData === void 0 ? void 0 : cacheData.override) === true;
         };
         for (let i = 0, length = format.length, name; i < length; ++i) {
             if (this.aborted) {
@@ -1127,7 +1137,7 @@ class Document extends core_1.Client {
                         let transformer = CACHE_PACKAGE[plugin + username];
                         if (!transformer) {
                             try {
-                                let pkg = this.resolveDir('package', plugin + '.js') || userImports?.[plugin] || imports[plugin] || util_1.IMPORTS[plugin];
+                                let pkg = this.resolveDir('package', plugin + '.js') || (userImports === null || userImports === void 0 ? void 0 : userImports[plugin]) || imports[plugin] || util_1.IMPORTS[plugin];
                                 if ((0, types_1.isString)(pkg)) {
                                     const match = /^(@?\S+)@(\d+(?:\.\d+(?:\.\S+)?)?|[a-z]+)$/.exec(pkg);
                                     if (match) {
@@ -1196,7 +1206,7 @@ class Document extends core_1.Client {
             output.map = sourceMap.map;
         }
         if ((0, types_1.isArray)(series.supplementChunks)) {
-            output.chunks = series.supplementChunks.map(item => ({ code: item.code, map: output.map && item.sourceMap?.map, entryPoint: item.entryPoint, filename: item.filename }));
+            output.chunks = series.supplementChunks.map(item => { var _a; return ({ code: item.code, map: output.map && ((_a = item.sourceMap) === null || _a === void 0 ? void 0 : _a.map), entryPoint: item.entryPoint, filename: item.filename }); });
         }
         if (sourceFiles) {
             output.sourceFiles = sourceFiles;
@@ -1286,6 +1296,7 @@ class Document extends core_1.Client {
         return this._dataSource || [];
     }
     set imports(value) {
+        var _a, _b, _c;
         if (!(0, types_1.isPlainObject)(value)) {
             this._imports = null;
             return;
@@ -1295,8 +1306,8 @@ class Document extends core_1.Client {
             this._imports = Object.assign(imports, value);
         }
         else {
-            const username = this.host?.username;
-            imports = username && this.settings.users?.[username]?.imports || this.module.imports;
+            const username = (_a = this.host) === null || _a === void 0 ? void 0 : _a.username;
+            imports = username && ((_c = (_b = this.settings.users) === null || _b === void 0 ? void 0 : _b[username]) === null || _c === void 0 ? void 0 : _c.imports) || this.module.imports;
             this._imports = Object.assign(this._imports || {}, (0, types_1.isPlainObject)(imports) ? imports : undefined, value);
         }
     }

package/package.json

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

package/parse/dom.js

@@ -34,7 +34,7 @@ class DomWriter extends index_1.XmlWriter {
                     tagGroup.push(new RegExp('^' + (0, types_1.escapePattern)(start)));
                 }
                 const end = ignoreTagGroup[i + 1];
-                if (end?.[end.length - 1] === '>') {
+                if ((end === null || end === void 0 ? void 0 : end[end.length - 1]) === '>') {
                     tagGroup.push(new RegExp((0, types_1.escapePattern)(start) + '$'));
                 }
             }
@@ -226,7 +226,8 @@ class HtmlElement extends index_1.XmlElement {
         this._documentType = "HTML";
     }
     getTagOffset(source) {
-        switch (this.node.append?.tagName || this.tagName) {
+        var _a;
+        switch (((_a = this.node.append) === null || _a === void 0 ? void 0 : _a.tagName) || this.tagName) {
             case 'html':
             case 'title':
             case 'style':

package/parse/index.js

@@ -235,7 +235,7 @@ class XmlWriter {
             return result;
         }
         const nodes = domutils.getElementsByTagName(node.tagName, outDom, true);
-        if (!parser?.xmlMode) {
+        if (!(parser === null || parser === void 0 ? void 0 : parser.xmlMode)) {
             nodes.filter(item => item.next && item.next.startIndex <= item.endIndex).forEach(item => {
                 for (let i = 0, length = nodes.length; i < length; ++i) {
                     const element = nodes[i];
@@ -262,7 +262,7 @@ class XmlWriter {
             const locator = node.locator;
             if (locator && locatorAttr) {
                 const { element } = this.locateElement(source, locator, locatorAttr, { parser, outDom });
-                if (element?.tagName === node.tagName) {
+                if ((element === null || element === void 0 ? void 0 : element.tagName) === node.tagName) {
                     result.element = element;
                     index = nodes.findIndex(item => item === element);
                 }
@@ -346,10 +346,12 @@ class XmlWriter {
         CACHE_TAGVOID[type] = values;
     }
     static isTagVoid(type, tagName) {
-        return !!CACHE_TAGVOID[type]?.includes(tagName);
+        var _a;
+        return !!((_a = CACHE_TAGVOID[type]) === null || _a === void 0 ? void 0 : _a.includes(tagName));
     }
     static getNodeId(node, document) {
-        return node.id?.[document] || '';
+        var _a;
+        return ((_a = node.id) === null || _a === void 0 ? void 0 : _a[document]) || '';
     }
     static getNameOfId(document) {
         return `data-${document}-id`;
@@ -424,7 +426,7 @@ class XmlWriter {
         if ((ignoreCase ? tagName.toLowerCase() === other.tagName.toLowerCase() : tagName === other.tagName) && (index === other.index && isIndex(index) || tagIndex === other.tagIndex && tagCount === other.tagCount && isIndex(tagIndex) && isCount(tagCount))) {
             return true;
         }
-        return document && other.id && id?.[document] ? id[document] === other.id[document] : false;
+        return document && other.id && (id === null || id === void 0 ? void 0 : id[document]) ? id[document] === other.id[document] : false;
     }
     static isIndex(value) {
         return isIndex(value);
@@ -450,7 +452,7 @@ class XmlWriter {
         this._patternIgnore = null;
         this._writeStartIndex = -1;
         this._source = source;
-        this.parser = options?.parser;
+        this.parser = options === null || options === void 0 ? void 0 : options.parser;
     }
     init(offsetMap) {
         const appending = [];
@@ -461,7 +463,7 @@ class XmlWriter {
             }
             if (isCount(item.tagCount)) {
                 const tagName = item.tagName;
-                item.tagCount += offsetMap?.[tagName] || 0;
+                item.tagCount += (offsetMap === null || offsetMap === void 0 ? void 0 : offsetMap[tagName]) || 0;
                 this._tagCount[tagName] = item.tagCount;
             }
             deletePosition(item, rootName);
@@ -550,6 +552,7 @@ class XmlWriter {
         return null;
     }
     write(element) {
+        var _a;
         if (!element.modified) {
             return true;
         }
@@ -580,7 +583,7 @@ class XmlWriter {
             if (append) {
                 const { tagName, id, textContent = '', prepend, nextSibling } = append;
                 if (!prepend) {
-                    node.index = nextSibling ?? -1;
+                    node.index = nextSibling !== null && nextSibling !== void 0 ? nextSibling : -1;
                 }
                 (node.id || (node.id = {}))[this.documentName] = id;
                 element.id = id;
@@ -603,7 +606,7 @@ class XmlWriter {
                 this.renameTag(node, element.tagName);
             }
             this.update(node, outerXml, append, element.tagOffset);
-            if (element.innerXml && !element.remove && (element.hasModifiedContent() || this.patternIgnore?.test(element.tagName))) {
+            if (element.innerXml && !element.remove && (element.hasModifiedContent() || ((_a = this.patternIgnore) === null || _a === void 0 ? void 0 : _a.test(element.tagName)))) {
                 this._hasInvalidContent = true;
                 this._writeStartIndex = -1;
             }
@@ -802,6 +805,7 @@ class XmlWriter {
         }
     }
     indexTag(tagName, append, offset = 0) {
+        var _a;
         if (tagName in this._tagCount) {
             const elements = [];
             const revised = [];
@@ -871,7 +875,7 @@ class XmlWriter {
                         return;
                     }
                 }
-                const id = append ? append.id : revised[0].id?.[this.documentName];
+                const id = append ? append.id : (_a = revised[0].id) === null || _a === void 0 ? void 0 : _a[this.documentName];
                 if (id) {
                     const element = XmlWriter.findElement(this.source, (append || revised[0]), { document: this.documentName, id, tagCount: nextCount, parser: this.parser });
                     if (element) {
@@ -893,7 +897,7 @@ class XmlWriter {
                 item.index = -1;
             }
             const append = item.append;
-            if (append?.tagName === tagName) {
+            if ((append === null || append === void 0 ? void 0 : append.tagName) === tagName) {
                 delete append.tagCount;
                 const nextSibling = append.nextSibling;
                 if (isIndex(nextSibling)) {
@@ -954,6 +958,7 @@ class XmlWriter {
     }
     getElementsByTagName(tagName, ignoreCase = false, options) {
         var _a;
+        var _b;
         let tagVoid;
         if (options) {
             ({ tagVoid } = options);
@@ -963,14 +968,14 @@ class XmlWriter {
         const result = [];
         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));
+        const pattern = CACHE_TAGNAME[_b = tagName + flags + '3'] || (CACHE_TAGNAME[_b] = new RegExp(`<${escapeTagName(tagName) + PATTERN_TAGOPEN}*>`, flags));
         pattern.lastIndex = 0;
         let match;
         while (match = pattern.exec(source)) {
             const startIndex = match.index;
             let outerXml = match[0], endIndex = startIndex + outerXml.length - 1;
             if (!invalid || isValidIndex(invalid, startIndex, endIndex)) {
-                const id = patternId.exec(outerXml)?.[1];
+                const id = (_a = patternId.exec(outerXml)) === null || _a === void 0 ? void 0 : _a[1];
                 if (!tagVoid) {
                     const [index, closeTag] = findCloseIndex(source, tagName, endIndex + 1, ignoreCase);
                     if (index !== -1) {
@@ -1152,6 +1157,7 @@ class XmlElement {
         }
     }
     getAttribute(name) {
+        var _a;
         let result = this._attributes.get(this._ignoreCase ? name = name.toLowerCase() : name);
         if (result) {
             return result;
@@ -1164,7 +1170,7 @@ class XmlElement {
             if (outerXml) {
                 const index = XmlWriter.findCloseTag(outerXml);
                 if (index !== -1) {
-                    return XmlWriter.getPatternId(this.nameOfId).exec(outerXml.substring(0, index))?.[1] || '';
+                    return ((_a = XmlWriter.getPatternId(this.nameOfId).exec(outerXml.substring(0, index))) === null || _a === void 0 ? void 0 : _a[1]) || '';
                 }
             }
         }
@@ -1376,7 +1382,8 @@ class XmlElement {
         return [this.tagName, attributes, this.innerXml];
     }
     getInnerOffset(tagName) {
-        return this._tagOffset?.[tagName] || 0;
+        var _a;
+        return ((_a = this._tagOffset) === null || _a === void 0 ? void 0 : _a[tagName]) || 0;
     }
     hasPosition() {
         return isIndex(this.node.startIndex) && isIndex(this.node.endIndex);
@@ -1412,7 +1419,8 @@ class XmlElement {
         return this._documentType || this.documentName;
     }
     get tagVoid() {
-        return this._tagVoid ?? XmlWriter.isTagVoid(this.documentType, this.tagName);
+        var _a;
+        return (_a = this._tagVoid) !== null && _a !== void 0 ? _a : XmlWriter.isTagVoid(this.documentType, this.tagName);
     }
     set innerXml(value) {
         if (!this.tagVoid && value !== this._innerXml) {

package/transform/index.js

@@ -136,8 +136,9 @@ class TransformSeries extends core_1.Module {
         return context;
     }
     close(instance) {
+        var _e;
         core_1.AbortComponent.detach(instance, this.signal);
-        this.host?.release(this);
+        (_e = this.host) === null || _e === void 0 ? void 0 : _e.release(this);
     }
     set code(value) {
         this[kCode] = value;