@atlaskit/eslint-plugin-design-system 13.1.0 → 13.1.2

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/eslint-plugin-design-system
 
+## 13.1.2
+
+### Patch Changes
+
+- [#131298](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/131298)
+  [`13ebcc2fd6d07`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/13ebcc2fd6d07) -
+  Update `use-modal-dialog-close-button` rule to include code within expression containers and
+  logical expressions.
+
+## 13.1.1
+
+### Patch Changes
+
+- [#127093](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/127093)
+  [`1378ea7a99ce1`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/1378ea7a99ce1) -
+  Upgrades `jscodeshift` to handle generics properly.
+- Updated dependencies
+
 ## 13.1.0
 
 ### Minor Changes

package/dist/cjs/rules/no-legacy-icons/checks.js

@@ -391,7 +391,6 @@ var createChecks = exports.createChecks = function createChecks(context) {
 
     // Legacy icons rendered as JSX elements
     if (Object.keys(legacyIconImports).includes(name)) {
-      var _size, _size2;
       // Determine if inside a new button - if so:
       // - Assume spread props are safe - still error if props explicitly set to unmigratable values
       var insideNewButton = (0, _helpers.isInsideNewButton)(node, newButtonImports);
@@ -487,7 +486,7 @@ var createChecks = exports.createChecks = function createChecks(context) {
       var migrationMapObject = (0, _helpers.getMigrationMapObject)(legacyIconImports[name].packageName);
       var upcomingIcon = (0, _helpers.getUpcomingIcons)(legacyIconImports[name].packageName);
       var newIcon = migrationMapObject === null || migrationMapObject === void 0 ? void 0 : migrationMapObject.newIcon;
-      var isNewIconMigratable = (0, _helpers.canAutoMigrateNewIconBasedOnSize)(upcomingIcon ? upcomingIcon.sizeGuidance[(_size = size) !== null && _size !== void 0 ? _size : 'medium'] : migrationMapObject === null || migrationMapObject === void 0 ? void 0 : migrationMapObject.sizeGuidance[(_size2 = size) !== null && _size2 !== void 0 ? _size2 : 'medium']);
+      var isNewIconMigratable = (0, _helpers.canAutoMigrateNewIconBasedOnSize)(upcomingIcon ? upcomingIcon.sizeGuidance[size !== null && size !== void 0 ? size : 'medium'] : migrationMapObject === null || migrationMapObject === void 0 ? void 0 : migrationMapObject.sizeGuidance[size !== null && size !== void 0 ? size : 'medium']);
 
       // Add spacing if:
       // 1. size is medium for core/utility icons or small for utility icons, or not set (default is medium for core and small for utility icons)

package/dist/cjs/rules/use-modal-dialog-close-button/index.js

@@ -77,34 +77,58 @@ var rule = (0, _createRule.createLintRule)({
         }
         var modalHeaderNode = null;
         var closeButtonNode = null;
-        var _searchChildren = function searchChildren(node) {
+        var checkNode = function checkNode(node) {
+          if (modalHeaderNode && closeButtonNode) {
+            return;
+          }
+
+          // Add expression conatiner's body if an expression container
+          if ((0, _eslintCodemodUtils.isNodeOfType)(node, 'JSXExpressionContainer')) {
+            if (((0, _eslintCodemodUtils.isNodeOfType)(node.expression, 'ArrowFunctionExpression') || (0, _eslintCodemodUtils.isNodeOfType)(node.expression, 'FunctionExpression')) && (0, _eslintCodemodUtils.isNodeOfType)(node.expression.body, 'JSXElement')) {
+              searchNode(node.expression.body, true);
+            } else if ((0, _eslintCodemodUtils.isNodeOfType)(node.expression, 'LogicalExpression')) {
+              var _node$expression = node.expression,
+                left = _node$expression.left,
+                right = _node$expression.right;
+              [left, right].forEach(function (e) {
+                if ((0, _eslintCodemodUtils.isNodeOfType)(e, 'JSXElement')) {
+                  searchNode(e, true);
+                }
+              });
+            }
+          }
+
+          // Skip if not a JSX Element
+          if (!(0, _eslintCodemodUtils.isNodeOfType)(node, 'JSXElement')) {
+            return;
+          }
+
+          // Skip if opening element is not an identifier
+          if (!(0, _eslintCodemodUtils.isNodeOfType)(node.openingElement.name, 'JSXIdentifier')) {
+            return;
+          }
+
+          // if child is CloseButton, return true
+          if (node.openingElement.name.name === closeButtonLocalName) {
+            closeButtonNode = node;
+          } else if (node.openingElement.name.name === modalHeaderLocalName) {
+            modalHeaderNode = node;
+          }
+          if (node.children) {
+            searchNode(node);
+          }
+        };
+        var searchNode = function searchNode(node) {
+          var searchSelf = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+          if (searchSelf) {
+            checkNode(node);
+          }
           var _iterator = _createForOfIteratorHelper(node.children),
             _step;
           try {
             for (_iterator.s(); !(_step = _iterator.n()).done;) {
               var child = _step.value;
-              if (modalHeaderNode && closeButtonNode) {
-                continue;
-              }
-              // Skip if not a JSX Element
-              if (!(0, _eslintCodemodUtils.isNodeOfType)(child, 'JSXElement')) {
-                continue;
-              }
-
-              // Skip if opening element is not an identifier
-              if (!(0, _eslintCodemodUtils.isNodeOfType)(child.openingElement.name, 'JSXIdentifier')) {
-                continue;
-              }
-
-              // if child is CloseButton, return true
-              if (child.openingElement.name.name === closeButtonLocalName) {
-                closeButtonNode = child;
-              } else if (child.openingElement.name.name === modalHeaderLocalName) {
-                modalHeaderNode = child;
-              }
-              if (child.children) {
-                _searchChildren(child);
-              }
+              checkNode(child);
             }
           } catch (err) {
             _iterator.e(err);
@@ -112,7 +136,7 @@ var rule = (0, _createRule.createLintRule)({
             _iterator.f();
           }
         };
-        _searchChildren(node);
+        searchNode(node);
 
         // If there is a close button, skip the rest, as this satisfies the rule.
         if (closeButtonNode) {

package/dist/cjs/rules/utils/create-no-exported-rule/check-if-supported-export.js

@@ -14,7 +14,6 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var getStack = function getStack(context, node) {
-  var _scope;
   var _getSourceCode = (0, _contextCompat.getSourceCode)(context),
     scopeManager = _getSourceCode.scopeManager;
   var stack = {
@@ -46,7 +45,7 @@ var getStack = function getStack(context, node) {
     }
   }
   return _objectSpread(_objectSpread({}, stack), {}, {
-    scope: (_scope = scope) !== null && _scope !== void 0 ? _scope : (0, _contextCompat.getScope)(context, node)
+    scope: scope !== null && scope !== void 0 ? scope : (0, _contextCompat.getScope)(context, node)
   });
 };
 var matches = function matches(defs, refs) {

package/dist/es2019/rules/use-modal-dialog-close-button/index.js

@@ -70,33 +70,57 @@ const rule = createLintRule({
         }
         let modalHeaderNode = null;
         let closeButtonNode = null;
-        const searchChildren = node => {
-          for (let child of node.children) {
-            if (modalHeaderNode && closeButtonNode) {
-              continue;
-            }
-            // Skip if not a JSX Element
-            if (!isNodeOfType(child, 'JSXElement')) {
-              continue;
-            }
+        const checkNode = node => {
+          if (modalHeaderNode && closeButtonNode) {
+            return;
+          }
 
-            // Skip if opening element is not an identifier
-            if (!isNodeOfType(child.openingElement.name, 'JSXIdentifier')) {
-              continue;
+          // Add expression conatiner's body if an expression container
+          if (isNodeOfType(node, 'JSXExpressionContainer')) {
+            if ((isNodeOfType(node.expression, 'ArrowFunctionExpression') || isNodeOfType(node.expression, 'FunctionExpression')) && isNodeOfType(node.expression.body, 'JSXElement')) {
+              searchNode(node.expression.body, true);
+            } else if (isNodeOfType(node.expression, 'LogicalExpression')) {
+              const {
+                left,
+                right
+              } = node.expression;
+              [left, right].forEach(e => {
+                if (isNodeOfType(e, 'JSXElement')) {
+                  searchNode(e, true);
+                }
+              });
             }
+          }
 
-            // if child is CloseButton, return true
-            if (child.openingElement.name.name === closeButtonLocalName) {
-              closeButtonNode = child;
-            } else if (child.openingElement.name.name === modalHeaderLocalName) {
-              modalHeaderNode = child;
-            }
-            if (child.children) {
-              searchChildren(child);
-            }
+          // Skip if not a JSX Element
+          if (!isNodeOfType(node, 'JSXElement')) {
+            return;
+          }
+
+          // Skip if opening element is not an identifier
+          if (!isNodeOfType(node.openingElement.name, 'JSXIdentifier')) {
+            return;
+          }
+
+          // if child is CloseButton, return true
+          if (node.openingElement.name.name === closeButtonLocalName) {
+            closeButtonNode = node;
+          } else if (node.openingElement.name.name === modalHeaderLocalName) {
+            modalHeaderNode = node;
+          }
+          if (node.children) {
+            searchNode(node);
+          }
+        };
+        const searchNode = (node, searchSelf = false) => {
+          if (searchSelf) {
+            checkNode(node);
+          }
+          for (let child of node.children) {
+            checkNode(child);
           }
         };
-        searchChildren(node);
+        searchNode(node);
 
         // If there is a close button, skip the rest, as this satisfies the rule.
         if (closeButtonNode) {

package/dist/esm/rules/no-legacy-icons/checks.js

@@ -385,7 +385,6 @@ export var createChecks = function createChecks(context) {
 
     // Legacy icons rendered as JSX elements
     if (Object.keys(legacyIconImports).includes(name)) {
-      var _size, _size2;
       // Determine if inside a new button - if so:
       // - Assume spread props are safe - still error if props explicitly set to unmigratable values
       var insideNewButton = isInsideNewButton(node, newButtonImports);
@@ -481,7 +480,7 @@ export var createChecks = function createChecks(context) {
       var migrationMapObject = getMigrationMapObject(legacyIconImports[name].packageName);
       var upcomingIcon = getUpcomingIcons(legacyIconImports[name].packageName);
       var newIcon = migrationMapObject === null || migrationMapObject === void 0 ? void 0 : migrationMapObject.newIcon;
-      var isNewIconMigratable = canAutoMigrateNewIconBasedOnSize(upcomingIcon ? upcomingIcon.sizeGuidance[(_size = size) !== null && _size !== void 0 ? _size : 'medium'] : migrationMapObject === null || migrationMapObject === void 0 ? void 0 : migrationMapObject.sizeGuidance[(_size2 = size) !== null && _size2 !== void 0 ? _size2 : 'medium']);
+      var isNewIconMigratable = canAutoMigrateNewIconBasedOnSize(upcomingIcon ? upcomingIcon.sizeGuidance[size !== null && size !== void 0 ? size : 'medium'] : migrationMapObject === null || migrationMapObject === void 0 ? void 0 : migrationMapObject.sizeGuidance[size !== null && size !== void 0 ? size : 'medium']);
 
       // Add spacing if:
       // 1. size is medium for core/utility icons or small for utility icons, or not set (default is medium for core and small for utility icons)

package/dist/esm/rules/use-modal-dialog-close-button/index.js

@@ -73,34 +73,58 @@ var rule = createLintRule({
         }
         var modalHeaderNode = null;
         var closeButtonNode = null;
-        var _searchChildren = function searchChildren(node) {
+        var checkNode = function checkNode(node) {
+          if (modalHeaderNode && closeButtonNode) {
+            return;
+          }
+
+          // Add expression conatiner's body if an expression container
+          if (isNodeOfType(node, 'JSXExpressionContainer')) {
+            if ((isNodeOfType(node.expression, 'ArrowFunctionExpression') || isNodeOfType(node.expression, 'FunctionExpression')) && isNodeOfType(node.expression.body, 'JSXElement')) {
+              searchNode(node.expression.body, true);
+            } else if (isNodeOfType(node.expression, 'LogicalExpression')) {
+              var _node$expression = node.expression,
+                left = _node$expression.left,
+                right = _node$expression.right;
+              [left, right].forEach(function (e) {
+                if (isNodeOfType(e, 'JSXElement')) {
+                  searchNode(e, true);
+                }
+              });
+            }
+          }
+
+          // Skip if not a JSX Element
+          if (!isNodeOfType(node, 'JSXElement')) {
+            return;
+          }
+
+          // Skip if opening element is not an identifier
+          if (!isNodeOfType(node.openingElement.name, 'JSXIdentifier')) {
+            return;
+          }
+
+          // if child is CloseButton, return true
+          if (node.openingElement.name.name === closeButtonLocalName) {
+            closeButtonNode = node;
+          } else if (node.openingElement.name.name === modalHeaderLocalName) {
+            modalHeaderNode = node;
+          }
+          if (node.children) {
+            searchNode(node);
+          }
+        };
+        var searchNode = function searchNode(node) {
+          var searchSelf = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+          if (searchSelf) {
+            checkNode(node);
+          }
           var _iterator = _createForOfIteratorHelper(node.children),
             _step;
           try {
             for (_iterator.s(); !(_step = _iterator.n()).done;) {
               var child = _step.value;
-              if (modalHeaderNode && closeButtonNode) {
-                continue;
-              }
-              // Skip if not a JSX Element
-              if (!isNodeOfType(child, 'JSXElement')) {
-                continue;
-              }
-
-              // Skip if opening element is not an identifier
-              if (!isNodeOfType(child.openingElement.name, 'JSXIdentifier')) {
-                continue;
-              }
-
-              // if child is CloseButton, return true
-              if (child.openingElement.name.name === closeButtonLocalName) {
-                closeButtonNode = child;
-              } else if (child.openingElement.name.name === modalHeaderLocalName) {
-                modalHeaderNode = child;
-              }
-              if (child.children) {
-                _searchChildren(child);
-              }
+              checkNode(child);
             }
           } catch (err) {
             _iterator.e(err);
@@ -108,7 +132,7 @@ var rule = createLintRule({
             _iterator.f();
           }
         };
-        _searchChildren(node);
+        searchNode(node);
 
         // If there is a close button, skip the rest, as this satisfies the rule.
         if (closeButtonNode) {

package/dist/esm/rules/utils/create-no-exported-rule/check-if-supported-export.js

@@ -7,7 +7,6 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { getScope, getSourceCode } from '@atlaskit/eslint-utils/context-compat';
 import { isStyledComponent } from './is-styled-component';
 var getStack = function getStack(context, node) {
-  var _scope;
   var _getSourceCode = getSourceCode(context),
     scopeManager = _getSourceCode.scopeManager;
   var stack = {
@@ -39,7 +38,7 @@ var getStack = function getStack(context, node) {
     }
   }
   return _objectSpread(_objectSpread({}, stack), {}, {
-    scope: (_scope = scope) !== null && _scope !== void 0 ? _scope : getScope(context, node)
+    scope: scope !== null && scope !== void 0 ? scope : getScope(context, node)
   });
 };
 var matches = function matches(defs, refs) {

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@atlaskit/eslint-plugin-design-system",
 	"description": "The essential plugin for use with the Atlassian Design System.",
-	"version": "13.1.0",
+	"version": "13.1.2",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
 	"publishConfig": {
@@ -45,7 +45,7 @@
 	"dependencies": {
 		"@atlaskit/eslint-utils": "^2.0.0",
 		"@atlaskit/icon": "^25.0.0",
-		"@atlaskit/icon-lab": "^4.2.0",
+		"@atlaskit/icon-lab": "^4.3.0",
 		"@atlaskit/tokens": "^4.5.0",
 		"@babel/runtime": "^7.0.0",
 		"@typescript-eslint/utils": "^7.1.0",
@@ -72,7 +72,7 @@
 		"@types/estraverse": "^5.1.7",
 		"@types/json-schema": "^7.0.15",
 		"eslint": "^8.57.0",
-		"jscodeshift": "^0.13.0",
+		"jscodeshift": "^17.0.0",
 		"outdent": "^0.5.0",
 		"react": "^18.2.0",
 		"ts-jest": "^29.2.2",