@pi-r/chrome 0.0.1 → 0.2.0

package/index.js

@@ -665,15 +665,17 @@ function setLocationUUID(data, file, ext) {
 }
 function transformOptions(file, mimeType, code, bundleContent) {
     const { uri, localUri, exported } = file;
-    let metadata;
-    if (mimeType === 'text/css') {
-        metadata = { ...this.config, ...file.metadata };
-    }
-    else if (mimeType === 'text/html') {
-        metadata = { '__fromhtml__': true, ...this.config, ...file.metadata };
-    }
-    else {
-        metadata = file.metadata;
+    const metadata = { userAgentData: this.userAgentData };
+    switch (mimeType) {
+        case 'text/html':
+            metadata['__fromhtml__'] = true;
+        case 'text/css':
+            Object.assign(metadata, this.config);
+        default:
+            if ((0, types_1.isObject)(file.metadata)) {
+                Object.assign(metadata, file.metadata);
+            }
+            break;
     }
     const [pathname, filename] = localUri ? [path.dirname(localUri), path.basename(localUri)] : ['', file.filename];
     const options = { pathname, filename, mimeType, metadata, imported: !!file.imports && file.imported !== false };
@@ -900,6 +902,7 @@ class ChromeDocument extends Document {
         this.productionRelease = false;
         this.productionIncremental = false;
         this.templateMap = {};
+        this.userAgentData = {};
         this.related = new Map();
         this.replaced = [];
         this._moduleName = 'chrome';
@@ -1053,7 +1056,7 @@ class ChromeDocument extends Document {
                     const serverRoot = ChromeDocument.INTERNAL_SERVERROOT;
                     const srcDir = path.join(this.baseDirectory, serverRoot);
                     if (isDir(srcDir)) {
-                        const result = await Document.copyDir(srcDir, productionRelease, !this.archiving);
+                        const result = await Document.copyDir(srcDir, productionRelease, this.incremental !== 'staging');
                         const failed = result.failed.map(value => this.removeCwd(value));
                         for (const value of this.files) {
                             if (value.startsWith(serverRoot)) {
@@ -1156,7 +1159,7 @@ class ChromeDocument extends Document {
             return 0;
         });
         if (config) {
-            const { useUnsafeReplace, baseUrl, productionRelease, productionIncremental, templateMap, imports, cache } = config;
+            const { useUnsafeReplace, baseUrl, productionRelease, productionIncremental, templateMap, userAgentData, imports, cache } = config;
             const target = this.config;
             for (const attr in config) {
                 if (attr in target) {
@@ -1198,6 +1201,9 @@ class ChromeDocument extends Document {
             if ((0, types_1.isObject)(templateMap)) {
                 this.templateMap = templateMap;
             }
+            if ((0, types_1.isObject)(userAgentData)) {
+                this.userAgentData = userAgentData;
+            }
             this.imports = (0, types_1.isPlainObject)(imports) ? { ...this.module.imports, ...imports } : this.module.imports;
             if ((0, types_1.isObject)(cache) && 'transform' in cache) {
                 this.customize({ transform: cache.transform });
@@ -3374,11 +3380,11 @@ class ChromeDocument extends Document {
             }
         };
         if (!useUnsafeCssReplace) {
-            const replaceBracket = (pattern, opening) => {
+            const replaceBracket = (pattern) => {
                 let bracket;
                 while (bracket = pattern.exec(current)) {
                     const segment = bracket[0];
-                    if (segment.indexOf('}') !== -1 || opening && segment.indexOf('{') !== -1) {
+                    if (/[{}]/.test(segment)) {
                         const placeholder = '`' + (0, types_1.generateUUID)() + '`';
                         replaceMap.push([placeholder, segment]);
                         current = replaceMatch(bracket, current, placeholder, pattern);
@@ -3386,12 +3392,12 @@ class ChromeDocument extends Document {
                 }
                 pattern.lastIndex = 0;
             };
-            replaceBracket(REGEXP_COMMENT, true);
-            replaceBracket(REGEXP_CONTENT, false);
+            replaceBracket(REGEXP_COMMENT);
+            replaceBracket(REGEXP_CONTENT);
             const values = (0, util_1.splitEnclosing)(current, /\burl/gi);
             for (let i = 0, length = values.length; i < length; ++i) {
                 const seg = values[i];
-                if (seg[seg.length - 1] === ')' && seg.indexOf('}') !== -1 && /^url\(/i.test(seg)) {
+                if (/^url\([^{}]*[{}][\S\s]*\)$/i.test(seg)) {
                     replaceMap.push([values[i] = (0, types_1.generateUUID)(), seg]);
                 }
             }
@@ -3413,25 +3419,29 @@ class ChromeDocument extends Document {
                 const key = value + (useUnsafeCssReplace ? '_1' : '');
                 let [single, group] = selectorMap[key] || [], selector;
                 if (!single || !group) {
-                    single = new RegExp(`(}|^)(${getStringSome()})(?<!@[^}]*)${selector = parseSelector(value)}\\{[^}]*\\}` + dom_1.DomWriter.PATTERN_TRAILINGSPACE, 'g');
+                    single = new RegExp(`(}|^)(${getStringSome()})(?<!@[^}]*)${selector = parseSelector(value)}\\{([^}]*)\\}` + dom_1.DomWriter.PATTERN_TRAILINGSPACE, 'g');
                     group = new RegExp(`((?:}|^)[^{]*?)((?:,${getStringSome()}|(?<!@[^}]*))${selector})(,[^{]*)?\\{`, 'g');
                 }
                 else {
                     single.lastIndex = 0;
                     group.lastIndex = 0;
                 }
-                while (match = single.exec(current)) {
-                    current = spliceSource(current, match.index, getEndIndex(match), single, match[2], match[3], match[1] || '');
+                while ((match = single.exec(current)) && match[3].indexOf('{') === -1) {
+                    current = spliceSource(current, match.index, getEndIndex(match), single, match[2], match[4], match[1] || '');
                     modified = true;
                 }
                 while (match = group.exec(current)) {
-                    const middle = match[2][0] === ',';
-                    const leading = middle ? match[1].trimEnd() : match[1];
-                    const trailing = match[3];
-                    const segment = trailing ? (!middle ? (!isSpace(leading[leading.length - 1]) ? ' ' : '') + trailing.substring(1).trimStart() : trailing).trimEnd() : '';
-                    current = replaceMatch(match, current, leading + segment + ' {');
-                    group.lastIndex = match.index;
-                    modified = true;
+                    const opening = match.index + match[0].length;
+                    const closing = current.indexOf('}', opening);
+                    if (closing !== -1 && current.substring(opening, closing).indexOf('{') === -1) {
+                        const middle = match[2][0] === ',';
+                        const leading = middle ? match[1].trimEnd() : match[1];
+                        const trailing = match[3];
+                        const segment = trailing ? (!middle ? (!isSpace(leading[leading.length - 1]) ? ' ' : '') + trailing.substring(1).trimStart() : trailing).trimEnd() : '';
+                        current = replaceMatch(match, current, leading + segment + ' {');
+                        group.lastIndex = match.index;
+                        modified = true;
+                    }
                 }
                 if (selector) {
                     selectorMap[key] = [single, group];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/chrome",
-  "version": "0.0.1",
+  "version": "0.2.0",
   "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.4.0",
-    "@e-mc/core": "^0.4.0",
-    "@e-mc/document": "^0.4.0",
-    "@e-mc/types": "^0.4.0"
+    "@e-mc/cloud": "^0.5.0",
+    "@e-mc/core": "^0.5.0",
+    "@e-mc/document": "^0.5.0",
+    "@e-mc/types": "^0.5.0"
   }
 }

package/types/index.d.ts

@@ -1,6 +1,6 @@
 import type { LocationUri, XmlTagNode } from '@e-mc/types/lib/squared';
 
-import type { DocumentConstructor, IDocument, IFileManager } from '@e-mc/types/lib';
+import type { DocumentConstructor, ICloud, IDocument, IFileManager } from '@e-mc/types/lib';
 import type { DocumentAsset as IDocumentAsset } from '@e-mc/types/lib/document';
 import type { LogTime } from '@e-mc/types/lib/logger';
 import type { DbSourceDataType, DocumentComponentOption, DocumentComponent as IDocumentComponent, DocumentComponentOptions as IDocumentComponentOptions, DocumentDirectory as IDocumentDirectory, DocumentEval as IDocumentEval, DocumentModule as IDocumentModule, DocumentSettings as IDocumentSettings } from '@e-mc/types/lib/settings';
@@ -37,7 +37,7 @@ interface ChromeDocumentSettings extends IDocumentSettings {
     export?: ObjectMap<string | FunctionType>;
 }
 
-type OutputType = "useUnsafeReplace" | "productionRelease" | "productionIncremental" | "templateMap";
+type OutputType = "useUnsafeReplace" | "productionRelease" | "productionIncremental" | "templateMap" | "userAgentData";
 
 export interface FormatUri extends Partial<LocationUri> {
     dictionary?: string;
@@ -78,7 +78,7 @@ export interface UserConfig extends CssRuleData, Omit<DocumentOutput, OutputType
     useUnsafeCssReplace?: boolean;
 }
 
-export interface IChromeDocument<T extends IFileManager<U>, U extends DocumentAsset = DocumentAsset> extends IDocument<T, U, DocumentModule, DocumentComponent>, Pick<DocumentOutput, OutputType> {
+export interface IChromeDocument<T extends IFileManager<U>, U extends DocumentAsset = DocumentAsset, V extends ICloud = ICloud<T>> extends IDocument<T, U, DocumentModule, DocumentComponent, DocumentComponentOption, V>, Pick<DocumentOutput, OutputType> {
     htmlFile: Null<U>;
     cssFiles: U[];
     jsFiles: U[];
@@ -100,10 +100,10 @@ export interface IChromeDocument<T extends IFileManager<U>, U extends DocumentAs
     removeUnusedStyles(source: string, options?: UserConfig): Undef<string>;
     removeServerRoot(value: string): string;
     replaceContent(source: string, match: RegExpExecArray | string, mimeType?: string): Undef<string>;
-    cloudInit(state: CloudScopeOrigin<T, U>): void;
-    cloudObject(state: CloudScopeOrigin<T, U>, file: U): boolean;
-    cloudUpload(state: CloudScopeOrigin<T, U>, file: U, url: string, active: boolean): Promise<boolean>;
-    cloudFinalize(state: CloudScopeOrigin<T, U>): Promise<unknown[]>;
+    cloudInit(state: CloudScopeOrigin<T, U, V>): void;
+    cloudObject(state: CloudScopeOrigin<T, U, V>, file: U): boolean;
+    cloudUpload(state: CloudScopeOrigin<T, U, V>, file: U, url: string, active: boolean): Promise<boolean>;
+    cloudFinalize(state: CloudScopeOrigin<T, U, V>): Promise<unknown[]>;
     get settings(): ChromeDocumentSettings;
     get editing(): U[];
     get dataSource(): DataSource[];
@@ -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>;
-}
+}

package/types/squared.d.ts

@@ -17,6 +17,13 @@ interface DataObject extends CascadeAction {
     options?: PlainObject;
 }
 
+export interface UserAgentData {
+    platform: string;
+    brand: string;
+    browser: number;
+    version: Null<number[]>;
+}
+
 export interface DocumentOutput {
     productionRelease?: boolean | string;
     productionIncremental?: boolean;
@@ -38,6 +45,7 @@ export interface DocumentOutput {
         excludeScopes?: string[];
     };
     templateMap?: TemplateMap;
+    userAgentData?: Partial<UserAgentData>;
 }
 
 export interface RequestData extends IRequestData<ChromeAsset>, Readonly<DocumentOutput>, Readonly<CssRuleData> {}