Clean up Raw

vinniewrote · Dec 26, 2013 · 4bfffb8 · 4bfffb8
1 parent eedb06b
commit 4bfffb8
Show file tree

Hide file tree

Showing 24 changed files with 100 additions and 222 deletions.
diff --git a/lib/at-rule.coffee b/lib/at-rule.coffee
@@ -23,7 +23,7 @@ class AtRule extends Container
   # Stringify at-rule
   stringify: (builder, last) ->
     name   = '@' + @name + if @afterName? then @afterName else ' '
-    params = @_params.stringify()
+    params = if @_params then @_params.toString() else ''
 
     if @rules or @decls
       params +=  if @afterParams?

diff --git a/lib/declaration.coffee b/lib/declaration.coffee
@@ -24,7 +24,7 @@ class Declaration extends Node
   # Stringify declaration
   stringify: (builder, semicolon) ->
     builder(@before) if @before
-    string  = @prop + (@between || ': ') + @_value.stringify()
+    string  = @prop + (@between || ': ') + @_value.toString()
     string += @_important || ''
     string += ';' if semicolon
     builder(string, @)

diff --git a/lib/node.coffee b/lib/node.coffee
@@ -29,17 +29,20 @@ class Node
   @raw: (name) ->
     hidden = '_' + name
 
-    @prototype[hidden] = Raw.empty
-
     @prop name,
       get: ->
-        @[hidden]?.trimmed
+        prop = @[hidden]
+        if prop instanceof Raw
+          prop.value
+        else
+          prop
       set: (value) ->
         if value instanceof Raw
           @[hidden] = value
-        else
-          @[hidden] = new Raw() if @[hidden] == Raw.empty
+        else if @[hidden] instanceof Raw
           @[hidden].set(value)
+        else
+          @[hidden] = value
 
   # Remove this node from parent.
   #

diff --git a/lib/parse.coffee b/lib/parse.coffee
@@ -129,7 +129,7 @@ class Parser
         [raw, left]          = @startSpaces(@prevBuffer())
         [raw, right]         = @endSpaces(raw)
         @current.afterName   = left
-        @current.params      = new Raw(raw, @trim @trimmed)
+        @current.params      = Raw.load(@trimmed.trim(), raw)
         @current.afterParams = right
         @endAtruleParams()
 
@@ -141,7 +141,7 @@ class Parser
     if @inside('selector')
       if @letter == '{'
         [raw, spaces]     = @endSpaces(@prevBuffer())
-        @current.selector = new Raw(raw, @trim @trimmed)
+        @current.selector = Raw.load(@trimmed.trim(), raw)
         @current.between  = spaces
         @semicolon = false
         @buffer    = ''
@@ -155,7 +155,7 @@ class Parser
       @init new Rule()
       if @letter == '{'
         @addType('decls')
-        @current.selector = new Raw('', '')
+        @current.selector = ''
         @current.between  = ''
         @semicolon = false
         @buffer    = ''
@@ -186,7 +186,7 @@ class Parser
           @trimmed = @trimmed[1..-1]
           @buffer  = @buffer[1..-1]
 
-        @current.prop    = @trim @trimmed
+        @current.prop    = @trimmed.trim()
         @current.between = @prevBuffer()[@current.prop.length..-1]
         @buffer = ''
 
@@ -217,15 +217,15 @@ class Parser
       if (@letter == ';' and not @inBrackets) or close
         @semicolon = true if @letter == ';'
         [raw, spaces] = @startSpaces(@prevBuffer())
-        trim          = @trim(@trimmed)
+        trim          = @trimmed.trim()
 
         if match = raw.match(/\s+!important\s*$/)
           @current._important = match[0]
           end  = -match[0].length - 1
           raw  = raw[0..end]
           trim = trim.replace(/\s+!important\s*$/, '')
 
-        @current.value    = new Raw(raw, trim)
+        @current.value    = Raw.load(trim, raw)
         @current.between += ':' + spaces
         @pop()
       else
@@ -376,9 +376,6 @@ class Parser
     else
       [string, '']
 
-  trim: (string) ->
-    string.replace(/^\s*/, '').replace(/\s*$/, '')
-
 module.exports = (source, opts = { }) ->
   parser = new Parser(source, opts)
   parser.loop()

