@ololoepepe/template-renderer 0.1.49 → 0.2.1

package/README.md

@@ -1 +1 @@
-# Lodash-based template renderer
+# eta-based template renderer

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ololoepepe/template-renderer",
-  "version": "0.1.49",
-  "description": "Lodash-based template renderer",
+  "version": "0.2.1",
+  "description": "eta-based template renderer",
   "main": "src/index.js",
   "imports": {
     "#src/*.js": "./src/*.js"
@@ -31,11 +31,11 @@
   },
   "homepage": "https://gitlab.void-walkers.com/libs/node.js/template-renderer#README",
   "devDependencies": {
-    "@ololoepepe/eslint-config": "^0.0.20",
+    "@ololoepepe/eslint-config": "^0.0.21",
     "eslint": "8.57.0",
-    "mocha": "^11.4.0"
+    "mocha": "^11.7.5"
   },
   "dependencies": {
-    "lodash.template": "^4.5.0"
+    "eta": "^4.5.0"
   }
 }

package/src/index.js

@@ -1,228 +1,32 @@
-import fs from 'node:fs';
-import {readFile} from 'node:fs/promises';
+import {Eta} from 'eta';
 
-import lodashTemplate from 'lodash.template';
-
-const RX_INCLUDE = /^(?<before>\s*)#include\s+'(?<include>[^']+)'(?<after>.*)$/u;
-
-async function exists(path) {
-  return await new Promise(resolve => {
-    fs.exists(path, resolve);
-  });
-}
-
-function _forEach(arr, callback) {
-  arr.forEach(callback);
-}
-
-function _renderTemplate(template, templateName, variables) {
-  if (!template) {
-    console.warn(`Template "${templateName}" not found`);
-
-    return null;
-  }
-
-  const obj = {
-    _: {
-      forEach: _forEach
-    },
-    ...variables
-  };
-
-  return template(obj);
+function getTemplateName(name) {
+  return name.startsWith('@') ? name : `./${name}`;
 }
 
 export class TemplateRenderer {
-  #templateCache = new Map();
-  #templatesDir = null;
-  #templateSettings = null;
-  #templateStringCache = new Map();
+  #eta = null;
 
   constructor(templatesDir, templateSettings = {}) {
-    this.#templatesDir = templatesDir;
-    this.#templateCache = new Map();
-    this.#templateStringCache = new Map();
-    this.#templateSettings = templateSettings;
-  }
-
-  async getTemplate(name) {
-    if (this.#templateCache.has(name)) {
-      return this.#templateCache.get(name);
-    }
-
-    const templateString = await this.#getTemplateStringRecursive(name);
-
-    return this.#getTemplate(name, templateString);
-  }
-
-  getTemplateSync(name) {
-    if (this.#templateCache.has(name)) {
-      return this.#templateCache.get(name);
-    }
-
-    const templateString = this.#getTemplateStringRecursiveSync(name);
-
-    return this.#getTemplate(name, templateString);
-  }
-
-  async loadTemplate(name, text) {
-    if (this.#templateCache.has(name)) {
-      console.warn(`Template renderer: template "${name}" already exists, overriding it`);
-    }
-
-    const templateString = await this.#getTemplateStringRecursiveInternal(text);
-
-    this.#getTemplate(name, templateString);
+    this.#eta = new Eta({
+      autoEscape: false,
+      cache: true,
+      defaultExtension: '',
+      ...templateSettings,
+      views: templatesDir
+    });
   }
 
   loadTemplateSync(name, text) {
-    if (this.#templateCache.has(name)) {
-      console.warn(`Template renderer: template "${name}" already exists, overriding it`);
-    }
-
-    const templateString = this.#getTemplateStringRecursiveInternalSync(text);
-
-    this.#getTemplate(name, templateString);
-  }
-
-  preloadSync(extension) {
-    this.#templateStringCache.clear();
-    this.#templateCache.clear();
-
-    this.#preloadRecursiveSync(extension);
+    this.#eta.loadTemplate(`@${name}`, text);
   }
 
   async renderTemplate(templateName, variables) {
-    let template = null;
-
-    if (typeof templateName === 'string') {
-      template = await this.getTemplate(templateName);
-    } else if (typeof templateName === 'function') {
-      template = templateName;
-    }
-
-    return _renderTemplate(template, templateName, variables);
+    return await this.#eta.renderAsync(getTemplateName(templateName), variables);
   }
 
   renderTemplateSync(templateName, variables) {
-    let template = null;
-
-    if (typeof templateName === 'string') {
-      template = this.getTemplateSync(templateName);
-    } else if (typeof templateName === 'function') {
-      template = templateName;
-    }
-
-    return _renderTemplate(template, templateName, variables);
-  }
-
-  #getTemplate(name, templateString) {
-    if (!templateString) {
-      return null;
-    }
-
-    const template = lodashTemplate(templateString, this.#templateSettings);
-
-    this.#templateCache.set(name, template);
-
-    return template;
-  }
-
-  async #getTemplateStringRecursive(name) {
-    const templatePath = `${this.#templatesDir}/${name}`;
-
-    if (this.#templateStringCache.has(templatePath)) {
-      return this.#templateStringCache.get(templatePath);
-    }
-
-    const templateExists = await exists(templatePath);
-
-    if (!templateExists) {
-      return null;
-    }
-
-    const templateString = await readFile(templatePath, 'utf8');
-
-    const result = await this.#getTemplateStringRecursiveInternal(templateString);
-
-    this.#templateStringCache.set(templatePath, result);
-
-    return result;
-  }
-
-  async #getTemplateStringRecursiveInternal(templateString) {
-    const lines = templateString.split('\n');
-
-    for (let i = 0; i < lines.length; ++i) {
-      const line = lines[i];
-
-      const m = line.match(RX_INCLUDE);
-
-      if (m) {
-        const {after, before, include} = m.groups;
-
-        // eslint-disable-next-line no-await-in-loop
-        const part = await this.#getTemplateStringRecursive(include);
-
-        lines[i] = `${before}${part}${after}`;
-      }
-    }
-
-    return lines.join('\n');
-  }
-
-  #getTemplateStringRecursiveInternalSync(templateString) {
-    const lines = templateString.split('\n');
-
-    for (let i = 0; i < lines.length; ++i) {
-      const line = lines[i];
-
-      const m = line.match(RX_INCLUDE);
-
-      if (m) {
-        const {after, before, include} = m.groups;
-
-        const part = this.#getTemplateStringRecursiveSync(include);
-
-        lines[i] = `${before}${part}${after}`;
-      }
-    }
-
-    return lines.join('\n');
-  }
-
-  #getTemplateStringRecursiveSync(name) {
-    const templatePath = `${this.#templatesDir}/${name}`;
-
-    if (this.#templateStringCache.has(templatePath)) {
-      return this.#templateStringCache.get(templatePath);
-    }
-
-    const templateExists = fs.existsSync(templatePath);
-
-    if (!templateExists) {
-      return null;
-    }
-
-    const templateString = fs.readFileSync(templatePath, 'utf8');
-
-    const result = this.#getTemplateStringRecursiveInternalSync(templateString);
-
-    this.#templateStringCache.set(templatePath, result);
-
-    return result;
-  }
-
-  #preloadRecursiveSync(extension, prefix = '') {
-    const path = `${this.#templatesDir}${prefix ? `/${prefix}` : ''}`;
-
-    const entries = fs.readdirSync(path);
-
-    entries.filter(entryName => entryName.endsWith(extension) && fs.statSync(`${path}/${entryName}`).isFile())
-      .forEach(fileName => this.getTemplateSync(`${prefix ? `${prefix}/` : ''}${fileName}`));
-
-    entries.filter(entryName => fs.statSync(`${path}/${entryName}`).isDirectory())
-      .forEach(dirName => this.#preloadRecursiveSync(extension, `${prefix ? `${prefix}/` : ''}${dirName}`));
+    return this.#eta.render(getTemplateName(templateName), variables);
   }
 }