refactor to allow switching ICategoryCollection context #40

src/application/Parser/ApplicationParser.ts

@@ -0,0 +1,27 @@
+import { IApplication } from '@/domain/IApplication';
+import { IProjectInformation } from '@/domain/IProjectInformation';
+import { ICategoryCollection } from '@/domain/ICategoryCollection';
+import { parseCategoryCollection } from './CategoryCollectionParser';
+import applicationFile, { YamlApplication } from 'js-yaml-loader!@/application/application.yaml';
+import { parseProjectInformation } from '@/application/Parser/ProjectInformationParser';
+import { Application } from '@/domain/Application';
+
+export function parseApplication(
+    parser = CategoryCollectionParser,
+    processEnv: NodeJS.ProcessEnv = process.env,
+    collectionData = CollectionData): IApplication {
+    const information = parseProjectInformation(processEnv);
+    const collection = parser(collectionData, information);
+    const app = new Application(information, [ collection ]);
+    return app;
+}
+
+export type CategoryCollectionParserType
+    = (file: YamlApplication, info: IProjectInformation) => ICategoryCollection;
+
+const CategoryCollectionParser: CategoryCollectionParserType
+    = (file, info) => parseCategoryCollection(file, info);
+
+const CollectionData: YamlApplication
+    = applicationFile;
+

src/application/Parser/CategoryCollectionParser.ts

@@ -1,17 +1,17 @@
 import { Category } from '@/domain/Category';
 import { YamlApplication } from 'js-yaml-loader!@/application.yaml';
 import { parseCategory } from './CategoryParser';
-import { parseProjectInformation } from './ProjectInformationParser';
 import { ScriptCompiler } from './Compiler/ScriptCompiler';
 import { OperatingSystem } from '@/domain/OperatingSystem';
 import { parseScriptingDefinition } from './ScriptingDefinitionParser';
 import { createEnumParser } from '../Common/Enum';
 import { ICategoryCollection } from '@/domain/ICategoryCollection';
 import { CategoryCollection } from '@/domain/CategoryCollection';
+import { IProjectInformation } from '@/domain/IProjectInformation';
 
 export function parseCategoryCollection(
     content: YamlApplication,
-    env: NodeJS.ProcessEnv = process.env,
+    info: IProjectInformation,
     osParser = createEnumParser(OperatingSystem)): ICategoryCollection {
     validate(content);
     const compiler = new ScriptCompiler(content.functions);
@@ -21,11 +21,9 @@ export function parseCategoryCollection(
         categories.push(category);
     }
     const os = osParser.parseEnum(content.os, 'os');
-    const info = parseProjectInformation(env);
     const scripting = parseScriptingDefinition(content.scripting, info);
     const collection = new CategoryCollection(
         os,
-        info,
         categories,
         scripting);
     return collection;