@storybook/react 10.3.0-alpha.11 → 10.3.0-alpha.13

package/dist/preset.js

@@ -1,10 +1,10 @@
-import CJS_COMPAT_NODE_URL_0kkbqdmsvas from 'node:url';
-import CJS_COMPAT_NODE_PATH_0kkbqdmsvas from 'node:path';
-import CJS_COMPAT_NODE_MODULE_0kkbqdmsvas from "node:module";
+import CJS_COMPAT_NODE_URL_y9v79lwxbk from 'node:url';
+import CJS_COMPAT_NODE_PATH_y9v79lwxbk from 'node:path';
+import CJS_COMPAT_NODE_MODULE_y9v79lwxbk from "node:module";
 
-var __filename = CJS_COMPAT_NODE_URL_0kkbqdmsvas.fileURLToPath(import.meta.url);
-var __dirname = CJS_COMPAT_NODE_PATH_0kkbqdmsvas.dirname(__filename);
-var require = CJS_COMPAT_NODE_MODULE_0kkbqdmsvas.createRequire(import.meta.url);
+var __filename = CJS_COMPAT_NODE_URL_y9v79lwxbk.fileURLToPath(import.meta.url);
+var __dirname = CJS_COMPAT_NODE_PATH_y9v79lwxbk.dirname(__filename);
+var require = CJS_COMPAT_NODE_MODULE_y9v79lwxbk.createRequire(import.meta.url);
 
 // ------------------------------------------------------------
 // end of CJS compatibility banner, injected by Storybook's esbuild configuration
@@ -11297,7 +11297,7 @@ function getCodeSnippet(csf, storyName, componentName) {
     if (callee.isMemberExpression()) {
       let obj = callee.get("object"), prop = callee.get("property"), isBind = prop.isIdentifier() && prop.node.name === "bind" || t2.isStringLiteral(prop.node) && prop.node.value === "bind";
       if (obj.isIdentifier() && isBind) {
-        let resolved = resolveBindIdentifierInit(storyDeclaration, obj);
+        let resolved = resolveIdentifierInit(storyDeclaration, obj);
         resolved && (normalizedPath = resolved);
       }
     }
@@ -11325,14 +11325,20 @@ function getCodeSnippet(csf, storyName, componentName) {
       "Expected story to be csf factory, function or an object expression"
     );
   let storyProps = normalizedPath.isObjectExpression() ? normalizedPath.get("properties").filter((p) => p.isObjectProperty()) : [], metaPath = pathForNode(csf._file.path, metaObj), metaProps = metaPath?.isObjectExpression() ? metaPath.get("properties").filter((p) => p.isObjectProperty()) : [], getRenderPath = (object) => {
-    let renderPath2 = object.find((p) => keyOf(p.node) === "render")?.get("value");
-    if (renderPath2?.isIdentifier() && (componentName = renderPath2.node.name), renderPath2 && !(renderPath2.isArrowFunctionExpression() || renderPath2.isFunctionExpression()))
-      throw renderPath2.buildCodeFrameError(
+    let renderPath = object.find((p) => keyOf(p.node) === "render")?.get("value");
+    if (!renderPath)
+      return { kind: "missing" };
+    if (renderPath.isIdentifier()) {
+      let resolved = resolveIdentifierInit(storyDeclaration, renderPath);
+      return resolved && (resolved.isArrowFunctionExpression() || resolved.isFunctionExpression() || resolved.isFunctionDeclaration()) ? { kind: "resolved", path: resolved } : { kind: "unresolved" };
+    }
+    if (!(renderPath.isArrowFunctionExpression() || renderPath.isFunctionExpression()))
+      throw renderPath.buildCodeFrameError(
         "Expected render to be an arrow function or function expression"
       );
-    return renderPath2;
-  }, metaRenderPath = getRenderPath(metaProps), renderPath = getRenderPath(storyProps);
-  storyFn ??= renderPath ?? metaRenderPath;
+    return { kind: "resolved", path: renderPath };
+  }, metaRender = getRenderPath(metaProps), storyRender = getRenderPath(storyProps);
+  storyFn || (storyFn = storyRender.kind === "resolved" ? storyRender.path : storyRender.kind === "missing" && metaRender.kind === "resolved" ? metaRender.path : void 0);
   let metaArgs = metaArgsRecord(metaObj ?? null), storyArgsPath = storyProps.filter((p) => keyOf(p.node) === "args").map((p) => p.get("value")).find((v) => v.isObjectExpression()), storyArgs = argsRecordFromObjectPath(storyArgsPath), storyAssignedArgsPath = storyArgsAssignmentPath(csf._file.path, storyName), storyAssignedArgs = argsRecordFromObjectPath(storyAssignedArgsPath), merged = { ...metaArgs, ...storyArgs, ...storyAssignedArgs }, entries = Object.entries(merged).filter(([k]) => k !== "children"), validEntries = entries.filter(([k, v]) => isValidJsxAttrName(k) && v != null), invalidEntries = entries.filter(([k, v]) => !isValidJsxAttrName(k) && v != null), injectedAttrs = validEntries.map(([k, v]) => toAttr(k, v)).filter((a) => a != null);
   if (storyFn) {
     let fn = storyFn.node;
@@ -11356,14 +11362,20 @@ function getCodeSnippet(csf, storyName, componentName) {
         return stmt;
       });
       if (changed)
-        return t2.isFunctionDeclaration(fn) ? t2.functionDeclaration(fn.id, [], t2.blockStatement(newBody), fn.generator, fn.async) : t2.variableDeclaration("const", [
+        return t2.isFunctionDeclaration(fn) ? t2.functionDeclaration(
+          t2.identifier(storyName),
+          [],
+          t2.blockStatement(newBody),
+          fn.generator,
+          fn.async
+        ) : t2.variableDeclaration("const", [
           t2.variableDeclarator(
             t2.identifier(storyName),
             t2.arrowFunctionExpression([], t2.blockStatement(newBody), fn.async)
           )
         ]);
     }
-    return t2.isFunctionDeclaration(fn) ? fn : t2.variableDeclaration("const", [t2.variableDeclarator(t2.identifier(storyName), fn)]);
+    return t2.isFunctionDeclaration(fn) ? t2.functionDeclaration(t2.identifier(storyName), fn.params, fn.body, fn.generator, fn.async) : t2.variableDeclaration("const", [t2.variableDeclarator(t2.identifier(storyName), fn)]);
   }
   invariant(componentName, "Could not generate snippet without component name.");
   let invalidSpread = buildInvalidSpread(invalidEntries), name = t2.jsxIdentifier(componentName), openingElAttrs = invalidSpread ? [...injectedAttrs, invalidSpread] : injectedAttrs, children = toJsxChildren(merged.children), selfClosing = children.length === 0, arrow = t2.arrowFunctionExpression(
@@ -11507,10 +11519,19 @@ function transformArgsSpreadsInJsx(node, merged) {
   });
   return { node: t2.jsxFragment(node.openingFragment, node.closingFragment, fragChildren), changed };
 }
