feat(struct): add separator info to list

jgranstrom · Nov 4, 2017 · 2e44151 · 2e44151
1 parent 1eb9af1
commit 2e44151
Show file tree

Hide file tree

Showing 7 changed files with 54 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -357,6 +357,7 @@ $variable: 1px solid black;
 ```js
 {
   type: 'SassList',
+  commaSeparator: false,
   value: [
     {
       type: 'SassNumber',
@@ -381,6 +382,28 @@ $variable: 1px solid black;
 }
 ```
 
+*Or when it's comma separated*
+
+```scss
+$variable: tahoma, arial;
+```
+```js
+{
+  type: 'SassList',
+  commaSeparator: true,
+  value: [
+    {
+      type: 'SassString',
+      value: 'tahoma'
+    },
+    {
+      type: 'SassString',
+      value: 'arial'
+    }
+  ]
+}
+```
+
 ##### SassMap
 *SassMaps contains recursive types as an object with matching field names*
 
@@ -471,4 +494,4 @@ Generate changelog using `npm install -g conventional-changelog` and `npm run ch
 5. `npm run changelog`
 6. Commit package.json and CHANGELOG.md files
 7. Tag
-8. Push
+8. Push
diff --git a/src/struct.js b/src/struct.js
@@ -27,7 +27,7 @@ function makeValue(sassValue) {
         },
       };
 
-    case sass.types.Null: 
+    case sass.types.Null:
       return { value: null };
 
     case sass.types.List:
@@ -36,7 +36,7 @@ function makeValue(sassValue) {
       for(let i = 0; i < listLength; i++) {
         listValue.push(createStructuredValue(sassValue.getValue(i)));
       }
-      return { value: listValue };
+      return { value: listValue, commaSeparator: sassValue.getSeparator() };
 
     case sass.types.Map:
       const mapLength = sassValue.getLength();
@@ -57,7 +57,7 @@ function makeValue(sassValue) {
  * Create a structured value definition from a sassValue object
  */
 export function createStructuredValue(sassValue) {
-  const value = Object.assign({ 
+  const value = Object.assign({
     type: sassValue.constructor.name,
   }, makeValue(sassValue));
 

diff --git a/test/basic.js b/test/basic.js
@@ -15,6 +15,7 @@ function verifyBasic(rendered, sourceFile, explicit, mixed) {
   expect(rendered.vars.global).to.have.property('$number2');
   expect(rendered.vars.global).to.have.property('$color');
   expect(rendered.vars.global).to.have.property('$list');
+  expect(rendered.vars.global).to.have.property('$listComma');
   expect(rendered.vars.global).to.have.property('$string');
   expect(rendered.vars.global).to.have.property('$boolean');
   expect(rendered.vars.global).to.have.property('$null');
@@ -72,11 +73,27 @@ function verifyBasic(rendered, sourceFile, explicit, mixed) {
   expect(rendered.vars.global.$list.value[2].value.b).to.equal(0);
   expect(rendered.vars.global.$list.value[2].value.a).to.equal(1);
   expect(rendered.vars.global.$list.value[2].value.hex).to.equal('#000000');
-  expect(rendered.vars.global.$list.value[2].type).to.equal('SassColor'); 
+  expect(rendered.vars.global.$list.value[2].type).to.equal('SassColor');
+  expect(rendered.vars.global.$list.commaSeparator).to.equal(false);
   if(explicit) {
     expect(rendered.vars.global.$list.declarations[0].flags.global).to.equal(true);
   }
 
+  expect(rendered.vars.global.$listComma.value).to.have.length(2);
+  expect(rendered.vars.global.$listComma.type).to.equal('SassList');
+  expect(rendered.vars.global.$listComma.sources).to.have.length(1);
+  expect(rendered.vars.global.$listComma.sources[0]).to.equal(normalizePath(sourceFile));
+  expect(rendered.vars.global.$listComma.declarations).to.have.length(1);
+  expect(rendered.vars.global.$listComma.declarations[0].expression).to.equal(`tahoma, arial${ explicit ? ' !global' : ''}`);
+  expect(rendered.vars.global.$listComma.value[0].value).to.equal('tahoma');
+  expect(rendered.vars.global.$listComma.value[0].type).to.equal('SassString');
+  expect(rendered.vars.global.$listComma.value[1].value).to.equal('arial');
+  expect(rendered.vars.global.$listComma.value[1].type).to.equal('SassString');
+  expect(rendered.vars.global.$listComma.commaSeparator).to.equal(true);
+  if(explicit) {
+    expect(rendered.vars.global.$listComma.declarations[0].flags.global).to.equal(true);
+  }
+
   expect(rendered.vars.global.$string.value).to.equal('string');
   expect(rendered.vars.global.$string.type).to.equal('SassString');
   expect(rendered.vars.global.$string.sources).to.have.length(1);
@@ -177,4 +194,4 @@ describe('basic-mixed', () => {
       });
     });
   });
-});
+});
diff --git a/test/sass/basic-explicit.scss b/test/sass/basic-explicit.scss
@@ -7,11 +7,12 @@ div {
   $number2: $number1 * 2 !global;
   $color: get-color() !global;
   $list: 1px solid black !global;
+  $listComma: tahoma, arial !global;
   $string: 'string' !global;
   $boolean: true !global;
   $null: null !global;
 $map: (
   number: 2em,
   string: 'mapstring'
 ) !global;
-}
+}
diff --git a/test/sass/basic-implicit.scss b/test/sass/basic-implicit.scss
@@ -6,10 +6,11 @@ $number1: 100px;
 $number2: $number1 * 2;
 $color: get-color();
 $list: 1px solid black;
+$listComma: tahoma, arial;
 $string: 'string';
 $boolean: true;
 $null: null;
 $map: (
   number: 2em,
   string: 'mapstring'
-);
+);
diff --git a/test/sass/basic-mixed.scss b/test/sass/basic-mixed.scss
@@ -11,6 +11,7 @@
 
 
 $list: 1px solid black;
+$listComma: tahoma, arial;
 $string: 'string';
 $map: (
   number: 2em,
@@ -24,4 +25,4 @@ div {
 }
 
 $boolean: true;
-$null: null;
+$null: null;
diff --git a/test/sass/comments.scss b/test/sass/comments.scss
@@ -3,11 +3,12 @@ $number1: 100px;
 $number2: $number1 * 2; // Comment
 $color: red;
 /* $list: 1px solid black;
+$listComma: tahoma, arial;
 $string: 'string';
 $map: (
   number: 2em,
   // blah
   string: 'mapstring'
 ); */
 
-// $test: 250px;
+// $test: 250px;