@pi-r/chrome 0.6.5 → 0.6.6

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] = [
@@ -1647,7 +1647,7 @@ class ChromeDocument extends Document {
                     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;
                         }
@@ -3407,7 +3407,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 +3460,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 +3509,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 +3739,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.6",
   "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.7",
+    "@e-mc/core": "^0.8.7",
+    "@e-mc/document": "^0.8.7",
+    "@e-mc/types": "^0.8.7"
   }
 }