-function resolveBindIdentifierInit(storyPath, identifier) {
+function resolveIdentifierInit(storyPath, identifier) {
   let programPath = storyPath.findParent((p) => p.isProgram());
   if (!programPath)
     return null;
+  for (let stmt of programPath.get("body")) {
+    if (stmt.isFunctionDeclaration() && stmt.node.id?.name === identifier.node.name)
+      return stmt;
+    if (stmt.isExportNamedDeclaration()) {
+      let decl = stmt.get("declaration");
+      if (decl.isFunctionDeclaration() && decl.node.id?.name === identifier.node.name)
+        return decl;
+    }
+  }
   let match = programPath.get("body").flatMap((stmt) => {
     if (stmt.isVariableDeclaration())
       return stmt.get("declarations");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/react",
-  "version": "10.3.0-alpha.11",
+  "version": "10.3.0-alpha.13",
   "description": "Storybook React renderer",
   "keywords": [
     "storybook"
@@ -53,7 +53,7 @@
   ],
   "dependencies": {
     "@storybook/global": "^5.0.0",
-    "@storybook/react-dom-shim": "10.3.0-alpha.11",
+    "@storybook/react-dom-shim": "10.3.0-alpha.13",
     "react-docgen": "^8.0.2",
     "react-docgen-typescript": "^2.2.2"
   },
@@ -81,7 +81,7 @@
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
     "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
-    "storybook": "^10.3.0-alpha.11",
+    "storybook": "^10.3.0-alpha.13",
     "typescript": ">= 4.9.x"
   },
   "peerDependenciesMeta": {