refactor: . Inline LinkResolver.resolve(), which is now misleading

LinkResolver now resolves links at run-time, not during
construction of Link objects - so there is no value
in having LinkResolver construction Links.

This also simplifies TasksFile.ts and ListItem.ts,
and makes test behaviour a bit clearer.

Author: claremacrae

src/Scripting/TasksFile.ts

@@ -1,6 +1,5 @@
 import { type CachedMetadata, type FrontMatterCache, type Reference, getAllTags, parseFrontMatterTags } from 'obsidian';
-import type { Link } from '../Task/Link';
-import { LinkResolver } from '../Task/LinkResolver';
+import { Link } from '../Task/Link';
 
 export type OptionalTasksFile = TasksFile | undefined;
 
@@ -36,7 +35,7 @@ export class TasksFile {
     }
 
     private createLinks(obsidianRawLinks: Reference[] | undefined) {
-        return obsidianRawLinks?.map((link) => LinkResolver.getInstance().resolve(link, this.path)) ?? [];
+        return obsidianRawLinks?.map((link) => new Link(link, this.path)) ?? [];
     }
 
     /**

src/Task/LinkResolver.ts

@@ -1,5 +1,4 @@
 import type { Reference } from 'obsidian';
-import { Link } from './Link';
 
 export type GetFirstLinkpathDestFn = (rawLink: Reference, sourcePath: string) => string | null;
 
@@ -25,11 +24,6 @@ export class LinkResolver {
     public resetGetFirstLinkpathDestFn() {
         this.getFirstLinkpathDestFn = defaultGetFirstLinkpathDestFn;
     }
-
-    public resolve(rawLink: Reference, pathContainingLink: string) {
-        return new Link(rawLink, pathContainingLink);
-    }
-
     public getDestinationPath(rawLink: Reference, pathContainingLink: string) {
         return this.getFirstLinkpathDestFn(rawLink, pathContainingLink) ?? undefined;
     }

src/Task/ListItem.ts

@@ -3,8 +3,7 @@ import type { TasksFile } from '../Scripting/TasksFile';
 import type { Task } from './Task';
 import type { TaskLocation } from './TaskLocation';
 import { TaskRegularExpressions } from './TaskRegularExpressions';
-import type { Link } from './Link';
-import { LinkResolver } from './LinkResolver';
+import { Link } from './Link';
 
 export class ListItem {
     // The original line read from file.
@@ -211,7 +210,7 @@ export class ListItem {
     public get outlinks(): Readonly<Link[]> {
         return this.rawLinksInFileBody
             .filter((link) => link.position.start.line === this.lineNumber)
-            .map((link) => LinkResolver.getInstance().resolve(link, this.file.path));
+            .map((link) => new Link(link, this.file.path));
     }
 
     /**

tests/Task/LinkResolver.test.ts

@@ -1,6 +1,7 @@
 import type { Reference } from 'obsidian';
 import link_in_file_body from '../Obsidian/__test_data__/link_in_file_body.json';
 import { LinkResolver } from '../../src/Task/LinkResolver';
+import { Link } from '../../src/Task/Link';
 
 describe('LinkResolver', () => {
     let rawLink: Reference;
@@ -10,15 +11,14 @@ describe('LinkResolver', () => {
     });
 
     it('should resolve a link via local instance', () => {
-        const resolver = new LinkResolver();
-        const link = resolver.resolve(rawLink, link_in_file_body.filePath);
+        const link = new Link(rawLink, link_in_file_body.filePath);
 
         expect(link.originalMarkdown).toEqual('[[yaml_tags_is_empty]]');
         expect(link.destinationPath).toBeNull();
     });
 
     it('should resolve a link via global instance', () => {
-        const link = LinkResolver.getInstance().resolve(rawLink, link_in_file_body.filePath);
+        const link = new Link(rawLink, link_in_file_body.filePath);
 
         expect(link.originalMarkdown).toEqual('[[yaml_tags_is_empty]]');
         expect(link.destinationPath).toBeNull();
@@ -28,20 +28,20 @@ describe('LinkResolver', () => {
         const resolver = LinkResolver.getInstance();
         resolver.setGetFirstLinkpathDestFn(() => 'Hello World.md');
 
-        const link = resolver.resolve(rawLink, link_in_file_body.filePath);
+        const link = new Link(rawLink, link_in_file_body.filePath);
         expect(link.destinationPath).toEqual('Hello World.md');
     });
 
     it('should allow the global instance to be reset', () => {
         const globalInstance = LinkResolver.getInstance();
         globalInstance.setGetFirstLinkpathDestFn(() => 'From Global Instance.md');
 
-        const link1 = globalInstance.resolve(rawLink, link_in_file_body.filePath);
+        const link1 = new Link(rawLink, link_in_file_body.filePath);
         expect(link1.destinationPath).toEqual('From Global Instance.md');
 
         globalInstance.resetGetFirstLinkpathDestFn();
 
-        const link2 = globalInstance.resolve(rawLink, link_in_file_body.filePath);
+        const link2 = new Link(rawLink, link_in_file_body.filePath);
         expect(link2.destinationPath).toBeNull();
     });
 });