reusing yaml parser

Author: RafaelGB

src/parsers/EmbedYamlParser.ts src/parsers/DatabaseYamlParser.tssrc/parsers/EmbedYamlParser.ts renamed to src/parsers/DatabaseYamlParser.ts

@@ -8,15 +8,16 @@ import { TypeHandler } from 'parsers/embedYamlHandlers/TypeHandler';
 import { TitleHandler } from 'parsers/embedYamlHandlers/TitleHandler';
 import { DbFolderError } from "errors/AbstractError";
 import { ParserError } from "errors/ParserError";
+import { DatabaseYaml } from "cdm/DatabaseModel";
 /**
  * PUBLIC METHODS
  ****************/
 /**
  * Parse a string
  */
-export function parseDatabase(yamlText: string, app: App): any {
+const DatabaseYamlParser = (yamlText: string): DatabaseYaml => {
     const yaml = parseYaml(yamlText);
-    const errors = validateYaml(yaml, app);
+    const errors = validateYaml(yaml);
     if (errors.length > 0) {
         throw new DbFolderError(new ParserError("Error parsing database", errors));
     }
@@ -32,14 +33,14 @@ export function parseDatabase(yamlText: string, app: App): any {
 /**
  * Validate yaml received from input using handlers of function getHandlers
  */
-function validateYaml(yaml: any, app: App): [string, string][] {
+function validateYaml(yaml: any): [string, string][] {
     const handlers = getHandlers();
     let i = 1;
     while (i < handlers.length) {
         handlers[i - 1].setNext(handlers[i]);
         i++;
     }
-    return handlers[0].handle(yaml, app);
+    return handlers[0].handle(yaml);
 }
 
 
@@ -53,4 +54,7 @@ function getHandlers(): YamlHandler[] {
         new FolderHandler(),
         new TitleHandler()
     ];
-}
+}
+
+// Export
+export default DatabaseYamlParser;

src/parsers/embedYamlHandlers/AbstractYamlPropertyHandler.ts

@@ -3,7 +3,7 @@ import { App } from "obsidian";
 export interface YamlHandler {
     setNext(handler: YamlHandler): YamlHandler;
 
-    handle(yaml: any, app: App): [string, string][];
+    handle(yaml: any): [string, string][];
 }
 
 export abstract class AbstractYamlHandler implements YamlHandler {
@@ -20,5 +20,5 @@ export abstract class AbstractYamlHandler implements YamlHandler {
         this.nextHandler = handler;
         return handler;
     }
-    abstract handle(yaml: any, app: App): [string, string][];
+    abstract handle(yaml: any): [string, string][];
 }

src/parsers/embedYamlHandlers/FolderHandler.ts

@@ -2,20 +2,20 @@ import { AbstractYamlHandler } from 'parsers/embedYamlHandlers/AbstractYamlPrope
 import { App, normalizePath } from "obsidian";
 export class FolderHandler extends AbstractYamlHandler {
     handlerName: string = 'folder';
-    public handle(yaml: any, app: App): [string, string][] {
+    public handle(yaml: any): [string, string][] {
         if (!yaml.folder) {
             this.addError('Folder name is not defined');
             // handle is ended if there is no folder name
             return this.listOfErrors;
         }
 
-        if (!this.checkIfFolderExist(yaml, app)) {
+        if (!this.checkIfFolderExist(yaml)) {
             // handle is ended if the folder does not exist
             return this.listOfErrors;
         }
         // Check next handler
         if (this.nextHandler) {
-            return this.nextHandler.handle(yaml, app);
+            return this.nextHandler.handle(yaml);
         }
         return this.listOfErrors;
     }
@@ -28,7 +28,7 @@ export class FolderHandler extends AbstractYamlHandler {
      * @param path
      * @param folderName 
      */
-    checkIfFolderExist(yaml: any, app: App): boolean {
+    checkIfFolderExist(yaml: any): boolean {
         // check if folder exists
         let folder_str = normalizePath(yaml.folder);
         const folder = app.vault.getAbstractFileByPath(folder_str);

src/parsers/embedYamlHandlers/TitleHandler.ts

@@ -4,7 +4,7 @@ import { App } from "obsidian";
 export class TitleHandler extends AbstractYamlHandler {
     handlerName: string = 'title';
 
-    public handle(yaml: any, app: App): [string, string][]{
+    public handle(yaml: any): [string, string][]{
 
         if (!yaml.title || yaml.title.length === 0) {
             this.addError(`Title is empty or is not defined value:${yaml.title}`);
@@ -14,7 +14,7 @@ export class TitleHandler extends AbstractYamlHandler {
 
         // Check next handler
         if (this.nextHandler) {
-            return this.nextHandler.handle(yaml,app);
+            return this.nextHandler.handle(yaml);
         }
         return this.listOfErrors;
     }

src/parsers/embedYamlHandlers/TypeHandler.ts

@@ -11,7 +11,7 @@ import { App } from "obsidian";
 
 export class TypeHandler extends AbstractYamlHandler {
     handlerName: string = 'type';
-    public handle(yaml: any, app: App): [string, string][] {
+    public handle(yaml: any): [string, string][] {
 
         if (!yaml.type) {
             // Default type is LIST if not specified
@@ -26,7 +26,7 @@ export class TypeHandler extends AbstractYamlHandler {
 
         // Check next handler
         if (this.nextHandler) {
-            return this.nextHandler.handle(yaml,app);
+            return this.nextHandler.handle(yaml);
         }
         return this.listOfErrors;
     }