Auto stash before merge of "master" and "origin/master"

Author: mProjectsCode

exampleVault/.obsidian/plugins/obsidian-meta-bind-plugin/main.js

@@ -5,15 +5,15 @@ rating: 31
 title: test title test test
 completed: false
 toggle1: true
-slider1: 37
+slider1: 7
 slider2: 5
 text1: Test text
-text_area1: Test text area
-date1: 06/28/2022
+text_area1: Test test
+date1: 2022-05-28
 select: option c
 multi-select:
-  - option b
-  - option d
+  - option a
+  - option c
 time1: 10:17
 ---
 
@@ -80,6 +80,15 @@ option(option d)
 ):multi-select]
 ```
 
+## In callouts
+> quote
+> `INPUT[slider(addLabels, minValue(1), maxValue(10)):slider1]`
+
+> [!INFO]
+> `INPUT[slider(addLabels, minValue(1), maxValue(10)):slider1]` Slider
+
+> [!INFO]
+> `INPUT[slider(addLabels, minValue(1), maxValue(10)):slider1]`
 
 ## Linking to a different note
 Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque sit amet porttitor arcu. Quisque scelerisque dolor augue, et posuere nulla bibendum nec. Curabitur sed rhoncus nisl.
@@ -112,7 +121,7 @@ option(option d)
 ):other note#multi-select]
 ```
 
-Lorem ipsum dolor sit amet, `INPUT[date():other note#date]` consectetur adipiscing elit. Pellentesque sit amet porttitor arcu. Quisque scelerisque dolor augue, et posuere nulla bibendum nec. Curabitur sed rhoncus nisl. Maecenas nisi justo, viverra vel tempus vel, hendrerit at metus. 
+Lorem ipsum dolor sit amet, `INPUT[date():other note#date]` consectetur adipiscing elit. Pellentesque sit amet porttitor arcu. Quisque scelerisque dolor augue, et posuere nulla bibendum nec. `INPUT[date():other note#date]` Curabitur sed rhoncus nisl. Maecenas nisi justo, viverra vel tempus vel, hendrerit at metus. 
 
 ## Error Messages
 - `INPUT[text():meta bind/nonExistantFile#title]`

exampleVault/examples.md

@@ -1,9 +1,9 @@
 ---
-title: Text in a different note
-select: option c
+title: Text in a diffea
+select: option b
 multi-select:
   - option b
   - option c
-date: 08/08/2002
+date: Thursday, June 27th 2030
 time: 19:20
 ---

exampleVault/other note.md

@@ -1,26 +1,27 @@
 import {AbstractInputField} from './AbstractInputField';
 import {DropdownComponent, TextComponent} from 'obsidian';
 import {InputFieldMarkdownRenderChild} from '../InputFieldMarkdownRenderChild';
-import {Date, DateFormat, DateParser} from '../parsers/DateParser';
+import {DateParser} from '../parsers/DateParser';
 import {MetaBindInternalError} from '../utils/Utils';
