Merge branch 'master' into encode-decode

csstree · Jun 1, 2020 · ac8e0d2 · ac8e0d2
2 parents a2b8191 + 771c337
commit ac8e0d2
Show file tree

Hide file tree

Showing 65 changed files with 439 additions and 24 deletions.
diff --git a/lib/syntax/function/var.js b/lib/syntax/function/var.js
@@ -1,4 +1,4 @@
-const { Comma } = require('../../tokenizer/types');
+const { Comma, WhiteSpace } = require('../../tokenizer/types');
 
 // var( <ident> , <value>? )
 module.exports = function() {
@@ -13,10 +13,26 @@ module.exports = function() {
 
     if (this.tokenType === Comma) {
         children.push(this.Operator());
-        children.push(this.parseCustomProperty
+
+        const startIndex = this.tokenIndex;
+        const value = this.parseCustomProperty
             ? this.Value(null)
-            : this.Raw(this.tokenIndex, this.consumeUntilExclamationMarkOrSemicolon, false)
-        );
+            : this.Raw(this.tokenIndex, this.consumeUntilExclamationMarkOrSemicolon, false);
+
+        if (value.type === 'Value' && value.children.isEmpty) {
+            for (let offset = startIndex - this.tokenIndex; offset <= 0; offset++) {
+                if (this.lookupType(offset) === WhiteSpace) {
+                    value.children.appendData({
+                        type: 'WhiteSpace',
+                        loc: null,
+                        value: ' '
+                    });
+                    break;
+                }
+            }
+        }
+
+        children.push(value);
     }
 
     return children;

diff --git a/lib/syntax/node/Declaration.js b/lib/syntax/node/Declaration.js
@@ -4,7 +4,8 @@ const {
     Hash,
     Colon,
     Semicolon,
-    Delim
+    Delim,
+    WhiteSpace
 } = require('../../tokenizer/types');
 
 const EXCLAMATIONMARK = 0x0021; // U+0021 EXCLAMATION MARK (!)
@@ -58,6 +59,8 @@ module.exports = {
         this.skipSC();
         this.eat(Colon);
 
+        const valueStart = this.tokenIndex;
+
         if (!customProperty) {
             this.skipSC();
         }
@@ -68,6 +71,19 @@ module.exports = {
             value = consumeRaw.call(this, this.tokenIndex);
         }
 
+        if (customProperty && value.type === 'Value' && value.children.isEmpty) {
+            for (let offset = valueStart - this.tokenIndex; offset <= 0; offset++) {
+                if (this.lookupType(offset) === WhiteSpace) {
+                    value.children.appendData({
+                        type: 'WhiteSpace',
+                        loc: null,
+                        value: ' '
+                    });
+                    break;
+                }
+            }
+        }
+
         if (this.isDelim(EXCLAMATIONMARK)) {
             important = getImportant.call(this);
             this.skipSC();

diff --git a/...ixture/parse/atrule/atrule/font-face.json → .../fixture/ast/atrule/atrule/font-face.json b/...ixture/parse/atrule/atrule/font-face.json → .../fixture/ast/atrule/atrule/font-face.json
diff --git a/test/fixture/parse/atrule/atrule/import.json → test/fixture/ast/atrule/atrule/import.json b/test/fixture/parse/atrule/atrule/import.json → test/fixture/ast/atrule/atrule/import.json
diff --git a/test/fixture/parse/atrule/atrule/media.json → test/fixture/ast/atrule/atrule/media.json b/test/fixture/parse/atrule/atrule/media.json → test/fixture/ast/atrule/atrule/media.json
diff --git a/...fixture/parse/atrule/atrule/supports.json → test/fixture/ast/atrule/atrule/supports.json b/...fixture/parse/atrule/atrule/supports.json → test/fixture/ast/atrule/atrule/supports.json
diff --git a/test/fixture/parse/atrule/block.json → test/fixture/ast/atrule/block.json b/test/fixture/parse/atrule/block.json → test/fixture/ast/atrule/block.json
diff --git a/test/fixture/parse/atrule/no-block.json → test/fixture/ast/atrule/no-block.json b/test/fixture/parse/atrule/no-block.json → test/fixture/ast/atrule/no-block.json
diff --git a/test/fixture/parse/atrule/stylesheet.json → test/fixture/ast/atrule/stylesheet.json b/test/fixture/parse/atrule/stylesheet.json → test/fixture/ast/atrule/stylesheet.json
diff --git a/test/fixture/parse/atrule/tolerant.json → test/fixture/ast/atrule/tolerant.json b/test/fixture/parse/atrule/tolerant.json → test/fixture/ast/atrule/tolerant.json
diff --git a/test/fixture/parse/atrulePrelude/index.json → test/fixture/ast/atrulePrelude/index.json b/test/fixture/parse/atrulePrelude/index.json → test/fixture/ast/atrulePrelude/index.json
diff --git a/test/fixture/parse/block/Block.json → test/fixture/ast/block/Block.json b/test/fixture/parse/block/Block.json → test/fixture/ast/block/Block.json
diff --git a/test/fixture/parse/block/tolerant.json → test/fixture/ast/block/tolerant.json b/test/fixture/parse/block/tolerant.json → test/fixture/ast/block/tolerant.json
diff --git a/...ixture/parse/declaration/Declaration.json → .../fixture/ast/declaration/Declaration.json b/...ixture/parse/declaration/Declaration.json → .../fixture/ast/declaration/Declaration.json
diff --git a/.../fixture/parse/declaration/Important.json → test/fixture/ast/declaration/Important.json b/.../fixture/parse/declaration/Important.json → test/fixture/ast/declaration/Important.json
diff --git a/...re/parse/declaration/custom-property.json → ...ture/ast/declaration/custom-property.json b/...re/parse/declaration/custom-property.json → ...ture/ast/declaration/custom-property.json
@@ -83,6 +83,21 @@
             }
         }
     },
+    "empty (parseCustomProperty:true)": {
+        "options": {
+            "parseCustomProperty": true
+        },
+        "source": "--var:",
+        "ast": {
+            "type": "Declaration",
+            "important": false,
+            "property": "--var",
+            "value": {
+                "type": "Value",
+                "children": []
+            }
+        }
+    },
     "empty with important": {
         "source": "--var:!important",
         "ast": {
@@ -95,6 +110,21 @@
             }
         }
     },