diff --git a/lib/raw.coffee b/lib/raw.coffee
@@ -1,24 +1,26 @@
 # Property with trimmed and raw value (with comments and spaces)
 class Raw
-  constructor: (@raw, @trimmed) ->
+  # Return Raw only if it necessary
+  @load: (value, raw) ->
+    if raw? and value != raw
+      new Raw(value, raw)
+    else
+      value
+
+  constructor: (@value, @raw) ->
 
   # Set new trimmed value and mark property as changed
   set: (value) ->
-    if @trimmed != value
+    if @value != value
+      @raw     = @value
       @changed = true
-      @trimmed = value
+      @value   = value
 
   # Stringify to CSS raw value if trimmed wasn’t changed
-  stringify: (opts = { }) ->
-    if not @changed
-      @raw || ''
-    else if not @raw
-      (opts.before || '') + @trimmed + (opts.after || '')
+  toString: ->
+    if @changed
+      @value || ''
     else
-      (if @raw[0] == ' ' then ' ' else '') +
-      @trimmed +
-      (if @raw[-1..-1] == ' ' then ' ' else '')
-
-Raw.empty = new Raw()
+      @raw || @value || ''
 
 module.exports = Raw
diff --git a/lib/rule.coffee b/lib/rule.coffee
@@ -11,8 +11,7 @@ class Rule extends Container.WithDecls
 
   # Stringify rule
   stringify: (builder) ->
-    selector = @_selector.stringify()
     between  = if @between? then @between else ' '
-    @stringifyBlock(builder, selector + between + '{')
+    @stringifyBlock(builder, "#{ @_selector + between }{")
 
 module.exports = Rule
diff --git a/test/cases/parse/atrule-decls.json b/test/cases/parse/atrule-decls.json
@@ -16,10 +16,7 @@
             "before": "",
             "name": "page",
             "afterName": " ",
-            "_params": {
-                "raw": ":left",
-                "trimmed": ":left"
-            },
+            "_params": ":left",
             "afterParams": " ",
             "decls": [
                 {
@@ -37,10 +34,7 @@
                     "before": "\n    ",
                     "prop": "background",
                     "between": ": ",
-                    "_value": {
-                        "raw": "black",
-                        "trimmed": "black"
-                    }
+                    "_value": "black"
                 }
             ],
             "after": "\n"
@@ -60,10 +54,7 @@
             "before": "\n\n",
             "name": "font-face",
             "afterName": " ",
-            "_params": {
-                "raw": "",
-                "trimmed": ""
-            },
+            "_params": "",
             "afterParams": "",
             "decls": [
                 {
@@ -81,10 +72,7 @@
                     "before": "\n    ",
                     "prop": "family-name",
                     "between": ": ",
-                    "_value": {
-                        "raw": "\"A;' /**/\"",
-                        "trimmed": "\"A;' /**/\""
-                    }
+                    "_value": "\"A;' /**/\""
                 }
             ],
             "semicolon": true,
@@ -105,10 +93,7 @@
             "before": "\n\n",
             "name": "viewport",
             "afterName": " ",
-            "_params": {
-                "raw": "",
-                "trimmed": ""
-            },
+            "_params": "",
             "afterParams": "",
             "decls": [
                 {
@@ -126,10 +111,7 @@
                     "before": "\n    ",
                     "prop": "width",
                     "between": ": ",
-                    "_value": {
-                        "raw": "110px",
-                        "trimmed": "110px"
-                    }
+                    "_value": "110px"
                 }
             ],
             "semicolon": true,
@@ -150,10 +132,7 @@
             "before": "\n\n",
             "name": "-ms-viewport",
             "afterName": " ",
-            "_params": {
-                "raw": "",
-                "trimmed": ""
-            },
+            "_params": "",
             "afterParams": "",
             "decls": [
                 {
@@ -171,10 +150,7 @@
                     "before": "\n    ",
                     "prop": "width",
                     "between": ": ",
-                    "_value": {
-                        "raw": "100px",
-                        "trimmed": "100px"
-                    }
+                    "_value": "100px"
                 }
             ],
             "semicolon": true,

