compiler: fp fc yeah

src/compiler/GardenPageCompiler.ts

@@ -76,8 +76,6 @@ export class GardenPageCompiler {
 	async generateMarkdown(file: PublishFile): Promise<TCompiledFile> {
 		const assets: Assets = { images: [] };
 
-		const processedFrontmatter = file.getProcessedFrontmatter();
-
 		const fileText = await file.cachedRead();
 
 		if (file.getType() === "excalidraw") {
@@ -90,20 +88,25 @@ export class GardenPageCompiler {
 			];
 		}
 
-		let text = await this.convertFrontMatter(
-			fileText,
-			processedFrontmatter,
+		const COMPILE_STEPS: TCompilerStep[] = [
+			this.convertFrontMatter,
+			this.convertCustomFilters,
+			this.createBlockIDs,
+			this.removeObsidianComments,
+			this.convertDataViews,
+			this.convertLinksToFullPath,
+			this.createTranscludedText(0),
+			this.createSvgEmbeds,
+		];
+
+		const compiledText = await COMPILE_STEPS.reduce(
+			async (previousStep, currentStep) =>
+				currentStep(file, await previousStep),
+			Promise.resolve(fileText),
 		);
-		text = await this.convertCustomFilters(file, text);
-		text = await this.createBlockIDs(file, text);
-		text = await this.createTranscludedText(0)(file, text);
-		text = await this.convertDataViews(file, text);
-		text = await this.convertLinksToFullPath(file, text);
-		text = await this.removeObsidianComments(file, text);
-		text = await this.createSvgEmbeds(file, text);
 
 		const text_and_images = await this.convertImageLinks(
-			text,
+			compiledText,
 			file.getPath(),
 		);
 
@@ -173,16 +176,13 @@ export class GardenPageCompiler {
 		return text;
 	};
 
-	async convertFrontMatter(
-		text: string,
-		frontmatter: string,
-	): Promise<string> {
+	convertFrontMatter: TCompilerStep = (file, text) => {
 		const replaced = text.replace(FRONTMATTER_REGEX, (_match, _p1) => {
-			return frontmatter;
+			return file.getProcessedFrontmatter();
 		});
 
 		return replaced;
-	}
+	};
 
 	convertDataViews: TCompilerStep = async (file, text) => {
 		let replacedText = text;

src/ui/PublishModal.ts

@@ -6,6 +6,7 @@ import PublicationCenter from "./PublicationCenter.svelte";
 import DiffView from "./DiffView.svelte";
 import DigitalGardenSiteManager from "src/publisher/DigitalGardenSiteManager";
 import * as Diff from "diff";
+import { PublishFile } from "../publisher/PublishFile";
 
 export class PublishModal {
 	modal: Modal;
@@ -51,11 +52,21 @@ export class PublishModal {
 			const remoteContent =
 				await this.siteManager.getNoteContent(notePath);
 			const localFile = this.vault.getAbstractFileByPath(notePath);
-			console.log(localFile);
+
+			const localPublishFile = new PublishFile({
+				file: localFile as TFile,
+				vault: this.vault,
+				compiler: this.publisher.compiler,
+				metadataCache: this.publisher.metadataCache,
+				settings: this.settings,
+			});
 
 			if (localFile instanceof TFile) {
 				const [localContent, _] =
-					await this.publisher.compiler.generateMarkdown(localFile);
+					await this.publisher.compiler.generateMarkdown(
+						localPublishFile,
+					);
+
 				const diff = Diff.diffLines(remoteContent, localContent);
 				let diffView: DiffView | undefined;
 				const diffModal = new Modal(this.modal.app);