Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 8 additions & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,28 +23,28 @@
"author": "Michael Brenan",
"license": "MIT",
"devDependencies": {
"@rollup/plugin-commonjs": "^25.0.4",
"@rollup/plugin-node-resolve": "^15.2.1",
"@rollup/plugin-typescript": "^11.1.3",
"@types/jest": "^27.0.1",
"@types/luxon": "^3.2.0",
"@types/node": "^16.7.13",
"@types/papaparse": "^5.2.6",
"@types/parsimmon": "^1.10.6",
"@rollup/plugin-commonjs": "^25.0.4",
"@rollup/plugin-node-resolve": "^15.2.1",
"@rollup/plugin-typescript": "^11.1.3",
"@zerollup/ts-transform-paths": "^1.7.18",
"compare-versions": "^4.1.1",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"obsidian": "^1.4.0",
"prettier": "2.3.2",
"ts-jest": "^29.1.1",
"tslib": "^2.6.2",
"typescript": "^5.2.2",
"rollup": "^2.79.1",
"rollup-jest": "^3.1.0",
"rollup-plugin-copy": "^3.5.0",
"rollup-plugin-typescript2": "^0.35.0",
"rollup-plugin-web-worker-loader": "^1.6.1"
"rollup-plugin-web-worker-loader": "^1.6.1",
"ts-jest": "^29.1.1",
"tslib": "^2.6.2",
"typescript": "^5.2.2"
},
"dependencies": {
"@codemirror/language": "https://github.com/lishid/cm-language",
Expand Down
4 changes: 2 additions & 2 deletions src/expression/functions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -705,14 +705,14 @@ export namespace DefaultFunctions {
export const display = new FunctionBuilder("display")
.add1("null", (): Literal => "")
.add1("array", (a: Literal[], ctx: Context): Literal => {
return a.map(e => display(ctx, e)).join(", ");
return a.map(e => display(ctx, e)).join(", ");
})
.add1("string", (str: string): Literal => normalizeMarkdown(str))
.add1("link", (a: Link, ctx: Context): Literal => {
if (a.display) {
return display(ctx, a.display);
} else {
return Values.toString(a, ctx.settings).replace(/\[\[.*\|(.*)\]\]/, "$1")
return Values.toString(a, ctx.settings).replace(/\[\[.*\|(.*)\]\]/, "$1");
}
})
.add1("*", (a: Literal, ctx: Context): Literal => {
Expand Down
13 changes: 7 additions & 6 deletions src/test/function/functions.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -111,18 +111,19 @@ test("Evaluate display()", () => {
expect(parseEval('display("[displayname](http://example.com)")')).toEqual("displayname");
expect(parseEval('display("[[test]]")')).toEqual("test");
expect(parseEval('display("[[test|displayname]]")')).toEqual("displayname");
expect(parseEval('display("long [[test]] **with** [[test2|multiple]] [links](http://example.com)")')).toEqual("long test with multiple links");
expect(parseEval('display(1)')).toEqual("1");
expect(parseEval('display(true)')).toEqual("true");
expect(parseEval('display(null)')).toEqual("");
expect(parseEval('display("long [[test]] **with** [[test2|multiple]] [links](http://example.com)")')).toEqual(
"long test with multiple links"
);
expect(parseEval("display(1)")).toEqual("1");
expect(parseEval("display(true)")).toEqual("true");
expect(parseEval("display(null)")).toEqual("");
expect(parseEval('display(date("2024-11-18"))')).toEqual("November 18, 2024");
expect(parseEval('display(dur("7 hours"))')).toEqual("7 hours");
expect(parseEval('display(link("path/to/file.md"))')).toEqual("file");
expect(parseEval('display(link("path/to/file.md", "displayname"))')).toEqual("displayname");
expect(parseEval('display(list("test", 2, link("file.md")))')).toEqual('test, 2, file');
expect(parseEval('display(list("test", 2, link("file.md")))')).toEqual("test, 2, file");
});


// <-- default() -->

test("Evaluate default()", () => {
Expand Down
4 changes: 4 additions & 0 deletions src/ui/views/inline-field-live-preview.ts
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,10 @@ class InlineFieldWidget extends WidgetType {

const value = renderContainer.createSpan({
cls: ["dataview", "inline-field-value"],
attr: {
"data-dv-key": this.field.key,
"data-dv-norm-key": canonicalizeVarName(this.field.key),
},
});
renderValue(
this.app,
Expand Down
10 changes: 5 additions & 5 deletions src/util/normalize.ts
Original file line number Diff line number Diff line change
Expand Up @@ -164,13 +164,13 @@ export function setsEqual<T>(first: Set<T>, second: Set<T>): boolean {
/** Normalize a markdown string. Removes all markdown tags and obsidian links. */
export function normalizeMarkdown(str: string): string {
// [[test]] -> test
let interim = str.replace(/\[\[([^\|]*?)\]\]/g, "$1")
let interim = str.replace(/\[\[([^\|]*?)\]\]/g, "$1");

// [[test|test]] -> test
interim = interim.replace(/\[\[.*?\|(.*?)\]\]/, "$1")
interim = interim.replace(/\[\[.*?\|(.*?)\]\]/, "$1");

// remove markdown tags
interim = removeMd(interim);

return interim
}
return interim;
}