Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

generate copy without wikilinks #1365

Merged
merged 24 commits into from
Jul 10, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
60b4adf
inseart new test file
hereistheusername Jun 21, 2024
bab6cd7
add generate standalone note command
hereistheusername Jun 21, 2024
bcfde0e
vscode cmd configure
hereistheusername Jun 21, 2024
76ed1ad
fix embeded wikilinks
hereistheusername Jun 21, 2024
07702c2
refactor convertLinksFormat function & add 4 user command interfaces
hereistheusername Jun 23, 2024
62f458e
cleanup
hereistheusername Jun 23, 2024
0aefd72
add comments
hereistheusername Jun 23, 2024
2e350d7
change user interface
hereistheusername Jun 24, 2024
08451f1
del outdated comments
hereistheusername Jun 24, 2024
18dbbb5
fix typo
hereistheusername Jun 28, 2024
b384491
modify createUpdateLinkEdit to accomplish convert
hereistheusername Jun 28, 2024
7adf32f
only images can be embedded
hereistheusername Jun 29, 2024
4483132
move useAngles to if-branch uses it
hereistheusername Jun 29, 2024
8dd26c9
keey filename when using in page anchor
hereistheusername Jun 29, 2024
7732e4b
remove redundant procedure
hereistheusername Jun 29, 2024
8194b5c
give a default value to alias in link format combination branch
hereistheusername Jun 30, 2024
6765d52
add tests to createUpdateLinkEdit about changint links' type and isEmbed
hereistheusername Jun 30, 2024
1daf3be
follow prettier format
hereistheusername Jun 30, 2024
aaa8321
change to one line expression
hereistheusername Jun 30, 2024
bdfa676
get target from getIdentifier
hereistheusername Jul 1, 2024
7af316b
add tests for inserting angles
hereistheusername Jul 2, 2024
e8e3c2a
Merge pull request #1 from hereistheusername/test/modify-createUpdate…
hereistheusername Jul 4, 2024
b9775a3
fix typo
hereistheusername Jul 6, 2024
866a091
change require to import statement
hereistheusername Jul 7, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions packages/foam-vscode/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,10 @@
"command": "foam-vscode.open-resource",
"title": "Foam: Open Resource"
},
{
"command": "foam-vscode.generate-standalone-note",
"title": "Foam: generate standalone copy without wikilinks"
},
{
"command": "foam-vscode.views.orphans.group-by:folder",
"title": "Group By Folder",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ describe('generateLinkReferences', () => {
});

it('initialised test graph correctly', () => {
expect(_workspace.list().length).toEqual(10);
expect(_workspace.list().length).toEqual(11);
});

it('should add link references to a file that does not have them', async () => {
Expand Down
55 changes: 55 additions & 0 deletions packages/foam-vscode/src/core/janitor/generate-mdlinks.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
import { generateMarkdownLinks } from './generate-mdlinks';
import { TEST_DATA_DIR } from '../../test/test-utils';
import { MarkdownResourceProvider } from '../services/markdown-provider';
import { Resource } from '../model/note';
import { FoamWorkspace } from '../model/workspace';
import { Logger } from '../utils/log';
import fs from 'fs';
import { URI } from '../model/uri';
import { createMarkdownParser } from '../services/markdown-parser';
import { FileDataStore } from '../../test/test-datastore';

Logger.setLevel('error');

describe('generateStdMdLink', () => {
let _workspace: FoamWorkspace;
// TODO slug must be reserved for actual slugs, not file names
const findBySlug = (slug: string): Resource => {
return _workspace
.list()
.find(res => res.uri.getName() === slug) as Resource;
};

beforeAll(async () => {
/** Use fs for reading files in units where vscode.workspace is unavailable */
const readFile = async (uri: URI) =>
(await fs.promises.readFile(uri.toFsPath())).toString();
const dataStore = new FileDataStore(
readFile,
TEST_DATA_DIR.joinPath('__scaffold__').toFsPath()
);
const parser = createMarkdownParser();
const mdProvider = new MarkdownResourceProvider(dataStore, parser);
_workspace = await FoamWorkspace.fromProviders([mdProvider], dataStore);
});

it('initialised test graph correctly', () => {
expect(_workspace.list().length).toEqual(11);
});

it('can generate markdown links correctly', async () => {
const note = findBySlug('file-with-different-link-formats');
const actual = await generateMarkdownLinks(note, _workspace);
const expected: string[] = [
'[first-document](first-document.md "First Document")',
'[second-document](second-document.md "Second Document")',
'[#one section](<#one section> "File with different link formats")',
'[another name](<#one section> "File with different link formats")',
'[an alias](first-document.md "First Document")',
];
expect(actual.length).toEqual(expected.length);
const _ = actual.map((textReplace, index) => {
expect(textReplace.to).toEqual(expected[index]);
});
});
});
107 changes: 107 additions & 0 deletions packages/foam-vscode/src/core/janitor/generate-mdlinks.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
import { NoteLinkDefinition, Resource } from '../model/note';
import { FoamWorkspace } from '../model/workspace';
import { createMarkdownReferences } from '../services/markdown-provider';

export interface TextReplace {
from: string;
to: string;
}

/**
* parse wikilink's rawText
* possible inpout:
* 1. [[\<filename\>#\<section\>|\<label\>]]
* 2. [[#\<section\>|\<label\>]]
* 3. [[\<filename\>#\<section\>]]
* 4. [[\<filename\>|\<label\>]]
*/
class WikilinkRawText {
private lable_m: string = '';
private filename_m: string = '';
private section_m: string = '';

public readFromText(definition: NoteLinkDefinition): WikilinkRawText {
const struct_rawText_regex =
/(?:(?<filename>[^\]|#]+)?(?:#(?<section>[^\]|]+))?)?(?:\|(?<label>[^\]]+))?/;
const match_result = definition.label.match(struct_rawText_regex);
if (match_result) {
this.filename_m = match_result[1];
this.section_m = match_result[2];
this.lable_m = match_result[3];
}
return this;
}

public getLable(): string {
if (this.lable_m) {
return this.lable_m;
}
// return `${this.getFilename()}${this.section_m ? '#' : ''}${this.getSection()}`;
return '';
}
public getFilename(): string {
if (this.filename_m) {
return this.filename_m;
}
return '';
}
public getSection(): string {
if (this.section_m) {
return this.section_m;
}
return '';
}
public toMarkdownLink(
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You probably can reuse the mechanisms available in MarkdownLink to achieve the same in a more integrated way

definition: NoteLinkDefinition,
toNote: Resource
): string {
const struct_rawText_regex =
/(?:(?<filename>[^\]|#]+)?(?:#(?<section>[^\]|]+))?)?(?:\|(?<label>[^\]]+))?/;
const match_result = definition.label.match(struct_rawText_regex);
this.filename_m = match_result[1];
this.section_m = match_result[2];
this.lable_m = match_result[3];

let url = `${
definition.url !== toNote.uri.getBasename() ? definition.url : ''
}${this.section_m ? `#${this.getSection()}` : ''}`;
if (url.indexOf(' ') > 0) {
url = `<${url}>`;
}
url = `(${url}${definition.title ? ` "${definition.title}"` : ''})`;

let label = this.lable_m;
let filename =
this.getFilename() !== toNote.uri.getName() ? this.getFilename() : '';
let section = this.getSection();
if (!label) {
label = `${filename}${this.section_m ? `#${section}` : ''}`;
}

return `[${label}]${url}`;
}
}

export const generateMarkdownLinks = async (
note: Resource,
workspace: FoamWorkspace
): Promise<TextReplace[]> => {
if (!note) {
return [] as TextReplace[];
}

const newWikilinkDefinitions = createMarkdownReferences(
workspace,
note,
true
);
const wikilinkRawTextParser = new WikilinkRawText();
const toReplaceArray = newWikilinkDefinitions.map(definition => {
return {
from: `[[${definition.label}]]`,
to: wikilinkRawTextParser.toMarkdownLink(definition, note),
};
});

return toReplaceArray;
};
1 change: 1 addition & 0 deletions packages/foam-vscode/src/core/janitor/index.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
export { generateLinkReferences } from './generate-link-references';
export { generateHeading } from './generate-headings';
export { generateMarkdownLinks } from './generate-mdlinks';
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
import { commands, ExtensionContext, window } from 'vscode';
import { isMdEditor } from '../../utils';
import { Foam } from '../../core/model/foam';
import { FoamWorkspace } from '../../core/model/workspace';
import { fromVsCodeUri } from '../../utils/vsc-utils';
import { getEditorEOL } from '../../services/editor';
import { ResourceParser } from '../../core/model/note';
import { IMatcher } from '../../core/services/datastore';
import { generateMarkdownLinks } from '../../core/janitor';
const vscode = require('vscode'); /* cannot import workspace from above statement and not sure what happened */

export default async function activate(
context: ExtensionContext,
foamPromise: Promise<Foam>
) {
const foam = await foamPromise;

context.subscriptions.push(
commands.registerCommand('foam-vscode.generate-standalone-note', () => {
return generateStandaloneNote(
foam.workspace,
foam.services.parser,
foam.services.matcher
);
})
);
}

/**
* based on generate-link-references,
* copy the current note,
* replace wikilinks in it,
* save it at the same directory,
* call update-wikilinks to remove link references if neccessary
*/
async function generateStandaloneNote(
fWorkspace: FoamWorkspace,
fParser: ResourceParser,
fMatcher: IMatcher
) {
const editor = window.activeTextEditor;
const doc = editor.document;

if (!isMdEditor(editor) || !fMatcher.isMatch(fromVsCodeUri(doc.uri))) {
return;
}

// const setting = getWikilinkDefinitionSetting();
const eol = getEditorEOL();
let text = doc.getText();

const resource = fParser.parse(fromVsCodeUri(doc.uri), text);
const textReplaceArr = await generateMarkdownLinks(resource, fWorkspace);
function escapeRegExp(string) {
return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
}

textReplaceArr.forEach(({ from, to }) => {
text = text.replace(new RegExp(escapeRegExp(from), 'g'), to);
});

const basePath = doc.uri.path.split('/').slice(0, -1).join('/');

const fileUri = vscode.Uri.file(
`${
basePath ? basePath + '/' : ''
}${resource.uri.getName()}.standalone${resource.uri.getExtension()}`
);
const encoder = new TextEncoder();
await vscode.workspace.fs.writeFile(fileUri, encoder.encode(text));
await window.showTextDocument(fileUri);
await commands.executeCommand('foam-vscode.update-wikilink-definitions');
riccardoferretti marked this conversation as resolved.
Show resolved Hide resolved
}
1 change: 1 addition & 0 deletions packages/foam-vscode/src/features/commands/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ export { default as openResource } from './open-resource';
export { default as updateGraphCommand } from './update-graph';
export { default as updateWikilinksCommand } from './update-wikilinks';
export { default as createNote } from './create-note';
export { default as generateStandaloneNote } from './generate-standalone-note';
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# File with different link formats

markdown link [home page](https://foambubble.github.io/)

wikilink to file [[first-document]].

markdown format link to local [file](first-document.md)

embeded wikilink to file ![[second-document]].

wikilink to placeholder [[non-exist-file]]

in-note anchor [[file-with-different-link-formats#one section]]

alias to anchor [[file-with-different-link-formats#one section|another name]]

alias [[first-document|an alias]]

dupilcated wikilink to file [[first-document]]

# one section