README.md

@@ -42,8 +42,3 @@ deno install \
   # OR
   ./cohamail <subcommand> -h
   ```
-
-## Configuration
-
-You can override default config and templates with your own in
-`/etc/cohabit/mailer/(config|templates)/`.

cli/_templates_loader.ts

@@ -1,8 +1,7 @@
-import { exists } from '@std/fs/exists'
+import { fromFileUrl } from '@std/path'
 import type { JSX } from 'preact'
 import { EnumType } from '@cliffy/command'
 import type { Template } from '../types.ts'
-import * as defaultTemplates from '../templates/mod.ts'
 
 export const templates: Map<
 	string,
@@ -12,38 +11,25 @@ export const templates: Map<
 	>
 > = new Map()
 
-//Load default templates
-for (const template of Object.values(defaultTemplates)) {
-	//@ts-expect-error types are checked at runtime later
-	templates.set(template.name, template)
-}
+const templatesDirUrl = import.meta.resolve('../templates')
+const templatesDir = fromFileUrl(templatesDirUrl)
 
-//Load local templates
-const basePath = '/etc/cohabit/mailer/templates'
-
-if (await exists(basePath)) {
-	for await (const template of Deno.readDir(basePath)) {
-		if (!template.isFile) continue
-		if (!template.name.endsWith('.tsx')) continue
-		if (template.name.startsWith('_')) continue
-
-		const mod = await import(`${basePath}/${template.name}`).catch(
-			checkFsErrors,
+//Load templates dynamicaly
+for await (
+	const template of Deno.readDir(templatesDir)
+) {
+	if (
+		template.isFile &&
+		template.name.endsWith('.tsx') &&
+		!template.name.startsWith('_')
+	) {
+		const modPath = new URL(
+			template.name,
+			`${import.meta.resolve('../templates')}/`,
 		)
+		const mod = await import(modPath.href)
 		templates.set(mod.default.name, mod.default)
 	}
 }
 
-function checkFsErrors(error: Error) {
-	if (error instanceof Deno.errors.PermissionDenied) {
-		throw new Error(
-			'unable to load config file due to read access permissions issues',
-			{
-				cause: error,
-			},
-		)
-	}
-	throw error
-}
-
 export const templateType = new EnumType([...templates.keys()])

config/loader.ts

@@ -1,49 +0,0 @@
-import type { JsonValue } from '@std/json'
-import defaultAccounts from './account.json' with { type: 'json' }
-import defaultDkim from './dkim.json' with { type: 'json' }
-
-function checkFsErrors(error: Error) {
-	if (error instanceof Deno.errors.NotFound) {
-		//use default config file
-		return
-	}
-	if (error instanceof Deno.errors.PermissionDenied) {
-		throw new Error(
-			'unable to load config file due to read access permissions issues',
-			{
-				cause: error,
-			},
-		)
-	}
-	throw error
-}
-
-type JsonRecord = Record<string, JsonValue>
-export type DkimRecord = {
-	domainName: string
-	keySelector: string
-	privateKey: string
-}
-export type AccountRecord = Record<string, {
-	name: string
-	address: string
-}>
-
-async function readJsonFile<
-	T extends JsonRecord,
->(path: string, defaultValue: T): Promise<T> {
-	const file = await Deno.readTextFile(path).catch(checkFsErrors)
-	const json = JSON.parse(file ?? '{}')
-	return { ...defaultValue, ...json }
-}
-
-const basePath = '/ect/cohabit/mailer/config'
-
-export const accounts = await readJsonFile<AccountRecord>(
-	`${basePath}/account.json`,
-	defaultAccounts,
-)
-export const dkim = await readJsonFile<DkimRecord>(
-	`${basePath}/dkim.json`,
-	defaultDkim,
-)

deno.json

@@ -1,6 +1,6 @@
 {
 	"name": "@cohabit/mailer",
-	"version": "0.5.2",
+	"version": "0.3.2",
 	"exports": {
 		".": "./mod.ts",
 		"./cli": "./cli.ts",
@@ -8,8 +8,8 @@
 		"./templates": "./templates/mod.ts"
 	},
 	"tasks": {
-		"compile": "deno compile --allow-read --allow-env --allow-net=0.0.0.0,jsr.io --allow-sys=osRelease,networkInterfaces --allow-run=/usr/sbin/sendmail,whoami --output=bin/mailer --target=x86_64-unknown-linux-gnu ./cli.ts",
-		"cli": "deno run --allow-read --allow-env --allow-net=0.0.0.0,jsr.io --allow-sys=osRelease,networkInterfaces --allow-run=/usr/sbin/sendmail,whoami ./cli.ts"
+		"compile": "deno compile --allow-read --allow-env --allow-net=0.0.0.0 --allow-sys=osRelease,networkInterfaces --allow-run=/usr/sbin/sendmail,whoami --output=bin/mailer --target=x86_64-unknown-linux-gnu ./cli.ts",
+		"cli": "deno run --allow-read --allow-env --allow-net=0.0.0.0 --allow-sys=osRelease,networkInterfaces --allow-run=/usr/sbin/sendmail,whoami ./cli.ts"
 	},
 	"fmt": {
 		"singleQuote": true,
@@ -19,8 +19,7 @@
 	"imports": {
 		"@cliffy/command": "jsr:@cliffy/command@^1.0.0-rc.5",
 		"@cliffy/prompt": "jsr:@cliffy/prompt@^1.0.0-rc.5",
-		"@std/fs": "jsr:@std/fs@^1.0.13",
-		"@std/json": "jsr:@std/json@^1.0.1",
+		"@std/path": "jsr:@std/path@^0.221.0",
 		"@types/nodemailer": "npm:@types/nodemailer@^6.4.15",
 		"jsx-email": "npm:jsx-email@^1.10.12",
 		"nodemailer": "npm:nodemailer@^6.9.13",
@@ -31,6 +30,5 @@
 	"compilerOptions": {
 		"jsx": "react-jsx",
 		"jsxImportSource": "preact"
-	},
-	"license": "MIT"
+	}
 }

src/contact.ts

@@ -1,4 +1,5 @@
-import { accounts, dkim } from '../config/loader.ts'
+import accounts from '../config/account.json' with { type: 'json' }
+import dkim from '../config/dkim.json' with { type: 'json' }
 
 export type AddressString = `${string}@${string}.${string}`
 
@@ -21,7 +22,7 @@ export class Contact {
 			throw new Error('unknown short name contact')
 		}
 
-		const { name, address } = accounts[shortName]
+		const { name, address } = accounts[shortName as keyof typeof accounts]
 
 		if (typeof name !== 'string') {
 			throw new SyntaxError(

src/transporter.ts

@@ -1,6 +1,6 @@
-// @deno-types="npm:@types/nodemailer@^6.4.15"
+// @deno-types="@types/nodemailer"
 import nodemailer from 'nodemailer'
-import { dkim } from '../config/loader.ts'
+import dkim from '../config/dkim.json' with { type: 'json' }
 
 export async function transporter() {
 	const dkimPath = dkim.privateKey