diff --git a/src/entities/routine/repository/group-repository.ts b/src/entities/routine/repository/group-repository.ts index cb58b9e..9d2068c 100644 --- a/src/entities/routine/repository/group-repository.ts +++ b/src/entities/routine/repository/group-repository.ts @@ -1,6 +1,6 @@ import { fileAccessor } from "@shared/file/file-accessor"; import { GROUP_PATH, GROUP_PREFIX } from "./utils"; -import { parseFrontmatter } from "@shared/file/parse-frontmatter"; +import { parseFrontmatterFromContent } from "@shared/file/parse-frontmatter"; import { RoutineGroup, RoutineGroupProperties } from "../domain/routine-type"; import { stringifyYaml, TFile } from "obsidian"; import { ensureArchive } from "@entities/archives"; @@ -11,7 +11,7 @@ import { RoutineGroupEntity } from "../domain/routine-group"; const parse = async (file: TFile): Promise => { const content = await fileAccessor.readFileAsReadonly(file); const name = file.basename.startsWith(GROUP_PREFIX) ? file.basename.slice(GROUP_PREFIX.length) : file.basename; - const properties = RoutineGroupEntity.validateGroupProperties(parseFrontmatter(content)); + const properties = RoutineGroupEntity.validateGroupProperties(parseFrontmatterFromContent(content)); if(properties.isErr()) throw new Error(`[RoutineGroup '${name}' Parse Error] ${properties.error}`); return { diff --git a/src/entities/routine/repository/routine-repository.ts b/src/entities/routine/repository/routine-repository.ts index 887c9c7..59997d9 100644 --- a/src/entities/routine/repository/routine-repository.ts +++ b/src/entities/routine/repository/routine-repository.ts @@ -3,7 +3,7 @@ import { compose } from "@shared/utils/compose"; import { fileAccessor } from "@shared/file/file-accessor"; import { Notice, stringifyYaml, TFile } from "obsidian"; import { GROUP_PREFIX, ROUTINE_PATH } from "./utils"; -import { parseFrontmatter } from "@shared/file/parse-frontmatter"; +import { parseFrontmatterFromContent } from "@shared/file/parse-frontmatter"; import { RoutineEntity } from "../domain/routine"; import dedent from "dedent"; import { Routine } from "../domain/routine-type"; @@ -11,7 +11,7 @@ import { Routine } from "../domain/routine-type"; const parse = async (file: TFile): Promise => { const content = await fileAccessor.readFileAsReadonly(file); - const result = RoutineEntity.validateRoutineProperties(parseFrontmatter(content)); + const result = RoutineEntity.validateRoutineProperties(parseFrontmatterFromContent(content)); if(result.isErr()){ new Notice(`Routine '${file.basename}' frontmatter error: ${result.error}`); throw new Error(`[Routine '${file.basename}' Parse Error] ${result.error}`); diff --git a/src/shared/file/parse-frontmatter.ts b/src/shared/file/parse-frontmatter.ts index 3a9e79c..44dbb8d 100644 --- a/src/shared/file/parse-frontmatter.ts +++ b/src/shared/file/parse-frontmatter.ts @@ -1,7 +1,7 @@ import { getFrontMatterInfo, parseYaml } from "obsidian"; -export const parseFrontmatter = (fileContent: string) => { +export const parseFrontmatterFromContent = (fileContent: string) => { const fmInfo = getFrontMatterInfo(fileContent); if(!fmInfo.exists){ throw new Error('File frontmatter is not found.');