@atlaskit/eslint-plugin-design-system 8.19.2 → 8.20.0

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @atlaskit/eslint-plugin-design-system
 
+## 8.20.0
+
+### Minor Changes
+
+- [#66409](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/66409) [`f6c48f4a67c1`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/f6c48f4a67c1) - Implemented functionality for the consistent-css-prop-usage rule to account for cssMap usages
+
+### Patch Changes
+
+- [#66604](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/66604) [`3205b1daf57f`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/3205b1daf57f) - Refactor internal logic of `use-primitives` to better handle cases it will not suggest transformations for, based on the value of CSS properties.
+
 ## 8.19.2
 
 ### Patch Changes

package/constellation/index/usage.mdx

@@ -142,7 +142,7 @@ This rule comes with options to support different repository configurations.
 
 #### cssFunctions
 
-An array of function names the linting rule should target. Defaults to `['css', 'xcss']`.
+An array of function names the linting rule should target. Defaults to `['css', 'xcss']`. Functionality of cssMap will be linted regardless of the configuration of `cssFunctions` as it can be used with either attribute.
 
 #### stylesPlacement
 

package/dist/cjs/rules/consistent-css-prop-usage/index.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _eslintCodemodUtils = require("eslint-codemod-utils");
 var _assign = _interopRequireDefault(require("lodash/assign"));
@@ -25,9 +26,9 @@ function findSpreadProperties(node) {
   });
 }
 function analyzeIdentifier(context, sourceIdentifier, configuration) {
-  var _getIdentifierInParen;
+  var _getIdentifierInParen, _getIdentifierInParen2;
   var scope = context.getScope();
-  var _ref = ((_getIdentifierInParen = (0, _eslintCodemodUtils.getIdentifierInParentScope)(scope, sourceIdentifier.name)) === null || _getIdentifierInParen === void 0 ? void 0 : _getIdentifierInParen.identifiers) || [],
+  var _ref = (_getIdentifierInParen = (_getIdentifierInParen2 = (0, _eslintCodemodUtils.getIdentifierInParentScope)(scope, sourceIdentifier.name)) === null || _getIdentifierInParen2 === void 0 ? void 0 : _getIdentifierInParen2.identifiers) !== null && _getIdentifierInParen !== void 0 ? _getIdentifierInParen : [],
     _ref2 = (0, _slicedToArray2.default)(_ref, 1),
     identifier = _ref2[0];
   if (!identifier || !identifier.parent) {
@@ -50,7 +51,7 @@ function analyzeIdentifier(context, sourceIdentifier, configuration) {
     });
     return;
   }
