Bring back old async support PR

API.md

@@ -489,7 +489,7 @@ The Views Manager is configured with [`registration options`](#registration) or
     Defaults to empty options `{}`.
   - `contentType` - the content type of the engine results. Defaults to `'text/html'`.
   - `context` - a global context used with all templates. The global context option can be either
-    an object or a function that takes the [`request`](https://github.com/hapijs/hapi/blob/master/API.md#request)
+    an object or a function (can be async or return a promise) that takes the [`request`](https://github.com/hapijs/hapi/blob/master/API.md#request)
     as its only argument and returns a context object. The [`request`](https://github.com/hapijs/hapi/blob/master/API.md#request) object is only provided when using
     the [view handler](#the-view-handler) or [`h.view()`](#hviewtemplate-context-options). When using
     [`server.render()`](#serverrendertemplate-context-options-callback) or

lib/manager.js

@@ -35,7 +35,6 @@ internals.defaults = {
     context: null
 };
 
-
 module.exports = class Manager {
 
     constructor(server, options) {
@@ -381,10 +380,18 @@ module.exports = class Manager {
         });
     }
 
-    _render(compiled, context, request) {
+
+    async _render(compiled, context, request, callback) {
 
         if (this._context) {
-            let base = typeof this._context === 'function' ? this._context(request) : this._context;
+
+            let base = this._context;
+
+            if (typeof this._context === 'function') {
+
+                base = await this._context(request);
+            }
+
             if (context) {
                 base = Object.assign({}, base);             // Shallow cloned
                 const keys = Object.keys(context);
@@ -521,8 +528,11 @@ module.exports = class Manager {
 
     async render(filename, context, options, request) {
 
+
         const compiled = await this._prepare(filename, options);
-        return this._render(compiled, context, request);
+
+        return await this._render(compiled, context, request);
+
     }
 };
 

test/manager.js

@@ -1117,7 +1117,7 @@ describe('Manager', () => {
                 context: function (request) {
 
                     return {
-                        message: request ? request.route.path : 'default message',
+                        message: 'default message',
 
                         query: {
                             test: 'global'
@@ -1132,6 +1132,58 @@ describe('Manager', () => {
             expect(rendered).to.contain('<h1>default message</h1>');
         });
 
+        it('renders with an async global context function (no request)', async () => {
+
+            const asyncFn = () => Promise.resolve('from async');
+
+            const server = Hapi.server();
+            const testView = new Manager(server, {
+                engines: { html: require('handlebars') },
+                path: __dirname + '/templates',
+
+                context: async function (request) {
+
+                    return {
+                        message: 'default message',
+
+                        query: {
+                            test: await asyncFn()
+                        }
+                    };
+                }
+            });
+
+            const rendered = await testView.render('valid/testContext');
+            expect(rendered).to.exist();
+            expect(rendered).to.contain('<h1>from async</h1>');
+            expect(rendered).to.contain('<h1>default message</h1>');
+        });
+
+        it('renders with a global context function that returns a promise (no request)', async () => {
+
+            const server = Hapi.server();
+            const testView = new Manager(server, {
+                engines: { html: require('handlebars') },
+                path: __dirname + '/templates',
+
+                context: function (request) {
+
+                    return Promise.resolve({
+                        message: 'default message',
+
+                        query: {
+                            test: 'from promise'
+                        }
+                    });
+                }
+            });
+
+            const rendered = await testView.render('valid/testContext');
+            expect(rendered).to.exist();
+            expect(rendered).to.contain('<h1>from promise</h1>');
+            expect(rendered).to.contain('<h1>default message</h1>');
+        });
+
         it('overrides the global context function values with local values', async () => {
 
             const server = Hapi.server();