miki-template 1.3.6 → 1.3.7

package/live-test/package.json

@@ -0,0 +1,9 @@
+{
+  "name": "live-test",
+  "version": "1.0.0",
+  "private": true,
+  "dependencies": {
+    "express": "^5.2.1",
+    "miki-template": "1.3.6"
+  }
+}

package/live-test/server.js

@@ -0,0 +1,14 @@
+const express = require('express');
+const path = require('path');
+const miki = require('miki-template');
+
+const app = express();
+const views = path.join(__dirname, 'views');
+
+miki.setupExpress(app, { extension: 'html', views });
+
+app.get('/', (req, res) => {
+  res.render('index', { name: 'Live NPM' });
+});
+
+app.listen(3002, () => console.log('Live test app listening on 3002'));

package/live-test/views/base.html

@@ -0,0 +1,8 @@
+<html>
+<head>
+  <title>{% block title %}Base Title{% endblock %}</title>
+</head>
+<body>
+  {% block content %}Base content{% endblock %}
+</body>
+</html>

package/live-test/views/child.html

@@ -0,0 +1,7 @@
+{% extends 'base.html' %}
+{% block title %}Child - {{ title }}{% endblock %}
+{% block content %}
+  <h2>Child Content</h2>
+  <p>{{ message }}</p>
+  {{ block.super }}
+{% endblock %}

package/live-test/views/index.html

@@ -0,0 +1 @@
+<html><head><title>{{ name }}</title></head><body><h1>Hello {{ name }}</h1></body></html>

package/miki-template-extension/extension.js

@@ -894,7 +894,7 @@ function activate(context) {
 			const selection = editor.selection;
 			const selectedText = editor.document.getText(selection);
 			editor.edit(editBuilder => {
-				editBuilder.replace(selection, `{% block ${1:name} %}\n${selectedText}\n{% endblock %}`);
+				editBuilder.replace(selection, '{% block ${1:name} %}\n' + selectedText + '\n{% endblock %}');
 			});
 		}),
 
@@ -904,7 +904,7 @@ function activate(context) {
 			const selection = editor.selection;
 			const selectedText = editor.document.getText(selection);
 			editor.edit(editBuilder => {
-				editBuilder.replace(selection, `{% for ${1:item} in ${2:items} %}\n${selectedText}\n{% endfor %}`);
+				editBuilder.replace(selection, '{% for ${1:item} in ${2:items} %}\n' + selectedText + '\n{% endfor %}');
 			});
 		}),
 
@@ -914,7 +914,7 @@ function activate(context) {
 			const selection = editor.selection;
 			const selectedText = editor.document.getText(selection);
 			editor.edit(editBuilder => {
-				editBuilder.replace(selection, `{% if ${1:condition} %}\n${selectedText}\n{% endif %}`);
+				editBuilder.replace(selection, '{% if ${1:condition} %}\n' + selectedText + '\n{% endif %}');
 			});
 		}),
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "miki-template",
-  "version": "1.3.6",
+  "version": "1.3.7",
   "description": "Django-Style template engine for Node.js and Express",
   "main": "src/index.js",
   "exports": {
@@ -10,13 +10,6 @@
       "default": "./src/index.js"
     }
   },
