Fixed issue mde#119

BananaAcid · Apr 17, 2016 · a67445d · a67445d
1 parent 154a96c
commit a67445d
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 0 deletions.
diff --git a/lib/ejs.js b/lib/ejs.js
@@ -535,6 +535,8 @@ Template.prototype = {
       , d = this.opts.delimiter;
 
     if (matches && matches.length) {
+      this.source = '     ; __lines = ' + JSON.stringify(this.templateText) + '\n';
+      this.source += '    ; __filename = "' + this.opts.filename.replace(/\\/g,  '/') + '"\n';
       matches.forEach(function (line, index) {
         var opening
           , closing

diff --git a/package.json b/package.json
@@ -35,6 +35,7 @@
   },
   "scripts": {
     "test": "mocha",
+    "sample": "npm install express && node test/sample/index.js",
     "coverage": "istanbul cover node_modules/mocha/bin/_mocha",
     "doc": "rimraf out && jsdoc -c jsdoc.json lib/* docs/jsdoc/*",
     "devdoc": "rimraf out && jsdoc -p -c jsdoc.json lib/* docs/jsdoc/*"

diff --git a/test/sample/body.html b/test/sample/body.html
@@ -0,0 +1,2 @@
+<!-- Execute an exception -->
+<p><%= this_variable_is_not_defined %></p>
diff --git a/test/sample/header.html b/test/sample/header.html
@@ -0,0 +1,3 @@
+<head>
+<title><%= header %></title>
+</head>
diff --git a/test/sample/index.html b/test/sample/index.html
@@ -0,0 +1,20 @@
+<html>
+<head>
+<% include header.html %>
+</head>
+<body>
+<!--
+	Without fix result should be confusing
+
+	ReferenceError: ./ejs/test/sample/index.html:2
+   1| <html> 
+>> 2| <head> 
+   3| <% include header.html %> 
+   4| </head> 
+   5| <body> 
+
+this_variable_is_not_defined is not defined
+-->
+<% include body.html %>
+</body>
+</html>
diff --git a/test/sample/index.js b/test/sample/index.js
@@ -0,0 +1,11 @@
+var express = require('express'),
+    ejs = require('../../lib/ejs.js');
+var app = express();
+app.engine('.html', ejs.__express);
+app.set('view engine', 'ejs');
+app.get('/', function(req, res) {
+	res.render(__dirname + '/index.html', {header: 'Hello EJS'});
+});
+var server = app.listen(3000, function () {
+  console.log('Example app listening at http://localhost:3000');
+});