@pi-r/chrome 0.5.0 → 0.5.2

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2023 An Pham
+Copyright 2023 Wit Studio
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

package/README.md

@@ -1,5 +1,7 @@
-### @pi-r/chrome
+# @pi-r/chrome
 
-### LICENSE
+PEP 402 - Forever Vivy
+
+## LICENSE
 
 MIT

package/index.d.ts

@@ -1,7 +1,7 @@
-import type { IFileManager } from '@e-mc/types/lib';
-
-import type { ChromeDocumentConstructor, DocumentAsset } from './types';
-
-declare const Chrome: ChromeDocumentConstructor<IFileManager<DocumentAsset>>;
-
+import type { IFileManager } from '@e-mc/types/lib';
+
+import type { ChromeDocumentConstructor, DocumentAsset } from './types';
+
+declare const Chrome: ChromeDocumentConstructor<IFileManager<DocumentAsset>>;
+
 export = Chrome;

package/index.js

@@ -17,31 +17,32 @@ const CACHE_SELECTOR = new Map();
 const CACHE_DATASET = {};
 const CACHE_ATRULES = {};
 let CACHE_TOTAL = 0;
-const REGEXP_SRCSETSIZE = /~\s*([\d.]+)\s*([wx])/i;
-const REGEXP_TEMPLATECONDITIONAL = /(\n\s+)?\{\{if\s+((?:[^}]|}(?!}))+?)\}\}(\s*)([\S\s]*?)(?:\s*\{\{else(?:\s+if\s+((?:[^}]|}(?!}))+?))?\}\}(\s*)([\S\s]*?)\s*)?\s*\{\{end\}\}/g;
-const REGEXP_TEMPLATECOMPARISON = /\s*\(\s*(?:(eq|ne|lt|le|gt|ge)\s+)?("[^"]+"|'[^']+'|[^\s)]+)(?:\s+("[^"]+"|'[^']+'|[^\s)]+))?\s*\)/g;
-const REGEXP_TEMPLATEMATCH = new RegExp(`^(?:(and|or|not)\\s+)?((?:${REGEXP_TEMPLATECOMPARISON.source})+)|(!|not\\s+)?([^\\s][\\S\\s]*)$`);
-const REGEXP_IMPORTMODULE = /(?:(?:^|[\n;]+)\s*import\s+(?:("(?:[^"]|(?<=\\)")+"|'(?:[^']|(?<=\\)')+')|.+?from\s+("(?:[^"]|(?<=\\)")+"|'(?:[^']|(?<=\\)')+')(?:[ \t]+assert[ \t]+\{((?:"(?:[^"]|(?<=\\)")+"|'(?:[^']|(?<=\\)')+'|`(?:[^`]|(?<=\\)`)+`|{[^{]*{|{[^}]*}|}[^}]*}|(?![{}])[^"'`])+)\})?)|\bimport\(\s*("(?:[^"]|(?<=\\)")+"|'(?:[^']|(?<=\\)')+')\s*(?:,\s*\{((?:"(?:[^"]|(?<=\\)")+"|'(?:[^']|(?<=\\)')+'|`(?:[^`]|(?<=\\)`)+`|{[^{]*{|{[^}]*}|}[^}]*}|(?![{}])[^"'`])+)\}\s*)?\))/g;
-const REGEXP_BLOCKEXCLUDE = new RegExp(`(\\s*)<!--\\s*exclude\\s*:\\s*(?:start|end)\\s*-->` + dom_1.DomWriter.PATTERN_TRAILINGSPACE, 'gi');
 const [PATTERN_STRING_SOME, PATTERN_STRING_MANY] = (function () {
     const grouping = '(?:\\s|' + dom_1.DomWriter.PATTERN_COMMENT + '|`[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}`)';
     return [grouping + '*', grouping + '+'];
 })();
+const PATTERN_PARENINLINE = '(?:[^()]|\\([^()]+\\(|\\([^)]+\\)|\\)[^()]+\\)|\\)*?)+';
+const REGEXP_SRCSETSIZE = /~\s*([\d.]+)\s*([wx])/i;
+const REGEXP_TEMPLATECONDITIONAL = /(\n\s+)?\{\{if\s+((?:[^}]|}(?!}))+?)\}\}(\s*)([\S\s]*?)(?:\s*\{\{else(?:\s+if\s+((?:[^}]|}(?!}))+?))?\}\}(\s*)([\S\s]*?)\s*)?\s*\{\{end\}\}/g;
+const REGEXP_TEMPLATECOMPARISON = /\s*\(\s*(?:\b(eq|ne|lt|le|gt|ge)\s+)?("[^"]+"|'[^']+'|[^\s)]+)(?:\s+("[^"]+"|'[^']+'|[^\s)]+))?\s*\)/g;
+const REGEXP_TEMPLATEMATCH = new RegExp(`^(?:\\b(and|or|not)\\s+)?((?:${REGEXP_TEMPLATECOMPARISON.source})+)|(!|not\\s+)?([^\\s][\\S\\s]*)$`);
+const REGEXP_IMPORTMODULE = /(?:(?:^|[\n;]+)\s*import\s+(?:("(?:[^"]|(?<=\\)")+"|'(?:[^']|(?<=\\)')+')|.+?from\s+("(?:[^"]|(?<=\\)")+"|'(?:[^']|(?<=\\)')+')(?:[ \t]+assert[ \t]+\{((?:"(?:[^"]|(?<=\\)")+"|'(?:[^']|(?<=\\)')+'|`(?:[^`]|(?<=\\)`)+`|{[^{]*{|{[^}]*}|}[^}]*}|[^"'`]+)+)\})?)|\bimport\(\s*("(?:[^"]|(?<=\\)")+"|'(?:[^']|(?<=\\)')+')\s*(?:,\s*\{((?:"(?:[^"]|(?<=\\)")+"|'(?:[^']|(?<=\\)')+'|`(?:[^`]|(?<=\\)`)+`|{[^{]*{|{[^}]*}|}[^}]*}|[^"'`]+)+)\}\s*)?\))/g;
+const REGEXP_BLOCKEXCLUDE = new RegExp(`(\\s*)<!--\\s*exclude\\s*:\\s*(?:start|end)\\s*-->` + dom_1.DomWriter.PATTERN_TRAILINGSPACE, 'gi');
 const REGEXP_COMMENT = new RegExp(dom_1.DomWriter.PATTERN_COMMENT, 'g');
-const REGEXP_CONTENT = new RegExp(`\\bcontent${PATTERN_STRING_SOME}:${PATTERN_STRING_SOME}(?:"[^"]*"|'[^']*')`, 'gi');
+const REGEXP_QUOTEDVALUE = new RegExp(`\\b(?:@import${PATTERN_STRING_MANY}|content${PATTERN_STRING_SOME}:${PATTERN_STRING_SOME})(?:"[^"]*"|'[^']*')`, 'gi');
 const REGEXP_STYLE = new RegExp(`(<style${dom_1.DomWriter.PATTERN_TAGOPEN}*>)([\\S\\s]*?)(<\\/style\\s*>)`, 'gi');
 const REGEXP_VARIABLES = new RegExp(`(\\s*)(--[^\\s:]*)${PATTERN_STRING_SOME}:[^;}]*([;}])` + dom_1.DomWriter.PATTERN_TRAILINGSPACE, 'g');
 const REGEXP_FONTFACE = new RegExp(`(\\s*)@font-face${PATTERN_STRING_SOME}{([^}]+)}` + dom_1.DomWriter.PATTERN_TRAILINGSPACE, 'gi');
-const REGEXP_FONTFAMILY = new RegExp(`font-family${PATTERN_STRING_SOME}:([^;}]+)`, 'i');
+const REGEXP_FONTFAMILY = new RegExp(`\\bfont-family${PATTERN_STRING_SOME}:([^;}]+)`, 'i');
 const REGEXP_KEYFRAMES = new RegExp(`(\\s*)@keyframes${PATTERN_STRING_MANY}([^{]+){`, 'gi');
 const REGEXP_PROPERTY = new RegExp(`(\\s*)@property${PATTERN_STRING_MANY}(--[^\\s]+)${PATTERN_STRING_SOME}{`, 'gi');
-const REGEXP_NTHCHILD = new RegExp(`\\(${PATTERN_STRING_SOME}([+-])?(?:(\\d*)[nN]|(0))${PATTERN_STRING_SOME}([+-])?${PATTERN_STRING_SOME}(\\d*)${PATTERN_STRING_SOME}\\)`, 'g');
+const REGEXP_NTHCHILD = new RegExp(`\\(${PATTERN_STRING_SOME}([+-])?(?:(\\d*)[nN]|(0))?${PATTERN_STRING_SOME}([+-])?${PATTERN_STRING_SOME}(\\d*)(?:${PATTERN_STRING_MANY}[oO][fF]${PATTERN_STRING_MANY}(${PATTERN_PARENINLINE})${PATTERN_STRING_SOME}\\)|${PATTERN_STRING_SOME}\\))`, 'g');
 const REGEXP_VARIABLES_UNSAFE = new RegExp(`(\\s*)(--[^\\s:]*)\\s*:[^;}]*([;}])` + dom_1.DomWriter.PATTERN_TRAILINGSPACE, 'g');
 const REGEXP_FONTFACE_UNSAFE = new RegExp(`(\\s*)@font-face\\s*{([^}]+)}` + dom_1.DomWriter.PATTERN_TRAILINGSPACE, 'gi');
-const REGEXP_FONTFAMILY_UNSAFE = /font-family\s*:([^;}]+)/i;
+const REGEXP_FONTFAMILY_UNSAFE = /\bfont-family\s*:([^;}]+)/i;
 const REGEXP_KEYFRAMES_UNSAFE = /(\s*)@keyframes\s+([^{]+){/gi;
 const REGEXP_PROPERTY_UNSAFE = /(\s*)@property\s+(--[^\s]+)\s*{/gi;
-const REGEXP_NTHCHILD_UNSAFE = /\(\s*([+-])?(?:(\d*)[nN]|(0))\s*([+-])?\s*(\d*)\s*\)/g;
+const REGEXP_NTHCHILD_UNSAFE = new RegExp(`\\(\\s*([+-])?(?:(\\d*)[nN]|(0))?\\s*([+-])?\\s*(\\d*)(?:\\s+[oO][fF]\\s+(${PATTERN_PARENINLINE})\\s*\\)|\\s*\\))`, 'g');
 const REGEXP_OBJECT_NAME = /([^[.\s]+)((?:\s*\[[^\]]+\]\s*)+)?\s*\.?\s*/g;
 const REGEXP_OBJECT_SUBSCRIPT = /\[\s*(["'])?(.+?)\1\s*\]/g;
 const REGEXP_TEMPLATE_LEADING = /\s*\{\{- \s*((?:[^}]|}(?!}))+?)\}\}/g;
@@ -49,7 +50,7 @@ const REGEXP_TEMPLATE_TRAILING = /\{\{((?:[^}]|}(?!}))+?)\s*? -\}\}\s*/g;
 const REGEXP_URL = /(?:\b[Uu][Rr][Ll]\(|@import\s+(["'])|\b([Hh][Rr][Ee][Ff])\s*=)/g;
 const REGEXP_URL_JS = /\bimport\(/g;
 const REGEXP_URL_SVG = /(?:\b[Uu][Rr][Ll]\(|@import\s+(["'])|\b([Hh][Rr][Ee][Ff])\s*=)/g;
-const REGEXP_IMAGESET = /(?:-webkit-)?image-set\(/gi;
+const REGEXP_IMAGESET = /\b(?:-webkit-)?image-set\(/gi;
 const REGEXP_IMAGESET_URL = /(?:^|[^(])\s*("(\s*[^)][^"]*)"|'(\s*[^)][^"]*)')\s*(?:,|$|[^)][^,]*,?)/g;
 const REGEXP_REPLACECSS = /^@import\s+(?:url\((?:[^)]|(?<=\\)\))+\)|"(?:[^"]|(?<=\\)")+"|'(?:[^']|(?<=\\)')+')(\s*layer(?:\(([^)]*)\)|\b))?(?:\s*supports\(((?:\([^(]+\(|\([^)]+\)|\)[^)]+\)|(?:(?!\))[^(])+|(?:(?!\()[^)])+)+)\))?(.*?);?$/;
 function removeNamespace(name, source, newline, comments) {
@@ -161,7 +162,7 @@ function addCacheItem(map, key, data, timeout) {
     map.set(key, [
         Date.now(),
         data,
-        setTimeout(() => deleteCacheItem(map, key), timeout * 1000 /* TIME.S */)
+        setTimeout(() => deleteCacheItem(map, key), timeout * 1000)
     ]);
 }
 function deleteCacheItem(map, key) {
@@ -219,10 +220,10 @@ function hasCondition(data, condition) {
                 if (arg2) {
                     switch (item[0]) {
                         case 'eq':
-                            valid = parseArg(arg1) == parseArg(arg2); // eslint-disable-line eqeqeq
+                            valid = parseArg(arg1) == parseArg(arg2);
                             break;
                         case 'ne':
-                            valid = parseArg(arg1) != parseArg(arg2); // eslint-disable-line eqeqeq
+                            valid = parseArg(arg1) != parseArg(arg2);
                             break;
                         case 'lt':
                             valid = parseArg(arg1) < parseArg(arg2);
@@ -346,7 +347,7 @@ function createHash(host, file, hash, bufferMap) {
         throw (0, types_1.errorMessage)('hash', 'Source not found', filename);
     }
     catch (err) {
-        host.writeFail(["Unable to read file" /* ERR_MESSAGE.READ_FILE */, filename], err, 32 /* LOG_TYPE.FILE */);
+        host.writeFail(["Unable to read file", filename], err, 32);
     }
 }
 function getSrcURL(parent, file) {
@@ -508,7 +509,7 @@ function transformURL(host, parent, type, source, importFile) {
                     }
                 }
                 if (asset.initialValue && !asset.initialValue.cacheable) {
-                    parent.flags |= 16 /* ASSET_FLAG.MODIFIED */;
+                    parent.flags |= 16;
                 }
                 related.push(asset);
             }
@@ -604,7 +605,7 @@ function transformURL(host, parent, type, source, importFile) {
                             else {
                                 related.push(asset);
                                 if (!(0, types_1.existsFlag)(asset.flags)) {
-                                    asset.flags |= 8 /* ASSET_FLAG.WATCH */;
+                                    asset.flags |= 8;
                                 }
                             }
                             modified = true;
@@ -764,12 +765,12 @@ function transformJs(host, file, output) {
                         });
                     }
                     else {
-                        this.writeFail(['Unable to create script entry point', path.basename(chunkUri)], (0, types_1.errorMessage)('js', 'Element not found', chunkUri), 4 /* LOG_TYPE.PROCESS */);
+                        this.writeFail(['Unable to create script entry point', path.basename(chunkUri)], (0, types_1.errorMessage)('js', 'Element not found', chunkUri), 4);
                     }
                 }
             }
             catch (err) {
-                this.writeFail(["Unable to write file" /* ERR_MESSAGE.WRITE_FILE */, path.basename(chunkUri)], err, 32 /* LOG_TYPE.FILE */);
+                this.writeFail(["Unable to write file", path.basename(chunkUri)], err, 32);
             }
         }
         appending?.forEach(item => item.order += order);
@@ -857,19 +858,18 @@ async function checkData(item, name, result, validate) {
     if (typeof callback === 'function') {
         try {
             let output;
-            // @ts-ignore
-            if (callback["__cjs__" /* INTERNAL.CJS */]) {
+            if (callback["__cjs__"]) {
                 output = await callback(result, item);
             }
             else {
-                output = await callback.apply(Document.enabled("node.process.inline" /* KEY_NAME.NODE_PROCESS_INLINE */) ? process : null, Document.enabled("node.require.inline" /* KEY_NAME.NODE_REQUIRE_INLINE */) ? [result, item, require] : [result, item]);
+                output = await callback.apply(Document.enabled("node.process.inline") ? process : null, Document.enabled("node.require.inline") ? [result, item, require] : [result, item]);
             }
             if (validate(output)) {
                 return output;
             }
         }
         catch (err) {
-            this.writeFail(["Unable to parse inline method" /* ERR_MESSAGE.INLINE_METHOD */, name], err);
+            this.writeFail(["Unable to parse inline method", name], err);
         }
     }
 }
@@ -897,7 +897,6 @@ const getEndIndex = (match) => match.index + match[0].length;
 const getRelativeURL = (file) => joinPath(file.moveTo, file.pathname, file.inlineFilename || file.filename) + (!file.static ? restoreSearchParams(file.url?.search) : '');
 const errorHtml = ({ tagName, tagIndex = -1 }) => (0, types_1.errorMessage)('html', 'Location did not resolve', tagName.toLowerCase() + (tagIndex >= 0 ? ': ' + tagIndex : ''));
 const errorDataSource = (value, hint) => (0, types_1.errorMessage)('data-source', value, hint);
-// @ts-ignore
 class ChromeDocument extends Document {
     constructor() {
         super(...arguments);
@@ -981,7 +980,7 @@ class ChromeDocument extends Document {
         const { Db: db, htmlFile, assets } = instance;
         const outHtml = htmlFile && !isIgnored(htmlFile, true);
         if (db && await db.commit()) {
-            db.writeTimeElapsed('DB', ["Transactions were committed" /* VAL_MESSAGE.COMMIT_TRANSACTION */, db.moduleName], processing.startTime, { ...Document.LOG_STYLE_SUCCESS, type: 65536 /* LOG_TYPE.DB */ });
+            db.writeTimeElapsed('DB', ["Transactions were committed", db.moduleName], processing.startTime, { ...Document.LOG_STYLE_SUCCESS, type: 65536 });
         }
         if (instance.dataSource.length === 0 && outHtml) {
             const incremental = htmlFile.incremental ?? this.incremental;
@@ -1024,7 +1023,7 @@ class ChromeDocument extends Document {
                         }
                         case 'exists':
                             if (hint || isHtmlOnly()) {
-                                this.formatMessage(4 /* LOG_TYPE.PROCESS */, 'HTML', ['No changes detected', 'incremental: ' + incremental], hint, { ...Document.LOG_STYLE_NOTICE, messageBgColor: 'bgWhite', messageColor: 'black' });
+                                this.formatMessage(4, 'HTML', ['No changes detected', 'incremental: ' + incremental], hint, { ...Document.LOG_STYLE_NOTICE, messageBgColor: 'bgWhite', messageColor: 'black' });
                                 return super.finalize.call(this, instance);
                             }
                             break;
@@ -1064,7 +1063,7 @@ class ChromeDocument extends Document {
                         for (const item of children) {
                             if (!items.has(item)) {
                                 if (isWatched.call(instance, item)) {
-                                    item.flags |= 8 /* ASSET_FLAG.WATCH */;
+                                    item.flags |= 8;
                                 }
                                 items.add(item);
                                 const next = related.get(item);
@@ -1095,18 +1094,18 @@ class ChromeDocument extends Document {
                                 this.delete(value);
                             }
                             else {
-                                instance.writeFail(["Unable to move file" /* ERR_MESSAGE.MOVE_FILE */, instance.moduleName], (0, types_1.errorMessage)('production', path.join(this.baseDirectory, value)), { fatal: true });
+                                instance.writeFail(["Unable to move file", instance.moduleName], (0, types_1.errorMessage)('production', path.join(this.baseDirectory, value)), { fatal: true });
                             }
                         }
                     }
                 }
             }
             else {
-                instance.writeFail(["Unable to write directory" /* ERR_MESSAGE.WRITE_DIRECTORY */, instance.moduleName], (0, types_1.errorMessage)('production', 'Access denied', productionRelease));
+                instance.writeFail(["Unable to write directory", instance.moduleName], (0, types_1.errorMessage)('production', 'Access denied', productionRelease));
             }
         }
         else {
-            instance.writeFail(["Unable to read directory" /* ERR_MESSAGE.READ_DIRECTORY */, instance.moduleName], (0, types_1.errorMessage)('production', 'Invalid directory', productionRelease), 32 /* LOG_TYPE.FILE */);
+            instance.writeFail(["Unable to read directory", instance.moduleName], (0, types_1.errorMessage)('production', 'Invalid directory', productionRelease), 32);
         }
     }
     static sanitizeAssets(assets, exclusions = []) {
@@ -1426,7 +1425,7 @@ class ChromeDocument extends Document {
                     await instance.tryFile(buffer, { format: to, filename: file.filename, etag: file.etag }, (err, result, ext) => {
                         if (err) {
                             setFormat();
-                            this.writeFail("Unable to compress file" /* ERR_MESSAGE.COMPRESS_FILE */, err, 8 /* LOG_TYPE.COMPRESS */);
+                            this.writeFail("Unable to compress file", err, 8);
                         }
                         else if (result) {
                             if (ext) {
@@ -1440,7 +1439,7 @@ class ChromeDocument extends Document {
                                     host.replace(file, output);
                                 }
                                 else {
-                                    this.writeFail("Unable to write file" /* ERR_MESSAGE.WRITE_FILE */, error, 32 /* LOG_TYPE.FILE */);
+                                    this.writeFail("Unable to write file", error, 32);
                                 }
                             });
                         }
@@ -1598,12 +1597,14 @@ class ChromeDocument extends Document {
         }
         for (const placeholder in importMap) {
             const items = importMap[placeholder];
+            let found;
             for (let i = 0, length = items.length; i < length; ++i) {
                 const index = code.indexOf(placeholder);
                 if (index !== -1) {
                     const { uri, original, type, dynamic } = items[i];
+                    const hosted = type === 'css';
                     let value;
-                    if (type === 'css') {
+                    if (hosted) {
                         const asset = this.host?.findAsset(uri);
                         if (asset) {
                             const [relativeUrl, sameDir] = getSrcURL.call(this, bundleMain || file, asset);
@@ -1615,11 +1616,12 @@ class ChromeDocument extends Document {
                     else if (!(dynamic && file.imported !== false)) {
                         value = this.findSourceRoot(uri);
                     }
-                    if (!value) {
+                    if (!value || !hosted && !Document.isPath(value)) {
                         if (i < length - 1) {
+                            found || (found = value);
                             continue;
                         }
-                        value = original;
+                        value = found || original;
                     }
                     code = spliceString(code, index, index + placeholder.length, value);
                     modified = true;
@@ -1750,7 +1752,7 @@ class ChromeDocument extends Document {
                         item.sourceUTF8 = output;
                     }
                     catch (err) {
-                        host.writeFail(["Unable to write file" /* ERR_MESSAGE.WRITE_FILE */, path.basename(item.localUri)], err, 32 /* LOG_TYPE.FILE */);
+                        host.writeFail(["Unable to write file", path.basename(item.localUri)], err, 32);
                     }
                 }
             }
@@ -1952,7 +1954,7 @@ class ChromeDocument extends Document {
                     host.removeAsset(item);
                 }
                 catch (err) {
-                    this.writeFail(["Unable to read file" /* ERR_MESSAGE.READ_FILE */, item.filename], err, { type: 32 /* LOG_TYPE.FILE */, startTime });
+                    this.writeFail(["Unable to read file", item.filename], err, { type: 32, startTime });
                     return false;
                 }
             }
@@ -2135,7 +2137,7 @@ class ChromeDocument extends Document {
         const { moduleName, config } = this;
         const htmlFile = this.htmlFile;
         const localUri = htmlFile.localUri;
-        this.formatMessage(4 /* LOG_TYPE.PROCESS */, 'HTML', ['Rewriting content...', path.dirname(localUri)]);
+        this.formatMessage(4, 'HTML', ['Rewriting content...', path.dirname(localUri)]);
         let source = host.getUTF8String(htmlFile, localUri), output;
         const domBase = new dom_1.DomWriter(moduleName, source, this.elements, { normalize: config.normalizeHtmlOutput, stripComments: config.stripCommentsAndCDATA, ignoreTagGroup: config.ignoreServerCodeBlocks, escapeEntities: config.escapeReservedCharacters });
         if (config.useUnsafeHtmlReplace) {
@@ -2161,7 +2163,7 @@ class ChromeDocument extends Document {
                 const domElement = new dom_1.HtmlElement(moduleName, element, item.attributes);
                 domElement.remove = true;
                 if (!domBase.write(domElement)) {
-                    this.writeFail('Unable to exclude HTML element', errorHtml(element), 4 /* LOG_TYPE.PROCESS */);
+                    this.writeFail('Unable to exclude HTML element', errorHtml(element), 4);
                 }
             }
         }
@@ -2201,7 +2203,7 @@ class ChromeDocument extends Document {
             domBase.errors.forEach(err => this.addLog(types_1.STATUS_TYPE.WARN, 'dom-writer -> ' + err.message, timeStamp));
         }
         if (domBase.failCount > 0) {
-            this.writeFail(['Unable to update document', moduleName], (0, types_1.errorMessage)('html', 'DOM rewrite failed', domBase.failCount + ' errors'), { type: 4 /* LOG_TYPE.PROCESS */, startTime });
+            this.writeFail(['Unable to update document', moduleName], (0, types_1.errorMessage)('html', 'DOM rewrite failed', domBase.failCount + ' errors'), { type: 4, startTime });
         }
         else {
             this.writeTimeProcess('html', `dom-writer (${domBase.modifyCount} modified) -> ` + path.basename(localUri), startTime);
@@ -2212,7 +2214,7 @@ class ChromeDocument extends Document {
                 for (const name in data) {
                     message.push(name + `(${data[name]})`);
                 }
-                this.formatMessage(65536 /* LOG_TYPE.DB */, 'DB', ['Cache statistics', cacheMiss.length + ' missed'], message.join(' - '), { ...Document.LOG_STYLE_NOTICE, hintBold: true });
+                this.formatMessage(65536, 'DB', ['Cache statistics', cacheMiss.length + ' missed'], message.join(' - '), { ...Document.LOG_STYLE_NOTICE, hintBold: true });
             }
         }
         htmlFile.modified = true;
@@ -2328,7 +2330,7 @@ class ChromeDocument extends Document {
                 }
             }
             if (!domBase.write(domElement)) {
-                this.writeFail(inlineContent ? 'Inline tag replacement' : 'Element attribute replacement', errorHtml(element), { type: 4 /* LOG_TYPE.PROCESS */, startTime });
+                this.writeFail(inlineContent ? 'Inline tag replacement' : 'Element attribute replacement', errorHtml(element), { type: 4, startTime });
                 delete item.inlineUrlCloud;
             }
             else if (inlineContent) {
@@ -2352,7 +2354,7 @@ class ChromeDocument extends Document {
             if (item.removeEmpty || item.type === 'display') {
                 (element || (element = new dom_1.HtmlElement(moduleName, item.element))).remove = true;
                 if (!domBase.write(element)) {
-                    this.writeFail('Unable to remove element', errorHtml(item.element), { type: 4 /* LOG_TYPE.PROCESS */, startTime });
+                    this.writeFail('Unable to remove element', errorHtml(item.element), { type: 4, startTime });
                 }
             }
         };
@@ -2360,7 +2362,7 @@ class ChromeDocument extends Document {
             removeElement(item);
             const pkg = getPackageName(err);
             if (!(pkg && this.checkPackage(err, pkg))) {
-                this.writeFail(["Invalid credentials" /* ERR_DB.CREDENTIALS */, item.source], err);
+                this.writeFail(["Invalid credentials", item.source], err);
             }
         };
         const checkObject = (item, data) => {
@@ -2390,7 +2392,7 @@ class ChromeDocument extends Document {
                     }
                     catch (err) {
                         this.abort(item.source);
-                        this.checkPackage(err, pkg, ["Unable to filter results" /* ERR_DB.FILTER_QUERY */, item.source]);
+                        this.checkPackage(err, pkg, ["Unable to filter results", item.source]);
                     }
                 }
             }
@@ -2413,7 +2415,7 @@ class ChromeDocument extends Document {
                             (batchMap[key] || (batchMap[key] = [])).push(item);
                         }
                         else {
-                            errorCredential(item, (0, types_1.errorValue)("Cloud module not installed" /* ERR_CLOUD.MODULE_NOTFOUND */, service));
+                            errorCredential(item, (0, types_1.errorValue)("Cloud module not installed", service));
                         }
                         break;
                     }
@@ -2446,7 +2448,7 @@ class ChromeDocument extends Document {
                             }
                         }
                         else {
-                            errorCredential(item, (0, types_1.errorValue)(db ? "Database provider not found" /* ERR_DB.PROVIDER_NOTFOUND */ : "Db module not installed" /* ERR_DB.MODULE_NOTFOUND */, type));
+                            errorCredential(item, (0, types_1.errorValue)(db ? "Database provider not found" : "Db module not installed", type));
                         }
                         break;
                 }
@@ -2463,7 +2465,7 @@ class ChromeDocument extends Document {
                     const errorClient = (item, reason) => {
                         removeElement(item);
                         if (reason) {
-                            this.writeFail(["Unable to configure client" /* ERR_DB.CLIENT */, item.source], reason);
+                            this.writeFail(["Unable to configure client", item.source], reason);
                         }
                         reject();
                     };
@@ -2505,7 +2507,7 @@ class ChromeDocument extends Document {
                                             }
                                             catch (err) {
                                                 this.abort(type);
-                                                this.writeFail(["Unable to read file" /* ERR_MESSAGE.READ_FILE */, path.basename(location)], err, { type: 32 /* LOG_TYPE.FILE */, startTime });
+                                                this.writeFail(["Unable to read file", path.basename(location)], err, { type: 32, startTime });
                                                 errorRemove(current);
                                                 return;
                                             }
@@ -2541,7 +2543,7 @@ class ChromeDocument extends Document {
                                         }
                                         catch (err) {
                                             this.abort(type);
-                                            this.writeFail(["Unable to download file" /* ERR_MESSAGE.DOWNLOAD_FILE */, target], err, { type: 1024 /* LOG_TYPE.HTTP */, startTime });
+                                            this.writeFail(["Unable to download file", target], err, { type: 1024, startTime });
                                             errorRemove(current);
                                             return;
                                         }
@@ -2570,7 +2572,7 @@ class ChromeDocument extends Document {
                                         }
                                         catch (err) {
                                             this.abort(type);
-                                            this.writeFail(["Unable to read file" /* ERR_MESSAGE.READ_FILE */, path.basename(pathname)], err, { type: 32 /* LOG_TYPE.FILE */, startTime });
+                                            this.writeFail(["Unable to read file", path.basename(pathname)], err, { type: 32, startTime });
                                             errorRemove(current);
                                             return;
                                         }
@@ -2584,7 +2586,7 @@ class ChromeDocument extends Document {
                                 }
                                 catch (err) {
                                     this.abort(type);
-                                    this.writeFail(['Unable to parse data source', format], err, { type: 4 /* LOG_TYPE.PROCESS */, startTime });
+                                    this.writeFail(['Unable to parse data source', format], err, { type: 4, startTime });
                                     errorRemove(current);
                                     return;
                                 }
@@ -2660,13 +2662,12 @@ class ChromeDocument extends Document {
                                         if (params && this.settingsOf(type, 'coerce') === true) {
                                             (0, types_1.coerceObject)(params);
                                         }
-                                        // @ts-ignore
-                                        if (getData["__cjs__" /* INTERNAL.CJS */]) {
+                                        if (getData["__cjs__"]) {
                                             data = await getData(params);
                                         }
                                         else {
-                                            const thisArg = Document.enabled("node.process.inline" /* KEY_NAME.NODE_PROCESS_INLINE */) ? process : null;
-                                            const inline = Document.enabled("node.require.inline" /* KEY_NAME.NODE_REQUIRE_INLINE */);
+                                            const thisArg = Document.enabled("node.process.inline") ? process : null;
+                                            const inline = Document.enabled("node.require.inline");
                                             const args = [params];
                                             if (getData.toString().startsWith('async')) {
                                                 if (inline) {
@@ -2688,7 +2689,7 @@ class ChromeDocument extends Document {
                                     }
                                     catch (err) {
                                         this.abort(type);
-                                        this.writeFail(['Unable to retrieve data source', hint], err, { type: 4 /* LOG_TYPE.PROCESS */, startTime });
+                                        this.writeFail(['Unable to retrieve data source', hint], err, { type: 4, startTime });
                                         errorRemove(current);
                                         return;
                                     }
@@ -2774,12 +2775,12 @@ class ChromeDocument extends Document {
                                                             }
                                                         }
                                                         else {
-                                                            throw (0, types_1.errorMessage)(type, "File not found" /* ERR_MESSAGE.NOTFOUND_FILE */, query);
+                                                            throw (0, types_1.errorMessage)(type, "File not found", query);
                                                         }
                                                     }
                                                     catch (err) {
                                                         this.abort(type);
-                                                        this.writeFail(["Unable to read file" /* ERR_MESSAGE.READ_FILE */, pathname ? path.basename(pathname) : query], err, { startTime });
+                                                        this.writeFail(["Unable to read file", pathname ? path.basename(pathname) : query], err, { startTime });
                                                         errorRemove(current);
                                                         return;
                                                     }
@@ -2816,7 +2817,7 @@ class ChromeDocument extends Document {
                                             this.abort(type);
                                         }
                                         if (err) {
-                                            this.writeFail(["Unable to execute query" /* ERR_DB.EXEC_QUERY */, message || "Unknown" /* ERR_MESSAGE.UNKNOWN */], err instanceof Error ? errors = err : err, { type: 65536 /* LOG_TYPE.DB */, startTime });
+                                            this.writeFail(["Unable to execute query", message || "Unknown"], err instanceof Error ? errors = err : err, { type: 65536, startTime });
                                         }
                                         return this.aborted;
                                     };
@@ -2830,7 +2831,7 @@ class ChromeDocument extends Document {
                                 }
                                 break;
                             }
-                            errorRemove(current, errorDataSource('Not found', type || "Unknown" /* ERR_MESSAGE.UNKNOWN */));
+                            errorRemove(current, errorDataSource('Not found', type || "Unknown"));
                             return;
                     }
                     if (this.aborted) {
@@ -2894,7 +2895,7 @@ class ChromeDocument extends Document {
                                                 setCacheData.call(this, item, item.value, pathname, cacheData, true);
                                             }
                                             catch (err) {
-                                                this.writeFail(["Unable to read file" /* ERR_MESSAGE.READ_FILE */, path.basename(pathname)], err, { type: 32 /* LOG_TYPE.FILE */, startTime });
+                                                this.writeFail(["Unable to read file", path.basename(pathname)], err, { type: 32, startTime });
                                                 errors = true;
                                             }
                                         }
@@ -2937,7 +2938,7 @@ class ChromeDocument extends Document {
                                                     const literal = segment.trim();
                                                     if (literal[0] === '`' && literal[literal.length - 1] === '`') {
                                                         if (!this.hasEval('function')) {
-                                                            errors = (0, types_1.errorMessage)('eval', "Unsupported access" /* ERR_MESSAGE.UNSUPPORTED_ACCESS */, 'function');
+                                                            errors = (0, types_1.errorMessage)('eval', "Unsupported access", 'function');
                                                             continue;
                                                         }
                                                         try {
@@ -2958,7 +2959,7 @@ class ChromeDocument extends Document {
                                                     else {
                                                         const pattern = /\$\{\s*([^\s}]+)\s*\}/g;
                                                         while (match = pattern.exec(segment)) {
-                                                            segment = replaceMatch(match, segment, match[1] === "__index__" /* PROPERTIES.INDEX */ && !(0, types_1.isObject)(row) ? (j + 1).toString() : valueAsString(getObjectValue(row, match[1]), ', '), pattern);
+                                                            segment = replaceMatch(match, segment, match[1] === "__index__" && !(0, types_1.isObject)(row) ? (j + 1).toString() : valueAsString(getObjectValue(row, match[1]), ', '), pattern);
                                                         }
                                                     }
                                                     value += trimTemplate(segment);
@@ -3153,37 +3154,37 @@ class ChromeDocument extends Document {
                                     default:
                                         removeElement(item, domElement);
                                         if (length === 1) {
-                                            reject(errorDataSource('Invalid action', item.type || "Unknown" /* ERR_MESSAGE.UNKNOWN */));
+                                            reject(errorDataSource('Invalid action', item.type || "Unknown"));
                                             return;
                                         }
                                         break invalid;
                                 }
                                 if (!domBase.write(domElement) || errors) {
-                                    this.writeFail(item.type === 'display' ? domElement.remove ? errors ? 'Element was removed with errors' : 'Unable to remove element' : 'Unable to determine display conditional' : 'Unable to replace ' + item.type, errors instanceof Error ? errors : errorHtml(element), { type: 4 /* LOG_TYPE.PROCESS */, startTime });
+                                    this.writeFail(item.type === 'display' ? domElement.remove ? errors ? 'Element was removed with errors' : 'Unable to remove element' : 'Unable to determine display conditional' : 'Unable to replace ' + item.type, errors instanceof Error ? errors : errorHtml(element), { type: 4, startTime });
                                 }
                             }
                         }
                         else {
                             if (!empty && item.type !== 'display' || item.transactionFail) {
                                 const emptyResponse = (value, service = item.source) => {
-                                    value || (value = "Unknown" /* ERR_MESSAGE.UNKNOWN */);
+                                    value || (value = "Unknown");
                                     return errors instanceof Error ? (0, types_1.errorMessage)(service, value, errors.message) : errorDataSource(service + ' -> Empty', value);
                                 };
                                 switch (item.source) {
                                     case 'cloud': {
                                         const { service, table, id, query } = item;
                                         const queryString = (table ? 'table=' + table : '') + (id || query ? (table ? ';' : '') + (id ? 'id=' + id : 'query=' + asString(query)) : '');
-                                        (cloud || this).formatFail(64 /* LOG_TYPE.CLOUD */, service, ["Unable to execute query" /* ERR_DB.EXEC_QUERY */, queryString], emptyResponse(queryString, service), { ...Cloud.LOG_CLOUD_FAIL, startTime });
+                                        (cloud || this).formatFail(64, service, ["Unable to execute query", queryString], emptyResponse(queryString, service), { ...Cloud.LOG_CLOUD_FAIL, startTime });
                                         break;
                                     }
                                     case 'uri': {
                                         const { uri, format = uri && path.extname(uri).substring(1) } = item;
-                                        this.formatFail(4 /* LOG_TYPE.PROCESS */, format || 'URI', ['No records were found', uri], emptyResponse(uri), { startTime });
+                                        this.formatFail(4, format || 'URI', ['No records were found', uri], emptyResponse(uri), { startTime });
                                         break;
                                     }
                                     case 'local': {
                                         const { pathname, format = pathname && path.extname(pathname).substring(1) } = item;
-                                        this.formatFail(4 /* LOG_TYPE.PROCESS */, format || 'LOCAL', ['No records were found', pathname], emptyResponse(pathname), { startTime });
+                                        this.formatFail(4, format || 'LOCAL', ['No records were found', pathname], emptyResponse(pathname), { startTime });
                                         break;
                                     }
                                     case 'export': {
@@ -3192,7 +3193,7 @@ class ChromeDocument extends Document {
                                         if (typeof target === 'function') {
                                             target = target.name;
                                         }
-                                        this.formatFail(4 /* LOG_TYPE.PROCESS */, 'EXPORT', ['No records were retrieved', target], emptyResponse(target), { startTime });
+                                        this.formatFail(4, 'EXPORT', ['No records were retrieved', target], emptyResponse(target), { startTime });
                                         break;
                                     }
                                 }
@@ -3244,7 +3245,7 @@ class ChromeDocument extends Document {
                                     throw (0, types_1.errorMessage)('hash', 'Source not found', item.filename);
                                 }
                                 catch (err) {
-                                    this.writeFail(["Unable to read file" /* ERR_MESSAGE.READ_FILE */, item.filename], err, { type: 32 /* LOG_TYPE.FILE */, startTime });
+                                    this.writeFail(["Unable to read file", item.filename], err, { type: 32, startTime });
                                 }
                             default:
                                 if (algorithm) {
@@ -3272,7 +3273,7 @@ class ChromeDocument extends Document {
         const parseSelector = (value) => {
             const items = [];
             const revised = value.replace(useUnsafeCssReplace ? REGEXP_NTHCHILD_UNSAFE : REGEXP_NTHCHILD, (...capture) => {
-                return '`%' + (items.push('\\(' + getStringSome() + (capture[1] === '-' ? '\\x2d' : '\\x2b?') + (capture[2] || '[01]?') + (capture[3] === '0' ? !capture[1] && !capture[2] && !capture[4] && !capture[5] ? '[+-]?0[nN]?' : '0' : '[nN]') + getStringSome() + (capture[5] ? (capture[4] === '-' ? '\\x2d' : '\\x2b') + getStringSome() + capture[5] : `(?:[+-]${getStringSome()}0)?`) + getStringSome() + '\\)') - 1) + '`';
+                return '`%' + (items.push('\\(' + getStringSome() + (capture[1] === '-' ? '\\x2d' : '\\x2b?') + (capture[2] || '[01]?') + (capture[3] === '0' ? !capture[1] && !capture[2] && !capture[4] && !capture[5] ? '[+-]?0[nN]?' : '0' : '[nN]') + getStringSome() + (capture[5] ? (capture[4] === '-' ? '\\x2d' : '\\x2b') + getStringSome() + capture[5] : `(?:[+-]${getStringSome()}0)?`) + (capture[6] ? getStringMany() + '[oO][fF]' + getStringMany() + capture[6].trim() : '') + getStringSome() + '\\)') - 1) + '`';
             });
             let selector = '';
             for (let i = 0, length = revised.length, casing = false, attr = false, quote = false; i < length; i++) {
@@ -3442,7 +3443,7 @@ class ChromeDocument extends Document {
                 pattern.lastIndex = 0;
             };
             replaceBracket(REGEXP_COMMENT);
-            replaceBracket(REGEXP_CONTENT);
+            replaceBracket(REGEXP_QUOTEDVALUE);
             const values = (0, util_1.splitEnclosing)(current, /\burl/gi);
             for (let i = 0, length = values.length; i < length; ++i) {
                 const seg = values[i];
@@ -3683,7 +3684,11 @@ class ChromeDocument extends Document {
         return (_a = this.module).settings || (_a.settings = {});
     }
 }
-ChromeDocument.INTERNAL_ASSIGNUUID = "__assign__" /* PROPERTIES.ASSIGN */;
-ChromeDocument.INTERNAL_SERVERROOT = "__serverroot__" /* PROPERTIES.SERVERROOT */;
+ChromeDocument.INTERNAL_ASSIGNUUID = "__assign__";
+ChromeDocument.INTERNAL_SERVERROOT = "__serverroot__";
+exports.default = ChromeDocument;
 
-module.exports = ChromeDocument;
+if (exports.default) {
+    module.exports = exports.default;
+    module.exports.default = exports.default;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/chrome",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "description": "Chrome document constructor for E-mc.",
   "main": "index.js",
   "publishConfig": {
@@ -8,7 +8,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/anpham6/pi-r.git",
+    "url": "git+https://github.com/anpham6/pi-r.git",
     "directory": "src/module/chrome"
   },
   "keywords": [
@@ -20,9 +20,9 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/cloud": "^0.7.0",
-    "@e-mc/core": "^0.7.0",
-    "@e-mc/document": "^0.7.0",
-    "@e-mc/types": "^0.7.0"
+    "@e-mc/cloud": "^0.7.2",
+    "@e-mc/core": "^0.7.2",
+    "@e-mc/document": "^0.7.2",
+    "@e-mc/types": "^0.7.2"
   }
 }

package/types/index.d.ts

@@ -98,12 +98,12 @@ export interface IChromeDocument<T extends IFileManager<U>, U extends DocumentAs
     formatMap?: ObjectMap<FormatUri>;
     setElementSrc(asset: U, element: IXmlElement, value: string): void;
     findDataValue(name: string): Undef<string>;
-    setInlinedAttributes(processing: FinalizeProcessing<T>): void;
-    applyTransforms(processing: FinalizeProcessing<T>): Promise<void>;
-    rewriteHtml(processing: FinalizeProcessing<T>): Promise<void>;
-    setElementAttributes(processing: FinalizeProcessing<T>, domBase: IDomWriter): Promise<void>;
-    applyDataSource(processing: FinalizeProcessing<T>, domBase: IDomWriter): Promise<void>;
-    setProductionAttributes(processing: FinalizeProcessing<T>): void;
+    setInlinedAttributes(processing: FinalizeProcessing<T, U>): void;
+    applyTransforms(processing: FinalizeProcessing<T, U>): Promise<void>;
+    rewriteHtml(processing: FinalizeProcessing<T, U>): Promise<void>;
+    setElementAttributes(processing: FinalizeProcessing<T, U>, domBase: IDomWriter): Promise<void>;
+    applyDataSource(processing: FinalizeProcessing<T, U>, domBase: IDomWriter): Promise<void>;
+    setProductionAttributes(processing: FinalizeProcessing<T, U>): void;
     removeUnusedStyles(source: string, options?: UserConfig): Undef<string>;
     removeServerRoot(value: string): string;
     replaceContent(source: string, match: RegExpExecArray | string, mimeType?: string): Undef<string>;