Merge pull request #1793 from TrevorBurnham/header

Adding header to generated JS (#1778)
jashkenas · Jan 10, 2012 · 447ce82 · 447ce82
2 parents 806df9b + 86e4d79
commit 447ce82
Show file tree

Hide file tree

Showing 16 changed files with 33 additions and 7 deletions.
diff --git a/lib/coffee-script/browser.js b/lib/coffee-script/browser.js
diff --git a/lib/coffee-script/cake.js b/lib/coffee-script/cake.js
diff --git a/lib/coffee-script/coffee-script.js b/lib/coffee-script/coffee-script.js
diff --git a/lib/coffee-script/command.js b/lib/coffee-script/command.js
diff --git a/lib/coffee-script/grammar.js b/lib/coffee-script/grammar.js
diff --git a/lib/coffee-script/helpers.js b/lib/coffee-script/helpers.js
diff --git a/lib/coffee-script/index.js b/lib/coffee-script/index.js
diff --git a/lib/coffee-script/lexer.js b/lib/coffee-script/lexer.js
diff --git a/lib/coffee-script/nodes.js b/lib/coffee-script/nodes.js
diff --git a/lib/coffee-script/optparse.js b/lib/coffee-script/optparse.js
diff --git a/lib/coffee-script/repl.js b/lib/coffee-script/repl.js
diff --git a/lib/coffee-script/rewriter.js b/lib/coffee-script/rewriter.js
diff --git a/lib/coffee-script/scope.js b/lib/coffee-script/scope.js
diff --git a/src/coffee-script.coffee b/src/coffee-script.coffee
@@ -34,10 +34,13 @@ exports.helpers = require './helpers'
 exports.compile = compile = (code, options = {}) ->
   {merge} = exports.helpers
   try
-    (parser.parse lexer.tokenize code).compile merge {}, options
+    js = (parser.parse lexer.tokenize code).compile options
+    return js unless options.header
   catch err
     err.message = "In #{options.filename}, #{err.message}" if options.filename
     throw err
+  header = "Generated by CoffeeScript #{@VERSION}"
+  "// #{header}\n#{js}"
 
 # Tokenize a string of CoffeeScript code, and return the array of tokens.
 exports.tokens = (code, options) ->

diff --git a/src/command.coffee b/src/command.coffee
@@ -313,7 +313,8 @@ parseOptions = ->
   return
 
 # The compile-time options to pass to the CoffeeScript compiler.
-compileOptions = (filename) -> {filename, bare: opts.bare}
+compileOptions = (filename) ->
+  {filename, bare: opts.bare, header: opts.compile}
 
 # Start up a new Node.js instance with the arguments in `--nodejs` passed to
 # the `node` binary, preserving the other options.

diff --git a/test/compilation.coffee b/test/compilation.coffee
@@ -13,6 +13,10 @@ test "--bare", ->
   eq -1, CoffeeScript.compile('x = y', bare: on).indexOf 'function'
   ok 'passed' is CoffeeScript.eval '"passed"', bare: on, filename: 'test'
 
+test "header (#1778)", ->
+  header = "// Generated by CoffeeScript #{CoffeeScript.VERSION}\n"
+  eq 0, CoffeeScript.compile('x = y', header: on).indexOf header
+
 test "multiple generated references", ->
   a = {b: []}
   a.b[true] = -> this == a.b