@pi-r/chrome 0.3.4 → 0.3.6

package/LICENSE

@@ -1,7 +1,7 @@
-Copyright 2024 An Pham
-
-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:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
+Copyright 2023 An Pham
+
+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:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/README.md

@@ -1,7 +1,5 @@
-# @pi-r/chrome
-
-PEP 402 - Forever
-
-## LICENSE
-
+# @pi-r/chrome
+
+## 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

@@ -11,6 +11,9 @@ const transform_1 = require("@e-mc/document/transform");
 const Document = require('@e-mc/document');
 const CACHE_DBRESULT = new Map();
 const CACHE_LOCALFILE = new Map();
+const CACHE_ETAG = new Map();
+const CACHE_CONTENT = new Map();
+const CACHE_FORMAT = new Map();
 const CACHE_DATASET = {};
 const CACHE_ATRULES = {};
 let CACHE_TOTAL = 0;
@@ -43,13 +46,9 @@ const REGEXP_VARIABLES_UNSAFE = new RegExp(`(\\s*)(--[^\\s:]*)\\s*:[^;}]*([;}])`
 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_KEYFRAMES_UNSAFE = /(\s*)@keyframes\s+([^{]+){/gi;
-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;
-const REGEXP_TEMPLATE_TRAILING = /\{\{((?:[^}]|}(?!}))+?)\s*? -\}\}\s*/g;
 function removeNamespace(name, source, newline, comments) {
     if (source.indexOf('-' + name) !== -1) {
-        const [a, b, c, d, e] = CACHE_DATASET[name] || (CACHE_DATASET[name] = [
+        const dataset = CACHE_DATASET[name] || (CACHE_DATASET[name] = [
             new RegExp(`(\\s*)<(script|style)(${dom_1.DomWriter.PATTERN_TAGOPEN}+)>[\\S\\s]*?<\\/\\2\\s*>` + dom_1.DomWriter.PATTERN_TRAILINGSPACE, 'gi'),
             new RegExp(`(\\s*)<link(${dom_1.DomWriter.PATTERN_TAGOPEN}+)>` + dom_1.DomWriter.PATTERN_TRAILINGSPACE, 'gi'),
             new RegExp(`\\s+data-${name}-[a-z-]+\\s*` + dom_1.DomWriter.PATTERN_ATTRVALUE, 'g'),
@@ -57,26 +56,24 @@ function removeNamespace(name, source, newline, comments) {
             new RegExp(`data-${name}-template\\s*` + dom_1.DomWriter.PATTERN_ATTRVALUE)
         ]);
         source = source
-            .replace(a, (...capture) => d.test(capture[3]) || e.test(capture[3]) ? getNewlineString(capture[1], capture[7], newline) : capture[0])
-            .replace(b, (...capture) => d.test(capture[2]) ? getNewlineString(capture[1], capture[6], newline) : capture[0])
-            .replace(c, '');
+            .replace(dataset[0], (...capture) => dataset[3].test(capture[3]) || dataset[4].test(capture[3]) ? getNewlineString(capture[1], capture[7], newline) : capture[0])
+            .replace(dataset[1], (...capture) => dataset[3].test(capture[2]) ? getNewlineString(capture[1], capture[6], newline) : capture[0])
+            .replace(dataset[2], '');
     }
     return (0, types_1.isArray)(comments) ? source.replace(REGEXP_BLOCKEXCLUDE, (...capture) => getNewlineString(capture[1], capture[2], newline)) : source;
 }
 function getObjectValue(value, key) {
-    REGEXP_OBJECT_NAME.lastIndex = 0;
+    const pattern = /([^[.\s]+)((?:\s*\[[^\]]+\]\s*)+)?\s*\.?\s*/g;
     let found, match;
-    while (match = REGEXP_OBJECT_NAME.exec(key)) {
+    while (match = pattern.exec(key)) {
         if ((0, types_1.isObject)(value)) {
             value = value[match[1]];
-            const name = match[2];
-            if (name) {
-                REGEXP_OBJECT_SUBSCRIPT.lastIndex = 0;
+            if (match[2]) {
+                const subscript = /\[\s*(["'])?(.+?)\1\s*\]/g;
                 let index;
-                while (index = REGEXP_OBJECT_SUBSCRIPT.exec(name)) {
-                    const quote = index[1];
-                    const attr = quote ? index[2] : index[2].trim();
-                    if (quote && (0, types_1.isObject)(value) || /^\d+$/.test(attr) && (typeof value === 'string' || (0, types_1.isObject)(value))) {
+                while (index = subscript.exec(match[2])) {
+                    const attr = index[1] ? index[2] : index[2].trim();
+                    if (index[1] && (0, types_1.isObject)(value) || /^\d+$/.test(attr) && (typeof value === 'string' || (0, types_1.isObject)(value))) {
                         value = value[attr];
                     }
                     else {
@@ -94,14 +91,14 @@ function getObjectValue(value, key) {
     return found ? value : null;
 }
 function trimTemplate(value) {
-    REGEXP_TEMPLATE_LEADING.lastIndex = 0;
+    const leading = /\s*\{\{- \s*((?:[^}]|}(?!}))+?)\}\}/g;
     let match;
-    while (match = REGEXP_TEMPLATE_LEADING.exec(value)) {
-        value = replaceMatch(match, value, 1, REGEXP_TEMPLATE_LEADING);
+    while (match = leading.exec(value)) {
+        value = replaceMatch(match, value, 1, leading);
     }
-    REGEXP_TEMPLATE_TRAILING.lastIndex = 0;
-    while (match = REGEXP_TEMPLATE_TRAILING.exec(value)) {
-        value = replaceMatch(match, value, 1, REGEXP_TEMPLATE_TRAILING);
+    const trailing = /\{\{((?:[^}]|}(?!}))+?)\s*? -\}\}\s*/g;
+    while (match = trailing.exec(value)) {
+        value = replaceMatch(match, value, 1, trailing);
     }
     return value;
 }
@@ -179,15 +176,15 @@ function hasCondition(data, condition) {
     }
     let match = REGEXP_TEMPLATEMATCH.exec(condition.trim());
     if (match) {
-        const comparison = match[2];
-        if (comparison) {
+        if (match[2]) {
             const join = match[1];
+            const comparison = match[2];
             const items = [];
             while (match = REGEXP_TEMPLATECOMPARISON.exec(comparison)) {
                 if (items.length && !isSpace(match[0][0])) {
                     return false;
                 }
-                items.push([match[1], match[2], match[3]]);
+                items.push([match[1], trimQuote(match[2]), trimQuote(match[3])]);
             }
             REGEXP_TEMPLATECOMPARISON.lastIndex = 0;
             const length = items.length;
@@ -286,14 +283,17 @@ function hasSameOrigin(value, ...other) {
     return false;
 }
 function restoreSearchParams(value, prefix = '__sqd') {
-    if ((value === null || value === void 0 ? void 0 : value.indexOf(prefix)) !== -1) {
-        const params = new URLSearchParams(value);
-        params.forEach((_, key) => key.startsWith(prefix) && params.delete(key));
-        if (value = params.toString()) {
-            return '?' + value;
+    if (value) {
+        if (value.indexOf(prefix) !== -1) {
+            const params = new URLSearchParams(value);
+            params.forEach((_, key) => key.startsWith(prefix) && params.delete(key));
+            if (value = params.toString()) {
+                return '?' + value;
+            }
         }
+        return value;
     }
-    return value || '';
+    return '';
 }
 function getBaseURLs(asset, baseUrl) {
     const result = [];
@@ -323,27 +323,26 @@ function getBaseURLs(asset, baseUrl) {
 }
 function createHash(host, file, bufferMap) {
     const hash = file.hash;
-    if (!hash) {
-        return;
-    }
-    const { filename, localUri } = file;
-    try {
-        const buffer = localUri && bufferMap[localUri] || getBuffer(file);
-        if (buffer) {
-            const [algorithm, length] = (0, util_1.getHashData)(hash);
-            let value;
-            if (algorithm && (value = Document.asHash(buffer, { algorithm, encoding: file.encoding }))) {
-                if (localUri) {
-                    bufferMap[localUri] = buffer;
+    if (hash) {
+        try {
+            const localUri = file.localUri;
+            const buffer = localUri && bufferMap[localUri] || getBuffer(file);
+            if (buffer) {
+                const [algorithm, length] = (0, util_1.getHashData)(hash);
+                let value;
+                if (algorithm && (value = Document.asHash(buffer, { algorithm, encoding: file.encoding }))) {
+                    if (localUri) {
+                        bufferMap[localUri] = buffer;
+                    }
+                    host.rename(file, (0, util_1.appendSuffix)(file.filename, length ? value.substring(0, length) : value));
+                    return file.filename;
                 }
-                host.rename(file, (0, util_1.appendSuffix)(filename, length ? value.substring(0, length) : value));
-                return file.filename;
             }
+            throw (0, types_1.errorMessage)('hash', 'Source not found', file.filename);
+        }
+        catch (err) {
+            host.writeFail(["Unable to read file", file.filename], err, 32);
         }
-        throw (0, types_1.errorMessage)('hash', 'Source not found', filename);
-    }
-    catch (err) {
-        host.writeFail(["Unable to read file", filename], err, 32);
     }
 }
 function getSrcURL(parent, file) {
@@ -665,7 +664,7 @@ function transformOptions(file, mimeType, code, bundleContent) {
     const metadata = { userAgentData: this.userAgentData };
     switch (mimeType) {
         case 'text/html':
-            metadata.__fromhtml__ = true;
+            metadata['__fromhtml__'] = true;
         case 'text/css':
             Object.assign(metadata, this.config);
         default:
@@ -764,12 +763,11 @@ function replaceCss(file) {
             map[id] = this.removeServerRoot(map[id]);
         }
     };
-    const { inlineUrlMap, inlineUrlCloudMap } = file;
-    if (inlineUrlMap) {
-        sanitize(inlineUrlMap);
+    if (file.inlineUrlMap) {
+        sanitize(file.inlineUrlMap);
     }
-    if (inlineUrlCloudMap) {
-        sanitize(inlineUrlCloudMap);
+    if (file.inlineUrlCloudMap) {
+        sanitize(file.inlineUrlCloudMap);
     }
 }
 function replaceHtml(source, { productionRelease, contentMap }, cssMap) {
@@ -845,10 +843,6 @@ async function checkData(item, name, result, validate) {
         }
     }
 }
-function getBuffer(item) {
-    let localUri;
-    return item.sourceUTF8 || item.buffer || ((localUri = item.localUri) && isPath(localUri) ? fs.readFileSync(localUri, item.encoding) : null);
-}
 const getNewlineString = dom_1.DomWriter.getNewlineString.bind(dom_1.DomWriter);
 const isSpace = dom_1.DomWriter.isSpace.bind(dom_1.DomWriter);
 const replaceMatch = dom_1.DomWriter.replaceMatch.bind(dom_1.DomWriter);
@@ -859,10 +853,11 @@ const asString = Document.asString.bind(Document);
 const resolvePath = Document.resolvePath.bind(Document);
 const toPosix = Document.toPosix.bind(Document);
 const isDir = Document.isDir.bind(Document);
-const hasSourceMap = (metadata, value) => (0, types_1.isObject)(metadata) && metadata.__sourcemap__ === value;
+const hasSourceMap = (metadata, value) => (0, types_1.isObject)(metadata) && metadata['__sourcemap__'] === value;
 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';
+const getBuffer = (item) => item.sourceUTF8 || item.buffer || (item.localUri && isPath(item.localUri) ? fs.readFileSync(item.localUri, item.encoding) : null);
 const isRemoved = (item) => item.exclude === true || isBundled(item.bundleIndex);
 const isUnedited = (item) => !item.attributes && !item.inlineContent && !item.srcSet && !item.element.dynamic && item.element.textContent === undefined && (!item.uri && !isBundled(item.bundleIndex, true) || (0, util_1.hasValue)(item.format, 'crossorigin'));
 const isIgnored = (item, exists) => item.invalid || (0, types_1.ignoreFlag)(item.flags) || !exists && (0, types_1.existsFlag)(item.flags);
@@ -939,6 +934,9 @@ class ChromeDocument extends Document {
                 }
                 CACHE_TOTAL = stored.length - result;
             }
+            CACHE_ETAG.clear();
+            CACHE_CONTENT.clear();
+            CACHE_FORMAT.clear();
         }
         return result + (parent && result > 0 ? await super.purgeMemory(typeof parent === 'number' && parent > 0 ? parent : percent, limit, true) : 0);
     }
@@ -966,12 +964,27 @@ class ChromeDocument extends Document {
                             if (outHtml) {
                                 const { etag, initialValue } = htmlFile;
                                 let buffer;
-                                if (!initialValue || !(etag && initialValue.etag === etag && (buffer = initialValue.buffer)) || fetched.find(item => item.bundleReplace && (!(0, types_1.isArray)(item.from) || item.from.includes('style')))) {
+                                if (!initialValue || !(etag && initialValue.etag === etag && (buffer = initialValue.buffer)) || fetched.find(item => item !== htmlFile && item.etag && CACHE_ETAG.get(item.localUri) !== item.etag && (item.inlineContent || item.bundleReplace && (!Array.isArray(item.from) || item.from.includes('style'))))) {
+                                    const isValid = (item) => !!item.localUri && item !== htmlFile && !item.invalid;
+                                    for (const item of fetched) {
+                                        if (item.etag && !item.content && isValid(item)) {
+                                            CACHE_ETAG.set(item.localUri, item.etag);
+                                        }
+                                    }
+                                    for (const item of instance.assets) {
+                                        if (isValid(item)) {
+                                            if (item.content) {
+                                                CACHE_CONTENT.set(item.localUri, item.content);
+                                            }
+                                            if (item.format) {
+                                                CACHE_FORMAT.set(item.localUri, item.format.toString());
+                                            }
+                                        }
+                                    }
                                     break;
                                 }
                                 try {
-                                    const { localUri, encoding } = htmlFile;
-                                    fs.writeFileSync(localUri, buffer, (0, types_1.getEncoding)(encoding));
+                                    fs.writeFileSync(htmlFile.localUri, buffer, (0, types_1.getEncoding)(htmlFile.encoding));
                                     htmlFile.buffer = buffer;
                                     htmlFile.sourceUTF8 = undefined;
                                 }
@@ -979,12 +992,39 @@ class ChromeDocument extends Document {
                                     break;
                                 }
                             }
-                            const { jsFiles, cssFiles, svgFiles } = instance;
-                            const copiedAssets = this.copiedAssets;
-                            const wasModified = (item) => fetched.includes(item) || copiedAssets.includes(item) && (!(0, types_1.isEmpty)(item.bundleId) || !(0, types_1.isEmpty)(item.trailingContent));
-                            const js = jsFiles.filter(item => item.imports || wasModified(item));
-                            const css = cssFiles.filter(wasModified);
-                            const svg = svgFiles.filter(wasModified);
+                            const wasModified = (item) => {
+                                const localUri = item.localUri;
+                                let result = fetched.includes(item) || Array.isArray(item.from) && item.from.includes('style');
+                                if (localUri) {
+                                    if (item.etag && !item.content && !item.invalid) {
+                                        CACHE_ETAG.set(localUri, item.etag);
+                                    }
+                                    else {
+                                        CACHE_ETAG.delete(localUri);
+                                    }
+                                    if (!item.content || item.invalid) {
+                                        CACHE_CONTENT.delete(localUri);
+                                    }
+                                    else if (CACHE_CONTENT.get(localUri) !== item.content || !item.inlineContent && !Document.isPath(localUri)) {
+                                        CACHE_CONTENT.set(localUri, item.content);
+                                        result = true;
+                                    }
+                                    if (!item.format || item.invalid) {
+                                        CACHE_FORMAT.delete(localUri);
+                                    }
+                                    else {
+                                        const format = item.format.toString();
+                                        if (CACHE_FORMAT.get(localUri) !== format || !item.inlineContent && !Document.isPath(localUri)) {
+                                            CACHE_FORMAT.set(localUri, format);
+                                            result = true;
+                                        }
+                                    }
+                                }
+                                return result || this.copiedAssets.includes(item) && (!(0, types_1.isEmpty)(item.bundleId) || !(0, types_1.isEmpty)(item.trailingContent));
+                            };
+                            const js = instance.jsFiles.filter(item => wasModified(item) || !!item.imports);
+                            const css = instance.cssFiles.filter(wasModified);
+                            const svg = instance.svgFiles.filter(wasModified);
                             if (js.length || css.length || svg.length) {
                                 instance.jsFiles = js;
                                 instance.cssFiles = css;
@@ -1033,16 +1073,15 @@ class ChromeDocument extends Document {
                     const items = new Set((asset.watch.assets || []));
                     (function recurse(children) {
                         for (const item of children) {
-                            if (items.has(item)) {
-                                continue;
-                            }
-                            if (isWatched.call(instance, item)) {
-                                item.flags |= 8;
-                            }
-                            items.add(item);
-                            const next = related.get(item);
-                            if (next) {
-                                recurse(next);
+                            if (!items.has(item)) {
+                                if (isWatched.call(instance, item)) {
+                                    item.flags |= 8;
+                                }
+                                items.add(item);
+                                const next = related.get(item);
+                                if (next) {
+                                    recurse(next);
+                                }
                             }
                         }
                     })(includes);
@@ -1051,37 +1090,34 @@ class ChromeDocument extends Document {
             }
         }
         let productionRelease = instance.productionRelease;
-        if (!(0, types_1.isString)(productionRelease)) {
-            return;
-        }
-        if (path.isAbsolute(productionRelease = path.normalize(productionRelease)) && isDir(productionRelease)) {
-            if (this.canWrite(productionRelease)) {
-                const serverRoot = ChromeDocument.INTERNAL_SERVERROOT;
-                const srcDir = path.join(this.baseDirectory, serverRoot);
-                if (!isDir(srcDir)) {
-                    return;
-                }
-                const result = await Document.copyDir(srcDir, productionRelease, this.incremental !== 'staging');
-                const failed = result.failed.map(value => this.removeCwd(value));
-                for (const value of this.files) {
-                    if (!value.startsWith(serverRoot)) {
-                        continue;
-                    }
-                    if (!failed.includes(value)) {
-                        this.delete(value);
-                    }
-                    else {
-                        instance.writeFail(["Unable to move file", instance.moduleName], (0, types_1.errorMessage)('production', path.join(this.baseDirectory, value)), { fatal: true });
+        if ((0, types_1.isString)(productionRelease)) {
+            if (path.isAbsolute(productionRelease = path.normalize(productionRelease)) && isDir(productionRelease)) {
+                if (this.canWrite(productionRelease)) {
+                    const serverRoot = ChromeDocument.INTERNAL_SERVERROOT;
+                    const srcDir = path.join(this.baseDirectory, serverRoot);
+                    if (isDir(srcDir)) {
+                        const result = await Document.copyDir(srcDir, productionRelease, this.incremental !== 'staging');
+                        const failed = result.failed.map(value => this.removeCwd(value));
+                        for (const value of this.files) {
+                            if (value.startsWith(serverRoot)) {
+                                if (!failed.includes(value)) {
+                                    this.delete(value);
+                                }
+                                else {
+                                    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", instance.moduleName], (0, types_1.errorMessage)('production', 'Access denied', productionRelease));
+                }
             }
             else {
-                instance.writeFail(["Unable to write directory", instance.moduleName], (0, types_1.errorMessage)('production', 'Access denied', productionRelease));
+                instance.writeFail(["Unable to read directory", instance.moduleName], (0, types_1.errorMessage)('production', 'Invalid directory', productionRelease), 32);
             }
         }
-        else {
-            instance.writeFail(["Unable to read directory", instance.moduleName], (0, types_1.errorMessage)('production', 'Invalid directory', productionRelease), 32);
-        }
     }
     static sanitizeAssets(assets, exclusions = []) {
         assets.forEach(item => {
@@ -1162,7 +1198,6 @@ class ChromeDocument extends Document {
             }
             return 0;
         });
-        let imports;
         if (config) {
             const { useUnsafeReplace, baseUrl, productionRelease, productionIncremental, templateMap, userAgentData, cache } = config;
             const target = this.config;
@@ -1209,37 +1244,25 @@ class ChromeDocument extends Document {
             if ((0, types_1.isObject)(userAgentData)) {
                 this.userAgentData = userAgentData;
             }
+            const imports = (0, types_1.isPlainObject)(config.imports) ? { ...this.module.imports, ...config.imports } : this.module.imports;
+            if (imports) {
+                this.imports = imports;
+            }
             if ((0, types_1.isObject)(cache) && 'transform' in cache) {
                 this.customize({ transform: cache.transform });
             }
-            if (!(0, types_1.isPlainObject)(imports = config.imports)) {
-                imports = undefined;
-            }
         }
         super.init(assets, config);
         const mimeMap = this._mimeMap;
-        if (mimeMap) {
-            if ('imports' in mimeMap) {
-                const imported = mimeMap.imports;
-                if ((0, types_1.isPlainObject)(imported)) {
-                    imports = imports ? Object.assign(imported, imports) : imported;
-                }
-                delete mimeMap.imports;
+        if (mimeMap && 'format' in mimeMap) {
+            const format = mimeMap.format;
+            if ((0, types_1.isObject)(format)) {
+                this.formatMap = 'pathname' in format || 'filename' in format || 'dictionary' in format ? { uuid: format } : format;
             }
-            if ('format' in mimeMap) {
-                const format = mimeMap.format;
-                if ((0, types_1.isObject)(format)) {
-                    this.formatMap = 'pathname' in format || 'filename' in format || 'dictionary' in format ? { uuid: format } : format;
-                }
-                else {
-                    this.formatMap = undefined;
-                }
-                delete mimeMap.format;
+            else {
+                this.formatMap = undefined;
             }
         }
-        if (imports) {
-            this.imports = imports;
-        }
         for (const storage of cloud) {
             for (const { service, upload, download } of storage) {
                 if (upload) {
@@ -1667,9 +1690,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 = (_b = (_a = instance.getStorage('upload', htmlFile.cloudStorage)) === null || _a === void 0 ? void 0 : _a.upload) === null || _b === void 0 ? void 0 : _b.endpoint;
+        if (this.htmlFile) {
+            const endpoint = (_b = (_a = instance.getStorage('upload', this.htmlFile.cloudStorage)) === null || _a === void 0 ? void 0 : _a.upload) === null || _b === void 0 ? void 0 : _b.endpoint;
             if (endpoint) {
                 this._cloudEndpoint = new RegExp((0, types_1.escapePattern)(toPosix(endpoint)) + '/', 'g');
             }
@@ -1850,7 +1872,9 @@ class ChromeDocument extends Document {
                 }
             }
             search !== null && search !== void 0 ? search : (search = restoreSearchParams((_a = asset.url) === null || _a === void 0 ? void 0 : _a.search));
-            status && (status = status.filter(item => item.type >= types_1.STATUS_TYPE.FATAL && item.type <= types_1.STATUS_TYPE.WARN));
+            if (status) {
+                status = status.filter(item => item.type >= types_1.STATUS_TYPE.FATAL && item.type <= types_1.STATUS_TYPE.WARN);
+            }
             watch.send(types_1.WATCH_EVENT.MODIFIED, {
                 action: pathname && watch.hot && !watch.main ? 'hot' : '',
                 type: asset.mimeType,
@@ -2027,9 +2051,8 @@ class ChromeDocument extends Document {
                 item.modified = true;
             }
             source = sanitizeSource(item, source);
-            const format = item.format;
-            if (format) {
-                const result = await this.transform('html', source, format, transformOptions.call(this, item, 'image/svg+xml'));
+            if (item.format) {
+                const result = await this.transform('html', source, item.format, transformOptions.call(this, item, 'image/svg+xml'));
                 if (result) {
                     item.modified = true;
                     source = result.code;
@@ -2139,12 +2162,11 @@ class ChromeDocument extends Document {
         await this.setElementAttributes(processing, domBase);
         await this.applyDataSource(processing, domBase);
         for (const item of this.assets) {
-            const element = item.element;
-            if (element && isRemoved(item) && !(0, types_1.ignoreFlag)(item.flags)) {
-                const domElement = new dom_1.HtmlElement(moduleName, element, item.attributes);
+            if (item.element && isRemoved(item) && !(0, types_1.ignoreFlag)(item.flags)) {
+                const domElement = new dom_1.HtmlElement(moduleName, item.element, item.attributes);
                 domElement.remove = true;
                 if (!domBase.write(domElement)) {
-                    this.writeFail('Unable to exclude HTML element', errorHtml(element), 4);
+                    this.writeFail('Unable to exclude HTML element', errorHtml(item.element), 4);
                 }
             }
         }
@@ -2165,15 +2187,13 @@ 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) {
-            const { filename, uri, encoding, metadata } = htmlFile;
-            const result = await this.transform('html', source, format, {
+        if (htmlFile.format) {
+            const result = await this.transform('html', source, htmlFile.format, {
                 pathname: path.dirname(localUri),
-                filename,
+                filename: htmlFile.filename,
                 mimeType: 'text/html',
-                metadata: Object.assign({ '__fromhtml__': true, ...this.config }, metadata),
-                cacheData: !productionRelease || this.productionIncremental ? { uri, encoding } : undefined
+                metadata: Object.assign({ '__fromhtml__': true, ...this.config }, htmlFile.metadata),
+                cacheData: !productionRelease || this.productionIncremental ? { uri: htmlFile.uri, encoding: htmlFile.encoding } : undefined
             });
             if (result) {
                 source = result.code;
@@ -2207,12 +2227,12 @@ class ChromeDocument extends Document {
         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;
+            const element = item.element;
             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);
-            if (inlineContent) {
+            if (item.inlineContent) {
                 let [innerXml, sourceMappingURL, inlineMap] = transform_1.SourceMap.removeSourceMappingURL(host.getUTF8String(item).trim());
                 if (sourceMappingURL && !inlineMap && item.localUri) {
                     let mapUri = path.resolve(sourceMappingURL = decodeURIComponent(sourceMappingURL));
@@ -2221,7 +2241,7 @@ class ChromeDocument extends Document {
                     }
                     host.deleteFile(mapUri);
                 }
-                domElement.tagName = inlineContent;
+                domElement.tagName = item.inlineContent;
                 domElement.innerXml = innerXml;
                 domElement.removeAttribute('src', 'href');
             }
@@ -2311,10 +2331,10 @@ class ChromeDocument extends Document {
                 }
             }
             if (!domBase.write(domElement)) {
-                this.writeFail(inlineContent ? 'Inline tag replacement' : 'Element attribute replacement', errorHtml(element), { type: 4, startTime });
+                this.writeFail(item.inlineContent ? 'Inline tag replacement' : 'Element attribute replacement', errorHtml(element), { type: 4, startTime });
                 delete item.inlineUrlCloud;
             }
-            else if (inlineContent) {
+            else if (item.inlineContent) {
                 host.removeAsset(item);
                 removeWatchReload(item);
             }
@@ -2911,7 +2931,7 @@ class ChromeDocument extends Document {
                                                 for (let j = 0, match; j < items.length; ++j) {
                                                     const row = items[j];
                                                     if ((0, types_1.isPlainObject)(row)) {
-                                                        (_c = row.__index__) !== null && _c !== void 0 ? _c : (row.__index__ = j + 1);
+                                                        (_c = row['__index__']) !== null && _c !== void 0 ? _c : (row['__index__'] = j + 1);
                                                     }
                                                     let segment = template;
                                                     while (match = REGEXP_TEMPLATECONDITIONAL.exec(segment)) {
@@ -3061,7 +3081,8 @@ class ChromeDocument extends Document {
                                                     const row = items[0];
                                                     let condition = NaN;
                                                     for (let seg of template) {
-                                                        switch ((seg = seg.trim()).toLowerCase()) {
+                                                        seg = seg.trim();
+                                                        switch (seg.toLowerCase()) {
                                                             case ':is(and)':
                                                                 if (condition === 0) {
                                                                     remove = false;
@@ -3254,7 +3275,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)?`) + (capture[6] ? getStringMany() + '[oO][fF]' + getStringMany() + capture[6].trim() : '') + 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++) {

package/package.json

@@ -1,28 +1,28 @@
-{
-  "name": "@pi-r/chrome",
-  "version": "0.3.4",
-  "description": "Chrome document constructor for E-mc.",
-  "main": "index.js",
-  "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.6.3",
-    "@e-mc/core": "^0.6.3",
-    "@e-mc/document": "^0.6.3",
-    "@e-mc/types": "^0.6.3"
-  }
-}
+{
+  "name": "@pi-r/chrome",
+  "version": "0.3.6",
+  "description": "Chrome document constructor for E-mc.",
+  "main": "index.js",
+  "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.6.16",
+    "@e-mc/core": "^0.6.16",
+    "@e-mc/document": "^0.6.16",
+    "@e-mc/types": "^0.6.16"
+  }
+}

package/types/index.d.ts

@@ -1,119 +1,118 @@
-import type { LocationUri, XmlTagNode } from '@e-mc/types/lib/squared';
-
-import type { DocumentConstructor, ICloud, IDocument, IFileManager } from '@e-mc/types/lib';
-import type { DocumentAsset as IDocumentAsset } from '@e-mc/types/lib/document';
-import type { LogTime } from '@e-mc/types/lib/logger';
-import type { DbSourceDataType, DocumentComponentOption, DocumentComponent as IDocumentComponent, DocumentComponentOptions as IDocumentComponentOptions, DocumentDirectory as IDocumentDirectory, DocumentEval as IDocumentEval, DocumentModule as IDocumentModule, DocumentSettings as IDocumentSettings } from '@e-mc/types/lib/settings';
-
-import type { CloudScopeOrigin } from '@e-mc/cloud/types';
-import type { IDomWriter, IXmlElement } from '@e-mc/document/parse/types';
-
-import type { ChromeAsset, CssRuleData, DataSource, DocumentOutput } from './squared';
-
-interface DocumentDirectory extends IDocumentDirectory {
-    template?: string;
-    data?: string;
-    export?: string;
-    schema?: string;
-    sql?: string;
-}
-
-interface DocumentComponentExtended<T> extends DbSourceDataType<T> {
-    uri?: T;
-    local?: T;
-    export?: T;
-}
-
-interface DocumentComponentOptions<T> extends IDocumentComponentOptions, DocumentComponentExtended<DocumentComponentOption<T>> {}
-
-interface DocumentEval extends IDocumentEval {
-    template?: boolean;
-    userconfig?: boolean;
-}
-
-interface ChromeDocumentSettings extends IDocumentSettings {
-    directory?: DocumentDirectory;
-    options?: DocumentComponentOptions<boolean | number>;
-    export?: ObjectMap<string | FunctionType>;
-}
-
-type OutputType = "useUnsafeReplace" | "productionRelease" | "productionIncremental" | "templateMap" | "userAgentData";
-
-export interface FormatUri extends Partial<LocationUri> {
-    dictionary?: string;
-}
-
-export interface FinalizeProcessing<T extends IFileManager<U>, U extends DocumentAsset = DocumentAsset> {
-    readonly host: T;
-    readonly startTime: LogTime;
-    readonly hashed: Set<DocumentAsset>;
-    readonly contentMap: StringMap;
-    readonly bufferMap: ObjectMap<BufferContent>;
-    readonly cacheMiss: string[];
-    readonly productionRelease: Undef<true>;
-}
-
-export interface DocumentComponent<T = boolean> extends IDocumentComponent<T, T>, DocumentComponentExtended<T> {}
-
-export interface DocumentModule extends IDocumentModule {
-    eval?: DocumentEval;
-    format?: PlainObject & { uuid?: FormatUri };
-    settings?: ChromeDocumentSettings;
-}
-
-export interface DocumentAsset extends IDocumentAsset, ChromeAsset {
-    relativeUrl?: string;
-    inlineFilename?: string;
-    srcSet?: string[];
-    inlineUrl?: string;
-    inlineUrlMap?: StringMap;
-    inlineUrlCloud?: string;
-    inlineUrlCloudMap?: StringMap;
-    inlineBase64?: string;
-    modified?: boolean;
-}
-
-export interface UserConfig extends CssRuleData, Omit<DocumentOutput, OutputType> {
-    useUnsafeHtmlReplace?: boolean;
-    useUnsafeCssReplace?: boolean;
-}
-
-export interface IChromeDocument<T extends IFileManager<U>, U extends DocumentAsset = DocumentAsset, V extends ICloud = ICloud<T>> extends IDocument<T, U, DocumentModule, DocumentComponent, DocumentComponentOption, V>, Pick<DocumentOutput, OutputType> {
-    htmlFile: Null<U>;
-    cssFiles: U[];
-    jsFiles: U[];
-    svgFiles: U[];
-    baseDirectory: string;
-    baseUrl: string;
-    config: UserConfig;
-    related: Map<U, Set<U>>;
-    replaced: U[];
-    formatMap?: ObjectMap<FormatUri>;
-    setElementSrc(asset: U, element: IXmlElement, value: string): void;
-    findDataValue(name: string): Undef<string>;
-    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>;
-    cloudInit(state: CloudScopeOrigin<T, U, V>): void;
-    cloudObject(state: CloudScopeOrigin<T, U, V>, file: U): boolean;
-    cloudUpload(state: CloudScopeOrigin<T, U, V>, file: U, url: string, active: boolean): Promise<boolean>;
-    cloudFinalize(state: CloudScopeOrigin<T, U, V>): Promise<unknown[]>;
-    get editing(): U[];
-    set dataSource(value);
-    get dataSource(): DataSource[];
-    get elements(): XmlTagNode[];
-    get settings(): ChromeDocumentSettings;
-}
-
-export interface ChromeDocumentConstructor<T extends IFileManager<U>, U extends DocumentAsset = DocumentAsset> extends DocumentConstructor<T, U> {
-    INTERNAL_ASSIGNUUID: string;
-    INTERNAL_SERVERROOT: string;
-    readonly prototype: IChromeDocument<T, U>;
-    new(module?: DocumentModule, ...args: unknown[]): IChromeDocument<T, U>;
+import type { LocationUri, XmlTagNode } from '@e-mc/types/lib/squared';
+
+import type { DocumentConstructor, ICloud, IDocument, IFileManager } from '@e-mc/types/lib';
+import type { DocumentAsset as IDocumentAsset } from '@e-mc/types/lib/document';
+import type { LogTime } from '@e-mc/types/lib/logger';
+import type { DbSourceDataType, DocumentComponentOption, DocumentComponent as IDocumentComponent, DocumentComponentOptions as IDocumentComponentOptions, DocumentDirectory as IDocumentDirectory, DocumentEval as IDocumentEval, DocumentModule as IDocumentModule, DocumentSettings as IDocumentSettings } from '@e-mc/types/lib/settings';
+
+import type { CloudScopeOrigin } from '@e-mc/cloud/types';
+import type { IDomWriter, IXmlElement } from '@e-mc/document/parse/types';
+
+import type { ChromeAsset, CssRuleData, DataSource, DocumentOutput } from './squared';
+
+interface DocumentDirectory extends IDocumentDirectory {
+    template?: string;
+    data?: string;
+    export?: string;
+    schema?: string;
+    sql?: string;
+}
+
+interface DocumentComponentExtended<T> extends DbSourceDataType<T> {
+    uri?: T;
+    local?: T;
+    export?: T;
+}
+
+interface DocumentComponentOptions<T> extends IDocumentComponentOptions, DocumentComponentExtended<DocumentComponentOption<T>> {}
+
+interface DocumentEval extends IDocumentEval {
+    template?: boolean;
+    userconfig?: boolean;
+}
+
+interface ChromeDocumentSettings extends IDocumentSettings {
+    directory?: DocumentDirectory;
+    options?: DocumentComponentOptions<boolean | number>;
+    export?: ObjectMap<string | FunctionType>;
+}
+
+type OutputType = "useUnsafeReplace" | "productionRelease" | "productionIncremental" | "templateMap" | "userAgentData";
+
+export interface FormatUri extends Partial<LocationUri> {
+    dictionary?: string;
+}
+
+export interface FinalizeProcessing<T extends IFileManager<U>, U extends DocumentAsset = DocumentAsset> {
+    readonly host: T;
+    readonly startTime: LogTime;
+    readonly hashed: Set<DocumentAsset>;
+    readonly contentMap: StringMap;
+    readonly bufferMap: ObjectMap<BufferContent>;
+    readonly cacheMiss: string[];
+    readonly productionRelease: Undef<true>;
+}
+
+export interface DocumentComponent<T = boolean> extends IDocumentComponent<T, T>, DocumentComponentExtended<T> {}
+
+export interface DocumentModule extends IDocumentModule {
+    eval?: DocumentEval;
+    format?: PlainObject & { uuid?: FormatUri };
+    settings?: ChromeDocumentSettings;
+}
+
+export interface DocumentAsset extends IDocumentAsset, ChromeAsset {
+    relativeUrl?: string;
+    inlineFilename?: string;
+    srcSet?: string[];
+    inlineUrl?: string;
+    inlineUrlMap?: StringMap;
+    inlineUrlCloud?: string;
+    inlineUrlCloudMap?: StringMap;
+    inlineBase64?: string;
+    modified?: boolean;
+}
+
+export interface UserConfig extends CssRuleData, Omit<DocumentOutput, OutputType> {
+    useUnsafeHtmlReplace?: boolean;
+    useUnsafeCssReplace?: boolean;
+}
+
+export interface IChromeDocument<T extends IFileManager<U>, U extends DocumentAsset = DocumentAsset, V extends ICloud = ICloud<T>> extends IDocument<T, U, DocumentModule, DocumentComponent, DocumentComponentOption, V>, Pick<DocumentOutput, OutputType> {
+    htmlFile: Null<U>;
+    cssFiles: U[];
+    jsFiles: U[];
+    svgFiles: U[];
+    baseDirectory: string;
+    baseUrl: string;
+    config: UserConfig;
+    related: Map<U, Set<U>>;
+    replaced: U[];
+    formatMap?: ObjectMap<FormatUri>;
+    setElementSrc(asset: U, element: IXmlElement, value: string): void;
+    findDataValue(name: string): Undef<string>;
+    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>;
+    cloudInit(state: CloudScopeOrigin<T, U, V>): void;
+    cloudObject(state: CloudScopeOrigin<T, U, V>, file: U): boolean;
+    cloudUpload(state: CloudScopeOrigin<T, U, V>, file: U, url: string, active: boolean): Promise<boolean>;
+    cloudFinalize(state: CloudScopeOrigin<T, U, V>): Promise<unknown[]>;
+    get settings(): ChromeDocumentSettings;
+    get editing(): U[];
+    get dataSource(): DataSource[];
+    get elements(): XmlTagNode[];
+}
+
+export interface ChromeDocumentConstructor<T extends IFileManager<U>, U extends DocumentAsset = DocumentAsset> extends DocumentConstructor<T, U> {
+    INTERNAL_ASSIGNUUID: string;
+    INTERNAL_SERVERROOT: string;
+    readonly prototype: IChromeDocument<T, U>;
+    new(module?: DocumentModule, ...args: unknown[]): IChromeDocument<T, U>;
 }

package/types/squared.d.ts

@@ -1,114 +1,114 @@
-import type { AttributeAction, ConditionProperty, CssConditionData, ElementAction, ExcludeAction, FileAsset, FromAction, HashAction, DataSource as IDataSource, ImportAction, MetadataAction, ViewEngine, XmlTagNode } from '@e-mc/types/lib/squared';
-
-import type { UploadAction } from '@e-mc/types/lib/cloud';
-import type { CascadeAction, DbSource } from '@e-mc/types/lib/db';
-import type { RequestData as IRequestData } from '@e-mc/types/lib/node';
-
-interface ImportFrom {
-    placeholder: string;
-    original: string;
-    uri: string;
-    type?: string;
-    dynamic?: boolean;
-}
-
-interface DataObject extends CascadeAction {
-    format?: string;
-    options?: PlainObject;
-}
-
-export interface UserAgentData {
-    platform: string;
-    brand: string;
-    browser: number;
-    version: Null<number[]>;
-}
-
-export interface DocumentOutput {
-    productionRelease?: boolean | string;
-    productionIncremental?: boolean;
-    useOriginalHtmlPage?: boolean | string;
-    useUnsafeReplace?: ArrayOf<"html" | "css"> | boolean;
-    stripCommentsAndCDATA?: boolean | string;
-    normalizeHtmlOutput?: boolean | string;
-    escapeReservedCharacters?: boolean;
-    ignoreServerCodeBlocks?: string[];
-    webBundle?: {
-        rootDirAlias?: string;
-        baseUrl?: string;
-        primaryUrl?: string;
-        copyTo?: string;
-        rewriteHtmlPage?: boolean | string;
-        excludeHtmlPage?: boolean;
-        excludeTransforms?: boolean;
-        includeScopes?: string[];
-        excludeScopes?: string[];
-    };
-    templateMap?: TemplateMap;
-    userAgentData?: Partial<UserAgentData>;
-}
-
-export interface RequestData extends IRequestData<ChromeAsset>, Readonly<DocumentOutput>, Readonly<CssRuleData> {}
-
-export interface ChromeAsset extends FileAsset, AttributeAction, ElementAction, MetadataAction<PlainObject>, UploadAction, HashAction, ExcludeAction, ImportAction<ImportFrom[] | boolean>, FromAction {
-    preserve?: boolean;
-    static?: boolean;
-    editing?: boolean;
-    inlineContent?: string;
-    originAddress?: boolean;
-}
-
-export interface TemplateMap extends PlainObject {
-    html?: ObjectMap<StringMap>;
-    js?: ObjectMap<StringMap>;
-    css?: ObjectMap<StringMap>;
-    data?: StringMap;
-}
-
-export interface CssRuleData {
-    usedVariables?: string[];
-    usedFontFace?: string[];
-    usedKeyframes?: string[];
-    unusedStyles?: string[];
-    unusedMedia?: string[];
-    unusedContainer?: string[];
-    unusedSupports?: string[];
-    unusedAtRules?: UnusedAtRule[];
-}
-
-export interface UnusedAtRule {
-    selector?: string;
-    media?: ConditionProperty;
-    supports?: ConditionProperty;
-    container?: CssConditionData & Partial<ConditionProperty>;
-    layer?: string[];
-}
-
-export interface DataSource<T = string> extends IDataSource<T>, ElementAction {
-    source: "cloud" | "uri" | "local" | "export" | DbSource;
-    element?: XmlTagNode;
-    type?: "text" | "attribute" | "display";
-    dynamic?: boolean;
-    value?: StringOfArray | ObjectMap<unknown>;
-    template?: string;
-    viewEngine?: ViewEngine | string;
-    ignoreEmpty?: boolean;
-}
-
-export interface UriDataSource extends DataSource, DataObject {
-    source: "uri";
-}
-
-export interface LocalDataSource extends DataSource, DataObject {
-    source: "local";
-    pathname?: string;
-}
-
-export interface ExportDataSource extends DataSource, CascadeAction {
-    source: "export";
-    execute?: FunctionType;
-    pathname?: string;
-    settings?: string;
-    params?: unknown;
-    persist?: boolean;
+import type { AttributeAction, ConditionProperty, CssConditionData, ElementAction, ExcludeAction, FileAsset, FromAction, HashAction, DataSource as IDataSource, ImportAction, MetadataAction, ViewEngine, XmlTagNode } from '@e-mc/types/lib/squared';
+
+import type { UploadAction } from '@e-mc/types/lib/cloud';
+import type { CascadeAction, DbSource } from '@e-mc/types/lib/db';
+import type { RequestData as IRequestData } from '@e-mc/types/lib/node';
+
+interface ImportFrom {
+    placeholder: string;
+    original: string;
+    uri: string;
+    type?: string;
+    dynamic?: boolean;
+}
+
+interface DataObject extends CascadeAction {
+    format?: string;
+    options?: PlainObject;
+}
+
+export interface UserAgentData {
+    platform: string;
+    brand: string;
+    browser: number;
+    version: Null<number[]>;
+}
+
+export interface DocumentOutput {
+    productionRelease?: boolean | string;
+    productionIncremental?: boolean;
+    useOriginalHtmlPage?: boolean | string;
+    useUnsafeReplace?: ArrayOf<"html" | "css"> | boolean;
+    stripCommentsAndCDATA?: boolean | string;
+    normalizeHtmlOutput?: boolean | string;
+    escapeReservedCharacters?: boolean;
+    ignoreServerCodeBlocks?: string[];
+    webBundle?: {
+        rootDirAlias?: string;
+        baseUrl?: string;
+        primaryUrl?: string;
+        copyTo?: string;
+        rewriteHtmlPage?: boolean | string;
+        excludeHtmlPage?: boolean;
+        excludeTransforms?: boolean;
+        includeScopes?: string[];
+        excludeScopes?: string[];
+    };
+    templateMap?: TemplateMap;
+    userAgentData?: Partial<UserAgentData>;
+}
+
+export interface RequestData extends IRequestData<ChromeAsset>, Readonly<DocumentOutput>, Readonly<CssRuleData> {}
+
+export interface ChromeAsset extends FileAsset, AttributeAction, ElementAction, MetadataAction<PlainObject>, UploadAction, HashAction, ExcludeAction, ImportAction<ImportFrom[] | boolean>, FromAction {
+    preserve?: boolean;
+    static?: boolean;
+    editing?: boolean;
+    inlineContent?: string;
+    originAddress?: boolean;
+}
+
+export interface TemplateMap extends PlainObject {
+    html?: ObjectMap<StringMap>;
+    js?: ObjectMap<StringMap>;
+    css?: ObjectMap<StringMap>;
+    data?: StringMap;
+}
+
+export interface CssRuleData {
+    usedVariables?: string[];
+    usedFontFace?: string[];
+    usedKeyframes?: string[];
+    unusedStyles?: string[];
+    unusedMedia?: string[];
+    unusedContainer?: string[];
+    unusedSupports?: string[];
+    unusedAtRules?: UnusedAtRule[];
+}
+
+export interface UnusedAtRule {
+    selector?: string;
+    media?: ConditionProperty;
+    supports?: ConditionProperty;
+    container?: CssConditionData & Partial<ConditionProperty>;
+    layer?: string[];
+}
+
+export interface DataSource<T = string> extends IDataSource<T>, ElementAction {
+    source: "cloud" | "uri" | "local" | "export" | DbSource;
+    element?: XmlTagNode;
+    type?: "text" | "attribute" | "display";
+    dynamic?: boolean;
+    value?: StringOfArray | ObjectMap<unknown>;
+    template?: string;
+    viewEngine?: ViewEngine | string;
+    ignoreEmpty?: boolean;
+}
+
+export interface UriDataSource extends DataSource, DataObject {
+    source: "uri";
+}
+
+export interface LocalDataSource extends DataSource, DataObject {
+    source: "local";
+    pathname?: string;
+}
+
+export interface ExportDataSource extends DataSource, CascadeAction {
+    source: "export";
+    execute?: FunctionType;
+    pathname?: string;
+    settings?: string;
+    params?: unknown;
+    persist?: boolean;
 }