Merge pull request #32 from GitScrum/milestone-0.0.18

Milestone 0.0.18

Author: Scrum

.gitignore

@@ -1,5 +1,6 @@
 node_modules/
 lib/
 coverage/
+.nyc_output/
 npm-debug.log
 *.sublime*

.travis.yml

@@ -1,10 +1,8 @@
 sudo: false
 language: node_js
 node_js:
-  - iojs
   - "5.1.0"
   - "4.2.2"
-  - "0.12"
-  - "0.10"
+
 after_script:
-  - npm run coveralls
+  - './node_modules/.bin/nyc report --reporter=text-lcov | ./node_modules/.bin/coveralls'

CHANGELOG.md

@@ -1,3 +1,25 @@
+## [0.0.17] - 18-03-2016
+### Added 
+- Added #1, ava
+- Added #19, coverage to travis config
+- Adeed test after transpiling
+
+### Change
+- Change #21, isparta to nyc
+- Rename index.es6 to index
+- Update #28, move updtr to prepublish
+- Change #1, test to ava
+- Update #31, matcher and core
+
+### Removed
+- Removed #30, ild node version in .travis config
+- Removed #1, mocha chai
+- Remove #19, coverage runs in package.json
+- Remove config for babel from cli
+
+### Fixed
+- Fixed report coverage
+
 ## [0.0.17] - 15-03-2016
 ### Added 
 - Added #18, babel config to package.json

package.json

@@ -1,17 +1,13 @@
 {
   "name": "postcss-at-rules-variables",
-  "version": "0.0.17",
+  "version": "0.0.18",
   "description": "PostCss plugin to use CSS Custom Properties in at-rule @each, @for, @if, @else ",
   "main": "./lib/index.js",
   "scripts": {
-    "test": "xo ./src/*.js ./test/*.js && mocha --compilers js:babel-register ./test/*.js",
+    "test": "xo ./src/*.js ./test/*.js && nyc ava",
     "clean": "rm -rf lib && mkdir lib",
-    "build": "npm run clean && babel --presets node5 src/index.es6.js --out-file lib/index.js",
-    "prepublish": "npm run build",
-    "coverage": "babel-node ./node_modules/isparta/bin/isparta cover _mocha --",
-    "coveralls": "coveralls < coverage/lcov.info",
-    "precoveralls": "npm run coverage",
-    "update": "updtr"
+    "build": "npm run clean && babel src/index.js --out-file lib/index.js && npm t",
+    "prepublish": "updtr && npm run build"
   },
   "keywords": [
     "postcss",
@@ -38,13 +34,12 @@
     "postcss": "^5.0.19"
   },
   "devDependencies": {
+    "ava": "^0.13.0",
     "babel-cli": "^6.6.5",
-    "babel-preset-node5": "^10.8.0",
+    "babel-preset-node5": "^11.0.0",
     "babel-register": "^6.7.2",
-    "chai": "^3.5.0",
     "coveralls": "^2.11.8",
-    "isparta": "^4.0.0",
-    "mocha": "^2.4.5",
+    "nyc": "^6.1.1",
     "updtr": "^0.1.7",
     "xo": "^0.13.0"
   },
@@ -53,6 +48,11 @@
       "node5"
     ]
   },
+  "ava": {
+    "require": [
+      "babel-register"
+    ]
+  },
   "bugs": {
     "url": "https://github.com/gitscrum/postcss-at-rules-variables/issues"
   },

src/index.es6.js

@@ -0,0 +1,46 @@
+import postcss from 'postcss';
+import {merge} from 'lodash';
+
+const VAR_FUNC_IDENTIFIER = 'var';
+const maps = {};
+
+function resolveValue(value) {
+	const hasVar = value.indexOf(`${VAR_FUNC_IDENTIFIER}(`);
+	if (hasVar === -1) {
+		return value;
+	}
+
+	return value.replace(/var\(--.*?\)/g, (match) => maps[match.slice(4, -1)] || match);
+}
+
+export default postcss.plugin('postcss-at-rules-variables', options => {
+	const DEFAULT = {
+		atRules: ['for', 'if', 'else', 'each']
+	};
+
+	const mergeOptions = merge(DEFAULT, options, (a, b) => {
+		if (Array.isArray(a)) {
+			return a.concat(b);
+		}
+	});
+
+	return nodes => {
+		const reg = new RegExp(mergeOptions.atRules.join('|'));
+
+		nodes.walkRules(rule => {
+			if (rule.selector !== ':root') {
+				return;
+			}
+
+			rule.each(decl => {
+				const prop = decl.prop;
+				const value = decl.value;
+				maps[prop] = value;
+			});
+		});
+
+		nodes.walkAtRules(reg, rules => {
+			rules.params = resolveValue(rules.params);
+		});
+	};
+});

src/index.js

@@ -1,68 +1,55 @@
-/* global describe it */
 import postcss from 'postcss';
