moved things, mb table and tests

Author: mProjectsCode

exampleVault/Advanced Examples/PF2e Encounter Calculator.md

@@ -1,22 +1,27 @@
 ---
 playerCount: 6
-playerLevel: 2
+playerLevel: 4
 enemy:
-  - name: Something
-    level: 3
+  - name: Someting
+    level: 4
     count: 1
+    variant: 0
   - name: Some other thing
+    level: 2
+    count: 1
+    variant: 0
+  - name: dragon
+    level: 2
+    count: 2
+    variant: -1
+  - name: test
     level: 1
     count: 1
-  - name: ""
-    level: 0
-    count: 0
-  - name: ""
-    level: 0
-    count: 0
-  - name: ""
-    level: 0
-    count: 0
+    variant: 0
+test:
+  - a
+  - b
+  - c
 ---
 
 
@@ -28,14 +33,60 @@ Player Level: `INPUT[number:playerLevel]`
 
 ### Enemies
 
-| Name                        | Level                        | Count                        |
+%% | Name                        | Level                        | Count                        |
 | --------------------------- | ---------------------------- | ---------------------------- |
 | `INPUT[text:enemy[0].name]` | `INPUT[number:enemy[0].level]` | `INPUT[number:enemy[0].count]` |
 | `INPUT[text:enemy[1].name]` | `INPUT[number:enemy[1].level]` | `INPUT[number:enemy[1].count]` |
 | `INPUT[text:enemy[2].name]` | `INPUT[number:enemy[2].level]` | `INPUT[number:enemy[2].count]` |
 | `INPUT[text:enemy[3].name]` | `INPUT[number:enemy[3].level]` | `INPUT[number:enemy[3].count]` |
 | `INPUT[text:enemy[4].name]` | `INPUT[number:enemy[4].level]` | `INPUT[number:enemy[4].count]` |
 
+```js
+const mb = engine.getPlugin('obsidian-meta-bind-plugin').api;
+
+function render(enemies) {
+	const md = engine.markdown.createBuilder();
+	md.createTable(
+		['Name', 'Level', 'Count'], 
+		enemies.map((x, i) => {
+			return [
+				`\`INPUT[text:enemy[${i}].name]\``,
+				`\`INPUT[text:enemy[${i}].level]\``,
+				`\`INPUT[text:enemy[${i}].count]\``
+			]
+		})
+	);
+	return md;
+}
+
+const signal = mb.createSignal([]);
+const unregisterCb = mb.listenToMetadata(signal, context.file.path, ['enemy'], false);
+
+const reactive = engine.reactive(render, signal.get());
+
+component.register(unregisterCb);
+
+return reactive;
+``` 
+%%
+
+
+```js-engine
+const mb = engine.getPlugin('obsidian-meta-bind-plugin').api;
+
+const bindTarget = mb.createBindTarget('enemy');
+const tableHead = ['Name', 'Level', 'Variant', 'Count'];
+const columns = [
+	mb.inputField.createInputFieldDeclarationFromString('INPUT[text:^.name]'),
+	mb.inputField.createInputFieldDeclarationFromString('INPUT[number:^.level]'),
+	mb.inputField.createInputFieldDeclarationFromString('INPUT[inlineSelect(option(-1, weak), option(0, normal), option(1, elite)):^.variant]'),
+	mb.inputField.createInputFieldDeclarationFromString('INPUT[number:^.count]')
+];
+
+mb.createTable(container, context.file.path, component, bindTarget, tableHead, columns);
+```
+
+
 ### Encounter Stats
 
 ```meta-bind-js-view
