@pi-r/chrome 0.11.0 → 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;
 }
@@ -3561,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)) {
@@ -3705,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;
@@ -3715,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();
@@ -3741,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;
                     }
@@ -3772,16 +3765,16 @@ 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;
                             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/chrome",
-  "version": "0.11.0",
+  "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.13.0",
-    "@e-mc/core": "^0.13.0",
-    "@e-mc/document": "^0.13.0",
-    "@e-mc/types": "^0.13.0",
+    "@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/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[];
 }