fix: move validate schema to template renderer

aws-amplify · Feb 25, 2022 · 459f5ff · 459f5ff
1 parent 7e26b20
commit 459f5ff
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 7 deletions.
diff --git a/packages/codegen-ui-react/lib/react-index-studio-template-renderer.ts b/packages/codegen-ui-react/lib/react-index-studio-template-renderer.ts
@@ -93,4 +93,7 @@ export class ReactIndexStudioTemplateRenderer extends StudioTemplateRenderer<
         );
       }) as ExportDeclaration[];
   }
+
+  // no-op
+  validateSchema() {}
 }
diff --git a/packages/codegen-ui-react/lib/react-studio-template-renderer.ts b/packages/codegen-ui-react/lib/react-studio-template-renderer.ts
@@ -31,6 +31,7 @@ import {
   handleCodegenErrors,
   ComponentMetadata,
   computeComponentMetadata,
+  validateComponentSchema,
 } from '@aws-amplify/codegen-ui';
 import { EOL } from 'os';
 import ts, {
@@ -1178,5 +1179,9 @@ export abstract class ReactStudioTemplateRenderer extends StudioTemplateRenderer
     mapSyntheticPropsForComponent(this.component);
   }
 
+  validateSchema(component: StudioComponent) {
+    validateComponentSchema(component);
+  }
+
   abstract renderJsx(component: StudioComponent): JsxElement | JsxFragment | JsxSelfClosingElement;
 }
diff --git a/packages/codegen-ui-react/lib/react-theme-studio-template-renderer.ts b/packages/codegen-ui-react/lib/react-theme-studio-template-renderer.ts
@@ -60,7 +60,6 @@ export class ReactThemeStudioTemplateRenderer extends StudioTemplateRenderer<
 
   constructor(theme: StudioTheme, renderConfig: ReactRenderConfig) {
     super(theme, new ReactOutputManager(), renderConfig);
-    validateThemeSchema(theme);
     this.renderConfig = {
       ...defaultRenderConfig,
       ...renderConfig,
@@ -194,4 +193,8 @@ export class ReactThemeStudioTemplateRenderer extends StudioTemplateRenderer<
       ),
     );
   }
+
+  validateSchema(theme: StudioTheme) {
+    validateThemeSchema(theme);
+  }
 }
diff --git a/packages/codegen-ui/lib/__tests__/__utils__/mock-classes.ts b/packages/codegen-ui/lib/__tests__/__utils__/mock-classes.ts
@@ -39,4 +39,6 @@ export class MockTemplateRenderer extends StudioTemplateRenderer<
       renderComponentToFilesystem: jest.fn(),
     };
   }
+
+  validateSchema() {}
 }
diff --git a/packages/codegen-ui/lib/common-component-renderer.ts b/packages/codegen-ui/lib/common-component-renderer.ts
@@ -15,7 +15,6 @@
  */
 import { StudioComponent, StudioComponentChild, WrappedComponentProperties } from './types';
 import { StudioNode } from './studio-node';
-import { validateComponentSchema } from './validation-helper';
 
 /**
  * Shared class for rendering components.
@@ -27,10 +26,6 @@ export abstract class CommonComponentRenderer<TPropIn> {
   protected node: StudioNode;
 
   constructor(protected component: StudioComponent | StudioComponentChild, protected parent?: StudioNode) {
-    // Run schema validation on the top-level component.
-    if (this.parent === undefined) {
-      validateComponentSchema(this.component as StudioComponent);
-    }
     const flattenedProps = Object.entries(component.properties).map((prop) => {
       return [prop[0], prop[1]];
     });

diff --git a/packages/codegen-ui/lib/studio-template-renderer.ts b/packages/codegen-ui/lib/studio-template-renderer.ts
@@ -33,7 +33,9 @@ export abstract class StudioTemplateRenderer<
     protected component: TStudioType,
     protected outputManager: TOutputManager,
     protected renderConfig: FrameworkRenderConfig,
-  ) {}
+  ) {
+    this.validateSchema(component);
+  }
 
   /**
    * Renders the entire first order component. It returns the
@@ -50,4 +52,6 @@ export abstract class StudioTemplateRenderer<
     return (fileName: string) => (outputPath: string) =>
       this.outputManager.writeComponent(componentContent, path.join(outputPath, fileName));
   }
+
+  protected abstract validateSchema(component: TStudioType): void;
 }