Svelte: Always inject doc metadata

storybookjs · Sep 9, 2023 · ff7b7e1 · ff7b7e1
1 parent d627022
commit ff7b7e1
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 20 deletions.
diff --git a/code/frameworks/svelte-vite/src/plugins/svelte-docgen.ts b/code/frameworks/svelte-vite/src/plugins/svelte-docgen.ts
@@ -79,21 +79,24 @@ export function svelteDocgen(svelteOptions: Record<string, any> = {}): PluginOpt
 
       const s = new MagicString(src);
 
+      let componentDoc: any;
       try {
-        const componentDoc = await svelteDoc.parse(options);
-        // get filename for source content
-        const file = path.basename(resource);
-
-        componentDoc.name = path.basename(file);
-
-        const componentName = getNameFromFilename(resource);
-        s.append(`;${componentName}.__docgen = ${JSON.stringify(componentDoc)}`);
+        componentDoc = await svelteDoc.parse(options);
       } catch (error: any) {
+        componentDoc = { keywords: [], data: [] };
         if (logDocgen) {
           logger.error(error);
         }
       }
 
+      // get filename for source content
+      const file = path.basename(resource);
+
+      componentDoc.name = path.basename(file);
+
+      const componentName = getNameFromFilename(resource);
+      s.append(`;${componentName}.__docgen = ${JSON.stringify(componentDoc)}`);
+
       return {
         code: s.toString(),
         map: s.generateMap({ hires: true, source: id }),

diff --git a/code/presets/svelte-webpack/src/svelte-docgen-loader.ts b/code/presets/svelte-webpack/src/svelte-docgen-loader.ts
@@ -73,27 +73,30 @@ export default async function svelteDocgen(this: any, source: string) {
 
   let docgen = '';
 
+  let componentDoc: any;
   try {
     // FIXME
     // @ts-expect-error (Converted from ts-ignore)
-    const componentDoc = await svelteDoc.parse(options);
+    componentDoc = await svelteDoc.parse(options);
+  } catch (error) {
+    componentDoc = { keywords: [], data: [] };
+    if (logDocgen) {
+      logger.error(error as any);
+    }
+  }
 
-    // get filename for source content
-    const file = path.basename(resource);
+  // get filename for source content
+  const file = path.basename(resource);
 
-    // populate filename in docgen
-    componentDoc.name = path.basename(file);
+  // populate filename in docgen
+  componentDoc.name = path.basename(file);
 
-    const componentName = getNameFromFilename(resource);
+  const componentName = getNameFromFilename(resource);
 
-    docgen = dedent`
+  docgen = dedent`
       ${componentName}.__docgen = ${JSON.stringify(componentDoc)};
     `;
-  } catch (error) {
-    if (logDocgen) {
-      logger.error(error as any);
-    }
-  }
+
   // inject __docgen prop in svelte component
   const output = source + docgen;