merged master

Author: geelen

CHANGELOG.md

@@ -6,6 +6,13 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Changed
 - Nothing yet.
 
+## [0.0.8] - 2015-06-11
+### Added
+- Pure mode where only local scope is allowed.
+
+### Changed
+- Using global selectors outside of a global context now triggers warnings.
+
 ## [0.0.7] - 2015-05-30
 ### Changed
 - Migrated to `css-selector-tokenizer`.
@@ -38,10 +45,11 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Automatic local classes
 - Explicit global selectors with `:global`
 
-[unreleased]: https://github.com/postcss-modules-local-by-default/compare/v0.0.7...HEAD
+[unreleased]: https://github.com/postcss-modules-local-by-default/compare/v0.0.8...HEAD
 [0.0.2]:      https://github.com/postcss-modules-local-by-default/compare/v0.0.1...v0.0.2
 [0.0.3]:      https://github.com/postcss-modules-local-by-default/compare/v0.0.2...v0.0.3
 [0.0.4]:      https://github.com/postcss-modules-local-by-default/compare/v0.0.3...v0.0.4
 [0.0.5]:      https://github.com/postcss-modules-local-by-default/compare/v0.0.4...v0.0.5
 [0.0.6]:      https://github.com/postcss-modules-local-by-default/compare/v0.0.5...v0.0.6
 [0.0.7]:      https://github.com/postcss-modules-local-by-default/compare/v0.0.6...v0.0.7
+[0.0.8]:      https://github.com/postcss-modules-local-by-default/compare/v0.0.7...v0.0.8

index.js

@@ -153,10 +153,49 @@ function localizeNode(node, context) {
   return node;
 }
 
-function localizeDecl(decl) {
-  if(typeof decl.prop === "string" && /animation(-name)?/.test(decl.prop)) {
-    decl.value = decl.value.replace(/(^|,)(\s*)(\w+)/g, "$1$2:local($3)"); // TODO
+function localizeDeclNode(node, context) {
+  var newNode;
+  switch(node.type) {
+    case "item":
+      if(context.localizeNextItem) {
+        newNode = Object.create(node);
+        newNode.name = ":local(" + newNode.name + ")";
+        context.localizeNextItem = false;
+        return newNode;
+      }
+      break;
+    case "url":
+      if(context.options.rewriteUrl) {
+        newNode = Object.create(node);
+        newNode.url = context.options.rewriteUrl(context.global, node.url);
+        return newNode;
+      }
+      break;
   }
+  return node;
+}
+
+function localizeDeclValue(valueNode, context) {
+  var newValueNode = Object.create(valueNode);
+  newValueNode.nodes = valueNode.nodes.map(function(node) {
+    return localizeDeclNode(node, context);
+  });
+  return newValueNode;
+}
+
+function localizeDecl(decl, context) {
+  var valuesNode = Tokenizer.parseValues(decl.value);
+  var localizeName = /animation(-name)?/.test(decl.prop);
+  var newValuesNode = Object.create(valuesNode);
+  newValuesNode.nodes = valuesNode.nodes.map(function(valueNode) {
+    var subContext = {
+      options: context.options,
+      global: context.global,
+      localizeNextItem: localizeName && !context.global
+    };
+    return localizeDeclValue(valueNode, subContext);
+  });
+  decl.value = Tokenizer.stringifyValues(newValuesNode);
 }
 
 module.exports = postcss.plugin('postcss-modules-local-by-default', function (options) {
@@ -174,7 +213,7 @@ module.exports = postcss.plugin('postcss-modules-local-by-default', function (op
         var localMatch = /^\s*:local\s*\((.+)\)\s*$/.exec(atrule.params);
         if(globalMatch) {
           if(pureMode) {
-            throw new Error("@keyframes :global(...) is not allowed in pure mode");
+            throw atrule.error("@keyframes :global(...) is not allowed in pure mode");
           }
           atrule.params = globalMatch[1];
         } else if(localMatch) {
@@ -187,22 +226,28 @@ module.exports = postcss.plugin('postcss-modules-local-by-default', function (op
     css.eachRule(function(rule) {
       var selector = Tokenizer.parse(rule.selector);
       var context = {
+        options: options,
         global: globalMode,
         hasPureGlobals: false,
         hasPureImplicitGlobals: false
       };
-      var newSelector = localizeNode(selector, context);
+      var newSelector;
+      try {
+        newSelector = localizeNode(selector, context);
+      } catch(e) {
+        throw rule.error(e.message);
+      }
       if(pureMode && context.hasPureGlobals) {
-        throw new Error("Selector '" + Tokenizer.stringify(selector) + "' is not pure " +
+        throw rule.error("Selector '" + Tokenizer.stringify(selector) + "' is not pure " +
           "(pure selectors must contain at least one local class or id)");
       }
       if(!globalMode && context.hasPureImplicitGlobals) {
-        throw new Error("Selector '" + Tokenizer.stringify(selector) + "' must be explicit flagged :global " +
+        throw rule.error("Selector '" + Tokenizer.stringify(selector) + "' must be explicit flagged :global " +
           "(elsewise it would leak globally)");
       }
-      if(!context.global) {
-        rule.nodes.forEach(localizeDecl);
-      }
+      rule.nodes.forEach(function(decl) {
+        localizeDecl(decl, context);
+      });
       rule.selector = Tokenizer.stringify(newSelector);
     });
   };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "postcss-modules-local-by-default",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "description": "A CSS Modules transform to make local scope the default",
   "keywords": [
     "css-modules",
@@ -15,7 +15,7 @@
     "url": "https://github.com/css-modules/postcss-modules-local-by-default.git"
   },
   "dependencies": {
-    "css-selector-tokenizer": "^0.3.1",
+    "css-selector-tokenizer": "^0.4.0",
     "postcss": "^4.1.5"
   },
   "devDependencies": {

test.js

@@ -345,11 +345,30 @@ var tests = [
     expected: '[type="radio"] {}'
   },
   {
-    should: 'localise class and pass through attribute',
-    input: '.foo :not([type="radio"]) {}',
-    expected: ':local(.foo) :not([type="radio"]) {}'
+    should: 'not modify urls without option',
+    input: '.a { background: url(./image.png); }\n' +
+      ':global .b { background: url(image.png); }\n' +
+      '.c { background: url("./image.png"); }',
+    expected: ':local(.a) { background: url(./image.png); }\n' +
+      '.b { background: url(image.png); }\n' +
+      ':local(.c) { background: url("./image.png"); }'
+  },
+  {
+    should: 'rewrite url in local block',
+    input: '.a { background: url(./image.png); }\n' +
+      ':global .b { background: url(image.png); }\n' +
+      '.c { background: url("./image.png"); }',
+    options: {
+      rewriteUrl: function(global, url) {
+        var mode = global ? 'global' : 'local';
+        return '(' + mode + ')' + url + '"' + mode + '"';
+      }
+    },
+    expected: ':local(.a) { background: url((local\\)./image.png\\\"local\\\"); }\n' +
+      '.b { background: url((global\\)image.png\\\"global\\\"); }\n' +
+      ':local(.c) { background: url(\"(local)./image.png\\\"local\\\"\"); }'
   }
-  
+
 ];
 
 function process (css, options) {