storybook 10.0.0-beta.6 → 10.0.0-beta.8

package/dist/manager-api/index.d.ts

@@ -2,7 +2,7 @@ import React, { FC, ReactNode, ReactElement, Component } from 'react';
 import { Channel, Listener as Listener$1 } from 'storybook/internal/channels';
 export { Listener as ChannelListener } from 'storybook/internal/channels';
 import { RouterData, NavigateOptions } from 'storybook/internal/router';
-import { Addon_Types, Addon_TypesEnum, Addon_Collection, Addon_TypesMapping, Addon_BaseType, Addon_TestProviderType, Addon_PageType, Addon_WrapperType, Addon_Config, API_ProviderData, API_StateMerger, API_Provider, Globals, GlobalTypes, API_PanelPositions, API_Layout, API_LayoutCustomisations, API_UI, API_Notification, API_IframeRenderer, API_ComposedRef, API_SetRefData, API_ComposedRefUpdate, API_Refs, StoryId, API_Settings, API_HashEntry, API_ViewMode, API_LeafEntry, API_PreparedStoryIndex, API_StoryEntry, Args, API_IndexHash, API_DocsEntry, API_FilterFunction, API_LoadedRefData, API_Version, API_Versions, API_UnknownEntries, API_OptionsData, Parameters, ArgTypes, NormalizedProjectAnnotations, ProjectAnnotations, ComposedStoryFn } from 'storybook/internal/types';
+import { Addon_Types, Addon_TypesEnum, Addon_Collection, Addon_TypesMapping, Addon_BaseType, Addon_TestProviderType, Addon_PageType, Addon_WrapperType, Addon_Config, API_ProviderData, API_StateMerger, API_Provider, Globals, GlobalTypes, API_PanelPositions, API_Layout, API_LayoutCustomisations, API_UI, API_Notification, API_IframeRenderer, API_ComposedRef, API_SetRefData, API_ComposedRefUpdate, API_Refs, StoryId, API_Settings, API_HashEntry, API_ViewMode, API_LeafEntry, API_PreparedStoryIndex, API_StoryEntry, API_TestEntry, Args, API_IndexHash, API_DocsEntry, API_FilterFunction, API_LoadedRefData, API_Version, API_Versions, API_UnknownEntries, API_OptionsData, Parameters, ArgTypes, NormalizedProjectAnnotations, ProjectAnnotations, ComposedStoryFn } from 'storybook/internal/types';
 export { Addon_Type as Addon, API_ComponentEntry as ComponentEntry, API_ComposedRef as ComposedRef, API_DocsEntry as DocsEntry, API_GroupEntry as GroupEntry, API_HashEntry as HashEntry, API_IndexHash as IndexHash, API_LeafEntry as LeafEntry, API_Refs as Refs, API_RootEntry as RootEntry, API_IndexHash as StoriesHash, API_StoryEntry as StoryEntry } from 'storybook/internal/types';
 import { ThemeVars } from 'storybook/theming';
 import { toId, StoryId as StoryId$1 } from 'storybook/internal/csf';
