fastify · mcollina · May 2, 2022 · Apr 27, 2022
diff --git a/README.md b/README.md
@@ -333,6 +333,20 @@ fastify.get("/", (req, reply) => {
 
 ### Nunjucks
 
+You can load templates from multiple paths when using the nunjucks engine:
+
+```js
+fastify.register(require("point-of-view"), {
+  engine: {
+    nunjucks: require("nunjucks"),
+  },
+  templates: [
+    "node_modules/shared-components",
+    "views",
+  ],
+});
+```
+
 To configure nunjucks environment after initialisation, you can pass callback function to options:
 
 ```js
@@ -393,7 +407,7 @@ fastify.get("/", (req, reply) => {
 });
 ```
 
-<!--- 
+<!---
 // This seems a bit random given that there was no mention of typescript before.
 ### Typing
 

diff --git a/index.js b/index.js
@@ -26,14 +26,20 @@ function fastifyView (fastify, opts, next) {
   const propertyName = opts.propertyName || 'view'
   const engine = opts.engine[type]
   const globalOptions = opts.options || {}
-  const templatesDir = opts.root || resolve(opts.templates || './')
+  const templatesDir = resolveTemplateDir(opts)
   const lru = HLRU(opts.maxCache || 100)
   const includeViewExtension = opts.includeViewExtension || false
   const viewExt = opts.viewExt || ''
   const prod = typeof opts.production === 'boolean' ? opts.production : process.env.NODE_ENV === 'production'
   const defaultCtx = opts.defaultContext || {}
   const globalLayoutFileName = opts.layout
 
+  function templatesDirIsValid (_templatesDir) {
+    if (Array.isArray(_templatesDir) && type !== 'nunjucks') {
+      throw new Error('Only Nunjucks supports the "templates" option as an array')
+    }
+  }
+
   function layoutIsValid (_layoutFileName) {
     if (type !== 'dot' && type !== 'handlebars' && type !== 'ejs' && type !== 'eta') {
       throw new Error('Only Dot, Handlebars, EJS, and Eta support the "layout" option')
@@ -44,13 +50,15 @@ function fastifyView (fastify, opts, next) {
     }
   }
 
-  if (globalLayoutFileName) {
-    try {
+  try {
+    templatesDirIsValid(templatesDir)
+
+    if (globalLayoutFileName) {
       layoutIsValid(globalLayoutFileName)
-    } catch (error) {
-      next(error)
-      return
     }
+  } catch (error) {
+    next(error)
+    return
   }
 
   const dotRender = type === 'dot' ? viewDot.call(fastify, preProcessDot.call(fastify, templatesDir, globalOptions)) : null
@@ -406,7 +414,7 @@ function fastifyView (fastify, opts, next) {
     data = Object.assign({}, defaultCtx, this.locals, data)
     // Append view extension.
     page = getPage(page, 'njk')
-    nunjucksEnv.render(join(templatesDir, page), data, (err, html) => {
+    nunjucksEnv.render(page, data, (err, html) => {
       const requestedPath = getRequestedPath(this)
       if (err) return this.send(err)
       if (useHtmlMinification(globalOptions, requestedPath)) {
@@ -677,6 +685,16 @@ function fastifyView (fastify, opts, next) {
     return render
   }
 
+  function resolveTemplateDir (_opts) {
+    if (_opts.root) {
+      return _opts.root
+    }
+
+    return Array.isArray(_opts.templates)
+      ? _opts.templates.map((dir) => resolve(dir))
+      : resolve(_opts.templates || './')
+  }
+
   function hasAccessToLayoutFile (fileName, ext) {
     try {
       accessSync(join(templatesDir, getPage(fileName, ext)))

diff --git a/templates/nunjucks-layout/layout.njk b/templates/nunjucks-layout/layout.njk
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en" dir="ltr">
+  <head>
+    <meta charset="utf-8">
+    <title></title>
+  </head>
+  <body>
+    {% block content %}{% endblock %}
+  </body>
+</html>
diff --git a/templates/nunjucks-template/index.njk b/templates/nunjucks-template/index.njk
@@ -0,0 +1,3 @@
+{% extends "layout.njk" %}
+
+{% block content %}<p>{{ text }}</p>{% endblock %}
diff --git a/test/test-nunjucks.js b/test/test-nunjucks.js
@@ -18,11 +18,12 @@ test('reply.view with nunjucks engine and custom templates folder', t => {
   fastify.register(require('../index'), {
     engine: {
       nunjucks: nunjucks
-    }
+    },
+    templates: 'templates'
   })
 
   fastify.get('/', (req, reply) => {
-    reply.view('./templates/index.njk', data)
+    reply.view('index.njk', data)
   })
 
   fastify.listen(0, err => {
@@ -36,7 +37,44 @@ test('reply.view with nunjucks engine and custom templates folder', t => {
       t.equal(response.statusCode, 200)
       t.equal(response.headers['content-length'], '' + body.length)
       t.equal(response.headers['content-type'], 'text/html; charset=utf-8')
-      t.equal(nunjucks.render('./templates/index.njk', data), body.toString())
+      t.equal(nunjucks.render('index.njk', data), body.toString())
+      fastify.close()
+    })
+  })
+})
+
+test('reply.view with nunjucks engine and custom templates array of folders', t => {
+  t.plan(6)
+  const fastify = Fastify()
+  const nunjucks = require('nunjucks')
+  const data = { text: 'text' }
+
+  fastify.register(require('../index'), {
+    engine: {
+      nunjucks: nunjucks
+    },
+    templates: [
+      'templates/nunjucks-layout',
+      'templates/nunjucks-template'
+    ]
+  })
+
+  fastify.get('/', (req, reply) => {
+    reply.view('index.njk', data)
+  })
+
+  fastify.listen(0, err => {
+    t.error(err)
+
+    sget({
+      method: 'GET',
+      url: 'http://localhost:' + fastify.server.address().port
+    }, (err, response, body) => {
+      t.error(err)
+      t.equal(response.statusCode, 200)
+      t.equal(response.headers['content-length'], '' + body.length)
+      t.equal(response.headers['content-type'], 'text/html; charset=utf-8')
+      t.equal(nunjucks.render('index.njk', data), body.toString())
       fastify.close()
     })
   })

diff --git a/test/test.js b/test/test.js
@@ -410,6 +410,21 @@ test('register callback should throw if layout option provided with wrong engine
   })
 })
 
+test('register callback should throw if templates option provided as array with wrong engine', t => {
+  t.plan(2)
+  const fastify = Fastify()
+
+  fastify.register(require('../index'), {
+    engine: {
+      pug: require('pug')
+    },
+    templates: ['layouts', 'pages']
+  }).ready(err => {
+    t.ok(err instanceof Error)
+    t.equal(err.message, 'Only Nunjucks supports the "templates" option as an array')
+  })
+})
+
 test('plugin is registered with "point-of-view" name', t => {
   t.plan(2)
   const fastify = Fastify()
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		{% extends "layout.njk" %}

		{% block content %}<p>{{ text }}</p>{% endblock %}