@pi-r/chrome 0.2.8 → 0.2.10

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2023 Mile Square Park
+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:
 

package/index.js

@@ -1,5 +1,4 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 const path = require("path");
 const fs = require("fs");
 const asset_1 = require("@e-mc/document/asset");
@@ -25,6 +24,14 @@ const [PATTERN_STRING_SOME, PATTERN_STRING_MANY] = (function () {
     const pattern = '(?:\\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 [pattern + '*', pattern + '+'];
 })();
+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(`^@import\\s+(?:url\\((?:[^)]|(?<=\\\\)\\))+\\)|"(?:[^"]|(?<=\\\\)")+"|'(?:[^']|(?<=\\\\)')+')(\\s*layer(?:\\(([^)]*)\\)|\\b))?(?:\\s*supports\\((${parenthesis})\\))?(.*?);?$`)
+    ];
+})();
 const REGEXP_COMMENT = new RegExp(dom_1.DomWriter.PATTERN_COMMENT, 'g');
 const REGEXP_CONTENT = new RegExp(`\\bcontent${PATTERN_STRING_SOME}:${PATTERN_STRING_SOME}(?:"[^"]*"|'[^']*')`, 'gi');
 const REGEXP_STYLE = new RegExp(`(<style${dom_1.DomWriter.PATTERN_TAGOPEN}*>)([\\S\\s]*?)(<\\/style\\s*>)`, 'gi');
