moved some files

mProjectsCode · mProjectsCode · commit ac2ad92cb7c1 · 2023-08-24T13:37:00.000+02:00
diff --git a/exampleVault/Test.md b/exampleVault/Test.md
@@ -49,4 +49,9 @@ await dv.paragraph(`${filter}${backticks}${codeblock}${backticks}`);
 
 
 ```meta-bind-parser-test
+declarationValidationGraph
+```
+
+```meta-bind-parser-test
+argumentsValidationGraph
 ```
diff --git a/exampleVault/examples.md b/exampleVault/examples.md
@@ -1,5 +1,5 @@
 ---
-slider1: 5
+slider1: 6
 suggest: test
 toggle1: false
 Domestic_tasks:
@@ -69,8 +69,9 @@ Lorem ipsum dolor sit amet, `INPUT[date():other note#date]` consectetur adipisci
 - `INPUT[text():meta bind/nonExistantFile#title]`
 - `INPUT[slider(nonExistantArgument)]`
 - `INPUT[slider]`
-
 - `INPUT[inlineSelect(option(option a),option(option b),option(option c),option(option d):select]`
+- `INPUT[inlineSelect(option(option a),option(option b),option(option c),option(option d)):select#]`
+- `INPUT[inlineSelect(option(option a),option(option b),option(option c),option(option d)):select#:]`
 
 
 Lorem ipsum dolor sit amet, `INPUT[text():meta bind/nonExistantFile#title]` consectetur adipiscing elit. Pellentesque sit amet porttitor arcu. Quisque scelerisque dolor augue, et posuere nulla bibendum nec. `INPUT[slider(nonExistantArgument)]` Curabitur sed rhoncus nisl. Maecenas nisi justo, viverra vel tempus vel, hendrerit at metus. `INPUT[select(option(option a),option(option b),option(option c),option(option d)):select]` asdasd asdasdasd
diff --git a/src/api/InputFieldAPI.ts b/src/api/InputFieldAPI.ts
@@ -1,9 +1,7 @@
 import { InputFieldArgumentType, InputFieldType } from '../parsers/InputFieldDeclarationParser';
 import { ErrorCollection } from '../utils/errors/ErrorCollection';
 import { API } from './API';
-import { useSyncExternalStore } from 'preact/compat';
-import { UnvalidatedInputFieldDeclaration } from '../parsers/newInputFieldParser/InputFieldDeclarationValidator';
-import { StructureParserResult } from '../parsers/newInputFieldParser/StructureParser';
+import { InputFieldStructureParserResult, UnvalidatedInputFieldDeclaration } from '../parsers/newInputFieldParser/InputFieldDeclarationValidator';
 
 export class InputFieldAPI {
 	private readonly api: API;
@@ -107,7 +105,7 @@ export class InputFieldAPI {
 					arr.push(currentValue);
 				}
 				return arr;
-			}, [] as { name: StructureParserResult; value?: StructureParserResult | undefined }[]),
+			}, [] as { name: InputFieldStructureParserResult; value?: InputFieldStructureParserResult | undefined }[]),
 			errorCollection: unvalidatedDeclaration.errorCollection.merge(override.errorCollection),
 		};
 	}
diff --git a/src/main.ts b/src/main.ts
@@ -90,7 +90,7 @@ export default class MetaBindPlugin extends Plugin implements IPlugin {
 		});
 
 		this.registerMarkdownCodeBlockProcessor('meta-bind-parser-test', (source, el, ctx) => {
-			ctx.addChild(new ParserTestMDRC(el, RenderChildType.BLOCK, this, ctx.sourcePath, self.crypto.randomUUID(), {}));
+			ctx.addChild(new ParserTestMDRC(el, RenderChildType.BLOCK, source, this, ctx.sourcePath, self.crypto.randomUUID(), {}));
 		});
 
 		// this.registerMarkdownCodeBlockProcessor('meta-bind-js', (source, el, ctx) => {
