@pi-r/chrome 0.6.6 → 0.7.0

package/README.md

@@ -1,10 +1,7 @@
-# @pi-r/chrome
+### @pi-r/chrome
 
-## Documentation
+https://e-mc.readthedocs.io/en/latest/document
 
-- [E-mc](https://e-mc.readthedocs.io/en/latest/document/index.html)
-- [squared](https://squared.readthedocs.io)
-
-## LICENSE
+### 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

@@ -58,13 +58,13 @@ const REGEXP_IMAGESET = /\b(?:-webkit-)?image-set\(/gi;
 const REGEXP_IMAGESET_URL = /(?:^|[^(])\s*("(\s*[^)][^"]*)"|'(\s*[^)][^"]*)')\s*(?:,|$|[^)][^,]*,?)/g;
 function removeNamespace(name, source, newline, comments) {
     if (source.includes('-' + name)) {
-        const [a, b, c, d, e] = CACHE_DATASET[name] || (CACHE_DATASET[name] = [
+        const [a, b, c, d, e] = 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'),
             new RegExp(`data-${name}-file\\s*=\\s*(["'])?exclude\\1`),
             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])
@@ -477,13 +477,13 @@ function transformURL(host, parent, type, source, importFile) {
             if (asset) {
                 if (!asset.inlineBase64) {
                     if (host.Cloud?.getStorage('upload', asset.cloudStorage)) {
-                        const inlineUrlCloud = asset.inlineUrlCloud || (asset.inlineUrlCloud = (0, types_1.generateUUID)());
-                        (parent.inlineUrlCloudMap || (parent.inlineUrlCloudMap = {}))[inlineUrlCloud] = value;
+                        const inlineUrlCloud = asset.inlineUrlCloud ||= (0, types_1.generateUUID)();
+                        (parent.inlineUrlCloudMap ||= {})[inlineUrlCloud] = value;
                         value = inlineUrlCloud;
                     }
                     else if (asset.hash && this.productionRelease) {
-                        const inlineUrl = asset.inlineUrl || (asset.inlineUrl = (0, types_1.generateUUID)());
-                        (parent.inlineUrlMap || (parent.inlineUrlMap = {}))[inlineUrl] = value;
+                        const inlineUrl = asset.inlineUrl ||= (0, types_1.generateUUID)();
+                        (parent.inlineUrlMap ||= {})[inlineUrl] = value;
                         value = inlineUrl;
                     }
                 }
@@ -629,7 +629,7 @@ function transformURL(host, parent, type, source, importFile) {
                     }
                 }
                 else if (!asset.invalid) {
-                    fullUrl = asset.inlineBase64 || (asset.inlineBase64 = (0, types_1.generateUUID)());
+                    fullUrl = asset.inlineBase64 ||= (0, types_1.generateUUID)();
                 }
                 if (url !== fullUrl) {
                     setOutputURL(fullUrl, asset);
@@ -666,7 +666,7 @@ function setLocationUUID(data, file, ext) {
     const assignUUID = ChromeDocument.INTERNAL_ASSIGNUUID;
     let index, modified;
     if (filename) {
-        ext || (ext = path.extname(filename).substring(1));
+        ext ||= path.extname(filename).substring(1);
         if ((index = filename.indexOf(assignUUID)) !== -1) {
             data.filename = spliceString(filename, index, index + assignUUID.length, getFormatUUID.call(this, 'filename', ext));
             if (file) {
@@ -738,7 +738,7 @@ function transformJs(host, file, output) {
             for (const item of elements) {
                 const append = item.append;
                 if (append && !append.prepend && dom_1.DomWriter.isEqual(item, element, host.moduleName, true)) {
-                    (appending || (appending = [])).push(append);
+                    (appending ||= []).push(append);
                 }
             }
         }
@@ -759,7 +759,7 @@ function transformJs(host, file, output) {
                     if (element) {
                         const attributes = { ...file.attributes, src: joinPath(relativeDir, chunkName) };
                         if (file.imports && file.imported !== false) {
-                            attributes.type || (attributes.type = 'module');
+                            attributes.type ||= 'module';
                         }
                         elements.push({
                             ...element,
@@ -829,7 +829,7 @@ function loadLocalFile(item, pathname, cacheData, encoding, out) {
     if (ext === 'cjs') {
         return require(pathname);
     }
-    content || (content = fs.readFileSync(pathname, encoding));
+    content ||= fs.readFileSync(pathname, encoding);
     const result = this.tryParse(content, ext);
     if (result !== undefined && result !== null) {
         setCacheData.call(this, item, result, pathname, cacheData, true);
@@ -886,7 +886,7 @@ 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 getBuffer = (item, localUri) => item.sourceUTF8 || item.buffer || ((localUri || (localUri = item.localUri)) && isPath(localUri) ? fs.readFileSync(localUri, item.encoding) : null);
+const getBuffer = (item, localUri) => item.sourceUTF8 || item.buffer || ((localUri ||= item.localUri) && isPath(localUri) ? fs.readFileSync(localUri, item.encoding) : null);
 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';
@@ -901,46 +901,8 @@ const getRelativeURL = (file) => joinPath(file.moveTo, file.pathname, file.inlin
 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);
 class ChromeDocument extends Document {
-    constructor() {
-        super(...arguments);
-        this.config = {
-            usedVariables: undefined,
-            usedFontFace: undefined,
-            usedKeyframes: undefined,
-            unusedStyles: undefined,
-            unusedMedia: undefined,
-            unusedContainer: undefined,
-            unusedSupports: undefined,
-            unusedAtRules: undefined,
-            useOriginalHtmlPage: undefined,
-            useUnsafeHtmlReplace: undefined,
-            useUnsafeCssReplace: undefined,
-            useSessionCache: undefined,
-            stripCommentsAndCDATA: undefined,
-            normalizeHtmlOutput: undefined,
-            escapeReservedCharacters: undefined,
-            ignoreServerCodeBlocks: undefined
-        };
-        this.htmlFile = null;
-        this.cssFiles = [];
-        this.jsFiles = [];
-        this.svgFiles = [];
-        this.baseDirectory = '';
-        this.baseUrl = '';
-        this.productionRelease = false;
-        this.productionIncremental = false;
-        this.templateMap = {};
-        this.userAgentData = {};
-        this.related = new Map();
-        this.replaced = [];
-        this._moduleName = 'chrome';
-        this._threadable = true;
-        this._elements = null;
-        this._idMap = Object.create(null);
-        this._editing = [];
-        this._queryMap = new Map();
-        this._selectorMap = new Map();
-    }
+    static INTERNAL_ASSIGNUUID = "__assign__";
+    static INTERNAL_SERVERROOT = "__serverroot__";
     static async purgeMemory(percent = 1, limit = 0, parent) {
         if (typeof limit === 'boolean') {
             parent = limit;
@@ -1081,35 +1043,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)) {
-                    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 });
+        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', "Unsupported access", 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 => {
@@ -1134,6 +1095,50 @@ class ChromeDocument extends Document {
             }
         });
     }
+    config = {
+        usedVariables: undefined,
+        usedFontFace: undefined,
+        usedKeyframes: undefined,
+        unusedStyles: undefined,
+        unusedMedia: undefined,
+        unusedSupports: undefined,
+        unusedContainer: undefined,
+        unusedScope: undefined,
+        unusedAtRules: undefined,
+        useOriginalHtmlPage: undefined,
+        useUnsafeHtmlReplace: undefined,
+        useUnsafeCssReplace: undefined,
+        useSessionCache: undefined,
+        stripCommentsAndCDATA: undefined,
+        normalizeHtmlOutput: undefined,
+        escapeReservedCharacters: undefined,
+        ignoreServerCodeBlocks: undefined
+    };
+    htmlFile = null;
+    cssFiles = [];
+    jsFiles = [];
+    svgFiles = [];
+    baseDirectory = '';
+    baseUrl = '';
+    productionRelease = false;
+    productionIncremental = false;
+    templateMap = {};
+    userAgentData = {};
+    related = new Map();
+    replaced = [];
+    formatMap;
+    _moduleName = 'chrome';
+    _threadable = true;
+    _dataSource;
+    _mimeMap;
+    _elements = null;
+    _cloudUrlMap;
+    _cloudUploaded;
+    _cloudEndpoint;
+    _idMap = Object.create(null);
+    _editing = [];
+    _queryMap = new Map();
+    _selectorMap = new Map();
     init(assets, config) {
         assets.sort((a, b) => {
             if (!(0, types_1.isEmpty)(a.bundleId) && a.bundleId === b.bundleId) {
@@ -1163,19 +1168,15 @@ class ChromeDocument extends Document {
                         else {
                             item.editing = false;
                         }
-                        item.mimeType = 'text/html';
                         break;
                     case 'text/css':
                         this.cssFiles.push(item);
                         this._editing.push(item);
-                        item.editing = true;
-                        item.mimeType = 'text/css';
                         break;
                     case 'text/javascript':
                     case 'application/javascript':
                         this.jsFiles.push(item);
                         this._editing.push(item);
-                        item.editing = true;
                         item.mimeType = 'application/javascript';
                         break;
                 }
@@ -1426,27 +1427,30 @@ class ChromeDocument extends Document {
                 const instance = host.loadModule('compress');
                 const buffer = host.getBuffer(file);
                 if (instance && buffer) {
-                    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, 8);
-                        }
-                        else if (result) {
+                    const options = { format: to, filename: file.filename, etag: file.etag };
+                    await instance.tryFile(buffer, options)
+                        .then(result => {
+                        if (result) {
+                            let ext = options.outExt;
                             if (ext) {
                                 setFormat(ext.startsWith('woff') ? ext : ext === 'otf' ? 'opentype' : 'truetype');
                             }
-                            const output = (0, types_1.renameExt)(localUri, ext || (ext = to));
+                            const output = (0, types_1.renameExt)(localUri, ext ||= to);
                             file.mimeType = 'font/' + ext;
-                            fs.writeFile(output, result, error => {
-                                if (!error) {
-                                    file.buffer = result;
+                            fs.writeFile(output, result, err => {
+                                if (!err) {
+                                    file.buffer = Buffer.from(result);
                                     host.replace(file, output);
                                 }
                                 else {
-                                    this.writeFail("Unable to write file", error, 32);
+                                    this.writeFail("Unable to write file", err, 32);
                                 }
                             });
                         }
+                    })
+                        .catch((err) => {
+                        setFormat();
+                        this.writeFail("Unable to compress file", err, 8);
                     });
                 }
                 break;
@@ -1581,7 +1585,6 @@ class ChromeDocument extends Document {
         return (trailing !== undefined ? [source, trailing] : source);
     }
     resolveImports(file, code, baseFile) {
-        var _a;
         if (!Array.isArray(file.imports)) {
             return;
         }
@@ -1597,7 +1600,7 @@ class ChromeDocument extends Document {
         }
         const importMap = {};
         for (const item of file.imports) {
-            (importMap[_a = item.placeholder] || (importMap[_a] = [])).push(item);
+            (importMap[item.placeholder] ||= []).push(item);
         }
         for (const placeholder in importMap) {
             const items = importMap[placeholder];
@@ -1622,7 +1625,7 @@ class ChromeDocument extends Document {
                     }
                     if (!value || !hosted && !Document.isPath(value)) {
                         if (i < length - 1) {
-                            found || (found = value);
+                            found ||= value;
                             continue;
                         }
                         value = found || original;
@@ -1684,7 +1687,7 @@ class ChromeDocument extends Document {
         if (output && command && file.element?.outerXml) {
             const match = REGEXP_SRCSETSIZE.exec(command);
             if (match) {
-                (file.srcSet || (file.srcSet = [])).push(toPosix(data.baseDirectory ? output.substring(data.baseDirectory.length + 1) : output), match[1] + match[2].toLowerCase());
+                (file.srcSet ||= []).push(toPosix(data.baseDirectory ? output.substring(data.baseDirectory.length + 1) : output), match[1] + match[2].toLowerCase());
                 file.modified = true;
                 return true;
             }
@@ -1738,6 +1741,7 @@ class ChromeDocument extends Document {
         }
         const { host, instance, localStorage } = state;
         const htmlFile = this.htmlFile;
+        const preferBuffer = process.env.EMC_CLOUD_UPLOAD_BUFFER === 'true';
         const checkDocument = (item) => {
             if (item.inlineUrlCloudMap) {
                 const source = host.getUTF8String(item);
@@ -1751,7 +1755,7 @@ class ChromeDocument extends Document {
                 }
                 if (output && output !== source) {
                     try {
-                        fs.writeFileSync(item.localUri, output, item.encoding || (item.encoding = 'utf-8'));
+                        fs.writeFileSync(item.localUri, output, item.encoding ||= 'utf-8');
                         item.sourceUTF8 = output;
                     }
                     catch (err) {
@@ -1767,7 +1771,7 @@ class ChromeDocument extends Document {
                     if (item.compress) {
                         await host.compressFile(item);
                     }
-                    await Promise.all(Cloud.uploadAsset(state, item, item.mimeType));
+                    await Promise.all(Cloud.uploadAsset(state, item, { preferBuffer }));
                 }
             }
             if (this.aborted) {
@@ -1780,7 +1784,7 @@ class ChromeDocument extends Document {
             if ((0, types_1.isArray)(cloudStorage)) {
                 for (const storage of cloudStorage) {
                     if (instance.hasCredential('storage', storage)) {
-                        const { service, admin, bucket, upload } = storage;
+                        const { admin, bucket, upload } = storage;
                         const website = admin?.configBucket?.website;
                         if ((0, types_1.isPlainObject)(website) && bucket && upload) {
                             let filename = joinPath(upload.pathname, upload.filename || path.basename(htmlFile.localUri));
@@ -1799,14 +1803,14 @@ class ChromeDocument extends Document {
                             if (website.errorPath === true) {
                                 website.errorPath = filename;
                             }
-                            instance.setBucketWebsite(service, instance.getCredential(storage), bucket, website);
+                            instance.setBucketWebsite(storage.service, instance.getCredential(storage), bucket, website);
                         }
                     }
                 }
                 if (htmlFile.compress) {
                     await host.compressFile(htmlFile);
                 }
-                return Promise.all(Cloud.uploadAsset(state, htmlFile, 'text/html', true));
+                return Promise.all(Cloud.uploadAsset(state, htmlFile, { preferBuffer, contentType: 'text/html', ignoreProcess: true }));
             }
         }
         return [];
@@ -1873,8 +1877,8 @@ class ChromeDocument extends Document {
                     search = next.url.search;
                 }
             }
-            search ?? (search = restoreSearchParams(asset.url?.search));
-            status && (status = status.filter(item => item.type >= types_1.STATUS_TYPE.FATAL && item.type <= types_1.STATUS_TYPE.WARN));
+            search ??= restoreSearchParams(asset.url?.search);
+            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,
@@ -2224,7 +2228,6 @@ class ChromeDocument extends Document {
         htmlFile.sourceUTF8 = source;
     }
     async setElementAttributes({ host, startTime, productionRelease }, domBase) {
-        var _a;
         const { moduleName, htmlFile } = this;
         const cloud = host.Cloud;
         const removeWatchReload = (item) => (0, types_1.isObject)(item.watch) && delete item.watch.reload;
@@ -2261,8 +2264,8 @@ class ChromeDocument extends Document {
                 }
                 if (uri && !(0, util_1.hasValue)(item.format, 'crossorigin') && item !== htmlFile) {
                     if (cloud?.getStorage('upload', item.cloudStorage)) {
-                        const inlineUrlCloud = item.inlineUrlCloud || (item.inlineUrlCloud = (0, types_1.generateUUID)());
-                        ((_a = htmlFile).inlineUrlCloudMap || (_a.inlineUrlCloudMap = {}))[inlineUrlCloud] = productionRelease ? this.removeServerRoot(uri) : uri;
+                        const inlineUrlCloud = item.inlineUrlCloud ||= (0, types_1.generateUUID)();
+                        (htmlFile.inlineUrlCloudMap ||= {})[inlineUrlCloud] = productionRelease ? this.removeServerRoot(uri) : uri;
                         uri = inlineUrlCloud;
                     }
                     if (!(0, util_1.hasValue)(item.format, 'webbundle')) {
@@ -2353,12 +2356,13 @@ class ChromeDocument extends Document {
         const cloud = host.Cloud;
         const sessionKey = (0, types_1.generateUUID)();
         const cacheData = Object.create(null);
+        const coerceMap = {};
         const dataItems = [];
         const displayItems = [];
         this.dataSource.forEach(item => item.type === 'display' ? displayItems.push(item) : dataItems.push(item));
         const removeElement = (item, element) => {
             if (item.removeEmpty || item.type === 'display') {
-                (element || (element = new dom_1.HtmlElement(moduleName, item.element))).remove = true;
+                (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, startTime });
                 }
@@ -2371,7 +2375,7 @@ class ChromeDocument extends Document {
                 this.writeFail(["Invalid credentials", item.source], err);
             }
         };
-        const checkObject = (item, data) => {
+        const checkObject = (item, data, type) => {
             const { query, cascade } = item;
             if ((0, types_1.isString)(cascade)) {
                 const result = data && (0, types_1.cascadeObject)(data, cascade, data);
@@ -2401,6 +2405,9 @@ class ChromeDocument extends Document {
                         this.checkPackage(err, pkg, ["Unable to filter results", item.source]);
                     }
                 }
+                if (type && !item.ignoreCoerce && (coerceMap[type] ??= this.settingsOf(type, 'coerce') === true)) {
+                    (0, types_1.coerceObject)(data);
+                }
             }
             return Array.isArray(data) ? data : (0, types_1.isObject)(data) ? [data] : null;
         };
@@ -2418,7 +2425,7 @@ class ChromeDocument extends Document {
                         const { service, credential } = item;
                         if (cloud) {
                             const key = service + '_' + (service === 'atlas' && item.uri || '') + '_' + asString(credential, true);
-                            (batchMap[key] || (batchMap[key] = [])).push(item);
+                            (batchMap[key] ||= []).push(item);
                         }
                         else {
                             errorCredential(item, (0, types_1.errorValue)("Cloud module not installed", service));
@@ -2448,7 +2455,7 @@ class ChromeDocument extends Document {
                                         key = core_1.ClientDb.keyOfResult(type, credential);
                                         break;
                                 }
-                                (batchMap[key] || (batchMap[key] = [])).push(item);
+                                (batchMap[key] ||= []).push(item);
                             }
                             catch (err) {
                                 errorCredential(item, err);
@@ -2482,7 +2489,7 @@ class ChromeDocument extends Document {
                     let result = new Array(length), errors;
                     switch (type) {
                         case 'cloud':
-                            result = await cloud.getDatabaseBatchRows(batch, true, sessionKey).catch(err => {
+                            result = await cloud.getDatabaseBatchRows(batch, true, sessionKey).catch((err) => {
                                 this.abort(type);
                                 if (err instanceof Error) {
                                     cloud.addLog(this.aborted ? types_1.STATUS_TYPE.ERROR : types_1.STATUS_TYPE.WARN, errors = err);
@@ -2491,49 +2498,43 @@ class ChromeDocument extends Document {
                             });
                             break;
                         case 'json':
-                            if ((result[0] = checkObject(current, current.items)) === null) {
+                            if ((result[0] = checkObject(current, current.items, type)) === null) {
                                 this.abort(type);
                                 errorRemove(current, errorDataSource("Invalid parameters" + ' (items)', type));
                                 return;
                             }
-                            if (this.settingsOf(type, 'coerce') === true) {
-                                (0, types_1.coerceObject)(result[0]);
-                            }
                             break;
                         case 'uri':
                         case 'local': {
-                            const { ignoreCache, encoding = 'utf-8', options } = current;
+                            const encoding = current.encoding || 'utf-8';
                             let content, target, data, cacheKey;
                             if (type === 'local') {
                                 let location;
-                                ({ pathname: target } = current);
-                                if (target && ((location = this.resolveDir('data', target)) || host.canRead(location = path.resolve(target), { ownPermissionOnly: true }))) {
-                                    if (!ignoreCache && CACHE_DBRESULT.has(location)) {
-                                        data = getCacheItem(CACHE_DBRESULT, location);
+                                if (!(0, types_1.isString)(target = current.pathname) || !((location = this.resolveDir('data', target)) || host.canRead(location = path.resolve(target), { ownPermissionOnly: true }))) {
+                                    this.abort(type);
+                                    errorRemove(current, target ? errorDataSource('Not found', target) : errorDataSource('Not defined - ' + (this.settings.directory?.data ? 'file' : 'directory'), type));
+                                    return;
+                                }
+                                if (!current.ignoreCache && CACHE_DBRESULT.has(location)) {
+                                    data = getCacheItem(CACHE_DBRESULT, location);
+                                }
+                                else {
+                                    if (current.ignoreCache === 1) {
+                                        CACHE_DBRESULT.delete(location);
                                     }
-                                    else {
-                                        if (ignoreCache === 1) {
-                                            CACHE_DBRESULT.delete(location);
+                                    if (!(data = cacheData[location])) {
+                                        try {
+                                            content = fs.readFileSync(location, encoding);
+                                            cacheKey = location;
                                         }
-                                        if (!(data = cacheData[location])) {
-                                            try {
-                                                content = fs.readFileSync(location, encoding);
-                                                cacheKey = location;
-                                            }
-                                            catch (err) {
-                                                this.abort(type);
-                                                this.writeFail(["Unable to read file", path.basename(location)], err, { type: 32, startTime });
-                                                errorRemove(current);
-                                                return;
-                                            }
+                                        catch (err) {
+                                            this.abort(type);
+                                            this.writeFail(["Unable to read file", path.basename(location)], err, { type: 32, startTime });
+                                            errorRemove(current);
+                                            return;
                                         }
                                     }
                                 }
-                                else {
-                                    this.abort(type);
-                                    errorRemove(current, target ? errorDataSource('Not found', target) : errorDataSource('Not defined - ' + (this.settings.directory?.data ? 'file' : 'directory'), type));
-                                    return;
-                                }
                             }
                             else if (!(0, types_1.isString)(target = current.uri)) {
                                 this.abort(type);
@@ -2556,11 +2557,11 @@ class ChromeDocument extends Document {
                                         return;
                                     }
                                 }
-                                else if (!ignoreCache && CACHE_DBRESULT.has(target)) {
+                                else if (!current.ignoreCache && CACHE_DBRESULT.has(target)) {
                                     data = getCacheItem(CACHE_DBRESULT, target);
                                 }
                                 else {
-                                    if (ignoreCache === 1) {
+                                    if (current.ignoreCache === 1) {
                                         CACHE_DBRESULT.delete(target);
                                     }
                                     if (!(data = cacheData[target])) {
@@ -2579,17 +2580,17 @@ class ChromeDocument extends Document {
                             }
                             else {
                                 const pathname = Document.resolveFile(target);
-                                if (!ignoreCache && CACHE_DBRESULT.has(pathname)) {
+                                if (!current.ignoreCache && CACHE_DBRESULT.has(pathname)) {
                                     data = getCacheItem(CACHE_DBRESULT, pathname);
                                 }
                                 else {
-                                    if (ignoreCache === 1) {
+                                    if (current.ignoreCache === 1) {
                                         CACHE_DBRESULT.delete(pathname);
                                     }
                                     if (!(data = cacheData[pathname])) {
                                         if (!host.canRead(pathname, { ownPermissionOnly: true })) {
                                             this.abort(type);
-                                            errorRemove(current, errorDataSource('Access denied', pathname));
+                                            errorRemove(current, errorDataSource("Unsupported access", pathname));
                                             return;
                                         }
                                         try {
@@ -2611,11 +2612,11 @@ class ChromeDocument extends Document {
                             if ((0, types_1.isString)(content)) {
                                 const { format = path.extname(target).substring(1) } = current;
                                 try {
-                                    data = this.tryParse(content, format, options);
+                                    data = this.tryParse(content, format, current.options);
                                 }
                                 catch (err) {
                                     this.abort(type);
-                                    this.writeFail(['Unable to parse data source', format], err, { type: 4, startTime });
+                                    this.writeFail(["Unable to parse inline object", format], err, { type: 4, startTime });
                                     errorRemove(current);
                                     return;
                                 }
@@ -2626,37 +2627,34 @@ class ChromeDocument extends Document {
                             }
                             if (!data) {
                                 this.abort(type);
-                                errorRemove(current, errorDataSource(content !== null ? 'Invalid response' : 'Empty response', target));
+                                errorRemove(current, errorDataSource(content !== null ? "Invalid response" : "Unknown", target));
                                 return;
                             }
                             if (cacheKey) {
                                 setCacheData.call(this, current, data, cacheKey, cacheData);
                             }
-                            if ((result[0] = checkObject(current, data)) === null) {
+                            if ((result[0] = checkObject(current, data, type)) === null) {
                                 this.abort(type);
                                 errorRemove(current, errorDataSource('Invalid ' + (current.query ? 'query' : 'URI'), target));
                                 return;
                             }
-                            if (this.settingsOf(type, 'coerce') === true) {
-                                (0, types_1.coerceObject)(result[0]);
-                            }
                             break;
                         }
                         case 'export': {
-                            const ignoreCache = current.ignoreCache;
                             const cacheKey = asString(current, true);
-                            if (!ignoreCache && CACHE_DBRESULT.has(cacheKey)) {
+                            if (!current.ignoreCache && CACHE_DBRESULT.has(cacheKey)) {
                                 result[0] = getCacheItem(CACHE_DBRESULT, cacheKey);
                             }
                             else {
-                                if (ignoreCache === 1) {
+                                if (current.ignoreCache === 1) {
                                     CACHE_DBRESULT.delete(cacheKey);
                                 }
                                 if (cacheKey in cacheData) {
                                     result[0] = cacheData[cacheKey];
                                 }
                                 else {
-                                    let { pathname, execute, params } = current, data, target, getData, hint;
+                                    const { pathname, execute, params } = current;
+                                    let data, target, getData, hint;
                                     if (typeof execute === 'function') {
                                         target = execute;
                                     }
@@ -2664,7 +2662,7 @@ class ChromeDocument extends Document {
                                         target = pathname;
                                     }
                                     else if ((0, types_1.isString)(pathname)) {
-                                        if ((pathname = pathname.trim()).startsWith('npm:')) {
+                                        if (pathname.startsWith('npm:')) {
                                             target = pathname;
                                             hint = pathname;
                                         }
@@ -2677,7 +2675,7 @@ class ChromeDocument extends Document {
                                     }
                                     if (!getData) {
                                         const { settings, encoding, persist = true } = current;
-                                        target || (target = settings && this.settings.export?.[settings] || pathname);
+                                        target ||= settings && this.settings.export?.[settings] || pathname;
                                         if (typeof target === 'function') {
                                             getData = target;
                                             hint = target.name;
@@ -2692,7 +2690,7 @@ class ChromeDocument extends Document {
                                         return;
                                     }
                                     try {
-                                        if (params && this.settingsOf(type, 'coerce') === true) {
+                                        if (params && !current.ignoreCoerce && this.settingsOf(type, 'coerce') === true) {
                                             (0, types_1.coerceObject)(params);
                                         }
                                         if (getData["__cjs__"]) {
@@ -2736,136 +2734,129 @@ class ChromeDocument extends Document {
                             break;
                         }
                         default:
-                            if (db?.hasSource(type)) {
-                                switch (type) {
-                                    case 'mongodb':
-                                        for (let j = 0; j < length; ++j) {
-                                            const cmd = batch[j];
-                                            cmd.cacheObjectKey = typeof cmd.cascade === 'string' ? cmd.cascade : '';
-                                        }
-                                        break;
-                                    case 'redis':
-                                        for (let j = 0; j < length; ++j) {
-                                            const cmd = batch[j];
-                                            const { search, key, query, cascade } = cmd;
-                                            if ((0, types_1.isObject)(search) && typeof search.schema === 'string') {
-                                                const pathname = this.resolveDir('schema', search.schema);
-                                                if (pathname) {
-                                                    const ignoreCache = cmd.ignoreCache;
-                                                    if (!ignoreCache && CACHE_LOCALFILE.has(pathname)) {
-                                                        search.schema = getCacheItem(CACHE_LOCALFILE, pathname);
+                            if (!db?.hasSource(type)) {
+                                errorRemove(current, errorDataSource('Not found', type || "Unknown"));
+                                return;
+                            }
+                            switch (type) {
+                                case 'mongodb':
+                                    for (let j = 0; j < length; ++j) {
+                                        const cmd = batch[j];
+                                        cmd.cacheObjectKey = typeof cmd.cascade === 'string' ? cmd.cascade : '';
+                                    }
+                                    break;
+                                case 'redis':
+                                    for (let j = 0; j < length; ++j) {
+                                        const cmd = batch[j];
+                                        const { search, key, query, cascade } = cmd;
+                                        if ((0, types_1.isObject)(search) && typeof search.schema === 'string') {
+                                            const pathname = this.resolveDir('schema', search.schema);
+                                            if (pathname) {
+                                                if (!cmd.ignoreCache && CACHE_LOCALFILE.has(pathname)) {
+                                                    search.schema = getCacheItem(CACHE_LOCALFILE, pathname);
+                                                }
+                                                else {
+                                                    if (cmd.ignoreCache === 1) {
+                                                        CACHE_LOCALFILE.delete(pathname);
                                                     }
-                                                    else {
-                                                        if (ignoreCache === 1) {
-                                                            CACHE_LOCALFILE.delete(pathname);
+                                                    if (!(search.schema = cacheData[pathname])) {
+                                                        try {
+                                                            search.schema = loadLocalFile.call(this, current, pathname, cacheData, cmd.encoding);
                                                         }
-                                                        if (!(search.schema = cacheData[pathname])) {
-                                                            try {
-                                                                search.schema = loadLocalFile.call(this, current, pathname, cacheData, cmd.encoding);
-                                                            }
-                                                            catch (err) {
-                                                                this.writeFail(['Unable to parse document', path.basename(pathname)], err instanceof Error ? errors = err : err, { startTime });
-                                                                search.schema = undefined;
-                                                            }
+                                                        catch (err) {
+                                                            this.writeFail(['Unable to parse document', path.basename(pathname)], err instanceof Error ? errors = err : err, { startTime });
+                                                            search.schema = undefined;
                                                         }
                                                     }
                                                 }
-                                                else {
-                                                    search.schema = undefined;
-                                                }
                                             }
-                                            if (key) {
-                                                cmd.cacheObjectKey = ((0, types_1.isString)(cascade) ? cascade : '') + '_' + ((0, types_1.isString)(query) ? query : '');
+                                            else {
+                                                search.schema = undefined;
                                             }
                                         }
-                                        break;
-                                    default:
-                                        if (db.hasSource(type, db.sourceType.SQL)) {
-                                            for (let j = 0; j < length; ++j) {
-                                                const cmd = batch[j];
-                                                const query = cmd.query;
-                                                if (typeof query === 'string' && query.endsWith('.sql')) {
-                                                    const pathname = this.resolveDir('sql', query);
-                                                    try {
-                                                        if (pathname) {
-                                                            const ignoreCache = cmd.ignoreCache;
-                                                            if (!ignoreCache && CACHE_LOCALFILE.has(pathname)) {
-                                                                cmd.query = getCacheItem(CACHE_LOCALFILE, pathname);
+                                        if (key) {
+                                            cmd.cacheObjectKey = ((0, types_1.isString)(cascade) ? cascade : '') + '_' + ((0, types_1.isString)(query) ? query : '');
+                                        }
+                                    }
+                                    break;
+                                default:
+                                    if (db.hasSource(type, db.sourceType.SQL)) {
+                                        for (let j = 0; j < length; ++j) {
+                                            const cmd = batch[j];
+                                            const query = cmd.query;
+                                            if (typeof query === 'string' && query.endsWith('.sql')) {
+                                                const pathname = this.resolveDir('sql', query);
+                                                try {
+                                                    if (pathname) {
+                                                        if (!cmd.ignoreCache && CACHE_LOCALFILE.has(pathname)) {
+                                                            cmd.query = getCacheItem(CACHE_LOCALFILE, pathname);
+                                                        }
+                                                        else {
+                                                            if (cmd.ignoreCache === 1) {
+                                                                CACHE_LOCALFILE.delete(pathname);
                                                             }
-                                                            else {
-                                                                if (ignoreCache === 1) {
-                                                                    CACHE_LOCALFILE.delete(pathname);
+                                                            if (!(cmd.query = cacheData[pathname])) {
+                                                                const out = { content: '' };
+                                                                try {
+                                                                    cmd.query = loadLocalFile.call(this, current, pathname, cacheData, cmd.encoding, out);
                                                                 }
-                                                                if (!(cmd.query = cacheData[pathname])) {
-                                                                    const out = { content: '' };
-                                                                    try {
-                                                                        cmd.query = loadLocalFile.call(this, current, pathname, cacheData, cmd.encoding, out);
-                                                                    }
-                                                                    catch {
-                                                                        setCacheData.call(this, current, cmd.query = out.content, pathname, cacheData, true);
-                                                                    }
+                                                                catch {
+                                                                    setCacheData.call(this, current, cmd.query = out.content, pathname, cacheData, true);
                                                                 }
                                                             }
                                                         }
-                                                        else {
-                                                            throw (0, types_1.errorMessage)(type, "File not found", query);
-                                                        }
                                                     }
-                                                    catch (err) {
-                                                        this.abort(type);
-                                                        this.writeFail(["Unable to read file", pathname ? path.basename(pathname) : query], err, { startTime });
-                                                        errorRemove(current);
-                                                        return;
+                                                    else {
+                                                        throw (0, types_1.errorMessage)(type, "File not found", query);
                                                     }
                                                 }
+                                                catch (err) {
+                                                    this.abort(type);
+                                                    this.writeFail(["Unable to read file", pathname ? path.basename(pathname) : query], err, { startTime });
+                                                    errorRemove(current);
+                                                    return;
+                                                }
                                             }
                                         }
-                                        break;
-                                }
-                                try {
-                                    let coerce, cache;
-                                    if (type === 'mongodb' || type === 'redis') {
-                                        coerce = this.settingsOf(type, 'coerce');
-                                        cache = this.settingsOf(type, 'cache');
                                     }
-                                    const errorQuery = (err, data, commandType) => {
-                                        let message, aborting = true;
-                                        if (db.hasSource(type, db.sourceType.DOCUMENT)) {
-                                            message = (data.name ? data.name + ': ' : '') + (data.table || '');
-                                        }
-                                        else if (db.hasSource(type, db.sourceType.KEYVALUE)) {
-                                            aborting = commandType !== db.commandType.UPDATE;
-                                            message = asString(data.search || data.key);
-                                        }
-                                        else {
-                                            const credential = data.credential;
-                                            if ((0, types_1.isPlainObject)(credential)) {
-                                                message = credential.database;
-                                            }
-                                        }
-                                        if (data.willAbort) {
-                                            this.abort(undefined, err);
-                                        }
-                                        else if (aborting) {
-                                            this.abort(type, err);
-                                        }
-                                        if (err) {
-                                            this.writeFail(["Unable to execute query", message || "Unknown"], err instanceof Error ? errors = err : err, { type: 65536, startTime });
+                                    break;
+                            }
+                            try {
+                                const errorQuery = (err, data, commandType) => {
+                                    let message, aborting = true;
+                                    if (db.hasSource(type, db.sourceType.DOCUMENT)) {
+                                        message = (data.name ? data.name + ': ' : '') + (data.table || '');
+                                    }
+                                    else if (db.hasSource(type, db.sourceType.KEYVALUE)) {
+                                        aborting = commandType !== db.commandType.UPDATE;
+                                        message = asString(data.search || data.key);
+                                    }
+                                    else {
+                                        const credential = data.credential;
+                                        if ((0, types_1.isPlainObject)(credential)) {
+                                            message = credential.database;
                                         }
-                                        return this.aborted;
-                                    };
-                                    const options = { coerce, cache, checkObject, sessionKey, connectOnce: length > 1, outCacheMiss: cacheMiss, errorQuery };
-                                    result = await db.executeBatchQuery(batch, options, result);
-                                }
-                                catch (err) {
-                                    this.abort(type);
-                                    const pkg = getPackageName(err);
-                                    errorClient(current, pkg && this.checkPackage(err, pkg) ? null : err);
-                                }
-                                break;
+                                    }
+                                    if (data.willAbort) {
+                                        this.abort(undefined, err);
+                                    }
+                                    else if (aborting) {
+                                        this.abort(type, err);
+                                    }
+                                    if (err) {
+                                        this.writeFail(["Unable to execute query", message || "Unknown"], err instanceof Error ? errors = err : err, { type: 65536, startTime });
+                                    }
+                                    return this.aborted;
+                                };
+                                const options = { checkObject, sessionKey, connectOnce: length > 1, outCacheMiss: cacheMiss, errorQuery };
+                                result = await db.executeBatchQuery(batch, options, result);
+                            }
+                            catch (err) {
+                                this.abort(type);
+                                const pkg = getPackageName(err);
+                                errorClient(current, pkg && this.checkPackage(err, pkg) ? null : err);
                             }
-                            errorRemove(current, errorDataSource('Not found', type || "Unknown"));
-                            return;
+                            break;
                     }
                     if (this.aborted) {
                         resolve();
@@ -2873,9 +2864,9 @@ class ChromeDocument extends Document {
                     }
                     for (let i = 0, items; i < length; ++i) {
                         const item = batch[i];
-                        const { index, limit, ignoreEmpty, postQuery, whenEmpty } = item;
+                        const { index, limit, postQuery, whenEmpty } = item;
                         const empty = (items = result[i]) === null;
-                        if ((items || (items = [])).length === 0) {
+                        if ((items ||= []).length === 0) {
                             if (whenEmpty) {
                                 const data = await checkData.call(this, item, whenEmpty, items, row => Array.isArray(row));
                                 if (data) {
@@ -2883,7 +2874,7 @@ class ChromeDocument extends Document {
                                     item.transactionFail = false;
                                 }
                             }
-                            if (ignoreEmpty && items.length === 0) {
+                            if (item.ignoreEmpty && items.length === 0) {
                                 continue;
                             }
                         }
@@ -2914,12 +2905,11 @@ class ChromeDocument extends Document {
                             if (item.template) {
                                 const pathname = this.resolveDir('template', item.template);
                                 if (pathname) {
-                                    const ignoreCache = item.ignoreCache;
-                                    if (!ignoreCache && CACHE_LOCALFILE.has(pathname)) {
+                                    if (!item.ignoreCache && CACHE_LOCALFILE.has(pathname)) {
                                         item.value = getCacheItem(CACHE_LOCALFILE, pathname);
                                     }
                                     else {
-                                        if (ignoreCache === 1) {
+                                        if (item.ignoreCache === 1) {
                                             CACHE_LOCALFILE.delete(pathname);
                                         }
                                         if (!(item.value = cacheData[pathname])) {
@@ -2960,7 +2950,7 @@ class ChromeDocument extends Document {
                                                 for (let j = 0, match; j < items.length; ++j) {
                                                     const row = items[j];
                                                     if ((0, types_1.isPlainObject)(row)) {
-                                                        row.__index__ ?? (row.__index__ = j + 1);
+                                                        row.__index__ ??= j + 1;
                                                     }
                                                     let segment = template;
                                                     while (match = REGEXP_TEMPLATECONDITIONAL.exec(segment)) {
@@ -3179,7 +3169,7 @@ class ChromeDocument extends Document {
                                                 }
                                             }
                                             if (errors && item.removeEmpty) {
-                                                domElement.remove || (domElement.remove = true);
+                                                domElement.remove ||= true;
                                             }
                                         }
                                         if (!domElement.remove) {
@@ -3207,7 +3197,7 @@ class ChromeDocument extends Document {
                         else {
                             if (!empty && item.type !== 'display' || item.transactionFail) {
                                 const emptyResponse = (value, service = item.source) => {
-                                    value || (value = "Unknown");
+                                    value ||= "Unknown";
                                     return errors instanceof Error ? (0, types_1.errorMessage)(service, value, errors.message) : errorDataSource(service + ' -> Empty', value);
                                 };
                                 switch (item.source) {
@@ -3279,7 +3269,7 @@ class ChromeDocument extends Document {
                                     let value;
                                     if (data && (value = Document.asHash(data, { algorithm, encoding: item.encoding, digest: 'base64' }))) {
                                         attributes.integrity = algorithm + '-' + value;
-                                        attributes.crossorigin || (attributes.crossorigin = 'anonymous');
+                                        attributes.crossorigin ||= 'anonymous';
                                         break;
                                     }
                                     throw (0, types_1.errorMessage)('hash', 'Source not found', item.filename);
@@ -3299,9 +3289,8 @@ class ChromeDocument extends Document {
             }
         }
     }
-    removeUnusedStyles(source, { useUnsafeCssReplace, usedVariables, usedFontFace, usedKeyframes, unusedStyles, unusedMedia, unusedContainer, unusedSupports, useSessionCache } = this.config) {
-        var _a;
-        if (!usedVariables && !usedFontFace && !usedKeyframes && !unusedStyles && !unusedMedia && !unusedContainer && !unusedSupports) {
+    removeUnusedStyles(source, { useUnsafeCssReplace, usedVariables, usedFontFace, usedKeyframes, unusedStyles, unusedMedia, unusedSupports, unusedContainer, unusedScope, useSessionCache } = this.config) {
+        if (!usedVariables && !usedFontFace && !usedKeyframes && !unusedStyles && !unusedMedia && !unusedContainer && !unusedSupports && !unusedScope) {
             return;
         }
         const queryMap = useSessionCache ? CACHE_QUERY : this._queryMap;
@@ -3407,15 +3396,17 @@ class ChromeDocument extends Document {
             }
             return selector.replace(/ +/g, getStringMany()) + getStringSome();
         };
-        const replaceUnunsed = (name, items, nesting) => {
-            for (let value of items) {
-                const key = name + '_' + (value = value.trim()) + (useUnsafeCssReplace ? '_1' : '');
+        const replaceUnunsed = (name, items, nesting, increment = 1) => {
+            for (let i = 0; i < items.length; i += increment) {
+                const value = items[i].trim();
+                let valueTo;
+                const key = name + '_' + value + (increment === 2 && (valueTo = items[i + 1].trim()) ? '_' + valueTo : '') + (useUnsafeCssReplace ? '_1' : '');
                 let pattern = queryMap.get(key), rule;
                 if (!pattern) {
                     let flags = 'gi', selector = '', revised;
                     if (name === 'container') {
-                        for (let i = 0, length = value.length, casing = true; i < length; i++) {
-                            let ch = value[i];
+                        for (let j = 0, length = value.length, casing = true; j < length; j++) {
+                            let ch = value[j];
                             if (!casing) {
                                 ch = ch.toLowerCase();
                             }
@@ -3423,7 +3414,7 @@ class ChromeDocument extends Document {
                                 casing = false;
                             }
                             if (casing || ch < 'a' || ch > 'z') {
-                                selector += value[i];
+                                selector += value[j];
                                 if (selector.endsWith(' not ')) {
                                     selector = selector.replace(/ not $/, ' `nN``oO``tT` ');
                                 }
@@ -3434,6 +3425,14 @@ class ChromeDocument extends Document {
                         }
                         flags = 'g';
                     }
+                    else if (name === 'scope') {
+                        selector = `\\(${getStringSome() + parseSelector(value)}\\)`;
+                        if (valueTo) {
+                            selector += `${getStringMany()}[tT][oO]${getStringMany()}\\(${getStringSome() + parseSelector(valueTo)}\\)`;
+                        }
+                        flags = 'g';
+                        revised = true;
+                    }
                     else if (name === 'supports' && /^selector\(/i.test(value)) {
                         const startIndex = value.indexOf('(');
                         const endIndex = value.lastIndexOf(')');
@@ -3460,25 +3459,18 @@ class ChromeDocument extends Document {
                     pattern.lastIndex = 0;
                 }
                 while (rule = pattern.exec(current)) {
-                    invalid: {
-                        if (!nesting) {
-                            for (let i = rule.index - 1; i > 0; --i) {
-                                const ch = current[i];
-                                if (ch === '}') {
-                                    break;
-                                }
-                                if (ch === '{') {
-                                    break invalid;
-                                }
-                            }
-                        }
-                        const [endIndex, trailing] = findClosingIndex(current, getEndIndex(rule), '{');
-                        if (endIndex !== -1) {
-                            current = spliceSource(current, rule.index, endIndex, pattern, rule[1], trailing);
-                            (checkEmpty || (checkEmpty = {}))[name] = true;
-                            modified = true;
+                    if (!nesting) {
+                        const block = Array.from(current.substring(0, rule.index).matchAll(/{|}/g));
+                        if (block.filter(open => open[0] === '{').length !== block.filter(close => close[0] === '}').length) {
+                            continue;
                         }
                     }
+                    const [endIndex, trailing] = findClosingIndex(current, getEndIndex(rule), '{');
+                    if (endIndex !== -1) {
+                        current = spliceSource(current, rule.index, endIndex, pattern, rule[1], trailing);
+                        (checkEmpty ||= {})[name] = true;
+                        modified = true;
+                    }
                 }
             }
         };
@@ -3517,6 +3509,9 @@ class ChromeDocument extends Document {
         if (unusedContainer) {
             replaceUnunsed('container', unusedContainer, false);
         }
+        if (unusedScope) {
+            replaceUnunsed('scope', unusedScope.map(item => [item.start || '', item.end || '']).flat(), false, 2);
+        }
         if (unusedStyles) {
             current = (function recurse(target, child) {
                 let output = '', index = 0, pendingStart = 0, pendingEnd = 0, found = -1;
@@ -3668,7 +3663,7 @@ class ChromeDocument extends Document {
         }
         if (modified) {
             for (const name in checkEmpty) {
-                const pattern = CACHE_ATRULES[_a = name + (useUnsafeCssReplace ? '_1' : '')] || (CACHE_ATRULES[_a] = new RegExp(`(\\s*)@${name}[^{]*{${getStringSome()}}` + dom_1.DomWriter.PATTERN_TRAILINGSPACE, 'gi'));
+                const pattern = CACHE_ATRULES[name + (useUnsafeCssReplace ? '_1' : '')] ||= new RegExp(`(\\s*)@${name}[^{]*{${getStringSome()}}` + dom_1.DomWriter.PATTERN_TRAILINGSPACE, 'gi');
                 while (match = pattern.exec(current)) {
                     current = spliceSource(current, match.index, getEndIndex(match), pattern, match[1], match[2]);
                 }
@@ -3733,10 +3728,7 @@ class ChromeDocument extends Document {
         return [];
     }
     get settings() {
-        var _a;
-        return (_a = this.module).settings || (_a.settings = {});
+        return this.module.settings ||= {};
     }
 }
-ChromeDocument.INTERNAL_ASSIGNUUID = "__assign__";
-ChromeDocument.INTERNAL_SERVERROOT = "__serverroot__";
 module.exports = ChromeDocument;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/chrome",
-  "version": "0.6.6",
+  "version": "0.7.0",
   "description": "Chrome document constructor for E-mc.",
   "main": "index.js",
   "publishConfig": {
@@ -20,9 +20,9 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/cloud": "^0.8.7",
-    "@e-mc/core": "^0.8.7",
-    "@e-mc/document": "^0.8.7",
-    "@e-mc/types": "^0.8.7"
+    "@e-mc/cloud": "^0.9.0",
+    "@e-mc/core": "^0.9.0",
+    "@e-mc/document": "^0.9.0",
+    "@e-mc/types": "^0.9.0"
   }
 }

package/types/index.d.ts

@@ -26,10 +26,10 @@ interface DocumentDirectory extends IDocumentDirectory {
 }
 
 interface DocumentComponentExtended<T> extends DbSourceDataType<T> {
-    json?: T;
     uri?: T;
     local?: T;
     export?: T;
+    json?: T;
 }
 
 interface DocumentComponentOptions<T> extends IDocumentComponentOptions, DocumentComponentExtended<DocumentComponentOption<T>> {}
@@ -56,7 +56,7 @@ export interface FinalizeProcessing<T extends IFileManager<U>, U extends Documen
     readonly startTime: LogTime;
     readonly hashed: Set<DocumentAsset>;
     readonly contentMap: StringMap;
-    readonly bufferMap: ObjectMap<BufferContent>;
+    readonly bufferMap: ObjectMap<Bufferable>;
     readonly cacheMiss: string[];
     readonly productionRelease: Undef<true>;
 }
@@ -124,4 +124,4 @@ export interface ChromeDocumentConstructor<T extends IFileManager<U>, U extends
     INTERNAL_SERVERROOT: string;
     readonly prototype: IChromeDocument<T, U>;
     new(module?: DocumentModule, ...args: unknown[]): IChromeDocument<T, U>;
-}
+}

package/types/squared.d.ts

@@ -1,4 +1,4 @@
-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 { AttributeAction, ConditionProperty, CssConditionData, ElementAction, ExcludeAction, FileAsset, FromAction, HashAction, DataSource as IDataSource, ImportAction, MetadataAction, ViewEngine } 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';
@@ -18,11 +18,19 @@ interface DataObject extends CascadeAction {
     options?: PlainObject;
 }
 
+interface ScopeData {
+    start: Null<string>;
+    end: Null<string>;
+}
+
 export interface UserAgentData {
     platform: string;
+    name: string;
     brand: string;
     browser: number;
     version: Null<number[]>;
+    majorVersion: number;
+    mobile: boolean;
 }
 
 export interface DocumentOutput {
@@ -73,8 +81,9 @@ export interface CssRuleData {
     usedKeyframes?: string[];
     unusedStyles?: string[];
     unusedMedia?: string[];
-    unusedContainer?: string[];
     unusedSupports?: string[];
+    unusedContainer?: string[];
+    unusedScope?: ScopeData[];
     unusedAtRules?: UnusedAtRule[];
 }
 
@@ -88,13 +97,13 @@ export interface UnusedAtRule {
 
 export interface DataSource<T = string> extends IDataSource<T>, ElementAction {
     source: "cloud" | "json" | "uri" | "local" | "export" | DbSource;
-    element?: XmlTagNode;
     type?: "text" | "attribute" | "display";
     dynamic?: boolean;
-    value?: StringOfArray | ObjectMap<unknown>;
+    value?: ArrayOf<string> | AnyObject;
     template?: string;
     viewEngine?: ViewEngine | string;
     ignoreEmpty?: boolean;
+    ignoreCoerce?: boolean;
 }
 
 export interface TextDataSource extends DataSource {