-  "scripts": {
-    "test": "node -e \"const fs=require('fs');const path=require('path');function walk(d){const out=[];for(const e of fs.readdirSync(d,{withFileTypes:true})){const p=path.join(d,e.name);if(e.isDirectory())out.push(...walk(p));else if(/\\\\.test\\\\.(cjs|mjs|js)$/.test(e.name))out.push(p);}return out;}const files=walk('tests');require('child_process').execSync('node --test '+files.join(' '),{stdio:'inherit'})\"",
-    "bench": "node benchmarks/run.js",
-    "release:patch": "npm version patch --no-git-tag-version -m \"chore(release): v%s\" && git push origin main",
-    "release:minor": "npm version minor --no-git-tag-version -m \"chore(release): v%s\" && git push origin main",
-    "release:major": "npm version major --no-git-tag-version -m \"chore(release): v%s\" && git push origin main"
-  },
   "keywords": [
     "django",
     "template",
@@ -32,6 +25,16 @@
     "he": "^1.2.0"
   },
   "devDependencies": {
-    "express": "^5.2.1"
+    "express": "^5.2.1",
+    "eslint": "^8.50.0"
+  }
+  ,
+  "scripts": {
+    "test": "node -e \"const fs=require('fs');const path=require('path');function walk(d){const out=[];for(const e of fs.readdirSync(d,{withFileTypes:true})){const p=path.join(d,e.name);if(e.isDirectory())out.push(...walk(p));else if(/\\\\.test\\\\.(cjs|mjs|js)$/.test(e.name))out.push(p);}return out;}const files=walk('tests');require('child_process').execSync('node --test '+files.join(' '),{stdio:'inherit'})\"",
+    "lint": "eslint . -f unix",
+    "bench": "node benchmarks/run.js",
+    "release:patch": "npm version patch --no-git-tag-version -m \"chore(release): v%s\" && git push origin main",
+    "release:minor": "npm version minor --no-git-tag-version -m \"chore(release): v%s\" && git push origin main",
+    "release:major": "npm version major --no-git-tag-version -m \"chore(release): v%s\" && git push origin main"
   }
 }

package/src/esm.mjs

@@ -44,6 +44,11 @@ const {
   escapeHtml
 } = cjsModule;
 
+// Re-export the finder for ESM tests
+export const findTemplateInViews = cjsModule.findTemplateInViews;
+export const setAppTemplateDirNames = cjsModule.setAppTemplateDirNames;
+export const getAppTemplateDirNames = cjsModule.getAppTemplateDirNames;
+
 export {
   compile,
   render,

package/src/index.js

@@ -69,6 +69,97 @@ function normalizeViews(views) {
   });
 }
 
