Cleaned up apply and plan orchastrators

Author: kevinwang5658

src/commands/apply/index.ts

@@ -1,7 +1,6 @@
 import { Args, Command, Flags } from '@oclif/core'
 import path from 'node:path';
-
-import { ApplyOrchestrator } from './orchestrator.js';
+import { ApplyOrchestrator } from '../../orchestrators/apply.js';
 
 export default class Apply extends Command {
   static args = {

src/commands/apply/orchestrator.ts

@@ -1,7 +1,6 @@
 import { Args, Command, Flags } from '@oclif/core'
 import * as path from 'node:path';
-
-import { PlanOrchestrator } from './orchestrator.js';
+import { PlanOrchestrator } from '../../orchestrators/plan.js';
 
 export default class Plan extends Command {
   static args = {

src/commands/plan/index.ts

@@ -1,4 +1,4 @@
-import { ConfigClass } from '../config-parser/language-definition.js';
+import { ConfigClass } from '../parser/language-definition.js';
 
 export interface ConfigBlock {
   configClass: ConfigClass;

src/commands/plan/orchestrator.ts

@@ -1,6 +1,6 @@
 import { ProjectSchema } from 'codify-schemas';
 
-import { ConfigClass } from '../config-parser/language-definition.js';
+import { ConfigClass } from '../parser/language-definition.js';
 import { ajv } from '../utils/ajv.js';
 import { RemoveMethods } from '../utils/types.js';
 import { ConfigBlock } from './index.js';

src/entities/index.ts

@@ -1,6 +1,6 @@
 import { ResourceSchema } from 'codify-schemas';
 
-import { ConfigClass } from '../config-parser/language-definition.js';
+import { ConfigClass } from '../parser/language-definition.js';
 import { ajv } from '../utils/ajv.js';
 import { RemoveMethods } from '../utils/types.js';
 import { ConfigBlock } from './index.js';

src/entities/project-config.ts

@@ -0,0 +1,21 @@
+import readline from 'node:readline';
+
+import { PlanOrchestrator } from './plan.js';
+
+const rl = readline.createInterface(process.stdin, process.stdout);
+
+export const ApplyOrchestrator = {
+  async run(rootDirectory: string): Promise<void> {
+    const { plan, pluginCollection } = await PlanOrchestrator.run(rootDirectory, false);
+
+    const response = await new Promise((resolve) => {
+      rl.question('Is this okay?\n', (answer) => resolve(answer));
+    });
+    if (response !== 'yes') {
+      return;
+    }
+
+    await pluginCollection.apply(plan);
+    await pluginCollection.destroy();
+  },
+};

src/entities/resource-config.ts

@@ -0,0 +1,39 @@
+import { PlanResponseData } from 'codify-schemas';
+
+import { Project } from '../entities/project.js';
+import { Parser } from '../parser/index.js';
+import { PluginCollection } from '../plugins/plugin-collection.js';
+
+interface PlanOchestratorResponse {
+  plan: PlanResponseData[],
+  pluginCollection: PluginCollection;
+  project: Project;
+}
+
+export const PlanOrchestrator = {
+  async run(rootDirectory: string, destroyPlugins = true): Promise<PlanOchestratorResponse> {
+    const project = await Parser.parseProject(rootDirectory);
+
+    const pluginCollection = new PluginCollection();
+    const dependencyMap = await pluginCollection.initialize(project);
+    project.validateWithResourceMap(dependencyMap);
+    project.resolveResourceDependencies(dependencyMap);
+
+    const validationResults = await pluginCollection.validate(project);
+    project.handlePluginResourceValidationResults(validationResults);
+    project.calculateEvaluationOrder();
+
+    const plan = await pluginCollection.getPlan(project);
+    console.log(JSON.stringify(plan, null, 2));
+
+    if (destroyPlugins) {
+      await pluginCollection.destroy();
+    }
+
+    return {
+      plan,
+      pluginCollection,
+      project,
+    };
+  },
+};

src/orchestrators/apply.ts

@@ -8,7 +8,7 @@ import { JsonFileParser } from './parser/json/file-parser.js';
 import { ProjectReader } from './reader/index.js';
 import { ConfigBlock } from '../entities/index.js';
 
-export class ConfigParser {
+export class Parser {
 
   static readonly supportedParsers: Record<string, FileParser> = {
     'json': new JsonFileParser(),
@@ -19,7 +19,7 @@ export class ConfigParser {
     const loadedProject = await configReader.readProject(directory);
 
     const configBlocksResult = await Promise.all(loadedProject.files.map((file) => {
-      const parser = ConfigParser.supportedParsers[file.fileType];
+      const parser = Parser.supportedParsers[file.fileType];
       if (!parser) {
         throw new InternalError(`Unsupported file format loaded into parser: ${file.fileName}`);
       }
@@ -28,7 +28,7 @@ export class ConfigParser {
     }));
 
     const configBlocks = configBlocksResult.flat(1);
-    const projectConfig = ConfigParser.findProjectConfig(configBlocks);
+    const projectConfig = Parser.findProjectConfig(configBlocks);
 
     return new Project(
       projectConfig,