@pi-r/chrome 0.10.3 → 0.11.1

package/index.js

@@ -21,10 +21,8 @@ const CACHE_CONTENT = new Map();
 const CACHE_FORMAT = new Map();
 const CACHE_DATASET = {};
 const CACHE_ATRULES = {};
-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}`)';
-    return [grouping + '*', grouping + '+'];
-})();
+const PATTERN_STRING_SOME = '(?:\\s|' + dom_1.DomWriter.PATTERN_COMMENT + '|`[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}`)*';
+const PATTERN_STRING_MANY = PATTERN_STRING_SOME.slice(0, -1) + '+';
 const [REGEXP_NTHCHILD, REGEXP_NTHCHILD_UNSAFE, REGEXP_REPLACECSS] = (function () {
     const parenthesis = '(?:,[^()]+(?=\\))|[^()]|\\([^()]*\\(+|\\([^()]*\\)|(?:\\)[^()]+)?\\)*?)+';
     return [
@@ -53,14 +51,6 @@ const REGEXP_FONTFACE_UNSAFE = new RegExp(`(\\s*)@font-face\\s*{([^}]+)}` + dom_
 const REGEXP_FONTFAMILY_UNSAFE = /\bfont-family\s*:([^;}]+)/i;
 const REGEXP_KEYFRAMES_UNSAFE = /(\s*)@keyframes\s+([^{]+){/gi;
 const REGEXP_PROPERTY_UNSAFE = /(\s*)@property\s+(--[^\s]+)\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;
-const REGEXP_URL = /(?:\b[Uu][Rr][Ll]\(|@import\s+(["'])|\b([Hh][Rr][Ee][Ff])\s*=)/g;
-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*(?:,|$|[^)][^,]*,?)/gd;
 const REGEXP_SANITIZEALL = new RegExp(`(?:\\s+|\\b)data-(?:pathname|filename|intl-locales|(?:use|exclude)-[^=\\s]+)\\s*${dom_1.DomWriter.PATTERN_ATTRVALUE}(?=(?:[^"<]+"[^"]*"|[^'<]+'[^']*')*[^<>]*>)`, 'g');
 function removeNamespace(name, source, newline, comments) {
@@ -80,16 +70,17 @@ function removeNamespace(name, source, newline, comments) {
     return (0, types_1.isArray)(comments) ? source.replace(REGEXP_BLOCKEXCLUDE, (...capture) => getNewlineString(capture[1], capture[2], newline)) : source;
 }
 function getObjectValue(value, key) {
-    REGEXP_OBJECT_NAME.lastIndex = 0;
+    const objectName = /([^[.\s]+)((?:\s*\[[^\]]+\]\s*)+)?\s*\.?\s*/g;
+    const subscript = /\[\s*(["'])?(.+?)\1\s*\]/g;
     let found = false, match;
-    while (match = REGEXP_OBJECT_NAME.exec(key)) {
+    while (match = objectName.exec(key)) {
         if ((0, types_1.isObject)(value)) {
             value = value[match[1]];
             const name = match[2];
             if (name) {
-                REGEXP_OBJECT_SUBSCRIPT.lastIndex = 0;
+                subscript.lastIndex = 0;
                 let index;
-                while (index = REGEXP_OBJECT_SUBSCRIPT.exec(name)) {
+                while (index = 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))) {
@@ -110,14 +101,14 @@ function getObjectValue(value, key) {
     return found ? value : null;
 }
 function trimTemplate(value) {
-    REGEXP_TEMPLATE_LEADING.lastIndex = 0;
+    const opening = /\s*\{\{- \s*((?:[^}]|}(?!}))+?)\}\}/g;
+    const closing = /\{\{((?:[^}]|}(?!}))+?)\s*? -\}\}\s*/g;
     let match;
-    while (match = REGEXP_TEMPLATE_LEADING.exec(value)) {
-        value = replaceMatch(match, value, 1, REGEXP_TEMPLATE_LEADING);
+    while (match = opening.exec(value)) {
+        value = replaceMatch(match, value, 1, opening);
     }
-    REGEXP_TEMPLATE_TRAILING.lastIndex = 0;
-    while (match = REGEXP_TEMPLATE_TRAILING.exec(value)) {
-        value = replaceMatch(match, value, 1, REGEXP_TEMPLATE_TRAILING);
+    while (match = closing.exec(value)) {
+        value = replaceMatch(match, value, 1, closing);
     }
     return value;
 }
@@ -148,7 +139,7 @@ function findClosingIndex(source, lastIndex, char) {
     return [endIndex, trailing];
 }
 function getPackageName(err) {
-    if (err instanceof Error && err.code === types_1.ERR_CODE.MODULE_NOT_FOUND) {
+    if ((0, types_1.isErrorCode)(err, types_1.ERR_CODE.MODULE_NOT_FOUND)) {
         return (0, util_1.getModuleName)(err);
     }
 }
@@ -393,40 +384,6 @@ function createHash(host, file, hash, bufferMap) {
         host.writeFail(["Unable to read file", filename], err, 32);
     }
 }
-function getSrcUrl(instance, parent, file) {
-    const relativeUrl = file.relativeUrl || instance.host.removeCwd(file.localUri) && getRelativeUrl(file);
-    if (!relativeUrl) {
-        return ['', false];
-    }
-    if (parent.inlineContent) {
-        return [relativeUrl, false];
-    }
-    let parentDir = parent.pathname, assetDir = file.pathname;
-    if (!instance.productionRelease) {
-        if (parent.moveTo) {
-            parentDir = Document.joinPath(parent.moveTo, parentDir);
-        }
-        if (file.moveTo) {
-            assetDir = Document.joinPath(file.moveTo, assetDir);
-        }
-    }
-    if (parentDir === assetDir) {
-        return [file.filename, true];
-    }
-    if (!parentDir) {
-        return [relativeUrl, false];
-    }
-    const splitPath = (value) => value.split(/\//).filter(seg => seg.trim());
-    const prefix = splitPath(parentDir);
-    const suffix = splitPath(assetDir);
-    let found = false;
-    while (prefix.length > 0 && suffix.length > 0 && prefix[0] === suffix[0]) {
-        prefix.shift();
-        suffix.shift();
-        found = true;
-    }
-    return [found ? Document.joinPath('../'.repeat(prefix.length), suffix.join('/'), file.filename) : '../'.repeat(prefix.length) + relativeUrl, false];
-}
 function replaceCss(instance, file) {
     if (file.inlineUrlMap) {
         sanitizeCss(instance, file.inlineUrlMap);
@@ -747,7 +704,7 @@ class ChromeDocument extends Document {
                                                 if (i !== start && !Document.createDir(destDir = path.join(destDir, ...subDir.slice(i, start)))) {
                                                     throw (0, types_1.errorMessage)('production', destDir, 'create');
                                                 }
-                                                const dest = path.join(destDir, subDir[subDir.length - 1]);
+                                                const dest = path.join(destDir, subDir.at(-1));
                                                 Document.renameFile(src, dest);
                                                 instance.addLog(4, `production: ${dest} (mapped)`, { source: subDir.join(path.sep) });
                                                 emptyDir.add(path.dirname(src));
@@ -1283,7 +1240,7 @@ class ChromeDocument extends Document {
                                             try {
                                                 const asset = host.findAsset(relative ? new URL(from, uri) : from);
                                                 if (asset) {
-                                                    const [relativeUrl, sameDir] = getSrcUrl(this, bundleMain || file, asset);
+                                                    const [relativeUrl, sameDir] = this.getSrcUrl(bundleMain || file, asset);
                                                     if (relativeUrl) {
                                                         output = (0, util_1.spliceString)(output, a, b, quote + (sameDir ? './' : '') + relativeUrl + quote, REGEXP_IMPORTMODULE);
                                                     }
@@ -1381,7 +1338,7 @@ class ChromeDocument extends Document {
                     if (hosted) {
                         const asset = this.host?.findAsset(uri);
                         if (asset) {
-                            const [relativeUrl, sameDir] = getSrcUrl(this, bundleMain || file, asset);
+                            const [relativeUrl, sameDir] = this.getSrcUrl(bundleMain || file, asset);
                             if (relativeUrl) {
                                 value = (sameDir ? './' : '') + relativeUrl;
                             }
@@ -2067,9 +2024,7 @@ class ChromeDocument extends Document {
                 const detectHeight = domElement.getAttribute('height') === 'detect';
                 if (detectWidth || detectHeight) {
                     let width = 0, height = 0, buffer = null;
-                    const addLog = (suffix, err) => {
-                        this.addLog(3, err instanceof Error ? err : 'Could not detect image ' + suffix, { source: item.localUri ? path.basename(item.localUri) : item.filename });
-                    };
+                    const addLog = (suffix, err) => this.addLog(3, err || ('Not detectable image ' + suffix), { source: item.localUri ? path.basename(item.localUri) : item.filename });
                     if (isImage(item.mimeType) && (buffer = host.getBuffer(item))) {
                         try {
                             ({ width, height } = (0, image_size_1.imageSize)(buffer));
@@ -2974,7 +2929,7 @@ class ChromeDocument extends Document {
                                     case 'cloud': {
                                         const { service, table, id, query } = item;
                                         const queryString = (table ? 'table=' + table : '') + (id || query ? (table ? ';' : '') + (id ? 'id=' + id : 'query=' + Document.asString(query)) : '');
-                                        (cloud || this).formatFail(64, service, ["Unable to execute query", queryString], emptyResponse(queryString, service), { ...Cloud.LOG_CLOUD_FAIL, startTime });
+                                        (cloud || this).formatFail(64, service, ["Unable to execute query", queryString], emptyResponse(queryString, service), Cloud.optionsLogMessage('FAIL', { startTime }));
                                         break;
                                     }
                                     case 'uri': {
@@ -3446,6 +3401,40 @@ class ChromeDocument extends Document {
             return current;
         }
     }
+    getSrcUrl(parent, file) {
+        const relativeUrl = file.relativeUrl || this.host.removeCwd(file.localUri) && getRelativeUrl(file);
+        if (!relativeUrl) {
+            return ['', false];
+        }
+        if (parent.inlineContent) {
+            return [relativeUrl, false];
+        }
+        let parentDir = parent.pathname, assetDir = file.pathname;
+        if (!this.productionRelease) {
+            if (parent.moveTo) {
+                parentDir = Document.joinPath(parent.moveTo, parentDir);
+            }
+            if (file.moveTo) {
+                assetDir = Document.joinPath(file.moveTo, assetDir);
+            }
+        }
+        if (parentDir === assetDir) {
+            return [file.filename, true];
+        }
+        if (!parentDir) {
+            return [relativeUrl, false];
+        }
+        const splitPath = (value) => value.split('/').filter(seg => seg.trim());
+        const prefix = splitPath(parentDir);
+        const suffix = splitPath(assetDir);
+        let found = false;
+        while (prefix.length > 0 && suffix.length > 0 && prefix[0] === suffix[0]) {
+            prefix.shift();
+            suffix.shift();
+            found = true;
+        }
+        return [found ? Document.joinPath('../'.repeat(prefix.length), suffix.join('/'), file.filename) : '../'.repeat(prefix.length) + relativeUrl, false];
+    }
     isWatched(file) {
         const { initialValue, format } = file;
         return (file.imported ||
@@ -3563,27 +3552,25 @@ class ChromeDocument extends Document {
         const baseHref = collectBaseUrl(importFile || file, this.baseUrl);
         const isHtml = type === 'html';
         const isJs = type === 'js';
-        const pattern = isJs ? REGEXP_URL_JS : type === 'svg' ? REGEXP_URL_SVG : REGEXP_URL;
-        pattern.lastIndex = 0;
-        REGEXP_IMAGESET.lastIndex = 0;
+        const imageSet = /\b(?:-webkit-)?image-set\(/gi;
+        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+(["'])|\b([Hh][Rr][Ee][Ff])\s*=)/g;
         let length = source.length, modified = false, match;
-        while (match = REGEXP_IMAGESET.exec(source)) {
+        while (match = imageSet.exec(source)) {
             const startIndex = match.index + match[0].length;
             const endIndex = findClosingIndex(source, startIndex, '(');
-            if (endIndex === -1) {
-                continue;
-            }
-            REGEXP_IMAGESET_URL.lastIndex = 0;
-            let content = source.substring(startIndex, endIndex), url;
-            while (url = REGEXP_IMAGESET_URL.exec(content)) {
-                const quote = url[2] ? '"' : "'";
-                const [a, b] = url.indices[1];
-                content = (0, util_1.spliceString)(content, a, b, `url(${quote + (url[2] || url[3]).trim() + quote})`, REGEXP_IMAGESET_URL);
-                modified = true;
-            }
-            if (modified) {
-                source = (0, util_1.spliceString)(source, startIndex, endIndex, content, REGEXP_IMAGESET);
-                modified = false;
+            if (endIndex !== -1) {
+                REGEXP_IMAGESET_URL.lastIndex = 0;
+                let content = source.substring(startIndex, endIndex), url;
+                while (url = REGEXP_IMAGESET_URL.exec(content)) {
+                    const quote = url[2] ? '"' : "'";
+                    const [a, b] = url.indices[1];
+                    content = (0, util_1.spliceString)(content, a, b, `url(${quote + (url[2] || url[3]).trim() + quote})`, REGEXP_IMAGESET_URL);
+                    modified = true;
+                }
+                if (modified) {
+                    source = (0, util_1.spliceString)(source, startIndex, endIndex, content, imageSet);
+                    modified = false;
+                }
             }
         }
         while (match = pattern.exec(source)) {
@@ -3707,7 +3694,7 @@ class ChromeDocument extends Document {
                 if (quote) {
                     value = quote + value + quote;
                 }
-                const revised = isJs ? 'import(' + value + trailing + ')' : isHref ? 'href=' + value : (isText ? '@import ' + value : `url(${value})`) + trailing;
+                const revised = isJs ? `import(${value + trailing})` : isHref ? 'href=' + value : (isText ? '@import ' + value : `url(${value})`) + trailing;
                 source = (0, util_1.spliceString)(source, startIndex, i + 1, revised, pattern);
                 length = source.length;
                 modified = true;
@@ -3717,7 +3704,7 @@ class ChromeDocument extends Document {
                 if (!quote) {
                     continue;
                 }
-                const target = new RegExp('^\\s*(' + quote + '((?:[^' + quote + ']|(?<=\\\\)' + quote + ')+)' + quote + ')\\s*(,.+)$').exec(content);
+                const target = new RegExp(`^\\s*(${quote}((?:[^${quote}]|(?<=\\\\)${quote})+)${quote})\\s*(,.+)$`).exec(content);
                 if (target) {
                     url = target[1].trim();
                     trailing = target[2].trim();
@@ -3734,7 +3721,7 @@ class ChromeDocument extends Document {
                 if (base64) {
                     for (const item of this.assets) {
                         if (item.base64 === base64) {
-                            setOutputURL(getSrcUrl(this, file, item)[0], item);
+                            setOutputURL(this.getSrcUrl(file, item)[0], item);
                             break;
                         }
                     }
@@ -3743,7 +3730,11 @@ class ChromeDocument extends Document {
             else if (baseHref.length > 0) {
                 let fullUrl, asset;
                 for (const parentUrl of baseHref) {
-                    asset = host.findAsset(fullUrl = Document.resolvePath(url, parentUrl), { replaced: true }) || (this.related.has(file) ? host.findAsset(fullUrl, { assets: Array.from(this.related.get(file)), replaced: true }) : undefined);
+                    asset = host.findAsset(fullUrl = Document.resolvePath(url, parentUrl), { replaced: true });
+                    if (!asset) {
+                        const assets = this.related.get(file);
+                        asset = assets && host.findAsset(fullUrl, { assets: Array.from(assets), replaced: true });
+                    }
                     if (asset) {
                         break;
                     }
@@ -3774,23 +3765,23 @@ class ChromeDocument extends Document {
                                 revised = this.processUrl(host, file, this.removeServerRoot(revised), type, asset) || revised;
                                 source = (0, util_1.spliceString)(source, k, l + 1, revised, pattern);
                                 length = source.length;
-                                if (!file.watch) {
-                                    host.deleteFile(asset.localUri, { ignorePermission: true, emptyDir: true, all: true, id: asset.id });
-                                    asset.invalid = true;
-                                }
-                                else {
+                                if (file.watch) {
                                     related.push(asset);
                                     if (!(0, types_1.existsFlag)(asset.flags)) {
                                         asset.flags |= 8;
                                     }
                                 }
+                                else if (asset.localUri) {
+                                    host.deleteFile(asset.localUri, { ignorePermission: true, emptyDir: true, all: true, id: asset.id });
+                                    asset.invalid = true;
+                                }
                                 modified = true;
                                 continue;
                             }
                         }
                         if (hasSameOrigin(asset.url || fullUrl, ...baseHref)) {
                             let sameDir = false;
-                            [fullUrl, sameDir] = getSrcUrl(this, file, asset);
+                            [fullUrl, sameDir] = this.getSrcUrl(file, asset);
                             if (sameDir && isJs) {
                                 fullUrl = './' + fullUrl;
                             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/chrome",
-  "version": "0.10.3",
+  "version": "0.11.1",
   "description": "Chrome document constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -20,10 +20,10 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/cloud": "^0.12.7",
-    "@e-mc/core": "^0.12.7",
-    "@e-mc/document": "^0.12.7",
-    "@e-mc/types": "^0.12.7",
+    "@e-mc/cloud": "^0.13.5",
+    "@e-mc/core": "^0.13.5",
+    "@e-mc/document": "^0.13.5",
+    "@e-mc/types": "^0.13.5",
     "image-size": "^2.0.2"
   }
 }

package/types/index.d.ts

@@ -117,6 +117,7 @@ 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[]>;
+    getSrcUrl(parent: U, file: U): [string, boolean];
     isWatched(file: U): boolean;
     get elements(): XmlTagNode[];
     get editing(): U[];

package/types/squared.d.ts

@@ -91,7 +91,7 @@ export interface UnusedAtRule {
     selector?: string;
     media?: ConditionProperty;
     supports?: ConditionProperty;
-    container?: CssConditionData & Partial<ConditionProperty>;
+    container?: Omit<CssConditionData, "conditionText"> & Partial<ConditionProperty>;
     layer?: string[];
 }