+// Find a template file by name in the provided views directories.
+// Supports searching recursively through subdirectories when the
+// template name is a bare name (no path separators). Returns the
+// absolute path to the first matching file, or null if not found.
+function findTemplateInViews(templateName, viewsDirs) {
+  if (!templateName) return null;
+  const hasExt = /\.[a-z0-9]+$/i.test(templateName);
+  // Candidate basenames to look for when doing recursive search
+  const candidateBasenames = hasExt ? [path.basename(templateName)] : [path.basename(templateName) + '.html', path.basename(templateName) + '.miki'];
+
+  // Normalize templateName's separators to the platform so direct
+  // resolves work when callers use forward slashes on Windows.
+  const templateNameNorm = templateName.replace(/\//g, path.sep);
+
+  for (const dir of viewsDirs) {
+    // Also consider app-style 'templates' directories nested inside
+    // the views root (e.g. project/app/templates/...)
+    const appTemplateDirs = findTemplatesDirsUnder(dir);
+    const searchDirs = [dir, ...appTemplateDirs];
+    for (const sdir of searchDirs) {
+      // Try direct resolution: if caller provided a path (like "nested/index")
+      // resolve it relative to the search dir and try supported extensions.
+      const basePath = path.resolve(sdir, templateNameNorm);
+      if (hasExt) {
+        try { if (fs.existsSync(basePath)) return basePath; } catch {}
+      } else {
+        try { if (fs.existsSync(basePath + '.html')) return basePath + '.html'; } catch {}
+        try { if (fs.existsSync(basePath + '.miki')) return basePath + '.miki'; } catch {}
+      }
+
+      // If templateName is a bare name (no path separators), search
+      // recursively under the search dir for matching filenames.
+      if (!templateName.includes('/') && !templateName.includes(path.sep)) {
+        const stack = [sdir];
+        while (stack.length) {
+          const cur = stack.pop();
+          let entries;
+          try { entries = fs.readdirSync(cur, { withFileTypes: true }); } catch (e) { continue; }
+          for (const ent of entries) {
+            const p = path.join(cur, ent.name);
+            if (ent.isDirectory()) {
+              stack.push(p);
+              continue;
+            }
+            if (!ent.isFile()) continue;
+            const relative = path.relative(path.resolve(sdir), p);
+            if (relative.startsWith('..') || path.isAbsolute(relative)) continue;
+            for (const candBasename of candidateBasenames) {
+              if (ent.name === candBasename) return p;
+            }
+          }
+        }
+      }
+    }
+  }
+  return null;
+}
+
+// Search for "app-style" templates directories under the provided
+// views directories. Many projects place templates inside an app
+// submodule under `appname/templates/...`. This helper will locate
+// any `templates` directories and search them for candidates.
+let appTemplateDirNames = ['templates'];
+
+function setAppTemplateDirNames(names) {
+  if (!names) return;
+  if (Array.isArray(names)) appTemplateDirNames = names.slice();
+  else if (typeof names === 'string') appTemplateDirNames = [names];
+}
+
+function getAppTemplateDirNames() {
+  return appTemplateDirNames.slice();
+}
+
+function findTemplatesDirsUnder(dir) {
+  const results = [];
+  const stack = [dir];
+  while (stack.length) {
+    const cur = stack.pop();
+    let entries;
+    try { entries = fs.readdirSync(cur, { withFileTypes: true }); } catch (e) { continue; }
+    for (const ent of entries) {
+      const p = path.join(cur, ent.name);
+      if (!ent.isDirectory()) continue;
+      if (appTemplateDirNames.includes(ent.name)) results.push(p);
+      stack.push(p);
+    }
+  }
+  return results;
+}
+
 // Inject the registration functions so libraries can activate without
 // triggering a circular require. This must happen BEFORE the
 // auto-activation loop below.
@@ -101,15 +192,28 @@ function readParentSource(parentName, viewsDirs) {
       if (relative.startsWith('..') || path.isAbsolute(relative)) {
         throw new Error(`Extends tag attempted path traversal outside allowed views: '${parentName}'`);
       }
-      const fileContent = fs.readFileSync(fullPath, 'utf8');
-      // Populate the LRU cache and return the value
-      return getParentSource(key, () => fileContent);
+      if (fs.existsSync(fullPath)) {
+        const fileContent = fs.readFileSync(fullPath, 'utf8');
+        // Populate the LRU cache and return the value
+        return getParentSource(key, () => fileContent);
+      }
     } catch (e) {
       if (e.message && e.message.startsWith('Extends tag attempted path traversal')) {
         throw e;
       }
     }
   }
+
+  // Fallback: try recursive search through subfolders in the provided
+  // views directories. This enables Django-like behavior where a
+  // template may be placed in a nested folder and referenced by name.
+  const found = findTemplateInViews(parentName, viewsDirs);
+  if (found) {
+    const key = path.dirname(found) + '\0' + parentName;
+    const fileContent = fs.readFileSync(found, 'utf8');
+    return getParentSource(key, () => fileContent);
+  }
+
   throw new Error(`Template not found: '${parentName}' in directories ${JSON.stringify(viewsDirs)}`);
 }
 
@@ -135,6 +239,18 @@ async function renderASTAsync(nodes, context) {
 
     const fileContent = readParentSource(parentName, viewsDirs);
 
+    // If parent not found by direct resolution, try recursive search
+    // (search subfolders) using the new helper. This ensures extends
+    // can locate parent templates placed in nested directories.
+    if (!fileContent) {
+      const found = findTemplateInViews(parentName, viewsDirs);
+      if (found) {
+        const fileContent2 = fs.readFileSync(found, 'utf8');
+        const key = path.dirname(found) + '\0' + parentName;
+        return getParentSource(key, () => fileContent2);
+      }
+    }
+
     const parentTokens = tokenize(fileContent);
     const parentParser = new Parser(parentTokens, getTagRegistry());
     const parentNodes = parentParser.parse();
@@ -427,6 +543,14 @@ function renderPartialFromFile(fileName, partialName, contextObj, options) {
     }
     if (loaded) break;
   }
