@technomoron/mail-magic-client 1.0.28 → 1.0.30

package/CHANGES

@@ -1,3 +1,10 @@
+Version 1.0.30 (2026-02-17)
+
+- Refactor template preprocess compilation to use per-invocation configuration
+  (remove module-level mutable config state).
+- Add regression coverage to ensure preprocess options (such as
+  `inline_includes`) do not leak between compile calls.
+
 Version 1.0.29 (2026-02-11)
 
 - Expand client coverage for mail-magic-owned endpoints:

package/dist/cjs/mail-magic-client.js

@@ -30,13 +30,11 @@ class templateClient {
             headers['Content-Type'] = 'application/json';
             options.body = JSON.stringify(body);
         }
-        //        console.log(JSON.stringify({ options, url }));
         const response = await fetch(url, options);
         const j = await response.json();
         if (response.ok) {
             return j;
         }
-        // console.log(JSON.stringify(j, undefined, 2));
         if (j && j.message) {
             throw new Error(`FETCH FAILED: ${response.status} ${j.message}`);
         }
@@ -75,10 +73,16 @@ class templateClient {
     }
     validateTemplate(template) {
         try {
-            const env = new nunjucks_1.default.Environment(new nunjucks_1.default.FileSystemLoader(['./templates']));
-            env.renderString(template, {});
+            const env = new nunjucks_1.default.Environment(null, { autoescape: true });
+            const compiled = nunjucks_1.default.compile(template, env);
+            compiled.render({});
         }
         catch (error) {
+            const message = error instanceof Error ? error.message : String(error);
+            // Syntax validation should not require local template loaders.
+            if (/template not found|no loader|unable to find template/i.test(message)) {
+                return;
+            }
             if (error instanceof Error) {
                 throw new Error(`Template validation failed: ${error.message}`);
             }
@@ -144,13 +148,7 @@ class templateClient {
         throw new Error(`FETCH FAILED: ${response.status} ${response.statusText}`);
     }
     async storeTemplate(td) {
-        if (!td.template) {
-            throw new Error('No template data provided');
-        }
-        this.validateTemplate(td.template);
-        if (td.sender) {
-            this.validateSender(td.sender);
-        }
+        // Backward-compatible alias for transactional template storage.
         return this.storeTxTemplate(td);
     }
     async sendTemplate(std) {
@@ -177,7 +175,6 @@ class templateClient {
         if (invalid.length > 0) {
             throw new Error('Invalid email address(es): ' + invalid.join(','));
         }
-        // this.validateTemplate(template);
         const body = {
             name: std.name,
             rcpt: std.rcpt,
@@ -187,7 +184,6 @@ class templateClient {
             replyTo: std.replyTo,
             headers: std.headers
         };
-        // console.log(JSON.stringify(body, undefined, 2));
         if (std.attachments && std.attachments.length > 0) {
             if (std.headers) {
                 throw new Error('Headers are not supported with attachment uploads');

package/dist/cli-version.js

@@ -0,0 +1,33 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolvePackageVersion = resolvePackageVersion;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+function resolvePackageVersion(options = {}) {
+    const argv1 = options.argv1 ?? process.argv[1] ?? '';
+    const cwd = options.cwd ?? process.cwd();
+    const candidates = [
+        argv1 ? path_1.default.resolve(path_1.default.dirname(argv1), '../package.json') : '',
+        path_1.default.resolve(cwd, 'package.json'),
+        path_1.default.resolve(cwd, 'packages/mail-magic-client/package.json')
+    ].filter(Boolean);
+    for (const candidate of candidates) {
+        if (!fs_1.default.existsSync(candidate)) {
+            continue;
+        }
+        try {
+            const raw = fs_1.default.readFileSync(candidate, 'utf8');
+            const data = JSON.parse(raw);
+            if (data.name === '@technomoron/mail-magic-client') {
+                return typeof data.version === 'string' && data.version ? data.version : 'unknown';
+            }
+        }
+        catch {
+            // Try next candidate.
+        }
+    }
+    return 'unknown';
+}

package/dist/cli.js

@@ -5,27 +5,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
 const readline_1 = __importDefault(require("readline"));
 const commander_1 = require("commander");
 const cli_env_1 = require("./cli-env");
 const cli_helpers_1 = require("./cli-helpers");
+const cli_version_1 = require("./cli-version");
 const mail_magic_client_1 = __importDefault(require("./mail-magic-client"));
 const preprocess_1 = require("./preprocess");
 const program = new commander_1.Command();
 const envDefaults = (0, cli_env_1.loadCliEnv)();
 const defaultToken = (0, cli_env_1.resolveToken)(envDefaults);
 const apiDefault = envDefaults.api || 'http://localhost:3000';
-function resolvePackageVersion() {
-    try {
-        const raw = fs_1.default.readFileSync(path_1.default.join(__dirname, '../package.json'), 'utf8');
-        const data = JSON.parse(raw);
-        return typeof data.version === 'string' && data.version ? data.version : 'unknown';
-    }
-    catch {
-        return 'unknown';
-    }
-}
 program.option('-a, --api <api>', 'Base API endpoint', apiDefault);
 if (defaultToken) {
     program.option('-t, --token <token>', 'Authentication token in the format "username:token"', defaultToken);
@@ -155,7 +145,7 @@ program
     .command('version')
     .description('Show current client version')
     .action(async () => {
-    console.log(resolvePackageVersion());
+    console.log((0, cli_version_1.resolvePackageVersion)());
 });
 program
     .command('compile')

package/dist/esm/mail-magic-client.js

@@ -25,13 +25,11 @@ class templateClient {
             headers['Content-Type'] = 'application/json';
             options.body = JSON.stringify(body);
         }
-        //        console.log(JSON.stringify({ options, url }));
         const response = await fetch(url, options);
         const j = await response.json();
         if (response.ok) {
             return j;
         }
-        // console.log(JSON.stringify(j, undefined, 2));
         if (j && j.message) {
             throw new Error(`FETCH FAILED: ${response.status} ${j.message}`);
         }
@@ -70,10 +68,16 @@ class templateClient {
     }
     validateTemplate(template) {
         try {
-            const env = new nunjucks.Environment(new nunjucks.FileSystemLoader(['./templates']));
-            env.renderString(template, {});
+            const env = new nunjucks.Environment(null, { autoescape: true });
+            const compiled = nunjucks.compile(template, env);
+            compiled.render({});
         }
         catch (error) {
+            const message = error instanceof Error ? error.message : String(error);
+            // Syntax validation should not require local template loaders.
+            if (/template not found|no loader|unable to find template/i.test(message)) {
+                return;
+            }
             if (error instanceof Error) {
                 throw new Error(`Template validation failed: ${error.message}`);
             }
@@ -139,13 +143,7 @@ class templateClient {
         throw new Error(`FETCH FAILED: ${response.status} ${response.statusText}`);
     }
     async storeTemplate(td) {
-        if (!td.template) {
-            throw new Error('No template data provided');
-        }
-        this.validateTemplate(td.template);
-        if (td.sender) {
-            this.validateSender(td.sender);
-        }
+        // Backward-compatible alias for transactional template storage.
         return this.storeTxTemplate(td);
     }
     async sendTemplate(std) {
@@ -172,7 +170,6 @@ class templateClient {
         if (invalid.length > 0) {
             throw new Error('Invalid email address(es): ' + invalid.join(','));
         }
-        // this.validateTemplate(template);
         const body = {
             name: std.name,
             rcpt: std.rcpt,
@@ -182,7 +179,6 @@ class templateClient {
             replyTo: std.replyTo,
             headers: std.headers
         };
-        // console.log(JSON.stringify(body, undefined, 2));
         if (std.attachments && std.attachments.length > 0) {
             if (std.headers) {
                 throw new Error('Headers are not supported with attachment uploads');

package/dist/mail-magic-client.js

@@ -30,13 +30,11 @@ class templateClient {
             headers['Content-Type'] = 'application/json';
             options.body = JSON.stringify(body);
         }
-        //        console.log(JSON.stringify({ options, url }));
         const response = await fetch(url, options);
         const j = await response.json();
         if (response.ok) {
             return j;
         }
-        // console.log(JSON.stringify(j, undefined, 2));
         if (j && j.message) {
             throw new Error(`FETCH FAILED: ${response.status} ${j.message}`);
         }
@@ -75,10 +73,16 @@ class templateClient {
     }
     validateTemplate(template) {
         try {
-            const env = new nunjucks_1.default.Environment(new nunjucks_1.default.FileSystemLoader(['./templates']));
-            env.renderString(template, {});
+            const env = new nunjucks_1.default.Environment(null, { autoescape: true });
+            const compiled = nunjucks_1.default.compile(template, env);
+            compiled.render({});
         }
         catch (error) {
+            const message = error instanceof Error ? error.message : String(error);
+            // Syntax validation should not require local template loaders.
+            if (/template not found|no loader|unable to find template/i.test(message)) {
+                return;
+            }
             if (error instanceof Error) {
                 throw new Error(`Template validation failed: ${error.message}`);
             }
@@ -144,13 +148,7 @@ class templateClient {
         throw new Error(`FETCH FAILED: ${response.status} ${response.statusText}`);
     }
     async storeTemplate(td) {
-        if (!td.template) {
-            throw new Error('No template data provided');
-        }
-        this.validateTemplate(td.template);
-        if (td.sender) {
-            this.validateSender(td.sender);
-        }
+        // Backward-compatible alias for transactional template storage.
         return this.storeTxTemplate(td);
     }
     async sendTemplate(std) {
@@ -177,7 +175,6 @@ class templateClient {
         if (invalid.length > 0) {
             throw new Error('Invalid email address(es): ' + invalid.join(','));
         }
-        // this.validateTemplate(template);
         const body = {
             name: std.name,
             rcpt: std.rcpt,
@@ -187,7 +184,6 @@ class templateClient {
             replyTo: std.replyTo,
             headers: std.headers
         };
-        // console.log(JSON.stringify(body, undefined, 2));
         if (std.attachments && std.attachments.length > 0) {
             if (std.headers) {
                 throw new Error('Headers are not supported with attachment uploads');

package/dist/preprocess.js

@@ -14,14 +14,16 @@ const node_path_1 = __importDefault(require("node:path"));
 const cheerio_1 = require("cheerio");
 const juice_1 = __importDefault(require("juice"));
 const nunjucks_1 = __importDefault(require("nunjucks"));
-const cfg = {
-    env: null,
-    src_dir: 'templates',
-    dist_dir: 'templates-dist',
-    css_path: node_path_1.default.join(process.cwd(), 'templates', 'foundation-emails.css'),
-    css_content: null,
-    inline_includes: true
-};
+function createCompileCfg(options) {
+    return {
+        env: null,
+        src_dir: options.src_dir ?? 'templates',
+        dist_dir: options.dist_dir ?? 'templates-dist',
+        css_path: options.css_path ?? node_path_1.default.join(process.cwd(), 'templates', 'foundation-emails.css'),
+        css_content: null,
+        inline_includes: options.inline_includes ?? true
+    };
+}
 function resolvePathRoot(dir) {
     return node_path_1.default.isAbsolute(dir) ? dir : node_path_1.default.join(process.cwd(), dir);
 }
@@ -58,8 +60,9 @@ function inlineIncludes(content, baseDir, srcRoot, normalizedSrcRoot, stack) {
     });
 }
 class PreprocessExtension {
-    constructor() {
+    constructor(cfg) {
         this.tags = ['process_layout'];
+        this.cfg = cfg;
     }
     parse(parser, nodes) {
         const token = parser.nextToken();
@@ -68,13 +71,13 @@ class PreprocessExtension {
         return new nodes.CallExtension(this, 'run', args);
     }
     run(_context, tplname) {
-        const template = cfg.env.getTemplate(tplname);
+        const template = this.cfg.env.getTemplate(tplname);
         const src = template.tmplStr;
         const extmatch = src.match(/\{%\s*extends\s+['"]([^'"]+)['"]\s*%\}/);
         if (!extmatch)
             return src;
         const layoutName = extmatch[1];
-        const layoutTemplate = cfg.env.getTemplate(layoutName);
+        const layoutTemplate = this.cfg.env.getTemplate(layoutName);
         const layoutSrc = layoutTemplate.tmplStr;
         const blocks = {};
         const blockexp = /\{%\s*block\s+([a-zA-Z0-9_]+)\s*%\}([\s\S]*?)\{%\s*endblock\s*%\}/g;
@@ -97,7 +100,7 @@ class PreprocessExtension {
         return merged;
     }
 }
-function process_template(tplname, writeOutput = true) {
+function process_template(cfg, tplname, writeOutput = true) {
     console.log(`Processing template: ${tplname}`);
     try {
         const srcRoot = resolvePathRoot(cfg.src_dir);
@@ -224,7 +227,7 @@ function get_all_files(dir, filelist = []) {
     });
     return filelist;
 }
-function find_templates() {
+function find_templates(cfg) {
     const srcRoot = resolvePathRoot(cfg.src_dir);
     const all = get_all_files(srcRoot);
     return all
@@ -242,16 +245,16 @@ function find_templates() {
         return name.substring(0, name.length - 4);
     });
 }
-async function process_all_templates() {
+async function process_all_templates(cfg) {
     const distRoot = resolvePathRoot(cfg.dist_dir);
     if (!node_fs_1.default.existsSync(distRoot)) {
         node_fs_1.default.mkdirSync(distRoot, { recursive: true });
     }
-    const templates = find_templates();
+    const templates = find_templates(cfg);
     console.log(`Found ${templates.length} templates to process: ${templates.join(', ')}`);
     for (const template of templates) {
         try {
-            process_template(template);
+            process_template(cfg, template);
         }
         catch (error) {
             console.error(`Failed to process ${template}:`, error);
@@ -259,7 +262,7 @@ async function process_all_templates() {
     }
     console.log('All templates processed!');
 }
-function init_env() {
+function init_env(cfg) {
     const loader = new nunjucks_1.default.FileSystemLoader(resolvePathRoot(cfg.src_dir));
     cfg.env = new nunjucks_1.default.Environment(loader, { autoescape: false });
     if (!cfg.env)
@@ -273,7 +276,7 @@ function init_env() {
         cfg.css_content = null;
     }
     // Extension
-    cfg.env.addExtension('PreprocessExtension', new PreprocessExtension());
+    cfg.env.addExtension('PreprocessExtension', new PreprocessExtension(cfg));
     // Filters
     cfg.env.addFilter('protect_variables', function (content) {
         return content
@@ -289,29 +292,17 @@ function init_env() {
     });
 }
 async function do_the_template_thing(options = {}) {
-    if (options.src_dir)
-        cfg.src_dir = options.src_dir;
-    if (options.dist_dir)
-        cfg.dist_dir = options.dist_dir;
-    if (options.css_path)
-        cfg.css_path = options.css_path;
-    if (options.inline_includes !== undefined)
-        cfg.inline_includes = options.inline_includes;
-    init_env();
+    const cfg = createCompileCfg(options);
+    init_env(cfg);
     if (options.tplname) {
-        process_template(options.tplname);
+        process_template(cfg, options.tplname);
     }
     else {
-        await process_all_templates();
+        await process_all_templates(cfg);
     }
 }
 async function compileTemplate(options) {
-    if (options.src_dir)
-        cfg.src_dir = options.src_dir;
-    if (options.css_path)
-        cfg.css_path = options.css_path;
-    if (options.inline_includes !== undefined)
-        cfg.inline_includes = options.inline_includes;
-    init_env();
-    return process_template(options.tplname, false);
+    const cfg = createCompileCfg(options);
+    init_env(cfg);
+    return process_template(cfg, options.tplname, false);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@technomoron/mail-magic-client",
-	"version": "1.0.28",
+	"version": "1.0.30",
 	"description": "Client library for mail-magic",
 	"main": "dist/cjs/mail-magic-client.js",
 	"types": "dist/cjs/mail-magic-client.d.ts",