fixed some bugs with the new view fields

mProjectsCode · mProjectsCode · commit 482796a66fbf · 2023-10-20T00:14:57.000+02:00
diff --git a/exampleVault/Advanced Examples/PF2e Encounter Calculator.md b/exampleVault/Advanced Examples/PF2e Encounter Calculator.md
@@ -3,8 +3,8 @@ playerCount: 6
 playerLevel: 4
 enemy:
   - name: Somthing
-    level: 4
-    count: 1
+    level: 2
+    count: 2
     variant: 0
   - name: Some other thing
     level: 2
diff --git a/exampleVault/View Fields/View Field.md b/exampleVault/View Fields/View Field.md
@@ -2,8 +2,8 @@
 number1: 12
 number2: 200
 unit: km
-distance: 12534
-computed: "**12534**"
+distance: 12
+computed: "**12**"
 ---
 
 `INPUT[number:number1]`
diff --git a/src/metaBindTable/MetaBindTable.ts b/src/metaBindTable/MetaBindTable.ts
@@ -9,6 +9,7 @@ import MetaBindTableComponent from './MetaBindTableComponent.svelte';
 import { ViewFieldMDRC } from '../renderChildren/ViewFieldMDRC';
 import { Component } from 'obsidian';
 import { UnvalidatedViewFieldDeclaration, ViewFieldDeclaration } from '../parsers/viewFieldParser/ViewFieldDeclaration';
+import { MetadataSubscription } from '../metadata/MetadataFileCache';
 
 export type MetaBindTableCell = InputFieldDeclaration | ViewFieldDeclaration;
 
