@pi-r/chrome 0.8.3 → 0.8.5

package/LICENSE

@@ -1,7 +1,7 @@
-Copyright 2024 An Pham
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
+Copyright 2024 An Pham
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/index.d.ts

@@ -1,7 +1,7 @@
-import type { IFileManager } from '@e-mc/types/lib';
-
-import type { ChromeDocumentConstructor, DocumentAsset } from './types';
-
-declare const Chrome: ChromeDocumentConstructor<IFileManager<DocumentAsset>>;
-
+import type { IFileManager } from '@e-mc/types/lib';
+
+import type { ChromeDocumentConstructor, DocumentAsset } from './types';
+
+declare const Chrome: ChromeDocumentConstructor<IFileManager<DocumentAsset>>;
+
 export = Chrome;

package/index.js

@@ -28,11 +28,11 @@ 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;
-const REGEXP_TEMPLATECONDITIONAL = /(\n\s+)?\{\{if\s+((?:[^}]|}(?!}))+?)\}\}(\s*)(.*?)(?:\s*\{\{else(?:\s+if\s+((?:[^}]|}(?!}))+?))?\}\}(\s*)(.*?)\s*)?\s*\{\{end\}\}/gs;
+const REGEXP_TEMPLATECONDITIONAL = /(\n\s+)?\{\{if\s+((?:[^}]|}(?!}))+?)\}\}(\s*)([\S\s]*?)(?:\s*\{\{else(?:\s+if\s+((?:[^}]|}(?!}))+?))?\}\}(\s*)([\S\s]*?)\s*)?\s*\{\{end\}\}/g;
 const REGEXP_TEMPLATECOMPARISON = /\s*\(\s*(?:\b(eq|ne|lt|le|gt|ge)\s+)?("[^"]+"|'[^']+'|[^\s)]+)(?:\s+("[^"]+"|'[^']+'|[^\s)]+))?\s*\)/g;
 const REGEXP_TEMPLATEMATCH = new RegExp(`^(?:\\b(and|or|not)\\s+)?((?:${REGEXP_TEMPLATECOMPARISON.source})+)|(!|not\\s+)?([^\\s][\\S\\s]*)$`);
 const REGEXP_IMPORTMODULE = /(?:(?:^|[\n;]+)\s*import\s+(?:("(?:[^"]|(?<=\\)")+"|'(?:[^']|(?<=\\)')+')|.+?from\s+("(?:[^"]|(?<=\\)")+"|'(?:[^']|(?<=\\)')+')(?:[ \t]+(?:assert|with)[ \t]+\{((?:"(?:[^"]|(?<=\\)")+"|'(?:[^']|(?<=\\)')+'|`(?:[^`]|(?<=\\)`)+`|{[^{]*{|{[^}]*}|}[^}]*}|[^"'`]+)+)\})?)|\bimport\(\s*("(?:[^"]|(?<=\\)")+"|'(?:[^']|(?<=\\)')+')\s*(?:,\s*\{((?:"(?:[^"]|(?<=\\)")+"|'(?:[^']|(?<=\\)')+'|`(?:[^`]|(?<=\\)`)+`|{[^{]*{|{[^}]*}|}[^}]*}|[^"'`]+)+)\}\s*)?\))/gd;
@@ -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*(?:,|$|[^)][^,]*,?)/gd;
 const REGEXP_SANITIZEALL = new RegExp(`(?:\\s+|\\b)data-(?:pathname|filename|intl-locales|(?:use|exclude)-[^=\\s]+)\\s*${dom_1.DomWriter.PATTERN_ATTRVALUE}(?=(?:[^"<]+"[^"]*"|[^'<]+'[^']*')*[^<>]*>)`, 'g');
@@ -189,10 +189,6 @@ function parseArg(data, value) {
     if (!isNaN(n)) {
         return n;
     }
-    const match = /^(["'])(.*)\1$/s.exec(value);
-    if (match) {
-        return match[2];
-    }
     return getObjectValue(data, value);
 }
 function hasCondition(data, condition) {
@@ -209,18 +205,18 @@ function hasCondition(data, condition) {
                 if (items.length > 0 && !isSpace(match[0][0])) {
                     return false;
                 }
-                items.push([match[1], match[2], match[3]]);
+                items.push([match[1], trimQuote(match[2]), match[3] ? trimQuote(match[3]) : '']);
             }
             REGEXP_TEMPLATECOMPARISON.lastIndex = 0;
-            if (items.length > 1 && !join) {
+            const length = items.length;
+            if (length > 1 && !join) {
                 return false;
             }
-            for (const item of items) {
-                const arg1 = item[1];
-                const arg2 = item[2];
-                let valid;
+            for (let i = 0; i < length; ++i) {
+                const [cmp, arg1, arg2] = items[i];
+                let valid = false;
                 if (arg2) {
-                    switch (item[0]) {
+                    switch (cmp) {
                         case 'eq':
                             valid = parseArg(data, arg1) == parseArg(data, arg2);
                             break;
@@ -243,7 +239,7 @@ function hasCondition(data, condition) {
                             return false;
                     }
                 }
-                else if (item[0]) {
+                else if (cmp) {
                     return false;
                 }
                 else {
@@ -590,7 +586,7 @@ function transformURL(instance, 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;
@@ -1822,7 +1818,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 : '';
@@ -1830,8 +1826,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 + '}';
@@ -3137,14 +3133,14 @@ class ChromeDocument extends Document {
                                                             continue;
                                                         }
                                                         try {
-                                                            let content = new Function('return ' + literal + ';')(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;
@@ -3279,7 +3275,8 @@ class ChromeDocument extends Document {
                                                     const row = items[0];
                                                     let condition = NaN;
                                                     for (let seg of template) {
-                                                        switch ((seg = seg.trim()).toLowerCase()) {
+                                                        seg = seg.trim();
+                                                        switch (seg.toLowerCase()) {
                                                             case ':is(and)':
                                                                 if (condition === 0) {
                                                                     remove = false;
@@ -3473,7 +3470,7 @@ class ChromeDocument extends Document {
         const parseSelector = (value) => {
             const items = [];
             const revised = value.replace(useUnsafeCssReplace ? REGEXP_NTHCHILD_UNSAFE : REGEXP_NTHCHILD, (...capture) => {
-                return '`%' + (items.push('\\(' + stringSome + (capture[1] === '-' ? '\\x2d' : '\\x2b?') + (capture[2] || '[01]?') + (capture[3] === '0' ? !capture[1] && !capture[2] && !capture[4] && !capture[5] ? '[+-]?0[nN]?' : '0' : '[nN]') + stringSome + (capture[5] ? (capture[4] === '-' ? '\\x2d' : '\\x2b') + stringSome + capture[5] : `(?:[+-]${stringSome}0)?`) + (capture[6] ? stringMany + '[oO][fF]' + stringMany + capture[6].trim() : '') + stringSome + '\\)') - 1) + '`';
+                return '`%' + (items.push('\\(' + stringSome + (capture[1] === '-' ? '\\x2d' : '\\x2b?') + (capture[2] || '[01]?') + (capture[3] === '0' ? !capture[1] && !capture[2] && !capture[4] && !capture[5] ? '[+-]?0[nN]?' : '0' : '[nN]?') + stringSome + (capture[5] ? (capture[4] === '-' ? '\\x2d' : '\\x2b?') + stringSome + capture[5] : `(?:[+-]${stringSome}0)?`) + (capture[6] ? stringMany + '[oO][fF]' + stringMany + capture[6].trim() : '') + stringSome + '\\)') - 1) + '`';
             });
             let selector = '';
             for (let i = 0, length = revised.length, casing = false, attr = false, quote = false; i < length; i++) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/chrome",
-  "version": "0.8.3",
+  "version": "0.8.5",
   "description": "Chrome document constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -21,9 +21,9 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/cloud": "^0.10.3",
-    "@e-mc/core": "^0.10.3",
-    "@e-mc/document": "^0.10.3",
-    "@e-mc/types": "^0.10.3"
+    "@e-mc/cloud": "^0.10.20",
+    "@e-mc/core": "^0.10.20",
+    "@e-mc/document": "^0.10.20",
+    "@e-mc/types": "^0.10.20"
   }
 }