helpers: now directly exported

Cakefile

@@ -1,5 +1,5 @@
 fs = require 'fs'
-{helpers} = require './lib/helpers'
+helpers  = require './lib/helpers'
 CoffeeScript = require './lib/coffee-script'
 {spawn, exec} = require 'child_process'
 path = require 'path'

bin/cake

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 
 var path = require('path');
-var fs = require('fs');
-var lib = path.join(path.dirname(fs.realpathSync(__filename)), '../lib');
+var fs  = require('fs');
+var lib  = path.join(path.dirname(fs.realpathSync(__filename)), '../lib');
 
-require(lib + '/helpers').helpers.extend(global, require('sys'));
+require(lib + '/helpers').extend(global, require('sys'));
 require(lib + '/cake').run();

bin/coffee

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 
 var path = require('path');
-var fs = require('fs');
-var lib = path.join(path.dirname(fs.realpathSync(__filename)), '../lib');
+var fs  = require('fs');
+var lib  = path.join(path.dirname(fs.realpathSync(__filename)), '../lib');
 
-require(lib + '/helpers').helpers.extend(global, require('sys'));
+require(lib + '/helpers').extend(global, require('sys'));
 require(lib + '/command').run();

lib/repl.js

@@ -1,7 +1,7 @@
 (function() {
  var CoffeeScript, helpers, readline, repl, run, stdio;
  CoffeeScript = require('./coffee-script');
- helpers = require('./helpers').helpers;
+ helpers = require('./helpers');
  readline = require('readline');
  stdio = process.openStdin();
  helpers.extend(global, {

src/cake.coffee

@@ -9,7 +9,7 @@
 # External dependencies.
 fs = require 'fs'
 path = require 'path'
-helpers = require('./helpers').helpers
+helpers = require './helpers'
 optparse = require './optparse'
 CoffeeScript = require './coffee-script'
 

src/command.coffee

@@ -9,7 +9,7 @@ fs = require 'fs'
 path = require 'path'
 optparse = require './optparse'
 CoffeeScript = require './coffee-script'
-{helpers} = require './helpers'
+helpers  = require './helpers'
 {spawn, exec} = require 'child_process'
 {EventEmitter} = require 'events'
 

src/helpers.coffee

@@ -2,10 +2,8 @@
 # the **Lexer**, **Rewriter**, and the **Nodes**. Merge objects, flatten
 # arrays, count characters, that sort of thing.
 
-helpers = exports.helpers = {}
-
 # Cross-engine indexOf, so that JScript can join the party.
-indexOf = helpers.indexOf = Array.indexOf or
+indexOf = exports.indexOf = Array.indexOf or
  if Array::indexOf
  (array, item, from) -> array.indexOf item, from
  else
@@ -16,45 +14,45 @@ indexOf = helpers.indexOf = Array.indexOf or
  -1
 
 # Does a list include a value?
-helpers.include = (list, value) -> 0 <= indexOf list, value
+exports.include = (list, value) -> 0 <= indexOf list, value
 
 # Peek at the beginning of a given string to see if it matches a sequence.
-helpers.starts = (string, literal, start) ->
+exports.starts = (string, literal, start) ->
  literal is string.substr start, literal.length
 
 # Peek at the end of a given string to see if it matches a sequence.
-helpers.ends = (string, literal, back) ->
+exports.ends = (string, literal, back) ->
  ll = literal.length
  literal is string.substr string.length - ll - (back or 0), ll
 
 # Trim out all falsy values from an array.
-helpers.compact = (array) -> item for item in array when item
+exports.compact = (array) -> item for item in array when item
 
 # Count the number of occurences of a character in a string.
-helpers.count = (string, letter) ->
+exports.count = (string, letter) ->
  num = pos = 0
  num++ while 0 < pos = 1 + string.indexOf letter, pos
  num
 
 # Merge objects, returning a fresh copy with attributes from both sides.
 # Used every time `BaseNode#compile` is called, to allow properties in the
 # options hash to propagate down the tree without polluting other branches.
-helpers.merge = (options, overrides) ->
+exports.merge = (options, overrides) ->
  extend (extend {}, options), overrides
 
 # Extend a source object with the properties of another object (shallow copy).
 # We use this to simulate Node's deprecated `process.mixin`
-extend = helpers.extend = (object, properties) ->
+extend = exports.extend = (object, properties) ->
  (object[key] = val) for all key, val of properties
  object
 
 # Return a flattened version of an array (nonrecursive).
 # Handy for getting a list of `children` from the nodes.
-helpers.flatten = (array) -> array.concat.apply [], array
+exports.flatten = (array) -> array.concat.apply [], array
 
 # Delete a key from an object, returning the value. Useful when a node is
 # looking for a particular method in an options hash.
-helpers.del = (obj, key) ->
+exports.del = (obj, key) ->
  val = obj[key]
  delete obj[key]
  val

src/lexer.coffee

@@ -10,7 +10,7 @@
 {Rewriter} = require './rewriter'
 
 # Import the helpers we need.
-{include, count, starts, compact} = require('./helpers').helpers
+{include, count, starts, compact} = require './helpers'
 
 # The Lexer Class
 # ---------------

src/nodes.coffee

@@ -6,7 +6,7 @@
 {Scope} = require './scope'
 
 # Import the helpers we plan to use.
-{compact, flatten, merge, del, include, indexOf, starts, ends} = require('./helpers').helpers
+{compact, flatten, merge, del, include, indexOf, starts, ends} = require './helpers'
 
 #### BaseNode
 

src/repl.coffee

@@ -6,7 +6,7 @@
 
 # Require the **coffee-script** module to get access to the compiler.
 CoffeeScript = require './coffee-script'
-helpers = require('./helpers').helpers
+helpers = require './helpers'
 readline = require 'readline'
 
 # Start by opening up **stdio**.

src/rewriter.coffee

@@ -6,7 +6,7 @@
 # parentheses, balance incorrect nestings, and generally clean things up.
 
 # Import the helpers we need.
-{include} = require('./helpers').helpers
+{include} = require './helpers'
 
 # The **Rewriter** class is used by the [Lexer](lexer.html), directly against
 # its internal array of tokens.

src/scope.coffee

@@ -6,7 +6,7 @@
 # with the outside.
 
 # Import the helpers we plan to use.
-{extend} = require('./helpers').helpers
+{extend} = require './helpers'
 
 exports.Scope = class Scope
 

test/test_helpers.coffee

@@ -1,5 +1,5 @@
 { indexOf, include, starts, ends, compact, count, merge, extend, flatten, del
-} = require('../lib/helpers').helpers
+} = require '../lib/helpers'
 
 array = [0..4]