@pi-r/chrome 0.7.5 → 0.7.7

package/index.js

@@ -28,7 +28,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_SRCSETSIZE = /~\s*([\d.]+)\s*([wx])/i;
@@ -54,9 +54,9 @@ 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 = /(?:\burl\(|@import\s+(["'])|\b(href)\s*=)/gi;
 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_URL_SVG = /(?:\burl\(|@import\s+(["'])|\b(href)\s*=)/gi;
 const REGEXP_IMAGESET = /\b(?:-webkit-)?image-set\(/gi;
 const REGEXP_IMAGESET_URL = /(?:^|[^(])\s*("(\s*[^)][^"]*)"|'(\s*[^)][^"]*)')\s*(?:,|$|[^)][^,]*,?)/g;
 function removeNamespace(name, source, newline, comments) {
@@ -200,7 +200,7 @@ function hasCondition(data, condition) {
                 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;
@@ -211,18 +211,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;
@@ -245,7 +240,7 @@ function hasCondition(data, condition) {
                             return false;
                     }
                 }
-                else if (item[0]) {
+                else if (cmp) {
                     return false;
                 }
                 else {
@@ -582,7 +577,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;
@@ -1689,7 +1684,7 @@ class ChromeDocument extends Document {
                 if (match) {
                     const layer = match[1];
                     const supports = match[3]?.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 : '';
@@ -1697,8 +1692,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 = match[2]?.replace(/\s+/g, '');
+                            result += '@layer ' + (name ? name.slice(1, -1) + ' ' : '') + `{${newline + source + newline}}` + (query ? newline + '}' : '');
                         }
                         else if (query) {
                             result += source + newline + '}';
@@ -3007,14 +3002,14 @@ class ChromeDocument extends Document {
                                                             continue;
                                                         }
                                                         try {
-                                                            let content = new Function('return ' + literal + ';').call(row);
+                                                            let unsafe = new Function('return ' + literal + ';').call(row);
                                                             if (!segment.startsWith('`')) {
-                                                                content = segment.substring(0, segment.indexOf('`')) + content;
+                                                                unsafe = segment.substring(0, segment.indexOf('`')) + unsafe;
                                                             }
                                                             if (!segment.endsWith('`')) {
-                                                                content += segment.substring(segment.lastIndexOf('`') + 1);
+                                                                unsafe += segment.substring(segment.lastIndexOf('`') + 1);
                                                             }
-                                                            segment = content;
+                                                            segment = unsafe;
                                                         }
                                                         catch (err) {
                                                             errors = err instanceof Error ? err : true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/chrome",
-  "version": "0.7.5",
+  "version": "0.7.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.9.18",
-    "@e-mc/core": "^0.9.18",
-    "@e-mc/document": "^0.9.18",
-    "@e-mc/types": "^0.9.18"
+    "@e-mc/cloud": "^0.9.28",
+    "@e-mc/core": "^0.9.28",
+    "@e-mc/document": "^0.9.28",
+    "@e-mc/types": "^0.9.28"
   }
 }