diff --git a/src/parsers/generalParser/ParsingError.ts b/src/parsers/generalParser/ParsingError.ts
diff --git a/src/parsers/generalParser/ParsingTree.ts b/src/parsers/generalParser/ParsingTree.ts
@@ -1,7 +1,6 @@
 import { ParsingError } from './ParsingError';
 import { ErrorLevel } from '../../utils/errors/MetaBindErrors';
 import { AbstractToken, Range } from './ParsingUtils';
-import { InputFieldTokenType } from './InputFieldTokenizer';
 
 export enum PT_Element_Type {
 	LITERAL = 'LITERAL',
@@ -35,7 +34,7 @@ export abstract class Abstract_PT_Node<TokenType extends string, Token extends A
 		this.children = children;
 	}
 
-	getChild(index: number, expected?: InputFieldTokenType | undefined): PT_Element<TokenType, Token> {
+	getChild(index: number, expected?: TokenType | undefined): PT_Element<TokenType, Token> {
 		const el = this.children[index];
 		if (!el) {
 			throw new Error('This parser sucks');
diff --git a/src/parsers/generalParser/ParsingTreeParser.ts b/src/parsers/generalParser/ParsingTreeParser.ts
@@ -1,9 +1,7 @@
 import { ParsingError } from './ParsingError';
 import { ErrorLevel } from '../../utils/errors/MetaBindErrors';
 import { ParsingTree, PT_Closure, PT_Element, PT_Element_Type, PT_Literal } from './ParsingTree';
-import { AbstractToken, Closure } from './ParsingUtils';
-import { InputFieldClosures, InputFieldToken, InputFieldTokenType } from './InputFieldTokenizer';
-import { EOF_TOKEN } from './validationGraph/ValidationGraph';
+import { AbstractToken, Closure, EOF_TOKEN } from './ParsingUtils';
 
 export class ParsingTreeParser<TokenType extends string, Token extends AbstractToken<TokenType>> {
 	private readonly tokens: Token[];
@@ -66,7 +64,7 @@ export class ParsingTreeParser<TokenType extends string, Token extends AbstractT
 		// skip the opening token
 		this.position += 1;
 
-		while (this.getCurrentToken().type !== InputFieldTokenType.EOF) {
+		while (this.getCurrentToken().type !== EOF_TOKEN) {
 			const nestedRes = this.parseCurrentToken();
 
 			if (nestedRes.type === PT_Element_Type.LITERAL && (nestedRes as PT_Literal<TokenType, Token>).token.type === closure.closingTokenType) {
@@ -104,7 +102,7 @@ export class ParsingTreeParser<TokenType extends string, Token extends AbstractT
 		// check for closure closing tokens that do not actually close a closure
 		const currentClosure = this.closureStack.length > 0 ? this.closureStack[this.closureStack.length - 1] : undefined;
 
-		for (const closure of InputFieldClosures) {
+		for (const closure of this.closures) {
 			// if the closure is the current token
 			if (
 				currentClosure !== undefined &&
diff --git a/src/parsers/generalParser/ParsingUtils.ts b/src/parsers/generalParser/ParsingUtils.ts
@@ -13,3 +13,16 @@ export interface Range {
 	from: number;
 	to: number;
 }
+
+export function createToken<TokenType extends string>(type: TokenType, literal: string, from: number, to: number): AbstractToken<TokenType> {
+	return {
+		type: type,
+		literal: literal,
+		range: {
+			from: from,
+			to: to,
+		},
+	};
+}
+
+export const EOF_TOKEN = '__EOF__' as const;
diff --git a/src/parsers/generalParser/StructureParser.ts b/src/parsers/generalParser/StructureParser.ts
diff --git a/src/parsers/generalParser/validationGraph/ContextActions.ts b/src/parsers/generalParser/validationGraph/ContextActions.ts
diff --git a/src/parsers/generalParser/validationGraph/VG_Node.ts b/src/parsers/generalParser/validationGraph/VG_Node.ts
diff --git a/src/parsers/generalParser/validationGraph/VG_Transition.ts b/src/parsers/generalParser/validationGraph/VG_Transition.ts
diff --git a/src/parsers/generalParser/validationGraph/VG_Transition_Constraint.ts b/src/parsers/generalParser/validationGraph/VG_Transition_Constraint.ts
@@ -1,4 +1,3 @@
-import { InputFieldTokenType } from '../InputFieldTokenizer';
 import { PT_Element, PT_Element_Type } from '../ParsingTree';
 import { AbstractToken } from '../ParsingUtils';
 
@@ -39,15 +38,15 @@ export class VG_Transition_Constraint<TokenType extends string, Token extends Ab
 
 	public toString(): string {
 		if (this.tokenType !== undefined && this.literalContent !== undefined) {
-			return `${this.astType}, ${this.tokenType}, ${this.literalContent}`;
+			return `${this.astType}, "${this.tokenType}", "${this.literalContent}"`;
 		}
 
 		if (this.tokenType !== undefined) {
-			return `${this.astType}, ${this.tokenType}`;
+			return `${this.astType}, "${this.tokenType}"`;
 		}
 
 		if (this.literalContent !== undefined) {
-			return `${this.astType}, ${this.literalContent}`;
+			return `${this.astType}, "${this.literalContent}"`;
 		}
 
 		return this.astType;
diff --git a/src/parsers/generalParser/validationGraph/ValidationGraph.ts b/src/parsers/generalParser/validationGraph/ValidationGraph.ts
@@ -6,12 +6,9 @@ import { ContextActionType } from './ContextActions';
 import { Abstract_PT_Node, PT_Closure, PT_Element, PT_Element_Type, PT_Literal } from '../ParsingTree';
 import { ComplexTreeLayout } from './treeLayout/ComplexTreeLayout';
 import { TL_Literal, TL_Loop, TL_LoopBound, TL_Or, TreeLayout } from './treeLayout/TreeLayout';
-import { createToken, InputFieldTokenType } from '../InputFieldTokenizer';
 import { ParsingError } from '../ParsingError';
 import { ErrorLevel, MetaBindParsingError } from '../../../utils/errors/MetaBindErrors';
-import { AbstractToken } from '../ParsingUtils';
-
-export const EOF_TOKEN = '__EOF__' as const;
+import { AbstractToken, createToken, EOF_TOKEN } from '../ParsingUtils';
 
 export interface ValidationState<TokenType extends string, Token extends AbstractToken<TokenType>, Key extends string> {
 	active: boolean;
@@ -255,7 +252,7 @@ export class ValidationGraph<TokenType extends string, Token extends AbstractTok
 				}
 
 				// set the min loop bound for the last node this is for the exit transition
-				if (currentLayout.bound.min === 0) {
+				if (currentLayout.bound.min === 0 || currentLayout.bound.min === -1) {
 					res.last.loopBound.min = 1;
 
 					previousNode.createTransition(emptyNodePost.index, undefined, undefined, undefined, undefined);
@@ -576,7 +573,7 @@ export class ValidationGraph<TokenType extends string, Token extends AbstractTok
 					ErrorLevel.ERROR,
 					'failed to parse',
 					`Encountered invalid token. Received '${receivedToken.literal}' expected token to be one of: ${violatedTransitions
-						.map(x => `'${x.constraint?.toString()}'`)
+						.map(x => `[${x.constraint?.toString()}]`)
 						.join(', ')}`,
 					{},
 					ptNode.str,
diff --git a/src/parsers/generalParser/validationGraph/treeLayout/ComplexTreeLayout.ts b/src/parsers/generalParser/validationGraph/treeLayout/ComplexTreeLayout.ts
@@ -1,6 +1,5 @@
 import { TL_Element, TL_Literal, TL_Loop, TL_LoopBound, TL_Or } from './TreeLayout';
 import { PT_Element_Type } from '../../ParsingTree';
-import { InputFieldTokenType } from '../../InputFieldTokenizer';
 import { AbstractToken } from '../../ParsingUtils';
 
 export abstract class Abstract_TL_C<TokenType extends string, Token extends AbstractToken<TokenType>, Key extends string> {
@@ -32,7 +31,7 @@ export class TL_C_Loop<TokenType extends string, Token extends AbstractToken<Tok
 	readonly min: number;
 	readonly max: number;
 
-	constructor(loop: ComplexTreeLayout<TokenType, Token, Key>, min: number, max: number, key?: Key | undefined) {
+	constructor(loop: ComplexTreeLayout<TokenType, Token, Key>, min: number = -1, max: number = -1, key?: Key | undefined) {
 		super(key);
 
 		this.loop = loop;
@@ -77,7 +76,7 @@ export class TL_C_Enumeration<TokenType extends string, Token extends AbstractTo
 				),
 			],
 			[
-				new TL_Loop([...this.loop.map(x => x.toTL()), ...this.separator.map(x => x.toTL())], new TL_LoopBound(-1, -1), this.key),
+				new TL_Loop([...this.loop.map(x => x.toTL()), ...this.separator.map(x => x.toTL())], new TL_LoopBound(1, -1), this.key),
 				new TL_Loop(
 					this.loop.map(x => x.toTL()),
 					new TL_LoopBound(1, 1),
diff --git a/src/parsers/generalParser/validationGraph/treeLayout/TreeLayout.ts b/src/parsers/generalParser/validationGraph/treeLayout/TreeLayout.ts
@@ -1,4 +1,3 @@
-import { InputFieldTokenType } from '../../InputFieldTokenizer';
 import { VG_Transition_Constraint } from '../VG_Transition_Constraint';
 import { PT_Element_Type } from '../../ParsingTree';
 import { AbstractToken } from '../../ParsingUtils';
diff --git a/src/parsers/newInputFieldParser/InputFieldDeclarationValidator.ts b/src/parsers/newInputFieldParser/InputFieldDeclarationValidator.ts
@@ -1,12 +1,12 @@
 import { ErrorCollection } from '../../utils/errors/ErrorCollection';
 import { InputFieldArgumentType, InputFieldDeclaration, InputFieldType } from '../InputFieldDeclarationParser';
-import { ParsingError } from './ParsingError';
+import { ParsingError } from '../generalParser/ParsingError';
 import { ErrorLevel, MetaBindParsingError, MetaBindValidationError } from '../../utils/errors/MetaBindErrors';
 import { InputFieldArgumentContainer } from '../../inputFieldArguments/InputFieldArgumentContainer';
 import { AbstractInputFieldArgument } from '../../inputFieldArguments/AbstractInputFieldArgument';
 import { InputFieldArgumentFactory } from '../../inputFieldArguments/InputFieldArgumentFactory';
 import { InputFieldToken, InputFieldTokenType } from './InputFieldTokenizer';
-import { StructureParserResult } from './StructureParser';
+import { StructureParserResult } from '../generalParser/StructureParser';
 
 export type InputFieldStructureParserResult = StructureParserResult<InputFieldTokenType, InputFieldToken>;
 
diff --git a/src/parsers/newInputFieldParser/InputFieldParser.ts b/src/parsers/newInputFieldParser/InputFieldParser.ts
@@ -9,7 +9,7 @@ import { deepFreeze } from '../../utils/Utils';
 import { InputFieldStructureParser } from './InputFieldStructureParser';
 import { InputFieldDeclarationValidator, UnvalidatedInputFieldDeclaration } from './InputFieldDeclarationValidator';
 import { ITemplateSupplier, TemplateSupplierTemplate } from './ITemplateSupplier';
-import { InputFieldValidationGraphSupplier } from './validationGraph/InputFieldValidationGraphSupplier';
+import { InputFieldValidationGraphSupplier } from './InputFieldValidationGraphSupplier';
 
 export type InputFieldDeclarationTemplate = TemplateSupplierTemplate<UnvalidatedInputFieldDeclaration>;
 
diff --git a/src/parsers/newInputFieldParser/InputFieldParserHelperTypes.ts b/src/parsers/newInputFieldParser/InputFieldParserHelperTypes.ts
@@ -1,7 +1,7 @@
-import { Abstract_PT_Node, ParsingTree, PT_Closure, PT_Literal } from './ParsingTree';
+import { Abstract_PT_Node, ParsingTree, PT_Closure, PT_Literal } from '../generalParser/ParsingTree';
 import { InputFieldToken, InputFieldTokenType } from './InputFieldTokenizer';
-import { ValidationContext, ValidationContextEntry, ValidationGraph } from './validationGraph/ValidationGraph';
-import { StructureParserResult } from './StructureParser';
+import { ValidationContext, ValidationContextEntry, ValidationGraph } from '../generalParser/validationGraph/ValidationGraph';
+import { StructureParserResult } from '../generalParser/StructureParser';
 
 export type InputField_PT_Literal = PT_Literal<InputFieldTokenType, InputFieldToken>;
 export type InputField_PT_Closure = PT_Closure<InputFieldTokenType, InputFieldToken>;
diff --git a/src/parsers/newInputFieldParser/InputFieldParsingTreeParser.ts b/src/parsers/newInputFieldParser/InputFieldParsingTreeParser.ts
@@ -1,5 +1,5 @@
 import { InputFieldClosures, InputFieldToken, InputFieldTokenType } from './InputFieldTokenizer';
-import { ParsingTreeParser } from './ParsingTreeParser';
+import { ParsingTreeParser } from '../generalParser/ParsingTreeParser';
 
 export class InputFieldParsingTreeParser extends ParsingTreeParser<InputFieldTokenType, InputFieldToken> {
 	constructor(str: string, tokens: InputFieldToken[]) {
diff --git a/src/parsers/newInputFieldParser/InputFieldStructureParser.ts b/src/parsers/newInputFieldParser/InputFieldStructureParser.ts
@@ -1,4 +1,3 @@
-import { Abstract_PT_Node, ParsingTree, PT_Closure, PT_Literal } from './ParsingTree';
 import {
 	getClosureFromContext,
 	getClosureOrUndefinedFromContext,
@@ -10,16 +9,16 @@ import {
 	ValidationContext,
 	ValidationContextEntry,
 	ValidationGraph,
-} from './validationGraph/ValidationGraph';
-import { InputFieldToken, InputFieldTokenType } from './InputFieldTokenizer';
+} from '../generalParser/validationGraph/ValidationGraph';
+import { InputFieldToken } from './InputFieldTokenizer';
 import { ErrorCollection } from '../../utils/errors/ErrorCollection';
 import { InputFieldType } from '../InputFieldDeclarationParser';
-import { ParsingError } from './ParsingError';
+import { ParsingError } from '../generalParser/ParsingError';
 import { ErrorLevel } from '../../utils/errors/MetaBindErrors';
 import { UnvalidatedInputFieldDeclaration } from './InputFieldDeclarationValidator';
 import { ITemplateSupplier } from './ITemplateSupplier';
-import { InputFieldValidationGraphSupplier } from './validationGraph/InputFieldValidationGraphSupplier';
-import { getTrimmedStructureParserResult, StructureParserResult } from './StructureParser';
+import { InputFieldValidationGraphSupplier } from './InputFieldValidationGraphSupplier';
+import { getTrimmedStructureParserResult } from '../generalParser/StructureParser';
 import {
 	InputField_Abstract_PT_Node,
 	InputField_ParsingTree,
diff --git a/src/parsers/newInputFieldParser/InputFieldTokenizer.ts b/src/parsers/newInputFieldParser/InputFieldTokenizer.ts
@@ -1,5 +1,4 @@
-import { AbstractToken, Closure } from './ParsingUtils';
-import { EOF_TOKEN } from './validationGraph/ValidationGraph';
+import { AbstractToken, Closure, createToken, EOF_TOKEN } from '../generalParser/ParsingUtils';
 
 export const InputFieldTokenType = {
 	EOF: EOF_TOKEN,
@@ -30,17 +29,6 @@ export const InputFieldClosures: Closure<InputFieldTokenType>[] = [
 
 export interface InputFieldToken extends AbstractToken<InputFieldTokenType> {}
 
-export function createToken<TokenType extends string>(type: TokenType, literal: string, from: number, to: number): AbstractToken<TokenType> {
-	return {
-		type: type,
-		literal: literal,
-		range: {
-			from: from,
-			to: to,
-		},
-	};
-}
-
 export class InputFieldTokenizer {
 	private readonly input: string;
 	private tokens: InputFieldToken[];
diff --git a/src/parsers/newInputFieldParser/InputFieldValidationGraphSupplier.ts b/src/parsers/newInputFieldParser/InputFieldValidationGraphSupplier.ts
@@ -1,7 +1,14 @@
-import { ValidationGraph } from './ValidationGraph';
-import { ComplexTreeLayout, TL_C_Enumeration, TL_C_Literal, TL_C_Loop, TL_C_Optional, TL_C_Or } from './treeLayout/ComplexTreeLayout';
-import { PT_Element_Type } from '../ParsingTree';
-import { InputFieldToken, InputFieldTokenType } from '../InputFieldTokenizer';
+import { ValidationGraph } from '../generalParser/validationGraph/ValidationGraph';
+import { InputFieldToken, InputFieldTokenType } from './InputFieldTokenizer';
+import {
+	ComplexTreeLayout,
+	TL_C_Enumeration,
+	TL_C_Literal,
+	TL_C_Loop,
+	TL_C_Optional,
+	TL_C_Or,
+} from '../generalParser/validationGraph/treeLayout/ComplexTreeLayout';
+import { PT_Element_Type } from '../generalParser/ParsingTree';
 
 type FullDeclarationKeys = 'template' | 'declaration';
 type TemplateFullDeclarationKeys = 'declaration';
@@ -41,16 +48,12 @@ export class InputFieldValidationGraphSupplier {
 				new TL_C_Literal(PT_Element_Type.LITERAL, InputFieldTokenType.HASHTAG), // hashtag
 			] as ComplexTreeLayout<InputFieldTokenType, InputFieldToken, BindTargetKeys>), // optional file and hashtag
 			new TL_C_Literal(PT_Element_Type.LITERAL, InputFieldTokenType.WORD, undefined, 'bindTarget'), // first bind target metadata path part
-			new TL_C_Loop(
-				[
-					new TL_C_Or([
-						[new TL_C_Literal(PT_Element_Type.LITERAL, InputFieldTokenType.WORD)],
-						[new TL_C_Literal(PT_Element_Type.CLOSURE, InputFieldTokenType.L_SQUARE)],
-					] as ComplexTreeLayout<InputFieldTokenType, InputFieldToken, BindTargetKeys>[]), // either literal or closure or none, in a loop
-				] as ComplexTreeLayout<InputFieldTokenType, InputFieldToken, BindTargetKeys>,
-				0,
-				-1
-			), // the other bind target metadata path part
+			new TL_C_Loop([
+				new TL_C_Or([
+					[new TL_C_Literal(PT_Element_Type.LITERAL, InputFieldTokenType.WORD)],
+					[new TL_C_Literal(PT_Element_Type.CLOSURE, InputFieldTokenType.L_SQUARE)],
+				] as ComplexTreeLayout<InputFieldTokenType, InputFieldToken, BindTargetKeys>[]), // either literal or closure or none, in a loop
+			] as ComplexTreeLayout<InputFieldTokenType, InputFieldToken, BindTargetKeys>), // the other bind target metadata path part
 		];
 
 		// FULL DECLARATION
diff --git a/src/renderChildren/ParserTestMDRC.ts b/src/renderChildren/ParserTestMDRC.ts
diff --git a/tests/InputFieldParser.test.ts b/tests/InputFieldParser.test.ts
