view field rework; a lot of stuff is broken

Author: mProjectsCode

exampleVault/Input Fields/Inline Select.md

@@ -1,7 +1,7 @@
 ---
 select: a
 select2: 1
-select3: 1 hour
+select3: 2 hours
 ---
 
 ```meta-bind
@@ -14,4 +14,4 @@ INPUT[inlineSelect(option(1, a), option(2, b), showcase):select2]
 
 ```meta-bind
 INPUT[inlineSelect(option(1 hour, a), option(2 hours, b), showcase):select3]
-```
+```

src/api/API.ts

@@ -1,10 +1,5 @@
 import { InputFieldMDRC, RenderChildType } from '../renderChildren/InputFieldMDRC';
-import {
-	JsViewFieldDeclaration,
-	UnvalidatedViewFieldDeclaration,
-	ViewFieldDeclaration,
-	ViewFieldDeclarationParser,
-} from '../parsers/ViewFieldDeclarationParser';
+import { ViewFieldDeclarationParser } from '../parsers/viewFieldParser/ViewFieldDeclarationParser';
 import { BindTargetParser } from '../parsers/BindTargetParser';
 import { ViewFieldMDRC } from '../renderChildren/ViewFieldMDRC';
 import { JsViewFieldMDRC } from '../renderChildren/JsViewFieldMDRC';
@@ -19,6 +14,7 @@ import { Signal } from '../utils/Signal';
 import { BindTargetScope } from '../metadata/BindTargetScope';
 import { MetaBindTable } from '../metaBindTable/MetaBindTable';
 import { NewInputFieldFactory } from '../inputFields/_new/NewInputFieldFactory';