+  // Fallback: try recursive search if not loaded
+  if (!loaded) {
+    const found = findTemplateInViews(fileName, viewsDirs);
+    if (found) {
+      fileContent = fs.readFileSync(found, 'utf8');
+      loaded = true;
+    }
+  }
   if (!loaded) {
     throw new Error(
       `Template not found: '${fileName}' in directories ${JSON.stringify(viewsDirs)}`
@@ -827,6 +951,11 @@ function setupExpress(app, opts = {}) {
           break;
         }
       }
+      // Fallback: recursive search for templates in subfolders
+      if (!filePath) {
+        const found = findTemplateInViews(fileName, [viewsDir]);
+        if (found) filePath = found;
+      }
       if (!filePath) {
         const err = new Error(
           `Failed to lookup view "${view}" in views directory "${viewsDir}"`
@@ -910,6 +1039,11 @@ function expressPartialRenderer() {
           filePath = null;
         } catch { filePath = null; }
       }
+      // Fallback: recursive search for templates in subfolders
+      if (!filePath) {
+        const found = findTemplateInViews(fileName, Array.isArray(viewsDir) ? viewsDir : [viewsDir]);
+        if (found) filePath = found;
+      }
       if (!filePath) {
         return res.status(404).send(
           `Template not found: '${fileName}' in '${viewsDir}'`
@@ -933,6 +1067,10 @@ function expressPartialRenderer() {
 }
 
 module.exports = {
+  // Export the finder to allow unit tests to call it directly
+  findTemplateInViews,
+  setAppTemplateDirNames,
+  getAppTemplateDirNames,
   compile,
   render,
   asyncRender,

package/tests/finder-appdirs.test.js

@@ -0,0 +1,19 @@
+const test = require('node:test');
+const assert = require('node:assert');
+const path = require('path');
+const fs = require('fs');
+const { findTemplateInViews, setAppTemplateDirNames } = require('../src/index.js');
+
+test('Finder honors custom app template dir names', () => {
+  const fixtures = path.join(__dirname, 'fixtures', 'views-appdirs');
+  // Create a small fixture structure
+  if (!fs.existsSync(path.join(fixtures, 'product', 'site'))){
+    fs.mkdirSync(path.join(fixtures, 'product', 'site'), { recursive: true });
+  }
+  const fname = path.join(fixtures, 'product', 'site', 'detail.html');
+  fs.writeFileSync(fname, '<p>detail</p>');
+
+  setAppTemplateDirNames(['site']);
+  const found = findTemplateInViews('detail', [fixtures]);
+  assert.ok(found && fs.existsSync(found));
+});

package/tests/finder.test.js

@@ -0,0 +1,17 @@
+const test = require('node:test');
+const assert = require('node:assert');
+const path = require('path');
+const fs = require('fs');
+const { findTemplateInViews } = require('../src/index.js');
+
+test('Template finder - nested subfolder', () => {
+  const views = [path.join(__dirname, 'fixtures', 'views')];
+  const found = findTemplateInViews('nested/index', views);
+  assert.ok(found && fs.existsSync(found));
+});
+
+test('Template finder - bare name searches subfolders', () => {
+  const views = [path.join(__dirname, 'fixtures', 'views')];
+  const found = findTemplateInViews('deepfile', views);
+  assert.ok(found && fs.existsSync(found));
+});

package/tests/fixtures/views/nested/index.html

@@ -0,0 +1 @@
+<h1>Nested Index</h1>

package/tests/fixtures/views/partial.html

@@ -0,0 +1 @@
+<p>Included: {{ item }}</p>

package/tests/fixtures/views/sub/deepfile.html

@@ -0,0 +1 @@
+<div>Deep file</div>

package/tests/fixtures/views-appdirs/product/site/detail.html

@@ -0,0 +1 @@
+<p>detail</p>

package/tests/integration/finder.esm.test.mjs

@@ -0,0 +1,13 @@
+import assert from 'node:assert';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+import test from 'node:test';
+import { findTemplateInViews } from '../../src/esm.mjs';
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+
+test('ESM Template finder - nested index', () => {
+  const views = [path.join(__dirname, '..', 'fixtures', 'views')];
+  const found = findTemplateInViews('nested/index', views);
+  assert.ok(found && typeof found === 'string');
+});