@ornikar/kitt-universal 13.3.2 → 13.4.0

package/babel-plugin-csf-to-jest.js

@@ -6,7 +6,10 @@ module.exports = function babelPluginStorybookCSFToJest({ types }, opts) {
   const storybookImportName = 'BabelPluginStorybookCSFToJest_StorybookReact';
   const storiesOfName = 'BabelPluginStorybookCSFToJest_stories';
 
-  const isStory = (file) => file.opts && file.opts.filename && file.opts.filename.endsWith('.stories.tsx');
+  const isStory = (file) =>
+    file.opts &&
+    file.opts.filename &&
+    (file.opts.filename.endsWith('.stories.tsx') || file.opts.filename.endsWith('/stories.tsx'));
 
   return {
     name: 'plugin-storybook-csf-to-jest',
@@ -134,6 +137,7 @@ module.exports = function babelPluginStorybookCSFToJest({ types }, opts) {
 
             const binding = path.scope.getBinding(declaration.id.name);
             let storyName = declaration.id.name;
+            let parameters;
 
             binding.referencePaths.forEach((refPath) => {
               if (refPath === path) return; // skip named export
@@ -154,28 +158,44 @@ module.exports = function babelPluginStorybookCSFToJest({ types }, opts) {
               }
 
               const prop = refPath.parent.property;
-              if (types.isIdentifier(prop) && prop.name === 'args') {
-                foundArgs = true;
-                path.scope.push({
-                  id: types.identifier('args'),
-                  init: assignmentExpression.right,
-                });
-              }
+              if (types.isIdentifier(prop)) {
+                if (prop.name === 'args') {
+                  foundArgs = true;
 
-              if (
-                types.isIdentifier(prop) &&
-                prop.name === 'story' &&
-                types.isObjectExpression(assignmentExpression.right)
-              ) {
-                const objectExpression = assignmentExpression.right;
-                objectExpression.properties.forEach((property) => {
-                  if (types.isIdentifier(property.key) && property.key.name === 'name') {
-                    storyName = property.value.value;
+                  if (declaration.init.body.type !== 'BlockStatement') {
+                    declaration.init.body = types.blockStatement([types.returnStatement(declaration.init.body)]);
                   }
-                });
-              }
 
-              // Need to add decorators and parameters
+                  declaration.init.body.body.unshift(
+                    types.variableDeclaration('const', [
+                      types.variableDeclarator(types.identifier('args'), assignmentExpression.right),
+                    ]),
+                  );
+                }
+
+                if (prop.name === 'storyName') {
+                  if (!types.isStringLiteral(assignmentExpression.right)) {
+                    throw path.buildCodeFrameError(
+                      `Invalid storyName, expecting StringLiteral, got "${assignmentExpression.right.type}"`,
+                    );
+                  }
+                  storyName = assignmentExpression.right.value;
+                }
+
+                if (prop.name === 'story' && types.isObjectExpression(assignmentExpression.right)) {
+                  throw path.buildCodeFrameError('story.name is deprecated, use storyName instead');
+                }
+
+                if (prop.name === 'parameters') {
+                  parameters = assignmentExpression.right;
+                }
+
+                if (prop.name === 'decorators') {
+                  throw path.buildCodeFrameError(
+                    'Story-specific decorators are not supported, use global decorators instead (in export default).',
+                  );
+                }
+              }
 
               memberExpressionPath.parentPath.remove();
             });
@@ -188,6 +208,7 @@ module.exports = function babelPluginStorybookCSFToJest({ types }, opts) {
               types.callExpression(types.memberExpression(types.identifier(storiesOfName), types.identifier('add')), [
                 types.stringLiteral(storyName),
                 declaration.init,
+                ...(parameters ? [parameters] : []),
               ]),
             );
           }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ornikar/kitt-universal",
-  "version": "13.3.2",
+  "version": "13.4.0",
   "license": "MIT",
   "repository": {
     "directory": "@ornikar/kitt-universal",
@@ -46,6 +46,7 @@
     "./translations/fr-FR.json": "./translations/fr-FR.json",
     "./translations/es-ES.json": "./translations/es-ES.json",
     "./dist/linaria-themes-node-14.17.cjs.web.js": "./dist/linaria-themes-node-14.17.cjs.web.js",
+    "./babel-plugin-csf-to-jest": "./babel-plugin-csf-to-jest.js",
     "./package.json": "./package.json"
   },
   "engines": {
@@ -140,5 +141,5 @@
     "react-native-svg": "13.4.0",
     "react-native-web": "0.18.12"
   },
-  "gitHead": "6139cb5f4f8e94300f6ea8a61bf179276cff9fff"
+  "gitHead": "05c075b21a5cef0f923a40b983569a517afb9997"
 }