Angular: Component creation with TestBed API

code/frameworks/angular/package.json

@@ -52,6 +52,8 @@
     "prep": "rimraf dist && jiti ../../../scripts/prepare/tsc.ts"
   },
   "dependencies": {
+    "@angular/platform-browser-dynamic": "^20.0.0",
+    "@angular/router": "^20.0.0",
     "@storybook/builder-webpack5": "workspace:*",
     "@storybook/core-webpack": "workspace:*",
     "@storybook/global": "^5.0.0",
@@ -65,17 +67,18 @@
   },
   "devDependencies": {
     "@analogjs/vite-plugin-angular": "^1.12.1",
-    "@angular-devkit/architect": "^0.1901.1",
-    "@angular-devkit/build-angular": "^19.1.1",
-    "@angular-devkit/core": "^19.1.1",
-    "@angular/animations": "^19.1.1",
-    "@angular/common": "^19.1.1",
-    "@angular/compiler": "^19.1.1",
-    "@angular/compiler-cli": "^19.1.1",
-    "@angular/core": "^19.1.1",
-    "@angular/forms": "^19.1.1",
-    "@angular/platform-browser": "^19.1.1",
-    "@angular/platform-browser-dynamic": "^19.1.1",
+    "@angular-devkit/architect": "^0.2000.1",
+    "@angular-devkit/build-angular": "^20.0.0",
+    "@angular-devkit/core": "^20.0.0",
+    "@angular/animations": "^20.0.0",
+    "@angular/common": "^20.0.0",
+    "@angular/compiler": "^20.0.0",
+    "@angular/compiler-cli": "^20.0.0",
+    "@angular/core": "^20.0.0",
+    "@angular/forms": "^20.0.0",
+    "@angular/platform-browser": "^20.0.0",
+    "@angular/platform-browser-dynamic": "^20.0.0",
+    "@angular/router": "^20.0.0",
     "@types/node": "^22.0.0",
     "rimraf": "^6.0.1",
     "typescript": "^5.8.3",
@@ -95,6 +98,7 @@
     "@angular/forms": ">=18.0.0 < 21.0.0",
     "@angular/platform-browser": ">=18.0.0 < 21.0.0",
     "@angular/platform-browser-dynamic": ">=18.0.0 < 21.0.0",
+    "@angular/router": ">=18.0.0 < 21.0.0",
     "rxjs": "^6.5.3 || ^7.4.0",
     "storybook": "workspace:^",
     "typescript": "^4.9.0 || ^5.0.0",

code/frameworks/angular/src/client/angular-beta/AbstractRenderer.ts

@@ -1,13 +1,14 @@
 import { ApplicationRef, NgModule } from '@angular/core';
-import { bootstrapApplication } from '@angular/platform-browser';
 import { BehaviorSubject, Subject } from 'rxjs';
 import { stringify } from 'telejson';
-
 import { ICollection, StoryFnAngularReturnType } from '../types';
-import { getApplication } from './StorybookModule';
-import { storyPropsProvider } from './StorybookProvider';
-import { queueBootstrapping } from './utils/BootstrapQueue';
 import { PropertyExtractor } from './utils/PropertyExtractor';
+import { TestBedComponentBuilder } from './utils/TestBedComponentBuilder';
+import { queueBootstrapping } from './utils/BootstrapQueue';
+import { bootstrapApplication } from '@angular/platform-browser';
+import { getWrapperComponent } from './TestBedWrapperComponent';
+import { storyPropsProvider } from './StorybookProvider';
+import { getApplication } from './StorybookModule';
 
 type StoryRenderInfo = {
   storyFnAngular: StoryFnAngularReturnType;
@@ -21,7 +22,6 @@ declare global {
 }
 
 const applicationRefs = new Map<HTMLElement, ApplicationRef>();
-
 /**
  * Attribute name for the story UID that may be written to the targetDOMNode.
  *
@@ -71,8 +71,6 @@ export abstract class AbstractRenderer {
     component?: any;
     targetDOMNode: HTMLElement;
   }) {
-    const targetSelector = this.generateTargetSelectorFromStoryId(targetDOMNode.id);
-
     const newStoryProps$ = new BehaviorSubject<ICollection>(storyFnAngular.props);
 
     if (
@@ -90,14 +88,87 @@ export abstract class AbstractRenderer {
       return;
     }
 
-    await this.beforeFullRender(targetDOMNode);
+    const { environmentProviders, componentSelector, analyzedMetadata } =
+      await this.prepareMetaData(storyFnAngular, targetDOMNode, component);
+    environmentProviders.push(storyPropsProvider(newStoryProps$));
 
     // Complete last BehaviorSubject and set a new one for the current module
     if (this.storyProps$) {
       this.storyProps$.complete();
     }
     this.storyProps$ = newStoryProps$;
 
+    const application = getApplication({
+      storyFnAngular,
+      component,
+      targetSelector: componentSelector,
+      analyzedMetadata,
+    });
+
+    const applicationRef = await queueBootstrapping(() => {
+      return bootstrapApplication(application, {
+        ...storyFnAngular.applicationConfig,
+        providers: environmentProviders,
+      });
+    });
+
+    this.setApplicationRef(targetDOMNode, applicationRef);
+  }
+
+  /**
+   * Bootstrap main angular module with main component with testbed api
+   *
+   * @param storyFnAngular {StoryFnAngularReturnType}
+   * @param forced {boolean}
+   * @param component {Component}
+   */
+  public async renderWithTestBed({
+    storyFnAngular,
+    forced,
+    component,
+    targetDOMNode,
+  }: {
+    storyFnAngular: StoryFnAngularReturnType;
+    forced: boolean;
+    component?: any;
+    targetDOMNode: HTMLElement;
+  }) {
+    const { environmentProviders, componentSelector, analyzedMetadata } =
+      await this.prepareMetaData(storyFnAngular, targetDOMNode, component);
+
+    if (storyFnAngular.userDefinedTemplate) {
+      component = getWrapperComponent(storyFnAngular.template);
+    }
+
+    const componentBuilder = await new TestBedComponentBuilder()
+      .setComponent(component)
+      .setSelector(componentSelector)
+      .setStoryFn(storyFnAngular)
+      .setMetaData(analyzedMetadata)
+      .setTargetNode(targetDOMNode)
+      .setEnvironmentProviders(environmentProviders)
+      .configure()
+      .initRouter()
+      .compileComponents();
+
+    componentBuilder.copyComponentIntoTargetNode();
+
+    this.setApplicationRef(targetDOMNode, componentBuilder.getApplicationRef());
+  }
+
+  public setApplicationRef(targetDOMNode: HTMLElement, applicationRef: ApplicationRef) {
+    applicationRefs.set(targetDOMNode, applicationRef);
+  }
+
+  private async prepareMetaData(
+    storyFnAngular: StoryFnAngularReturnType,
+    targetDOMNode: HTMLElement,
+    component?: any
+  ) {
+    const targetSelector = this.generateTargetSelectorFromStoryId(targetDOMNode.id);
+
+    await this.beforeFullRender();
+
     this.initAngularRootElement(targetDOMNode, targetSelector);
 
     const analyzedMetadata = new PropertyExtractor(storyFnAngular.moduleMetadata, component);
@@ -112,36 +183,25 @@ export abstract class AbstractRenderer {
       element.toggleAttribute(storyUid, true);
     }
 
-    const application = getApplication({
-      storyFnAngular,
-      component,
-      targetSelector: componentSelector,
-      analyzedMetadata,
-    });
-
-    const providers = [
-      storyPropsProvider(newStoryProps$),
+    const environmentProviders = [
       ...analyzedMetadata.applicationProviders,
       ...(storyFnAngular.applicationConfig?.providers ?? []),
     ];
 
-    if (STORYBOOK_ANGULAR_OPTIONS?.experimentalZoneless) {
-      const { provideExperimentalZonelessChangeDetection } = await import('@angular/core');
-      if (!provideExperimentalZonelessChangeDetection) {
-        throw new Error('Experimental zoneless change detection requires Angular 18 or higher');
-      } else {
-        providers.unshift(provideExperimentalZonelessChangeDetection());
-      }
-    }
-
-    const applicationRef = await queueBootstrapping(() => {
-      return bootstrapApplication(application, {
-        ...storyFnAngular.applicationConfig,
-        providers,
-      });
-    });
-
-    applicationRefs.set(targetDOMNode, applicationRef);
+    // if (STORYBOOK_ANGULAR_OPTIONS?.experimentalZoneless) {
+    //   const { provideExperimentalZonelessChangeDetection } = await import('@angular/core');
+    //   if (!provideExperimentalZonelessChangeDetection) {
+    //     throw new Error('Experimental zoneless change detection requires Angular 18 or higher');
+    //   } else {
+    //     environmentProviders.unshift(provideExperimentalZonelessChangeDetection());
+    //   }
+    // }
+
+    return {
+      environmentProviders,
+      componentSelector,
+      analyzedMetadata,
+    };
   }
 
   /**
@@ -202,7 +262,6 @@ export abstract class AbstractRenderer {
     forced: boolean;
   }) {
     const previousStoryRenderInfo = this.previousStoryRenderInfo.get(targetDOMNode);
-
     const currentStoryRender = {
       storyFnAngular,
       moduleMetadataSnapshot: stringify(moduleMetadata, { maxDepth: 50 }),

code/frameworks/angular/src/client/angular-beta/RendererFactory.test.ts

@@ -40,12 +40,12 @@ describe('RendererFactory', () => {
 
   describe('CanvasRenderer', () => {
     it('should get CanvasRenderer instance', async () => {
-      const render = await rendererFactory.getRendererInstance(rootTargetDOMNode);
+      const render = await rendererFactory.getRendererInstance(rootTargetDOMNode, false);
       expect(render).toBeInstanceOf(CanvasRenderer);
     });
 
     it('should render my-story for story template', async () => {
-      const render = await rendererFactory.getRendererInstance(rootTargetDOMNode);
+      const render = await rendererFactory.getRendererInstance(rootTargetDOMNode, false);
       await render?.render({
         storyFnAngular: {
           template: '🦊',
@@ -62,7 +62,7 @@ describe('RendererFactory', () => {
       @Component({ selector: 'foo', template: '🦊' })
       class FooComponent {}
 
-      const render = await rendererFactory.getRendererInstance(rootTargetDOMNode);
+      const render = await rendererFactory.getRendererInstance(rootTargetDOMNode, false);
       await render?.render({
         storyFnAngular: {
           props: {},
@@ -87,7 +87,7 @@ describe('RendererFactory', () => {
       }
       const token = new Thing();
 
-      const render = await rendererFactory.getRendererInstance(rootTargetDOMNode);
+      const render = await rendererFactory.getRendererInstance(rootTargetDOMNode, false);
 
       await render?.render({
         storyFnAngular: {
@@ -105,7 +105,7 @@ describe('RendererFactory', () => {
     describe('when forced=true', () => {
       beforeEach(async () => {
         // Init first render
-        const render = await rendererFactory.getRendererInstance(rootTargetDOMNode);
+        const render = await rendererFactory.getRendererInstance(rootTargetDOMNode, false);
         await render?.render({
           storyFnAngular: {
             template: '{{ logo }}: {{ name }}',
@@ -125,7 +125,7 @@ describe('RendererFactory', () => {
 
       it('should not be re-rendered when only props change', async () => {
         // only props change
-        const render = await rendererFactory.getRendererInstance(rootTargetDOMNode);
+        const render = await rendererFactory.getRendererInstance(rootTargetDOMNode, false);
         await render?.render({
           storyFnAngular: {
             props: {
@@ -140,7 +140,7 @@ describe('RendererFactory', () => {
       });
 
       it('should be re-rendered when template change', async () => {
-        const render = await rendererFactory.getRendererInstance(rootTargetDOMNode);
+        const render = await rendererFactory.getRendererInstance(rootTargetDOMNode, false);
         await render?.render({
           storyFnAngular: {
             template: '{{ beer }}',
@@ -161,7 +161,7 @@ describe('RendererFactory', () => {
     describe('when canvas render is done before', () => {
       beforeEach(async () => {
         // Init first Canvas render
-        const render = await rendererFactory.getRendererInstance(rootTargetDOMNode);
+        const render = await rendererFactory.getRendererInstance(rootTargetDOMNode, false);
         await render?.render({
           storyFnAngular: {
             template: 'Canvas 🖼',
@@ -177,13 +177,13 @@ describe('RendererFactory', () => {
           .appendChild(global.document.createElement('👾'));
 
         expect(global.document.getElementById('storybook-root').innerHTML).toContain('Canvas 🖼');
-        await rendererFactory.getRendererInstance(rootDocstargetDOMNode);
+        await rendererFactory.getRendererInstance(rootDocstargetDOMNode, false);
         expect(global.document.getElementById('storybook-root').innerHTML).toBe('');
       });
     });
 
     it('should get DocsRenderer instance', async () => {
-      const render = await rendererFactory.getRendererInstance(rootDocstargetDOMNode);
+      const render = await rendererFactory.getRendererInstance(rootDocstargetDOMNode, false);
       expect(render).toBeInstanceOf(DocsRenderer);
     });
 
@@ -193,7 +193,8 @@ describe('RendererFactory', () => {
         class FooComponent {}
 
         const render = await rendererFactory.getRendererInstance(
-          global.document.getElementById('storybook-docs')
+          global.document.getElementById('storybook-docs'),
+          false
         );
 
         const targetDOMNode1 = global.document.createElement('div');
@@ -223,7 +224,7 @@ describe('RendererFactory', () => {
         expect(global.document.querySelectorAll('#story-1 > story-1')[0].innerHTML).toBe(
           '<foo>🦊</foo><!--container-->'
         );
-        expect(global.document.querySelectorAll('#story-1 > story-1')[1].innerHTML).toBe(
+        expect(global.document.querySelectorAll('#story-1 > story-1')[0].innerHTML).toBe(
           '<foo>🦊</foo><!--container-->'
         );
       });
@@ -235,7 +236,8 @@ describe('RendererFactory', () => {
         class FooComponent {}
 
         const render = await rendererFactory.getRendererInstance(
-          global.document.getElementById('storybook-docs')
+          global.document.getElementById('storybook-docs'),
+          false
         );
 
         const targetDOMNode1 = global.document.createElement('div');