+import { JsViewFieldDeclaration, UnvalidatedViewFieldDeclaration, ViewFieldDeclaration } from '../parsers/viewFieldParser/ViewFieldDeclaration';
 
 export class API implements IAPI {
 	public plugin: MetaBindPlugin;

src/api/IAPI.ts

@@ -1,5 +1,5 @@
 import { InputFieldDeclarationParser } from '../parsers/inputFieldParser/InputFieldParser';
-import { ViewFieldDeclarationParser } from '../parsers/ViewFieldDeclarationParser';
+import { ViewFieldDeclarationParser } from '../parsers/viewFieldParser/ViewFieldDeclarationParser';
 import { BindTargetParser } from '../parsers/BindTargetParser';
 import { IPlugin } from '../IPlugin';
 import { InputFieldAPI } from './InputFieldAPI';

src/api/InputFieldAPI.ts

@@ -3,10 +3,10 @@ import { ErrorCollection } from '../utils/errors/ErrorCollection';
 import { IAPI } from './IAPI';
 import {
 	UnvalidatedBindTargetDeclaration,
-	UnvalidatedInputFieldArgument,
+	UnvalidatedFieldArgument,
 	UnvalidatedInputFieldDeclaration,
 } from '../parsers/inputFieldParser/InputFieldDeclaration';
-import { InputFieldArgumentType, InputFieldType } from '../inputFields/InputFieldConfigs';
+import { InputFieldArgumentType, InputFieldType } from '../parsers/inputFieldParser/InputFieldConfigs';
 
 export class InputFieldAPI {
 	private readonly api: IAPI;
@@ -21,7 +21,7 @@ export class InputFieldAPI {
 	): UnvalidatedInputFieldDeclaration {
 		const errorCollection = new ErrorCollection('input field declaration');
 
-		const mappedArguments: UnvalidatedInputFieldArgument[] = (inputFieldArguments ?? []).map(x => ({
+		const mappedArguments: UnvalidatedFieldArgument[] = (inputFieldArguments ?? []).map(x => ({
 			name: { value: x.name },
 			value: x.value.map(y => ({ value: y })),
 		}));
@@ -137,7 +137,7 @@ export class InputFieldAPI {
 			fullDeclaration: override.fullDeclaration,
 			inputFieldType: override.inputFieldType !== undefined ? override.inputFieldType : unvalidatedDeclaration.inputFieldType,
 			bindTarget: bindTarget,
-			arguments: override.arguments.concat(unvalidatedDeclaration.arguments).reduce<UnvalidatedInputFieldArgument[]>((arr, currentValue) => {
+			arguments: override.arguments.concat(unvalidatedDeclaration.arguments).reduce<UnvalidatedFieldArgument[]>((arr, currentValue) => {
 				// filter out duplicates
 				if (arr.find(x => x.name === currentValue.name) === undefined) {
 					arr.push(currentValue);

src/inputFieldArguments/AbstractInputFieldArgument.ts renamed to src/fieldArguments/AbstractFieldArgument.ts

@@ -1,11 +1,15 @@
-import { ErrorLevel, MetaBindArgumentError } from '../utils/errors/MetaBindErrors';
-import { InputFieldArgumentConfig, InputFieldArgumentValueConfig, InputFieldType } from '../inputFields/InputFieldConfigs';
 import { ParsingResultNode } from '../parsers/nomParsers/GeneralParsers';
+import { ErrorLevel, MetaBindArgumentError } from '../utils/errors/MetaBindErrors';
+import { FieldArgumentConfig, FieldArgumentValueConfig } from '../parsers/GeneralConfigs';
 
-export abstract class AbstractInputFieldArgument {
+export abstract class AbstractFieldArgument<
+	FieldType extends string,
+	FieldArgumentType extends string,
+	FieldConfig extends FieldArgumentConfig<FieldArgumentType, FieldType>
+> {
 	value: any;
 
-	abstract getConfig(): InputFieldArgumentConfig;
+	abstract getConfig(): FieldConfig;
 
 	parseValue(value: ParsingResultNode[]): void {
 		this.validateValues(value, this.getConfig().values);
@@ -14,7 +18,7 @@ export abstract class AbstractInputFieldArgument {
 
 	protected abstract _parseValue(value: ParsingResultNode[]): void;
 
-	validateValues(value: ParsingResultNode[], allowedValues: InputFieldArgumentValueConfig[][]): void {
+	validateValues(value: ParsingResultNode[], allowedValues: FieldArgumentValueConfig[][]): void {
 		const min = allowedValues[0].length;
 		const max = allowedValues[allowedValues.length - 1].length;
 
@@ -29,15 +33,15 @@ export abstract class AbstractInputFieldArgument {
 		}
 	}
 
-	isAllowed(inputFieldType: InputFieldType): boolean {
-		if (this.getConfig().allowedInputFieldTypes.length === 0) {
+	isAllowed(fieldType: FieldType): boolean {
+		if (this.getConfig().allowedFieldTypes.length === 0) {
 			return true;
 		}
 
-		return this.getConfig().allowedInputFieldTypes.includes(inputFieldType);
+		return this.getConfig().allowedFieldTypes.includes(fieldType);
 	}
 
-	getAllowedInputFieldsAsString(): string {
-		return this.getConfig().allowedInputFieldTypes.length === 0 ? 'all' : this.getConfig().allowedInputFieldTypes.join(', ');
+	getAllowedFieldsAsString(): string {
+		return this.getConfig().allowedFieldTypes.length === 0 ? 'all' : this.getConfig().allowedFieldTypes.join(', ');
 	}
 }

src/inputFieldArguments/InputFieldArgumentContainer.ts renamed to src/fieldArguments/AbstractFieldArgumentContainer.ts

@@ -1,11 +1,16 @@
-import { AbstractInputFieldArgument } from './AbstractInputFieldArgument';
+import { InputFieldArgumentType } from '../parsers/inputFieldParser/InputFieldConfigs';
 import { ErrorLevel, MetaBindParsingError } from '../utils/errors/MetaBindErrors';
-import { InputFieldArgumentType } from '../inputFields/InputFieldConfigs';
+import { FieldArgumentConfig } from '../parsers/GeneralConfigs';
+import { AbstractFieldArgument } from './AbstractFieldArgument';
 
-export class InputFieldArgumentContainer {
-	arguments: AbstractInputFieldArgument[] = [];
+export abstract class AbstractFieldArgumentContainer<
+	FieldType extends string,
+	FieldArgumentType extends string,
+	FieldConfig extends FieldArgumentConfig<FieldArgumentType, FieldType>
+> {
+	arguments: AbstractFieldArgument<FieldType, FieldArgumentType, FieldConfig>[] = [];
 
-	add(argument: AbstractInputFieldArgument): void {
+	add(argument: AbstractFieldArgument<FieldType, FieldArgumentType, FieldConfig>): void {
 		this.arguments.push(argument);
 	}
 
@@ -30,12 +35,14 @@ export class InputFieldArgumentContainer {
 	}
 
 	/**
-	 * Merges two InputFieldArgumentContainers by overriding.
+	 * Merges two FieldArgumentContainers by overriding.
 	 * The arguments form the other container take priority.
 	 *
 	 * @param other
 	 */
-	mergeByOverride(other: InputFieldArgumentContainer): InputFieldArgumentContainer {
+	mergeByOverride(
+		other: AbstractFieldArgumentContainer<FieldType, FieldArgumentType, FieldConfig>
+	): AbstractFieldArgumentContainer<FieldType, FieldArgumentType, FieldConfig> {
 		for (const argument of other.arguments) {
 			const argumentConfig = argument.getConfig();
 			if (!argumentConfig.allowMultiple) {
@@ -51,20 +58,22 @@ export class InputFieldArgumentContainer {
 	}
 
 	/**
-	 * Merges two InputFieldArgumentContainers.
+	 * Merges two FieldArgumentContainers.
 	 * If there is an argument that does not allow duplicates in both containers this will throw an error.
 	 *
 	 * @param other
 	 */
-	mergeByThrow(other: InputFieldArgumentContainer): InputFieldArgumentContainer {
+	mergeByThrow(
+		other: AbstractFieldArgumentContainer<FieldType, FieldArgumentType, FieldConfig>
+	): AbstractFieldArgumentContainer<FieldType, FieldArgumentType, FieldConfig> {
 		for (const argument of other.arguments) {
 			const argumentConfig = argument.getConfig();
 			if (!argumentConfig.allowMultiple) {
 				if (this.arguments.filter(x => x.getConfig().type === argumentConfig.type).length > 0) {
 					throw new MetaBindParsingError(
 						ErrorLevel.ERROR,
 						'failed to merge argument container',
-						'can not merge InputFieldArgumentContainers, since arguments overlap'
+						'can not merge FieldArgumentContainers, since arguments overlap'
 					);
 				}
 			}
@@ -77,11 +86,11 @@ export class InputFieldArgumentContainer {
 		return this;
 	}
 
-	getAll(name: InputFieldArgumentType): AbstractInputFieldArgument[] {
+	getAll(name: FieldArgumentType): AbstractFieldArgument<FieldType, FieldArgumentType, FieldConfig>[] {
 		return this.arguments.filter(x => x.getConfig().type === name);
 	}
 
-	get(name: InputFieldArgumentType): AbstractInputFieldArgument | undefined {
+	get(name: FieldArgumentType): AbstractFieldArgument<FieldType, FieldArgumentType, FieldConfig> | undefined {
 		return this.getAll(name).at(0);
 	}
 }

src/fieldArguments/inputFieldArguments/AbstractInputFieldArgument.ts

@@ -0,0 +1,4 @@
+import { AbstractFieldArgument } from '../AbstractFieldArgument';
+import { InputFieldArgumentConfig, InputFieldArgumentType, InputFieldType } from '../../parsers/inputFieldParser/InputFieldConfigs';
+
+export abstract class AbstractInputFieldArgument extends AbstractFieldArgument<InputFieldType, InputFieldArgumentType, InputFieldArgumentConfig> {}

src/fieldArguments/inputFieldArguments/InputFieldArgumentContainer.ts

@@ -0,0 +1,4 @@
+import { InputFieldArgumentConfig, InputFieldArgumentType, InputFieldType } from '../../parsers/inputFieldParser/InputFieldConfigs';
+import { AbstractFieldArgumentContainer } from '../AbstractFieldArgumentContainer';
+
+export class InputFieldArgumentContainer extends AbstractFieldArgumentContainer<InputFieldType, InputFieldArgumentType, InputFieldArgumentConfig> {}

src/inputFieldArguments/InputFieldArgumentFactory.ts renamed to src/fieldArguments/inputFieldArguments/InputFieldArgumentFactory.ts

@@ -5,14 +5,14 @@ import { MaxValueInputFieldArgument } from './arguments/MaxValueInputFieldArgume
 import { OptionInputFieldArgument } from './arguments/OptionInputFieldArgument';
 import { TitleInputFieldArgument } from './arguments/TitleInputFieldArgument';
 import { OptionQueryInputFieldArgument } from './arguments/OptionQueryInputFieldArgument';
-import { ErrorLevel, MetaBindParsingError } from '../utils/errors/MetaBindErrors';
+import { ErrorLevel, MetaBindParsingError } from '../../utils/errors/MetaBindErrors';
 import { AbstractInputFieldArgument } from './AbstractInputFieldArgument';
 import { ShowcaseInputFieldArgument } from './arguments/ShowcaseInputFieldArgument';
 import { OffValueInputFieldArgument } from './arguments/OffValueInputFieldArgument';
 import { OnValueInputFieldArgument } from './arguments/OnValueInputFieldArgument';
 import { DefaultValueInputFieldArgument } from './arguments/DefaultValueInputFieldArgument';
 import { PlaceholderInputFieldArgument } from './arguments/PlaceholderInputFieldArgument';
-import { InputFieldArgumentType } from '../inputFields/InputFieldConfigs';
+import { InputFieldArgumentType } from '../../parsers/inputFieldParser/InputFieldConfigs';
 import { UseLinksInputFieldArgument } from './arguments/UseLinksInputFieldArgument';
 
 export class InputFieldArgumentFactory {

src/inputFieldArguments/arguments/AddLabelsInputFieldArgument.ts renamed to src/fieldArguments/inputFieldArguments/arguments/AddLabelsInputFieldArgument.ts

@@ -1,6 +1,6 @@
 import { AbstractInputFieldArgument } from '../AbstractInputFieldArgument';
-import { InputFieldArgumentConfig, InputFieldArgumentConfigs } from '../../inputFields/InputFieldConfigs';
-import { ParsingResultNode } from '../../parsers/nomParsers/GeneralParsers';
+import { InputFieldArgumentConfig, InputFieldArgumentConfigs } from '../../../parsers/inputFieldParser/InputFieldConfigs';
+import { ParsingResultNode } from '../../../parsers/nomParsers/GeneralParsers';
 
 export class AddLabelsInputFieldArgument extends AbstractInputFieldArgument {
 	value: boolean = true;