From 24b98d9fc451b6eae4138ee4c443b8b91533a04c Mon Sep 17 00:00:00 2001
From: Max Sagan <maxim.sagan@winning.com.au>
Date: Fri, 29 Mar 2019 11:08:55 +1100
Subject: [PATCH] Adds requiresComponentDeclaration option

---
 .../src/frameworks/angular/helpers.ts         | 21 +++++++++++++++---
 .../src/frameworks/angular/types.ts           |  1 +
 app/angular/index.d.ts                        |  1 +
 .../src/client/preview/angular/helpers.ts     | 22 ++++++++++++++++---
 .../src/client/preview/angular/types.ts       |  1 +
 5 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/addons/storyshots/storyshots-core/src/frameworks/angular/helpers.ts b/addons/storyshots/storyshots-core/src/frameworks/angular/helpers.ts
index d8786390a4c..ad2ff8aa5e2 100644
--- a/addons/storyshots/storyshots-core/src/frameworks/angular/helpers.ts
+++ b/addons/storyshots/storyshots-core/src/frameworks/angular/helpers.ts
@@ -34,9 +34,24 @@ const createComponentFromTemplate = (template: string) => {
 };
 
 export const initModuleData = (storyObj: NgStory): any => {
-  const { component, template, props, moduleMetadata = {} } = storyObj;
+  const {
+    component,
+    template,
+    props,
+    moduleMetadata = {},
+    requiresComponentDeclaration: componentRequiresDeclaration = true,
+  } = storyObj;
 
-  const AnnotatedComponent = template ? createComponentFromTemplate(template) : component;
+  const isCreatingComponentFromTemplate = Boolean(template);
+
+  const AnnotatedComponent = isCreatingComponentFromTemplate
+    ? createComponentFromTemplate(template)
+    : component;
+
+  const componentDeclarations =
+    isCreatingComponentFromTemplate || componentRequiresDeclaration
+      ? [AppComponent, AnnotatedComponent]
+      : [AppComponent];
 
   const story = {
     component: AnnotatedComponent,
@@ -44,7 +59,7 @@ export const initModuleData = (storyObj: NgStory): any => {
   };
 
   const moduleMeta = getModuleMeta(
-    [AppComponent, AnnotatedComponent],
+    componentDeclarations,
     [AnnotatedComponent],
     [AppComponent],
     story,
diff --git a/addons/storyshots/storyshots-core/src/frameworks/angular/types.ts b/addons/storyshots/storyshots-core/src/frameworks/angular/types.ts
index 3582cb89f8a..36793bf7fb7 100644
--- a/addons/storyshots/storyshots-core/src/frameworks/angular/types.ts
+++ b/addons/storyshots/storyshots-core/src/frameworks/angular/types.ts
@@ -12,6 +12,7 @@ export interface ICollection {
 
 export interface NgStory {
   component?: any;
+  requiresComponentDeclaration?: boolean;
   props: ICollection;
   propsMeta?: ICollection;
   moduleMetadata?: NgModuleMetadata;
diff --git a/app/angular/index.d.ts b/app/angular/index.d.ts
index 5fb420e543f..3b2e9d078db 100644
--- a/app/angular/index.d.ts
+++ b/app/angular/index.d.ts
@@ -22,6 +22,7 @@ export interface IStory {
   props?: ICollection;
   moduleMetadata?: Partial<NgModuleMetadata>;
   component?: any;
+  requiresComponentDeclaration?: boolean;
   template?: string;
 }
 
diff --git a/app/angular/src/client/preview/angular/helpers.ts b/app/angular/src/client/preview/angular/helpers.ts
index d85fa451edf..63bcff52dd0 100644
--- a/app/angular/src/client/preview/angular/helpers.ts
+++ b/app/angular/src/client/preview/angular/helpers.ts
@@ -47,9 +47,25 @@ const createComponentFromTemplate = (template: string, styles: string[]) => {
 
 const initModule = (storyFn: IStoryFn) => {
   const storyObj = storyFn();
-  const { component, template, props, styles, moduleMetadata = {} } = storyObj;
+  const {
+    component,
+    template,
+    props,
+    styles,
+    moduleMetadata = {},
+    requiresComponentDeclaration: componentRequiresDeclaration = true,
+  } = storyObj;
 
-  let AnnotatedComponent = template ? createComponentFromTemplate(template, styles) : component;
+  const isCreatingComponentFromTemplate = Boolean(template);
+
+  const AnnotatedComponent = isCreatingComponentFromTemplate
+    ? createComponentFromTemplate(template, styles)
+    : component;
+
+  const componentDeclarations =
+    isCreatingComponentFromTemplate || componentRequiresDeclaration
+      ? [AppComponent, AnnotatedComponent]
+      : [AppComponent];
 
   const story = {
     component: AnnotatedComponent,
@@ -57,7 +73,7 @@ const initModule = (storyFn: IStoryFn) => {
   };
 
   return getModule(
-    [AppComponent, AnnotatedComponent],
+    componentDeclarations,
     [AnnotatedComponent],
     [AppComponent],
     story,
diff --git a/app/angular/src/client/preview/angular/types.ts b/app/angular/src/client/preview/angular/types.ts
index 0633eabea0e..408911dcbf0 100644
--- a/app/angular/src/client/preview/angular/types.ts
+++ b/app/angular/src/client/preview/angular/types.ts
@@ -12,6 +12,7 @@ export interface ICollection {
 
 export interface NgStory {
   component?: any;
+  requiresComponentDeclaration?: boolean;
   props: ICollection;
   propsMeta?: ICollection;
   moduleMetadata?: NgModuleMetadata;