remove old parser

Author: mProjectsCode

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Obsidian Meta Bind Changelog
 
+# Unreleased
+
+Breaking Changes
+
+-   removed setting migrations for settings from plugin versions earlier than `0.6.0`
+
 # 0.7.2
 
 Changes

exampleVault/Input Fields/List.md

@@ -3,6 +3,7 @@ list:
   - apple
   - banana
   - berries
+  - "[[file]]"
 list2:
   - "[[Other/Example Notes/Example Note with Image.md|Example Note with Image]]"
   - "[[Other/Example Notes/Example Note with Callouts.md|Example Note with Callouts]]"

src/main.ts

@@ -7,10 +7,8 @@ import { API } from './api/API';
 import { setFirstWeekday } from './utils/DatePickerUtils';
 import { createMarkdownRenderChildWidgetEditorPlugin } from './cm6/Cm6_ViewPlugin';
 import { MDRCManager } from './MDRCManager';
-import { DEFAULT_SETTINGS, type InputFieldTemplate, type MetaBindPluginSettings } from './settings/Settings';
+import { DEFAULT_SETTINGS, type MetaBindPluginSettings } from './settings/Settings';
 import { type IPlugin } from './IPlugin';
-import { EnclosingPair, ParserUtils } from './utils/ParserUtils';
-import { ErrorLevel, MetaBindParsingError } from './utils/errors/MetaBindErrors';
 import { ObsidianMetadataAdapter } from './metadata/ObsidianMetadataAdapter';
 import { FaqView, MB_FAQ_VIEW_TYPE } from './utils/faq/FaqView';
 
