v0.25.11

* Introduced Location
* Passing a reference to the source link to the create-note command

Also
* Added withTiming fn for performance logging
* Added extra test to check incoming wikilink with sections
* Tweaked creation of vscode URI to also support raw objects

docs/user/recipes/recipes.md

@@ -75,7 +75,7 @@ A #recipe is a guide, tip or strategy for getting the most out of your Foam work
 - Publish using community templates
   - [[publish-to-netlify-with-eleventy]] by [@juanfrank77](https://github.com/juanfrank77)
   - [[generate-gatsby-site]] by [@mathieudutour](https://github.com/mathieudutour) and [@hikerpig](https://github.com/hikerpig)
-  - [foamy-nextjs](https://github.com/yenly/foamy-nextjs) by [@yenly](https://github.com/yenly)
+  
 - Make the site your own by [[publish-to-github]].
 - Render math symbols, by either
   - adding client-side [[math-support-with-mathjax]] to the default [[publish-to-github-pages]] site

lerna.json

@@ -4,5 +4,5 @@
   ],
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "0.25.8"
+  "version": "0.25.11"
 }

packages/foam-vscode/CHANGELOG.md

@@ -4,6 +4,24 @@ All notable changes to the "foam-vscode" extension will be documented in this fi
 
 Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how to structure this file.
 
+## [0.25.11] - 2024-03-18
+
+Fixes and Improvements:
+
+- Actually fixed bug in graph computation (#1345)
+
+## [0.25.10] - 2024-03-18
+
+Fixes and Improvements:
+
+- Fixed bug in graph computation (#1345)
+
+## [0.25.9] - 2024-03-17
+
+Fixes and Improvements:
+
+- Improved note creation from placeholder (#1344)
+
 ## [0.25.8] - 2024-02-21
 
 Fixes and Improvements:

packages/foam-vscode/package.json

@@ -8,7 +8,7 @@
     "type": "git"
   },
   "homepage": "https://github.com/foambubble/foam",
-  "version": "0.25.8",
+  "version": "0.25.11",
   "license": "MIT",
   "publisher": "foam",
   "engines": {

packages/foam-vscode/src/core/model/foam.ts

@@ -5,7 +5,7 @@ import { FoamGraph } from './graph';
 import { ResourceParser } from './note';
 import { ResourceProvider } from './provider';
 import { FoamTags } from './tags';
-import { Logger } from '../utils/log';
+import { Logger, withTiming, withTimingAsync } from '../utils/log';
 
 export interface Services {
   dataStore: IDataStore;
@@ -28,24 +28,25 @@ export const bootstrap = async (
   initialProviders: ResourceProvider[],
   defaultExtension: string = '.md'
 ) => {
-  const tsStart = Date.now();
-
-  const workspace = await FoamWorkspace.fromProviders(
-    initialProviders,
-    dataStore,
-    defaultExtension
+  const workspace = await withTimingAsync(
+    () =>
+      FoamWorkspace.fromProviders(
+        initialProviders,
+        dataStore,
+        defaultExtension
+      ),
+    ms => Logger.info(`Workspace loaded in ${ms}ms`)
   );
 
-  const tsWsDone = Date.now();
-  Logger.info(`Workspace loaded in ${tsWsDone - tsStart}ms`);
+  const graph = withTiming(
+    () => FoamGraph.fromWorkspace(workspace, true),
+    ms => Logger.info(`Graph loaded in ${ms}ms`)
+  );
 
-  const graph = FoamGraph.fromWorkspace(workspace, true);
-  const tsGraphDone = Date.now();
-  Logger.info(`Graph loaded in ${tsGraphDone - tsWsDone}ms`);
-
-  const tags = FoamTags.fromWorkspace(workspace, true);
-  const tsTagsEnd = Date.now();
-  Logger.info(`Tags loaded in ${tsTagsEnd - tsGraphDone}ms`);
+  const tags = withTiming(
+    () => FoamTags.fromWorkspace(workspace, true),
+    ms => Logger.info(`Tags loaded in ${ms}ms`)
+  );
 
   watcher?.onDidChange(async uri => {
     if (matcher.isMatch(uri)) {

packages/foam-vscode/src/core/model/graph.test.ts

@@ -139,6 +139,21 @@ describe('Graph', () => {
     ).toEqual(['/path/another/page-c.md', '/somewhere/page-b.md']);
   });
 
+  it('should create inbound connections when targeting a section', () => {
+    const noteA = createTestNote({
+      uri: '/path/to/page-a.md',
+      links: [{ slug: 'page-b#section 2' }],
+    });
+    const noteB = createTestNote({
+      uri: '/somewhere/page-b.md',
+      text: '## Section 1\n\n## Section 2',
+    });
+    const ws = createTestWorkspace().set(noteA).set(noteB);
+    const graph = FoamGraph.fromWorkspace(ws);
+
+    expect(graph.getBacklinks(noteB.uri).length).toEqual(1);
+  });
+
   it('should support attachments', () => {
     const noteA = createTestNote({
       uri: '/path/to/page-a.md',

packages/foam-vscode/src/core/model/graph.ts

@@ -3,7 +3,7 @@ import { ResourceLink } from './note';
 import { URI } from './uri';
 import { FoamWorkspace } from './workspace';
 import { IDisposable } from '../common/lifecycle';
-import { Logger } from '../utils/log';
+import { Logger, withTiming } from '../utils/log';
 import { Emitter } from '../common/event';
 
 export type Connection = {

packages/foam-vscode/src/core/model/location.ts

@@ -0,0 +1,35 @@
+import { Range } from './range';
+import { URI } from './uri';
+import { ResourceLink } from './note';
+
+/**
+ * Represents a location inside a resource, such as a line
+ * inside a text file.
+ */
+export interface Location<T> {
+  /**
+   * The resource identifier of this location.
+   */
+  uri: URI;
+  /**
+   * The document range of this locations.
+   */
+  range: Range;
+  /**
+   * The data associated to this location.
+   */
+  data: T;
+}
+
+export abstract class Location<T> {
+  static create<T>(uri: URI, range: Range, data: T): Location<T> {
+    return { uri, range, data };
+  }
+
+  static forObjectWithRange<T extends { range: Range }>(
+    uri: URI,
+    obj: T
+  ): Location<T> {
+    return Location.create(uri, obj.range, obj);
+  }
+}

packages/foam-vscode/src/core/utils/log.ts

@@ -89,3 +89,25 @@ export class Logger {
     Logger.defaultLogger = logger;
   }
 }
+
+export const withTiming = <T>(
+  fn: () => T,
+  onDidComplete: (elapsed: number) => void
+): T => {
+  const tsStart = Date.now();
+  const res = fn();
+  const tsEnd = Date.now();
+  onDidComplete(tsEnd - tsStart);
+  return res;
+};
+
+export const withTimingAsync = async <T>(
+  fn: () => Promise<T>,
+  onDidComplete: (elapsed: number) => void
+): Promise<T> => {
+  const tsStart = Date.now();
+  const res = await fn();
+  const tsEnd = Date.now();
+  onDidComplete(tsEnd - tsStart);
+  return res;
+};

packages/foam-vscode/src/extension.ts

@@ -73,7 +73,9 @@ export async function activate(context: ExtensionContext) {
     );
 
     // Load the features
-    const resPromises = features.map(feature => feature(context, foamPromise));
+    const featuresPromises = features.map(feature =>
+      feature(context, foamPromise)
+    );
 
     const foam = await foamPromise;
     Logger.info(`Loaded ${foam.workspace.list().length} resources`);
@@ -102,14 +104,15 @@ export async function activate(context: ExtensionContext) {
       })
     );
 
-    const res = (await Promise.all(resPromises)).filter(r => r != null);
+    const feats = (await Promise.all(featuresPromises)).filter(r => r != null);
 
     return {
       extendMarkdownIt: (md: markdownit) => {
-        return res.reduce((acc: markdownit, r: any) => {
+        return feats.reduce((acc: markdownit, r: any) => {
           return r.extendMarkdownIt ? r.extendMarkdownIt(acc) : acc;
         }, md);
       },
+      foam,
     };
   } catch (e) {
     Logger.error('An error occurred while bootstrapping Foam', e);

packages/foam-vscode/src/features/commands/create-note.spec.ts

@@ -10,7 +10,12 @@ import {
   showInEditor,
 } from '../../test/test-utils-vscode';
 import { fromVsCodeUri } from '../../utils/vsc-utils';
-import { CREATE_NOTE_COMMAND } from './create-note';
+import { CREATE_NOTE_COMMAND, createNote } from './create-note';
+import { Location } from '../../core/model/location';
+import { Range } from '../../core/model/range';
+import { ResourceLink } from '../../core/model/note';
+import { MarkdownResourceProvider } from '../../core/services/markdown-provider';
+import { createMarkdownParser } from '../../core/services/markdown-parser';
 
 describe('create-note command', () => {
   afterEach(() => {
@@ -194,8 +199,14 @@ describe('factories', () => {
   describe('forPlaceholder', () => {
     it('adds the .md extension to notes created for placeholders', async () => {
       await closeEditors();
+      const link: ResourceLink = {
+        type: 'wikilink',
+        rawText: '[[my-placeholder]]',
+        range: Range.create(0, 0, 0, 0),
+        isEmbed: false,
+      };
       const command = CREATE_NOTE_COMMAND.forPlaceholder(
-        'my-placeholder',
+        Location.forObjectWithRange(URI.file(''), link),
         '.md'
       );
       await commands.executeCommand(command.name, command.params);
@@ -204,5 +215,41 @@ describe('factories', () => {
       expect(doc.uri.path).toMatch(/my-placeholder.md$/);
       expect(doc.getText()).toMatch(/^# my-placeholder/);
     });
+
+    it('replaces the original placeholder based on the new note identifier (#1327)', async () => {
+      await closeEditors();
+      const templateA = await createFile(
+        `---
+foam_template:
+  name: 'Example Template'
+  description: 'An example for reproducing a bug'
+  filepath: '$FOAM_SLUG-world.md'
+---`,
+        ['.foam', 'templates', 'template-a.md']
+      );
+
+      const noteA = await createFile(`this is my [[hello]]`);
+
+      const parser = createMarkdownParser();
+      const res = parser.parse(noteA.uri, noteA.content);
+
+      const command = CREATE_NOTE_COMMAND.forPlaceholder(
+        Location.forObjectWithRange(noteA.uri, res.links[0]),
+        '.md',
+        {
+          templatePath: templateA.uri.path,
+        }
+      );
+      const results: Awaited<ReturnType<typeof createNote>> =
+        await commands.executeCommand(command.name, command.params);
+      expect(results.didCreateFile).toBeTruthy();
+      expect(results.uri.path.endsWith('hello-world.md')).toBeTruthy();
+
+      const newNoteDoc = window.activeTextEditor.document;
+      expect(newNoteDoc.uri.path).toMatch(/hello-world.md$/);
+
+      const { doc } = await showInEditor(noteA.uri);
+      expect(doc.getText()).toEqual(`this is my [[hello-world]]`);
+    });
   });
 });

packages/foam-vscode/src/features/commands/create-note.ts

@@ -10,10 +10,21 @@ import { Resolver } from '../../services/variable-resolver';
 import { asAbsoluteWorkspaceUri, fileExists } from '../../services/editor';
 import { isSome } from '../../core/utils';
 import { CommandDescriptor } from '../../utils/commands';
+import { Foam } from '../../core/model/foam';
+import { Location } from '../../core/model/location';
+import { MarkdownLink } from '../../core/services/markdown-link';
+import { ResourceLink } from '../../core/model/note';
+import { toVsCodeRange, toVsCodeUri } from '../../utils/vsc-utils';
 
-export default async function activate(context: vscode.ExtensionContext) {
+export default async function activate(
+  context: vscode.ExtensionContext,
+  foamPromise: Promise<Foam>
+) {
+  const foam = await foamPromise;
   context.subscriptions.push(
-    vscode.commands.registerCommand(CREATE_NOTE_COMMAND.command, createNote)
+    vscode.commands.registerCommand(CREATE_NOTE_COMMAND.command, args =>
+      createNote(args, foam)
+    )
   );
 }
 
@@ -48,6 +59,11 @@ interface CreateNoteArgs {
    * The title of the note (translates into the FOAM_TITLE variable)
    */
   title?: string;
+  /**
+   * The source link that triggered the creation of the note.
+   * It will be updated with the appropriate identifier to the note, if necessary.
+   */
+  sourceLink?: Location<ResourceLink>;
   /**
    * What to do in case the target file already exists
    */
@@ -66,7 +82,7 @@ const DEFAULT_NEW_NOTE_TEXT = `# \${FOAM_TITLE}
 
 \${FOAM_SELECTED_TEXT}`;
 
-async function createNote(args: CreateNoteArgs) {
+export async function createNote(args: CreateNoteArgs, foam: Foam) {
   args = args ?? {};
   const date = isSome(args.date) ? new Date(Date.parse(args.date)) : new Date();
   const resolver = new Resolver(
@@ -92,23 +108,39 @@ async function createNote(args: CreateNoteArgs) {
       : getDefaultTemplateUri();
   }
 
-  if (await fileExists(templateUri)) {
-    return NoteFactory.createFromTemplate(
-      templateUri,
-      resolver,
-      noteUri,
-      text,
-      args.onFileExists
-    );
-  } else {
-    return NoteFactory.createNote(
-      noteUri ?? (await getPathFromTitle(resolver)),
-      text,
-      resolver,
-      args.onFileExists,
-      args.onRelativeNotePath
-    );
+  const createdNote = (await fileExists(templateUri))
+    ? await NoteFactory.createFromTemplate(
+        templateUri,
+        resolver,
+        noteUri,
+        text,
+        args.onFileExists
+      )
+    : await NoteFactory.createNote(
+        noteUri ?? (await getPathFromTitle(resolver)),
+        text,
+        resolver,
+        args.onFileExists,
+        args.onRelativeNotePath
+      );
+
+  if (args.sourceLink) {
+    const identifier = foam.workspace.getIdentifier(createdNote.uri);
+    const edit = MarkdownLink.createUpdateLinkEdit(args.sourceLink.data, {
+      target: identifier,
+    });
+    if (edit.newText != args.sourceLink.data.rawText) {
+      const updateLink = new vscode.WorkspaceEdit();
+      const uri = toVsCodeUri(args.sourceLink.uri);
+      updateLink.replace(
+        uri,
+        toVsCodeRange(args.sourceLink.range),
+        edit.newText
+      );
+      await vscode.workspace.applyEdit(updateLink);
+    }
   }
+  return createdNote;
 }
 
 export const CREATE_NOTE_COMMAND = {
@@ -123,12 +155,12 @@ export const CREATE_NOTE_COMMAND = {
    * @returns the command descriptor
    */
   forPlaceholder: (
-    placeholder: string,
+    sourceLink: Location<ResourceLink>,
     defaultExtension: string,
     extra: Partial<CreateNoteArgs> = {}
   ): CommandDescriptor<CreateNoteArgs> => {
     const endsWithDefaultExtension = new RegExp(defaultExtension + '$');
-
+    const { target: placeholder } = MarkdownLink.analyzeLink(sourceLink.data);
     const title = placeholder.endsWith(defaultExtension)
       ? placeholder.replace(endsWithDefaultExtension, '')
       : placeholder;
@@ -140,6 +172,7 @@ export const CREATE_NOTE_COMMAND = {
       params: {
         title,
         notePath,
+        sourceLink,
         ...extra,
       },
     };

packages/foam-vscode/src/features/hover-provider.ts

@@ -14,6 +14,7 @@ import { FoamGraph } from '../core/model/graph';
 import { OPEN_COMMAND } from './commands/open-resource';
 import { CREATE_NOTE_COMMAND } from './commands/create-note';
 import { commandAsURI } from '../utils/commands';
+import { Location } from '../core/model/location';
 
 export const CONFIG_KEY = 'links.hover.enable';
 
@@ -107,7 +108,7 @@ export class HoverProvider implements vscode.HoverProvider {
     }
 
     const command = CREATE_NOTE_COMMAND.forPlaceholder(
-      targetUri.path,
+      Location.forObjectWithRange(documentUri, targetLink),
       this.workspace.defaultExtension,
       {
         askForTemplate: true,

packages/foam-vscode/src/features/navigation-provider.spec.ts

@@ -12,6 +12,10 @@ import { createMarkdownParser } from '../core/services/markdown-parser';
 import { FoamGraph } from '../core/model/graph';
 import { commandAsURI } from '../utils/commands';
 import { CREATE_NOTE_COMMAND } from './commands/create-note';
+import { Location } from '../core/model/location';
+import { URI } from '../core/model/uri';
+import { Range } from '../core/model/range';
+import { ResourceLink } from '../core/model/note';
 
 describe('Document navigation', () => {
   const parser = createMarkdownParser([]);
@@ -71,9 +75,8 @@ describe('Document navigation', () => {
 
     it('should create links for placeholders', async () => {
       const fileA = await createFile(`this is a link to [[a placeholder]].`);
-      const ws = createTestWorkspace().set(
-        parser.parse(fileA.uri, fileA.content)
-      );
+      const noteA = parser.parse(fileA.uri, fileA.content);
+      const ws = createTestWorkspace().set(noteA);
       const graph = FoamGraph.fromWorkspace(ws);
 
       const { doc } = await showInEditor(fileA.uri);
@@ -83,9 +86,13 @@ describe('Document navigation', () => {
       expect(links.length).toEqual(1);
       expect(links[0].target).toEqual(
         commandAsURI(
-          CREATE_NOTE_COMMAND.forPlaceholder('a placeholder', '.md', {
-            onFileExists: 'open',
-          })
+          CREATE_NOTE_COMMAND.forPlaceholder(
+            Location.forObjectWithRange(noteA.uri, noteA.links[0]),
+            '.md',
+            {
+              onFileExists: 'open',
+            }
+          )
         )
       );
       expect(links[0].range).toEqual(new vscode.Range(0, 20, 0, 33));

packages/foam-vscode/src/features/navigation-provider.ts

@@ -10,6 +10,7 @@ import { FoamGraph } from '../core/model/graph';
 import { Position } from '../core/model/position';
 import { CREATE_NOTE_COMMAND } from './commands/create-note';
 import { commandAsURI } from '../utils/commands';
+import { Location } from '../core/model/location';
 
 export default async function activate(
   context: vscode.ExtensionContext,
@@ -146,10 +147,8 @@ export class NavigationProvider
   public provideDocumentLinks(
     document: vscode.TextDocument
   ): vscode.DocumentLink[] {
-    const resource = this.parser.parse(
-      fromVsCodeUri(document.uri),
-      document.getText()
-    );
+    const documentUri = fromVsCodeUri(document.uri);
+    const resource = this.parser.parse(documentUri, document.getText());
 
     const targets: { link: ResourceLink; target: URI }[] = resource.links.map(
       link => ({
@@ -162,7 +161,7 @@ export class NavigationProvider
       .filter(o => o.target.isPlaceholder()) // links to resources are managed by the definition provider
       .map(o => {
         const command = CREATE_NOTE_COMMAND.forPlaceholder(
-          o.target.path,
+          Location.forObjectWithRange(documentUri, o.link),
           this.workspace.defaultExtension,
           {
             onFileExists: 'open',

packages/foam-vscode/src/utils/vsc-utils.ts

@@ -9,7 +9,7 @@ export const toVsCodePosition = (p: FoamPosition): Position =>
 export const toVsCodeRange = (r: FoamRange): Range =>
   new Range(r.start.line, r.start.character, r.end.line, r.end.character);
 
-export const toVsCodeUri = (u: FoamURI): Uri => Uri.parse(u.toString());
+export const toVsCodeUri = (u: FoamURI): Uri => Uri.from(u);
 
 export const fromVsCodeUri = (u: Uri): FoamURI => FoamURI.parse(u.toString());