@pi-r/chrome 0.6.5 → 0.6.7

package/index.js

@@ -20,11 +20,12 @@ const [PATTERN_STRING_SOME, PATTERN_STRING_MANY] = (function () {
     const grouping = '(?:\\s|' + dom_1.DomWriter.PATTERN_COMMENT + '|`[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}`)';
     return [grouping + '*', grouping + '+'];
 })();
-const [REGEXP_NTHCHILD, REGEXP_NTHCHILD_UNSAFE] = (function () {
+const [REGEXP_NTHCHILD, REGEXP_NTHCHILD_UNSAFE, REGEXP_REPLACECSS] = (function () {
     const parenthesis = '(?:,[^()]+(?=\\))|[^()]|\\([^()]*\\(+|\\([^()]*\\)|(?:\\)[^()]+)?\\)*?)+';
     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(`\\(\\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})\\))?(.*?);?$`)
     ];
 })();
 const REGEXP_SRCSETSIZE = /~\s*([\d.]+)\s*([wx])/i;
@@ -55,7 +56,6 @@ const REGEXP_URL_JS = /\bimport\(/g;
 const REGEXP_URL_SVG = /(?:\b[Uu][Rr][Ll]\(|@import\s+(["'])|\b([Hh][Rr][Ee][Ff])\s*=)/g;
 const REGEXP_IMAGESET = /\b(?:-webkit-)?image-set\(/gi;
 const REGEXP_IMAGESET_URL = /(?:^|[^(])\s*("(\s*[^)][^"]*)"|'(\s*[^)][^"]*)')\s*(?:,|$|[^)][^,]*,?)/g;
-const REGEXP_REPLACECSS = /^@import\s+(?:url\((?:[^)]|(?<=\\)\))+\)|"(?:[^"]|(?<=\\)")+"|'(?:[^']|(?<=\\)')+')(\s*layer(?:\(([^)]*)\)|\b))?(?:\s*supports\(((?:\([^(]+\(|\([^)]+\)|\)[^)]+\)|(?:(?!\))[^(])+|(?:(?!\()[^)])+)+)\))?(.*?);?$/;
 function removeNamespace(name, source, newline, comments) {
     if (source.includes('-' + name)) {
         const [a, b, c, d, e] = CACHE_DATASET[name] || (CACHE_DATASET[name] = [
@@ -297,7 +297,7 @@ function hasSameOrigin(value, ...other) {
     return false;
 }
 function restoreSearchParams(value, prefix = '__sqd') {
-    if (value?.includes(prefix)) {
+    if (value === null || value === void 0 ? void 0 : value.includes(prefix)) {
         const params = new URLSearchParams(value);
         params.forEach((_, key) => key.startsWith(prefix) && params.delete(key));
         if (value = params.toString()) {
@@ -385,6 +385,7 @@ function getSrcURL(parent, file) {
     return [found ? joinPath('../'.repeat(prefix.length), suffix.join('/'), file.filename) : '../'.repeat(prefix.length) + relativeUrl];
 }
 function transformURL(host, parent, type, source, importFile) {
+    var _a;
     const related = [];
     const baseHref = getBaseURLs(importFile || parent, this.baseUrl);
     const isHtml = type === 'html';
@@ -471,12 +472,13 @@ function transformURL(host, parent, type, source, importFile) {
             }
         }
         const setOutputURL = (value, asset) => {
+            var _a;
             if (!value) {
                 return;
             }
             if (asset) {
                 if (!asset.inlineBase64) {
-                    if (host.Cloud?.getStorage('upload', asset.cloudStorage)) {
+                    if ((_a = host.Cloud) === null || _a === void 0 ? void 0 : _a.getStorage('upload', asset.cloudStorage)) {
                         const inlineUrlCloud = asset.inlineUrlCloud || (asset.inlineUrlCloud = (0, types_1.generateUUID)());
                         (parent.inlineUrlCloudMap || (parent.inlineUrlCloudMap = {}))[inlineUrlCloud] = value;
                         value = inlineUrlCloud;
@@ -557,7 +559,7 @@ function transformURL(host, parent, type, source, importFile) {
             url = trimQuote(content);
         }
         if (url.startsWith('data:')) {
-            const base64 = url.split(',')[1]?.trim();
+            const base64 = (_a = url.split(',')[1]) === null || _a === void 0 ? void 0 : _a.trim();
             if (base64) {
                 for (const item of this.assets) {
                     if (item.base64 === base64) {
@@ -776,7 +778,7 @@ function transformJs(host, file, output) {
                 this.writeFail(["Unable to write file", path.basename(chunkUri)], err, 32);
             }
         }
-        appending?.forEach(item => item.order += order);
+        appending === null || appending === void 0 ? void 0 : appending.forEach(item => item.order += order);
     }
     if ((0, types_1.isArray)(sourceFiles)) {
         file.sourceFiles = sourceFiles;
@@ -897,7 +899,7 @@ const isIgnored = (item, exists) => item.invalid || (0, types_1.ignoreFlag)(item
 const findFont = (value) => value && (Array.isArray(value) ? value : [value]).find(format => isFont(format));
 const spliceString = (source, startIndex, endIndex, content) => source.substring(0, startIndex) + content + source.substring(endIndex);
 const getEndIndex = (match) => match.index + match[0].length;
-const getRelativeURL = (file) => joinPath(file.moveTo, file.pathname, file.inlineFilename || file.filename) + (!file.static ? restoreSearchParams(file.url?.search) : '');
+const getRelativeURL = (file) => { var _a; return joinPath(file.moveTo, file.pathname, file.inlineFilename || file.filename) + (!file.static ? restoreSearchParams((_a = file.url) === null || _a === void 0 ? void 0 : _a.search) : ''); };
 const errorHtml = ({ tagName, tagIndex = -1 }) => (0, types_1.errorMessage)('html', 'Location did not resolve', tagName.toLowerCase() + (tagIndex >= 0 ? ': ' + tagIndex : ''));
 const errorDataSource = (value, hint) => (0, types_1.errorMessage)('data-source', value, hint);
 class ChromeDocument extends Document {
@@ -975,6 +977,7 @@ class ChromeDocument extends Document {
         return result + (parent && result > 0 ? await super.purgeMemory(typeof parent === 'number' && parent > 0 ? parent : percent, limit, true) : 0);
     }
     static async finalize(instance) {
+        var _a;
         if (instance.aborted) {
             return Promise.reject((0, types_1.createAbortError)());
         }
@@ -986,7 +989,7 @@ class ChromeDocument extends Document {
             db.writeTimeElapsed('DB', ["Transactions were committed", db.moduleName], processing.startTime, { ...Document.LOG_STYLE_SUCCESS, type: 65536 });
         }
         if (instance.dataSource.length === 0 && outHtml) {
-            const incremental = htmlFile.incremental ?? this.incremental;
+            const incremental = (_a = htmlFile.incremental) !== null && _a !== void 0 ? _a : this.incremental;
             if (incremental === 'etag' || incremental === 'exists') {
                 const fetched = this.fetchedAssets;
                 const isHtmlOnly = () => !fetched.find(item => item !== htmlFile && assets.includes(item));
@@ -1582,6 +1585,7 @@ class ChromeDocument extends Document {
     }
     resolveImports(file, code, baseFile) {
         var _a;
+        var _b;
         if (!Array.isArray(file.imports)) {
             return;
         }
@@ -1597,7 +1601,7 @@ class ChromeDocument extends Document {
         }
         const importMap = {};
         for (const item of file.imports) {
-            (importMap[_a = item.placeholder] || (importMap[_a] = [])).push(item);
+            (importMap[_b = item.placeholder] || (importMap[_b] = [])).push(item);
         }
         for (const placeholder in importMap) {
             const items = importMap[placeholder];
@@ -1609,7 +1613,7 @@ class ChromeDocument extends Document {
                     const hosted = type === 'css';
                     let value;
                     if (hosted) {
-                        const asset = this.host?.findAsset(uri);
+                        const asset = (_a = this.host) === null || _a === void 0 ? void 0 : _a.findAsset(uri);
                         if (asset) {
                             const [relativeUrl, sameDir] = getSrcURL.call(this, bundleMain || file, asset);
                             if (relativeUrl) {
@@ -1638,16 +1642,17 @@ class ChromeDocument extends Document {
         }
     }
     replaceContent(source, statement, mimeType) {
+        var _a;
         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 = match[3]?.trim();
+                    const supports = (_a = match[3]) === null || _a === void 0 ? void 0 : _a.trim();
                     const query = match[4].trim();
                     if (layer || supports || query) {
                         const newline = (0, util_1.getNewline)(source);
-                        let result = supports ? `@supports (${match[1].trim()}) {` + newline : '';
+                        let result = supports ? `@supports (${supports}) {` + newline : '';
                         if (query) {
                             result += `@media ${query} {` + newline;
                         }
@@ -1680,8 +1685,9 @@ class ChromeDocument extends Document {
         }
     }
     writeImage(data) {
+        var _a;
         const { file, output, command } = data;
-        if (output && command && file.element?.outerXml) {
+        if (output && command && ((_a = file.element) === null || _a === void 0 ? void 0 : _a.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());
@@ -1692,12 +1698,13 @@ class ChromeDocument extends Document {
         return false;
     }
     cloudInit({ instance }) {
+        var _a, _b;
         this._cloudUrlMap = Object.create(null);
         this._cloudUploaded = new Set();
         this._cloudEndpoint = null;
         const htmlFile = this.htmlFile;
         if (htmlFile) {
-            const endpoint = instance.getStorage('upload', htmlFile.cloudStorage)?.upload?.endpoint;
+            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');
             }
@@ -1710,6 +1717,7 @@ class ChromeDocument extends Document {
         return this.editing.includes(file);
     }
     async cloudUpload({ host }, file, url, active) {
+        var _a;
         if (active) {
             const endpoint = this._cloudEndpoint;
             const inlineUrlCloud = file.inlineUrlCloud;
@@ -1718,7 +1726,7 @@ class ChromeDocument extends Document {
             if (inlineUrlCloud) {
                 const pattern = new RegExp((0, types_1.escapePattern)(inlineUrlCloud), 'g');
                 for (const item of this.editing) {
-                    if (item.inlineUrlCloudMap?.[inlineUrlCloud]) {
+                    if ((_a = item.inlineUrlCloudMap) === null || _a === void 0 ? void 0 : _a[inlineUrlCloud]) {
                         const source = host.getUTF8String(item);
                         const output = source.replace(pattern, endpoint && item.imported && cloudUrl.includes('/') ? url : cloudUrl);
                         if (source !== output) {
@@ -1733,6 +1741,7 @@ class ChromeDocument extends Document {
         return false;
     }
     async cloudFinalize(state) {
+        var _a;
         if (this.aborted) {
             return Promise.reject((0, types_1.createAbortError)());
         }
@@ -1781,7 +1790,7 @@ class ChromeDocument extends Document {
                 for (const storage of cloudStorage) {
                     if (instance.hasCredential('storage', storage)) {
                         const { service, admin, bucket, upload } = storage;
-                        const website = admin?.configBucket?.website;
+                        const website = (_a = admin === null || admin === void 0 ? void 0 : admin.configBucket) === null || _a === void 0 ? void 0 : _a.website;
                         if ((0, types_1.isPlainObject)(website) && bucket && upload) {
                             let filename = joinPath(upload.pathname, upload.filename || path.basename(htmlFile.localUri));
                             if (website.indexPage === true) {
@@ -1817,7 +1826,7 @@ class ChromeDocument extends Document {
         }
         const main = watch.main;
         let result;
-        if (main?.editing && main.mimeType === 'text/html') {
+        if ((main === null || main === void 0 ? void 0 : main.editing) && main.mimeType === 'text/html') {
             const inlineUrlCloudMap = main.inlineUrlCloudMap || {};
             const using = [];
             let found;
@@ -1854,6 +1863,7 @@ class ChromeDocument extends Document {
     }
     watchModified(watch, assets) {
         return (files, errors, status) => {
+            var _a;
             if (!watch.server || watch.captured || watch.aborted) {
                 return;
             }
@@ -1873,7 +1883,7 @@ class ChromeDocument extends Document {
                     search = next.url.search;
                 }
             }
-            search ?? (search = restoreSearchParams(asset.url?.search));
+            search !== null && search !== void 0 ? search : (search = restoreSearchParams((_a = asset.url) === null || _a === void 0 ? void 0 : _a.search));
             status && (status = status.filter(item => item.type >= types_1.STATUS_TYPE.FATAL && item.type <= types_1.STATUS_TYPE.WARN));
             watch.send(types_1.WATCH_EVENT.MODIFIED, {
                 action: pathname && watch.hot && !watch.main ? 'hot' : '',
@@ -1945,11 +1955,13 @@ class ChromeDocument extends Document {
         }
     }
     findDataValue(name) {
+        var _a;
         if (this.hasEval('template')) {
-            return this.templateMap.data?.[name];
+            return (_a = this.templateMap.data) === null || _a === void 0 ? void 0 : _a[name];
         }
     }
     setInlinedAttributes({ host, startTime, hashed, contentMap, bufferMap, productionRelease }) {
+        var _a, _b;
         const readBase64 = (item, uuid) => {
             if (!contentMap[uuid]) {
                 try {
@@ -1979,7 +1991,7 @@ class ChromeDocument extends Document {
                     const filename = hash && createHash(host, item, hash, bufferMap);
                     if (filename) {
                         for (const asset of this.assets) {
-                            const url = inlineUrl ? asset.inlineUrlMap?.[inlineUrl] : asset.inlineUrlCloudMap?.[inlineUrlCloud];
+                            const url = inlineUrl ? (_a = asset.inlineUrlMap) === null || _a === void 0 ? void 0 : _a[inlineUrl] : (_b = asset.inlineUrlCloudMap) === null || _b === void 0 ? void 0 : _b[inlineUrlCloud];
                             if (url) {
                                 const search = url.indexOf('?');
                                 const index = (search !== -1 ? url.substring(0, search) : url).lastIndexOf('/');
@@ -2027,10 +2039,10 @@ class ChromeDocument extends Document {
             const sortNested = (a, b) => {
                 const { inlineUrlCloud: urlA, inlineUrlCloudMap: mapA } = a;
                 const { inlineUrlCloud: urlB, inlineUrlCloudMap: mapB } = b;
-                if (urlA && mapB?.[urlA]) {
+                if (urlA && (mapB === null || mapB === void 0 ? void 0 : mapB[urlA])) {
                     return -1;
                 }
-                if (urlB && mapA?.[urlB]) {
+                if (urlB && (mapA === null || mapA === void 0 ? void 0 : mapA[urlB])) {
                     return 1;
                 }
                 return 0;
@@ -2260,7 +2272,7 @@ class ChromeDocument extends Document {
                     }
                 }
                 if (uri && !(0, util_1.hasValue)(item.format, 'crossorigin') && item !== htmlFile) {
-                    if (cloud?.getStorage('upload', item.cloudStorage)) {
+                    if (cloud === null || cloud === void 0 ? void 0 : 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;
                         uri = inlineUrlCloud;
@@ -2432,7 +2444,7 @@ class ChromeDocument extends Document {
                         batchGroup.push([item]);
                         break;
                     default:
-                        if (db?.hasSource(type)) {
+                        if (db === null || db === void 0 ? void 0 : db.hasSource(type)) {
                             try {
                                 await db.setCredential(item);
                                 const credential = item.credential;
@@ -2465,6 +2477,7 @@ class ChromeDocument extends Document {
             }
             return this.allSettled(batchGroup.map(async (batch) => {
                 return new Promise(async (resolve, reject) => {
+                    var _a, _b, _c;
                     const errorRemove = (item, reason) => {
                         removeElement(item);
                         reject(reason);
@@ -2531,7 +2544,7 @@ class ChromeDocument extends Document {
                                 }
                                 else {
                                     this.abort(type);
-                                    errorRemove(current, target ? errorDataSource('Not found', target) : errorDataSource('Not defined - ' + (this.settings.directory?.data ? 'file' : 'directory'), type));
+                                    errorRemove(current, target ? errorDataSource('Not found', target) : errorDataSource('Not defined - ' + (((_a = this.settings.directory) === null || _a === void 0 ? void 0 : _a.data) ? 'file' : 'directory'), type));
                                     return;
                                 }
                             }
@@ -2677,7 +2690,7 @@ class ChromeDocument extends Document {
                                     }
                                     if (!getData) {
                                         const { settings, encoding, persist = true } = current;
-                                        target || (target = settings && this.settings.export?.[settings] || pathname);
+                                        target || (target = settings && ((_b = this.settings.export) === null || _b === void 0 ? void 0 : _b[settings]) || pathname);
                                         if (typeof target === 'function') {
                                             getData = target;
                                             hint = target.name;
@@ -2736,7 +2749,7 @@ class ChromeDocument extends Document {
                             break;
                         }
                         default:
-                            if (db?.hasSource(type)) {
+                            if (db === null || db === void 0 ? void 0 : db.hasSource(type)) {
                                 switch (type) {
                                     case 'mongodb':
                                         for (let j = 0; j < length; ++j) {
@@ -2960,7 +2973,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);
+                                                        (_c = row.__index__) !== null && _c !== void 0 ? _c : (row.__index__ = j + 1);
                                                     }
                                                     let segment = template;
                                                     while (match = REGEXP_TEMPLATECONDITIONAL.exec(segment)) {
@@ -3253,6 +3266,7 @@ class ChromeDocument extends Document {
         }
     }
     setProductionAttributes({ host, hashed, bufferMap, startTime }) {
+        var _a;
         for (const item of this.assets) {
             if (isIgnored(item, true)) {
                 continue;
@@ -3260,7 +3274,7 @@ class ChromeDocument extends Document {
             if (item.hash && !hashed.has(item)) {
                 createHash(host, item, item.hash, bufferMap);
             }
-            switch (item.element?.tagName.toLowerCase()) {
+            switch ((_a = item.element) === null || _a === void 0 ? void 0 : _a.tagName.toLowerCase()) {
                 case 'style':
                     if (!item.content) {
                         break;
@@ -3407,7 +3421,7 @@ class ChromeDocument extends Document {
             }
             return selector.replace(/ +/g, getStringMany()) + getStringSome();
         };
-        const replaceUnunsed = (name, items) => {
+        const replaceUnunsed = (name, items, nesting) => {
             for (let value of items) {
                 const key = name + '_' + (value = value.trim()) + (useUnsafeCssReplace ? '_1' : '');
                 let pattern = queryMap.get(key), rule;
@@ -3460,11 +3474,24 @@ class ChromeDocument extends Document {
                     pattern.lastIndex = 0;
                 }
                 while (rule = pattern.exec(current)) {
-                    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;
+                    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;
+                        }
                     }
                 }
             }
@@ -3496,13 +3523,13 @@ class ChromeDocument extends Document {
             }
         }
         if (unusedMedia) {
-            replaceUnunsed('media', unusedMedia);
+            replaceUnunsed('media', unusedMedia, true);
         }
         if (unusedSupports) {
-            replaceUnunsed('supports', unusedSupports);
+            replaceUnunsed('supports', unusedSupports, true);
         }
         if (unusedContainer) {
-            replaceUnunsed('container', unusedContainer);
+            replaceUnunsed('container', unusedContainer, false);
         }
         if (unusedStyles) {
             current = (function recurse(target, child) {
@@ -3726,5 +3753,4 @@ class ChromeDocument extends Document {
 }
 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.5",
+  "version": "0.6.7",
   "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.6",
-    "@e-mc/core": "^0.8.6",
-    "@e-mc/document": "^0.8.6",
-    "@e-mc/types": "^0.8.6"
+    "@e-mc/cloud": "^0.8.8",
+    "@e-mc/core": "^0.8.8",
+    "@e-mc/document": "^0.8.8",
+    "@e-mc/types": "^0.8.8"
   }
 }