@@ -128,26 +126,6 @@ export default class MetaBindPlugin extends Plugin implements IPlugin {
 		const bestLinkPath = this.app.metadataCache.getFirstLinkpathDest(name, '');
 
 		return bestLinkPath === null ? [] : [bestLinkPath.path];
-
-		// const fileNameIsPath = isPath(name);
-		// const processedFileName = fileNameIsPath ? removeFileEnding(name) : getFileName(removeFileEnding(name));
-		//
-		// const allFiles = this.app.vault.getMarkdownFiles();
-		// const filePaths: string[] = [];
-		// for (const file of allFiles) {
-		// 	// console.log(removeFileEnding(file.path));
-		// 	if (fileNameIsPath) {
-		// 		if (removeFileEnding(file.path) === processedFileName) {
-		// 			filePaths.push(file.path);
-		// 		}
-		// 	} else {
-		// 		if (getFileName(removeFileEnding(file.name)) === processedFileName) {
-		// 			filePaths.push(file.path);
-		// 		}
-		// 	}
-		// }
-		//
-		// return filePaths;
 	}
 
 	isFilePathExcluded(path: string): boolean {
@@ -176,45 +154,11 @@ export default class MetaBindPlugin extends Plugin implements IPlugin {
 		console.log(`meta-bind | Main >> settings save`);
 
 		DateParser.dateFormat = this.settings.preferredDateFormat;
-		// this.api.inputFieldParser.parseTemplates(this.settings.inputTemplates);
 		setFirstWeekday(this.settings.firstWeekday);
 		await this.saveData(this.settings);
 	}
 
 	applyTemplatesMigration(oldSettings: MetaBindPluginSettings): MetaBindPluginSettings {
-		if (oldSettings.inputTemplates !== undefined) {
-			const templates = oldSettings.inputTemplates;
-			const newTemplates: InputFieldTemplate[] = [];
-
-			try {
-				let templateDeclarations = templates ? ParserUtils.split(templates, '\n', new EnclosingPair('[', ']')) : [];
-				templateDeclarations = templateDeclarations.map(x => x.trim()).filter(x => x.length > 0);
-
-				for (const templateDeclaration of templateDeclarations) {
-					let templateDeclarationParts: string[] = ParserUtils.split(templateDeclaration, '->', new EnclosingPair('[', ']'));
-					templateDeclarationParts = templateDeclarationParts.map(x => x.trim());
-
-					if (templateDeclarationParts.length === 1) {
-						throw new MetaBindParsingError({
-							errorLevel: ErrorLevel.CRITICAL,
-							effect: 'failed to parse template declaration',
-							cause: `template must include one "->"`,
-						});
-					} else if (templateDeclarationParts.length === 2) {
-						newTemplates.push({
-							name: templateDeclarationParts[0],
-							declaration: templateDeclarationParts[1],
-						});
-					}
-				}
-			} catch (e) {
-				console.warn('failed to migrate templates', e);
-			}
-
-			delete oldSettings.inputTemplates;
-			oldSettings.inputFieldTemplates = newTemplates;
-		}
-
 		return oldSettings;
 	}
 

src/parsers/MarkdownLinkParser.ts

@@ -1,57 +1,36 @@
-import { EnclosingPair, ParserUtils } from '../utils/ParserUtils';
-import { ErrorLevel, MetaBindParsingError } from '../utils/errors/MetaBindErrors';
+import { P } from '@lemons_dev/parsinom/lib/ParsiNOM';
+import { filePath } from './nomParsers/BindTargetParsers';
+import { type Parser } from '@lemons_dev/parsinom/lib/Parser';
+import { runParser } from './ParsingError';
+
+const mdLinkInnerParser = P.sequence(
+	filePath, // the file path
+	P.string('#').then(P.manyNotOf('[]#|^:')).optional(), // the optional heading
+	P.string('|').then(P.manyNotOf('[]').optional()), // the optional alias
+);
+
+const mdLinkParser: Parser<MarkdownLink> = P.sequenceMap(
+	(a, b) => {
+		return {
+			isEmbed: a !== undefined,
+			target: b[0],
+			block: b[1],
+			alias: b[2],
+		};
+	},
+	P.string('!').optional(),
+	mdLinkInnerParser.wrapString('[[', ']]'),
+);
 
 export interface MarkdownLink {
 	isEmbed: boolean;
 	target: string;
-	block: string;
-	alias: string;
+	block?: string;
+	alias?: string;
 }
 
-// TODO: rebuild this with parsinom
 export function parseMdLink(link: string): MarkdownLink {
-	if (!link) {
-		throw new MetaBindParsingError({ errorLevel: ErrorLevel.ERROR, effect: 'failed to parse md link', cause: 'invalid link, link is empty' });
-	}
-
-	const mdLink: MarkdownLink = {} as MarkdownLink;
-	mdLink.isEmbed = link.startsWith('!');
-	const linkContent = ParserUtils.getInBetween(link, new EnclosingPair('[[', ']]'));
-
-	if (!linkContent) {
-		throw new MetaBindParsingError({ errorLevel: ErrorLevel.ERROR, effect: 'failed to parse md link', cause: 'invalid link, link is empty' });
-	}
-
-	if (typeof linkContent !== 'string') {
-		throw new MetaBindParsingError({ errorLevel: ErrorLevel.ERROR, effect: 'failed to parse md link', cause: 'invalid link, link format is invalid' });
-	}
-
-	const linkParts = linkContent.split('|');
-	if (linkParts.length === 2) {
-		mdLink.alias = linkParts[1];
-	} else if (linkParts.length > 2) {
-		throw new MetaBindParsingError({
-			errorLevel: ErrorLevel.ERROR,
-			effect: 'failed to parse md link',
-			cause: "invalid link, link may only contain a maximum of one '|'",
-		});
-	}
-
-	const targetParts = linkParts[0].split('#');
-	if (targetParts.length === 1) {
-		mdLink.target = targetParts[0];
-	} else if (targetParts.length === 2) {
-		mdLink.target = targetParts[0];
-		mdLink.block = targetParts[1];
-	} else {
-		throw new MetaBindParsingError({
-			errorLevel: ErrorLevel.ERROR,
-			effect: 'failed to parse md link',
-			cause: "invalid link, link target may only contain a maximum of one '#'",
-		});
-	}
-
-	return mdLink;
+	return runParser(mdLinkParser, link);
 }
 
 export function isMdLink(str: string): boolean {

src/parsers/nomParsers/BindTargetParsers.ts

@@ -4,7 +4,7 @@ import { P_UTILS } from '@lemons_dev/parsinom/lib/ParserUtils';
 import { type UnvalidatedBindTargetDeclaration } from '../inputFieldParser/InputFieldDeclaration';
 import { createResultNode, doubleQuotedString, ident, type ParsingResultNode } from './GeneralParsers';
 
-const filePath: Parser<string> = P.manyNotOf('{}[]#^|:?').box('file path');
+export const filePath: Parser<string> = P.manyNotOf('{}[]#^|:?').box('file path');
 
 const metadataPathPartIdent: Parser<ParsingResultNode> = ident.node(createResultNode);