move some things; fix #132

Author: mProjectsCode

exampleVault/Advanced Examples/PF2e DC Calcualtor.md

@@ -1,7 +1,8 @@
 ---
-playerLevel: 20
-InputDCLevel: 20
-spellLevel: 2
+playerLevel: 1
+spellLevel: 1
+baseDC: 15
+baseSpellDC: 15
 ---
 
 
@@ -31,23 +32,23 @@ spellLevel: 2
 
 DC Level: `INPUT[number:playerLevel]`
 
-| Difficulty               | DC                                                                                                    |
-| ------------------------ | ----------------------------------------------------------------------------------------------------- |
-| Incredibly Easy          | `VIEW[({playerLevel} < 20 ? {playerLevel} + 14 + floor({playerLevel} / 3) : {playerLevel} * 2) - 10]` |
-| Very Easy                | `VIEW[({playerLevel} < 20 ? {playerLevel} + 14 + floor({playerLevel} / 3) : {playerLevel} * 2) - 5]`  |
-| Easy                     | `VIEW[({playerLevel} < 20 ? {playerLevel} + 14 + floor({playerLevel} / 3) : {playerLevel} * 2) - 2]`  |
-| Normal                   | `VIEW[({playerLevel} < 20 ? {playerLevel} + 14 + floor({playerLevel} / 3) : {playerLevel} * 2)]`      |
-| Hard (Uncommon)          | `VIEW[({playerLevel} < 20 ? {playerLevel} + 14 + floor({playerLevel} / 3) : {playerLevel} * 2) + 2]`  |
-| Very Hard (Rare)         | `VIEW[({playerLevel} < 20 ? {playerLevel} + 14 + floor({playerLevel} / 3) : {playerLevel} * 2) + 5]`  |
-| Incredibly Hard (Unique) | `VIEW[({playerLevel} < 20 ? {playerLevel} + 14 + floor({playerLevel} / 3) : {playerLevel} * 2) + 10]` |
+| Difficulty               | DC                                                                                                        |
+| ------------------------ | --------------------------------------------------------------------------------------------------------- |
+| Incredibly Easy          | `VIEW[{baseDC} - 10]`                                                                                     |
+| Very Easy                | `VIEW[{baseDC} - 5]`                                                                                      |
+| Easy                     | `VIEW[{baseDC} - 2]`                                                                                      |
+| Normal                   | `VIEW[({playerLevel} < 20 ? {playerLevel} + 14 + floor({playerLevel} / 3) : {playerLevel} * 2)][:baseDC]` |
+| Hard (Uncommon)          | `VIEW[{baseDC} + 2]`                                                                                      |
+| Very Hard (Rare)         | `VIEW[{baseDC} + 5]`                                                                                      |
+| Incredibly Hard (Unique) | `VIEW[{baseDC} + 10]`                                                                                     |
 
 Spell Level: `INPUT[number:spellLevel]`
 
 | Spell Rarity | DC                                                                             |
 | ------------ | ------------------------------------------------------------------------------ |
-| Normal       | `VIEW[(({spellLevel} * 2 - 1) + 14 + floor(({spellLevel} * 2 - 1) / 3))]`      |
-| Uncommon     | `VIEW[(({spellLevel} * 2 - 1) + 14 + floor(({spellLevel} * 2 - 1) / 3)) + 2]`  |
-| Rare         | `VIEW[(({spellLevel} * 2 - 1) + 14 + floor(({spellLevel} * 2 - 1) / 3)) + 5]`  |
-| Unique       | `VIEW[(({spellLevel} * 2 - 1) + 14 + floor(({spellLevel} * 2 - 1) / 3)) + 10]` |
+| Normal       | `VIEW[(({spellLevel} * 2 - 1) + 14 + floor(({spellLevel} * 2 - 1) / 3))][:baseSpellDC]`      |
+| Uncommon     | `VIEW[{baseSpellDC} + 2]`  |
+| Rare         | `VIEW[{baseSpellDC} + 5]`  |
+| Unique       | `VIEW[{baseSpellDC} + 10]` |
 
 

exampleVault/View Fields/View Field.md

@@ -4,6 +4,12 @@ number2: 200
 unit: km
 distance: 12
 computed: "**12**"
+list:
+  - 1
+  - 2
+  - 3
+object:
+  key: value
 ---
 
 `INPUT[number:number1]`
@@ -38,4 +44,14 @@ Loop Error: `VIEW[**{computed}**][text():distance]`
 Self Loop Error: `VIEW[**{computed}**][text():computed]`
 
 
-`VIEW['[[{file}|link]]'][text(renderMarkdown)]`
+`VIEW['[[{file}|link]]'][text(renderMarkdown)]`
+
+## Arrays and Objects
+
+Plain Text:
+`VIEW[{list}][text]`
+`VIEW[{object}][text]`
+
+Markdown:
+`VIEW[**{list}**][text(renderMarkdown)]`
+`VIEW[**{object}**][text(renderMarkdown)]`