-  if (identifier.parent && identifier.parent.init && !isCssCallExpression(identifier.parent.init, configuration.cssFunctions)) {
+  if (identifier.parent && identifier.parent.init && !isCssCallExpression(identifier.parent.init, [].concat((0, _toConsumableArray2.default)(configuration.cssFunctions), ['cssMap']))) {
     // When variable value is not of type css({})
     context.report({
       node: identifier,
@@ -69,6 +70,13 @@ function analyzeIdentifier(context, sourceIdentifier, configuration) {
     });
   }
 }
+
+/**
+ * Handle different cases based on what's been passed in the css-related JSXAttribute
+ * @param context the context of the node
+ * @param expression the expression of the JSXAttribute value
+ * @param configuration what css-related functions to account for (eg. css, xcss, cssMap), and whether to detect bottom vs top expressions
+ */
 var traverseExpressionWithConfig = function traverseExpressionWithConfig(context, expression, configuration) {
   function traverseExpression(expression) {
     switch (expression.type) {
@@ -140,7 +148,8 @@ var rule = (0, _createRule.createLintRule)({
   create: function create(context) {
     var _ref3;
     var mergedConfig = (0, _assign.default)({}, defaultConfig, context.options[0]);
-    var callSelector = mergedConfig.cssFunctions.map(function (fn) {
+    var callSelectorFunctions = [].concat((0, _toConsumableArray2.default)(mergedConfig.cssFunctions), ['cssMap']);
+    var callSelector = callSelectorFunctions.map(function (fn) {
       return "CallExpression[callee.name=".concat(fn, "]");
     }).join(',');
     return _ref3 = {}, (0, _defineProperty2.default)(_ref3, callSelector, function (node) {

package/dist/cjs/rules/use-primitives/utils/convert-ast-object-expression-to-js-object.js

@@ -3,34 +3,24 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.convertASTObjectExpressionToJSObject = void 0;
+exports.convertASTObjectExpressionToJSObject = exports.SPREAD_SYNTAX = void 0;
 var _eslintCodemodUtils = require("eslint-codemod-utils");
-// FIXME: This is only loosely typed
-
+var SPREAD_SYNTAX = exports.SPREAD_SYNTAX = Symbol('SPREAD_SYNTAX');
 /**
  * Note: Not recursive. Only handles top level key/value pairs
  */
 var convertASTObjectExpressionToJSObject = exports.convertASTObjectExpressionToJSObject = function convertASTObjectExpressionToJSObject(styles) {
-  var styleObj = {};
+  var styleObj = {
+    unsupported: []
+  };
 
-  // if we see any spread props we stop and return false to indicate this is unsupported
+  // if we see any spread props we indicate that as unsupported
   if (!styles.properties.every(function (prop) {
     return (0, _eslintCodemodUtils.isNodeOfType)(prop, 'Property');
   })) {
-    return false;
+    styleObj.unsupported.push(SPREAD_SYNTAX);
   }
-
-  // TODO: https://product-fabric.atlassian.net/browse/DSP-16055
-  // We need to harden this logic asap.
-  // It currently generates a false positive for:
-  // styled.div({
-  //  marginTop: "0px",
-  //  marginBottom: blah(...),
-  // })
-  // as the value for `marginBottom` is not a string nor a `token` call, it is just skipped
-  // from the resulting map and this is inaccurate.
   styles.properties.forEach(function (prop) {
-    // cases we want to skip (see note above)
     if (!(0, _eslintCodemodUtils.isNodeOfType)(prop, 'Property')) {
       return;
     }
@@ -41,28 +31,30 @@ var convertASTObjectExpressionToJSObject = exports.convertASTObjectExpressionToJ
     // a literal string value, the base case
     if ((0, _eslintCodemodUtils.isNodeOfType)(prop.value, 'Literal') && typeof prop.value.value === 'string') {
       styleObj[prop.key.name] = prop.value.value;
+      return;
     }
 
     // try to handle a direct call to `token`
     if ((0, _eslintCodemodUtils.isNodeOfType)(prop.value, 'CallExpression')) {
-      var _callExpression$argum;
       var callExpression = prop.value;
-      // skip if not a call to `token`
-      if (!(0, _eslintCodemodUtils.isNodeOfType)(callExpression.callee, 'Identifier') || callExpression.callee.name !== 'token') {
-        return;
+      // strictly handle calls to `token`
+      if ((0, _eslintCodemodUtils.isNodeOfType)(callExpression.callee, 'Identifier') && callExpression.callee.name === 'token') {
+        // only two valid cases are supported
+        // one argument  => token('space.100')
+        // two arguments => token('space.100', '8px')
+        if ((callExpression.arguments.length === 1 || callExpression.arguments.length === 2) && (0, _eslintCodemodUtils.isNodeOfType)(callExpression.arguments[0], 'Literal') && (typeof callExpression.arguments[1] === 'undefined' || (0, _eslintCodemodUtils.isNodeOfType)(callExpression.arguments[1], 'Literal'))) {
+          var _callExpression$argum;
+          styleObj[prop.key.name] = {
+            tokenName: String(callExpression.arguments[0].value),
+            fallbackValue: (_callExpression$argum = callExpression.arguments[1]) !== null && _callExpression$argum !== void 0 && _callExpression$argum.value ? String(callExpression.arguments[1].value) : undefined
+          };
+          return;
+        }
       }
-
-      // only two valid cases are supported
-      // one argument  => token('space.100')
-      // two arguments => token('space.100', '8px')
-      if (callExpression.arguments.length !== 1 && callExpression.arguments.length !== 2 || !(0, _eslintCodemodUtils.isNodeOfType)(callExpression.arguments[0], 'Literal') || callExpression.arguments[1] && !(0, _eslintCodemodUtils.isNodeOfType)(callExpression.arguments[1], 'Literal')) {
-        return;
-      }
-      styleObj[prop.key.name] = {
-        tokenName: String(callExpression.arguments[0].value),
-        fallbackValue: (_callExpression$argum = callExpression.arguments[1]) !== null && _callExpression$argum !== void 0 && _callExpression$argum.value ? String(callExpression.arguments[1].value) : undefined
-      };
     }
+
+    // if we get here we have an unsupported value
+    styleObj.unsupported.push(prop.key.name);
   });
   return styleObj;
 };

package/dist/cjs/rules/use-primitives/utils/is-valid-css-properties-to-transform.js

@@ -6,18 +6,22 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.isValidCssPropertiesToTransform = void 0;
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _eslintCodemodUtils = require("eslint-codemod-utils");
 var _cssToXcss = require("../transformers/css-to-xcss");
 var _convertAstObjectExpressionToJsObject = require("./convert-ast-object-expression-to-js-object");
+var _excluded = ["unsupported"];
 var isValidCssPropertiesToTransform = exports.isValidCssPropertiesToTransform = function isValidCssPropertiesToTransform(node, config) {
   var cssObjectExpression = node.arguments[0];
   // Bail on empty object calls
   if (!cssObjectExpression || !(0, _eslintCodemodUtils.isNodeOfType)(cssObjectExpression, 'ObjectExpression')) {
     return false;
   }
-  var cssObject = (0, _convertAstObjectExpressionToJsObject.convertASTObjectExpressionToJSObject)(cssObjectExpression);
-  // Bail if there are less or more than 1 styles defined
-  if (!cssObject || Object.keys(cssObject).length !== 1) {
+  var _convertASTObjectExpr = (0, _convertAstObjectExpressionToJsObject.convertASTObjectExpressionToJSObject)(cssObjectExpression),
+    unsupported = _convertASTObjectExpr.unsupported,
+    cssObject = (0, _objectWithoutProperties2.default)(_convertASTObjectExpr, _excluded);
+  // Bail if there are any unsupported styles
+  if (unsupported.length > 0 || Object.keys(cssObject).length !== 1) {
     return false;
   }
   // Short-circuit when token calls are found but pattern is not enabled in config

package/dist/es2019/rules/consistent-css-prop-usage/index.js

@@ -14,9 +14,9 @@ function findSpreadProperties(node) {
   property.type === 'ExperimentalSpreadProperty');
 }
 function analyzeIdentifier(context, sourceIdentifier, configuration) {
-  var _getIdentifierInParen;
+  var _getIdentifierInParen, _getIdentifierInParen2;
   const scope = context.getScope();
-  const [identifier] = ((_getIdentifierInParen = getIdentifierInParentScope(scope, sourceIdentifier.name)) === null || _getIdentifierInParen === void 0 ? void 0 : _getIdentifierInParen.identifiers) || [];
+  const [identifier] = (_getIdentifierInParen = (_getIdentifierInParen2 = getIdentifierInParentScope(scope, sourceIdentifier.name)) === null || _getIdentifierInParen2 === void 0 ? void 0 : _getIdentifierInParen2.identifiers) !== null && _getIdentifierInParen !== void 0 ? _getIdentifierInParen : [];
   if (!identifier || !identifier.parent) {
     // Identifier isn't in the module, skip!
     return;
@@ -37,7 +37,7 @@ function analyzeIdentifier(context, sourceIdentifier, configuration) {
     });
     return;
   }
-  if (identifier.parent && identifier.parent.init && !isCssCallExpression(identifier.parent.init, configuration.cssFunctions)) {
+  if (identifier.parent && identifier.parent.init && !isCssCallExpression(identifier.parent.init, [...configuration.cssFunctions, 'cssMap'])) {
     // When variable value is not of type css({})
     context.report({
       node: identifier,
@@ -56,6 +56,13 @@ function analyzeIdentifier(context, sourceIdentifier, configuration) {
     });
   }
 }
+
+/**
+ * Handle different cases based on what's been passed in the css-related JSXAttribute
+ * @param context the context of the node
+ * @param expression the expression of the JSXAttribute value
+ * @param configuration what css-related functions to account for (eg. css, xcss, cssMap), and whether to detect bottom vs top expressions
+ */
 const traverseExpressionWithConfig = (context, expression, configuration) => {
   function traverseExpression(expression) {
     switch (expression.type) {
@@ -124,7 +131,8 @@ const rule = createLintRule({
   },
   create(context) {
     const mergedConfig = assign({}, defaultConfig, context.options[0]);
-    const callSelector = mergedConfig.cssFunctions.map(fn => `CallExpression[callee.name=${fn}]`).join(',');
+    const callSelectorFunctions = [...mergedConfig.cssFunctions, 'cssMap'];
+    const callSelector = callSelectorFunctions.map(fn => `CallExpression[callee.name=${fn}]`).join(',');
     return {
       [callSelector]: node => {
         if (node.parent.type !== 'VariableDeclarator') {

package/dist/es2019/rules/use-primitives/utils/convert-ast-object-expression-to-js-object.js

@@ -1,29 +1,18 @@
 import { isNodeOfType } from 'eslint-codemod-utils';
-
-// FIXME: This is only loosely typed
-
+export const SPREAD_SYNTAX = Symbol('SPREAD_SYNTAX');
 /**
  * Note: Not recursive. Only handles top level key/value pairs
  */
 export const convertASTObjectExpressionToJSObject = styles => {
-  const styleObj = {};
+  const styleObj = {
+    unsupported: []
+  };
 
-  // if we see any spread props we stop and return false to indicate this is unsupported
+  // if we see any spread props we indicate that as unsupported
   if (!styles.properties.every(prop => isNodeOfType(prop, 'Property'))) {
-    return false;
+    styleObj.unsupported.push(SPREAD_SYNTAX);
   }
-
-  // TODO: https://product-fabric.atlassian.net/browse/DSP-16055
-  // We need to harden this logic asap.
-  // It currently generates a false positive for:
-  // styled.div({
-  //  marginTop: "0px",
-  //  marginBottom: blah(...),
-  // })
-  // as the value for `marginBottom` is not a string nor a `token` call, it is just skipped
-  // from the resulting map and this is inaccurate.
   styles.properties.forEach(prop => {
-    // cases we want to skip (see note above)
     if (!isNodeOfType(prop, 'Property')) {
       return;
     }
@@ -34,28 +23,30 @@ export const convertASTObjectExpressionToJSObject = styles => {
     // a literal string value, the base case
     if (isNodeOfType(prop.value, 'Literal') && typeof prop.value.value === 'string') {
       styleObj[prop.key.name] = prop.value.value;
+      return;
     }
 
     // try to handle a direct call to `token`
     if (isNodeOfType(prop.value, 'CallExpression')) {
-      var _callExpression$argum;
       const callExpression = prop.value;
-      // skip if not a call to `token`
-      if (!isNodeOfType(callExpression.callee, 'Identifier') || callExpression.callee.name !== 'token') {
-        return;
+      // strictly handle calls to `token`
+      if (isNodeOfType(callExpression.callee, 'Identifier') && callExpression.callee.name === 'token') {
+        // only two valid cases are supported
+        // one argument  => token('space.100')
+        // two arguments => token('space.100', '8px')
+        if ((callExpression.arguments.length === 1 || callExpression.arguments.length === 2) && isNodeOfType(callExpression.arguments[0], 'Literal') && (typeof callExpression.arguments[1] === 'undefined' || isNodeOfType(callExpression.arguments[1], 'Literal'))) {
+          var _callExpression$argum;
+          styleObj[prop.key.name] = {
+            tokenName: String(callExpression.arguments[0].value),
+            fallbackValue: (_callExpression$argum = callExpression.arguments[1]) !== null && _callExpression$argum !== void 0 && _callExpression$argum.value ? String(callExpression.arguments[1].value) : undefined
+          };
+          return;
+        }
       }
-
-      // only two valid cases are supported
-      // one argument  => token('space.100')
-      // two arguments => token('space.100', '8px')
-      if (callExpression.arguments.length !== 1 && callExpression.arguments.length !== 2 || !isNodeOfType(callExpression.arguments[0], 'Literal') || callExpression.arguments[1] && !isNodeOfType(callExpression.arguments[1], 'Literal')) {
-        return;
-      }
-      styleObj[prop.key.name] = {
-        tokenName: String(callExpression.arguments[0].value),
-        fallbackValue: (_callExpression$argum = callExpression.arguments[1]) !== null && _callExpression$argum !== void 0 && _callExpression$argum.value ? String(callExpression.arguments[1].value) : undefined
-      };
     }
+
+    // if we get here we have an unsupported value
+    styleObj.unsupported.push(prop.key.name);
   });
   return styleObj;
 };

package/dist/es2019/rules/use-primitives/utils/is-valid-css-properties-to-transform.js

@@ -7,9 +7,12 @@ export const isValidCssPropertiesToTransform = (node, config) => {
   if (!cssObjectExpression || !isNodeOfType(cssObjectExpression, 'ObjectExpression')) {
     return false;
   }
-  const cssObject = convertASTObjectExpressionToJSObject(cssObjectExpression);
-  // Bail if there are less or more than 1 styles defined
-  if (!cssObject || Object.keys(cssObject).length !== 1) {
+  const {
+    unsupported,
+    ...cssObject
+  } = convertASTObjectExpressionToJSObject(cssObjectExpression);
+  // Bail if there are any unsupported styles
+  if (unsupported.length > 0 || Object.keys(cssObject).length !== 1) {
     return false;
   }
   // Short-circuit when token calls are found but pattern is not enabled in config

package/dist/esm/rules/consistent-css-prop-usage/index.js

@@ -1,4 +1,5 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 // eslint-disable-next-line import/no-extraneous-dependencies
 
@@ -18,9 +19,9 @@ function findSpreadProperties(node) {
   });
 }
 function analyzeIdentifier(context, sourceIdentifier, configuration) {
-  var _getIdentifierInParen;
+  var _getIdentifierInParen, _getIdentifierInParen2;
   var scope = context.getScope();
-  var _ref = ((_getIdentifierInParen = getIdentifierInParentScope(scope, sourceIdentifier.name)) === null || _getIdentifierInParen === void 0 ? void 0 : _getIdentifierInParen.identifiers) || [],
+  var _ref = (_getIdentifierInParen = (_getIdentifierInParen2 = getIdentifierInParentScope(scope, sourceIdentifier.name)) === null || _getIdentifierInParen2 === void 0 ? void 0 : _getIdentifierInParen2.identifiers) !== null && _getIdentifierInParen !== void 0 ? _getIdentifierInParen : [],
     _ref2 = _slicedToArray(_ref, 1),
     identifier = _ref2[0];
   if (!identifier || !identifier.parent) {
@@ -43,7 +44,7 @@ function analyzeIdentifier(context, sourceIdentifier, configuration) {
     });
     return;
   }
-  if (identifier.parent && identifier.parent.init && !isCssCallExpression(identifier.parent.init, configuration.cssFunctions)) {
+  if (identifier.parent && identifier.parent.init && !isCssCallExpression(identifier.parent.init, [].concat(_toConsumableArray(configuration.cssFunctions), ['cssMap']))) {
     // When variable value is not of type css({})
     context.report({
       node: identifier,
@@ -62,6 +63,13 @@ function analyzeIdentifier(context, sourceIdentifier, configuration) {
     });
   }
 }
+
+/**
+ * Handle different cases based on what's been passed in the css-related JSXAttribute
+ * @param context the context of the node
+ * @param expression the expression of the JSXAttribute value
+ * @param configuration what css-related functions to account for (eg. css, xcss, cssMap), and whether to detect bottom vs top expressions
+ */
 var traverseExpressionWithConfig = function traverseExpressionWithConfig(context, expression, configuration) {
   function traverseExpression(expression) {
     switch (expression.type) {
@@ -133,7 +141,8 @@ var rule = createLintRule({
   create: function create(context) {
     var _ref3;
     var mergedConfig = assign({}, defaultConfig, context.options[0]);
-    var callSelector = mergedConfig.cssFunctions.map(function (fn) {
+    var callSelectorFunctions = [].concat(_toConsumableArray(mergedConfig.cssFunctions), ['cssMap']);
+    var callSelector = callSelectorFunctions.map(function (fn) {
       return "CallExpression[callee.name=".concat(fn, "]");
     }).join(',');
     return _ref3 = {}, _defineProperty(_ref3, callSelector, function (node) {

package/dist/esm/rules/use-primitives/utils/convert-ast-object-expression-to-js-object.js

@@ -1,31 +1,20 @@
 import { isNodeOfType } from 'eslint-codemod-utils';
-
-// FIXME: This is only loosely typed
-
+export var SPREAD_SYNTAX = Symbol('SPREAD_SYNTAX');
 /**
  * Note: Not recursive. Only handles top level key/value pairs
  */
 export var convertASTObjectExpressionToJSObject = function convertASTObjectExpressionToJSObject(styles) {
-  var styleObj = {};
+  var styleObj = {
+    unsupported: []
+  };
 
-  // if we see any spread props we stop and return false to indicate this is unsupported
+  // if we see any spread props we indicate that as unsupported
   if (!styles.properties.every(function (prop) {
     return isNodeOfType(prop, 'Property');
   })) {
-    return false;
+    styleObj.unsupported.push(SPREAD_SYNTAX);
   }
-
-  // TODO: https://product-fabric.atlassian.net/browse/DSP-16055
-  // We need to harden this logic asap.
-  // It currently generates a false positive for:
-  // styled.div({
-  //  marginTop: "0px",
-  //  marginBottom: blah(...),
-  // })
-  // as the value for `marginBottom` is not a string nor a `token` call, it is just skipped
-  // from the resulting map and this is inaccurate.
   styles.properties.forEach(function (prop) {
-    // cases we want to skip (see note above)
     if (!isNodeOfType(prop, 'Property')) {
       return;
     }
@@ -36,28 +25,30 @@ export var convertASTObjectExpressionToJSObject = function convertASTObjectExpre
     // a literal string value, the base case
     if (isNodeOfType(prop.value, 'Literal') && typeof prop.value.value === 'string') {
       styleObj[prop.key.name] = prop.value.value;
+      return;
     }
 
     // try to handle a direct call to `token`
     if (isNodeOfType(prop.value, 'CallExpression')) {
-      var _callExpression$argum;
       var callExpression = prop.value;
-      // skip if not a call to `token`
-      if (!isNodeOfType(callExpression.callee, 'Identifier') || callExpression.callee.name !== 'token') {
-        return;
+      // strictly handle calls to `token`
+      if (isNodeOfType(callExpression.callee, 'Identifier') && callExpression.callee.name === 'token') {
+        // only two valid cases are supported
+        // one argument  => token('space.100')
+        // two arguments => token('space.100', '8px')
+        if ((callExpression.arguments.length === 1 || callExpression.arguments.length === 2) && isNodeOfType(callExpression.arguments[0], 'Literal') && (typeof callExpression.arguments[1] === 'undefined' || isNodeOfType(callExpression.arguments[1], 'Literal'))) {
+          var _callExpression$argum;
+          styleObj[prop.key.name] = {
+            tokenName: String(callExpression.arguments[0].value),
+            fallbackValue: (_callExpression$argum = callExpression.arguments[1]) !== null && _callExpression$argum !== void 0 && _callExpression$argum.value ? String(callExpression.arguments[1].value) : undefined
+          };
+          return;
+        }
       }
-
-      // only two valid cases are supported
-      // one argument  => token('space.100')
-      // two arguments => token('space.100', '8px')
-      if (callExpression.arguments.length !== 1 && callExpression.arguments.length !== 2 || !isNodeOfType(callExpression.arguments[0], 'Literal') || callExpression.arguments[1] && !isNodeOfType(callExpression.arguments[1], 'Literal')) {
-        return;
-      }
-      styleObj[prop.key.name] = {
-        tokenName: String(callExpression.arguments[0].value),
-        fallbackValue: (_callExpression$argum = callExpression.arguments[1]) !== null && _callExpression$argum !== void 0 && _callExpression$argum.value ? String(callExpression.arguments[1].value) : undefined
-      };
     }
+
+    // if we get here we have an unsupported value
+    styleObj.unsupported.push(prop.key.name);
   });
   return styleObj;
 };

package/dist/esm/rules/use-primitives/utils/is-valid-css-properties-to-transform.js

@@ -1,4 +1,6 @@
 import _typeof from "@babel/runtime/helpers/typeof";
+import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
+var _excluded = ["unsupported"];
 import { isNodeOfType } from 'eslint-codemod-utils';
 import { supportedStylesMap } from '../transformers/css-to-xcss';
 import { convertASTObjectExpressionToJSObject } from './convert-ast-object-expression-to-js-object';
@@ -8,9 +10,11 @@ export var isValidCssPropertiesToTransform = function isValidCssPropertiesToTran
   if (!cssObjectExpression || !isNodeOfType(cssObjectExpression, 'ObjectExpression')) {
     return false;
   }
-  var cssObject = convertASTObjectExpressionToJSObject(cssObjectExpression);
-  // Bail if there are less or more than 1 styles defined
-  if (!cssObject || Object.keys(cssObject).length !== 1) {
+  var _convertASTObjectExpr = convertASTObjectExpressionToJSObject(cssObjectExpression),
+    unsupported = _convertASTObjectExpr.unsupported,
+    cssObject = _objectWithoutProperties(_convertASTObjectExpr, _excluded);
+  // Bail if there are any unsupported styles
+  if (unsupported.length > 0 || Object.keys(cssObject).length !== 1) {
     return false;
   }
   // Short-circuit when token calls are found but pattern is not enabled in config

package/dist/types/rules/use-primitives/utils/convert-ast-object-expression-to-js-object.d.ts

@@ -1,14 +1,18 @@
+import type { CSSProperties } from 'react';
 import type { Rule } from 'eslint';
 import { ObjectExpression } from 'eslint-codemod-utils';
+export declare const SPREAD_SYNTAX: unique symbol;
 type Token = {
     tokenName: string;
     fallbackValue: string | undefined;
 };
 export type CSSPropStyleObject = {
-    [key: string]: string | number | Token;
+    [key in keyof CSSProperties]: string | number | Token;
+} & {
+    unsupported: (keyof CSSProperties | typeof SPREAD_SYNTAX)[];
 };
 /**
  * Note: Not recursive. Only handles top level key/value pairs
  */
-export declare const convertASTObjectExpressionToJSObject: (styles: ObjectExpression & Partial<Rule.NodeParentExtension>) => CSSPropStyleObject | false;
+export declare const convertASTObjectExpressionToJSObject: (styles: ObjectExpression & Partial<Rule.NodeParentExtension>) => CSSPropStyleObject;
 export {};

package/dist/types-ts4.5/rules/use-primitives/utils/convert-ast-object-expression-to-js-object.d.ts

@@ -1,14 +1,18 @@
+import type { CSSProperties } from 'react';
 import type { Rule } from 'eslint';
 import { ObjectExpression } from 'eslint-codemod-utils';
+export declare const SPREAD_SYNTAX: unique symbol;
 type Token = {
     tokenName: string;
     fallbackValue: string | undefined;
 };
 export type CSSPropStyleObject = {
-    [key: string]: string | number | Token;
+    [key in keyof CSSProperties]: string | number | Token;
+} & {
+    unsupported: (keyof CSSProperties | typeof SPREAD_SYNTAX)[];
 };
 /**
  * Note: Not recursive. Only handles top level key/value pairs
  */
-export declare const convertASTObjectExpressionToJSObject: (styles: ObjectExpression & Partial<Rule.NodeParentExtension>) => CSSPropStyleObject | false;
+export declare const convertASTObjectExpressionToJSObject: (styles: ObjectExpression & Partial<Rule.NodeParentExtension>) => CSSPropStyleObject;
 export {};

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