storybook 9.0.0-alpha.16 → 9.0.0-alpha.17

package/dist/csf-tools/index.cjs

@@ -78,7 +78,7 @@ Qe(dt, {
   babelParseFile: () => ye,
   enrichCsf: () => pt,
   enrichCsfMeta: () => we,
-  enrichCsfStory: () => Ne,
+  enrichCsfStory: () => ve,
   extractDescription: () => oe,
   extractSource: () => Fe,
   formatConfig: () => Se,
@@ -395,7 +395,7 @@ var D = /* @__PURE__ */ f((s, e) => {
                     );
                   else if (b.key.name === "parameters" && c.types.isObjectExpression(b.value)) {
                     let h = b.value.properties.find(
-                      (N) => c.types.isObjectProperty(N) && c.types.isIdentifier(N.key) && N.key.name === "__id"
+                      (v) => c.types.isObjectProperty(v) && c.types.isIdentifier(v.key) && v.key.name === "__id"
                     );
                     h && (E.__id = h.value.value);
                   }
@@ -1180,7 +1180,7 @@ TSModifiers"), De = /* @__PURE__ */ f((s) => {
 
 // src/csf-tools/enrichCsf.ts
 var u = require("storybook/internal/babel");
-var Ne = /* @__PURE__ */ f((s, e, t, r) => {
+var ve = /* @__PURE__ */ f((s, e, t, r) => {
   let i = e.getStoryExport(t), o = u.types.isCallExpression(i) && u.types.isMemberExpression(i.callee) && u.types.isIdentifier(i.callee.object) &&
   i.callee.object.name === "meta", l = !r?.disableSource && Fe(i), a = !r?.disableDescription && oe(e._storyStatements[t]), p = [], d = o ? u.types.
   memberExpression(u.types.identifier(t), u.types.identifier("input")) : u.types.identifier(t), g = u.types.memberExpression(d, u.types.identifier(
@@ -1238,7 +1238,7 @@ var Ne = /* @__PURE__ */ f((s, e, t, r) => {
     );
     s._ast.program.body.push(b);
   }
-}, "enrichCsfStory"), ve = /* @__PURE__ */ f((s, e, t) => {
+}, "enrichCsfStory"), Ne = /* @__PURE__ */ f((s, e, t) => {
   if (!e.length) {
     s.properties.find(
       (p) => u.types.isObjectProperty(p) && u.types.isIdentifier(p.key) && p.key.name === "component"
@@ -1248,12 +1248,12 @@ var Ne = /* @__PURE__ */ f((s, e, t, r) => {
   let [r, ...i] = e, o = s.properties.find(
     (a) => u.types.isObjectProperty(a) && u.types.isIdentifier(a.key) && a.key.name === r && u.types.isObjectExpression(a.value)
   ), l;
-  o ? l = o.value : (l = u.types.objectExpression([]), s.properties.push(u.types.objectProperty(u.types.identifier(r), l))), ve(l, i, t);
+  o ? l = o.value : (l = u.types.objectExpression([]), s.properties.push(u.types.objectProperty(u.types.identifier(r), l))), Ne(l, i, t);
 }, "addComponentDescription"), we = /* @__PURE__ */ f((s, e, t) => {
   let r = !t?.disableDescription && oe(e._metaStatement);
   if (r) {
     let i = s._metaNode;
-    i && u.types.isObjectExpression(i) && ve(
+    i && u.types.isObjectExpression(i) && Ne(
       i,
       ["parameters", "docs", "description"],
       u.types.objectProperty(u.types.identifier("component"), u.types.stringLiteral(r))
@@ -1261,7 +1261,7 @@ var Ne = /* @__PURE__ */ f((s, e, t, r) => {
   }
 }, "enrichCsfMeta"), pt = /* @__PURE__ */ f((s, e, t) => {
   we(s, e, t), Object.keys(s._storyExports).forEach((r) => {
-    Ne(s, e, r, t);
+    ve(s, e, r, t);
   });
 }, "enrichCsf"), Fe = /* @__PURE__ */ f((s) => {
   let e = u.types.isVariableDeclarator(s) ? s.init : s, { code: t } = (0, u.generate)(e, {});
@@ -1328,10 +1328,10 @@ le an issue with details about your use case.`
     );
     ft(S, i) && (b[_] = a._storyStatements[_]);
   });
-  let h = a._file.path.scope.generateUidIdentifier("test"), N = a._file.path.scope.generateUidIdentifier("describe");
+  let h = a._file.path.scope.generateUidIdentifier("test"), v = a._file.path.scope.generateUidIdentifier("describe");
   if (Object.keys(b).length === 0) {
     let _ = m.types.expressionStatement(
-      m.types.callExpression(m.types.memberExpression(N, m.types.identifier("skip")), [
+      m.types.callExpression(m.types.memberExpression(v, m.types.identifier("skip")), [
         m.types.stringLiteral("No valid tests found")
       ])
     );
@@ -1340,7 +1340,7 @@ le an issue with details about your use case.`
       m.types.importDeclaration(
         [
           m.types.importSpecifier(h, m.types.identifier("test")),
-          m.types.importSpecifier(N, m.types.identifier("describe"))
+          m.types.importSpecifier(v, m.types.identifier("describe"))
         ],
         m.types.stringLiteral("vitest")
       )
@@ -1348,7 +1348,7 @@ le an issue with details about your use case.`
     p.program.body.unshift(...S);
   } else {
     let le = function() {
-      let j = a._file.path.scope.generateUidIdentifier("isRunningFromThisFile"), v = m.types.memberExpression(
+      let j = a._file.path.scope.generateUidIdentifier("isRunningFromThisFile"), N = m.types.memberExpression(
         m.types.callExpression(m.types.memberExpression(_, m.types.identifier("getState")), []),
         m.types.identifier("testPath")
       ), k = m.types.memberExpression(
@@ -1359,7 +1359,7 @@ le an issue with details about your use case.`
         // TODO: switch order of testPathProperty and filePathProperty when the bug is fixed
         // https://github.com/vitest-dev/vitest/issues/6367 (or probably just use testPathProperty)
         k,
-        v
+        N
       ), G = m.types.callExpression(
         m.types.memberExpression(
           m.types.memberExpression(
@@ -1381,7 +1381,7 @@ le an issue with details about your use case.`
     p.program.body.push(Re);
     let Me = /* @__PURE__ */ f(({
       localName: j,
-      exportName: v,
+      exportName: N,
       testTitle: k,
       node: V
     }) => {
@@ -1389,7 +1389,7 @@ le an issue with details about your use case.`
         m.types.callExpression(h, [
           m.types.stringLiteral(k),
           m.types.callExpression(S, [
-            m.types.stringLiteral(v),
+            m.types.stringLiteral(N),
             m.types.identifier(j),
             m.types.identifier(d),
             $e
@@ -1397,8 +1397,8 @@ le an issue with details about your use case.`
         ])
       );
       return G.loc = V.loc, G;
-    }, "getTestStatementForStory"), Ue = Object.entries(b).map(([j, v]) => {
-      if (v === null) {
+    }, "getTestStatementForStory"), Ue = Object.entries(b).map(([j, N]) => {
+      if (N === null) {
         Ce.warn(
           ae.dedent`
             [Storybook]: Could not transform "${j}" story into test at "${e}".
@@ -1408,7 +1408,7 @@ le an issue with details about your use case.`
         return;
       }
       let k = a._stories[j].localName ?? j, V = a._stories[j].name ?? j;
-      return Me({ testTitle: V, localName: k, exportName: j, node: v });
+      return Me({ testTitle: V, localName: k, exportName: j, node: N });
     }).filter((j) => !!j), qe = m.types.ifStatement(Le, m.types.blockStatement(Ue));
     p.program.body.push(qe);
     let Be = [
@@ -1421,7 +1421,7 @@ le an issue with details about your use case.`
       ),
       m.types.importDeclaration(
         [m.types.importSpecifier(S, m.types.identifier("testStory"))],
-        m.types.stringLiteral("@storybook/addon-test/internal/test-utils")
+        m.types.stringLiteral("@storybook/addon-vitest/internal/test-utils")
       )
     ];
     p.program.body.unshift(...Be);

package/dist/csf-tools/index.js

@@ -592,7 +592,7 @@ null, "propKey"), G = /* @__PURE__ */ f((s) => n.isTSAsExpression(s) || n.isTSSa
   return e.body.find((r) => (n.isVariableDeclaration(r) ? t = r.declarations : n.isExportNamedDeclaration(r) && n.isVariableDeclaration(r.declaration) &&
   (t = r.declaration.declarations), t && t.find((o) => n.isVariableDeclarator(o) && n.isIdentifier(o.id) && o.id.name === s ? (i = o, !0) : !1))),
   i;
-}, "_findVarDeclarator"), v = /* @__PURE__ */ f((s, e) => z(s, e)?.init, "_findVarInitialization"), R = /* @__PURE__ */ f((s, e) => {
+}, "_findVarDeclarator"), N = /* @__PURE__ */ f((s, e) => z(s, e)?.init, "_findVarInitialization"), R = /* @__PURE__ */ f((s, e) => {
   if (s.length === 0)
     return e;
   let [i, ...t] = s, r = R(t, e);
@@ -622,7 +622,7 @@ null, "propKey"), G = /* @__PURE__ */ f((s) => n.isTSAsExpression(s) || n.isTSSa
       let t = w(i);
       if (t) {
         let r = i.value;
-        n.isIdentifier(r) && (r = v(r.name, this._ast.program)), this._exports[t] = r;
+        n.isIdentifier(r) && (r = N(r.name, this._ast.program)), this._exports[t] = r;
       }
     });
   }
@@ -632,7 +632,7 @@ null, "propKey"), G = /* @__PURE__ */ f((s) => n.isTSAsExpression(s) || n.isTSSa
       ExportDefaultDeclaration: {
         enter({ node: i, parent: t }) {
           e.hasDefaultExport = !0;
-          let r = n.isIdentifier(i.declaration) && n.isProgram(t) ? v(i.declaration.name, t) : i.declaration;
+          let r = n.isIdentifier(i.declaration) && n.isProgram(t) ? N(i.declaration.name, t) : i.declaration;
           r = G(r), n.isCallExpression(r) && n.isObjectExpression(r.arguments[0]) && (r = r.arguments[0]), n.isObjectExpression(r) ? e._parseExportsObject(
           r) : H.warn(
             Y({
@@ -649,7 +649,7 @@ null, "propKey"), G = /* @__PURE__ */ f((s) => n.isTSAsExpression(s) || n.isTSSa
             i.declaration.declarations.forEach((r) => {
               if (n.isVariableDeclarator(r) && n.isIdentifier(r.id)) {
                 let { name: o } = r.id, l = r.init;
-                n.isIdentifier(l) && (l = v(l.name, t)), e._exports[o] = l, e._exportDecls[o] = r;
+                n.isIdentifier(l) && (l = N(l.name, t)), e._exports[o] = l, e._exportDecls[o] = r;
               }
             });
           else if (n.isFunctionDeclaration(i.declaration)) {
@@ -679,11 +679,11 @@ null, "propKey"), G = /* @__PURE__ */ f((s) => n.isTSAsExpression(s) || n.isTSSa
             if (n.isMemberExpression(r) && n.isIdentifier(r.object) && r.object.name === "module" && n.isIdentifier(r.property) && r.property.
             name === "exports") {
               let l = o;
-              n.isIdentifier(o) && (l = v(o.name, t)), l = G(l), n.isObjectExpression(l) ? (e._exportsObject = l, l.properties.forEach((a) => {
+              n.isIdentifier(o) && (l = N(o.name, t)), l = G(l), n.isObjectExpression(l) ? (e._exportsObject = l, l.properties.forEach((a) => {
                 let p = w(a);
                 if (p) {
                   let d = a.value;
-                  n.isIdentifier(d) && (d = v(
+                  n.isIdentifier(d) && (d = N(
                     d.name,
                     t
                   )), e._exports[p] = d;
@@ -849,7 +849,7 @@ null, "propKey"), G = /* @__PURE__ */ f((s) => n.isTSAsExpression(s) || n.isTSSa
         }
         if (n.isExportDefaultDeclaration(o)) {
           let l = o.declaration;
-          if (n.isIdentifier(l) && (l = v(l.name, this._ast.program)), l = G(l), n.isObjectExpression(l)) {
+          if (n.isIdentifier(l) && (l = N(l.name, this._ast.program)), l = G(l), n.isObjectExpression(l)) {
             let a = l.properties;
             i(a, e[0]), r = !0;
           }
@@ -1335,7 +1335,7 @@ le an issue with details about your use case.`
     p.program.body.unshift(...S);
   } else {
     let ie = function() {
-      let j = a._file.path.scope.generateUidIdentifier("isRunningFromThisFile"), N = m.memberExpression(
+      let j = a._file.path.scope.generateUidIdentifier("isRunningFromThisFile"), v = m.memberExpression(
         m.callExpression(m.memberExpression(_, m.identifier("getState")), []),
         m.identifier("testPath")
       ), C = m.memberExpression(
@@ -1346,7 +1346,7 @@ le an issue with details about your use case.`
         // TODO: switch order of testPathProperty and filePathProperty when the bug is fixed
         // https://github.com/vitest-dev/vitest/issues/6367 (or probably just use testPathProperty)
         C,
-        N
+        v
       ), M = m.callExpression(
         m.memberExpression(
           m.memberExpression(
@@ -1364,11 +1364,11 @@ le an issue with details about your use case.`
     var Et = ie;
     f(ie, "getTestGuardDeclaration");
     let _ = a._file.path.scope.generateUidIdentifier("expect"), S = a._file.path.scope.generateUidIdentifier("testStory"), De = m.identifier(
-    JSON.stringify(r.skip)), { isRunningFromThisFileDeclaration: Ne, isRunningFromThisFileId: ve } = ie();
-    p.program.body.push(Ne);
+    JSON.stringify(r.skip)), { isRunningFromThisFileDeclaration: ve, isRunningFromThisFileId: Ne } = ie();
+    p.program.body.push(ve);
     let we = /* @__PURE__ */ f(({
       localName: j,
-      exportName: N,
+      exportName: v,
       testTitle: C,
       node: T
     }) => {
@@ -1376,7 +1376,7 @@ le an issue with details about your use case.`
         m.callExpression(h, [
           m.stringLiteral(C),
           m.callExpression(S, [
-            m.stringLiteral(N),
+            m.stringLiteral(v),
             m.identifier(j),
             m.identifier(d),
             De
@@ -1384,8 +1384,8 @@ le an issue with details about your use case.`
         ])
       );
       return M.loc = T.loc, M;
-    }, "getTestStatementForStory"), Fe = Object.entries(y).map(([j, N]) => {
-      if (N === null) {
+    }, "getTestStatementForStory"), Fe = Object.entries(y).map(([j, v]) => {
+      if (v === null) {
         Ie.warn(
           re.dedent`
             [Storybook]: Could not transform "${j}" story into test at "${e}".
@@ -1395,8 +1395,8 @@ le an issue with details about your use case.`
         return;
       }
       let C = a._stories[j].localName ?? j, T = a._stories[j].name ?? j;
-      return we({ testTitle: T, localName: C, exportName: j, node: N });
-    }).filter((j) => !!j), Ce = m.ifStatement(ve, m.blockStatement(Fe));
+      return we({ testTitle: T, localName: C, exportName: j, node: v });
+    }).filter((j) => !!j), Ce = m.ifStatement(Ne, m.blockStatement(Fe));
     p.program.body.push(Ce);
     let Te = [
       m.importDeclaration(
@@ -1408,7 +1408,7 @@ le an issue with details about your use case.`
       ),
       m.importDeclaration(
         [m.importSpecifier(S, m.identifier("testStory"))],
-        m.stringLiteral("@storybook/addon-test/internal/test-utils")
+        m.stringLiteral("@storybook/addon-vitest/internal/test-utils")
       )
     ];
     p.program.body.unshift(...Te);