Fix resolution of theme's templates

1 files changed, 24 insertions, 13 deletions

diff --git a/lib/templating/renderFile.js b/lib/templating/renderFile.js
index 13a9c5b..9b74e5b 100644
--- a/lib/templating/renderFile.js
+++ b/lib/templating/renderFile.js
@@ -1,27 +1,38 @@
 var Promise = require('../utils/promise');
-
-var replaceShortcuts = require('./replaceShortcuts');
+var error = require('../utils/error');
+var render = require('./render');
 
 /**
     Render a template
 
     @param {TemplateEngine} engine
     @param {String} filePath
-    @param {String} content
-    @param {Object} ctx
+    @param {Object} context
     @return {Promise<String>}
 */
-function renderTemplateFile(engine, filePath, content, context) {
-    context = context || {};
-    var env = engine.toNunjucks();
+function renderTemplateFile(engine, filePath, context) {
+    var loader = engine.getLoader();
+
+    return Promise()
+    .then(function() {
+        if (!loader.async) {
+            return loader.getSource(filePath);
+        }
+
+        var deferred = Promise.defer();
+        loader.getSource(filePath, deferred.makeNodeResolver());
+        return deferred.promise;
+    })
+    .then(function(result) {
+        if (!result) {
+            throw error.TemplateError(new Error('Not found'), {
+                filename: filePath
+            });
+        }
 
-    content = replaceShortcuts(engine, filePath, content);
+        return render(engine, result.path, result.src, context);
+    });
 
-    return Promise.nfcall(
-        env.render.bind(env),
-        content,
-        context
-    );
 }
 
 module.exports = renderTemplateFile;