@mepkg/mtwig 1.0.0 → 2.1.0

package/package.json

@@ -14,7 +14,7 @@
     "test:watch": "node --test --watch 'tests/**/*.test.js'"
   },
   "dependencies": {
-    "twing": "^7.3.1"
+    "twig": "^3.0.0"
   },
-  "version": "1.0.0"
+  "version": "2.1.0"
 }

package/src/filters/_filters.js

@@ -1,5 +1,3 @@
-import truncate from "./truncate.js";
+import int from "./int.js";
 
-export const filters = [
-    truncate
-];
+export const filters = [int];

package/src/filters/int.js

@@ -0,0 +1,6 @@
+export default (twig) => {
+    twig.extendFilter("int", (value) => {
+        const parsed = parseInt(value, 10);
+        return Number.isNaN(parsed) ? 0 : parsed;
+    });
+}

package/src/index.js

@@ -1,47 +1,26 @@
-import fs from "fs";
-import path from "path";
-import {createEnvironment, createFilesystemLoader} from "twing";
+import Twig from "twig";
 import {filters} from "./filters/_filters.js";
 
-
-const cache = new Map();
-const cacheHandler = {
-    write: (key, content) => {
-        cache.set(key, {content, timestamp: Date.now()});
-        return Promise.resolve();
-    },
-    load: (key) => {
-        return Promise.resolve(cache.get(key)?.content ?? null);
-    },
-    getTimestamp: (key) => {
-        return Promise.resolve(cache.get(key)?.timestamp ?? 0);
-    }
-};
+for (const filter of filters) {
+    filter(Twig);
+}
 
 const express = (app, viewsPath) => {
     app.set('views', viewsPath);
-    const loader = createFilesystemLoader(fs);
-    loader.addPath(viewsPath);
-    const isProduction = process.env.NODE_ENV === 'production';
-    const twing = createEnvironment(loader, isProduction ? {cache: cacheHandler} : {});
-
-    for (const filter of filters) {
-        filter(twing);
-    }
-
+    Twig.cache(process.env.NODE_ENV === 'production');
     app.engine('twig', (filePath, options, callback) => {
-        const relativePath = path.relative(viewsPath, filePath);
-        twing.render(relativePath, options)
-            .then((output) => {
-                return callback(null, output);
-            })
-            .catch((err) => {
-                return callback(err);
-            });
+        Twig.__express(filePath, options, (err, html) => {
+            if (err && !(err instanceof Error)) {
+                const error = new Error(err.message ?? String(err));
+                error.name = err.name ?? 'Error';
+                return callback(error);
+            }
+            return callback(err, html);
+        });
     });
     app.set('view engine', 'twig');
 }
 
 export default {
     express
-}
+}

package/src/filters/truncate.js

@@ -1,14 +0,0 @@
-import {createFilter} from "twing";
-
-export default (twing) => {
-    twing.addFilter(createFilter('truncate', (_context, value, length = 35, suffix = '...') => {
-        const str = String(value ?? '');
-        if (str.length <= length) {
-            return Promise.resolve(str);
-        }
-        return Promise.resolve(str.substring(0, length) + suffix);
-    }, [
-        {name: 'length', defaultValue: 30},
-        {name: 'suffix', defaultValue: '...'}
-    ]));
-};