@pi-r/chrome 0.9.1 → 0.9.2

package/index.js

@@ -209,7 +209,7 @@ 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]), trimQuote(match[3])]);
             }
             REGEXP_TEMPLATECOMPARISON.lastIndex = 0;
             const length = items.length;
@@ -818,7 +818,7 @@ function replaceHtml(instance, source, { productionRelease, contentMap }, cssMap
 }
 function finalizeHtml(value, data) {
     for (const id in data) {
-        value = value.replace(new RegExp(escapePattern(id), 'g'), data[id]);
+        value = value.replace(new RegExp((0, types_1.escapePattern)(id), 'g'), data[id]);
     }
     return value;
 }
@@ -907,9 +907,6 @@ function errorCredential(instance, domBase, item, err) {
         instance.writeFail(["Invalid credentials", item.source], err);
     }
 }
-function escapePattern(value) {
-    return value.replace(/[-|\\{}()[\]^$+*?.]/g, capture => capture === '-' ? '\\x2d' : '\\' + capture);
-}
 const isSpace = dom_1.DomWriter.isSpace.bind(dom_1.DomWriter);
 const replaceMatch = dom_1.DomWriter.replaceMatch.bind(dom_1.DomWriter);
 const getNewlineString = dom_1.DomWriter.getNewlineString.bind(dom_1.DomWriter);
@@ -1851,7 +1848,7 @@ class ChromeDocument extends Document {
         }
     }
     removeServerRoot(value) {
-        return value.replace(new RegExp('(\\.\\./)*' + escapePattern(ChromeDocument.INTERNAL_SERVERROOT), 'g'), '');
+        return value.replace(new RegExp('(\\.\\./)*' + (0, types_1.escapePattern)(ChromeDocument.INTERNAL_SERVERROOT), 'g'), '');
     }
     addCopy(data, saveAs) {
         if (data.command && this.host) {
@@ -1880,7 +1877,7 @@ class ChromeDocument extends Document {
         if (this.htmlFile) {
             const endpoint = instance.getStorage('upload', this.htmlFile.cloudStorage)?.upload?.endpoint;
             if (endpoint) {
-                this._cloudEndpoint = new RegExp(escapePattern(Document.toPosix(endpoint)) + '/', 'g');
+                this._cloudEndpoint = new RegExp((0, types_1.escapePattern)(Document.toPosix(endpoint)) + '/', 'g');
             }
         }
     }
@@ -1897,7 +1894,7 @@ class ChromeDocument extends Document {
             const cloudUrl = endpoint ? url.replace(endpoint, '') : url;
             file.cloudUrl = cloudUrl;
             if (inlineUrlCloud) {
-                const pattern = new RegExp(escapePattern(inlineUrlCloud), 'g');
+                const pattern = new RegExp((0, types_1.escapePattern)(inlineUrlCloud), 'g');
                 for (const item of this.editing) {
                     if (item.inlineUrlCloudMap?.[inlineUrlCloud]) {
                         const source = host.getUTF8String(item);
@@ -1927,7 +1924,7 @@ class ChromeDocument extends Document {
                 for (const id in this._cloudUrlMap) {
                     const inlineUrlCloud = item.inlineUrlCloudMap[id];
                     if (inlineUrlCloud && !this._cloudUploaded.has(id)) {
-                        output = (output || source).replace(new RegExp(escapePattern(id), 'g'), inlineUrlCloud);
+                        output = (output || source).replace(new RegExp((0, types_1.escapePattern)(id), 'g'), inlineUrlCloud);
                         state.localStorage.delete(this._cloudUrlMap[id]);
                     }
                 }
@@ -2108,7 +2105,7 @@ class ChromeDocument extends Document {
                         let current = srcset, match;
                         for (const url of items) {
                             const resolve = sameOrigin && !Document.isURL(url);
-                            const pathname = url.split('/').map(seg => escapePattern(seg)).join('/');
+                            const pathname = url.split('/').map(seg => (0, types_1.escapePattern)(seg)).join('/');
                             const pattern = new RegExp(`(,?\\s*)(${(resolve && !url.startsWith('.') ? `(?:\\.\\./)*\\.\\.${pathname}|` : '') + pathname})(` + (!url.includes('?') ? '(?:(?!,)(?:[^?]|$)[^,]*)|(?!\\?)[^,]*)' : '[^,]*)'), 'g');
                             while (match = pattern.exec(current)) {
                                 const partial = match[2];
@@ -2356,7 +2353,7 @@ class ChromeDocument extends Document {
         source = removeNamespace(moduleName, domBase.modified ? domBase.close() : source, domBase.newline, domBase.getComments());
         if (this.sanitizeFramework) {
             for (const name of this.sanitizeFramework) {
-                source = source.replace(name === '*' ? REGEXP_SANITIZEALL : new RegExp(`(?:\\s+|\\b)data-(?:${escapePattern(name)}-[^=\\s]+|.+?-${escapePattern(name)})\\s*${dom_1.DomWriter.PATTERN_ATTRVALUE}(?=(?:[^"<]+"[^"]*"|[^'<]+'[^']*')*[^<>]*>)`, 'g'), '');
+                source = source.replace(name === '*' ? REGEXP_SANITIZEALL : new RegExp(`(?:\\s+|\\b)data-(?:${(0, types_1.escapePattern)(name)}-[^=\\s]+|.+?-${(0, types_1.escapePattern)(name)})\\s*${dom_1.DomWriter.PATTERN_ATTRVALUE}(?=(?:[^"<]+"[^"]*"|[^'<]+'[^']*')*[^<>]*>)`, 'g'), '');
             }
         }
         if (!htmlFile.preserve) {
@@ -3283,7 +3280,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;
@@ -3552,7 +3550,7 @@ class ChromeDocument extends Document {
                 }
                 selector += (space & 1 ? '`%%`' : '') + (!casing && ch >= 'a' && ch <= 'z' ? '`' + ch + ch.toUpperCase() + '`' : ch) + (space & 2 ? '`%%`' : '');
             }
-            selector = escapePattern(selector)
+            selector = (0, types_1.escapePattern)(selector)
                 .replace(/\s*(>|~(?!=)|\\\+|\\\*(?!=)])\s*/g, (...capture) => stringSome + capture[1] + stringSome)
                 .replace(/`([a-z][A-Z]|%{2,4})`/g, (...capture) => {
                 switch (capture[1]) {
@@ -3618,7 +3616,7 @@ class ChromeDocument extends Document {
                         }
                     }
                     if (!revised) {
-                        selector = escapePattern(selector || value)
+                        selector = (0, types_1.escapePattern)(selector || value)
                             .replace(/\s*(\\[()])\s*/g, (...capture) => stringSome + capture[1] + stringSome)
                             .replace(/:\s+/g, stringSome + ':' + stringSome)
                             .replace(/\s+([<>/]|<=|>=|\\\*)\s+/g, (...capture) => stringSome + capture[1] + stringSome)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/chrome",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "description": "Chrome document constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",