refactor: Push codeblock generation to the right place

Author: bebraw

src/dependency.ts

@@ -20,12 +20,12 @@ import { LoaderOptions } from "./types";
 
 class DocGenDependency extends NullDependency {
   public static Template: NullDependency.Template;
-  private componentDocs: docGen.ComponentDoc[];
+  private codeBlock: string;
 
-  constructor(request: string, componentDocs: docGen.ComponentDoc[]) {
+  constructor(request: string, codeBlock: string) {
     super(request);
 
-    this.componentDocs = componentDocs;
+    this.codeBlock = codeBlock;
   }
 
   // TODO: Note if you want that modules correctly invalidate and cache you need to add updateHash to your Dependency and hash the type info (because that might change depending on outside factors (other modules)
@@ -35,45 +35,11 @@ makeSerializable(
   DocGenDependency,
   "react-docgen-typescript-plugin/dist/dependency"
 );
-
-type Options = {
-  parser: docGen.FileParser;
-  docgenOptions: LoaderOptions;
-};
-
 class DocGenTemplate extends NullDependency.Template {
-  private options: Options;
-
-  constructor(options: Options) {
-    super();
-
-    this.options = options;
-  }
-
-  apply(
-    dependency: NullDependency,
-    source: ReplaceSource,
-    { module }: { module: Module }
-  ): void {
-    const { userRequest } = module;
-
-    if (!dependency.componentDocs.length) {
-      return;
+  apply(dependency: NullDependency, source: ReplaceSource): void {
+    if (dependency.codeBlock) {
+      source.insert(0, dependency.codeBlock);
     }
-
-    source.insert(
-      0,
-      generateDocgenCodeBlock({
-        filename: userRequest,
-        source: userRequest,
-        componentDocs: dependency.componentDocs,
-        docgenCollectionName:
-          this.options.docgenOptions.docgenCollectionName ||
-          "STORYBOOK_REACT_CLASSES",
-        setDisplayName: this.options.docgenOptions.setDisplayName || true,
-        typePropName: this.options.docgenOptions.typePropName || "type",
-      }).substring(userRequest.length)
-    );
   }
 }
 

src/plugin.ts

@@ -9,6 +9,7 @@ import { matcher } from "micromatch";
 
 import { LoaderOptions } from "./types";
 import DocGenDependency from "./dependency";
+import { generateDocgenCodeBlock } from "./generateDocgenCodeBlock";
 
 const debugExclude = createDebug("docgen:exclude");
 
@@ -109,10 +110,8 @@ export default class DocgenPlugin {
           // eslint-disable-next-line
           // @ts-ignore TODO: Figure out why this isn't allowed
           DocGenDependency,
-          new DocGenDependency.Template({
-            parser: this.parser,
-            docgenOptions: this.docgenOptions,
-          })
+          // TODO: Use ConstDependency.Template instead?
+          new DocGenDependency.Template()
         );
 
         // eslint-disable-next-line
@@ -138,10 +137,21 @@ export default class DocgenPlugin {
               return;
             }
 
+            const componentDocs = this.parser.parse(nameForCondition);
+
             module.addDependency(
               new DocGenDependency(
                 module.request,
-                this.parser.parse(nameForCondition)
+                generateDocgenCodeBlock({
+                  filename: nameForCondition,
+                  source: nameForCondition,
+                  componentDocs,
+                  docgenCollectionName:
+                    this.docgenOptions.docgenCollectionName ||
+                    "STORYBOOK_REACT_CLASSES",
+                  setDisplayName: this.docgenOptions.setDisplayName || true,
+                  typePropName: this.docgenOptions.typePropName || "type",
+                }).substring(module.userRequest.length)
               )
             );
           });