Merge remote-tracking branch 'origin/develop' into feat/198-extract-template-service

Author: pajoma

docs/plans/2026-05-18-199-infer-type-context-object.md

@@ -17,7 +17,7 @@ Trade-off: keeping the interface in `paths.ts` rather than `src/model/interfaces
 
 `inferType` has no VS Code dependencies — safe to run inside Extension Host suite without special plumbing. Lock down all three classification branches before touching the signature:
 
-- attachment: extension mismatch → `JournalPageType.attachement`
+- attachment: extension mismatch → `JournalPageType.attachment`
 - entry: `extension` matches AND name matches `/^[\d|\-|_]+$/` → `JournalPageType.entry`
 - note: `extension` matches AND name is alphanumeric → `JournalPageType.note`
 
@@ -80,7 +80,7 @@ All existing tests plus the new unit tests must pass.
 ## Test scenarios
 
 - **Compile clean:** `npm run compile` and `npm run compile-tests` both exit 0, no TS errors
-- **Regression — attachment:** file with non-matching extension → `JournalPageType.attachement`
+- **Regression — attachment:** file with non-matching extension → `JournalPageType.attachment`
 - **Regression — entry:** matching extension + digits/dashes/underscores name → `JournalPageType.entry`
 - **Regression — note:** matching extension + alphanumeric name → `JournalPageType.note`
 - **Regex fix verified:** `2026|05|18.md` → `JournalPageType.note` after Step 0b (pipe no longer in character class)

src/features/entries/scan-entries.ts

@@ -54,7 +54,7 @@ export class ScanEntries {
         }
 
         // go into base directory, find all files changed within the last X days (see config)
-        // for each file, check if it is an entry, a note or an attachement
+        // for each file, check if it is an entry, a note or an attachment
         for (const directory of directories) {
             try {
                 await this.fs.stat(directory.path);
@@ -65,7 +65,7 @@ export class ScanEntries {
 
             await this.walkDir(directory.path, thresholdInMs, (entries: J.Model.FileEntry[]) => {
                 entries.forEach(entry => {
-                    entry.type = J.Journal.inferType(Path.parse(entry.path), this.config.getFileExtension());
+                    entry.type = J.Journal.inferType(Path.parse(entry.path), { extension: this.config.getFileExtension() });
                     entry.scope = directory.scope;
                     this.cache.set(entry.path, entry);
                 });
@@ -89,7 +89,7 @@ export class ScanEntries {
     public async getPreviouslyAccessedFiles(thresholdInMs: number, callback: Function, picker: any, type: J.Model.JournalPageType, directories: Set<J.Model.ScopeDirectory>): Promise<void> {
 
         // go into base directory, find all files changed within the last 40 days
-        // for each file, check if it is an entry, a note or an attachement
+        // for each file, check if it is an entry, a note or an attachment
 
 
         this.logger.trace("Entering getPreviouslyAccessedFiles() in actions/reader.ts and number of directories to scan: ", directories.size);
@@ -137,7 +137,7 @@ export class ScanEntries {
 
         await this.walkDir(directory.path, thresholdInMs, (entries: J.Model.FileEntry[]) => {
             entries.forEach(fe => {
-                fe.type = J.Journal.inferType(Path.parse(fe.path), this.config.getFileExtension());
+                fe.type = J.Journal.inferType(Path.parse(fe.path), { extension: this.config.getFileExtension() });
                 fe.scope = directory.scope;
                 if (!this.cache.has(fe.path)) {
                     this.cache.set(fe.path, fe);

src/features/sync/sync-note-links.ts

@@ -18,8 +18,8 @@ export class SyncNoteLinks {
     *
     * @param doc
     */
-    public async injectAttachementLinks(doc: vscode.TextDocument, date: Date): Promise<vscode.TextDocument> {
-        this.ctrl.logger.trace("Entering injectAttachementLinks() in features/sync-note-links for date: ", date);
+    public async injectAttachmentLinks(doc: vscode.TextDocument, date: Date): Promise<vscode.TextDocument> {
+        this.ctrl.logger.trace("Entering injectAttachmentLinks() in features/sync-note-links for date: ", date);
 
         try {
             await this.ctrl.ui.saveDocument(doc);
@@ -33,12 +33,12 @@ export class SyncNoteLinks {
             const promises: Promise<J.Model.InlineString>[] = foundFiles
                 .filter(file => J.Util.isNullOrUndefined(referencedFiles.find(match => match.fsPath === file.fsPath)))
                 .map(file => {
-                    this.ctrl.logger.debug("injectAttachementLinks() - File link not present in entry: ", file);
+                    this.ctrl.logger.debug("injectAttachmentLinks() - File link not present in entry: ", file);
                     return this.buildReference(doc, file);
                 });
 
             const inlineStrings = await Promise.all(promises);
-            this.ctrl.logger.trace("injectAttachementLinks() - Number of references to synchronize: ", inlineStrings.length);
+            this.ctrl.logger.trace("injectAttachmentLinks() - Number of references to synchronize: ", inlineStrings.length);
 
             if (inlineStrings.length > 0) {
                 this.ctrl.inject.injectInlineString(inlineStrings[0], ...inlineStrings.splice(1))

src/journal/paths.ts

@@ -168,25 +168,20 @@ export async function checkIfFileIsAccessible(path: string): Promise<void> {
 }
 
 
-/**
- * Tries to infer the file type from the path by matching against the configured patterns
- * @param entry - path to entry
- * @param ext - configured standard extension 
- */
-export function inferType(entry: Path.ParsedPath, extension: string): J.Model.JournalPageType {
-
-    if (!entry.ext.endsWith(extension)) {
-        return J.Model.JournalPageType.attachement; // any attachement
-    } else
-
-        // this is getting out of hand if we need to infer it by scanning the patterns from the settings.
-        // We keep it simple: if the filename contains only digits and special chars, we assume it 
-        // is a journal entry. Everything else is a journal note. 
-        if (entry.name.match(/^[\d|\-|_]+$/gm)) {
-            return J.Model.JournalPageType.entry; // any entry
-        } else {
-            return J.Model.JournalPageType.note; // anything else is a note
-        }
+/** Context passed to inferType. All future fields must be optional (?:) to prevent shotgun surgery. */
+export interface InferTypeContext {
+    extension: string;
+}
+
+export function inferType(entry: Path.ParsedPath, ctx: InferTypeContext): J.Model.JournalPageType {
+
+    if (!entry.ext.endsWith(ctx.extension)) {
+        return J.Model.JournalPageType.attachment;
+    } else if (entry.name.match(/^[\d\-_]+$/)) {
+        return J.Model.JournalPageType.entry;
+    } else {
+        return J.Model.JournalPageType.note;
+    }
 
 
 }

src/model/config.ts

@@ -1,7 +1,7 @@
 export enum JournalPageType {
     note,
     entry,
-    attachement
+    attachment
 }
 
 export interface ScopedTemplate {

src/test/suite/infer-type.test.ts

@@ -0,0 +1,55 @@
+import * as assert from 'assert';
+import * as Path from 'path';
+import { inferType, InferTypeContext } from '../../journal/paths';
+import { JournalPageType } from '../../model/config';
+
+suite('inferType — classification', () => {
+    const ctx: InferTypeContext = { extension: '.md' };
+
+    suite('attachment', () => {
+        test('extension mismatch → attachment', () => {
+            const entry = Path.parse('/base/2026/05/2026-05-18.txt');
+            assert.strictEqual(inferType(entry, ctx), JournalPageType.attachment);
+        });
+
+        test('no extension → attachment', () => {
+            const entry = Path.parse('/base/2026/05/2026-05-18');
+            assert.strictEqual(inferType(entry, ctx), JournalPageType.attachment);
+        });
+    });
+
+    suite('entry', () => {
+        test('digits-only name → entry', () => {
+            const entry = Path.parse('/base/2026/05/20260518.md');
+            assert.strictEqual(inferType(entry, ctx), JournalPageType.entry);
+        });
+
+        test('digits with hyphens → entry', () => {
+            const entry = Path.parse('/base/2026/05/2026-05-18.md');
+            assert.strictEqual(inferType(entry, ctx), JournalPageType.entry);
+        });
+
+        test('digits with underscores → entry', () => {
+            const entry = Path.parse('/base/2026/05/2026_05_18.md');
+            assert.strictEqual(inferType(entry, ctx), JournalPageType.entry);
+        });
+
+        test('pipe-separated name → note (pipe not a separator)', () => {
+            // Pipe was previously a literal in the character class; now correctly excluded.
+            const entry = Path.parse('/base/2026/05/2026|05|18.md');
+            assert.strictEqual(inferType(entry, ctx), JournalPageType.note);
+        });
+    });
+
+    suite('note', () => {
+        test('alphanumeric name → note', () => {
+            const entry = Path.parse('/base/2026/05/my-note.md');
+            assert.strictEqual(inferType(entry, ctx), JournalPageType.note);
+        });
+
+        test('name with letters and digits → note', () => {
+            const entry = Path.parse('/base/2026/05/meeting2026.md');
+            assert.strictEqual(inferType(entry, ctx), JournalPageType.note);
+        });
+    });
+});

src/vscode/dialogues.ts

@@ -126,8 +126,8 @@ export class Dialogues {
                         this.pickItem(JournalPageType.note).then(selected => {
                             resolve(selected);
                         });
-                    } else if (isNotNullOrUndefined(selected.pickItem) && selected.pickItem === JournalPageType.attachement) {
-                        this.pickItem(JournalPageType.attachement).then(selected => {
+                    } else if (isNotNullOrUndefined(selected.pickItem) && selected.pickItem === JournalPageType.attachment) {
+                        this.pickItem(JournalPageType.attachment).then(selected => {
                             resolve(selected);
                         });
                     } else {
@@ -457,7 +457,7 @@ function addItemToPickList(entries: FileEntry[], input: TimedQuickPick, type: Jo
                 else { displayName = `$(circle-large-filled) ${displayName}`; break; }
             }
             case JournalPageType.entry: displayName = `$(clock) ${displayName}`; break;
-            case JournalPageType.attachement: displayName = `$(package) ${displayName}`; break;
+            case JournalPageType.attachment: displayName = `$(package) ${displayName}`; break;
         }
 
 

src/vscode/startup.ts

@@ -98,7 +98,7 @@ export class Startup {
 
         try {
             ctrl.reader.onNotesInjected = (doc, date) => {
-                new J.Features.SyncNoteLinks(ctrl).injectAttachementLinks(doc, date)
+                new J.Features.SyncNoteLinks(ctrl).injectAttachmentLinks(doc, date)
                     .finally(() => ctrl.logger.trace("Scanning notes completed"));
             };