Use function declaration

TimothyGu · TimothyGu · commit 267076f07d1b · 2015-01-17T16:34:12.000-08:00
Removes the need for prototypes, at the same time gives pretty feedback
in stack traces. It is also recommended by the Geddy style guide.
diff --git a/lib/ejs.js b/lib/ejs.js
@@ -21,11 +21,6 @@
 var utils = require('./utils')
   , templateCache = {}
   , jsCache = {}
-  , includeFile
-  , includeSource
-  , resolveInclude
-  , compile
-  , rethrow
   , _DEFAULT_DELIMITER = '%'
   , _REGEX_STRING = '(<%%)|(<%=)|(<%-)|(<%#)|(<%)|(%>)|(-%>)'
   , _OPTS_MAP = {
@@ -39,7 +34,7 @@ var utils = require('./utils')
     , client: 'client'
     };
 
-resolveInclude = function (name, filename) {
+function resolveInclude(name, filename) {
   var path = require('path')
     , dirname = path.dirname
     , extname = path.extname
@@ -50,9 +45,9 @@ resolveInclude = function (name, filename) {
     includePath += '.ejs';
   }
   return includePath;
-};
+}
 
-includeFile = function (path, options) {
+function includeFile(path, options) {
   var fn
     , opts = utils.shallowCopy({}, options || /* istanbul ignore next */ {})
     , fs = require('fs')
@@ -76,9 +71,9 @@ includeFile = function (path, options) {
   opts.filename = includePath;
   fn = exports.compile(template, opts);
   return fn;
-};
+}
 
-includeSource = function (path, options) {
+function includeSource(path, options) {
   var opts = utils.shallowCopy({}, options || {})
     , fs = require('fs')
     , includePath
@@ -102,15 +97,15 @@ includeSource = function (path, options) {
   var templ = new Template(template, opts);
   templ.generateSource();
   return templ.source;
-};
+}
 
-rethrow = function (err, str, filename, lineno){
+function rethrow(err, str, filename, lineno){
   var lines = str.split('\n')
     , start = Math.max(lineno - 3, 0)
     , end = Math.min(lines.length, lineno + 3);
 
   // Error context
-  var context = lines.slice(start, end).map(function(line, i){
+  var context = lines.slice(start, end).map(function (line, i){
     var curr = i + start + 1;
     return (curr === lineno ? ' >> ' : '    ')
       + curr
@@ -126,12 +121,13 @@ rethrow = function (err, str, filename, lineno){
     + err.message;
 
   throw err;
-};
+}
 
-compile = exports.compile = function (template, opts) {
+function compile(template, opts) {
   var templ = new Template(template, opts);
   return templ.compile();
-};
+}
+exports.compile = compile;
 
 // template, [data], [opts]
 // Have to include an empty data object if you want opts and no data
@@ -188,13 +184,12 @@ exports.renderFile = function () {
     , cb = args.pop()
     , data = args.shift() || {}
     , opts = args.pop() || {}
-    , template
-    , handleTemplate;
+    , template;
 
   // Set the filename for includes
   opts.filename = path;
 
-  handleTemplate = function (template) {
+  function handleTemplate(template) {
     var result
       , failed = false;
     try {
@@ -207,7 +202,7 @@ exports.renderFile = function () {
     if (!failed) {
       cb(null, result);
     }
-  };
+  }
 
   template = templateCache[path];
   if (opts.cache && template) {
@@ -233,7 +228,7 @@ exports.clearCache = function () {
   jsCache = {};
 };
 
-var Template = function (text, opts) {
+function Template(text, opts) {
   opts = opts || {};
   var options = {};
   this.templateText = text;
@@ -251,10 +246,9 @@ var Template = function (text, opts) {
   this.opts = options;
 
   this.regex = this.createRegex();
-};
+}
 
 Template.prototype = new function () {
-
   this.modes = {
       EVAL: 'eval'
     , ESCAPED: 'escaped'
@@ -411,10 +405,9 @@ Template.prototype = new function () {
   this.scanLine = function (line) {
     var self = this
       , d = this.opts.delimiter
-      , newLineCount = 0
-      , _addOutput;
+      , newLineCount = 0;
 
-    _addOutput = function () {
+    function _addOutput() {
       if (self.truncate) {
         line = line.replace('\n', '');
       }
@@ -430,7 +423,7 @@ Template.prototype = new function () {
       // - this will be the delimiter during execution
       line = line.replace(/"/g, '\\"');
       self.source += ';__output += "' + line + '";';
-    };
+    }
 
     newLineCount = (line.split('\n').length - 1);
 
