feat(vscode): add JSONC formatter configuration

- Adds inline comments to JSON files to improve readability
- Renames `.json` files to `.jsonc` to support comments
- Improves organization of translation entries

.gitea/default_merge_message/MERGE_TEMPLATE.md

@@ -0,0 +1,5 @@
+chore(pr): ${PullRequestTitle} ${PullRequestReference}
+
+${PullRequestDescription}
+
+Merged from ${HeadBranch} into ${BaseBranch}

.vscode/settings.json

@@ -17,5 +17,8 @@
     "[json]": {
         "editor.defaultFormatter": "denoland.vscode-deno"
     },
+    "[jsonc]": {
+        "editor.defaultFormatter": "denoland.vscode-deno"
+    },
     "editor.formatOnSave": true
 }

CHANGELOG.md

@@ -2,6 +2,19 @@
 
 All notable changes to this project will be documented in this file.
 
+## [unreleased]
+
+### 🧪 Testing
+
+- *(fs)* Update test descriptions and comments to English - ([c4f4614](https://git.0xmax42.io/maxp/systemd-timer/commit/c4f4614a2daee68f9b33b9676106214c65a1a427))
+- *(fs)* Add rollback tests for writeUnitFiles errors - ([6039d23](https://git.0xmax42.io/maxp/systemd-timer/commit/6039d236eb7de449ce22b1d9ea718389a3e2261d))
+
+## [0.4.1](https://git.0xmax42.io/maxp/systemd-timer/compare/v0.4.0..v0.4.1) - 2025-05-28
+
+### 🐛 Bug Fixes
+
+- *(tasks)* Add read permissions to build scripts - ([a22c156](https://git.0xmax42.io/maxp/systemd-timer/commit/a22c156dd3d2cf4a24f0eed699f7dfabfae3837a))
+
 ## [0.4.0](https://git.0xmax42.io/maxp/systemd-timer/compare/v0.3.1..v0.4.0) - 2025-05-28
 
 ### 🚀 Features

VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

deno.jsonc

@@ -5,8 +5,8 @@
         "fmt": "deno fmt --check",
         "lint": "deno lint",
         "ci": "deno task fmt && deno task lint && deno task test", // For local CI checks
-        "build:amd64": "deno compile --target x86_64-unknown-linux-gnu --include VERSION --include src/i18n/de.json --include src/i18n/en.json --allow-env --allow-write --output dist/systemd-timer-linux-amd64 src/mod.ts",
-        "build:arm64": "deno compile --target aarch64-unknown-linux-gnu --include VERSION --include src/i18n/de.json --include src/i18n/en.json --allow-env --allow-write --output dist/systemd-timer-linux-arm64 src/mod.ts"
+        "build:amd64": "deno compile --target x86_64-unknown-linux-gnu --include VERSION --include src/i18n/de.json --include src/i18n/en.json --allow-env --allow-write --allow-read --output dist/systemd-timer-linux-amd64 src/mod.ts",
+        "build:arm64": "deno compile --target aarch64-unknown-linux-gnu --include VERSION --include src/i18n/de.json --include src/i18n/en.json --allow-env --allow-write --allow-read --output dist/systemd-timer-linux-arm64 src/mod.ts"
     },
     "compilerOptions": {},
     "fmt": {
@@ -23,6 +23,7 @@
     },
     "exclude": [],
     "imports": {
-        "@cliffy/command": "jsr:@cliffy/command@1.0.0-rc.7"
+        "@cliffy/command": "jsr:@cliffy/command@1.0.0-rc.7",
+        "@std/jsonc": "jsr:@std/jsonc@^1.0.2"
     }
 }

deno.lock

@@ -6,6 +6,8 @@
     "jsr:@cliffy/internal@1.0.0-rc.7": "1.0.0-rc.7",
     "jsr:@cliffy/table@1.0.0-rc.7": "1.0.0-rc.7",
     "jsr:@std/fmt@~1.0.2": "1.0.7",
+    "jsr:@std/json@^1.0.2": "1.0.2",
+    "jsr:@std/jsonc@^1.0.2": "1.0.2",
     "jsr:@std/text@~1.0.7": "1.0.13"
   },
   "jsr": {
@@ -37,6 +39,15 @@
     "@std/fmt@1.0.7": {
       "integrity": "2a727c043d8df62cd0b819b3fb709b64dd622e42c3b1bb817ea7e6cc606360fb"
     },
+    "@std/json@1.0.2": {
+      "integrity": "d9e5497801c15fb679f55a2c01c7794ad7a5dfda4dd1bebab5e409cb5e0d34d4"
+    },
+    "@std/jsonc@1.0.2": {
+      "integrity": "909605dae3af22bd75b1cbda8d64a32cf1fd2cf6efa3f9e224aba6d22c0f44c7",
+      "dependencies": [
+        "jsr:@std/json"
+      ]
+    },
     "@std/text@1.0.13": {
       "integrity": "2191c90e6e667b0c3b7dea1cd082137580a93b3c136bad597c0212d5fe006eb1"
     }
@@ -168,11 +179,13 @@
     "https://deno.land/std@0.224.0/path/windows/relative.ts": "3e1abc7977ee6cc0db2730d1f9cb38be87b0ce4806759d271a70e4997fc638d7",
     "https://deno.land/std@0.224.0/path/windows/resolve.ts": "8dae1dadfed9d46ff46cc337c9525c0c7d959fb400a6308f34595c45bdca1972",
     "https://deno.land/std@0.224.0/path/windows/to_file_url.ts": "40e560ee4854fe5a3d4d12976cef2f4e8914125c81b11f1108e127934ced502e",
-    "https://deno.land/std@0.224.0/path/windows/to_namespaced_path.ts": "4ffa4fb6fae321448d5fe810b3ca741d84df4d7897e61ee29be961a6aac89a4c"
+    "https://deno.land/std@0.224.0/path/windows/to_namespaced_path.ts": "4ffa4fb6fae321448d5fe810b3ca741d84df4d7897e61ee29be961a6aac89a4c",
+    "https://deno.land/std@0.224.0/testing/mock.ts": "a963181c2860b6ba3eb60e08b62c164d33cf5da7cd445893499b2efda20074db"
   },
   "workspace": {
     "dependencies": [
-      "jsr:@cliffy/command@1.0.0-rc.7"
+      "jsr:@cliffy/command@1.0.0-rc.7",
+      "jsr:@std/jsonc@^1.0.2"
     ]
   }
 }

src/i18n/de.jsonc

@@ -1,6 +1,8 @@
 {
+    // General
     "cli_description": "CLI-Tool zum Erzeugen von systemd .timer und .service Units",
     "cli_create_description": "Erzeugt eine systemd .service und .timer Unit",
+    // Options
     "option_name": "Name der Unit-Dateien (optional, wird sonst aus dem Exec generiert)",
     "option_exec": "Kommando, das durch systemd ausgeführt werden soll",
     "option_calendar": "OnCalendar-Ausdruck für den Timer",
@@ -14,9 +16,11 @@
     "option_environment": "Environment-Variablen im Format KEY=VALUE",
     "option_logfile": "Dateipfad für Log-Ausgabe (stdout/stderr)",
     "option_dry_run": "Gibt die Unit-Dateien nur aus, ohne sie zu schreiben",
+    // Messages
     "unit_written_service": "Service Unit geschrieben in: {path}",
     "unit_written_timer": "Timer Unit geschrieben in: {path}",
     "hint_header": "\nℹ️  Hinweis:",
+    // Error messages
     "error_write_units": "Fehler beim Schreiben der Units:",
     "rollback_failed": "Rollback fehlgeschlagen:"
 }

src/i18n/en.jsonc

@@ -1,6 +1,8 @@
 {
+    // General
     "cli_description": "CLI tool for generating systemd .timer and .service units",
     "cli_create_description": "Generates a systemd .service and .timer unit",
+    // Options
     "option_name": "Name of the unit files (optional, otherwise derived from the exec command)",
     "option_exec": "Command to be executed by systemd",
     "option_calendar": "OnCalendar expression for the timer",
@@ -14,9 +16,11 @@
     "option_environment": "Environment variables in the format KEY=VALUE",
     "option_logfile": "File path for log output (stdout/stderr)",
     "option_dry_run": "Only outputs the unit files without writing them",
+    // Messages
     "unit_written_service": "Service unit written to: {path}",
     "unit_written_timer": "Timer unit written to: {path}",
     "hint_header": "\nℹ️  Note:",
+    // Error messages
     "error_write_units": "Error while writing unit files:",
     "rollback_failed": "Rollback failed:"
 }

src/i18n/i18n.ts

@@ -1,3 +1,5 @@
+import { parse as parseJsonc } from '@std/jsonc';
+
 /**
  * Initializes the i18n module by loading
  * the appropriate locale file based on the system language.
@@ -15,29 +17,35 @@ let translations: Record<string, string> = {};
 /**
  * Loads the translation file for the specified locale.
  *
- * Expects a JSON file in the same directory named like `de.json` or `en.json`.
+ * Accepts both `.jsonc` (JSON with comments) and plain `.json`.
+ * When both exist, `.jsonc` takes precedence.
  * Falls back to English ('en') if the specified file does not exist.
  *
  * @param locale - The language code (e.g., 'de', 'en') to load
  * @returns Promise that resolves once the translations have been loaded
  */
 export async function loadLocale(locale: string): Promise<void> {
-    try {
-        const localeUrl = new URL(`./${locale}.json`, import.meta.url);
-        const file = await Deno.readTextFile(localeUrl);
-        translations = JSON.parse(file);
-    } catch (err) {
-        if (err instanceof Deno.errors.NotFound) {
-            console.warn(
-                `Locale '${locale}' not found – falling back to 'en'.`,
-            );
-            if (locale !== 'en') {
-                await loadLocale('en');
+    const extensions = ['jsonc', 'json'];
+    for (const ext of extensions) {
+        try {
+            const localeUrl = new URL(`./${locale}.${ext}`, import.meta.url);
+            const raw = await Deno.readTextFile(localeUrl);
+            // parseJsonc tolerates both pure JSON and JSONC, so we can use it for either.
+            translations = parseJsonc(raw) as Record<string, string>;
+            return;
+        } catch (err) {
+            if (err instanceof Deno.errors.NotFound) {
+                // Continue with next extension.
+                continue;
             }
-        } else {
-            console.error('Error loading translation file:', err);
+            console.error(`Error parsing locale '${locale}.${ext}':`, err);
+            break;
         }
     }
+    if (locale !== 'en') {
+        console.warn(`Locale '${locale}' not found – falling back to 'en'.`);
+        await loadLocale('en');
+    }
 }
 
 /**

src/utils/__tests__/fs.test.ts

@@ -3,11 +3,13 @@ import {
     assertExists,
     assertStringIncludes,
 } from 'https://deno.land/std@0.224.0/assert/mod.ts';
+import { stub } from 'https://deno.land/std@0.224.0/testing/mock.ts';
+import { exists } from 'https://deno.land/std@0.224.0/fs/mod.ts';
 import { join } from 'https://deno.land/std@0.224.0/path/mod.ts';
 import { resolveUnitTargetPath, writeUnitFiles } from '../mod.ts';
 import { TimerOptions } from '../../types/options.ts';
 
-Deno.test('writeUnitFiles schreibt .service und .timer korrekt', async () => {
+Deno.test('writeUnitFiles: writes .service and .timer files correctly', async () => {
     const tmp = await Deno.makeTempDir({ prefix: 'test-units-' });
 
     const options = {
@@ -26,15 +28,15 @@ Deno.test('writeUnitFiles schreibt .service und .timer korrekt', async () => {
         options as TimerOptions,
     ) as { servicePath: string; timerPath: string };
 
-    // Überprüfe Pfade
+    // Check file paths
     assertEquals(servicePath, join(tmp, 'test-backup.service'));
     assertEquals(timerPath, join(tmp, 'test-backup.timer'));
 
-    // Existieren Dateien?
+    // Check if files exist
     assertExists(await Deno.stat(servicePath));
     assertExists(await Deno.stat(timerPath));
 
-    // Enthält die Datei den erwarteten Inhalt?
+    // Check if file contents match expectations
     const readService = await Deno.readTextFile(servicePath);
     const readTimer = await Deno.readTextFile(timerPath);
 
@@ -42,18 +44,237 @@ Deno.test('writeUnitFiles schreibt .service und .timer korrekt', async () => {
     assertStringIncludes(readTimer, 'OnCalendar=daily');
 });
 
-Deno.test('resolveUnitTargetPath mit --output', () => {
+Deno.test('resolveUnitTargetPath: with --output', () => {
     const result = resolveUnitTargetPath({ output: '/tmp/units', user: false });
     assertEquals(result, '/tmp/units');
 });
 
-Deno.test('resolveUnitTargetPath mit --user ohne output', () => {
+Deno.test('resolveUnitTargetPath: with --user and no output', () => {
     Deno.env.set('HOME', '/home/maxp');
     const result = resolveUnitTargetPath({ output: undefined, user: true });
     assertEquals(result, '/home/maxp/.config/systemd/user');
 });
 
-Deno.test('resolveUnitTargetPath ohne output und ohne user', () => {
+Deno.test('resolveUnitTargetPath: with no output and no user', () => {
     const result = resolveUnitTargetPath({ output: undefined, user: false });
     assertEquals(result, '/etc/systemd/system');
 });
+
+Deno.test('writeUnitFiles: error writing .timer file triggers rollback', async () => {
+    const tmp = await Deno.makeTempDir();
+
+    const options: TimerOptions = {
+        output: tmp,
+        user: false,
+        exec: '/bin/true',
+        calendar: 'never',
+    };
+
+    const name = 'fail-timer';
+    const serviceContent = '[Service]\nExecStart=/bin/true';
+    const timerContent = '[Timer]\nOnCalendar=never';
+
+    const servicePath = join(tmp, `${name}.service`);
+    const timerPath = join(tmp, `${name}.timer`);
+
+    // Simulate: writing the .timer file fails
+    const originalWrite = Deno.writeTextFile;
+    const writeStub = stub(
+        Deno,
+        'writeTextFile',
+        async (path: string | URL, data: string | ReadableStream<string>) => {
+            if (typeof path === 'string' && path.endsWith('.timer')) {
+                throw new Error('Simulated write error');
+            } else {
+                return await originalWrite(path, data);
+            }
+        },
+    );
+
+    const result = await writeUnitFiles(
+        name,
+        serviceContent,
+        timerContent,
+        options,
+    );
+
+    // Expect: function returns undefined
+    assertEquals(result, undefined);
+
+    // Expect: both files have been deleted (rollback)
+    assertEquals(await exists(servicePath), false);
+    assertEquals(await exists(timerPath), false);
+
+    writeStub.restore();
+});
+
+Deno.test('writeUnitFiles: error writing .service file prevents further actions', async () => {
+    const tmp = await Deno.makeTempDir();
+
+    const options: TimerOptions = {
+        output: tmp,
+        user: false,
+        exec: '/bin/true',
+        calendar: 'weekly',
+    };
+
+    const name = 'fail-service';
+    const serviceContent = '[Service]\nExecStart=/bin/true';
+    const timerContent = '[Timer]\nOnCalendar=weekly';
+
+    const servicePath = join(tmp, `${name}.service`);
+    const timerPath = join(tmp, `${name}.timer`);
+
+    // Simulate: error writing the .service file
+    const writeStub = stub(
+        Deno,
+        'writeTextFile',
+        (path: string | URL, _data: string | ReadableStream<string>) => {
+            if (typeof path === 'string' && path.endsWith('.service')) {
+                throw new Error('Simulated service write error');
+            }
+            return Promise.resolve();
+        },
+    );
+
+    const result = await writeUnitFiles(
+        name,
+        serviceContent,
+        timerContent,
+        options,
+    );
+
+    // Expect: function returns undefined
+    assertEquals(result, undefined);
+
+    // Expect: no files were created
+    assertEquals(await exists(servicePath), false);
+    assertEquals(await exists(timerPath), false);
+
+    writeStub.restore();
+});
+
+Deno.test('writeUnitFiles: both files written, then error → full rollback', async () => {
+    const tmp = await Deno.makeTempDir();
+
+    const options: TimerOptions = {
+        output: tmp,
+        user: false,
+        exec: '/bin/true',
+        calendar: 'never',
+    };
+
+    const name = 'fail-after-write';
+    const serviceContent = '[Service]\nExecStart=/bin/true';
+    const timerContent = '[Timer]\nOnCalendar=never';
+
+    const servicePath = join(tmp, `${name}.service`);
+    const timerPath = join(tmp, `${name}.timer`);
+
+    let writeCount = 0;
+    const originalWriteTextFile = Deno.writeTextFile;
+
+    const writeStub = stub(
+        Deno,
+        'writeTextFile',
+        async (path: string | URL, data: string | ReadableStream<string>) => {
+            if (typeof path !== 'string') {
+                throw new Error('Unexpected path type');
+            }
+
+            // Simulate both writes, then throw an error after the second
+            writeCount++;
+
+            await originalWriteTextFile(path, data);
+
+            if (writeCount === 2) {
+                throw new Error('Simulated error after full write');
+            }
+        },
+    );
+
+    const result = await writeUnitFiles(
+        name,
+        serviceContent,
+        timerContent,
+        options,
+    );
+
+    // Expect: function returns undefined
+    assertEquals(result, undefined);
+
+    // Expect: both files were removed
+    assertEquals(await exists(servicePath), false);
+    assertEquals(await exists(timerPath), false);
+
+    writeStub.restore();
+});
+
+Deno.test('writeUnitFiles: rollback fails if files cannot be deleted', async () => {
+    const tmp = await Deno.makeTempDir();
+
+    const options: TimerOptions = {
+        output: tmp,
+        user: false,
+        exec: '/bin/true',
+        calendar: 'never',
+    };
+
+    const name = 'rollback-error';
+    const serviceContent = '[Service]\nExecStart=/bin/true';
+    const timerContent = '[Timer]\nOnCalendar=never';
+
+    const servicePath = join(tmp, `${name}.service`);
+    const timerPath = join(tmp, `${name}.timer`);
+
+    const originalWriteTextFile = Deno.writeTextFile;
+    const _originalRemove = Deno.remove;
+
+    let writeCount = 0;
+
+    const writeStub = stub(
+        Deno,
+        'writeTextFile',
+        async (path: string | URL, data: string | ReadableStream<string>) => {
+            writeCount++;
+            await originalWriteTextFile(path, data);
+            if (writeCount === 2) {
+                throw new Error('Error after full write');
+            }
+        },
+    );
+
+    const removeStub = stub(
+        Deno,
+        'remove',
+        // deno-lint-ignore require-await
+        async (_path: string | URL, _opts?: Deno.RemoveOptions) => {
+            throw new Error('Deletion forbidden!');
+        },
+    );
+
+    const logs: string[] = [];
+    const consoleStub = stub(console, 'error', (...args) => {
+        logs.push(args.map((a) => String(a)).join(' '));
+    });
+
+    const result = await writeUnitFiles(
+        name,
+        serviceContent,
+        timerContent,
+        options,
+    );
+    assertEquals(result, undefined);
+
+    // Files still exist because deletion failed
+    assertEquals(await exists(servicePath), true);
+    assertEquals(await exists(timerPath), true);
+
+    // Error output contains "rollback_failed"
+    const combinedLogs = logs.join('\n');
+    assertStringIncludes(combinedLogs, 'rollback_failed');
+
+    writeStub.restore();
+    removeStub.restore();
+    consoleStub.restore();
+});