@atlaskit/eslint-plugin-platform 0.14.0 → 1.1.0

package/dist/es2019/rules/util/context-compat.js

@@ -0,0 +1,27 @@
+/**
+ * TODO: Consider whether this should be replaced by ESLint's compat library.
+ * Either way, this should be removed once we no longer need to support ESLint versions less than 8.40.
+ */
+
+/**
+ * A compatibility layer to support older versions of ESLint.
+ * `context.sourceCode` is the preferred way to access SourceCode, as
+ * `context.getSourceCode()` is deprecated in v8 and removed in v9.
+ * @param context - The ESLint rule context
+ */
+const getSourceCode = context => {
+  var _context$sourceCode;
+  return (_context$sourceCode = context.sourceCode) !== null && _context$sourceCode !== void 0 ? _context$sourceCode : context.getSourceCode();
+};
+
+/**
+ * A compatibility layer to support older versions of ESLint.
+ * `context.sourceCode.getScope()` is the preferred way to access Scope, as
+ * `context.getScope()` was removed in v9.
+ * @param context - The ESLint rule context
+ * @param node - The node to get the scope for
+ */
+export const getScope = (context, node) => {
+  var _getSourceCode$getSco, _getSourceCode;
+  return (_getSourceCode$getSco = (_getSourceCode = getSourceCode(context)) === null || _getSourceCode === void 0 ? void 0 : _getSourceCode.getScope(node)) !== null && _getSourceCode$getSco !== void 0 ? _getSourceCode$getSco : context.getScope();
+};

package/dist/esm/index.js

