@pi-r/chrome 0.8.0 → 0.8.2

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

@@ -19,7 +19,6 @@ const CACHE_CONTENT = new Map();
 const CACHE_FORMAT = new Map();
 const CACHE_DATASET = {};
 const CACHE_ATRULES = {};
-let CACHE_TOTAL = 0;
 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 + '+'];
@@ -36,7 +35,7 @@ const REGEXP_SRCSETSIZE = /~\s*([\d.]+)\s*([wx])/i;
 const REGEXP_TEMPLATECONDITIONAL = /(\n\s+)?\{\{if\s+((?:[^}]|}(?!}))+?)\}\}(\s*)(.*?)(?:\s*\{\{else(?:\s+if\s+((?:[^}]|}(?!}))+?))?\}\}(\s*)(.*?)\s*)?\s*\{\{end\}\}/gs;
 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*)?\))/gd;
+const REGEXP_IMPORTMODULE = /(?:(?:^|[\n;]+)\s*import\s+(?:("(?:[^"]|(?<=\\)")+"|'(?:[^']|(?<=\\)')+')|.+?from\s+("(?:[^"]|(?<=\\)")+"|'(?:[^']|(?<=\\)')+')(?:[ \t]+(?:assert|with)[ \t]+\{((?:"(?:[^"]|(?<=\\)")+"|'(?:[^']|(?<=\\)')+'|`(?:[^`]|(?<=\\)`)+`|{[^{]*{|{[^}]*}|}[^}]*}|[^"'`]+)+)\})?)|\bimport\(\s*("(?:[^"]|(?<=\\)")+"|'(?:[^']|(?<=\\)')+')\s*(?:,\s*\{((?:"(?:[^"]|(?<=\\)")+"|'(?:[^']|(?<=\\)')+'|`(?:[^`]|(?<=\\)`)+`|{[^{]*{|{[^}]*}|}[^}]*}|[^"'`]+)+)\}\s*)?\))/gd;
 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_QUOTEDVALUE = new RegExp(`\\b(?:@import${PATTERN_STRING_MANY}|content${PATTERN_STRING_SOME}:${PATTERN_STRING_SOME})(?:"[^"]*"|'[^']*')`, 'gi');
@@ -98,7 +97,7 @@ function getObjectValue(value, key) {
                     }
                 }
             }
-            if (value !== undefined && value !== null) {
+            if (value != null) {
                 found = true;
                 continue;
             }
@@ -164,9 +163,6 @@ function getCacheItem(map, key) {
     }
 }
 function addCacheItem(map, key, data, timeout) {
-    if (!map.has(key)) {
-        ++CACHE_TOTAL;
-    }
     map.set(key, [
         Date.now(),
         data,
@@ -180,7 +176,6 @@ function deleteCacheItem(map, key) {
     if (item) {
         clearTimeout(item[2]);
         map.delete(key);
-        --CACHE_TOTAL;
     }
 }
 function spliceSource(source, startIndex, endIndex, pattern, leading = '', trailing = '', content = '') {
@@ -282,12 +277,17 @@ function isTruthy(data, attr, falsey) {
     return falsey ? !value : !!value;
 }
 function hasSameOrigin(value, ...other) {
+    if (typeof value === 'string') {
+        try {
+            value = new URL(value);
+        }
+        catch {
+            return null;
+        }
+    }
     for (let url of other) {
         if (url) {
             try {
-                if (typeof value === 'string') {
-                    value = new URL(value);
-                }
                 if (typeof url === 'string') {
                     url = new URL(url);
                 }
@@ -355,7 +355,7 @@ function createHash(host, file, hash, bufferMap) {
                 if (localUri) {
                     bufferMap[localUri] = buffer;
                 }
-                host.rename(file, (0, util_1.appendSuffix)(filename, length ? value.substring(0, length) : value));
+                host.rename(file, (0, util_1.appendSuffix)(filename, length > 0 ? value.substring(0, length) : value));
                 return file.filename;
             }
         }
@@ -385,7 +385,6 @@ function getSrcURL(instance, parent, file) {
     if (parentDir === assetDir) {
         return [file.filename, true];
     }
-    const splitPath = (value) => value.split(/[\\/]/).filter(segment => segment.trim());
     const prefix = splitPath(parentDir);
     const suffix = splitPath(assetDir);
     let found;
@@ -588,7 +587,7 @@ function transformURL(instance, host, parent, type, source, importFile) {
             if (asset && asset !== importFile) {
                 if (!(0, util_1.hasValue)(asset.format, 'base64')) {
                     if (asset.bundleReplace) {
-                        let k, valid;
+                        let k = 0, valid;
                         if (!isText) {
                             let j = startIndex;
                             while (isSpace(source[--j])) { }
@@ -674,7 +673,7 @@ function getFormatUUID(instance, attr, ext) {
 function setLocationUUID(instance, data, file, ext) {
     const { pathname, filename } = data;
     const assignUUID = ChromeDocument.INTERNAL_ASSIGNUUID;
-    let index, modified;
+    let index = 0, modified;
     if (filename) {
         ext ||= path.extname(filename).substring(1);
         if ((index = filename.indexOf(assignUUID)) !== -1) {
@@ -842,7 +841,7 @@ function loadLocalFile(instance, item, pathname, cacheData, encoding, out) {
     }
     content ||= fs.readFileSync(pathname, encoding);
     const result = instance.tryParse(content, ext);
-    if (result !== undefined && result !== null) {
+    if (result != null) {
         setCacheData(instance, item, result, pathname, cacheData, true);
         return result;
     }
@@ -850,7 +849,7 @@ function loadLocalFile(instance, item, pathname, cacheData, encoding, out) {
 function setCacheData(instance, item, data, dataKey, cacheData, template) {
     if ((0, types_1.isObject)(data) || template) {
         const cache = instance.settingsOf(item.source, template && item.source !== 'local' ? 'local_file' : 'cache');
-        let timeout;
+        let timeout = 0;
         if (cache && (timeout = core_1.ClientDb.getTimeout(cache)) && timeout > 0) {
             addCacheItem(template ? CACHE_LOCALFILE : CACHE_DBRESULT, dataKey, data, timeout);
         }
@@ -895,6 +894,11 @@ function removeElement(instance, domBase, item, element) {
         }
     }
 }
+function removeWatchReload(item) {
+    if ((0, types_1.isObject)(item.watch) && 'reload' in item.watch) {
+        delete item.watch.reload;
+    }
+}
 function errorCredential(instance, domBase, item, err) {
     removeElement(instance, domBase, item);
     const pkg = getPackageName(err);
@@ -907,6 +911,7 @@ const replaceMatch = dom_1.DomWriter.replaceMatch.bind(dom_1.DomWriter);
 const getNewlineString = dom_1.DomWriter.getNewlineString.bind(dom_1.DomWriter);
 const getBuffer = (item, localUri) => item.sourceUTF8 || item.buffer || ((localUri ||= item.localUri) && Document.isPath(localUri) ? fs.readFileSync(localUri, item.encoding) : null);
 const hasSourceMap = (metadata, value) => (0, types_1.isObject)(metadata) && metadata.__sourcemap__ === value;
+const splitPath = (value) => value.split(/[\\/]/).filter(segment => segment.trim());
 const isBundled = (value, main) => typeof value === 'number' && (value > 0 || main && value === 0);
 const isFont = (value) => value === 'truetype' || value === 'opentype' || value === 'woff' || value === 'woff2';
 const isImage = (value) => typeof value === 'string' && value.startsWith('image/') && value !== "image/svg+xml";
@@ -929,13 +934,13 @@ class ChromeDocument extends Document {
             parent = limit;
             limit = 0;
         }
+        const total = CACHE_LOCALFILE.size + CACHE_DBRESULT.size;
         let result = 0;
-        if ((limit === 0 || CACHE_TOTAL >= limit) && percent > 0) {
+        if ((limit === 0 || total >= limit) && percent > 0) {
             if (percent >= 1) {
-                result += CACHE_DBRESULT.size + CACHE_LOCALFILE.size;
+                result += total;
                 CACHE_DBRESULT.clear();
                 CACHE_LOCALFILE.clear();
-                CACHE_TOTAL = 0;
             }
             else {
                 const stored = [];
@@ -950,7 +955,6 @@ class ChromeDocument extends Document {
                     const [map, key] = stored[i];
                     deleteCacheItem(map, key);
                 }
-                CACHE_TOTAL = stored.length - result;
             }
             CACHE_QUERY.clear();
             CACHE_SELECTOR.clear();
@@ -1684,7 +1688,7 @@ class ChromeDocument extends Document {
                                         const from = trimQuote(match[idx]);
                                         const quote = output[a];
                                         const relative = /^\.{0,2}\//.test(from);
-                                        if (assert && /\btype\s*:\s*(["'`])css\1/.test(assert)) {
+                                        if (assert && /\btype\s*:\s*(["'`])(?:css|json)\1/.test(assert)) {
                                             try {
                                                 const asset = host.findAsset(relative ? new URL(from, uri) : from);
                                                 if (asset) {
@@ -1731,7 +1735,6 @@ class ChromeDocument extends Document {
                     break;
                 case "text/css":
                     if (file.editing) {
-                        const htmlFile = this.htmlFile;
                         const bundleId = file.bundleId;
                         if (!(0, types_1.isEmpty)(bundleId)) {
                             for (const asset of this.assets) {
@@ -1745,8 +1748,8 @@ class ChromeDocument extends Document {
                                 }
                             }
                         }
-                        if (trailing && htmlFile) {
-                            const output = transformURL(this, host, file, 'css', trailing, htmlFile);
+                        if (trailing && this.htmlFile) {
+                            const output = transformURL(this, host, file, 'css', trailing, this.htmlFile);
                             if (output) {
                                 trailing = output;
                             }
@@ -1871,9 +1874,8 @@ class ChromeDocument extends Document {
         this._cloudUrlMap = Object.create(null);
         this._cloudUploaded = new Set();
         this._cloudEndpoint = null;
-        const htmlFile = this.htmlFile;
-        if (htmlFile) {
-            const endpoint = instance.getStorage('upload', htmlFile.cloudStorage)?.upload?.endpoint;
+        if (this.htmlFile) {
+            const endpoint = instance.getStorage('upload', this.htmlFile.cloudStorage)?.upload?.endpoint;
             if (endpoint) {
                 this._cloudEndpoint = new RegExp((0, types_1.escapePattern)(Document.toPosix(endpoint)) + '/', 'g');
             }
@@ -1912,7 +1914,7 @@ class ChromeDocument extends Document {
         if (this.aborted) {
             return (0, types_1.createAbortError)(true);
         }
-        const { host, instance, localStorage } = state;
+        const { host, instance } = state;
         const htmlFile = this.htmlFile;
         const preferBuffer = process.env.EMC_CLOUD_UPLOAD_BUFFER === 'true';
         const checkDocument = (item) => {
@@ -1923,7 +1925,7 @@ class ChromeDocument extends Document {
                     const inlineUrlCloud = item.inlineUrlCloudMap[id];
                     if (inlineUrlCloud && !this._cloudUploaded.has(id)) {
                         output = (output || source).replace(new RegExp((0, types_1.escapePattern)(id), 'g'), inlineUrlCloud);
-                        localStorage.delete(this._cloudUrlMap[id]);
+                        state.localStorage.delete(this._cloudUrlMap[id]);
                     }
                 }
                 if (output && output !== source) {
@@ -2086,10 +2088,9 @@ class ChromeDocument extends Document {
                 if ((0, util_1.hasValue)(file.format, 'srcset')) {
                     const srcset = element.getAttribute('srcset');
                     if (srcset) {
-                        const htmlFile = this.htmlFile;
                         const uri = Document.toPosix(file.uri);
                         const items = new Set([uri]);
-                        const baseHref = getBaseURLs(htmlFile, this.baseUrl);
+                        const baseHref = getBaseURLs(this.htmlFile, this.baseUrl);
                         const sameOrigin = hasSameOrigin(file.url || uri, ...baseHref);
                         if (sameOrigin) {
                             const src = element.getAttribute('src');
@@ -2152,7 +2153,7 @@ class ChromeDocument extends Document {
                 }
             }
             if (productionRelease) {
-                const { inlineUrl, inlineUrlCloud, imported, hash } = item;
+                const { inlineUrl, inlineUrlCloud, hash } = item;
                 if (inlineUrl || inlineUrlCloud) {
                     const filename = hash && createHash(host, item, hash, bufferMap);
                     if (filename) {
@@ -2180,16 +2181,16 @@ class ChromeDocument extends Document {
                     }
                     hashed.add(item);
                 }
-                else if (hash && (!item.editing || imported) && createHash(host, item, hash, bufferMap)) {
+                else if (hash && (!item.editing || item.imported) && createHash(host, item, hash, bufferMap)) {
                     hashed.add(item);
                 }
             }
         }
     }
     async applyTransforms(processing) {
-        const { host, hashed, bufferMap, productionRelease } = processing;
+        const host = processing.host;
         const sanitizeSource = (item, source) => {
-            if (productionRelease) {
+            if (processing.productionRelease) {
                 replaceCss(this, item);
             }
             const output = replaceHtml(this, source, processing, item.inlineUrlMap);
@@ -2236,8 +2237,8 @@ class ChromeDocument extends Document {
                 }
             }
             item.sourceUTF8 = source;
-            if (productionRelease && item.hash && !hashed.has(item) && createHash(host, item, item.hash, bufferMap)) {
-                hashed.add(item);
+            if (processing.productionRelease && item.hash && !processing.hashed.has(item) && createHash(host, item, item.hash, processing.bufferMap)) {
+                processing.hashed.add(item);
             }
         }
         for (const item of this.cssFiles) {
@@ -2292,6 +2293,7 @@ class ChromeDocument extends Document {
             }
         }
         return Promise.allSettled(tasks).then(items => {
+            const productionRelease = processing.productionRelease;
             for (let i = 0, length = items.length, value; i < length; ++i) {
                 const item = items[i];
                 if (item.status === 'fulfilled' && (value = item.value)) {
@@ -2314,7 +2316,7 @@ class ChromeDocument extends Document {
         });
     }
     async rewriteHtml(processing) {
-        const { host, startTime, cacheMiss, productionRelease } = processing;
+        const { host, startTime, cacheMiss } = processing;
         const { moduleName, config } = this;
         const htmlFile = this.htmlFile;
         const localUri = htmlFile.localUri;
@@ -2333,7 +2335,7 @@ class ChromeDocument extends Document {
         if ((0, types_1.isArray)(config.ignoreServerCodeBlocks)) {
             domBase.ignoreTag(config.ignoreServerCodeBlocks);
         }
-        if (productionRelease) {
+        if (processing.productionRelease) {
             replaceCss(this, htmlFile);
         }
         await this.setElementAttributes(processing, domBase);
@@ -2370,15 +2372,14 @@ class ChromeDocument extends Document {
         if ((0, types_1.isString)(config.stripCommentsAndCDATA)) {
             source = dom_1.DomWriter.getCommentsAndCDATA(source, config.stripCommentsAndCDATA, true, true);
         }
-        const format = htmlFile.format;
-        if (format) {
+        if (htmlFile.format) {
             const { filename, uri, encoding, metadata } = htmlFile;
-            const result = await this.transform('html', source, format, {
+            const result = await this.transform('html', source, htmlFile.format, {
                 pathname: path.dirname(localUri),
                 filename,
                 mimeType: "text/html",
                 metadata: Object.assign({ '__fromhtml__': true, ...this.config }, metadata),
-                cacheData: !productionRelease || this.productionIncremental ? { uri, encoding } : undefined
+                cacheData: !processing.productionRelease || this.productionIncremental ? { uri, encoding } : undefined
             });
             if (result) {
                 source = result.code;
@@ -2411,15 +2412,12 @@ class ChromeDocument extends Document {
         htmlFile.sourceUTF8 = source;
     }
     async setElementAttributes({ host, startTime, productionRelease }, domBase) {
-        const { moduleName, htmlFile } = this;
-        const cloud = host.Cloud;
-        const removeWatchReload = (item) => (0, types_1.isObject)(item.watch) && delete item.watch.reload;
         for (const item of this.assets) {
             const { element, inlineContent } = item;
             if (!element || element.removed || isRemoved(item) || isUnedited(item) || (0, types_1.ignoreFlag)(item.flags) && !(0, types_1.processFlag)(item.flags)) {
                 continue;
             }
-            const domElement = new dom_1.HtmlElement(moduleName, element, item.attributes);
+            const domElement = new dom_1.HtmlElement(this.moduleName, element, item.attributes);
             if (inlineContent) {
                 let [innerXml, sourceMappingURL, inlineMap] = transform_1.SourceMap.removeSourceMappingURL(host.getUTF8String(item).trim());
                 if (sourceMappingURL && !inlineMap && item.localUri) {
@@ -2445,10 +2443,10 @@ class ChromeDocument extends Document {
                         uri = '';
                     }
                 }
-                if (uri && !(0, util_1.hasValue)(item.format, 'crossorigin') && item !== htmlFile) {
-                    if (cloud?.getStorage('upload', item.cloudStorage)) {
+                if (uri && !(0, util_1.hasValue)(item.format, 'crossorigin') && item !== this.htmlFile) {
+                    if (host.Cloud?.getStorage('upload', item.cloudStorage)) {
                         const inlineUrlCloud = item.inlineUrlCloud ||= (0, crypto_1.randomUUID)();
-                        (htmlFile.inlineUrlCloudMap ||= {})[inlineUrlCloud] = productionRelease ? this.removeServerRoot(uri) : uri;
+                        (this.htmlFile.inlineUrlCloudMap ||= {})[inlineUrlCloud] = productionRelease ? this.removeServerRoot(uri) : uri;
                         uri = inlineUrlCloud;
                     }
                     if (!(0, util_1.hasValue)(item.format, 'webbundle')) {
@@ -2537,8 +2535,6 @@ class ChromeDocument extends Document {
         if (this.dataSource.length === 0) {
             return;
         }
-        const db = this.Db;
-        const cloud = host.Cloud;
         const sessionKey = (0, crypto_1.randomUUID)();
         const cacheData = Object.create(null);
         const dataItems = [];
@@ -2588,6 +2584,8 @@ class ChromeDocument extends Document {
             return Array.isArray(data) ? data : (0, types_1.isObject)(data) ? [data] : null;
         };
         const setElements = async (sourceSet) => {
+            const db = this.Db;
+            const cloud = host.Cloud;
             const batchMap = Object.create(null);
             const batchGroup = [];
             for (const item of sourceSet) {
@@ -3058,7 +3056,7 @@ class ChromeDocument extends Document {
                             const data = items[index];
                             items = data ? [data] : [];
                         }
-                        else if (limit !== undefined && limit > 0 && items.length > limit) {
+                        else if (typeof limit === 'number' && limit > 0 && items.length > limit) {
                             items = items.slice(0, limit);
                         }
                         if (postQuery) {
@@ -3068,7 +3066,7 @@ class ChromeDocument extends Document {
                             }
                         }
                         if (items.length > 0 && !item.transactionFail) {
-                            const { element, preRender } = item;
+                            const element = item.element;
                             const domElement = new dom_1.HtmlElement(this.moduleName, element);
                             let value = '';
                             const checkValue = async (name) => {
@@ -3163,8 +3161,8 @@ class ChromeDocument extends Document {
                                                     value += trimTemplate(segment);
                                                 }
                                             }
-                                            if (preRender) {
-                                                await checkValue(preRender);
+                                            if (item.preRender) {
+                                                await checkValue(item.preRender);
                                             }
                                             const { leadingText, trailingText } = item;
                                             if (leadingText) {
@@ -3239,8 +3237,8 @@ class ChromeDocument extends Document {
                                                     }
                                                 }
                                                 if (valid) {
-                                                    if (preRender) {
-                                                        await checkValue(preRender);
+                                                    if (item.preRender) {
+                                                        await checkValue(item.preRender);
                                                     }
                                                     domElement.setAttribute(attr, value);
                                                 }
@@ -3470,14 +3468,13 @@ class ChromeDocument extends Document {
         }
         const queryMap = useSessionCache ? CACHE_QUERY : this._queryMap;
         const selectorMap = useSessionCache ? CACHE_SELECTOR : this._selectorMap;
+        const [stringSome, stringMany] = useUnsafeCssReplace ? ['\\s*', '\\s+'] : [PATTERN_STRING_SOME, PATTERN_STRING_MANY];
         const replaceMap = [];
-        const getStringSome = () => useUnsafeCssReplace ? '\\s*' : PATTERN_STRING_SOME;
-        const getStringMany = () => useUnsafeCssReplace ? '\\s+' : PATTERN_STRING_MANY;
         let current = source, modified, checkEmpty, match;
         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)?`) + (capture[6] ? getStringMany() + '[oO][fF]' + getStringMany() + capture[6].trim() : '') + getStringSome() + '\\)') - 1) + '`';
+                return '`%' + (items.push('\\(' + stringSome + (capture[1] === '-' ? '\\x2d' : '\\x2b?') + (capture[2] || '[01]?') + (capture[3] === '0' ? !capture[1] && !capture[2] && !capture[4] && !capture[5] ? '[+-]?0[nN]?' : '0' : '[nN]') + stringSome + (capture[5] ? (capture[4] === '-' ? '\\x2d' : '\\x2b') + stringSome + capture[5] : `(?:[+-]${stringSome}0)?`) + (capture[6] ? stringMany + '[oO][fF]' + stringMany + capture[6].trim() : '') + stringSome + '\\)') - 1) + '`';
             });
             let selector = '';
             for (let i = 0, length = revised.length, casing = false, attr = false, quote = false; i < length; i++) {
@@ -3553,13 +3550,13 @@ class ChromeDocument extends Document {
                 selector += (space & 1 ? '`%%`' : '') + (!casing && ch >= 'a' && ch <= 'z' ? '`' + ch + ch.toUpperCase() + '`' : ch) + (space & 2 ? '`%%`' : '');
             }
             selector = (0, types_1.escapePattern)(selector)
-                .replace(/\s*(>|~(?!=)|\\\+|\\\*(?!=)])\s*/g, (...capture) => getStringSome() + capture[1] + getStringSome())
+                .replace(/\s*(>|~(?!=)|\\\+|\\\*(?!=)])\s*/g, (...capture) => stringSome + capture[1] + stringSome)
                 .replace(/`([a-z][A-Z]|%{2,4})`/g, (...capture) => {
                 switch (capture[1]) {
                     case '%%':
-                        return getStringSome();
+                        return stringSome;
                     case '%%%':
-                        return `(?:["']|${getStringSome()})`;
+                        return `(?:["']|${stringSome})`;
                     case '%%%%':
                         return '\\\\{0,}';
                     default:
@@ -3569,7 +3566,7 @@ class ChromeDocument extends Document {
             for (let i = 0, length = revised.length; i < length; ++i) {
                 selector = selector.replace('`%' + i + '`', items[i]);
             }
-            return selector.replace(/ +/g, getStringMany()) + getStringSome();
+            return selector.replace(/ +/g, stringMany) + stringSome;
         };
         const replaceUnunsed = (name, items, nesting, increment = 1) => {
             for (let i = 0; i < items.length; i += increment) {
@@ -3601,9 +3598,9 @@ class ChromeDocument extends Document {
                         flags = 'g';
                     }
                     else if (name === 'scope') {
-                        selector = `\\(${getStringSome() + parseSelector(value)}\\)`;
+                        selector = `\\(${stringSome + parseSelector(value)}\\)`;
                         if (valueTo) {
-                            selector += `${getStringMany()}[tT][oO]${getStringMany()}\\(${getStringSome() + parseSelector(valueTo)}\\)`;
+                            selector += `${stringMany}[tT][oO]${stringMany}\\(${stringSome + parseSelector(valueTo)}\\)`;
                         }
                         flags = 'g';
                         revised = true;
@@ -3612,22 +3609,22 @@ class ChromeDocument extends Document {
                         const startIndex = value.indexOf('(');
                         const endIndex = value.lastIndexOf(')');
                         if (startIndex !== -1 && endIndex !== -1) {
-                            selector = '[sS][eE][lL][eE][cC][tT][oO][rR]\\(' + getStringSome() + parseSelector(value.substring(startIndex + 1, endIndex)) + '\\)';
+                            selector = '[sS][eE][lL][eE][cC][tT][oO][rR]\\(' + stringSome + parseSelector(value.substring(startIndex + 1, endIndex)) + '\\)';
                             flags = 'g';
                             revised = true;
                         }
                     }
                     if (!revised) {
                         selector = (0, types_1.escapePattern)(selector || value)
-                            .replace(/\s*(\\[()])\s*/g, (...capture) => getStringSome() + capture[1] + getStringSome())
-                            .replace(/:\s+/g, getStringSome() + ':' + getStringSome())
-                            .replace(/\s+([<>/]|<=|>=|\\\*)\s+/g, (...capture) => getStringSome() + capture[1] + getStringSome())
-                            .replace(/ +/g, getStringMany());
+                            .replace(/\s*(\\[()])\s*/g, (...capture) => stringSome + capture[1] + stringSome)
+                            .replace(/:\s+/g, stringSome + ':' + stringSome)
+                            .replace(/\s+([<>/]|<=|>=|\\\*)\s+/g, (...capture) => stringSome + capture[1] + stringSome)
+                            .replace(/ +/g, stringMany);
                         if (flags === 'g') {
                             selector = selector.replace(/`([a-z][A-Z])`/g, (...capture) => `[${capture[1]}]`);
                         }
                     }
-                    pattern = new RegExp('(\\s*)@' + (flags === 'g' ? name.split('').map(ch => `[${ch + ch.toUpperCase()}]`).join('') : name) + getStringMany() + selector + getStringSome() + '{', flags);
+                    pattern = new RegExp('(\\s*)@' + (flags === 'g' ? name.split('').map(ch => `[${ch + ch.toUpperCase()}]`).join('') : name) + stringMany + selector + stringSome + '{', flags);
                     queryMap.set(key, pattern);
                 }
                 else {
@@ -3702,9 +3699,9 @@ class ChromeDocument extends Document {
                         const pattern = selectorMap.get(key);
                         let single, group;
                         if (!pattern) {
-                            const selector = parseSelector(value) + (child ? `(?:${getStringSome()}&${getStringSome()})*` : '');
-                            single = new RegExp(`(^|;)(${getStringSome()})(?<!${child ? '&|' : ''}@[^};]*)${selector}\\{$`);
-                            group = new RegExp(`((?:^|;)[^{]*?${getStringSome()}(,${getStringSome()}|(?<!@[^};]*)))(${(child ? '(?:&\\s+|(?<!&))' : '') + selector})(,[^{]*)?\\{$`, 'g');
+                            const selector = parseSelector(value) + (child ? `(?:${stringSome}&${stringSome})*` : '');
+                            single = new RegExp(`(^|;)(${stringSome})(?<!${child ? '&|' : ''}@[^};]*)${selector}\\{$`);
+                            group = new RegExp(`((?:^|;)[^{]*?${stringSome}(,${stringSome}|(?<!@[^};]*)))(${(child ? '(?:&\\s+|(?<!&))' : '') + selector})(,[^{]*)?\\{$`, 'g');
                             selectorMap.set(key, [single, group]);
                         }
                         else {
@@ -3838,7 +3835,7 @@ class ChromeDocument extends Document {
         }
         if (modified) {
             for (const name in checkEmpty) {
-                const pattern = CACHE_ATRULES[name + (useUnsafeCssReplace ? '_1' : '')] ||= new RegExp(`(\\s*)@${name}[^{]*{${getStringSome()}}` + dom_1.DomWriter.PATTERN_TRAILINGSPACE, 'gi');
+                const pattern = CACHE_ATRULES[name + (useUnsafeCssReplace ? '_1' : '')] ||= new RegExp(`(\\s*)@${name}[^{]*{${stringSome}}` + dom_1.DomWriter.PATTERN_TRAILINGSPACE, 'gi');
                 while (match = pattern.exec(current)) {
                     current = spliceSource(current, match.index, getEndIndex(match), pattern, match[1], match[2]);
                 }

package/package.json

@@ -1,29 +1,29 @@
-{
-  "name": "@pi-r/chrome",
-  "version": "0.8.0",
-  "description": "Chrome document constructor for E-mc.",
-  "main": "index.js",
-  "types": "index.d.ts",
-  "publishConfig": {
-    "access": "public"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/anpham6/pi-r.git",
-    "directory": "src/module/chrome"
-  },
-  "keywords": [
-    "squared",
-    "e-mc",
-    "squared-functions"
-  ],
-  "author": "An Pham <anpham6@gmail.com>",
-  "license": "MIT",
-  "homepage": "https://github.com/anpham6/pi-r#readme",
-  "dependencies": {
-    "@e-mc/cloud": "^0.10.0",
-    "@e-mc/core": "^0.10.0",
-    "@e-mc/document": "^0.10.0",
-    "@e-mc/types": "^0.10.0"
-  }
-}
+{
+  "name": "@pi-r/chrome",
+  "version": "0.8.2",
+  "description": "Chrome document constructor for E-mc.",
+  "main": "index.js",
+  "types": "index.d.ts",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/anpham6/pi-r.git",
+    "directory": "src/module/chrome"
+  },
+  "keywords": [
+    "squared",
+    "e-mc",
+    "squared-functions"
+  ],
+  "author": "An Pham <anpham6@gmail.com>",
+  "license": "MIT",
+  "homepage": "https://github.com/anpham6/pi-r#readme",
+  "dependencies": {
+    "@e-mc/cloud": "^0.10.2",
+    "@e-mc/core": "^0.10.2",
+    "@e-mc/document": "^0.10.2",
+    "@e-mc/types": "^0.10.2"
+  }
+}

package/types/squared.d.ts

@@ -29,7 +29,6 @@ interface ConditionProperty {
 
 interface CssConditionData extends ConditionProperty {
     name?: string;
-    conditionText: string;
 }
 
 export interface UserAgentData {