refactor: move angular loader in addon-storyshots framework part to TS

storybookjs · Aug 4, 2019 · 6cbddb0 · 6cbddb0
1 parent e9e5c49
commit 6cbddb0
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 13 deletions.
diff --git a/addons/storyshots/storyshots-core/src/frameworks/Loader.ts b/addons/storyshots/storyshots-core/src/frameworks/Loader.ts
@@ -1,4 +1,15 @@
+type SupportedFramework = 'angular';
+
+export type RenderTree = (story: any) => any;
+
 export interface Loader {
-  load: (options: any) => any;
+  load: (
+    options: any
+  ) => {
+    framework: SupportedFramework;
+    renderTree: RenderTree;
+    renderShallowTree: any;
+    storybook: any;
+  };
   test: (options: any) => boolean;
 }
diff --git a/...ots-core/src/frameworks/angular/loader.js → ...ots-core/src/frameworks/angular/loader.ts b/...ots-core/src/frameworks/angular/loader.js → ...ots-core/src/frameworks/angular/loader.ts
@@ -2,6 +2,8 @@ import 'core-js';
 import 'core-js/es/reflect';
 import hasDependency from '../hasDependency';
 import configure from '../configure';
+import { Loader } from '../Loader';
+import { StoryshotsOptions } from '../../api/StoryshotsOptions';
 
 function setupAngularJestPreset() {
   // Needed to prevent "Zone.js has detected that ZoneAwarePromise `(window|global).Promise` has been overwritten."
@@ -18,13 +20,13 @@ function setupAngularJestPreset() {
   require.requireActual('jest-preset-angular/setupJest');
 }
 
-function test(options) {
+function test(options: any): boolean {
   return (
     options.framework === 'angular' || (!options.framework && hasDependency('@storybook/angular'))
   );
 }
 
-function load(options) {
+function load(options: StoryshotsOptions) {
   setupAngularJestPreset();
 
   const { configPath, config } = options;
@@ -33,7 +35,7 @@ function load(options) {
   configure({ configPath, config, storybook });
 
   return {
-    framework: 'angular',
+    framework: 'angular' as const,
     renderTree: require.requireActual('./renderTree').default,
     renderShallowTree: () => {
       throw new Error('Shallow renderer is not supported for angular');
@@ -42,7 +44,9 @@ function load(options) {
   };
 }
 
-export default {
+const angularLoader: Loader = {
   load,
   test,
 };
+
+export default angularLoader;
diff --git a/...core/src/frameworks/angular/renderTree.js → ...core/src/frameworks/angular/renderTree.ts b/...core/src/frameworks/angular/renderTree.js → ...core/src/frameworks/angular/renderTree.ts
@@ -14,18 +14,21 @@ import { initModuleData } from './helpers';
 addSerializer(HTMLCommentSerializer);
 addSerializer(AngularSnapshotSerializer);
 
-function getRenderedTree(story) {
+function getRenderedTree(story: any) {
   const currentStory = story.render();
 
   const { moduleMeta, AppComponent } = initModuleData(currentStory);
 
-  TestBed.configureTestingModule({
-    imports: [...moduleMeta.imports],
-    declarations: [...moduleMeta.declarations],
-    providers: [...moduleMeta.providers],
-    schemas: [NO_ERRORS_SCHEMA, ...moduleMeta.schemas],
-    bootstrap: [...moduleMeta.bootstrap],
-  });
+  TestBed.configureTestingModule(
+    // TODO: take a look at `bootstrap` because it looks it does not exists in TestModuleMetadata
+    {
+      imports: [...moduleMeta.imports],
+      declarations: [...moduleMeta.declarations],
+      providers: [...moduleMeta.providers],
+      schemas: [NO_ERRORS_SCHEMA, ...moduleMeta.schemas],
+      bootstrap: [...moduleMeta.bootstrap],
+    } as any
+  );
 
   TestBed.overrideModule(BrowserDynamicTestingModule, {
     set: {

diff --git a/addons/storyshots/storyshots-core/src/typings.d.ts b/addons/storyshots/storyshots-core/src/typings.d.ts
@@ -1 +1,2 @@
 declare module 'global';
+declare module 'jest-preset-angular/*';
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		declare module 'global';
		declare module 'jest-preset-angular/*';