@pi-r/chrome 0.3.6 → 0.3.8

package/index.js

@@ -32,7 +32,7 @@ const [REGEXP_NTHCHILD, REGEXP_NTHCHILD_UNSAFE, REGEXP_REPLACECSS] = (function (
     return [
         new RegExp(`\\(${PATTERN_STRING_SOME}([+-])?(?:(\\d*)[nN]|(0))?${PATTERN_STRING_SOME}([+-])?${PATTERN_STRING_SOME}(\\d*)(?:${PATTERN_STRING_MANY}[oO][fF]${PATTERN_STRING_MANY}(${parenthesis})${PATTERN_STRING_SOME}\\)|${PATTERN_STRING_SOME}\\))`, 'g'),
         new RegExp(`\\(\\s*([+-])?(?:(\\d*)[nN]|(0))?\\s*([+-])?\\s*(\\d*)(?:\\s+[oO][fF]\\s+(${parenthesis})\\s*\\)|\\s*\\))`, 'g'),
-        new RegExp(`^@import\\s+(?:url\\((?:[^)]|(?<=\\\\)\\))+\\)|"(?:[^"]|(?<=\\\\)")+"|'(?:[^']|(?<=\\\\)')+')(\\s*layer(?:\\(([^)]*)\\)|\\b))?(?:\\s*supports\\((${parenthesis})\\))?(.*?);?$`)
+        new RegExp(`^@import\\s+(?:url\\((?:[^)]|(?<=\\\\)\\))+\\)|"(?:[^"]|(?<=\\\\)")+"|'(?:[^']|(?<=\\\\)')+')(\\s*layer(\\([^)]*\\))?)?(?:\\s*supports\\((${parenthesis})\\))?(.*)$`, 'si')
     ];
 })();
 const REGEXP_COMMENT = new RegExp(dom_1.DomWriter.PATTERN_COMMENT, 'g');
@@ -46,9 +46,13 @@ 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 dataset = CACHE_DATASET[name] || (CACHE_DATASET[name] = [
+        const [a, b, c, d, e] = 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'),
@@ -56,24 +60,26 @@ function removeNamespace(name, source, newline, comments) {
             new RegExp(`data-${name}-template\\s*` + dom_1.DomWriter.PATTERN_ATTRVALUE)
         ]);
         source = source
-            .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], '');
+            .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, '');
     }
     return (0, types_1.isArray)(comments) ? source.replace(REGEXP_BLOCKEXCLUDE, (...capture) => getNewlineString(capture[1], capture[2], newline)) : source;
 }
 function getObjectValue(value, key) {
-    const pattern = /([^[.\s]+)((?:\s*\[[^\]]+\]\s*)+)?\s*\.?\s*/g;
+    REGEXP_OBJECT_NAME.lastIndex = 0;
     let found, match;
-    while (match = pattern.exec(key)) {
+    while (match = REGEXP_OBJECT_NAME.exec(key)) {
         if ((0, types_1.isObject)(value)) {
             value = value[match[1]];
-            if (match[2]) {
-                const subscript = /\[\s*(["'])?(.+?)\1\s*\]/g;
+            const name = match[2];
+            if (name) {
+                REGEXP_OBJECT_SUBSCRIPT.lastIndex = 0;
                 let index;
-                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))) {
+                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))) {
                         value = value[attr];
                     }
                     else {
@@ -91,14 +97,14 @@ function getObjectValue(value, key) {
     return found ? value : null;
 }
 function trimTemplate(value) {
-    const leading = /\s*\{\{- \s*((?:[^}]|}(?!}))+?)\}\}/g;
+    REGEXP_TEMPLATE_LEADING.lastIndex = 0;
     let match;
-    while (match = leading.exec(value)) {
-        value = replaceMatch(match, value, 1, leading);
+    while (match = REGEXP_TEMPLATE_LEADING.exec(value)) {
+        value = replaceMatch(match, value, 1, REGEXP_TEMPLATE_LEADING);
     }
-    const trailing = /\{\{((?:[^}]|}(?!}))+?)\s*? -\}\}\s*/g;
-    while (match = trailing.exec(value)) {
-        value = replaceMatch(match, value, 1, trailing);
+    REGEXP_TEMPLATE_TRAILING.lastIndex = 0;
+    while (match = REGEXP_TEMPLATE_TRAILING.exec(value)) {
+        value = replaceMatch(match, value, 1, REGEXP_TEMPLATE_TRAILING);
     }
     return value;
 }
@@ -176,15 +182,15 @@ function hasCondition(data, condition) {
     }
     let match = REGEXP_TEMPLATEMATCH.exec(condition.trim());
     if (match) {
-        if (match[2]) {
+        const comparison = match[2];
+        if (comparison) {
             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], trimQuote(match[2]), trimQuote(match[3])]);
+                items.push([match[1], trimQuote(match[2]), match[3] ? trimQuote(match[3]) : '']);
             }
             REGEXP_TEMPLATECOMPARISON.lastIndex = 0;
             const length = items.length;
