From 5c557915ef534171b50fce4c2b841294e320ba35 Mon Sep 17 00:00:00 2001
From: Richard Lea <chigix@zoho.com>
Date: Wed, 5 Sep 2018 02:49:22 +0900
Subject: [PATCH] Feat: absolute path support in template include/import

Signed-off-by: Richard Lea <chigix@zoho.com>
---
 .../import-render-nigeru.html                 |  1 +
 .../import-render-case/layout/template.njk    |  1 -
 test/nunjucks.test.ts                         | 55 +++++++++++++------
 tools/njk-loader.js                           | 22 ++++----
 4 files changed, 51 insertions(+), 28 deletions(-)

diff --git a/test/fixtures/tpl-render-result/import-render-nigeru.html b/test/fixtures/tpl-render-result/import-render-nigeru.html
index 559fd11..fa672f4 100644
--- a/test/fixtures/tpl-render-result/import-render-nigeru.html
+++ b/test/fixtures/tpl-render-result/import-render-nigeru.html
@@ -6,6 +6,7 @@
     <title>逃げる</title>
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <style>
+    
     #nigeru {
     background-color: green;
 }
diff --git a/test/fixtures/tpl-test/import-render-case/layout/template.njk b/test/fixtures/tpl-test/import-render-case/layout/template.njk
index 9f769d6..83d9ad7 100644
--- a/test/fixtures/tpl-test/import-render-case/layout/template.njk
+++ b/test/fixtures/tpl-test/import-render-case/layout/template.njk
@@ -6,7 +6,6 @@
     <title>{{ title }}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <style>
-    {% include "style.css" %}
     {% for style in styleIncludes if styleIncludes else [] %}
     {% include style %}
     {% endfor %}
diff --git a/test/nunjucks.test.ts b/test/nunjucks.test.ts
index 21c7e41..48e929c 100644
--- a/test/nunjucks.test.ts
+++ b/test/nunjucks.test.ts
@@ -10,38 +10,59 @@ function getNJKEnv(tplDir: string | string[]) {
 }
 
 test('TemplateLoader Basic Usage', done => {
-  const njk_env = getNJKEnv(path.join(CONST.TEST_TEMPLATE_DIR, './basic-render-case'));
-  njk_env.render('layout/template.njk', {
+  getNJKEnv(path.join(CONST.TEST_TEMPLATE_DIR, './basic-render-case'))
+    .render('layout/template.njk', {
+      title: '逃げる',
+      body: '逃げちゃだめだ。逃げちゃだめだ。逃げちゃだめだ。',
+    }, (err, result) => {
+      expect(err).toBeNull();
+      if (err) {
+        console.error(err);
+      }
+      expect(result).toEqual(
+        fs.readFileSync(
+          path.resolve(CONST.RENDER_CASE_DIR, './basic-render-nigeru.html'),
+          'utf8'));
+
+      return done();
+    });
+});
+
+test('Basic External Source Import Testing', done => {
+  getNJKEnv([
+    path.join(CONST.TEST_TEMPLATE_DIR, './import-render-case'),
+    path.join(CONST.TEST_TEMPLATE_DIR, './import-render-case/source'),
+  ]).render('layout/template.njk', {
     title: '逃げる',
     body: '逃げちゃだめだ。逃げちゃだめだ。逃げちゃだめだ。',
+    styleIncludes: [
+      'style.css',
+    ],
   }, (err, result) => {
     expect(err).toBeNull();
-    if (err) {
-      console.error(err);
-    }
     expect(result).toEqual(
       fs.readFileSync(
-        path.resolve(CONST.RENDER_CASE_DIR, './basic-render-nigeru.html'),
-        'utf8'));
+        path.resolve(CONST.RENDER_CASE_DIR, './import-render-nigeru.html')
+        , 'utf8'));
 
     return done();
   });
 });
 
-test('Basic External Source Import Testing', done => {
-  const njk_env = getNJKEnv([
+test('Import Normalize Css', done => {
+  getNJKEnv([
     path.join(CONST.TEST_TEMPLATE_DIR, './import-render-case'),
-    path.join(CONST.TEST_TEMPLATE_DIR, './import-render-case/source'),
-  ]);
-  njk_env.render('layout/template.njk', {
-    title: '逃げる',
-    body: '逃げちゃだめだ。逃げちゃだめだ。逃げちゃだめだ。',
+  ]).render('layout/template.njk', {
+    title: '守る',
+    body: 'あなたは死なないわ。私が守るもの',
+    styleIncludes: [
+      require.resolve('normalize.css'),
+    ],
   }, (err, result) => {
     expect(err).toBeNull();
     expect(result).toEqual(
-      fs.readFileSync(
-        path.resolve(CONST.RENDER_CASE_DIR, './import-render-nigeru.html')
-        , 'utf8'));
+      expect.stringContaining(
+        fs.readFileSync(require.resolve('normalize.css'), 'utf8')));
 
     return done();
   });
diff --git a/tools/njk-loader.js b/tools/njk-loader.js
index 739a0fb..cd7c1f9 100644
--- a/tools/njk-loader.js
+++ b/tools/njk-loader.js
@@ -16,18 +16,20 @@ module.exports = {
             }
         },
         getSource: function (name, callback) {
-            let full_path = null;
             const paths = this.searchPaths;
-
-            for (let i = 0; i < paths.length; i++) {
-                const basePath = path.resolve(paths[i]);
-                const p = path.resolve(paths[i], name); // Only allow the current directory and anything
-                // underneath it to be searched
-                if (p.indexOf(basePath) === 0 && fs.existsSync(p)) {
-                    full_path = p;
-                    break;
+            const full_path = (function () {
+                if (path.isAbsolute(name) && fs.existsSync(name)) {
+                    return name;
                 }
-            }
+                for (let i = 0; i < paths.length; i++) {
+                    const basePath = path.resolve(paths[i]);
+                    const p = path.resolve(paths[i], name); // Only allow the current directory and anything
+                    // underneath it to be searched
+                    if (p.indexOf(basePath) === 0 && fs.existsSync(p)) {
+                        return p;
+                    }
+                }
+            })();
 
             if (!full_path) {
                 return callback(null, null);