Merge pull request #236 from Marak/solve-circular-refs

Solve circular refs

examples/safe-string.js

@@ -37,7 +37,7 @@ console.log('Setting themes is useful');
 // Load theme with JSON literal
 colors.setTheme({
   silly: 'rainbow',
-  input: 'grey',
+  input: 'blue',
   verbose: 'cyan',
   prompt: 'grey',
   info: 'green',
@@ -54,14 +54,14 @@ console.log(colors.error('this is an error'));
 // outputs yellow text
 console.log(colors.warn('this is a warning'));
 
-// outputs grey text
+// outputs blue text
 console.log(colors.input('this is an input'));
 
 
 // console.log('Generic logging theme as file'.green.bold.underline);
 
 // Load a theme from file
-colors.setTheme(__dirname + '/../themes/generic-logging.js');
+colors.setTheme(require(__dirname + '/../themes/generic-logging.js'));
 
 // outputs red text
 console.log(colors.error('this is an error'));

lib/colors.js

@@ -185,10 +185,10 @@ colors.zalgo = require('./custom/zalgo');
 
 // maps
 colors.maps = {};
-colors.maps.america = require('./maps/america');
-colors.maps.zebra = require('./maps/zebra');
-colors.maps.rainbow = require('./maps/rainbow');
-colors.maps.random = require('./maps/random');
+colors.maps.america = require('./maps/america')(colors);
+colors.maps.zebra = require('./maps/zebra')(colors);
+colors.maps.rainbow = require('./maps/rainbow')(colors);
+colors.maps.random = require('./maps/random')(colors);
 
 for (var map in colors.maps) {
   (function(map) {

lib/maps/america.js

@@ -1,6 +1,4 @@
-var colors = require('../colors');
-
-module['exports'] = (function() {
+module['exports'] = function(colors) {
   return function(letter, i, exploded) {
     if (letter === ' ') return letter;
     switch (i%3) {
@@ -9,4 +7,4 @@ module['exports'] = (function() {
       case 2: return colors.blue(letter);
     }
   };
-})();
+};

lib/maps/rainbow.js

@@ -1,6 +1,4 @@
-var colors = require('../colors');
-
-module['exports'] = (function() {
+module['exports'] = function(colors) {
   // RoY G BiV
   var rainbowColors = ['red', 'yellow', 'green', 'blue', 'magenta'];
   return function(letter, i, exploded) {
@@ -10,5 +8,5 @@ module['exports'] = (function() {
       return colors[rainbowColors[i++ % rainbowColors.length]](letter);
     }
   };
-})();
+};
 

lib/maps/random.js

@@ -1,6 +1,4 @@
-var colors = require('../colors');
-
-module['exports'] = (function() {
+module['exports'] = function(colors) {
   var available = ['underline', 'inverse', 'grey', 'yellow', 'red', 'green',
     'blue', 'white', 'cyan', 'magenta'];
   return function(letter, i, exploded) {
@@ -9,4 +7,4 @@ module['exports'] = (function() {
         available[Math.round(Math.random() * (available.length - 2))]
       ](letter);
   };
-})();
+};

lib/maps/zebra.js

@@ -1,5 +1,5 @@
-var colors = require('../colors');
-
-module['exports'] = function(letter, i, exploded) {
+module['exports'] = function(colors) {
+  return function(letter, i, exploded) {
     return i % 2 === 0 ? letter : colors.inverse(letter);
   };
+};