Fixed dependency-graph-resolver bugs. Added tests for dependency-graph-resolver. Added xcode-tools config by default for all plans and applies. Made all other resource blocks depend on xcode-tools. Renamed config file from index.ts to config.ts.

Author: kevinwang5658

README.md

@@ -28,8 +28,6 @@ USAGE
 # Commands
 <!-- commands -->
 * [`codify apply [FILE]`](#codify-apply-file)
-* [`codify hello PERSON`](#codify-hello-person)
-* [`codify hello world`](#codify-hello-world)
 * [`codify help [COMMANDS]`](#codify-help-commands)
 * [`codify plan [FILE]`](#codify-plan-file)
 * [`codify plugins`](#codify-plugins)
@@ -41,21 +39,27 @@ USAGE
 * [`codify plugins:uninstall PLUGIN...`](#codify-pluginsuninstall-plugin-1)
 * [`codify plugins:uninstall PLUGIN...`](#codify-pluginsuninstall-plugin-2)
 * [`codify plugins update`](#codify-plugins-update)
-* [`codify uninstall RESOURCES`](#codify-uninstall-resources)
+* [`codify uninstall`](#codify-uninstall)
 
 ## `codify apply [FILE]`
 
 describe the command here
 
 ```
 USAGE
-  $ codify apply [FILE] [-p <value>]
+  $ codify apply [FILE] [--json] [-o plain|default|debug|json] [--debug] [-p <value>]
 
 ARGUMENTS
   FILE  file to read
 
 FLAGS
-  -p, --path=<value>  path to project
+  -o, --output=<option>  [default: default]
+                         <options: plain|default|debug|json>
+  -p, --path=<value>     path to project
+  --debug
+
+GLOBAL FLAGS
+  --json  Format output as json.
 
 DESCRIPTION
   describe the command here
@@ -67,48 +71,6 @@ EXAMPLES
 _See
 code: [src/commands/apply/index.ts](https://github.com/kevinwang5658/codify/blob/v0.0.0/src/commands/apply/index.ts)_
 
-## `codify hello PERSON`
-
-Say hello
-
-```
-USAGE
-  $ codify hello PERSON -f <value>
-
-ARGUMENTS
-  PERSON  Person to say hello to
-
-FLAGS
-  -f, --from=<value>  (required) Who is saying hello
-
-DESCRIPTION
-  Say hello
-
-EXAMPLES
-  $ oex hello friend --from oclif
-  hello friend from oclif! (./src/commands/hello/index.ts)
-```
-
-_See code: [src/commands/hello/index.ts](https://github.com/kevinwang5658/codify/blob/v0.0.0/src/commands/hello/index.ts)_
-
-## `codify hello world`
-
-Say hello world
-
-```
-USAGE
-  $ codify hello world
-
-DESCRIPTION
-  Say hello world
-
-EXAMPLES
-  $ codify hello world
-  hello world! (./src/commands/hello/world.ts)
-```
-
-_See code: [src/commands/hello/world.ts](https://github.com/kevinwang5658/codify/blob/v0.0.0/src/commands/hello/world.ts)_
-
 ## `codify help [COMMANDS]`
 
 Display help for codify.
@@ -135,15 +97,21 @@ describe the command here
 
 ```
 USAGE
-  $ codify plan [FILE] [-f] [-n <value>] [-p <value>]
+  $ codify plan [FILE] [--json] [-o plain|default|debug|json] [--debug] [-f] [-n <value>] [-p <value>]
 
 ARGUMENTS
   FILE  file to read
 
 FLAGS
   -f, --force
-  -n, --name=<value>  name to print
-  -p, --path=<value>  path to project
+  -n, --name=<value>     name to print
+  -o, --output=<option>  [default: default]
+                         <options: plain|default|debug|json>
+  -p, --path=<value>     path to project
+  --debug
+
+GLOBAL FLAGS
+  --json  Format output as json.
 
 DESCRIPTION
   describe the command here
@@ -402,16 +370,21 @@ DESCRIPTION
 
 _See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v3.9.4/src/commands/plugins/update.ts)_
 
-## `codify uninstall RESOURCES`
+## `codify uninstall`
 
 describe the command here
 
 ```
 USAGE
-  $ codify uninstall RESOURCES...
+  $ codify uninstall [--json] [-o plain|default|debug|json] [--debug]
 
-ARGUMENTS
-  RESOURCES...  A resource typeId for uninstalling. Ex: "codify uninstall homebrew"
+FLAGS
+  -o, --output=<option>  [default: default]
+                         <options: plain|default|debug|json>
+  --debug
+
+GLOBAL FLAGS
+  --json  Format output as json.
 
 DESCRIPTION
   describe the command here

src/common/orchestrator.ts

@@ -13,5 +13,5 @@ export const CommonOrchestrator = {
     ctx.subprocessFinished(SubProcessName.INITIALIZE_PLUGINS)
 
     return { dependencyMap, pluginCollection };
-  }
+  },
 };

src/entities/index.ts src/entities/config.tssrc/entities/index.ts renamed to src/entities/config.ts

@@ -3,7 +3,7 @@ import { ProjectSchema } from 'codify-schemas';
 import { ConfigClass } from '../parser/language-definition.js';
 import { ajv } from '../utils/ajv.js';
 import { RemoveMethods } from '../utils/types.js';
-import { ConfigBlock } from './index.js';
+import { ConfigBlock } from './config.js';
 
 /** Project JSON supported format
  * {

src/entities/project-config.ts

@@ -1,5 +1,6 @@
 import { ValidateResponseData } from 'codify-schemas';
 
+import { ctx } from '../events/context.js';
 import { DependencyMap } from '../plugins/plugin-collection.js';
 import { DependencyGraphResolver } from '../utils/dependency-graph-resolver.js';
 import { ProjectConfig } from './project-config.js';
@@ -19,6 +20,12 @@ export class Project {
     return this.resourceConfigs.length === 0;
   }
 
+  addXCodeToolsConfig() {
+    this.resourceConfigs.unshift(new ResourceConfig({
+      type: 'xcode-tools'
+    }));
+  }
+
   validateWithResourceMap(resourceMap: Map<string, string[]>) {
     const invalidConfigs = this.resourceConfigs.filter((c) => !resourceMap.get(c.type));
     if (invalidConfigs.length > 0) {
@@ -31,7 +38,7 @@ export class Project {
   resolveResourceDependencies(dependencyMap: DependencyMap) {
     const resourceMap = new Map(this.resourceConfigs.map((r) => [r.id, r] as const));
 
-    this.resourceConfigs.forEach((r) => {
+    for (const r of this.resourceConfigs) {
       // User specified dependencies are hard dependencies. They must be present.
       r.addDependenciesBasedOnParameters((id) => resourceMap.has(id));
 
@@ -40,7 +47,13 @@ export class Project {
           ?.filter((id) => resourceMap.has(id))
         ?? []
       );
-    })
+
+      // Add this to ensure that the default config xcode-tools gets applied first
+      // TODO: remove this in the future with required dependencies
+      if (r.type !== 'xcode-tools') {
+        r.addDependencies(['xcode-tools'])
+      }
+    }
   }
 
   handlePluginResourceValidationResults(results: ValidateResponseData[]) {
@@ -65,5 +78,7 @@ ${JSON.stringify(
       (r) => r.id,
       (r) => r.dependencyIds
     );
+
+    ctx.debug(`Resource Evaluation Order:\n${JSON.stringify(this.evaluationOrder, null, 2)}`);
   }
 }

src/entities/project.ts

@@ -3,7 +3,7 @@ import { ResourceSchema } from 'codify-schemas';
 import { ConfigClass } from '../parser/language-definition.js';
 import { ajv } from '../utils/ajv.js';
 import { RemoveMethods } from '../utils/types.js';
-import { ConfigBlock } from './index.js';
+import { ConfigBlock } from './config.js';
 
 /** Resource JSON supported format
  * {

src/entities/resource-config.ts

@@ -19,6 +19,9 @@ export const PlanOrchestrator = {
 
     ctx.subprocessStarted(SubProcessName.PARSE);
     const project = await Parser.parseProject(path);
+
+    // Always add xcode tools as a dependency to make sure it's installed. This may be temporary if required dependencies get added.
+    project.addXCodeToolsConfig();
     ctx.subprocessFinished(SubProcessName.PARSE);
 
     const { dependencyMap, pluginCollection } = await CommonOrchestrator.initializePlugins(project);
@@ -33,7 +36,6 @@ export const PlanOrchestrator = {
     project.calculateEvaluationOrder();
     ctx.subprocessFinished(SubProcessName.VALIDATE)
 
-
     ctx.subprocessStarted(SubProcessName.GENERATE_PLAN)
     const plan = await pluginCollection.getPlan(project);
     ctx.subprocessFinished(SubProcessName.GENERATE_PLAN)

src/orchestrators/plan.ts

@@ -1,4 +1,4 @@
-import { ConfigBlock } from '../entities/index.js';
+import { ConfigBlock } from '../entities/config.js';
 import { Project } from '../entities/project.js';
 import { ProjectConfig } from '../entities/project-config.js';
 import { ResourceConfig } from '../entities/resource-config.js';

src/parser/index.ts

@@ -1,4 +1,4 @@
-import { ConfigBlock } from '../../entities/index.js';
+import { ConfigBlock } from '../../entities/config.js';
 import { File } from '../reader/entities/file.js';
 
 export interface FileParser {

src/parser/parser/index.ts

@@ -1,4 +1,4 @@
-import { ConfigBlock } from '../../../entities/index.js';
+import { ConfigBlock } from '../../../entities/config.js';
 import { ProjectConfig } from '../../../entities/project-config.js';
 import { ResourceConfig } from '../../../entities/resource-config.js';
 import { SyntaxError } from '../../../utils/errors.js';