-import {expect} from 'chai';
+import test from 'ava';
 import plugin from '../lib/index';
-const test = (input, output, opts) => {
-	expect(postcss([plugin(opts)]).process(input).css).to.eql(output);
+
+const processing = (input, opts) => {
+	return postcss([plugin(opts)]).process(input).css;
 };
 
-describe('postcss-at-rules-variables', () => {
-	it('it change first properties for @for', () => {
-		test(
-			':root{ --from: 1; } @for $i from var(--from) to 2',
-			':root{ --from: 1; } @for $i from 1 to 2'
-		);
-	});
+test('it change first properties for @for', t => {
+	const expected = ':root{ --from: 1; } @for $i from 1 to 2';
+	const value = ':root{ --from: 1; } @for $i from var(--from) to 2';
+	t.is(processing(value), expected);
+});
 
-	it('it change second properties for @for', () => {
-		test(
-			':root{ --to: 2; } @for $i from 1 to var(--to)',
-			':root{ --to: 2; } @for $i from 1 to 2'
-		);
-	});
+test('it change second properties for @for', t => {
+	const expected = ':root{ --to: 2; } @for $i from 1 to 2';
+	const value = ':root{ --to: 2; } @for $i from 1 to var(--to)';
+	t.is(processing(value), expected);
+});
 
-	it('it change two properties for @for', () => {
-		test(
-			':root{ --from: 1; --to: 2; } @for $i from var(--from) to var(--to)',
-			':root{ --from: 1; --to: 2; } @for $i from 1 to 2'
-		);
-	});
+test('it change two properties for @for', t => {
+	const expected = ':root{ --from: 1; --to: 2; } @for $i from 1 to 2';
+	const value = ':root{ --from: 1; --to: 2; } @for $i from var(--from) to var(--to)';
+	t.is(processing(value), expected);
+});
 
-	it('it change three properties for @for', () => {
-		test(
-			':root{ --from: 1; --to: 2; --step: 5 } @for $i from var(--from) to var(--to) by var(--step)',
-			':root{ --from: 1; --to: 2; --step: 5 } @for $i from 1 to 2 by 5'
-		);
-	});
+test('it change three properties for @for', t => {
+	const expected = ':root{ --from: 1; --to: 2; --step: 5 } @for $i from 1 to 2 by 5';
+	const value = ':root{ --from: 1; --to: 2; --step: 5 } @for $i from var(--from) to var(--to) by var(--step)';
+	t.is(processing(value), expected);
+});
 
-	it('it change two properties for @if', () => {
-		test(
-			':root{ --first: 1; --second: 2; } @if var(--first) < var(--second)',
-			':root{ --first: 1; --second: 2; } @if 1 < 2',
-			{atRules: ['if']}
-		);
-	});
+test('it change two properties for @if', t => {
+	const expected = ':root{ --first: 1; --second: 2; } @if 1 < 2';
+	const value = ':root{ --first: 1; --second: 2; } @if var(--first) < var(--second)';
+	t.is(processing(value, {atRules: ['if']}), expected);
+});
 
-	it('it change two properties for @if, @else if', () => {
-		test(
-			':root{ --first: 1; --second: 2; } @if var(--first) < var(--second) { color: olive; } @else if var(--first) > var(--second) { color: red; }',
-			':root{ --first: 1; --second: 2; } @if 1 < 2 { color: olive; } @else if 1 > 2 { color: red; }',
-			{atRules: ['if', 'else']}
-		);
-	});
+test('it change two properties for @if, @else if', t => {
+	const expected = ':root{ --first: 1; --second: 2; } @if 1 < 2 { color: olive; } @else if 1 > 2 { color: red; }';
+	const value = ':root{ --first: 1; --second: 2; } @if var(--first) < var(--second) { color: olive; } @else if var(--first) > var(--second) { color: red; }';
+	t.is(processing(value, {atRules: ['if', 'else']}), expected);
+});
 
-	it('it change multi properties for @each', () => {
-		test(
-			':root{ --array: foo, bar, baz; } @each $val in var(--array)',
-			':root{ --array: foo, bar, baz; } @each $val in foo, bar, baz',
-			{atRules: ['each']}
-		);
-	});
+test('it change multi properties for @each', t => {
+	const expected = ':root{ --array: foo, bar, baz; } @each $val in foo, bar, baz';
+	const value = ':root{ --array: foo, bar, baz; } @each $val in var(--array)';
+	t.is(processing(value, {atRules: ['each']}), expected);
+});
 
-	it('it without variables', () => {
-		test(
-			':root{ --red: red; } @if var(--green) { color: var(--green) }',
-			':root{ --red: red; } @if var(--green) { color: var(--green) }'
-		);
-	});
+test('it without variables', t => {
+	const expected = ':root{ --red: red; } @if var(--green) { color: var(--green) }';
+	const value = ':root{ --red: red; } @if var(--green) { color: var(--green) }';
+	t.is(processing(value), expected);
 });