Refactored file parser code

Author: kevinwang5658

src/commands/apply/orchestrator.ts

@@ -1,6 +1,6 @@
 import readline from 'node:readline'
 
-import { ConfigReader } from '../../config-compiler/index.js';
+import { ConfigParser } from '../../config-parser/index.js';
 import { PluginCollection } from '../../plugins/plugin-collection.js';
 
 const rl = readline.createInterface({
@@ -12,7 +12,7 @@ const rl = readline.createInterface({
 export const ApplyOrchestrator = {
 
   async run(rootDirectory: string): Promise<string> {
-    const project = await ConfigReader.parseProject(rootDirectory);
+    const project = await ConfigParser.parseProject(rootDirectory);
     if (project.isEmpty()) {
       console.log('Empty project. Taking no action');
       return '';

src/commands/plan/orchestrator.ts

@@ -1,9 +1,9 @@
-import { ConfigReader } from '../../config-compiler/index.js';
+import { ConfigParser } from '../../config-parser/index.js';
 import { PluginCollection } from '../../plugins/plugin-collection.js';
 
 export const PlanOrchestrator = {
   async run(rootDirectory: string): Promise<string> {
-    const project = await ConfigReader.parseProject(rootDirectory);
+    const project = await ConfigParser.parseProject(rootDirectory);
     if (project.isEmpty()) {
       console.log('Empty project. Taking no action');
       return '';

src/config-compiler/loader/entities/module.ts

@@ -3,38 +3,45 @@ import { ProjectConfig } from '../entities/project-config.js';
 import { ResourceConfig } from '../entities/resource-config.js';
 import { InternalError } from '../utils/errors.js';
 import { ConfigClass } from './language-definition.js';
-import { ConfigLoader } from './loader/index.js';
 import { FileParser } from './parser/index.js';
 import { JsonFileParser } from './parser/json/file-parser.js';
+import { ProjectReader } from './reader/index.js';
+import { ConfigBlock } from '../entities/index.js';
 
-export class ConfigReader {
+export class ConfigParser {
 
   static readonly supportedParsers: Record<string, FileParser> = {
     'json': new JsonFileParser(),
   }
 
   static async parseProject(directory: string): Promise<Project> {
-    const loadedProject = await (new ConfigLoader().loadProject(directory));
+    const configReader = new ProjectReader();
+    const loadedProject = await configReader.readProject(directory);
 
-    const configBlocksResult = await Promise.all(loadedProject.coreModule.files.map((file) => {
-      const parser = ConfigReader.supportedParsers[file.fileType];
+    const configBlocksResult = await Promise.all(loadedProject.files.map((file) => {
+      const parser = ConfigParser.supportedParsers[file.fileType];
       if (!parser) {
         throw new InternalError(`Unsupported file format loaded into parser: ${file.fileName}`);
       }
 
       return parser.parse(file);
     }));
+
     const configBlocks = configBlocksResult.flat(1);
+    const projectConfig = ConfigParser.findProjectConfig(configBlocks);
 
+    return new Project(
+      projectConfig,
+      configBlocks.filter((u) => u.configClass !== ConfigClass.PROJECT) as ResourceConfig[],
+    )
+  }
+
+  private static findProjectConfig(configBlocks: ConfigBlock[]): ProjectConfig | null {
     const parsedProjectConfigs = configBlocks.filter((u) => u.configClass === ConfigClass.PROJECT);
     if (parsedProjectConfigs.length > 1) {
       throw new Error('One or zero project config can be specified');
     }
 
-    const projectConfig = parsedProjectConfigs[0] as unknown as ProjectConfig | undefined;
-    return new Project(
-      projectConfig ?? null,
-      configBlocks.filter((u) => u.configClass !== ConfigClass.PROJECT) as ResourceConfig[],
-    )
+    return (parsedProjectConfigs[0] ?? null) as unknown as ProjectConfig | null;
   }
 }

src/config-compiler/loader/entities/project.ts

@@ -0,0 +1,6 @@
+import { ConfigBlock } from '../../entities/index.js';
+import { File } from '../reader/entities/file.js';
+
+export interface FileParser {
+  parse(file: File): Promise<ConfigBlock[]>
+}