@@ -63,7 +63,7 @@ var commonConfig = {
   '@atlaskit/platform/ensure-atlassian-team': 'error',
   '@atlaskit/platform/no-module-level-eval-nav4': 'error',
   // Compiled: rules that are not included via `@compiled/recommended
-  '@atlaskit/platform/expand-border-shorthand': 'warn',
+  '@atlaskit/platform/expand-border-shorthand': 'error',
   '@atlaskit/platform/expand-background-shorthand': 'warn',
   '@compiled/jsx-pragma': ['error', {
     importSources: ['@atlaskit/css'],

package/dist/esm/rules/compiled/expand-background-shorthand/index.js

@@ -1,10 +1,11 @@
 import { getImportSources, isCompiled, isAtlasKitCSS } from '@atlaskit/eslint-utils/is-supported-import';
+import { getScope } from '../../util/context-compat';
 
 // Checks if the function that holds the border property is using an import package that this rule is targeting
-var isCompiledAPI = function isCompiledAPI(context) {
+var isCompiledAPI = function isCompiledAPI(context, node) {
   var importSources = getImportSources(context);
-  var _context$getScope = context.getScope(),
-    references = _context$getScope.references;
+  var _getScope = getScope(context, node),
+    references = _getScope.references;
   var ancestors = context.getAncestors();
   if (ancestors.some(function (ancestor) {
     return ancestor.type === 'CallExpression' && ancestor.callee && (isCompiled(ancestor.callee, references, importSources) || isAtlasKitCSS(ancestor.callee, references, importSources));
@@ -37,7 +38,7 @@ export var expandBackgroundShorthand = {
   create: function create(context) {
     return {
       'Property[key.name="background"]': function PropertyKeyNameBackground(node) {
-        if (isCompiledAPI(context) && isTokenCallExpression(node.value)) {
+        if (isCompiledAPI(context, node) && isTokenCallExpression(node.value)) {
           context.report({
             node: node,
             messageId: 'expandBackgroundShorthand',
@@ -45,7 +46,6 @@ export var expandBackgroundShorthand = {
               return fixer.replaceText(node.key, "backgroundColor");
             }
           });
-          return;
         }
       }
     };

package/dist/esm/rules/compiled/expand-border-shorthand/index.js

@@ -13,6 +13,9 @@ var separateBorderProperties = function separateBorderProperties(borderString, p
   if (EXCLUDED_VALUES.includes(borderString)) {
     return;
   }
+  if (borderString.includes('var(--')) {
+    return;
+  }
   context.report({
     node: property,
     messageId: 'expandBorderShorthand'
@@ -33,7 +36,7 @@ var isCompiledAPI = function isCompiledAPI(importDeclaration, callExpression) {
     return;
   }
   return importDeclaration.specifiers.some(function (specifier) {
-    return specifier.type === 'ImportSpecifier' && specifier.imported.name === functionName;
+    return specifier.type === 'ImportSpecifier' && specifier.local.name === functionName;
   });
 };
 export var expandBorderShorthand = {
@@ -60,21 +63,11 @@ export var expandBorderShorthand = {
         if (importDeclaration) {
           if (isCompiledAPI(importDeclaration, callExpression)) {
             if (node.value.type === 'Literal' && node.value.value !== null) {
-              if (typeof node.value.value === 'string') {
-                var borderString = node.value.value;
+              var borderString = typeof node.value.value === 'string' ? node.value.value : node.value.raw;
+              if (borderString) {
                 separateBorderProperties(borderString, node, context);
-              } else if (node.value.raw) {
-                var _borderString = node.value.raw;
-                separateBorderProperties(_borderString, node, context);
               }
             } else if (node.value.type === 'TemplateLiteral') {
-              if (node.value.quasis.length > 1 || node.value.expressions.length > 0) {
-                context.report({
-                  node: node,
-                  messageId: 'expandBorderShorthand'
-                });
-                return;
-              }
               if (node.value.quasis.length === 1 && node.value.quasis[0].value.cooked) {
                 var borderQuasis = node.value.quasis[0].value.cooked;
                 separateBorderProperties(borderQuasis, node, context);

package/dist/esm/rules/feature-gating/inline-usage/index.js

@@ -8,7 +8,7 @@ var findDefinitionDeclaration = function findDefinitionDeclaration(node) {
 var validateCallExpression = function validateCallExpression(node, context) {
   var targetedFunctionsSwitch = context.options[0] === 'ssOnly' ? STATSIG_ONLY_FUNCTION_NAMES : FUNCTION_NAMES;
   var callee = node.callee;
-  var shouldWarn = callee.type === 'Identifier' && targetedFunctionsSwitch.has(callee.name) && isAPIimport(callee.name, context);
+  var shouldWarn = callee.type === 'Identifier' && targetedFunctionsSwitch.has(callee.name) && isAPIimport(callee.name, context, node);
   if (shouldWarn) {
     var defDeclaration = findDefinitionDeclaration(node.parent);
     context.report({

package/dist/esm/rules/feature-gating/no-alias/index.js

@@ -43,7 +43,7 @@ var rule = {
         if (!node.init || node.init.type !== 'Identifier') {
           return;
         }
-        var isReassignment = isIdentifierImportedFrom(node.init.name, IMPORT_SOURCES, context);
+        var isReassignment = isIdentifierImportedFrom(node.init.name, IMPORT_SOURCES, context, node);
         if (isReassignment) {
           context.report({
             messageId: 'noReassignment',

package/dist/esm/rules/feature-gating/no-module-level-eval/index.js

@@ -1,6 +1,7 @@
 import { isAPIimport } from '../utils';
-var isInFunctionLevel = function isInFunctionLevel(context) {
-  var scope = context.getScope();
+import { getScope } from '../../util/context-compat';
+var isInFunctionLevel = function isInFunctionLevel(context, node) {
+  var scope = getScope(context, node);
   while (((_scope = scope) === null || _scope === void 0 ? void 0 : _scope.type) !== 'module' && ((_scope2 = scope) === null || _scope2 === void 0 ? void 0 : _scope2.type) !== 'global') {
     var _scope, _scope2;
     if (scope.type === 'function') {
@@ -26,7 +27,7 @@ var rule = {
   create: function create(context) {
     return {
       'CallExpression[callee.type="Identifier"]': function CallExpressionCalleeTypeIdentifier(node) {
-        if (node.type === 'CallExpression' && node.callee.type === 'Identifier' && isAPIimport(node.callee.name, context) && !isInFunctionLevel(context)) {
+        if (node.type === 'CallExpression' && node.callee.type === 'Identifier' && isAPIimport(node.callee.name, context, node) && !isInFunctionLevel(context, node)) {
           context.report({
             messageId: 'noModuleLevelEval',
             node: node

package/dist/esm/rules/feature-gating/no-module-level-eval-nav4/index.js

@@ -1,3 +1,4 @@
+import { getScope } from '../../util/context-compat';
 var featureLibraryFunctions = new Set([
 /*
  * STOP!
@@ -10,8 +11,8 @@ var featureLibraryFunctions = new Set([
  * Slack thread: https://atlassian.slack.com/archives/CFGLH1ZS8/p1726449739284819
  */
 'isVisualRefreshEnabled', 'getMetaBoolean', 'getNav4Rollout', 'getWillShowNav3', 'getWillShowNav4', 'getWillShowNav4UserOptIn', 'getWillShowNav4UserOptOut']);
-var isInFunctionLevel = function isInFunctionLevel(context) {
-  var scope = context.getScope();
+var isInFunctionLevel = function isInFunctionLevel(context, node) {
+  var scope = getScope(context, node);
   while (((_scope = scope) === null || _scope === void 0 ? void 0 : _scope.type) !== 'module' && ((_scope2 = scope) === null || _scope2 === void 0 ? void 0 : _scope2.type) !== 'global') {
     var _scope, _scope2;
     if (scope.type === 'function') {
@@ -37,7 +38,7 @@ var rule = {
   create: function create(context) {
     return {
       'CallExpression[callee.type="Identifier"]': function CallExpressionCalleeTypeIdentifier(node) {
-        if (node.type === 'CallExpression' && node.callee.type === 'Identifier' && featureLibraryFunctions.has(node.callee.name) && !isInFunctionLevel(context)) {
+        if (node.type === 'CallExpression' && node.callee.type === 'Identifier' && featureLibraryFunctions.has(node.callee.name) && !isInFunctionLevel(context, node)) {
           context.report({
             messageId: 'noModuleLevelEval',
             node: node

package/dist/esm/rules/feature-gating/no-preconditioning/index.js

@@ -14,7 +14,7 @@ var getGateType = function getGateType(node, context) {
     var callee = node.callee;
     var isFeatureGate = type === 'CallExpression' && callee.type === 'Identifier' && (
     // Experiments cannot have other experiments as preconditions, only gates
-    callee.name === 'fg' || isExpUsage(callee.name)) && isAPIimport(callee.name, context);
+    callee.name === 'fg' || isExpUsage(callee.name)) && isAPIimport(callee.name, context, node);
     return isFeatureGate ? callee.name : '';
   }
   return '';

package/dist/esm/rules/feature-gating/prefer-fg/index.js

@@ -4,11 +4,12 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 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) { _defineProperty(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; }
 import { FEATURE_API_IMPORT_SOURCES } from '../../constants';
+import { getScope } from '../../util/context-compat';
 var validateUsage = function validateUsage(node, utilName, context, changeMap) {
-  var _context$getScope$ref;
-  var resolved = (_context$getScope$ref = context.getScope().references.find(function (ref) {
+  var _getScope$references$;
+  var resolved = (_getScope$references$ = getScope(context, node).references.find(function (ref) {
     return ref.identifier.name === utilName;
-  })) === null || _context$getScope$ref === void 0 ? void 0 : _context$getScope$ref.resolved;
+  })) === null || _getScope$references$ === void 0 ? void 0 : _getScope$references$.resolved;
   var importSpecifierDefinition = resolved === null || resolved === void 0 ? void 0 : resolved.defs.find(function (def) {
     var _def$node, _def$parent;
     return ((_def$node = def.node) === null || _def$node === void 0 ? void 0 : _def$node.type) === 'ImportSpecifier' && FEATURE_API_IMPORT_SOURCES.has((_def$parent = def.parent) === null || _def$parent === void 0 ? void 0 : _def$parent.source.value);
@@ -65,12 +66,12 @@ var rule = {
         changeMap = changeMap || new Map();
         validateUsage(node, 'getBooleanFF', context, changeMap);
       },
-      'Program:exit': function ProgramExit() {
+      'Program:exit': function ProgramExit(node) {
         var _changeMap;
         if ((_changeMap = changeMap) !== null && _changeMap !== void 0 && _changeMap.size) {
           changeMap.forEach(function (changeCounts, importDeclaration) {
-            var _context$getScope$chi = _slicedToArray(context.getScope().childScopes, 1),
-              moduleScope = _context$getScope$chi[0];
+            var _getScope$childScopes = _slicedToArray(getScope(context, node).childScopes, 1),
+              moduleScope = _getScope$childScopes[0];
             var importSpecifiers = new Set(importDeclaration.specifiers.map(function (_ref) {
               var imported = _ref.imported;
               return imported.name;

package/dist/esm/rules/feature-gating/static-feature-flags/index.js

@@ -26,12 +26,12 @@ var rule = {
         if (node.type !== 'CallExpression') {
           return;
         }
-        if (node.callee.type === 'Identifier' && (!targetedFunctionsSwitch.has(node.callee.name) || !isIdentifierImportedFrom(node.callee.name, IMPORT_SOURCES, context))) {
+        if (node.callee.type === 'Identifier' && (!targetedFunctionsSwitch.has(node.callee.name) || !isIdentifierImportedFrom(node.callee.name, IMPORT_SOURCES, context, node))) {
           return;
         }
         var nameArgument = node.arguments[0];
         if (nameArgument.type === 'Identifier') {
-          var def = getDef(nameArgument.name, context);
+          var def = getDef(nameArgument.name, context, node);
           if (def != null && def.type === 'Variable') {
             var _ref = def.node.init,
               value = _ref.value;

package/dist/esm/rules/feature-gating/use-recommended-utils/index.js

@@ -15,7 +15,7 @@ var rule = {
   create: function create(context) {
     return {
       'CallExpression > MemberExpression:matches([property.name="checkGate"])': function CallExpressionMemberExpressionMatchesPropertyNameCheckGate(node) {
-        if (node.object.type === 'Identifier' && isIdentifierImportedFrom(node.object.name, BANNED_IMPORTS_SET, context)) {
+        if (node.object.type === 'Identifier' && isIdentifierImportedFrom(node.object.name, BANNED_IMPORTS_SET, context, node)) {
           context.report({
             messageId: 'useRecommended',
             node: node,
@@ -28,7 +28,7 @@ var rule = {
         }
       },
       'CallExpression > MemberExpression:matches([property.name="getExperimentValue"])': function CallExpressionMemberExpressionMatchesPropertyNameGetExperimentValue(node) {
-        if (node.object.type === 'Identifier' && isIdentifierImportedFrom(node.object.name, BANNED_IMPORTS_SET, context)) {
+        if (node.object.type === 'Identifier' && isIdentifierImportedFrom(node.object.name, BANNED_IMPORTS_SET, context, node)) {
           context.report({
             messageId: 'notSupported',
             node: node

package/dist/esm/rules/feature-gating/utils.js

@@ -2,25 +2,26 @@ function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 import { FEATURE_API_IMPORT_SOURCES } from '../constants';
-export function isIdentifierImportedFrom(identifierName, sources, context) {
+import { getScope } from '../util/context-compat';
+export function isIdentifierImportedFrom(identifierName, sources, context, node) {
   if (sources.size > 0) {
-    var _context$getScope$ref, _context$getScope$ref2;
-    return (_context$getScope$ref = (_context$getScope$ref2 = context.getScope().references.find(function (ref) {
+    var _getScope$references$, _getScope$references$2;
+    return (_getScope$references$ = (_getScope$references$2 = getScope(context, node).references.find(function (ref) {
       return ref.identifier.name === identifierName;
-    })) === null || _context$getScope$ref2 === void 0 || (_context$getScope$ref2 = _context$getScope$ref2.resolved) === null || _context$getScope$ref2 === void 0 ? void 0 : _context$getScope$ref2.defs.some(function (def) {
+    })) === null || _getScope$references$2 === void 0 || (_getScope$references$2 = _getScope$references$2.resolved) === null || _getScope$references$2 === void 0 ? void 0 : _getScope$references$2.defs.some(function (def) {
       var _def$parent;
       return ((_def$parent = def.parent) === null || _def$parent === void 0 ? void 0 : _def$parent.type) === 'ImportDeclaration' && sources.has(def.parent.source.value + '');
-    })) !== null && _context$getScope$ref !== void 0 ? _context$getScope$ref : false;
+    })) !== null && _getScope$references$ !== void 0 ? _getScope$references$ : false;
   }
   return false;
 }
-export function isAPIimport(functionName, context) {
-  return isIdentifierImportedFrom(functionName, FEATURE_API_IMPORT_SOURCES, context);
+export function isAPIimport(functionName, context, node) {
+  return isIdentifierImportedFrom(functionName, FEATURE_API_IMPORT_SOURCES, context, node);
 }
 
 // returns the definition node of a variable if it's declared within the scope of the file
-export function getDef(name, context) {
-  var scope = context.getScope();
+export function getDef(name, context, node) {
+  var scope = getScope(context, node);
   while (scope && scope.type !== 'global') {
     var _iterator = _createForOfIteratorHelper(scope.variables),
       _step;

package/dist/esm/rules/util/context-compat.js

@@ -0,0 +1,27 @@
+/**
+ * TODO: Consider whether this should be replaced by ESLint's compat library.
+ * Either way, this should be removed once we no longer need to support ESLint versions less than 8.40.
+ */
+
+/**
+ * A compatibility layer to support older versions of ESLint.
+ * `context.sourceCode` is the preferred way to access SourceCode, as
+ * `context.getSourceCode()` is deprecated in v8 and removed in v9.
+ * @param context - The ESLint rule context
+ */
+var getSourceCode = function getSourceCode(context) {
+  var _context$sourceCode;
+  return (_context$sourceCode = context.sourceCode) !== null && _context$sourceCode !== void 0 ? _context$sourceCode : context.getSourceCode();
+};
+
+/**
+ * A compatibility layer to support older versions of ESLint.
+ * `context.sourceCode.getScope()` is the preferred way to access Scope, as
+ * `context.getScope()` was removed in v9.
+ * @param context - The ESLint rule context
+ * @param node - The node to get the scope for
+ */
+export var getScope = function getScope(context, node) {
+  var _getSourceCode$getSco, _getSourceCode;
+  return (_getSourceCode$getSco = (_getSourceCode = getSourceCode(context)) === null || _getSourceCode === void 0 ? void 0 : _getSourceCode.getScope(node)) !== null && _getSourceCode$getSco !== void 0 ? _getSourceCode$getSco : context.getScope();
+};

package/dist/types/rules/feature-gating/utils.d.ts

@@ -1,7 +1,8 @@
 import type { Rule, Scope } from 'eslint';
-export declare function isIdentifierImportedFrom(identifierName: string, sources: Set<string>, context: Rule.RuleContext): boolean;
-export declare function isAPIimport(functionName: string, context: Rule.RuleContext): boolean;
-export declare function getDef(name: string, context: Rule.RuleContext): Scope.Definition | null | undefined;
+import type { Node as EstreeNode } from 'estree';
+export declare function isIdentifierImportedFrom(identifierName: string, sources: Set<string>, context: Rule.RuleContext, node: EstreeNode): boolean;
+export declare function isAPIimport(functionName: string, context: Rule.RuleContext, node: EstreeNode): boolean;
+export declare function getDef(name: string, context: Rule.RuleContext, node: EstreeNode): Scope.Definition | null | undefined;
 export type Node<T extends Rule.Node['type']> = Extract<Rule.Node, {
     type: T;
 }>;

package/dist/types/rules/util/context-compat.d.ts

@@ -0,0 +1,10 @@
+import type { Rule, Scope } from 'eslint';
+import type { Node } from 'estree';
+/**
+ * A compatibility layer to support older versions of ESLint.
+ * `context.sourceCode.getScope()` is the preferred way to access Scope, as
+ * `context.getScope()` was removed in v9.
+ * @param context - The ESLint rule context
+ * @param node - The node to get the scope for
+ */
+export declare const getScope: (context: Rule.RuleContext, node: Node) => Scope.Scope;

package/dist/types-ts4.5/rules/feature-gating/utils.d.ts

@@ -1,7 +1,8 @@
 import type { Rule, Scope } from 'eslint';
-export declare function isIdentifierImportedFrom(identifierName: string, sources: Set<string>, context: Rule.RuleContext): boolean;
-export declare function isAPIimport(functionName: string, context: Rule.RuleContext): boolean;
-export declare function getDef(name: string, context: Rule.RuleContext): Scope.Definition | null | undefined;
+import type { Node as EstreeNode } from 'estree';
+export declare function isIdentifierImportedFrom(identifierName: string, sources: Set<string>, context: Rule.RuleContext, node: EstreeNode): boolean;
+export declare function isAPIimport(functionName: string, context: Rule.RuleContext, node: EstreeNode): boolean;
+export declare function getDef(name: string, context: Rule.RuleContext, node: EstreeNode): Scope.Definition | null | undefined;
 export type Node<T extends Rule.Node['type']> = Extract<Rule.Node, {
     type: T;
 }>;

package/dist/types-ts4.5/rules/util/context-compat.d.ts

@@ -0,0 +1,10 @@
+import type { Rule, Scope } from 'eslint';
+import type { Node } from 'estree';
+/**
+ * A compatibility layer to support older versions of ESLint.
+ * `context.sourceCode.getScope()` is the preferred way to access Scope, as
+ * `context.getScope()` was removed in v9.
+ * @param context - The ESLint rule context
+ * @param node - The node to get the scope for
+ */
+export declare const getScope: (context: Rule.RuleContext, node: Node) => Scope.Scope;

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@atlaskit/eslint-plugin-platform",
 	"description": "The essential plugin for use with Atlassian frontend platform tools",
-	"version": "0.14.0",
+	"version": "1.1.0",
 	"author": "Atlassian Pty Ltd",
 	"atlassian": {
 		"team": "Build Infra",
@@ -33,18 +33,15 @@
 	"dependencies": {
 		"@atlaskit/eslint-utils": "^1.7.0",
 		"@babel/runtime": "^7.0.0",
+		"@compiled/eslint-plugin": "^0.17.0",
 		"@manypkg/find-root": "^1.1.0",
 		"fuse.js": "^6.6.2",
 		"read-pkg-up": "^7.0.1"
 	},
 	"devDependencies": {
 		"@atlassian/ts-loader": "*",
-		"@compiled/eslint-plugin": "^0.17.0",
 		"@types/eslint": "^8.56.6",
 		"eslint": "^8.57.0",
 		"outdent": "^0.5.0"
-	},
-	"peerDependencies": {
-		"@compiled/eslint-plugin": "^0.17.0"
 	}
 }

package/src/index.tsx

@@ -62,7 +62,7 @@ const commonConfig = {
 	'@atlaskit/platform/ensure-atlassian-team': 'error',
 	'@atlaskit/platform/no-module-level-eval-nav4': 'error',
 	// Compiled: rules that are not included via `@compiled/recommended
-	'@atlaskit/platform/expand-border-shorthand': 'warn',
+	'@atlaskit/platform/expand-border-shorthand': 'error',
 	'@atlaskit/platform/expand-background-shorthand': 'warn',
 	'@compiled/jsx-pragma': [
 		'error',

package/src/rules/compiled/expand-background-shorthand/__tests__/rule.test.ts

@@ -51,7 +51,7 @@ tester.run('expand-border-shorthand', expandBackgroundShorthand, {
 				background: 'transparent'
 			});
 			const styles2 = css({
-				background: url(image.png)
+				background: url('image.png')
 			});
 			const styles3 = css({
 				background: 0

package/src/rules/compiled/expand-background-shorthand/index.tsx

@@ -5,11 +5,12 @@ import {
 	isCompiled,
 	isAtlasKitCSS,
 } from '@atlaskit/eslint-utils/is-supported-import';
+import { getScope } from '../../util/context-compat';
 
 // Checks if the function that holds the border property is using an import package that this rule is targeting
-const isCompiledAPI = (context: Rule.RuleContext): boolean => {
+const isCompiledAPI = (context: Rule.RuleContext, node: Node): boolean => {
 	const importSources = getImportSources(context);
-	const { references } = context.getScope();
+	const { references } = getScope(context, node);
 	const ancestors = context.getAncestors();
 	if (
 		ancestors.some(
@@ -49,7 +50,7 @@ export const expandBackgroundShorthand: Rule.RuleModule = {
 	create(context) {
 		return {
 			'Property[key.name="background"]': function (node: Property) {
-				if (isCompiledAPI(context) && isTokenCallExpression(node.value)) {
+				if (isCompiledAPI(context, node) && isTokenCallExpression(node.value)) {
 					context.report({
 						node,
 						messageId: 'expandBackgroundShorthand',
@@ -57,7 +58,6 @@ export const expandBackgroundShorthand: Rule.RuleModule = {
 							return fixer.replaceText(node.key, `backgroundColor`);
 						},
 					});
-					return;
 				}
 			},
 		};

package/src/rules/compiled/expand-border-shorthand/README.md

@@ -1,6 +1,6 @@
 # `shorthand-property-sorting`
 
-This ESLint rule enforces the expansion of CSS `border` shorthand property, into it's longhand
+This ESLint rule enforces the expansion of CSS `border` shorthand property, into its longhand
 equivalents `borderStyle`, `borderWidth`, `borderColor`, for packages that originates from
 `@compiled/react`, and `@atlaskit/css`.
 

package/src/rules/compiled/expand-border-shorthand/__tests__/rule.test.ts

@@ -3,15 +3,13 @@ import { outdent } from 'outdent';
 import { tester } from '../../../../__tests__/utils/_tester';
 import { expandBorderShorthand } from '../index';
 
-const valid_packages_calls_and_imports = [
+const included_packages_calls_and_imports = [
 	['css', 'css', '@atlaskit/css'],
 	['css', 'css', '@compiled/react'],
 	['styled', 'styled.div', '@compiled/react'],
-	['cssMap', 'cssMap', '@atlaskit/css'],
-	['cssMap', 'cssMap', '@compiled/react'],
 ];
 
-const invalid_packages_calls_and_imports = [
+const exempt_packages_calls_and_imports = [
 	['css', '@atlaskit/primitives'],
 	['css', '@emotion'],
 	['css', 'styled-components'],
@@ -19,8 +17,8 @@ const invalid_packages_calls_and_imports = [
 
 tester.run('expand-border-shorthand', expandBorderShorthand, {
 	valid: [
-		...invalid_packages_calls_and_imports.map(([pkg, imp]) => ({
-			name: `incorrect packages (${pkg}, ${imp})`,
+		...exempt_packages_calls_and_imports.map(([pkg, imp]) => ({
+			name: `handle only Compiled APIs (${pkg}, ${imp})`,
 			code: outdent`
 			import {${pkg}} from '${imp}';
 
@@ -30,13 +28,18 @@ tester.run('expand-border-shorthand', expandBorderShorthand, {
 		`,
 		})),
 		{
-			name: 'references correct package',
+			name: 'CallExpression matches with imported API',
 			code: outdent`
-			import {css} from '@compiled/react';
+			import { styled } from 'styled-components';
+			import { styled as styled2, css as compiledCSS, jsx } from '@compiled/react';
 
 			const styles = xcss({
 				border: '1px solid red',
 			});
+
+			const styles2 = styled.div({
+				border: '1px solid red',
+			});
 		`,
 		},
 		{
@@ -71,6 +74,17 @@ tester.run('expand-border-shorthand', expandBorderShorthand, {
 			const styles9 = css({
 				border: 0,
 			});
+			const styles10 = css({
+				border: 'var(--icon-border)',
+			});
+			const styles11 = css({
+				border: \`\${(props: { border?: boolean }) =>
+					props.border ? \`1px solid \${token('color.border.disabled', colors.N30)}\` : 'none'}\`,
+			});
+			const styles12 = css({
+				border: (props: { border?: boolean }) =>
+					props.border ? token('color.border.disabled', colors.N30) : 'none',
+			});
 		`,
 		},
 		{
@@ -91,9 +105,20 @@ tester.run('expand-border-shorthand', expandBorderShorthand, {
 			});
 		`,
 		},
+		{
+			name: 'cssMap case where border is assigned an ObjectExpression',
+			code: outdent`
+			import { cssMap } from '@compiled/react';
+
+			const borderStyleMap = cssMap({
+				none: { borderStyle: 'none' },
+				border: { borderStyle: 'solid' },
+			});
+		`,
+		},
 	],
 	invalid: [
-		...valid_packages_calls_and_imports.map(([pkg, call, imp]) => ({
+		...included_packages_calls_and_imports.map(([pkg, call, imp]) => ({
 			name: `simple case (${call}, ${imp})`,
 			code: outdent`
 			import {${pkg}} from '${imp}';
@@ -147,14 +172,6 @@ tester.run('expand-border-shorthand', expandBorderShorthand, {
 				border: \`1px solid red\`,
 			})
 
-			const styles2 = css({
-				border: \`1px solid \${token('red')}\`,
-			})
-
-			const styles3 = css({
-				border: \`1px \${solid} red\`,
-			})
-
 			const styles4 = css({
 				border: \`1px red\`,
 			})
@@ -162,12 +179,8 @@ tester.run('expand-border-shorthand', expandBorderShorthand, {
 			const styles5 = css({
 				border: \`1px\`,
 			})
-
-			const styles6 = css({
-				border: \` \${token('red')}\`,
-			})
 		`,
-			errors: Array.from(Array(6), () => ({ messageId: 'expandBorderShorthand' })),
+			errors: Array.from(Array(3), () => ({ messageId: 'expandBorderShorthand' })),
 		},
 		{
 			name: 'tokens',
@@ -182,5 +195,17 @@ tester.run('expand-border-shorthand', expandBorderShorthand, {
 		`,
 			errors: Array.from(Array(2), () => ({ messageId: 'expandBorderShorthand' })),
 		},
+		{
+			name: 'cssMap case where border is assigned an a Literal',
+			code: outdent`
+			import { cssMap } from '@compiled/react';
+
+			const borderStyleMap = cssMap({
+				none: { border: 'none' },
+				solid: { border: '1px solid blue' },
+			});
+			`,
+			errors: [{ messageId: 'expandBorderShorthand' }],
+		},
 	],
 });