Merge pull request #2529 from holroy/feat-add-attributes-to-standalone-inline-field

Add attributes on inline field to standalone inline field

Author: holroy

package-lock.json

@@ -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",

package.json

@@ -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 => {

src/expression/functions.ts

@@ -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()", () => {

src/test/function/functions.test.ts

@@ -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,

src/ui/views/inline-field-live-preview.ts

@@ -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;
+}