Merge pull request #7 from css-modules/jest

Jest

Author: TrySound

.babelrc

@@ -1,29 +1,3 @@
-lib/
-
-# Logs
-logs
-*.log
-
-# Runtime data
-pids
-*.pid
-*.seed
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-
-# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (http://nodejs.org/api/addons.html)
-build/Release
-
-# Dependency directory
-# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
 node_modules
+coverage
+lib

.gitignore

@@ -0,0 +1,5 @@
+language: node_js
+node_js:
+  - "4"
+  - "6"
+  - "node"

.npmignore

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Alexey Litvinov
+Copyright (c) 2015 Alexey Litvinov and Bogdan Chadkin
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

.travis.yml

@@ -1,42 +1,69 @@
 {
-  "name": "postcss-modules-parser",
+  "name": "postcss-icss",
   "version": "1.1.0",
-  "description": "A CSS Modules parser to extract tokens from the css file",
-  "main": "index.js",
+  "description": "Postcss plugin to process css modules and extract tokens",
+  "main": "lib/index.js",
+  "files": [
+    "lib"
+  ],
   "scripts": {
-    "compile": "babel src --out-dir lib",
-    "prepublish": "in-publish && npm run -s compile || in-install",
-    "test": "mocha --compilers js:babel-core/register"
+    "build": "babel --out-dir lib src",
+    "test": "jest --coverage",
+    "precommit": "lint-staged",
+    "prepublish": "yarn test && yarn run build"
+  },
+  "lint-staged": {
+    "*.js": [
+      "eslint",
+      "prettier --write",
+      "git add"
+    ]
   },
-  "engines": {
-    "node": ">=0.12"
+  "eslintConfig": {
+    "parserOptions": {
+      "ecmaVersion": 6,
+      "sourceType": "module"
+    },
+    "env": {
+      "es6": true
+    },
+    "extends": "eslint:recommended"
   },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/css-modules/postcss-modules-parser.git"
+  "babel": {
+    "presets": [
+      [
+        "env",
+        {
+          "targets": {
+            "node": 4
+          }
+        }
+      ]
+    ]
   },
+  "repository": "css-modules/postcss-icss",
   "keywords": [
     "css-modules",
     "postcss",
     "css",
+    "icss",
     "postcss-plugin"
   ],
   "author": "Alexey Litvinov",
   "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/css-modules/postcss-modules-parser/issues"
-  },
-  "homepage": "https://github.com/css-modules/postcss-modules-parser#readme",
   "dependencies": {
     "icss-replace-symbols": "^1.0.2",
     "lodash.foreach": "^3.0.3",
     "postcss": "^5.0.10"
   },
   "devDependencies": {
-    "babel-cli": "^6.0.15",
-    "babel-core": "^6.0.17",
-    "babel-preset-es2015": "^6.0.15",
-    "in-publish": "^2.0.0",
-    "mocha": "^2.3.3"
+    "babel-cli": "^6.24.1",
+    "babel-jest": "^20.0.3",
+    "babel-preset-env": "^1.5.1",
+    "eslint": "^3.19.0",
+    "husky": "^0.13.3",
+    "jest": "^20.0.4",
+    "lint-staged": "^3.5.0",
+    "prettier": "^1.3.1"
   }
 }

LICENSE

@@ -1,6 +1,7 @@
-import { plugin } from 'postcss';
-import forEach from 'lodash.foreach';
-import replaceSymbols from 'icss-replace-symbols';
+/* eslint-env node */
+import postcss from "postcss";
+import forEach from "lodash.foreach";
+import replaceSymbols from "icss-replace-symbols";
 const importRegexp = /^:import\((.+)\)$/;
 const exportRegexp = /^:export$/;
 