+import {moment} from 'obsidian';
 
 export class DateInputField extends AbstractInputField {
 	container: HTMLDivElement | undefined;
-	date: Date;
+	date: moment.Moment;
 
 	months: Record<string, string> = {
-		'1': 'January',
-		'2': 'February',
-		'3': 'March',
-		'4': 'April',
-		'5': 'May',
-		'6': 'June',
-		'7': 'July',
-		'8': 'August',
-		'9': 'September',
-		'10': 'October',
-		'11': 'November',
-		'12': 'December',
+		'0': 'January',
+		'1': 'February',
+		'2': 'March',
+		'3': 'April',
+		'4': 'May',
+		'5': 'June',
+		'6': 'July',
+		'7': 'August',
+		'8': 'September',
+		'9': 'October',
+		'10': 'November',
+		'11': 'December',
 	};
 	days: Record<string, string>;
 
@@ -65,9 +66,9 @@ export class DateInputField extends AbstractInputField {
 
 		this.date = DateParser.parse(value) ?? DateParser.getDefaultDate();
 		// console.log(this.date);
-		this.monthComponent.setValue(this.date.getMonth().toString());
-		this.dayComponent.setValue(this.date.getDay().toString());
-		this.yearComponent.setValue(this.date.getYear().toString());
+		this.monthComponent.setValue(this.date.month().toString());
+		this.dayComponent.setValue(this.date.date().toString());
+		this.yearComponent.setValue(this.date.year().toString());
 	}
 
 	public isEqualValue(value: any): boolean {
@@ -80,40 +81,41 @@ export class DateInputField extends AbstractInputField {
 
 	public render(container: HTMLDivElement): void {
 		this.date = DateParser.parse(this.inputFieldMarkdownRenderChild.getInitialValue()) ?? DateParser.getDefaultDate();
+		let useUsInputOrder = this.inputFieldMarkdownRenderChild.plugin.settings.useUsDateInputOrder;
 
 		container.removeClass('meta-bind-plugin-input-wrapper');
 		container.addClass('meta-bind-plugin-flex-input-wrapper', 'meta-bind-plugin-input-element-group');
 
-		if (DateParser.dateFormat === DateFormat.EU) {
+		if (!useUsInputOrder) {
 			this.dayComponent = new DropdownComponent(container);
 			this.dayComponent.addOptions(this.days);
-			this.dayComponent.setValue(this.date.getDay().toString());
+			this.dayComponent.setValue(this.date.date().toString());
 			this.dayComponent.onChange(this.onDayChange.bind(this));
 
 			this.monthComponent = new DropdownComponent(container);
 			this.monthComponent.addOptions(this.months);
-			this.monthComponent.setValue(this.date.getMonth().toString());
+			this.monthComponent.setValue(this.date.month().toString());
 			this.monthComponent.onChange(this.onMonthChange.bind(this));
 
 			this.dayComponent.selectEl.addClass('meta-bind-plugin-input-element-group-element');
 			this.monthComponent.selectEl.addClass('meta-bind-plugin-input-element-group-element');
 		} else {
 			this.monthComponent = new DropdownComponent(container);
 			this.monthComponent.addOptions(this.months);
-			this.monthComponent.setValue(this.date.getMonth().toString());
+			this.monthComponent.setValue(this.date.month().toString());
 			this.monthComponent.onChange(this.onMonthChange.bind(this));
 
 			this.dayComponent = new DropdownComponent(container);
 			this.dayComponent.addOptions(this.days);
-			this.dayComponent.setValue(this.date.getDay().toString());
+			this.dayComponent.setValue(this.date.date().toString());
 			this.dayComponent.onChange(this.onDayChange.bind(this));
 
 			this.dayComponent.selectEl.addClass('meta-bind-plugin-input-element-group-element');
 			this.monthComponent.selectEl.addClass('meta-bind-plugin-input-element-group-element');
 		}
 
 		this.yearComponent = new TextComponent(container);
-		this.yearComponent.setValue(this.date.getYear().toString());
+		this.yearComponent.setValue(this.date.year().toString());
 		this.yearComponent.onChange(this.onYearChange.bind(this));
 
 		this.yearComponent.inputEl.addClass('meta-bind-plugin-date-input-year-input');
@@ -125,19 +127,41 @@ export class DateInputField extends AbstractInputField {
 	}
 
 	private onMonthChange(value: string): void {
-		// console.log(value);
-		this.date.setMonthFromString(value);
+		this.date.month(value);
+
+		const clampedDay = this.clampDay(this.date.date());
+		this.dayComponent?.setValue(clampedDay.toString());
+		this.date.date(clampedDay);
+
 		this.onValueChange(this.getValue());
 	}
 
 	private onDayChange(value: string): void {
-		this.date.setDayFromString(value);
+		const day = Number.parseInt(value);
+		const clampedDay = this.clampDay(day);
+		if (clampedDay !== day) {
+			this.dayComponent?.setValue(clampedDay.toString());
+		}
+
+		this.date.date(clampedDay);
 		this.onValueChange(this.getValue());
 	}
 
 	private onYearChange(value: string): void {
-		this.date.setYearFromString(value);
+		const year = Number.parseInt(value);
+		this.date.year(Number.isNaN(year) ? DateParser.getDefaultYear() : year);
 		this.onValueChange(this.getValue());
 	}
 
+	private clampDay(day: number): number {
+		if (Number.isNaN(day)) {
+			return DateParser.getDefaultDay();
+		} else if (day < 1) {
+			return 1;
+		} else if (day > this.date.daysInMonth()) {
+			return this.date.daysInMonth();
+		}
+		return day;
+	}
+
 }

src/inputFields/DateInputField.ts

@@ -18,7 +18,7 @@ export default class MetaBindPlugin extends Plugin {
 		await this.loadSettings();
 
 		Logger.devMode = this.settings.devMode;
-		DateParser.dateFormat = this.settings.dateFormat;
+		DateParser.dateFormat = this.settings.preferredDateFormat;
 
 		this.activeMarkdownInputFields = [];
 		this.markDownInputFieldIndex = 0;
@@ -31,7 +31,13 @@ export default class MetaBindPlugin extends Plugin {
 				const isInputField = text.startsWith('INPUT[') && text.endsWith(']');
 				// console.log(context.sourcePath);
 				if (isInputField) {
-					context.addChild(new InputFieldMarkdownRenderChild(codeBlock, InputFieldMarkdownRenderChildType.INLINE_CODE_BLOCK, text, this, context.sourcePath, this.markDownInputFieldIndex));
+					context.addChild(new InputFieldMarkdownRenderChild(
+						codeBlock,
+						InputFieldMarkdownRenderChildType.INLINE_CODE_BLOCK,
+						text, this,
+						context.sourcePath,
+						this.markDownInputFieldIndex
+					));
 					this.markDownInputFieldIndex += 1;
 				}
 			}
@@ -43,14 +49,20 @@ export default class MetaBindPlugin extends Plugin {
 			const isInputField = text.startsWith('INPUT[') && text.endsWith(']');
 			// console.log(context.sourcePath);
 			if (isInputField) {
-				ctx.addChild(new InputFieldMarkdownRenderChild(codeBlock, InputFieldMarkdownRenderChildType.CODE_BLOCK, text, this, ctx.sourcePath, this.markDownInputFieldIndex));
+				ctx.addChild(new InputFieldMarkdownRenderChild(
+					codeBlock,
+					InputFieldMarkdownRenderChildType.CODE_BLOCK,
+					text,
+					this,
+					ctx.sourcePath,
+					this.markDownInputFieldIndex));
 				this.markDownInputFieldIndex += 1;
 			}
 		});
 
 		this.registerEvent(this.app.vault.on('modify', async abstractFile => {
 			if (abstractFile instanceof TFile) {
-				await this.updateMarkdownInputFieldsOnFileChange(abstractFile as TFile);
+				await this.updateMarkdownInputFieldsOnFileChange(abstractFile);
 			}
 		}));
 
@@ -97,15 +109,16 @@ export default class MetaBindPlugin extends Plugin {
 		}
 
 		let fileContent: string = await this.app.vault.read(file);
-		const regExp = new RegExp('^(---)\\n[\\s\\S]*\\n---');
-		fileContent = fileContent.replace(regExp, '');
 
-		const metadata: any = await this.getMetaDataForFile(file);
+		const metadata: any = await this.getMetaDataForFileContent(fileContent);
 		// console.log(metadata);
 		if (!metadata) {
 			return;
 		}
 
+		const regExp = new RegExp('^(---)\\n[\\s\\S]*\\n---');
+		fileContent = fileContent.replace(regExp, '');
+
 		metadata[key] = value;
 		// console.log(metadata);
 
@@ -118,7 +131,7 @@ export default class MetaBindPlugin extends Plugin {
 		const fileNameIsPath = isPath(name);
 		const processedFileName = fileNameIsPath ? removeFileEnding(name) : getFileName(removeFileEnding(name));
 
-		const allFiles = this.app.vault.getFiles();
+		const allFiles = this.app.vault.getMarkdownFiles();
 		const files: TFile[] = [];
 		for (const file of allFiles) {
 			// console.log(removeFileEnding(file.path));
@@ -137,10 +150,18 @@ export default class MetaBindPlugin extends Plugin {
 	}
 
 	async getMetaDataForFile(file: TFile): Promise<any> {
+		if (!file) {
+			return undefined;
+		}
+
+		const fileContent: string = await this.app.vault.read(file);
+		return await this.getMetaDataForFileContent(fileContent);
+	}
+
+	async getMetaDataForFileContent(fileContent: string): Promise<any> {
 		// Logger.logDebug(`reading metadata for ${file.path}`);
 		let metadata: any;
 
-		const fileContent: string = await this.app.vault.read(file);
 		const regExp = new RegExp('^(---)\\n[\\s\\S]*\\n---');
 		const frontMatterRegExpResult = regExp.exec(fileContent);
 		if (!frontMatterRegExpResult) {
@@ -171,7 +192,7 @@ export default class MetaBindPlugin extends Plugin {
 	}
 
 	async saveSettings(): Promise<void> {
-		DateParser.dateFormat = this.settings.dateFormat;
+		DateParser.dateFormat = this.settings.preferredDateFormat;
 		Logger.devMode = this.settings.devMode;
 		await this.saveData(this.settings);
 	}