@@ -29,16 +30,18 @@ export class MetaBindTable extends AbstractMDRC {
 	columns: MetaBindColumnDeclaration[];
 	tableComponent: MetaBindTableComponent | undefined;
 
-	private metadataManagerReadSignalListener: Listener<T | undefined> | undefined;
+	private metadataManagerOutputSignalListener: Listener<T | undefined> | undefined;
 
 	/**
 	 * Signal to write to the input field
 	 */
-	public writeSignal: Signal<T | undefined>;
+	public inputSignal: Signal<T | undefined>;
 	/**
 	 * Signal to read from the input field
 	 */
-	public readSignal: Signal<T | undefined>;
+	public outputSignal: Signal<T | undefined>;
+
+	private metadataSubscription?: MetadataSubscription;
 
 	constructor(
 		containerEl: HTMLElement,
@@ -55,30 +58,34 @@ export class MetaBindTable extends AbstractMDRC {
 		this.tableHead = tableHead;
 		this.columns = columns;
 
-		this.writeSignal = new Signal<T | undefined>(undefined);
-		this.readSignal = new Signal<T | undefined>(undefined);
+		this.inputSignal = new Signal<T | undefined>(undefined);
+		this.outputSignal = new Signal<T | undefined>(undefined);
 	}
 
 	registerSelfToMetadataManager(): undefined {
-		this.metadataManagerReadSignalListener = this.readSignal.registerListener({ callback: this.updateMetadataManager.bind(this) });
+		this.metadataManagerOutputSignalListener = this.outputSignal.registerListener({ callback: this.updateMetadataManager.bind(this) });
 
-		this.plugin.metadataManager.register(this.bindTarget.filePath ?? this.filePath, this.writeSignal, this.bindTarget.metadataPath, false, this.uuid);
+		this.metadataSubscription = this.plugin.metadataManager.subscribe(
+			this.uuid,
+			this.inputSignal,
+			this.plugin.api.bindTargetParser.toFullDeclaration(this.bindTarget, this.filePath)
+		);
 	}
 
 	unregisterSelfFromMetadataManager(): void {
-		if (this.metadataManagerReadSignalListener) {
-			this.readSignal.unregisterListener(this.metadataManagerReadSignalListener);
+		if (this.metadataManagerOutputSignalListener) {
+			this.outputSignal.unregisterListener(this.metadataManagerOutputSignalListener);
 		}
 
-		this.plugin.metadataManager.unregister(this.bindTarget.filePath ?? this.filePath, this.uuid);
+		this.metadataSubscription?.unsubscribe();
 	}
 
 	updateMetadataManager(value: unknown): void {
-		this.plugin.metadataManager.updatePropertyInCache(value, this.bindTarget.metadataPath, this.bindTarget.filePath ?? this.filePath, this.uuid);
+		this.metadataSubscription?.update(value);
 	}
 
 	getInitialValue(): T {
-		return this.writeSignal.get() ?? [];
+		return this.inputSignal.get() ?? [];
 	}
 
 	updateDisplayValue(values: T | undefined): void {
@@ -90,6 +97,7 @@ export class MetaBindTable extends AbstractMDRC {
 				const scope = new BindTargetScope({
 					metadataPath: [...this.bindTarget.metadataPath, i.toString()],
 					filePath: this.bindTarget.filePath,
+					listenToChildren: false,
 					boundToLocalScope: false,
 				});
 
@@ -132,16 +140,16 @@ export class MetaBindTable extends AbstractMDRC {
 	}
 
 	removeColumn(index: number): void {
-		const value = this.writeSignal.get() ?? [];
+		const value = this.inputSignal.get() ?? [];
 		value.splice(index, 1);
-		this.readSignal.set(value);
+		this.outputSignal.set(value);
 		this.updateDisplayValue(value);
 	}
 
 	addColumn(): void {
-		const value = this.writeSignal.get() ?? [];
+		const value = this.inputSignal.get() ?? [];
 		value.push({});
-		this.readSignal.set(value);
+		this.outputSignal.set(value);
 		this.updateDisplayValue(value);
 	}
 
@@ -156,13 +164,13 @@ export class MetaBindTable extends AbstractMDRC {
 			},
 		});
 
-		this.writeSignal.registerListener({
+		this.inputSignal.registerListener({
 			callback: values => {
 				this.updateDisplayValue(values);
 			},
 		});
 
-		this.updateDisplayValue(this.writeSignal.get());
+		this.updateDisplayValue(this.inputSignal.get());
 	}
 
 	public onunload(): void {
diff --git a/src/metadata/MetadataManager.ts b/src/metadata/MetadataManager.ts
@@ -355,21 +355,6 @@ export class MetadataManager {
 					console.debug(`meta-bind | MetadataManager >> notifying input field ${listener.uuid} of updated metadata value`, value);
 					listener.notify(value);
 				}
-
-				// if (listener.bindTarget.listenToChildren) {
-				// 	// TODO: this should update when there is any overlap in the beginning of the array
-				// 	if (arrayStartsWith(metadataPath, listener.bindTarget.metadataPath)) {
-				// 		const actualValue = traverseObjectByPath(listener.bindTarget.metadataPath, fileCache.metadata);
-				// 		console.debug(`meta-bind | MetadataManager >> notifying input field ${listener.uuid} of updated metadata value`, actualValue);
-				// 		listener.notify(actualValue);
-				// 	}
-				// } else {
-				// 	if (arrayStartsWith(listener.bindTarget.metadataPath, metadataPath)) {
-				// 		const actualValue = traverseObjectByPath(listener.bindTarget.metadataPath, fileCache.metadata);
-				// 		console.debug(`meta-bind | MetadataManager >> notifying input field ${listener.uuid} of updated metadata value`, actualValue);
-				// 		listener.notify(actualValue);
-				// 	}
-				// }
 			} else {
 				const v = traverseObjectByPath(listener.bindTarget.metadataPath, fileCache.metadata);
 				console.debug(
diff --git a/src/parsers/BindTargetParser.ts b/src/parsers/BindTargetParser.ts
@@ -70,6 +70,7 @@ export class BindTargetParser {
 
 		bindTargetDeclaration.metadataPath = unvalidatedBindTargetDeclaration.path.map(x => x.value);
 		bindTargetDeclaration.boundToLocalScope = unvalidatedBindTargetDeclaration.boundToLocalScope;
+		bindTargetDeclaration.listenToChildren = unvalidatedBindTargetDeclaration.listenToChildren;
 
 		return this.resolveScope(bindTargetDeclaration, scope);
 	}
diff --git a/src/parsers/inputFieldParser/InputFieldDeclaration.ts b/src/parsers/inputFieldParser/InputFieldDeclaration.ts
@@ -39,6 +39,7 @@ export interface InputFieldDeclaration {
 export interface UnvalidatedBindTargetDeclaration {
 	file?: ParsingResultNode;
 	boundToLocalScope: boolean;
+	listenToChildren: boolean;
 	path: ParsingResultNode[];
 }
 
diff --git a/src/parsers/nomParsers/BindTargetParsers.ts b/src/parsers/nomParsers/BindTargetParsers.ts
@@ -16,21 +16,23 @@ const firstMetadataPathPart: Parser<UnvalidatedBindTargetDeclaration> = P.or(
 			return {
 				file: undefined,
 				boundToLocalScope: prefix === '^',
+				listenToChildren: false,
 				path: firstPart,
-			};
+			} satisfies UnvalidatedBindTargetDeclaration;
 		},
-		P.or(P.string('^'), P.string('?')).optional(),
+		P.string('^').optional(),
 		bracketMetadataPathPart.atLeast(1)
 	),
 	P.sequenceMap(
 		(prefix, firstPart, bracketPath) => {
 			return {
 				file: undefined,
 				boundToLocalScope: prefix === '^',
+				listenToChildren: false,
 				path: [firstPart, ...bracketPath],
-			};
+			} satisfies UnvalidatedBindTargetDeclaration;
 		},
-		P.or(P.string('^'), P.string('?')).optional(),
+		P.string('^').skip(P.string('.')).optional(),
 		metadataPathPartIdent,
 		bracketMetadataPathPart.many()
 	)
diff --git a/src/parsers/nomParsers/ViewFieldParsers.ts b/src/parsers/nomParsers/ViewFieldParsers.ts
@@ -56,9 +56,12 @@ export const VIEW_FIELD_FULL_DECLARATION: Parser<PartialUnvalidatedViewFieldDecl
 
 const jsViewFieldBindTargetMapping: Parser<UnvalidatedJsViewFieldBindTargetMapping> = P.sequenceMap(
 	(bindTarget, children, _1, name) => {
+		if (children !== undefined) {
+			bindTarget.listenToChildren = true;
+		}
+
 		return {
 			bindTarget: bindTarget,
-			listenToChildren: children !== undefined,
 			name: name
 		} satisfies UnvalidatedJsViewFieldBindTargetMapping;
 	},
diff --git a/src/parsers/viewFieldParser/ViewFieldDeclaration.ts b/src/parsers/viewFieldParser/ViewFieldDeclaration.ts
@@ -45,7 +45,6 @@ export interface ViewFieldDeclaration {
 
 export interface UnvalidatedJsViewFieldBindTargetMapping {
 	bindTarget: UnvalidatedBindTargetDeclaration;
-	listenToChildren: boolean;
 	name: string;
 }
 
diff --git a/src/publish/PublishViewFieldMDRC.ts b/src/publish/PublishViewFieldMDRC.ts
@@ -54,11 +54,9 @@ export class PublishViewFieldMDRC extends MarkdownRenderChild {
 					if (typeof entry !== 'string') {
 						const variable: ViewFieldVariable = {
 							bindTargetDeclaration: entry,
-							writeSignal: new Signal<any>(undefined),
+							inputSignal: new Signal<any>(undefined),
 							uuid: self.crypto.randomUUID(),
-							writeSignalListener: undefined,
 							contextName: `MB_VAR_${varCounter}`,
-							listenToChildren: false,
 						};
 
 						this.variables.push(variable);
@@ -81,11 +79,11 @@ export class PublishViewFieldMDRC extends MarkdownRenderChild {
 	buildContext(): Record<string, any> {
 		const context: Record<string, any> = {};
 		for (const variable of this.variables ?? []) {
-			if (!variable.contextName || !variable.writeSignal) {
+			if (!variable.contextName || !variable.inputSignal) {
 				continue;
 			}
 
-			context[variable.contextName] = variable.writeSignal.get() ?? '';
+			context[variable.contextName] = variable.inputSignal.get() ?? '';
 		}
 
 		return context;
diff --git a/src/renderChildren/InputFieldMDRC.ts b/src/renderChildren/InputFieldMDRC.ts
@@ -35,7 +35,7 @@ export class InputFieldMDRC extends AbstractMDRC {
 	 */
 	public outputSignal: Signal<MBExtendedLiteral | undefined>;
 
-	metadataSubscription?: MetadataSubscription;
+	private metadataSubscription?: MetadataSubscription;
 
 	constructor(
 		containerEl: HTMLElement,
diff --git a/src/renderChildren/JsViewFieldMDRC.ts b/src/renderChildren/JsViewFieldMDRC.ts
@@ -39,11 +39,9 @@ export class JsViewFieldMDRC extends AbstractViewFieldMDRC {
 				for (const bindTargetMapping of this.viewFieldDeclaration.bindTargetMappings ?? []) {
 					this.variables.push({
 						bindTargetDeclaration: bindTargetMapping.bindTarget,
-						writeSignal: new Signal<any>(undefined),
+						inputSignal: new Signal<any>(undefined),
 						uuid: self.crypto.randomUUID(),
-						writeSignalListener: undefined,
 						contextName: bindTargetMapping.name,
-						listenToChildren: bindTargetMapping.listenToChildren,
 					});
 				}
 
@@ -67,11 +65,11 @@ export class JsViewFieldMDRC extends AbstractViewFieldMDRC {
 	buildContext(): Record<string, any> {
 		const context: Record<string, any> = {};
 		for (const variable of this.variables ?? []) {
-			if (!variable.contextName || !variable.writeSignal) {
+			if (!variable.contextName || !variable.inputSignal) {
 				continue;
 			}
 
-			context[variable.contextName] = variable.writeSignal.get() ?? '';
+			context[variable.contextName] = variable.inputSignal.get() ?? '';
 		}
 
 		return context;
@@ -106,7 +104,7 @@ export class JsViewFieldMDRC extends AbstractViewFieldMDRC {
 			this.variables.map((x): ComputedSubscriptionDependency => {
 				return {
 					bindTarget: this.plugin.api.bindTargetParser.toFullDeclaration(x.bindTargetDeclaration, this.filePath),
-					callbackSignal: x.writeSignal,
+					callbackSignal: x.inputSignal,
 				};
 			}),
 			() => this.update()
diff --git a/src/renderChildren/ViewFieldMDRC.ts b/src/renderChildren/ViewFieldMDRC.ts
@@ -13,11 +13,9 @@ import { ComputedMetadataSubscription, ComputedSubscriptionDependency } from '..
 
 export interface ViewFieldVariable {
 	bindTargetDeclaration: BindTargetDeclaration;
-	writeSignal: Signal<any>;
+	inputSignal: Signal<any>;
 	uuid: string;
-	writeSignalListener: Listener<any> | undefined;
 	contextName: string | undefined;
-	listenToChildren: boolean;
 }
 
 export class ViewFieldMDRC extends AbstractViewFieldMDRC {
@@ -65,7 +63,7 @@ export class ViewFieldMDRC extends AbstractViewFieldMDRC {
 				this.variables.map((x): ComputedSubscriptionDependency => {
 					return {
 						bindTarget: this.plugin.api.bindTargetParser.toFullDeclaration(x.bindTargetDeclaration, this.filePath),
-						callbackSignal: x.writeSignal,
+						callbackSignal: x.inputSignal,
 					};
 				}),
 				async () => await this.viewField?.computeValue(this.variables)
diff --git a/src/viewFields/fields/MathVF.ts b/src/viewFields/fields/MathVF.ts
@@ -28,11 +28,9 @@ export class MathVF extends AbstractViewField {
 			if (typeof entry !== 'string') {
 				const variable: ViewFieldVariable = {
 					bindTargetDeclaration: entry,
-					writeSignal: new Signal<any>(undefined),
+					inputSignal: new Signal<any>(undefined),
 					uuid: self.crypto.randomUUID(),
-					writeSignalListener: undefined,
 					contextName: `MB_VAR_${varCounter}`,
-					listenToChildren: false,
 				};
 
 				variables.push(variable);
@@ -60,11 +58,11 @@ export class MathVF extends AbstractViewField {
 	buildContext(variables: ViewFieldVariable[]): Record<string, any> {
 		const context: Record<string, any> = {};
 		for (const variable of variables ?? []) {
-			if (!variable.contextName || !variable.writeSignal) {
+			if (!variable.contextName || !variable.inputSignal) {
 				continue;
 			}
 
-			context[variable.contextName] = variable.writeSignal.get() ?? '';
+			context[variable.contextName] = variable.inputSignal.get() ?? '';
 		}
 
 		return context;
diff --git a/src/viewFields/fields/TextVF.ts b/src/viewFields/fields/TextVF.ts
@@ -29,11 +29,9 @@ export class TextVF extends AbstractViewField {
 			if (typeof entry !== 'string') {
 				const variable: ViewFieldVariable = {
 					bindTargetDeclaration: entry,
-					writeSignal: new Signal<any>(undefined),
+					inputSignal: new Signal<any>(undefined),
 					uuid: self.crypto.randomUUID(),
-					writeSignalListener: undefined,
 					contextName: `MB_VAR_${varCounter}`,
-					listenToChildren: false,
 				};
 
 				variables.push(variable);
@@ -80,7 +78,7 @@ export class TextVF extends AbstractViewField {
 		return this.textParts
 			.map(x => {
 				if (typeof x === 'number') {
-					return variables[x].writeSignal.get();
+					return variables[x].inputSignal.get();
 				} else {
 					return x;
 				}

Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,7 @@ export class BindTargetParser {`
`70`	`70`
`71`	`71`	`bindTargetDeclaration.metadataPath = unvalidatedBindTargetDeclaration.path.map(x => x.value);`
`72`	`72`	`bindTargetDeclaration.boundToLocalScope = unvalidatedBindTargetDeclaration.boundToLocalScope;`
	`73`	`+ bindTargetDeclaration.listenToChildren = unvalidatedBindTargetDeclaration.listenToChildren;`
`73`	`74`
`74`	`75`	`return this.resolveScope(bindTargetDeclaration, scope);`
`75`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ export interface InputFieldDeclaration {`
`39`	`39`	`export interface UnvalidatedBindTargetDeclaration {`
`40`	`40`	`file?: ParsingResultNode;`
`41`	`41`	`boundToLocalScope: boolean;`
	`42`	`+ listenToChildren: boolean;`
`42`	`43`	`path: ParsingResultNode[];`
`43`	`44`	`}`
`44`	`45`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,6 @@ export interface ViewFieldDeclaration {`
`45`	`45`
`46`	`46`	`export interface UnvalidatedJsViewFieldBindTargetMapping {`
`47`	`47`	`bindTarget: UnvalidatedBindTargetDeclaration;`
`48`		`- listenToChildren: boolean;`
`49`	`48`	`name: string;`
`50`	`49`	`}`
`51`	`50`