+    "empty with important (parseCustomProperty:true)": {
+        "options": {
+            "parseCustomProperty": true
+        },
+        "source": "--var:!important",
+        "ast": {
+            "type": "Declaration",
+            "important": true,
+            "property": "--var",
+            "value": {
+                "type": "Value",
+                "children": []
+            }
+        }
+    },
     "should preserve single spaces": {
         "source": "--var: ",
         "ast": {
@@ -107,6 +137,26 @@
             }
         }
     },
+    "should preserve single spaces (parseCustomProperty:true)": {
+        "options": {
+            "parseCustomProperty": true
+        },
+        "source": "--var: ",
+        "ast": {
+            "type": "Declaration",
+            "important": false,
+            "property": "--var",
+            "value": {
+                "type": "Value",
+                "children": [
+                    {
+                        "type": "WhiteSpace",
+                        "value": " "
+                    }
+                ]
+            }
+        }
+    },
     "should preserve single spaces with important": {
         "source": "--var: !important",
         "ast": {
@@ -119,6 +169,26 @@
             }
         }
     },
+    "should preserve single spaces with important (parseCustomProperty:true)": {
+        "options": {
+            "parseCustomProperty": true
+        },
+        "source": "--var: !important",
+        "ast": {
+            "type": "Declaration",
+            "important": true,
+            "property": "--var",
+            "value": {
+                "type": "Value",
+                "children": [
+                    {
+                        "type": "WhiteSpace",
+                        "value": " "
+                    }
+                ]
+            }
+        }
+    },
     "spaces and comments": {
         "source": "--var: /* 1 */ ",
         "ast": {
@@ -131,6 +201,118 @@
             }
         }
     },
