@technomoron/mail-magic 1.0.34 → 1.0.35

package/CHANGES

@@ -1,3 +1,14 @@
+Version 1.0.35 (2026-02-17)
+
+- Enforce deterministic locale resolution for transactional template sends:
+  requested locale first, then root fallback (`locale=''`) only.
+- Enforce the same deterministic locale resolution for template-scoped asset uploads
+  (`POST /api/v1/assets`) for both `tx` and `form` template types.
+- Remove non-deterministic fallback to arbitrary locale records when requested/root
+  locales are missing.
+- Add regression tests covering deterministic locale fallback and missing-locale
+  behavior for both transactional sends and template asset upload resolution.
+
 Version 1.0.34 (2026-02-10)
 
 - Ensure inline form template assets (CID) are actually attached when delivering public form submissions.

package/dist/api/assets.js

@@ -22,11 +22,9 @@ export class AssetAPI extends ApiModule {
         }
         const templateType = templateTypeRaw.toLowerCase();
         const domainId = apireq.domain.domain_id;
-        const deflocale = this.server.storage.deflocale || '';
         if (templateType === 'tx') {
             const template = (await api_txmail.findOne({ where: { name: templateName, domain_id: domainId, locale } })) ||
-                (await api_txmail.findOne({ where: { name: templateName, domain_id: domainId, locale: deflocale } })) ||
-                (await api_txmail.findOne({ where: { name: templateName, domain_id: domainId } }));
+                (await api_txmail.findOne({ where: { name: templateName, domain_id: domainId, locale: '' } }));
             if (!template) {
                 throw new ApiError({
                     code: 404,
@@ -43,8 +41,7 @@ export class AssetAPI extends ApiModule {
         }
         if (templateType === 'form') {
             const form = (await api_form.findOne({ where: { idname: templateName, domain_id: domainId, locale } })) ||
-                (await api_form.findOne({ where: { idname: templateName, domain_id: domainId, locale: deflocale } })) ||
-                (await api_form.findOne({ where: { idname: templateName, domain_id: domainId } }));
+                (await api_form.findOne({ where: { idname: templateName, domain_id: domainId, locale: '' } }));
             if (!form) {
                 throw new ApiError({
                     code: 404,

package/dist/api/mailer.js

@@ -100,13 +100,11 @@ export class MailerAPI extends ApiModule {
             throw new ApiError({ code: 400, message: 'Invalid email address(es): ' + invalid.join(',') });
         }
         let template = null;
-        const deflocale = this.server.storage.deflocale || '';
         const domain_id = apireq.domain.domain_id;
         try {
             template =
                 (await api_txmail.findOne({ where: { name, domain_id, locale } })) ||
-                    (await api_txmail.findOne({ where: { name, domain_id, locale: deflocale } })) ||
-                    (await api_txmail.findOne({ where: { name, domain_id } }));
+                    (await api_txmail.findOne({ where: { name, domain_id, locale: '' } }));
         }
         catch (error) {
             throw new ApiError({

package/dist/bin/mail-magic.js

@@ -7,13 +7,15 @@ import { startMailMagicServer } from '../index.js';
 const args = process.argv.slice(2);
 function usage(exitCode = 0) {
     const out = exitCode === 0 ? process.stdout : process.stderr;
-    out.write(`Usage: mail-magic [--env PATH]\n\n` +
+    out.write(`Usage: mail-magic [--env PATH] [--config DIR]\n\n` +
         `Options:\n` +
         `  -e, --env PATH   Path to .env (defaults to ./.env)\n` +
+        `  -c, --config DIR Config directory (overrides CONFIG_PATH)\n` +
         `  -h, --help       Show this help\n`);
     process.exit(exitCode);
 }
 let envPath;
+let configPath;
 for (let i = 0; i < args.length; i += 1) {
     const arg = args[i];
     if (arg === '-h' || arg === '--help') {
@@ -29,10 +31,24 @@ for (let i = 0; i < args.length; i += 1) {
         i += 1;
         continue;
     }
+    if (arg === '-c' || arg === '--config') {
+        const next = args[i + 1];
+        if (!next) {
+            console.error('Error: --config requires a directory');
+            usage(1);
+        }
+        configPath = next;
+        i += 1;
+        continue;
+    }
     if (arg.startsWith('--env=')) {
         envPath = arg.slice('--env='.length);
         continue;
     }
+    if (arg.startsWith('--config=')) {
+        configPath = arg.slice('--config='.length);
+        continue;
+    }
     console.error(`Error: unknown option ${arg}`);
     usage(1);
 }
@@ -41,6 +57,19 @@ if (!fs.existsSync(resolvedEnvPath)) {
     console.error(`Error: env file not found at ${resolvedEnvPath}`);
     process.exit(1);
 }
+let resolvedConfigPath;
+if (configPath) {
+    // Resolve the config dir relative to the .env directory (we chdir there next).
+    resolvedConfigPath = path.resolve(path.dirname(resolvedEnvPath), configPath);
+    if (!fs.existsSync(resolvedConfigPath)) {
+        console.error(`Error: config dir not found at ${resolvedConfigPath}`);
+        process.exit(1);
+    }
+    if (!fs.statSync(resolvedConfigPath).isDirectory()) {
+        console.error(`Error: config path is not a directory: ${resolvedConfigPath}`);
+        process.exit(1);
+    }
+}
 process.chdir(path.dirname(resolvedEnvPath));
 const result = dotenv.config({ path: resolvedEnvPath });
 if (result.error) {
@@ -50,7 +79,8 @@ if (result.error) {
 }
 async function main() {
     try {
-        const { store, vars } = await startMailMagicServer();
+        const envOverrides = resolvedConfigPath ? { CONFIG_PATH: resolvedConfigPath } : {};
+        const { store, vars } = await startMailMagicServer({}, envOverrides);
         console.log(`Using config path: ${store.configpath}`);
         console.log(`mail-magic server listening on ${vars.API_HOST}:${vars.API_PORT}`);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@technomoron/mail-magic",
-	"version": "1.0.34",
+	"version": "1.0.35",
 	"main": "dist/index.js",
 	"type": "module",
 	"bin": {

package/dist/api/form-replyto.js

@@ -1 +0,0 @@
-export * from '../util/form-replyto.js';

package/dist/api/form-submission.js

@@ -1 +0,0 @@
-export * from '../util/form-submission.js';