@@ -9,7 +10,7 @@ const exportRegexp = /^:export$/;
  * @return {boolean}
  */
 function isPromise(promise) {
-  return typeof promise === 'object' && typeof promise.then === 'function';
+  return typeof promise === "object" && typeof promise.then === "function";
 }
 
 /**
@@ -23,7 +24,10 @@ function proceed(css, translations) {
 
   css.walkRules(exportRegexp, rule => {
     rule.walkDecls(decl => {
-      forEach(translations, (value, key) => decl.value = decl.value.replace(key, value));
+      forEach(
+        translations,
+        (value, key) => (decl.value = decl.value.replace(key, value))
+      );
       exportTokens[decl.prop] = decl.value;
     });
 
@@ -37,38 +41,35 @@ function proceed(css, translations) {
  * @param  {function} options.fetch
  * @return {function}
  */
-export default plugin('parser', function parser({ fetch } = {}) {
-  return css => {
-    // https://github.com/postcss/postcss/blob/master/docs/api.md#inputfile
-    const file = css.source.input.file;
+module.exports = postcss.plugin("postcss-icss", ({ fetch } = {}) => css => {
+  // https://github.com/postcss/postcss/blob/master/docs/api.md#inputfile
+  const file = css.source.input.file;
 
-    const translations = {};
-    const promises = [];
+  const translations = {};
+  const promises = [];
 
-    let iteration = 0;
+  let iteration = 0;
 
-    css.walkRules(importRegexp, rule => {
-      const dependency = RegExp.$1.replace(/^["']|["']$/g, '');
-      const result = fetch(dependency, file, iteration++);
+  css.walkRules(importRegexp, rule => {
+    const dependency = RegExp.$1.replace(/^["']|["']$/g, "");
+    const result = fetch(dependency, file, iteration++);
 
-      if (isPromise(result)) {
-        result.then(exports => {
-          rule.walkDecls(decl => translations[decl.prop] = exports[decl.value]);
-          rule.remove();
-        });
-
-        promises.push(result);
-      } else {
-        rule.walkDecls(decl => translations[decl.prop] = result[decl.value]);
+    if (isPromise(result)) {
+      result.then(exports => {
+        rule.walkDecls(decl => (translations[decl.prop] = exports[decl.value]));
         rule.remove();
-      }
-    });
+      });
 
-    if (promises.length === 0) {
-      return void proceed(css, translations);
+      promises.push(result);
+    } else {
+      rule.walkDecls(decl => (translations[decl.prop] = result[decl.value]));
+      rule.remove();
     }
+  });
+
+  if (promises.length === 0) {
+    return void proceed(css, translations);
+  }
 
-    return Promise.all(promises)
-      .then(() => proceed(css, translations));
-  };
+  return Promise.all(promises).then(() => proceed(css, translations));
 });

index.js

@@ -0,0 +1,51 @@
+/* eslint-env jest */
+import { readFileSync } from "fs";
+import { resolve } from "path";
+import asyncLoader from "./helper/async-loader";
+import syncLoader from "./helper/sync-loader";
+
+let fixture;
+let expected;
+let filename;
+
+describe("single", () => {
+  beforeEach(() => {
+    fixture = "test/fixture/single";
+    filename = resolve(fixture, "source.css");
+    expected = JSON.parse(
+      readFileSync(resolve(fixture, "expected.json"), "utf8")
+    );
+  });
+
+  it("asynchronous", () => {
+    return asyncLoader(filename, filename).then(result => {
+      expect(JSON.stringify(result)).toEqual(JSON.stringify(expected));
+    });
+  });
+
+  it("synchronous", () => {
+    const result = syncLoader(filename, filename);
+    expect(JSON.stringify(result)).toEqual(JSON.stringify(expected));
+  });
+});
+
+describe("multiple", () => {
+  beforeEach(() => {
+    fixture = "test/fixture/multiple";
+    filename = resolve(fixture, "source.css");
+    expected = JSON.parse(
+      readFileSync(resolve(fixture, "expected.json"), "utf8")
+    );
+  });
+
+  it("asynchronous", () => {
+    return asyncLoader(filename, filename).then(result => {
+      expect(JSON.stringify(result)).toEqual(JSON.stringify(expected));
+    });
+  });
+
+  it("synchronous", () => {
+    const result = syncLoader(filename, filename);
+    expect(JSON.stringify(result)).toEqual(JSON.stringify(expected));
+  });
+});