Optimize compiled templates

benchmark.coffee

@@ -1,3 +1,5 @@
+#!/usr/bin/env coffee
+
 coffeekup = require './src/coffeekup'
 jade = require 'jade'
 ejs = require 'ejs'
@@ -63,6 +65,8 @@ coffeekup_string_template = """
 
 coffeekup_compiled_template = coffeekup.compile coffeekup_template
 
+coffeekup_optimized_template = coffeekup.compile coffeekup_template, optimize: yes
+
 jade_template = '''
   !!! 5
   html(lang="en")
@@ -153,6 +157,8 @@ eco_template = '''
   </html>
 '''
 
+eco_compiled_template = eco.compile eco_template
+
 haml_template = '''
   !!! 5
   %html{lang: "en"}
@@ -185,23 +191,25 @@ benchmark = (title, code) ->
     code()
   log "#{title}: #{new Date - start} ms"
 
-@run = ->
-  benchmark 'CoffeeKup (precompiled)', -> coffeekup_compiled_template data
-  benchmark 'Jade (precompiled)', -> jade_compiled_template data
-  benchmark 'haml-js (precompiled)', -> haml_template_compiled data
-  benchmark 'Eco', -> eco.render eco_template, data
 
-  console.log '\n'
+benchmark 'CoffeeKup (precompiled)', -> coffeekup_compiled_template data
+benchmark 'CoffeeKup (precompiled, optimized)', -> coffeekup_optimized_template data
+benchmark 'Jade (precompiled)', -> jade_compiled_template data
+benchmark 'haml-js (precompiled)', -> haml_template_compiled data
+benchmark 'Eco (precompiled)', -> eco_compiled_template data
+
+console.log '\n'
 
-  benchmark 'CoffeeKup (function, cache on)', -> coffeekup.render coffeekup_template, data, cache: on
-  benchmark 'CoffeeKup (string, cache on)', -> coffeekup.render coffeekup_string_template, data, cache: on
-  benchmark 'Jade (cache on)', -> jade.render jade_template, locals: data, cache: on, filename: 'test'
-  benchmark 'ejs (cache on)', -> ejs.render ejs_template, locals: data, cache: on, filename: 'test'
+benchmark 'CoffeeKup (function, cache on)', -> coffeekup.render coffeekup_template, data, cache: on
+benchmark 'CoffeeKup (string, cache on)', -> coffeekup.render coffeekup_string_template, data, cache: on
+#benchmark 'Jade (cache on)', -> jade.render jade_template, locals: data, cache: on, filename: 'test'
+benchmark 'ejs (cache on)', -> ejs.render ejs_template, locals: data, cache: on, filename: 'test'
+benchmark 'Eco', -> eco.render eco_template, data
 
-  console.log '\n'
+console.log '\n'
 
-  benchmark 'CoffeeKup (function, cache off)', -> coffeekup.render coffeekup_template, data
-  benchmark 'CoffeeKup (string, cache off)', -> coffeekup.render coffeekup_string_template, data, cache: off
-  benchmark 'Jade (cache off)', -> jade.render jade_template, locals: data
-  benchmark 'haml-js', -> haml.render haml_template, locals: data
-  benchmark 'ejs (cache off)', -> ejs.render ejs_template, locals: data
+benchmark 'CoffeeKup (function, cache off)', -> coffeekup.render coffeekup_template, data, cache: off
+benchmark 'CoffeeKup (string, cache off)', -> coffeekup.render coffeekup_string_template, data, cache: off
+#benchmark 'Jade (cache off)', -> jade.render jade_template, locals: data
+benchmark 'haml-js', -> haml.render haml_template, locals: data
+benchmark 'ejs (cache off)', -> ejs.render ejs_template, locals: data

bin/coffeekup

@@ -1,7 +1,3 @@
-#!/usr/bin/env node
+#!/usr/bin/env coffee
 
-var path = require('path')
-var fs = require('fs')
-var lib = path.join(path.dirname(fs.realpathSync(__filename)), '../lib')
-
-require(lib + '/cli').run()
+require(__dirname + '/../src/cli').run()

package.json

@@ -9,7 +9,7 @@
   "devDependencies": {"jade": "0.13.0", "eco": "1.1.0-rc-1", "ejs": "0.4.3", "haml": "0.4.2"},
   "keywords": ["template", "view", "coffeescript"],
   "bin": "./bin/coffeekup",
-  "main": "./lib/coffeekup",
+  "main": "./src/coffeekup",
   "engines": {"node": ">= 0.4.7"},
   "contributors": [
     "Luis Pedro Coelho <lpc@cmu.edu>",

src/coffeekup.coffee

@@ -15,6 +15,8 @@ if window?
 else
   coffeekup = exports
   coffee = require 'coffee-script'
+  compiler = require __dirname + '/compiler'
+  compiler.setup coffeekup
 
 coffeekup.version = '0.3.1edge'
 
@@ -294,6 +296,11 @@ coffeekup.compile = (template, options = {}) ->
         hardcoded_locals += "var #{k} = function(){return (#{v}).apply(data, arguments);};"
       else hardcoded_locals += "var #{k} = #{JSON.stringify v};"
 
+  # If `optimize` is set on the options hash, use uglify-js to parse the
+  # template function's code and optimize it using static analysis.
+  if options.optimize and compiler?
+    return compiler.compile template, hardcoded_locals, options
+
   # Add a function for each tag this template references. We don't want to have
   # all hundred-odd tags wasting space in the compiled function.
   tag_functions = ''
@@ -338,6 +345,10 @@ coffeekup.render = (template, data = {}, options = {}) ->
   data[k] = v for k, v of options
   data.cache ?= off
 
+  # Do not optimize templates if the cache is disabled, as it will slow
+  # everything down considerably.
+  if data.optimize and not data.cache then data.optimize = no
+
   if data.cache and cache[template]? then tpl = cache[template]
   else if data.cache then tpl = cache[template] = coffeekup.compile(template, data)
   else tpl = coffeekup.compile(template, data)
@@ -368,4 +379,4 @@ unless window?
 
         return ->
           try tpl arguments...
-          catch e then throw new TemplateError "Error rendering #{data.filename}: #{e.message}"
+          catch e then throw new TemplateError "Error rendering #{data.filename}: #{e.message}"