@@ -195,18 +201,13 @@ function hasCondition(data, condition) {
                 if (!isNaN(+value)) {
                     return +value;
                 }
-                if (match = /^(["'])([\S\s]*)\1$/.exec(value)) {
-                    return match[2];
-                }
                 return getObjectValue(data, value);
             };
             for (let i = 0; i < length; ++i) {
-                const item = items[i];
-                const arg1 = item[1];
-                const arg2 = item[2];
-                let valid;
+                const [cmp, arg1, arg2] = items[i];
+                let valid = false;
                 if (arg2) {
-                    switch (item[0]) {
+                    switch (cmp) {
                         case 'eq':
                             valid = parseArg(arg1) == parseArg(arg2);
                             break;
@@ -229,7 +230,7 @@ function hasCondition(data, condition) {
                             return false;
                     }
                 }
-                else if (item[0]) {
+                else if (cmp) {
                     return false;
                 }
                 else {
@@ -283,17 +284,14 @@ function hasSameOrigin(value, ...other) {
     return false;
 }
 function restoreSearchParams(value, prefix = '__sqd') {
-    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;
-            }
+    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;
         }
-        return value;
     }
-    return '';
+    return value || '';
 }
 function getBaseURLs(asset, baseUrl) {
     const result = [];
@@ -323,26 +321,27 @@ function getBaseURLs(asset, baseUrl) {
 }
 function createHash(host, file, bufferMap) {
     const hash = file.hash;
-    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;
+    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;
                 }
+                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) {
@@ -382,7 +381,7 @@ function transformURL(host, parent, type, source, importFile) {
     const baseHref = getBaseURLs(importFile || parent, this.baseUrl);
     const isHtml = type === 'html';
     const isJs = type === 'js';
-    const pattern = isJs ? /\bimport\(/g : type === 'svg' ? /(?:\b[Uu][Rr][Ll]\(|@import\s+(["'])|\b([Hh][Rr][Ee][Ff])\s*=)/g : /\b[Uu][Rr][Ll]\(|@import\s+(["'])/g;
+    const pattern = isJs ? /\bimport\(/g : type === 'svg' ? /(?:\burl\(|@import\s+(["'])|\b(href)\s*=)/gi : /\burl\(|@import\s+(["'])/gi;
     let length = source.length, modified, match;
     while (match = pattern.exec(source)) {
         const isText = !!match[1];
@@ -554,7 +553,7 @@ function transformURL(host, parent, type, source, importFile) {
                         if (!isText) {
                             let j = startIndex;
                             while (isSpace(source[--j])) { }
-                            valid = source.substring(k = j - 6, j + 1) === '@import';
+                            valid = source.substring(k = j - 6, j + 1).toLowerCase() === '@import';
                         }
                         else {
                             k = startIndex;
@@ -664,7 +663,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:
@@ -763,11 +762,12 @@ function replaceCss(file) {
             map[id] = this.removeServerRoot(map[id]);
         }
     };
-    if (file.inlineUrlMap) {
-        sanitize(file.inlineUrlMap);
+    const { inlineUrlMap, inlineUrlCloudMap } = file;
+    if (inlineUrlMap) {
+        sanitize(inlineUrlMap);
     }
-    if (file.inlineUrlCloudMap) {
-        sanitize(file.inlineUrlCloudMap);
+    if (inlineUrlCloudMap) {
+        sanitize(inlineUrlCloudMap);
     }
 }
 function replaceHtml(source, { productionRelease, contentMap }, cssMap) {
@@ -843,6 +843,10 @@ 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);
@@ -853,11 +857,10 @@ 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);
@@ -1073,15 +1076,16 @@ class ChromeDocument extends Document {
                     const items = new Set((asset.watch.assets || []));
                     (function recurse(children) {
                         for (const item of children) {
-                            if (!items.has(item)) {
-                                if (isWatched.call(instance, item)) {
-                                    item.flags |= 8;
-                                }
-                                items.add(item);
-                                const next = related.get(item);
-                                if (next) {
-                                    recurse(next);
-                                }
+                            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);
                             }
                         }
                     })(includes);
@@ -1090,34 +1094,37 @@ class ChromeDocument extends Document {
             }
         }
         let productionRelease = instance.productionRelease;
-        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 });
-                                }
-                            }
-                        }
-                    }
+        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;
                 }
-                else {
-                    instance.writeFail(["Unable to write directory", instance.moduleName], (0, types_1.errorMessage)('production', 'Access denied', productionRelease));
+                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 });
+                    }
                 }
             }
             else {
-                instance.writeFail(["Unable to read directory", instance.moduleName], (0, types_1.errorMessage)('production', 'Invalid directory', productionRelease), 32);
+                instance.writeFail(["Unable to write directory", instance.moduleName], (0, types_1.errorMessage)('production', 'Access denied', productionRelease));
             }
         }
+        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 => {
@@ -1198,6 +1205,7 @@ class ChromeDocument extends Document {
             }
             return 0;
         });
+        let imports;
         if (config) {
             const { useUnsafeReplace, baseUrl, productionRelease, productionIncremental, templateMap, userAgentData, cache } = config;
             const target = this.config;
@@ -1244,25 +1252,37 @@ 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 && '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 (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;
             }
-            else {
-                this.formatMap = undefined;
+            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;
             }
         }
+        if (imports) {
+            this.imports = imports;
+        }
         for (const storage of cloud) {
             for (const { service, upload, download } of storage) {
                 if (upload) {
@@ -1630,14 +1650,14 @@ class ChromeDocument extends Document {
         }
     }
     replaceContent(source, statement, mimeType) {
-        var _a;
+        var _a, _b;
         switch (mimeType) {
             case 'text/css': {
                 const match = REGEXP_REPLACECSS.exec((typeof statement === 'string' ? statement : statement[0]).trim());
                 if (match) {
                     const layer = match[1];
                     const supports = (_a = match[3]) === null || _a === void 0 ? void 0 : _a.trim();
-                    const query = match[4].trim();
+                    const query = match[4].trim().replace(/;+$/, '');
                     if (layer || supports || query) {
                         const newline = (0, util_1.getNewline)(source);
                         let result = supports ? `@supports (${supports}) {` + newline : '';
@@ -1645,8 +1665,8 @@ class ChromeDocument extends Document {
                             result += `@media ${query} {` + newline;
                         }
                         if (layer) {
-                            let name = match[2];
-                            result += '@layer ' + (name && (name = name.trim()) ? name + ' ' : '') + `{${newline + source + newline}}` + (query ? newline + '}' : '');
+                            const name = (_b = match[2]) === null || _b === void 0 ? void 0 : _b.replace(/\s+/g, '');
+                            result += '@layer ' + (name ? name.slice(1, -1) + ' ' : '') + `{${newline + source + newline}}` + (query ? newline + '}' : '');
                         }
                         else if (query) {
                             result += source + newline + '}';
@@ -1690,8 +1710,9 @@ class ChromeDocument extends Document {
         this._cloudUrlMap = Object.create(null);
         this._cloudUploaded = new Set();
         this._cloudEndpoint = null;
-        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;
+        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 (endpoint) {
                 this._cloudEndpoint = new RegExp((0, types_1.escapePattern)(toPosix(endpoint)) + '/', 'g');
             }
@@ -1872,9 +1893,7 @@ class ChromeDocument extends Document {
                 }
             }
             search !== null && search !== void 0 ? search : (search = restoreSearchParams((_a = asset.url) === null || _a === void 0 ? void 0 : _a.search));
-            if (status) {
-                status = status.filter(item => item.type >= types_1.STATUS_TYPE.FATAL && item.type <= types_1.STATUS_TYPE.WARN);
-            }
+            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,
@@ -2051,8 +2070,9 @@ class ChromeDocument extends Document {
                 item.modified = true;
             }
             source = sanitizeSource(item, source);
-            if (item.format) {
-                const result = await this.transform('html', source, item.format, transformOptions.call(this, item, 'image/svg+xml'));
+            const format = item.format;
+            if (format) {
+                const result = await this.transform('html', source, format, transformOptions.call(this, item, 'image/svg+xml'));
                 if (result) {
                     item.modified = true;
                     source = result.code;
@@ -2162,11 +2182,12 @@ class ChromeDocument extends Document {
         await this.setElementAttributes(processing, domBase);
         await this.applyDataSource(processing, domBase);
         for (const item of this.assets) {
-            if (item.element && isRemoved(item) && !(0, types_1.ignoreFlag)(item.flags)) {
-                const domElement = new dom_1.HtmlElement(moduleName, item.element, item.attributes);
+            const element = item.element;
+            if (element && isRemoved(item) && !(0, types_1.ignoreFlag)(item.flags)) {
+                const domElement = new dom_1.HtmlElement(moduleName, element, item.attributes);
                 domElement.remove = true;
                 if (!domBase.write(domElement)) {
-                    this.writeFail('Unable to exclude HTML element', errorHtml(item.element), 4);
+                    this.writeFail('Unable to exclude HTML element', errorHtml(element), 4);
                 }
             }
         }
@@ -2187,13 +2208,15 @@ class ChromeDocument extends Document {
         if ((0, types_1.isString)(config.stripCommentsAndCDATA)) {
             source = dom_1.DomWriter.getCommentsAndCDATA(source, config.stripCommentsAndCDATA, true, true);
         }
-        if (htmlFile.format) {
-            const result = await this.transform('html', source, htmlFile.format, {
+        const format = htmlFile.format;
+        if (format) {
+            const { filename, uri, encoding, metadata } = htmlFile;
+            const result = await this.transform('html', source, format, {
                 pathname: path.dirname(localUri),
-                filename: htmlFile.filename,
+                filename,
                 mimeType: 'text/html',
-                metadata: Object.assign({ '__fromhtml__': true, ...this.config }, htmlFile.metadata),
-                cacheData: !productionRelease || this.productionIncremental ? { uri: htmlFile.uri, encoding: htmlFile.encoding } : undefined
+                metadata: Object.assign({ '__fromhtml__': true, ...this.config }, metadata),
+                cacheData: !productionRelease || this.productionIncremental ? { uri, encoding } : undefined
             });
             if (result) {
                 source = result.code;
@@ -2227,12 +2250,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 = item.element;
+            const { element, inlineContent } = item;
             if (!element || element.removed || isRemoved(item) || isUnedited(item) || (0, types_1.ignoreFlag)(item.flags) && !(0, types_1.processFlag)(item.flags)) {
                 continue;
             }
             const domElement = new dom_1.HtmlElement(moduleName, element, item.attributes);
-            if (item.inlineContent) {
+            if (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));
@@ -2241,7 +2264,7 @@ class ChromeDocument extends Document {
                     }
                     host.deleteFile(mapUri);
                 }
-                domElement.tagName = item.inlineContent;
+                domElement.tagName = inlineContent;
                 domElement.innerXml = innerXml;
                 domElement.removeAttribute('src', 'href');
             }
@@ -2331,10 +2354,10 @@ class ChromeDocument extends Document {
                 }
             }
             if (!domBase.write(domElement)) {
-                this.writeFail(item.inlineContent ? 'Inline tag replacement' : 'Element attribute replacement', errorHtml(element), { type: 4, startTime });
+                this.writeFail(inlineContent ? 'Inline tag replacement' : 'Element attribute replacement', errorHtml(element), { type: 4, startTime });
                 delete item.inlineUrlCloud;
             }
-            else if (item.inlineContent) {
+            else if (inlineContent) {
                 host.removeAsset(item);
                 removeWatchReload(item);
             }
@@ -2931,7 +2954,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)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/chrome",
-  "version": "0.3.6",
+  "version": "0.3.8",
   "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.6.16",
-    "@e-mc/core": "^0.6.16",
-    "@e-mc/document": "^0.6.16",
-    "@e-mc/types": "^0.6.16"
+    "@e-mc/cloud": "^0.6.19",
+    "@e-mc/core": "^0.6.19",
+    "@e-mc/document": "^0.6.19",
+    "@e-mc/types": "^0.6.19"
   }
 }

package/types/index.d.ts

@@ -104,10 +104,11 @@ export interface IChromeDocument<T extends IFileManager<U>, U extends DocumentAs
     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[];
+    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> {