@micro-zoe/micro-app 0.8.2 → 0.8.3

package/lib/index.esm.js

@@ -1,4 +1,4 @@
-const version = '0.8.2';
+const version = '0.8.3';
 // do not use isUndefined
 const isBrowser = typeof window !== 'undefined';
 // do not use isUndefined
@@ -359,9 +359,8 @@ function fetchSource(url, appName = null, options = {}) {
 // common reg
 const rootSelectorREG = /(^|\s+)(html|:root)(?=[\s>~[.#:]+|$)/;
 const bodySelectorREG = /(^|\s+)((html[\s>~]+body)|body)(?=[\s>~[.#:]+|$)/;
-const cssUrlREG = /url\(["']?([^)"']+)["']?\)/gm;
 function parseError(msg, linkPath) {
-    msg = linkPath ? `${linkPath}:${msg}` : msg;
+    msg = linkPath ? `${linkPath} ${msg}` : msg;
     const err = new Error(msg);
     err.reason = msg;
     if (linkPath) {
@@ -438,44 +437,41 @@ class CSSParser {
     styleDeclarations() {
         if (!this.matchOpenBrace())
             return parseError("Declaration missing '{'", this.linkPath);
-        this.matchComments();
-        while (this.styleDeclaration()) {
-            this.matchComments();
-        }
+        this.matchAllDeclarations();
         if (!this.matchCloseBrace())
             return parseError("Declaration missing '}'", this.linkPath);
         return true;
     }
-    // match one styleDeclaration at a time
-    styleDeclaration() {
-        // css property
-        if (!this.commonMatch(/^(\*?[-#+\/\*\\\w]+(\[[0-9a-z_-]+\])?)\s*/))
-            return false;
-        // match :
-        if (!this.commonMatch(/^:\s*/))
-            return parseError("property missing ':'", this.linkPath);
-        // match css value
-        const r = this.commonMatch(/^((?:'(?:\\'|.)*?'|"(?:\\"|.)*?"|\([^\)]*?\)|[^};])+)/, true);
-        let cssValue = r ? r[0] : '';
-        if (!this.scopecssDisableNextLine &&
-            (!this.scopecssDisable || this.scopecssDisableSelectors.length)) {
-            cssValue = cssValue.replace(cssUrlREG, (all, $1) => {
-                if (/^((data|blob):|#)/.test($1) || /^(https?:)?\/\//.test($1)) {
-                    return all;
-                }
-                // ./a/b.png  ../a/b.png  a/b.png
-                if (/^((\.\.?\/)|[^/])/.test($1) && this.linkPath) {
-                    this.baseURI = getLinkFileDir(this.linkPath);
-                }
-                return `url("${CompletionPath($1, this.baseURI)}")`;
-            });
+    matchAllDeclarations() {
+        let cssValue = this.commonMatch(/^(?:url\(["']?(?:[^)"'}]+)["']?\)|[^}/])*/, true)[0];
+        if (cssValue) {
+            if (!this.scopecssDisableNextLine &&
+                (!this.scopecssDisable || this.scopecssDisableSelectors.length)) {
+                cssValue = cssValue.replace(/url\(["']?([^)"']+)["']?\)/gm, (all, $1) => {
+                    if (/^((data|blob):|#)/.test($1) || /^(https?:)?\/\//.test($1)) {
+                        return all;
+                    }
+                    // ./a/b.png  ../a/b.png  a/b.png
+                    if (/^((\.\.?\/)|[^/])/.test($1) && this.linkPath) {
+                        this.baseURI = getLinkFileDir(this.linkPath);
+                    }
+                    return `url("${CompletionPath($1, this.baseURI)}")`;
+                });
+            }
+            this.result += cssValue;
         }
         // reset scopecssDisableNextLine
         this.scopecssDisableNextLine = false;
-        this.result += cssValue;
-        this.matchLeadingSpaces();
-        this.commonMatch(/^[;\s]*/);
-        return true;
+        if (!this.cssText || this.cssText.charAt(0) === '}')
+            return;
+        // extract comments in declarations
+        if (this.cssText.charAt(0) === '/' && this.cssText.charAt(1) === '*') {
+            this.matchComments();
+        }
+        else {
+            this.commonMatch(/\/+/);
+        }
+        return this.matchAllDeclarations();
     }
     formatSelector() {
         const m = this.commonMatch(/^([^{]+)/, true);
@@ -609,10 +605,7 @@ class CSSParser {
     commonHandlerForAtRuleWithSelfRule(name) {
         if (!this.matchOpenBrace())
             return parseError(`@${name} missing '{'`, this.linkPath);
-        this.matchComments();
-        while (this.styleDeclaration()) {
-            this.matchComments();
-        }
+        this.matchAllDeclarations();
         if (!this.matchCloseBrace())
             return parseError(`@${name} missing '}'`, this.linkPath);
         this.matchLeadingSpaces();
@@ -698,7 +691,7 @@ function commonAction(styleElement, appName, prefix, baseURI, linkPath) {
         }
         catch (e) {
             parser.reset();
-            logError('CSSParser: An error occurred while parsing CSS', appName, e);
+            logError('An error occurred while parsing CSS:\n', appName, e);
         }
         if (result)
             styleElement.textContent = result;
@@ -1309,7 +1302,7 @@ function rejectMicroAppStyle() {
         hasRejectMicroAppStyle = true;
         const style = pureCreateElement('style');
         globalEnv.rawSetAttribute.call(style, 'type', 'text/css');
-        style.textContent = `\n${microApp.tagName}, micro-app-body { display: block; position: relative; } \nmicro-app-head { display: none; }`;
+        style.textContent = `\n${microApp.tagName}, micro-app-body { display: block; } \nmicro-app-head { display: none; }`;
         globalEnv.rawDocument.head.appendChild(style);
     }
 }