src/api/InputFieldAPI.ts

@@ -6,7 +6,7 @@ import {
 	type UnvalidatedFieldArgument,
 	type UnvalidatedInputFieldDeclaration,
 } from '../parsers/inputFieldParser/InputFieldDeclaration';
-import { type InputFieldArgumentType, type InputFieldType } from '../parsers/inputFieldParser/InputFieldConfigs';
+import { InputFieldArgumentType, InputFieldType } from '../parsers/GeneralConfigs';
 
 export class InputFieldAPI {
 	private readonly api: IAPI;

src/fieldArguments/AbstractFieldArgumentContainer.ts

@@ -1,6 +1,5 @@
-import { InputFieldArgumentType } from '../parsers/inputFieldParser/InputFieldConfigs';
 import { ErrorLevel, MetaBindParsingError } from '../utils/errors/MetaBindErrors';
-import { type FieldArgumentConfig } from '../parsers/GeneralConfigs';
+import { type FieldArgumentConfig, InputFieldArgumentType } from '../parsers/GeneralConfigs';
 import { type AbstractFieldArgument } from './AbstractFieldArgument';
 
 export abstract class AbstractFieldArgumentContainer<

src/fieldArguments/inputFieldArguments/AbstractInputFieldArgument.ts

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

src/fieldArguments/inputFieldArguments/InputFieldArgumentContainer.ts

@@ -1,6 +1,6 @@
-import { type InputFieldArgumentConfig, type InputFieldArgumentType, type InputFieldType } from '../../parsers/inputFieldParser/InputFieldConfigs';
 import { AbstractFieldArgumentContainer } from '../AbstractFieldArgumentContainer';
 import { type InputFieldArgumentMapType } from './InputFieldArgumentFactory';
+import { InputFieldArgumentConfig, InputFieldArgumentType, InputFieldType } from '../../parsers/GeneralConfigs';
 
 export class InputFieldArgumentContainer extends AbstractFieldArgumentContainer<InputFieldType, InputFieldArgumentType, InputFieldArgumentConfig> {
 	getAll<T extends InputFieldArgumentType>(name: T): NonNullable<InputFieldArgumentMapType<T>>[] {

src/fieldArguments/inputFieldArguments/InputFieldArgumentFactory.ts

@@ -11,10 +11,10 @@ import { OffValueInputFieldArgument } from './arguments/OffValueInputFieldArgume
 import { OnValueInputFieldArgument } from './arguments/OnValueInputFieldArgument';
 import { DefaultValueInputFieldArgument } from './arguments/DefaultValueInputFieldArgument';
 import { PlaceholderInputFieldArgument } from './arguments/PlaceholderInputFieldArgument';
-import { InputFieldArgumentType } from '../../parsers/inputFieldParser/InputFieldConfigs';
 import { UseLinksInputFieldArgument } from './arguments/UseLinksInputFieldArgument';
 import { StepSizeValueInputFieldArgument } from './arguments/StepSizeValueInputFieldArgument';
 import { LimitInputFieldArgument } from './arguments/LimitInputFieldArgument';
+import { InputFieldArgumentType } from '../../parsers/GeneralConfigs';
 
 export const INPUT_FIELD_ARGUMENT_MAP = {
 	[InputFieldArgumentType.CLASS]: ClassInputFieldArgument,

src/fieldArguments/inputFieldArguments/arguments/AddLabelsInputFieldArgument.ts

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

src/fieldArguments/inputFieldArguments/arguments/ClassInputFieldArgument.ts

@@ -1,6 +1,6 @@
 import { AbstractInputFieldArgument } from '../AbstractInputFieldArgument';
-import { type InputFieldArgumentConfig, InputFieldArgumentConfigs } from '../../../parsers/inputFieldParser/InputFieldConfigs';
 import { type ParsingResultNode } from '../../../parsers/nomParsers/GeneralParsers';
+import { InputFieldArgumentConfig, InputFieldArgumentConfigs } from '../../../parsers/GeneralConfigs';
 
 export class ClassInputFieldArgument extends AbstractInputFieldArgument {
 	value: string[] = [];

src/fieldArguments/inputFieldArguments/arguments/DefaultValueInputFieldArgument.ts

@@ -1,7 +1,7 @@
 import { AbstractInputFieldArgument } from '../AbstractInputFieldArgument';
-import { type MBExtendedLiteral, parseLiteral } from '../../../utils/Utils';
-import { type InputFieldArgumentConfig, InputFieldArgumentConfigs } from '../../../parsers/inputFieldParser/InputFieldConfigs';
 import { type ParsingResultNode } from '../../../parsers/nomParsers/GeneralParsers';
+import { InputFieldArgumentConfig, InputFieldArgumentConfigs } from '../../../parsers/GeneralConfigs';
+import { MBExtendedLiteral, parseLiteral } from '../../../utils/Literal';
 
 export class DefaultValueInputFieldArgument extends AbstractInputFieldArgument {
 	value: MBExtendedLiteral = '';