@atlaskit/eslint-plugin-design-system 8.24.0 → 8.25.1

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/eslint-plugin-design-system
 
+## 8.25.1
+
+### Patch Changes
+
+- [#67941](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/67941) [`0b1def807516`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/0b1def807516) - Now rule is aplicable only to ButtonGroup ImportSpecifiers
+
+## 8.25.0
+
+### Minor Changes
+
+- [#70369](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/70369) [`611434ce1fe5`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/611434ce1fe5) - ensure-design-token-usage no longer errors on color properties defined in SVG JSX elements.
+
 ## 8.24.0
 
 ### Minor Changes

package/dist/cjs/rules/ensure-design-token-usage/color.js

@@ -140,6 +140,9 @@ var lintJSXLiteralForColor = exports.lintJSXLiteralForColor = function lintJSXLi
   if (!(0, _eslintCodemodUtils.isNodeOfType)(node.parent.name, 'JSXIdentifier')) {
     return;
   }
+  if ((0, _isNode.isDecendantOfSvgElement)(node.parent)) {
+    return;
+  }
   if (['alt', 'src', 'label', 'key'].includes(node.parent.name.name)) {
     return;
   }

package/dist/cjs/rules/use-button-group-label/index.js

@@ -30,16 +30,18 @@ var rule = (0, _createRule.createLintRule)({
     var contextLocalIdentifier = [];
     return {
       ImportDeclaration: function ImportDeclaration(node) {
-        if (node.source.value === '@atlaskit/button') {
-          if (node.specifiers.length) {
-            var defaultImport = node.specifiers.filter(function (spec) {
-              return spec.type === 'ImportSpecifier';
-            });
-            if (defaultImport && defaultImport.length) {
-              var local = defaultImport[0].local;
-              contextLocalIdentifier.push(local.name);
-            }
+        var _node$specifiers;
+        var buttonGroupIdentifier = (_node$specifiers = node.specifiers) === null || _node$specifiers === void 0 ? void 0 : _node$specifiers.filter(function (spec) {
+          if (node.source.value === '@atlaskit/button') {
+            var _spec$imported;
+            return spec.type === 'ImportSpecifier' && ((_spec$imported = spec.imported) === null || _spec$imported === void 0 ? void 0 : _spec$imported.name) === 'ButtonGroup';
+          } else if (node.source.value === '@atlaskit/button/button-group') {
+            return spec.type === 'ImportDefaultSpecifier';
           }
+        });
+        if (buttonGroupIdentifier !== null && buttonGroupIdentifier !== void 0 && buttonGroupIdentifier.length) {
+          var local = buttonGroupIdentifier[0].local;
+          contextLocalIdentifier.push(local.name);
         }
       },
       JSXElement: function JSXElement(node) {

package/dist/cjs/rules/utils/is-node.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isPropertyKey = exports.isDecendantOfType = exports.isDecendantOfStyleJsxAttribute = exports.isDecendantOfStyleBlock = exports.isDecendantOfGlobalToken = exports.isCssInJsTemplateNode = exports.isCssInJsObjectNode = exports.isCssInJsCallNode = exports.isChildOfType = void 0;
+exports.isPropertyKey = exports.isDecendantOfType = exports.isDecendantOfSvgElement = exports.isDecendantOfStyleJsxAttribute = exports.isDecendantOfStyleBlock = exports.isDecendantOfGlobalToken = exports.isCssInJsTemplateNode = exports.isCssInJsObjectNode = exports.isCssInJsCallNode = exports.isChildOfType = void 0;
 var _eslintCodemodUtils = require("eslint-codemod-utils");
 // eslint-disable-next-line import/no-extraneous-dependencies
 
@@ -42,6 +42,18 @@ var isDecendantOfStyleJsxAttribute = exports.isDecendantOfStyleJsxAttribute = fu
   }
   return false;
 };
+var isDecendantOfSvgElement = exports.isDecendantOfSvgElement = function isDecendantOfSvgElement(node) {
+  if ((0, _eslintCodemodUtils.isNodeOfType)(node, 'JSXElement')) {
+    // @ts-ignore
+    if (node.openingElement.name.name === 'svg') {
+      return true;
+    }
+  }
+  if (node.parent) {
+    return isDecendantOfSvgElement(node.parent);
+  }
+  return false;
+};
 var cssInJsCallees = ['css', 'styled', 'styled2'];
 var isCssInJsTemplateNode = exports.isCssInJsTemplateNode = function isCssInJsTemplateNode(node) {
   return (node === null || node === void 0 ? void 0 : node.type) === 'TaggedTemplateExpression' && node.tag.type === 'MemberExpression' && node.tag.object.type === 'Identifier' && node.tag.object.name === 'styled';

package/dist/es2019/rules/ensure-design-token-usage/color.js

@@ -4,7 +4,7 @@ import { node as generate, isNodeOfType } from 'eslint-codemod-utils';
 import { getIsException } from '../utils/get-is-exception';
 import { includesHardCodedColor, isHardCodedColor, isLegacyColor, isLegacyNamedColor } from '../utils/is-color';
 import { isLegacyElevation } from '../utils/is-elevation';
-import { isChildOfType, isDecendantOfGlobalToken, isDecendantOfStyleBlock } from '../utils/is-node';
+import { isChildOfType, isDecendantOfGlobalToken, isDecendantOfStyleBlock, isDecendantOfSvgElement } from '../utils/is-node';
 // TemplateLiteral > Identifier
 export const lintTemplateIdentifierForColor = (node, context, config) => {
   if (node.type !== 'Identifier') {
@@ -135,6 +135,9 @@ export const lintJSXLiteralForColor = (node, context, config) => {
   if (!isNodeOfType(node.parent.name, 'JSXIdentifier')) {
     return;
   }
+  if (isDecendantOfSvgElement(node.parent)) {
+    return;
+  }
   if (['alt', 'src', 'label', 'key'].includes(node.parent.name.name)) {
     return;
   }

package/dist/es2019/rules/use-button-group-label/index.js

@@ -24,16 +24,20 @@ const rule = createLintRule({
     const contextLocalIdentifier = [];
     return {
       ImportDeclaration(node) {
-        if (node.source.value === '@atlaskit/button') {
-          if (node.specifiers.length) {
-            const defaultImport = node.specifiers.filter(spec => spec.type === 'ImportSpecifier');
-            if (defaultImport && defaultImport.length) {
-              const {
-                local
-              } = defaultImport[0];
-              contextLocalIdentifier.push(local.name);
-            }
+        var _node$specifiers;
+        const buttonGroupIdentifier = (_node$specifiers = node.specifiers) === null || _node$specifiers === void 0 ? void 0 : _node$specifiers.filter(spec => {
+          if (node.source.value === '@atlaskit/button') {
+            var _spec$imported;
+            return spec.type === 'ImportSpecifier' && ((_spec$imported = spec.imported) === null || _spec$imported === void 0 ? void 0 : _spec$imported.name) === 'ButtonGroup';
+          } else if (node.source.value === '@atlaskit/button/button-group') {
+            return spec.type === 'ImportDefaultSpecifier';
           }
+        });
+        if (buttonGroupIdentifier !== null && buttonGroupIdentifier !== void 0 && buttonGroupIdentifier.length) {
+          const {
+            local
+          } = buttonGroupIdentifier[0];
+          contextLocalIdentifier.push(local.name);
         }
       },
       JSXElement(node) {

package/dist/es2019/rules/utils/is-node.js

@@ -35,6 +35,18 @@ export const isDecendantOfStyleJsxAttribute = node => {
   }
   return false;
 };
+export const isDecendantOfSvgElement = node => {
+  if (isNodeOfType(node, 'JSXElement')) {
+    // @ts-ignore
+    if (node.openingElement.name.name === 'svg') {
+      return true;
+    }
+  }
+  if (node.parent) {
+    return isDecendantOfSvgElement(node.parent);
+  }
+  return false;
+};
 const cssInJsCallees = ['css', 'styled', 'styled2'];
 export const isCssInJsTemplateNode = node => (node === null || node === void 0 ? void 0 : node.type) === 'TaggedTemplateExpression' && node.tag.type === 'MemberExpression' && node.tag.object.type === 'Identifier' && node.tag.object.name === 'styled';
 export const isCssInJsCallNode = node => (node === null || node === void 0 ? void 0 : node.type) === 'CallExpression' && node.callee.type === 'Identifier' && cssInJsCallees.includes(node.callee.name);

package/dist/esm/rules/ensure-design-token-usage/color.js

@@ -4,7 +4,7 @@ import { node as generate, isNodeOfType } from 'eslint-codemod-utils';
 import { getIsException } from '../utils/get-is-exception';
 import { includesHardCodedColor, isHardCodedColor, isLegacyColor, isLegacyNamedColor } from '../utils/is-color';
 import { isLegacyElevation } from '../utils/is-elevation';
-import { isChildOfType, isDecendantOfGlobalToken, isDecendantOfStyleBlock } from '../utils/is-node';
+import { isChildOfType, isDecendantOfGlobalToken, isDecendantOfStyleBlock, isDecendantOfSvgElement } from '../utils/is-node';
 // TemplateLiteral > Identifier
 export var lintTemplateIdentifierForColor = function lintTemplateIdentifierForColor(node, context, config) {
   if (node.type !== 'Identifier') {
@@ -134,6 +134,9 @@ export var lintJSXLiteralForColor = function lintJSXLiteralForColor(node, contex
   if (!isNodeOfType(node.parent.name, 'JSXIdentifier')) {
     return;
   }
+  if (isDecendantOfSvgElement(node.parent)) {
+    return;
+  }
   if (['alt', 'src', 'label', 'key'].includes(node.parent.name.name)) {
     return;
   }

package/dist/esm/rules/use-button-group-label/index.js

@@ -24,16 +24,18 @@ var rule = createLintRule({
     var contextLocalIdentifier = [];
     return {
       ImportDeclaration: function ImportDeclaration(node) {
-        if (node.source.value === '@atlaskit/button') {
-          if (node.specifiers.length) {
-            var defaultImport = node.specifiers.filter(function (spec) {
-              return spec.type === 'ImportSpecifier';
-            });
-            if (defaultImport && defaultImport.length) {
-              var local = defaultImport[0].local;
-              contextLocalIdentifier.push(local.name);
-            }
+        var _node$specifiers;
+        var buttonGroupIdentifier = (_node$specifiers = node.specifiers) === null || _node$specifiers === void 0 ? void 0 : _node$specifiers.filter(function (spec) {
+          if (node.source.value === '@atlaskit/button') {
+            var _spec$imported;
+            return spec.type === 'ImportSpecifier' && ((_spec$imported = spec.imported) === null || _spec$imported === void 0 ? void 0 : _spec$imported.name) === 'ButtonGroup';
+          } else if (node.source.value === '@atlaskit/button/button-group') {
+            return spec.type === 'ImportDefaultSpecifier';
           }
+        });
+        if (buttonGroupIdentifier !== null && buttonGroupIdentifier !== void 0 && buttonGroupIdentifier.length) {
+          var local = buttonGroupIdentifier[0].local;
+          contextLocalIdentifier.push(local.name);
         }
       },
       JSXElement: function JSXElement(node) {

package/dist/esm/rules/utils/is-node.js

@@ -36,6 +36,18 @@ export var isDecendantOfStyleJsxAttribute = function isDecendantOfStyleJsxAttrib
   }
   return false;
 };
+export var isDecendantOfSvgElement = function isDecendantOfSvgElement(node) {
+  if (isNodeOfType(node, 'JSXElement')) {
+    // @ts-ignore
+    if (node.openingElement.name.name === 'svg') {
+      return true;
+    }
+  }
+  if (node.parent) {
+    return isDecendantOfSvgElement(node.parent);
+  }
+  return false;
+};
 var cssInJsCallees = ['css', 'styled', 'styled2'];
 export var isCssInJsTemplateNode = function isCssInJsTemplateNode(node) {
   return (node === null || node === void 0 ? void 0 : node.type) === 'TaggedTemplateExpression' && node.tag.type === 'MemberExpression' && node.tag.object.type === 'Identifier' && node.tag.object.name === 'styled';

package/dist/types/rules/utils/is-node.d.ts

@@ -4,6 +4,7 @@ export declare const isDecendantOfGlobalToken: (node: EslintNode) => boolean;
 export declare const isDecendantOfType: (node: Rule.Node, type: Rule.Node['type'], skipNode?: boolean) => boolean;
 export declare const isPropertyKey: (node: Rule.Node) => boolean;
 export declare const isDecendantOfStyleJsxAttribute: (node: Rule.Node) => boolean;
+export declare const isDecendantOfSvgElement: (node: Rule.Node) => boolean;
 export declare const isCssInJsTemplateNode: (node?: Expression | null) => node is TaggedTemplateExpression;
 export declare const isCssInJsCallNode: (node?: Expression | null) => node is CallExpression;
 export declare const isCssInJsObjectNode: (node?: Expression | null) => node is CallExpression;

package/dist/types-ts4.5/rules/utils/is-node.d.ts

@@ -4,6 +4,7 @@ export declare const isDecendantOfGlobalToken: (node: EslintNode) => boolean;
 export declare const isDecendantOfType: (node: Rule.Node, type: Rule.Node['type'], skipNode?: boolean) => boolean;
 export declare const isPropertyKey: (node: Rule.Node) => boolean;
 export declare const isDecendantOfStyleJsxAttribute: (node: Rule.Node) => boolean;
+export declare const isDecendantOfSvgElement: (node: Rule.Node) => boolean;
 export declare const isCssInJsTemplateNode: (node?: Expression | null) => node is TaggedTemplateExpression;
 export declare const isCssInJsCallNode: (node?: Expression | null) => node is CallExpression;
 export declare const isCssInJsObjectNode: (node?: Expression | null) => node is CallExpression;

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": "8.24.0",
+  "version": "8.25.1",
   "author": "Atlassian Pty Ltd",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"