merge fixes

Author: mProjectsCode

exampleVault/examples fg.md

@@ -3,18 +3,17 @@ rating: 31
 title: test title test test
 completed: false
 toggle1: true
-slider1: 17
+slider1: 24
 slider2: 8
 text1: Testa
 text_area1: test test test
 date1: Wednesday, July 20th 2022
-select: option c
+select: option b
 nested:
   object: dfgdf
 multi_select:
   - option a
-  - option b
-  - option c
+  - option d
 time1: 10:17
 suggest: test
 editor: test **test**

exampleVault/other note.md

@@ -1,10 +1,11 @@
 ---
 tags: test
 title: "test test test "
-select: option c
+select: option b
 date: Tuesday, June 21st 2022
 time: 19:20
 multi-select:
+  - option a
   - option b
   - option c
 ---

src/InputFieldMarkdownRenderChild.ts

@@ -2,8 +2,7 @@ import { MarkdownRenderChild, TFile } from 'obsidian';
 import MetaBindPlugin from './main';
 import { AbstractInputField } from './inputFields/AbstractInputField';
 import { InputFieldFactory } from './inputFields/InputFieldFactory';
-import { InputFieldArgumentType, InputFieldDeclaration, InputFieldDeclarationParser } from './parsers/InputFieldDeclarationParser';
-import { isFalsy, isTruthy, MetaBindBindTargetError, MetaBindInternalError } from './utils/Utils';
+import { InputFieldArgumentType, InputFieldDeclaration } from './parsers/InputFieldDeclarationParser';
 import { AbstractInputFieldArgument } from './inputFieldArguments/AbstractInputFieldArgument';
 import { ClassInputFieldArgument } from './inputFieldArguments/ClassInputFieldArgument';
 import { parsePath, traverseObjectByPath } from '@opd-libs/opd-metadata-lib/lib/Utils';
@@ -33,7 +32,15 @@ export class InputFieldMarkdownRenderChild extends MarkdownRenderChild {
 	metadataValueUpdateQueue: any[];
 	inputFieldValueUpdateQueue: any[];
 
-	constructor(containerEl: HTMLElement, type: InputFieldMarkdownRenderChildType, fullDeclaration: string, plugin: MetaBindPlugin, filePath: string, uuid: string, error?: string) {
+	constructor(
+		containerEl: HTMLElement,
+		type: InputFieldMarkdownRenderChildType,
+		declaration: InputFieldDeclaration,
+		plugin: MetaBindPlugin,
+		filePath: string,
+		uuid: string,
+		error?: string
+	) {
 		super(containerEl);
 
 		this.error = error || '';
@@ -48,24 +55,20 @@ export class InputFieldMarkdownRenderChild extends MarkdownRenderChild {
 		this.intervalCounter = 0;
 		this.inputFieldDeclaration = declaration;
 
-		this.uid = this.plugin.markDownInputFieldIndex;
-		this.plugin.markDownInputFieldIndex += 1;
-
 		if (!error) {
-            try {
-			    if (this.inputFieldDeclaration.isBound) {
-			    	this.parseBindTarget();
-			    }
-
-
-			    this.inputField = InputFieldFactory.createInputField(this.inputFieldDeclaration.inputFieldType, {
-				    type: type,
-				    inputFieldMarkdownRenderChild: this,
-				    onValueChanged: this.updateMetadataManager.bind(this),
-			    });
-		    } catch (e: any) {
-			    this.error = e.message;
-                console.warn(e);
+			try {
+				if (this.inputFieldDeclaration.isBound) {
+					this.parseBindTarget();
+				}
+
+				this.inputField = InputFieldFactory.createInputField(this.inputFieldDeclaration.inputFieldType, {
+					type: type,
+					inputFieldMarkdownRenderChild: this,
+					onValueChanged: this.updateMetadataManager.bind(this),
+				});
+			} catch (e: any) {
+				this.error = e.message;
+				console.warn(e);
 			}
 		}
 	}

src/MetadataManager.ts

@@ -53,6 +53,7 @@ export class MetadataManager {
 			this.plugin.app.vault.cachedRead(file).then(value => {
 				c.metadata = getMetaDataFromFileContent(value);
 				console.log(`meta-bind | MetadataManager >> loaded metadata for file ${file.path}`, c.metadata);
+				debugger;
 				this.notifyListeners(c);
 			});
 

src/main.ts

@@ -1,11 +1,11 @@
 import { CachedMetadata, editorEditorField, MarkdownPostProcessorContext, Plugin, TFile } from 'obsidian';
-import { Plugin, TFile } from 'obsidian';
 import { DEFAULT_SETTINGS, MetaBindPluginSettings, MetaBindSettingTab } from './settings/Settings';
 import { InputFieldMarkdownRenderChild, InputFieldMarkdownRenderChildType } from './InputFieldMarkdownRenderChild';
 import { getFileName, isPath, removeFileEnding } from './utils/Utils';
 import { DateParser } from './parsers/DateParser';
-import { InputFieldDeclarationParser } from './parsers/InputFieldDeclarationParser';
+import { InputFieldArgumentType, InputFieldDeclaration, InputFieldDeclarationParser, InputFieldType } from './parsers/InputFieldDeclarationParser';
 import { MetadataManager } from './MetadataManager';
+import { MetaBindBindTargetError } from './utils/MetaBindErrors';
 
 export default class MetaBindPlugin extends Plugin {
 	// defined in `loadSettings`
@@ -83,7 +83,7 @@ export default class MetaBindPlugin extends Plugin {
 			}
 		}
 
-		return new InputFieldMarkdownRenderChild(container, renderType, declaration as InputFieldDeclaration, this, sourcePath, error);
+		return new InputFieldMarkdownRenderChild(container, renderType, declaration as InputFieldDeclaration, this, sourcePath, crypto.randomUUID(), error);
 	}
 
 	/**