@@ -79,11 +130,11 @@ function getXP(enemyLevel) {
 function calculateTotalXP() {
 	let acc = 0;
 	for (const enemy of context.enemies) {
-		const xp = getXP(enemy.level);
+		const xp = getXP((enemy.level ?? 0) + (enemy.variant ?? 0));
 		if (xp === -1) {
 			return -1;
 		}
-		acc += xp * enemy.count;
+		acc += xp * (enemy.count ?? 0);
 	}
 	return acc;
 }

jest.config.js

@@ -3,4 +3,5 @@ module.exports = {
 	testEnvironment: 'jsdom',
 	moduleDirectories: ['node_modules', 'src'],
 	verbose: true,
+	setupFilesAfterEnv: ['<rootDir>/tests/CustomMatchers/jest.custom_matchers.setup.ts'],
 };

package-lock.json

@@ -45,7 +45,7 @@
 	},
 	"dependencies": {
 		"@codemirror/language": "https://github.com/lishid/cm-language",
-		"@lemons_dev/parsinom": "^0.0.8",
+		"@lemons_dev/parsinom": "^0.0.9",
 		"@opd-libs/opd-metadata-lib": "0.0.4",
 		"@opd-libs/opd-utils-lib": "0.0.2",
 		"@popperjs/core": "^2.11.8",

package.json

@@ -1,20 +1,28 @@
 import { InputFieldMDRC, RenderChildType } from '../renderChildren/InputFieldMDRC';
-import { JsViewFieldDeclaration, ViewFieldDeclaration, ViewFieldDeclarationParser } from '../parsers/ViewFieldDeclarationParser';
+import {
+	JsViewFieldDeclaration,
+	UnvalidatedViewFieldDeclaration,
+	ViewFieldDeclaration,
+	ViewFieldDeclarationParser,
+} from '../parsers/ViewFieldDeclarationParser';
 import { BindTargetParser } from '../parsers/BindTargetParser';
 import { ViewFieldMDRC } from '../renderChildren/ViewFieldMDRC';
 import { JsViewFieldMDRC } from '../renderChildren/JsViewFieldMDRC';
 import MetaBindPlugin from '../main';
-import { NewInputFieldDeclarationParser } from '../parsers/newInputFieldParser/InputFieldParser';
+import { InputFieldDeclarationParser } from '../parsers/inputFieldParser/InputFieldParser';
 import { Component, MarkdownPostProcessorContext } from 'obsidian';
 import { InputFieldAPI } from './InputFieldAPI';
 import { IAPI } from './IAPI';
 import { ExcludedMDRC } from '../renderChildren/ExcludedMDRC';
-import { InputFieldDeclaration, UnvalidatedInputFieldDeclaration } from '../parsers/newInputFieldParser/InputFieldDeclaration';
+import { BindTargetDeclaration, InputFieldDeclaration, UnvalidatedInputFieldDeclaration } from '../parsers/inputFieldParser/InputFieldDeclaration';
+import { Signal } from '../utils/Signal';
+import { BindTargetScope } from '../metadata/BindTargetScope';
+import { MetaBindTable } from '../metaBindTable/MetaBindTable';
 
 export class API implements IAPI {
 	public plugin: MetaBindPlugin;
 	// public inputFieldParser: InputFieldDeclarationParser;
-	public readonly newInputFieldParser: NewInputFieldDeclarationParser;
+	public readonly inputFieldParser: InputFieldDeclarationParser;
 	public readonly viewFieldParser: ViewFieldDeclarationParser;
 	public readonly bindTargetParser: BindTargetParser;
 
@@ -24,7 +32,7 @@ export class API implements IAPI {
 		this.plugin = plugin;
 
 		// this.inputFieldParser = new InputFieldDeclarationParser();
-		this.newInputFieldParser = new NewInputFieldDeclarationParser(this.plugin);
+		this.inputFieldParser = new InputFieldDeclarationParser(this.plugin);
 		this.viewFieldParser = new ViewFieldDeclarationParser(this.plugin);
 		this.bindTargetParser = new BindTargetParser(this.plugin);
 
@@ -42,7 +50,7 @@ export class API implements IAPI {
 			return this.createExcludedField(containerEl, filePath, component);
 		}
 
-		const declaration = this.newInputFieldParser.validateDeclaration(unvalidatedDeclaration);
+		const declaration = this.inputFieldParser.validateDeclaration(unvalidatedDeclaration);
 
 		const inputField = new InputFieldMDRC(containerEl, renderType, declaration, this.plugin, filePath, self.crypto.randomUUID());
 		component.addChild(inputField);
@@ -55,13 +63,14 @@ export class API implements IAPI {
 		renderType: RenderChildType,
 		filePath: string,
 		containerEl: HTMLElement,
-		component: Component | MarkdownPostProcessorContext
+		component: Component | MarkdownPostProcessorContext,
+		scope: BindTargetScope
 	): InputFieldMDRC | ExcludedMDRC {
 		if (this.plugin.isFilePathExcluded(filePath)) {
 			return this.createExcludedField(containerEl, filePath, component);
 		}
 
-		const declaration: InputFieldDeclaration = this.newInputFieldParser.parseString(fullDeclaration);
+		const declaration: InputFieldDeclaration = this.inputFieldParser.parseString(fullDeclaration);
 
 		const inputField = new InputFieldMDRC(containerEl, renderType, declaration, this.plugin, filePath, self.crypto.randomUUID());
 		component.addChild(inputField);
@@ -113,4 +122,43 @@ export class API implements IAPI {
 
 		return excludedField;
 	}
+
+	public createSignal<T>(value: T): Signal<T> {
+		return new Signal<T>(value);
+	}
+
+	/**
+	 * Registers a signal to a metadata property and returns a callback to unregister.
+	 *
+	 * @param signal
+	 * @param filePath
+	 * @param metadataPath
+	 * @param listenToChildren
+	 */
+	public listenToMetadata(signal: Signal<unknown>, filePath: string, metadataPath: string[], listenToChildren: boolean = false): () => void {
+		const uuid = self.crypto.randomUUID();
+		this.plugin.metadataManager.register(filePath, signal, metadataPath, listenToChildren, uuid);
+
+		return () => {
+			this.plugin.metadataManager.unregister(filePath, uuid);
+		};
+	}
+
+	public createTable(
+		containerEl: HTMLElement,
+		filePath: string,
+		component: Component | MarkdownPostProcessorContext,
+		bindTarget: BindTargetDeclaration,
+		tableHead: string[],
+		columns: (UnvalidatedInputFieldDeclaration | UnvalidatedViewFieldDeclaration)[]
+	): MetaBindTable {
+		const table = new MetaBindTable(containerEl, RenderChildType.INLINE, this.plugin, filePath, self.crypto.randomUUID(), bindTarget, tableHead, columns);
+		component.addChild(table);
+
+		return table;
+	}
+
+	public createBindTarget(fullDeclaration: string): BindTargetDeclaration {
+		return this.bindTargetParser.parseAndValidateBindTarget(fullDeclaration);
+	}
 }

src/api/API.ts

@@ -1,12 +1,12 @@
-import { NewInputFieldDeclarationParser } from '../parsers/newInputFieldParser/InputFieldParser';
+import { InputFieldDeclarationParser } from '../parsers/inputFieldParser/InputFieldParser';
 import { ViewFieldDeclarationParser } from '../parsers/ViewFieldDeclarationParser';
 import { BindTargetParser } from '../parsers/BindTargetParser';
 import { IPlugin } from '../IPlugin';
 import { InputFieldAPI } from './InputFieldAPI';
 
 export interface IAPI {
 	readonly plugin: IPlugin;
-	readonly newInputFieldParser: NewInputFieldDeclarationParser;
+	readonly inputFieldParser: InputFieldDeclarationParser;
 	readonly viewFieldParser: ViewFieldDeclarationParser;
 	readonly bindTargetParser: BindTargetParser;
 	readonly inputField: InputFieldAPI;

src/api/IAPI.ts

@@ -5,7 +5,7 @@ import {
 	UnvalidatedBindTargetDeclaration,
 	UnvalidatedInputFieldArgument,
 	UnvalidatedInputFieldDeclaration,
-} from '../parsers/newInputFieldParser/InputFieldDeclaration';
+} from '../parsers/inputFieldParser/InputFieldDeclaration';
 import { InputFieldArgumentType, InputFieldType } from '../inputFields/InputFieldConfigs';
 
 export class InputFieldAPI {
@@ -36,7 +36,7 @@ export class InputFieldAPI {
 	}
 
 	public createInputFieldDeclarationFromString(fullDeclaration: string): UnvalidatedInputFieldDeclaration {
-		return this.api.newInputFieldParser.parseStringWithoutValidation(fullDeclaration);
+		return this.api.inputFieldParser.parseStringWithoutValidation(fullDeclaration);
 	}
 
 	public setType(unvalidatedDeclaration: UnvalidatedInputFieldDeclaration, inputFieldType: InputFieldType): UnvalidatedInputFieldDeclaration {
@@ -82,7 +82,7 @@ export class InputFieldAPI {
 		if (unvalidatedDeclaration.bindTarget) {
 			unvalidatedDeclaration.bindTarget.file = { value: bindTargetFile };
 		} else {
-			unvalidatedDeclaration.bindTarget = { file: { value: bindTargetFile }, path: [] };
+			unvalidatedDeclaration.bindTarget = { file: { value: bindTargetFile }, path: [], boundToLocalScope: false };
 		}
 
 		return unvalidatedDeclaration;
@@ -99,7 +99,7 @@ export class InputFieldAPI {
 		if (unvalidatedDeclaration.bindTarget) {
 			unvalidatedDeclaration.bindTarget.path = bindTargetMetadataField.map(x => ({ value: x }));
 		} else {
-			unvalidatedDeclaration.bindTarget = { file: undefined, path: bindTargetMetadataField.map(x => ({ value: x })) };
+			unvalidatedDeclaration.bindTarget = { file: undefined, path: bindTargetMetadataField.map(x => ({ value: x })), boundToLocalScope: false };
 		}
 
 		return unvalidatedDeclaration;
@@ -111,11 +111,11 @@ export class InputFieldAPI {
 	}
 
 	public applyTemplate(unvalidatedDeclaration: UnvalidatedInputFieldDeclaration): UnvalidatedInputFieldDeclaration {
-		return this.api.newInputFieldParser.applyTemplate(unvalidatedDeclaration);
+		return this.api.inputFieldParser.applyTemplate(unvalidatedDeclaration);
 	}
 
 	public getTemplate(templateName: string): Readonly<UnvalidatedInputFieldDeclaration> | undefined {
-		return this.api.newInputFieldParser.getTemplate(templateName);
+		return this.api.inputFieldParser.getTemplate(templateName);
 	}
 
 	public merge(unvalidatedDeclaration: UnvalidatedInputFieldDeclaration, override: UnvalidatedInputFieldDeclaration): UnvalidatedInputFieldDeclaration {

src/api/InputFieldAPI.ts

@@ -1,5 +1,5 @@
 import { ErrorLevel, MetaBindArgumentError } from '../utils/errors/MetaBindErrors';
-import { ParsingResultNode } from '../parsers/newInputFieldParser/InputFieldParser';
+import { ParsingResultNode } from '../parsers/inputFieldParser/InputFieldParser';
 import { InputFieldArgumentConfig, InputFieldArgumentValueConfig, InputFieldType } from '../inputFields/InputFieldConfigs';
 
 export abstract class AbstractInputFieldArgument {
@@ -34,7 +34,9 @@ export abstract class AbstractInputFieldArgument {
 			return true;
 		}
 
-		return this.getConfig().allowedInputFieldTypes.contains(inputFieldType);
+		console.log(this.getConfig().allowedInputFieldTypes);
+
+		return this.getConfig().allowedInputFieldTypes.includes(inputFieldType);
 	}
 
 	getAllowedInputFieldsAsString(): string {

src/inputFieldArguments/AbstractInputFieldArgument.ts

@@ -1,5 +1,5 @@
 import { AbstractInputFieldArgument } from '../AbstractInputFieldArgument';
-import { ParsingResultNode } from '../../parsers/newInputFieldParser/InputFieldParser';
+import { ParsingResultNode } from '../../parsers/inputFieldParser/InputFieldParser';
 import { InputFieldArgumentConfig, InputFieldArgumentConfigs, InputFieldArgumentType, InputFieldType } from '../../inputFields/InputFieldConfigs';
 
 export class AddLabelsInputFieldArgument extends AbstractInputFieldArgument {

src/inputFieldArguments/arguments/AddLabelsInputFieldArgument.ts

@@ -1,6 +1,6 @@
 import { AbstractInputFieldArgument } from '../AbstractInputFieldArgument';
 
-import { ParsingResultNode } from '../../parsers/newInputFieldParser/InputFieldParser';
+import { ParsingResultNode } from '../../parsers/inputFieldParser/InputFieldParser';
 import { InputFieldArgumentConfig, InputFieldArgumentConfigs, InputFieldArgumentType, InputFieldType } from '../../inputFields/InputFieldConfigs';
 
 export class ClassInputFieldArgument extends AbstractInputFieldArgument {