@@ -271,6 +271,11 @@ interface SubAPI$9 {
      * account customisations requested by the end user via a layoutCustomisations function.
      */
     getShowToolbarWithCustomisations: (showToolbar: boolean) => boolean;
+    /**
+     * GetShowPanelWithCustomisations - Returns the current visibility of the addon panel, taking into
+     * account customisations requested by the end user via a layoutCustomisations function.
+     */
+    getShowPanelWithCustomisations: (showPanel: boolean) => boolean;
     /**
      * GetNavSizeWithCustomisations - Returns the size to apply to the sidebar/nav, taking into
      * account customisations requested by the end user via a layoutCustomisations function.
@@ -388,7 +393,7 @@ interface SubState$5 {
 
 declare const isMacLike: () => boolean;
 declare const controlOrMetaSymbol: () => "⌘" | "ctrl";
-declare const controlOrMetaKey: () => "control" | "meta";
+declare const controlOrMetaKey: () => "meta" | "control";
 declare const optionOrAltSymbol: () => "⌥" | "alt";
 declare const isShortcutTaken: (arr1: string[], arr2: string[]) => boolean;
 type KeyboardEventLike = Pick<KeyboardEvent, 'altKey' | 'ctrlKey' | 'metaKey' | 'shiftKey' | 'key' | 'code' | 'keyCode' | 'preventDefault'>;
@@ -619,20 +624,20 @@ interface SubAPI$3 {
     /**
      * Updates the arguments for the given story with the provided new arguments.
      *
-     * @param {API_StoryEntry} story - The story to update the arguments for.
+     * @param {API_StoryEntry | API_TestEntry} story - The story to update the arguments for.
      * @param {Args} newArgs - The new arguments to set for the story.
      * @returns {void}
      */
-    updateStoryArgs(story: API_StoryEntry, newArgs: Args): void;
+    updateStoryArgs(story: API_StoryEntry | API_TestEntry, newArgs: Args): void;
     /**
      * Resets the arguments for the given story to their initial values.
      *
-     * @param {API_StoryEntry} story - The story to reset the arguments for.
+     * @param {API_StoryEntry | API_TestEntry} story - The story to reset the arguments for.
      * @param {string[]} [argNames] - An optional array of argument names to reset. If not provided,
      *   all arguments will be reset.
      * @returns {void}
      */
-    resetStoryArgs: (story: API_StoryEntry, argNames?: string[]) => void;
+    resetStoryArgs: (story: API_StoryEntry | API_TestEntry, argNames?: string[]) => void;
     /**
      * Finds the leaf entry for the given story ID in the given story index.
      *

package/dist/manager-api/index.js

@@ -895,6 +895,7 @@ var transformSetStoriesStoryDataToPreparedStoryIndex = /* @__PURE__ */ __name((s
         const { argTypes, args, initialArgs } = story;
         acc[id] = {
           type: "story",
+          subtype: "story",
           ...base,
           parameters,
           argTypes,
@@ -972,19 +973,18 @@ var transformStoryIndexToStoriesHash = /* @__PURE__ */ __name((input, { provider
   index = index.v === 3 ? transformStoryIndexV3toV4(index) : index;
   index = index.v === 4 ? transformStoryIndexV4toV5(index) : index;
   index = index;
-  const entryValues = Object.values(index.entries).filter((entry) => {
-    let result = true;
-    const storyStatuses = allStatuses[entry.id] ?? {};
-    if (Object.values(storyStatuses).some(({ value }) => value === "status-value:error")) {
-      return result;
+  const indexEntries = Object.values(index.entries);
+  const filterFunctions = Object.values(filters);
+  const entryValues = indexEntries.filter((entry) => {
+    const statuses = allStatuses[entry.id] ?? {};
+    if (Object.values(statuses).some(({ value }) => value === "status-value:error")) {
+      return true;
     }
-    Object.values(filters).forEach((filter) => {
-      if (result === false) {
-        return;
-      }
-      result = filter({ ...entry, statuses: storyStatuses });
-    });
-    return result;
+    if (filterFunctions.every((fn) => fn({ ...entry, statuses }))) {
+      return true;
+    }
+    const children = indexEntries.filter((item) => "parent" in item && item.parent === entry.id);
+    return children.some((child) => filterFunctions.every((fn) => fn({ ...child, statuses })));
   });
   const { sidebar = {} } = provider.getConfig();
   const { showRoots, collapsedRoots = [], renderLabel } = sidebar;
@@ -1007,7 +1007,7 @@ var transformStoryIndexToStoriesHash = /* @__PURE__ */ __name((input, { provider
         throw new Error(
           dedent`
           Invalid part '${name}', leading to id === parentId ('${id}'), inside title '${title}'
-          
+
           Did you create a path that uses the separator char accidentally, such as 'Vue <docs/>' where '/' is a separator char? See https://github.com/storybookjs/storybook/issues/6128
           `
         );
@@ -1058,36 +1058,60 @@ var transformStoryIndexToStoriesHash = /* @__PURE__ */ __name((input, { provider
       }
     });
     acc[item.id] = {
-      type: "story",
       tags: [],
       ...item,
       depth: paths.length,
-      parent: paths[paths.length - 1],
+      parent: "parent" in item ? item.parent : paths[paths.length - 1],
       renderLabel,
       prepared: !!item.parameters
     };
     return acc;
   }, {});
   function addItem(acc, item) {
-    if (acc[item.id]) {
-      return acc;
-    }
-    acc[item.id] = item;
-    if (item.type === "root" || item.type === "group" || item.type === "component") {
-      item.children.forEach((childId) => addItem(acc, storiesHashOutOfOrder[childId]));
-      item.tags = item.children.reduce((currentTags, childId) => {
-        const child = acc[childId];
-        return currentTags === null ? child.tags : intersect_default(currentTags, child.tags);
-      }, null);
+    if (!acc[item.id]) {
+      acc[item.id] = item;
+      if ("children" in item && item.children) {
+        item.children.forEach((childId) => addItem(acc, storiesHashOutOfOrder[childId]));
+        item.tags = item.children.reduce((currentTags, childId) => {
+          return currentTags === null ? acc[childId].tags : intersect_default(currentTags, acc[childId].tags);
+        }, null) || [];
+      }
     }
     if (item.type === "component") {
-      item.importPath = acc[item.children[0]].importPath;
+      const firstChild = acc[item.children[0]];
+      if (firstChild && "importPath" in firstChild) {
+        item.importPath = firstChild.importPath;
+      }
     }
     return acc;
   }
   __name(addItem, "addItem");
-  const orphanHash = Object.values(storiesHashOutOfOrder).filter((i) => i.type !== "root" && !i.parent).reduce(addItem, {});
-  return Object.values(storiesHashOutOfOrder).filter((i) => i.type === "root").reduce(addItem, orphanHash);
+  let storiesHash = Object.values(storiesHashOutOfOrder).filter((i) => i.type !== "root" && !i.parent).reduce((acc, item) => addItem(acc, item), {});
+  storiesHash = Object.values(storiesHashOutOfOrder).filter((i) => i.type === "root").reduce(addItem, storiesHash);
+  storiesHash = Object.values(storiesHash).reduce((acc, item) => {
+    if (item.type === "story" && item.subtype === "test") {
+      const story = acc[item.parent];
+      const component = acc[story.parent];
+      acc[component.id] = {
+        ...component,
+        // Remove test from the component node as it will be attached to the story node instead
+        children: component.children && component.children.filter((id) => id !== item.id)
+      };
+      acc[story.id] = {
+        ...story,
+        // Add test to the story node
+        children: (story.children || []).concat(item.id)
+      };
+      acc[item.id] = {
+        ...item,
+        depth: item.depth + 1
+      };
+    } else {
+      acc[item.id] = item;
+    }
+    return acc;
+  }, {});
+  return storiesHash;
 }, "transformStoryIndexToStoriesHash");
 var addPreparedStories = /* @__PURE__ */ __name((newHash, oldHash) => {
   if (!oldHash) {
@@ -1097,6 +1121,9 @@ var addPreparedStories = /* @__PURE__ */ __name((newHash, oldHash) => {
     Object.entries(newHash).map(([id, newEntry]) => {
       const oldEntry = oldHash[id];
       if (newEntry.type === "story" && oldEntry?.type === "story" && oldEntry.prepared) {
+        if ("children" in oldEntry) {
+          delete oldEntry.children;
+        }
         return [id, { ...oldEntry, ...newEntry, prepared: true }];
       }
       return [id, newEntry];
@@ -1704,6 +1731,13 @@ var init5 = /* @__PURE__ */ __name(({ store: store2, provider, singleStory }) =>
       }
       return showToolbar;
     },
+    getShowPanelWithCustomisations(showPanel) {
+      const state = store2.getState();
+      if (isFunction(state.layoutCustomisations.showPanel)) {
+        return state.layoutCustomisations.showPanel(state, showPanel) ?? showPanel;
+      }
+      return showPanel;
+    },
     getNavSizeWithCustomisations(navSize) {
       const state = store2.getState();
       if (isFunction(state.layoutCustomisations.showSidebar)) {
@@ -1812,7 +1846,6 @@ import {
   OPEN_IN_EDITOR_RESPONSE
 } from "storybook/internal/core-events";
 import { FailedIcon } from "@storybook/icons";
-import { color } from "storybook/theming";
 var init7 = /* @__PURE__ */ __name(({ provider, fullAPI }) => {
   const api = {
     openInEditor(payload) {
@@ -1834,6 +1867,7 @@ var init7 = /* @__PURE__ */ __name(({ provider, fullAPI }) => {
     api,
     state,
     init: /* @__PURE__ */ __name(async () => {
+      const { color } = await import("../theming/index.js");
       provider.channel?.on(OPEN_IN_EDITOR_RESPONSE, (payload) => {
         if (payload.error !== null) {
           fullAPI.addNotification({
@@ -2730,8 +2764,9 @@ var init11 = /* @__PURE__ */ __name(({
         }
         if (node.type === "story") {
           results.push(node.id);
-        } else if ("children" in node) {
-          node.children.forEach((childId) => findChildEntriesRecursively(childId, results));
+        }
+        if ("children" in node) {
+          node.children?.forEach((childId) => findChildEntriesRecursively(childId, results));
         }
         return results;
       }, "findChildEntriesRecursively");
@@ -3254,7 +3289,7 @@ import { global as global8 } from "@storybook/global";
 import semver from "semver";
 
 // src/manager-api/version.ts
-var version = "10.0.0-beta.6";
+var version = "10.0.0-beta.8";
 
 // src/manager-api/modules/versions.ts
 var { VERSIONCHECK } = global8;
@@ -3371,7 +3406,7 @@ import {
 } from "storybook/internal/core-events";
 import { global as global9 } from "@storybook/global";
 var WHATS_NEW_NOTIFICATION_ID = "whats-new";
-var StorybookIcon = /* @__PURE__ */ __name(({ color: color2 = "currentColor", size = 14 }) => {
+var StorybookIcon = /* @__PURE__ */ __name(({ color = "currentColor", size = 14 }) => {
   return React3.createElement(
     "svg",
     {
@@ -3387,7 +3422,7 @@ var StorybookIcon = /* @__PURE__ */ __name(({ color: color2 = "currentColor", si
         fillRule: "evenodd",
         clipRule: "evenodd",
         d: "M2.042.616a.704.704 0 00-.66.729L1.816 12.9c.014.367.306.66.672.677l9.395.422h.032a.704.704 0 00.704-.703V.704c0-.015 0-.03-.002-.044a.704.704 0 00-.746-.659l-.773.049.057 1.615a.105.105 0 01-.17.086l-.52-.41-.617.468a.105.105 0 01-.168-.088L9.746.134 2.042.616zm8.003 4.747c-.247.192-2.092.324-2.092.05.04-1.045-.429-1.091-.689-1.091-.247 0-.662.075-.662.634 0 .57.607.893 1.32 1.27 1.014.538 2.24 1.188 2.24 2.823 0 1.568-1.273 2.433-2.898 2.433-1.676 0-3.141-.678-2.976-3.03.065-.275 2.197-.21 2.197 0-.026.971.195 1.256.753 1.256.43 0 .624-.236.624-.634 0-.602-.633-.958-1.361-1.367-.987-.554-2.148-1.205-2.148-2.7 0-1.494 1.027-2.489 2.86-2.489 1.832 0 2.832.98 2.832 2.845z",
-        fill: color2
+        fill: color
       }
     )
   );

package/dist/node-logger/index.js

@@ -1,43 +1,43 @@
-import CJS_COMPAT_NODE_URL_0v1evul49qdo from 'node:url';
-import CJS_COMPAT_NODE_PATH_0v1evul49qdo from 'node:path';
-import CJS_COMPAT_NODE_MODULE_0v1evul49qdo from "node:module";
+import CJS_COMPAT_NODE_URL_7kszd2fgfzq from 'node:url';
+import CJS_COMPAT_NODE_PATH_7kszd2fgfzq from 'node:path';
+import CJS_COMPAT_NODE_MODULE_7kszd2fgfzq from "node:module";
 
-var __filename = CJS_COMPAT_NODE_URL_0v1evul49qdo.fileURLToPath(import.meta.url);
-var __dirname = CJS_COMPAT_NODE_PATH_0v1evul49qdo.dirname(__filename);
-var require = CJS_COMPAT_NODE_MODULE_0v1evul49qdo.createRequire(import.meta.url);
+var __filename = CJS_COMPAT_NODE_URL_7kszd2fgfzq.fileURLToPath(import.meta.url);
+var __dirname = CJS_COMPAT_NODE_PATH_7kszd2fgfzq.dirname(__filename);
+var require = CJS_COMPAT_NODE_MODULE_7kszd2fgfzq.createRequire(import.meta.url);
 
 // ------------------------------------------------------------
 // end of CJS compatibility banner, injected by Storybook's esbuild configuration
 // ------------------------------------------------------------
 import {
   require_pretty_hrtime
-} from "../_node-chunks/chunk-NUVGSFQI.js";
+} from "../_node-chunks/chunk-6SXRGPL6.js";
 import {
   ansi_styles_default,
   boxen,
   require_string_width,
   stripAnsi
-} from "../_node-chunks/chunk-EAOPWIKA.js";
-import "../_node-chunks/chunk-A7CUP23N.js";
+} from "../_node-chunks/chunk-4QSDBUYK.js";
+import "../_node-chunks/chunk-3VCGPS3V.js";
 import {
   execaSync,
   optionalEnvToBoolean
-} from "../_node-chunks/chunk-55VWKF63.js";
-import "../_node-chunks/chunk-F3PO67U3.js";
+} from "../_node-chunks/chunk-IE2VBA4V.js";
+import "../_node-chunks/chunk-O33XSHQE.js";
 import {
   require_prompts,
   require_src
-} from "../_node-chunks/chunk-E6TLN2J2.js";
+} from "../_node-chunks/chunk-TL5UYDH2.js";
 import {
   require_picocolors
-} from "../_node-chunks/chunk-5IEY46LQ.js";
+} from "../_node-chunks/chunk-JEIQPNWQ.js";
 import {
   __commonJS,
   __export,
   __name,
   __require,
   __toESM
-} from "../_node-chunks/chunk-XZTBG2TG.js";
+} from "../_node-chunks/chunk-FRTUAT3V.js";
 
 // ../node_modules/are-we-there-yet/lib/tracker-base.js
 var require_tracker_base = __commonJS({

package/dist/preview/globals.js

@@ -11,7 +11,7 @@ var globalsNameReferenceMap = {
   "storybook/internal/core-events": "__STORYBOOK_MODULE_CORE_EVENTS__",
   "storybook/internal/preview-errors": "__STORYBOOK_MODULE_CORE_EVENTS_PREVIEW_ERRORS__",
   "storybook/internal/types": "__STORYBOOK_MODULE_TYPES__",
-  // @deprecated TODO: Remove in 9.1
+  // @deprecated TODO: Remove in 9.1 or some point in the future, I guess
   "storybook/internal/preview-api": "__STORYBOOK_MODULE_PREVIEW_API__"
 };
 var globalPackages = Object.keys(globalsNameReferenceMap);

package/dist/preview/runtime.js

@@ -21115,7 +21115,7 @@ var globalsNameReferenceMap = {
   "storybook/internal/core-events": "__STORYBOOK_MODULE_CORE_EVENTS__",
   "storybook/internal/preview-errors": "__STORYBOOK_MODULE_CORE_EVENTS_PREVIEW_ERRORS__",
   "storybook/internal/types": "__STORYBOOK_MODULE_TYPES__",
-  // @deprecated TODO: Remove in 9.1
+  // @deprecated TODO: Remove in 9.1 or some point in the future, I guess
   "storybook/internal/preview-api": "__STORYBOOK_MODULE_PREVIEW_API__"
 };
 var globalPackages = Object.keys(globalsNameReferenceMap);
@@ -24911,6 +24911,55 @@ var includeConditionalArg = /* @__PURE__ */ __name((argType, args, globals) => {
   return testValue(argType.if, value);
 }, "includeConditionalArg");
 
+// src/preview-api/modules/preview-web/render/mount-utils.ts
+function mountDestructured(playFunction) {
+  return playFunction != null && getUsedProps(playFunction).includes("mount");
+}
+__name(mountDestructured, "mountDestructured");
+function getUsedProps(fn3) {
+  const match = fn3.toString().match(/[^(]*\(([^)]*)/);
+  if (!match) {
+    return [];
+  }
+  const args = splitByComma(match[1]);
+  if (!args.length) {
+    return [];
+  }
+  const first = args[0];
+  if (!(first.startsWith("{") && first.endsWith("}"))) {
+    return [];
+  }
+  const props = splitByComma(first.slice(1, -1).replace(/\s/g, "")).map((prop) => {
+    return prop.replace(/:.*|=.*/g, "");
+  });
+  return props;
+}
+__name(getUsedProps, "getUsedProps");
+function splitByComma(s3) {
+  const result = [];
+  const stack = [];
+  let start = 0;
+  for (let i2 = 0; i2 < s3.length; i2++) {
+    if (s3[i2] === "{" || s3[i2] === "[") {
+      stack.push(s3[i2] === "{" ? "}" : "]");
+    } else if (s3[i2] === stack[stack.length - 1]) {
+      stack.pop();
+    } else if (!stack.length && s3[i2] === ",") {
+      const token = s3.substring(start, i2).trim();
+      if (token) {
+        result.push(token);
+      }
+      start = i2 + 1;
+    }
+  }
+  const lastToken = s3.substring(start).trim();
+  if (lastToken) {
+    result.push(lastToken);
+  }
+  return result;
+}
+__name(splitByComma, "splitByComma");
+
 // src/actions/addArgs.ts
 var addArgs_exports = {};
 __export(addArgs_exports, {
@@ -49462,10 +49511,21 @@ function definePreviewAddon(preview) {
   return preview;
 }
 __name(definePreviewAddon, "definePreviewAddon");
+function isMeta(input2) {
+  return input2 != null && typeof input2 === "object" && "_tag" in input2 && input2?._tag === "Meta";
+}
+__name(isMeta, "isMeta");
 function isStory(input2) {
   return input2 != null && typeof input2 === "object" && "_tag" in input2 && input2?._tag === "Story";
 }
 __name(isStory, "isStory");
+function getStoryChildren(story) {
+  if ("__children" in story) {
+    return story.__children;
+  }
+  return [];
+}
+__name(getStoryChildren, "getStoryChildren");
 
 // src/csf/index.ts
 var sanitize = /* @__PURE__ */ __name((string) => {
@@ -49479,6 +49539,7 @@ var sanitizeSafe = /* @__PURE__ */ __name((string, part) => {
   return sanitized;
 }, "sanitizeSafe");
 var toId = /* @__PURE__ */ __name((kind, name) => `${sanitizeSafe(kind, "kind")}${name ? `--${sanitizeSafe(name, "name")}` : ""}`, "toId");
+var toTestId = /* @__PURE__ */ __name((parentId, testName2) => `${parentId}:${sanitizeSafe(testName2, "test")}`, "toTestId");
 var storyNameFromExport = /* @__PURE__ */ __name((key) => toStartCaseStr(key), "storyNameFromExport");
 function matches3(storyKey, arrayOrRegex) {
   if (Array.isArray(arrayOrRegex)) {
@@ -49835,6 +49896,13 @@ var map = /* @__PURE__ */ __name((arg, argType) => {
         const mapped = map(val, { type: type5.value[key] });
         return mapped === INCOMPATIBLE ? acc : Object.assign(acc, { [key]: mapped });
       }, {});
+    case "other": {
+      const isPrimitiveArg = typeof arg === "string" || typeof arg === "number" || typeof arg === "boolean";
+      if (type5.value === "ReactNode" && isPrimitiveArg) {
+        return arg;
+      }
+      return INCOMPATIBLE;
+    }
     default:
       return INCOMPATIBLE;
   }
@@ -50245,9 +50313,17 @@ function processCSFFile(moduleExports, importPath, title) {
     const csfFile2 = { meta: meta2, stories: {}, moduleExports };
     Object.keys(namedExports).forEach((key) => {
       if (isExportStory(key, meta2)) {
-        const storyMeta = normalizeStory(key, namedExports[key].input, meta2);
+        const story = namedExports[key];
+        const storyMeta = normalizeStory(key, story.input, meta2);
         checkDisallowedParameters(storyMeta.parameters);
         csfFile2.stories[storyMeta.id] = storyMeta;
+        getStoryChildren(story).forEach((child) => {
+          const name = child.input.name;
+          const childId = toTestId(storyMeta.id, name);
+          child.input.parameters ??= {};
+          child.input.parameters.__id = childId;
+          csfFile2.stories[childId] = normalizeStory(name, child.input, meta2);
+        });
       }
     });
     csfFile2.projectAnnotations = firstStory.meta.preview.composed;
@@ -50271,55 +50347,6 @@ function processCSFFile(moduleExports, importPath, title) {
 }
 __name(processCSFFile, "processCSFFile");
 
-// src/preview-api/modules/preview-web/render/mount-utils.ts
-function mountDestructured(playFunction) {
-  return playFunction != null && getUsedProps(playFunction).includes("mount");
-}
-__name(mountDestructured, "mountDestructured");
-function getUsedProps(fn3) {
-  const match = fn3.toString().match(/[^(]*\(([^)]*)/);
-  if (!match) {
-    return [];
-  }
-  const args = splitByComma(match[1]);
-  if (!args.length) {
-    return [];
-  }
-  const first = args[0];
-  if (!(first.startsWith("{") && first.endsWith("}"))) {
-    return [];
-  }
-  const props = splitByComma(first.slice(1, -1).replace(/\s/g, "")).map((prop) => {
-    return prop.replace(/:.*|=.*/g, "");
-  });
-  return props;
-}
-__name(getUsedProps, "getUsedProps");
-function splitByComma(s3) {
-  const result = [];
-  const stack = [];
-  let start = 0;
-  for (let i2 = 0; i2 < s3.length; i2++) {
-    if (s3[i2] === "{" || s3[i2] === "[") {
-      stack.push(s3[i2] === "{" ? "}" : "]");
-    } else if (s3[i2] === stack[stack.length - 1]) {
-      stack.pop();
-    } else if (!stack.length && s3[i2] === ",") {
-      const token = s3.substring(start, i2).trim();
-      if (token) {
-        result.push(token);
-      }
-      start = i2 + 1;
-    }
-  }
-  const lastToken = s3.substring(start).trim();
-  if (lastToken) {
-    result.push(lastToken);
-  }
-  return result;
-}
-__name(splitByComma, "splitByComma");
-
 // src/preview-api/modules/store/decorators.ts
 function decorateStory(storyFn, decorator, bindWithContext) {
   const boundStoryFunction = bindWithContext(storyFn);
@@ -50500,11 +50527,13 @@ __name(prepareMeta, "prepareMeta");
 function preparePartialAnnotations(storyAnnotations, componentAnnotations, projectAnnotations) {
   const defaultTags = ["dev", "test"];
   const extraTags = scope.DOCS_OPTIONS?.autodocs === true ? ["autodocs"] : [];
+  const overrideTags = storyAnnotations?.tags?.includes("test-fn") ? ["!autodocs"] : [];
   const tags = combineTags(
     ...defaultTags,
     ...extraTags,
     ...projectAnnotations.tags ?? [],
     ...componentAnnotations.tags ?? [],
+    ...overrideTags,
     ...storyAnnotations?.tags ?? []
   );
   const parameters2 = combineParameters(
@@ -50960,7 +50989,7 @@ function getCsfFactoryAnnotations(story, meta, projectAnnotations) {
     story: story.input,
     meta: story.meta.input,
     preview: story.meta.preview.composed
-  } : { story, meta, preview: projectAnnotations };
+  } : { story, meta: isMeta(meta) ? meta.input : meta, preview: projectAnnotations };
 }
 __name(getCsfFactoryAnnotations, "getCsfFactoryAnnotations");
 
@@ -51359,7 +51388,7 @@ var _StoryStore = class _StoryStore {
     return { entryExports, csfFiles };
   }
   // A prepared story does not include args, globals or hooks. These are stored in the story store
-  // and updated separtely to the (immutable) story.
+  // and updated separately to the (immutable) story.
   getStoryContext(story, { forceInitialArgs = false } = {}) {
     const userGlobals = this.userGlobals.get();
     const { initialGlobals: initialGlobals5 } = this.userGlobals;
@@ -51393,21 +51422,25 @@ var _StoryStore = class _StoryStore {
   }
   extract(options = { includeDocsOnly: false }) {
     const { cachedCSFFiles } = this;
+    console.log("extract: extracting stories", cachedCSFFiles);
     if (!cachedCSFFiles) {
       throw new CalledExtractOnStoreError();
     }
-    return Object.entries(this.storyIndex.entries).reduce(
-      (acc, [storyId, { type: type5, importPath }]) => {
-        if (type5 === "docs") {
+    const stories = Object.entries(this.storyIndex.entries).reduce(
+      (acc, [storyId, entry]) => {
+        if (entry.type === "docs") {
           return acc;
         }
-        const csfFile = cachedCSFFiles[importPath];
+        const csfFile = cachedCSFFiles[entry.importPath];
         const story = this.storyFromCSFFile({ storyId, csfFile });
         if (!options.includeDocsOnly && story.parameters.docsOnly) {
           return acc;
         }
         acc[storyId] = Object.entries(story).reduce(
           (storyAcc, [key, value]) => {
+            if (key === "story" && entry.subtype === "test") {
+              return { ...storyAcc, story: entry.parentName };
+            }
             if (key === "moduleExport") {
               return storyAcc;
             }
@@ -51420,19 +51453,21 @@ var _StoryStore = class _StoryStore {
             return Object.assign(storyAcc, { [key]: value });
           },
           {
-            //
             args: story.initialArgs,
             globals: {
               ...this.userGlobals.initialGlobals,
               ...this.userGlobals.globals,
               ...story.storyGlobals
-            }
+            },
+            storyId: entry.parent ? entry.parent : storyId
           }
         );
         return acc;
       },
       {}
     );
+    console.log("extract: stories", stories);
+    return stories;
   }
 };
 __name(_StoryStore, "StoryStore");
@@ -51590,7 +51625,7 @@ var sortStoriesV7 = /* @__PURE__ */ __name((stories, storySortParameter, fileNam
     Error sorting stories with sort parameter ${storySortParameter}:
 
     > ${err.message}
-    
+
     Are you using a V6-style sort function in V7 mode?
 
     More info: https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#v7-style-story-sort
@@ -51648,16 +51683,15 @@ var _StoryRender = class _StoryRender {
     }
   }
   checkIfAborted(signal) {
-    if (signal.aborted) {
+    if (signal.aborted && !["finished", "aborted", "errored"].includes(this.phase)) {
       this.phase = "aborted";
       this.channel.emit(STORY_RENDER_PHASE_CHANGED, {
         newPhase: this.phase,
         renderId: this.renderId,
         storyId: this.id
       });
-      return true;
     }
-    return false;
+    return signal.aborted;
   }
   async prepare() {
     await this.runPhase(this.abortController.signal, "preparing", async () => {