chore: suggestions

forcedotcom · Aug 6, 2024 · 0b7bda4 · 0b7bda4
1 parent 25b4956
commit 0b7bda4
Show file tree

Hide file tree

Showing 4 changed files with 68 additions and 58 deletions.
diff --git a/src/generators/index.ts b/src/generators/index.ts
diff --git a/src/service/templateService.ts b/src/service/templateService.ts
@@ -5,11 +5,22 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 
-import { type CreateOutput, TemplateType } from '../utils/types';
-import { Generators, generators } from '../generators';
+import {
+  type CreateOutput,
+  GeneratorClass,
+  generators,
+  TemplateOptions,
+  TemplateType,
+} from '../utils/types';
+import { nls } from '../i18n';
 
-export function importGenerator(templateType: TemplateType) {
-  const generator = generators.get(templateType) as Generators;
+export function importGenerator<TOptions extends TemplateOptions>(
+  templateType: TemplateType
+): GeneratorClass<TOptions> {
+  const generator = generators.get(templateType);
+  if (!generator) {
+    throw new Error(nls.localize('templateTypeNotFound'));
+  }
   return generator;
 }
 

diff --git a/src/utils/types.ts b/src/utils/types.ts
@@ -5,11 +5,37 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 
-export type CreateOutput = {
-  outputDir: string;
-  created: string[];
-  rawOutput: string;
-};
+import AnalyticsTemplateGenerator from '../generators/analyticsTemplateGenerator';
+import ApexClassGenerator from '../generators/apexClassGenerator';
+import ApexTriggerGenerator from '../generators/apexTriggerGenerator';
+import LightningAppGenerator from '../generators/lightningAppGenerator';
+import LightningComponentGenerator from '../generators/lightningComponentGenerator';
+import LightningEventGenerator from '../generators/lightningEventGenerator';
+import LightningInterfaceGenerator from '../generators/lightningInterfaceGenerator';
+import LightningTestGenerator from '../generators/lightningTestGenerator';
+import ProjectGenerator from '../generators/projectGenerator';
+import StaticResourceGenerator from '../generators/staticResourceGenerator';
+import VisualforceComponentGenerator from '../generators/visualforceComponentGenerator';
+import VisualforcePageGenerator from '../generators/visualforcePageGenerator';
+import { BaseGenerator } from '../generators/baseGenerator';
+
+export type GeneratorClass<TOptions extends TemplateOptions> = new (
+  options: TOptions
+) => BaseGenerator<TOptions>;
+
+export type Generators =
+  | typeof AnalyticsTemplateGenerator
+  | typeof ApexClassGenerator
+  | typeof ApexTriggerGenerator
+  | typeof LightningAppGenerator
+  | typeof LightningComponentGenerator
+  | typeof LightningEventGenerator
+  | typeof LightningTestGenerator
+  | typeof LightningInterfaceGenerator
+  | typeof ProjectGenerator
+  | typeof StaticResourceGenerator
+  | typeof VisualforceComponentGenerator
+  | typeof VisualforcePageGenerator;
 
 /**
  * Available Template types
@@ -33,6 +59,27 @@ export enum TemplateType {
   StaticResource,
 }
 
+export const generators = new Map<TemplateType, GeneratorClass<any>>([
+  [TemplateType.AnalyticsTemplate, AnalyticsTemplateGenerator],
+  [TemplateType.ApexClass, ApexClassGenerator],
+  [TemplateType.ApexTrigger, ApexTriggerGenerator],
+  [TemplateType.LightningApp, LightningAppGenerator],
+  [TemplateType.LightningComponent, LightningComponentGenerator],
+  [TemplateType.LightningEvent, LightningEventGenerator],
+  [TemplateType.LightningInterface, LightningInterfaceGenerator],
+  [TemplateType.LightningTest, LightningTestGenerator],
+  [TemplateType.Project, ProjectGenerator],
+  [TemplateType.StaticResource, StaticResourceGenerator],
+  [TemplateType.VisualforceComponent, VisualforceComponentGenerator],
+  [TemplateType.VisualforcePage, VisualforcePageGenerator],
+]);
+
+export type CreateOutput = {
+  outputDir: string;
+  created: string[];
+  rawOutput: string;
+};
+
 /**
  * Template Options
  * If not supplied, the apiversion and outputdir use default values.

diff --git a/test/service/templateService.test.ts b/test/service/templateService.test.ts
@@ -460,7 +460,7 @@ describe('TemplateService', () => {
   describe('Generators', () => {
     it('should have a generator for each TemplateType', () => {
       const templateTypes = Object.values(TemplateType).filter(
-        (v) => !isNaN(Number(v))
+        (value) => typeof value === 'number'
       );
 
       for (const templateType of templateTypes) {