+    "spaces and comments (parseCustomProperty:true)": {
+        "options": {
+            "parseCustomProperty": true
+        },
+        "source": "--var: /* 1 */ ",
+        "generate": "--var: ",
+        "ast": {
+            "type": "Declaration",
+            "important": false,
+            "property": "--var",
+            "value": {
+                "type": "Value",
+                "children": [
+                    {
+                        "type": "WhiteSpace",
+                        "value": " "
+                    }
+                ]
+            }
+        }
+    },
+    "spaces and comments #2 (parseCustomProperty:true)": {
+        "options": {
+            "parseCustomProperty": true
+        },
+        "source": "--var: /* 1 */",
+        "generate": "--var: ",
+        "ast": {
+            "type": "Declaration",
+            "important": false,
+            "property": "--var",
+            "value": {
+                "type": "Value",
+                "children": [
+                    {
+                        "type": "WhiteSpace",
+                        "value": " "
+                    }
+                ]
+            }
+        }
+    },
+    "spaces and comments #3 (parseCustomProperty:true)": {
+        "options": {
+            "parseCustomProperty": true
+        },
+        "source": "--var:/* 1 */ ",
+        "generate": "--var: ",
+        "ast": {
+            "type": "Declaration",
+            "important": false,
+            "property": "--var",
+            "value": {
+                "type": "Value",
+                "children": [
+                    {
+                        "type": "WhiteSpace",
+                        "value": " "
+                    }
+                ]
+            }
+        }
+    },
+    "only a comment": {
+        "source": "--var:/* 1 */",
+        "ast": {
+            "type": "Declaration",
+            "important": false,
+            "property": "--var",
+            "value": {
+                "type": "Raw",
+                "value": "/* 1 */"
+            }
+        }
+    },
+    "only a comment (parseCustomProperty:true)": {
+        "options": {
+            "parseCustomProperty": true
+        },
+        "source": "--var:/* 1 */",
+        "generate": "--var:",
+        "ast": {
+            "type": "Declaration",
+            "important": false,
+            "property": "--var",
+            "value": {
+                "type": "Value",
+                "children": []
+            }
+        }
+    },
+    "whitespace beetween comments (parseCustomProperty:true)": {
+        "options": {
+            "parseCustomProperty": true
+        },
+        "source": "--var:/* 1 */ /* 2 */",
+        "generate": "--var: ",
+        "ast": {
+            "type": "Declaration",
+            "important": false,
+            "property": "--var",
+            "value": {
+                "type": "Value",
+                "children": [
+                    {
+                        "type": "WhiteSpace",
+                        "value": " "
+                    }
+                ]
+            }
+        }
+    },
     "should parse a custom property value when parseCustomProperty is true": {
         "options": {
             "parseCustomProperty": true

diff --git a/test/fixture/parse/declaration/filter.json → test/fixture/ast/declaration/filter.json b/test/fixture/parse/declaration/filter.json → test/fixture/ast/declaration/filter.json
diff --git a/...arse/declarationList/DeclarationList.json → .../ast/declarationList/DeclarationList.json b/...arse/declarationList/DeclarationList.json → .../ast/declarationList/DeclarationList.json
diff --git a/...xture/parse/declarationList/tolerant.json → ...fixture/ast/declarationList/tolerant.json b/...xture/parse/declarationList/tolerant.json → ...fixture/ast/declarationList/tolerant.json
diff --git a/test/fixture/parse/index.js → test/fixture/ast/index.js b/test/fixture/parse/index.js → test/fixture/ast/index.js
diff --git a/.../fixture/parse/mediaQuery/MediaQuery.json → test/fixture/ast/mediaQuery/MediaQuery.json b/.../fixture/parse/mediaQuery/MediaQuery.json → test/fixture/ast/mediaQuery/MediaQuery.json
diff --git a/test/fixture/parse/mediaQuery/Ratio.json → test/fixture/ast/mediaQuery/Ratio.json b/test/fixture/parse/mediaQuery/Ratio.json → test/fixture/ast/mediaQuery/Ratio.json
diff --git a/test/fixture/parse/rule/Rule.json → test/fixture/ast/rule/Rule.json b/test/fixture/parse/rule/Rule.json → test/fixture/ast/rule/Rule.json
diff --git a/test/fixture/parse/rule/nested-atrule.json → test/fixture/ast/rule/nested-atrule.json b/test/fixture/parse/rule/nested-atrule.json → test/fixture/ast/rule/nested-atrule.json
diff --git a/test/fixture/parse/rule/tolerant.json → test/fixture/ast/rule/tolerant.json b/test/fixture/parse/rule/tolerant.json → test/fixture/ast/rule/tolerant.json
diff --git a/...ure/parse/selector/AttributeSelector.json → ...xture/ast/selector/AttributeSelector.json b/...ure/parse/selector/AttributeSelector.json → ...xture/ast/selector/AttributeSelector.json
diff --git a/...fixture/parse/selector/ClassSelector.json → test/fixture/ast/selector/ClassSelector.json b/...fixture/parse/selector/ClassSelector.json → test/fixture/ast/selector/ClassSelector.json
diff --git a/test/fixture/parse/selector/Combinator.json → test/fixture/ast/selector/Combinator.json b/test/fixture/parse/selector/Combinator.json → test/fixture/ast/selector/Combinator.json
diff --git a/test/fixture/parse/selector/IdSelector.json → test/fixture/ast/selector/IdSelector.json b/test/fixture/parse/selector/IdSelector.json → test/fixture/ast/selector/IdSelector.json
diff --git a/test/fixture/parse/selector/Nth.json → test/fixture/ast/selector/Nth.json b/test/fixture/parse/selector/Nth.json → test/fixture/ast/selector/Nth.json
diff --git a/...e/parse/selector/PseudoClassSelector.json → ...ure/ast/selector/PseudoClassSelector.json b/...e/parse/selector/PseudoClassSelector.json → ...ure/ast/selector/PseudoClassSelector.json
diff --git a/...parse/selector/PseudoElementSelector.json → ...e/ast/selector/PseudoElementSelector.json b/...parse/selector/PseudoElementSelector.json → ...e/ast/selector/PseudoElementSelector.json
diff --git a/test/fixture/parse/selector/Selector.json → test/fixture/ast/selector/Selector.json b/test/fixture/parse/selector/Selector.json → test/fixture/ast/selector/Selector.json
diff --git a/.../fixture/parse/selector/TypeSelector.json → test/fixture/ast/selector/TypeSelector.json b/.../fixture/parse/selector/TypeSelector.json → test/fixture/ast/selector/TypeSelector.json
diff --git a/...parse/selector/functional-pseudo/dir.json → ...e/ast/selector/functional-pseudo/dir.json b/...parse/selector/functional-pseudo/dir.json → ...e/ast/selector/functional-pseudo/dir.json
diff --git a/...parse/selector/functional-pseudo/has.json → ...e/ast/selector/functional-pseudo/has.json b/...parse/selector/functional-pseudo/has.json → ...e/ast/selector/functional-pseudo/has.json
diff --git a/...arse/selector/functional-pseudo/lang.json → .../ast/selector/functional-pseudo/lang.json b/...arse/selector/functional-pseudo/lang.json → .../ast/selector/functional-pseudo/lang.json
diff --git a/...e/selector/functional-pseudo/matches.json → ...t/selector/functional-pseudo/matches.json b/...e/selector/functional-pseudo/matches.json → ...t/selector/functional-pseudo/matches.json
diff --git a/...parse/selector/functional-pseudo/not.json → ...e/ast/selector/functional-pseudo/not.json b/...parse/selector/functional-pseudo/not.json → ...e/ast/selector/functional-pseudo/not.json
diff --git a/...e/selector/functional-pseudo/slotted.json → ...t/selector/functional-pseudo/slotted.json b/...e/selector/functional-pseudo/slotted.json → ...t/selector/functional-pseudo/slotted.json
diff --git a/.../fixture/parse/selectorList/Selector.json → test/fixture/ast/selectorList/Selector.json b/.../fixture/parse/selectorList/Selector.json → test/fixture/ast/selectorList/Selector.json
diff --git a/.../fixture/parse/stylesheet/StyleSheet.json → test/fixture/ast/stylesheet/StyleSheet.json b/.../fixture/parse/stylesheet/StyleSheet.json → test/fixture/ast/stylesheet/StyleSheet.json
diff --git a/test/fixture/parse/stylesheet/comment.json → test/fixture/ast/stylesheet/comment.json b/test/fixture/parse/stylesheet/comment.json → test/fixture/ast/stylesheet/comment.json
diff --git a/test/fixture/parse/stylesheet/errors.json → test/fixture/ast/stylesheet/errors.json b/test/fixture/parse/stylesheet/errors.json → test/fixture/ast/stylesheet/errors.json
diff --git a/test/fixture/parse/stylesheet/tolerant.json → test/fixture/ast/stylesheet/tolerant.json b/test/fixture/parse/stylesheet/tolerant.json → test/fixture/ast/stylesheet/tolerant.json
diff --git a/test/fixture/parse/value/Brackets.json → test/fixture/ast/value/Brackets.json b/test/fixture/parse/value/Brackets.json → test/fixture/ast/value/Brackets.json
diff --git a/test/fixture/parse/value/Dimension.json → test/fixture/ast/value/Dimension.json b/test/fixture/parse/value/Dimension.json → test/fixture/ast/value/Dimension.json
diff --git a/test/fixture/parse/value/Function.json → test/fixture/ast/value/Function.json b/test/fixture/parse/value/Function.json → test/fixture/ast/value/Function.json
diff --git a/test/fixture/parse/value/HexColor.json → test/fixture/ast/value/HexColor.json b/test/fixture/parse/value/HexColor.json → test/fixture/ast/value/HexColor.json
diff --git a/test/fixture/parse/value/Identifier.json → test/fixture/ast/value/Identifier.json b/test/fixture/parse/value/Identifier.json → test/fixture/ast/value/Identifier.json
diff --git a/test/fixture/parse/value/Number.json → test/fixture/ast/value/Number.json b/test/fixture/parse/value/Number.json → test/fixture/ast/value/Number.json
diff --git a/test/fixture/parse/value/Parentheses.json → test/fixture/ast/value/Parentheses.json b/test/fixture/parse/value/Parentheses.json → test/fixture/ast/value/Parentheses.json
diff --git a/test/fixture/parse/value/Percentage.json → test/fixture/ast/value/Percentage.json b/test/fixture/parse/value/Percentage.json → test/fixture/ast/value/Percentage.json
diff --git a/test/fixture/parse/value/String.json → test/fixture/ast/value/String.json b/test/fixture/parse/value/String.json → test/fixture/ast/value/String.json
diff --git a/test/fixture/parse/value/UnicodeRange.json → test/fixture/ast/value/UnicodeRange.json b/test/fixture/parse/value/UnicodeRange.json → test/fixture/ast/value/UnicodeRange.json
diff --git a/test/fixture/parse/value/Url.json → test/fixture/ast/value/Url.json b/test/fixture/parse/value/Url.json → test/fixture/ast/value/Url.json
diff --git a/test/fixture/parse/value/Value.json → test/fixture/ast/value/Value.json b/test/fixture/parse/value/Value.json → test/fixture/ast/value/Value.json
diff --git a/test/fixture/parse/value/function/calc.json → test/fixture/ast/value/function/calc.json b/test/fixture/parse/value/function/calc.json → test/fixture/ast/value/function/calc.json
diff --git a/...fixture/parse/value/function/element.json → test/fixture/ast/value/function/element.json b/...fixture/parse/value/function/element.json → test/fixture/ast/value/function/element.json
diff --git a/...ture/parse/value/function/expression.json → ...ixture/ast/value/function/expression.json b/...ture/parse/value/function/expression.json → ...ixture/ast/value/function/expression.json