@@ -32,12 +39,10 @@ const REGEXP_VARIABLES = new RegExp(`(\\s*)(--[^\\s:]*)${PATTERN_STRING_SOME}:[^
 const REGEXP_FONTFACE = new RegExp(`(\\s*)@font-face${PATTERN_STRING_SOME}{([^}]+)}` + dom_1.DomWriter.PATTERN_TRAILINGSPACE, 'gi');
 const REGEXP_FONTFAMILY = new RegExp(`font-family${PATTERN_STRING_SOME}:([^;}]+)`, 'i');
 const REGEXP_KEYFRAMES = new RegExp(`(\\s*)@keyframes${PATTERN_STRING_MANY}([^{]+){`, 'gi');
-const REGEXP_NTHCHILD = new RegExp(`\\(${PATTERN_STRING_SOME}([+-])?(?:(\\d*)[nN]|(0))${PATTERN_STRING_SOME}([+-])?${PATTERN_STRING_SOME}(\\d*)${PATTERN_STRING_SOME}\\)`, 'g');
 const REGEXP_VARIABLES_UNSAFE = new RegExp(`(\\s*)(--[^\\s:]*)\\s*:[^;}]*([;}])` + dom_1.DomWriter.PATTERN_TRAILINGSPACE, 'g');
 const REGEXP_FONTFACE_UNSAFE = new RegExp(`(\\s*)@font-face\\s*{([^}]+)}` + dom_1.DomWriter.PATTERN_TRAILINGSPACE, 'gi');
 const REGEXP_FONTFAMILY_UNSAFE = /font-family\s*:([^;}]+)/i;
 const REGEXP_KEYFRAMES_UNSAFE = /(\s*)@keyframes\s+([^{]+){/gi;
-const REGEXP_NTHCHILD_UNSAFE = /\(\s*([+-])?(?:(\d*)[nN]|(0))\s*([+-])?\s*(\d*)\s*\)/g;
 function removeNamespace(name, source, newline, comments) {
     if (source.indexOf('-' + name) !== -1) {
         const dataset = CACHE_DATASET[name] || (CACHE_DATASET[name] = [
@@ -1143,7 +1148,7 @@ class ChromeDocument extends Document {
             return 0;
         });
         if (config) {
-            const { useUnsafeReplace, baseUrl, productionRelease, productionIncremental, templateMap, userAgentData, imports, cache } = config;
+            const { useUnsafeReplace, baseUrl, productionRelease, productionIncremental, templateMap, userAgentData, cache } = config;
             const target = this.config;
             for (const attr in config) {
                 if (attr in target) {
@@ -1188,7 +1193,10 @@ class ChromeDocument extends Document {
             if ((0, types_1.isObject)(userAgentData)) {
                 this.userAgentData = userAgentData;
             }
-            this.imports = (0, types_1.isPlainObject)(imports) ? { ...this.module.imports, ...imports } : this.module.imports;
+            const imports = (0, types_1.isPlainObject)(config.imports) ? { ...this.module.imports, ...config.imports } : this.module.imports;
+            if (imports) {
+                this.imports = imports;
+            }
             if ((0, types_1.isObject)(cache) && 'transform' in cache) {
                 this.customize({ transform: cache.transform });
             }
@@ -1572,14 +1580,14 @@ class ChromeDocument extends Document {
     replaceContent(source, statement, mimeType) {
         switch (mimeType) {
             case 'text/css': {
-                const match = /^@import\s+(?:url\((?:[^)]|(?<=\\)\))+\)|"(?:[^"]|(?<=\\)")+"|'(?:[^']|(?<=\\)')+')(\s*layer(?:\(([^)]*)\)|\b))?(?:\s*supports\(((?:\([^(]+\(|\([^)]+\)|\)[^)]+\)|(?:(?!\))[^(])+|(?:(?!\()[^)])+)+)\))?(.*?);?$/.exec((typeof statement === 'string' ? statement : statement[0]).trim());
+                const match = REGEXP_REPLACECSS.exec((typeof statement === 'string' ? statement : statement[0]).trim());
                 if (match) {
                     const layer = match[1];
                     const supports = match[3]?.trim();
                     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;
                         }
@@ -3204,7 +3212,7 @@ class ChromeDocument extends Document {
         const parseSelector = (value) => {
             const items = [];
             const revised = value.replace(useUnsafeCssReplace ? REGEXP_NTHCHILD_UNSAFE : REGEXP_NTHCHILD, (...capture) => {
-                return '`%' + (items.push('\\(' + getStringSome() + (capture[1] === '-' ? '\\x2d' : '\\x2b?') + (capture[2] || '[01]?') + (capture[3] === '0' ? !capture[1] && !capture[2] && !capture[4] && !capture[5] ? '[+-]?0[nN]?' : '0' : '[nN]') + getStringSome() + (capture[5] ? (capture[4] === '-' ? '\\x2d' : '\\x2b') + getStringSome() + capture[5] : `(?:[+-]${getStringSome()}0)?`) + getStringSome() + '\\)') - 1) + '`';
+                return '`%' + (items.push('\\(' + getStringSome() + (capture[1] === '-' ? '\\x2d' : '\\x2b?') + (capture[2] || '[01]?') + (capture[3] === '0' ? !capture[1] && !capture[2] && !capture[4] && !capture[5] ? '[+-]?0[nN]?' : '0' : '[nN]') + getStringSome() + (capture[5] ? (capture[4] === '-' ? '\\x2d' : '\\x2b') + getStringSome() + capture[5] : `(?:[+-]${getStringSome()}0)?`) + (capture[6] ? getStringMany() + '[oO][fF]' + getStringMany() + capture[6].trim() : '') + getStringSome() + '\\)') - 1) + '`';
             });
             let selector = '';
             for (let i = 0, length = revised.length, casing = false, attr = false, quote = false; i < length; i++) {
@@ -3537,9 +3545,5 @@ class ChromeDocument extends Document {
 }
 ChromeDocument.INTERNAL_ASSIGNUUID = '__assign__';
 ChromeDocument.INTERNAL_SERVERROOT = '__serverroot__';
-exports.default = ChromeDocument;
 
-if (exports.default) {
-    module.exports = exports.default;
-    module.exports.default = exports.default;
-}
+module.exports = ChromeDocument;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/chrome",
-  "version": "0.2.8",
+  "version": "0.2.10",
   "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.5.4",
-    "@e-mc/core": "^0.5.4",
-    "@e-mc/document": "^0.5.4",
-    "@e-mc/types": "^0.5.4"
+    "@e-mc/cloud": "^0.5.6",
+    "@e-mc/core": "^0.5.6",
+    "@e-mc/document": "^0.5.6",
+    "@e-mc/types": "^0.5.6"
   }
 }

package/types/index.d.ts

@@ -91,12 +91,12 @@ export interface IChromeDocument<T extends IFileManager<U>, U extends DocumentAs
     formatMap?: ObjectMap<FormatUri>;
     setElementSrc(asset: U, element: IXmlElement, value: string): void;
     findDataValue(name: string): Undef<string>;
-    setInlinedAttributes(processing: FinalizeProcessing<T>): void;
-    applyTransforms(processing: FinalizeProcessing<T>): Promise<void>;
-    rewriteHtml(processing: FinalizeProcessing<T>): Promise<void>;
-    setElementAttributes(processing: FinalizeProcessing<T>, domBase: IDomWriter): Promise<void>;
-    applyDataSource(processing: FinalizeProcessing<T>, domBase: IDomWriter): Promise<void>;
-    setProductionAttributes(processing: FinalizeProcessing<T>): void;
+    setInlinedAttributes(processing: FinalizeProcessing<T, U>): void;
+    applyTransforms(processing: FinalizeProcessing<T, U>): Promise<void>;
+    rewriteHtml(processing: FinalizeProcessing<T, U>): Promise<void>;
+    setElementAttributes(processing: FinalizeProcessing<T, U>, domBase: IDomWriter): Promise<void>;
+    applyDataSource(processing: FinalizeProcessing<T, U>, domBase: IDomWriter): Promise<void>;
+    setProductionAttributes(processing: FinalizeProcessing<T, U>): void;
     removeUnusedStyles(source: string, options?: UserConfig): Undef<string>;
     removeServerRoot(value: string): string;
     replaceContent(source: string, match: RegExpExecArray | string, mimeType?: string): Undef<string>;
@@ -115,4 +115,4 @@ export interface ChromeDocumentConstructor<T extends IFileManager<U>, U extends
     INTERNAL_SERVERROOT: string;
     readonly prototype: IChromeDocument<T, U>;
     new(module?: DocumentModule, ...args: unknown[]): IChromeDocument<T, U>;
-}
+}