diff --git a/test/cases/parse/atrule-empty.json b/test/cases/parse/atrule-empty.json
@@ -16,10 +16,7 @@
             "before": "",
             "name": "charset",
             "afterName": " ",
-            "_params": {
-                "raw": "\"UTF-8\"",
-                "trimmed": "\"UTF-8\""
-            },
+            "_params": "\"UTF-8\"",
             "afterParams": "",
             "semicolon": true
         }

diff --git a/test/cases/parse/atrule-no-semicolon.json b/test/cases/parse/atrule-no-semicolon.json
@@ -16,10 +16,7 @@
             "before": "\n",
             "name": "charset",
             "afterName": " ",
-            "_params": {
-                "raw": "\"UTF-8\"",
-                "trimmed": "\"UTF-8\""
-            },
+            "_params": "\"UTF-8\"",
             "afterParams": ""
         }
     ],

diff --git a/test/cases/parse/atrule-params.json b/test/cases/parse/atrule-params.json
@@ -17,8 +17,8 @@
             "name": "-moz-document",
             "afterName": "",
             "_params": {
-                "raw": "/* near */ /* filter */ url(\"example.com/{\") /* a */",
-                "trimmed": "url(\"example.com/{\")"
+                "value": "url(\"example.com/{\")",
+                "raw": "/* near */ /* filter */ url(\"example.com/{\") /* a */"
             },
             "afterParams": " ",
             "rules": [],

diff --git a/test/cases/parse/atrule-rules.json b/test/cases/parse/atrule-rules.json
@@ -16,10 +16,7 @@
             "before": "",
             "name": "supports",
             "afterName": " ",
-            "_params": {
-                "raw": "(animation-name: test)",
-                "trimmed": "(animation-name: test)"
-            },
+            "_params": "(animation-name: test)",
             "afterParams": " ",
             "rules": [
                 {
@@ -37,10 +34,7 @@
                     "before": "\n    ",
                     "name": "-custom-keyframe",
                     "afterName": " ",
-                    "_params": {
-                        "raw": "anim",
-                        "trimmed": "anim"
-                    },
+                    "_params": "anim",
                     "afterParams": " ",
                     "rules": [
                         {
@@ -61,10 +55,7 @@
                                     "before": "\n            ",
                                     "prop": "color",
                                     "between": ": ",
-                                    "_value": {
-                                        "raw": "black",
-                                        "trimmed": "black"
-                                    }
+                                    "_value": "black"
                                 }
                             ],
                             "source": {
@@ -78,10 +69,7 @@
                                 }
                             },
                             "before": "\n        ",
-                            "_selector": {
-                                "raw": "from",
-                                "trimmed": "from"
-                            },
+                            "_selector": "from",
                             "between": " ",
                             "semicolon": true,
                             "after": "\n        "
@@ -104,10 +92,7 @@
                                     "before": "\n            ",
                                     "prop": "color",
                                     "between": ": ",
-                                    "_value": {
-                                        "raw": "white",
-                                        "trimmed": "white"
-                                    }
+                                    "_value": "white"
                                 }
                             ],
                             "source": {
@@ -121,10 +106,7 @@
                                 }
                             },
                             "before": "\n        ",
-                            "_selector": {
-                                "raw": "to",
-                                "trimmed": "to"
-                            },
+                            "_selector": "to",
                             "between": " ",
                             "after": "\n        "
                         }

diff --git a/test/cases/parse/comments.json b/test/cases/parse/comments.json
@@ -53,10 +53,7 @@
                     "before": "\n    ",
                     "prop": "color",
                     "between": ": ",
-                    "_value": {
-                        "raw": "black",
-                        "trimmed": "black"
-                    }
+                    "_value": "black"
                 },
                 {
                     "type": "comment",
@@ -91,8 +88,8 @@
                     "prop": "background",
                     "between": ": ",
                     "_value": {
-                        "raw": "white\n    /* end */",
-                        "trimmed": "white"
+                        "value": "white",
+                        "raw": "white\n    /* end */"
                     }
                 }
             ],
@@ -107,10 +104,7 @@
                 }
             },
             "before": "\n",
-            "_selector": {
-                "raw": "div",
-                "trimmed": "div"
-            },
+            "_selector": "div",
             "between": " ",
             "after": "\n"
         },