@spinnaker/eslint-plugin 2025.0.6 → 2025.1.1

package/base.config.js

@@ -18,7 +18,7 @@ module.exports = {
     '@spinnaker/ng-no-module-export': 2,
     '@spinnaker/ng-no-require-angularjs': 2,
     '@spinnaker/ng-no-require-module-deps': 2,
-    '@spinnaker/ng-strictdi': 2,
+    '@spinnaker/ng-strictdi': 'off', // TODO: this rule seems to be broken, needs to be rewritten to avoid an error
     '@spinnaker/prefer-promise-like': 1,
     '@spinnaker/react2angular-with-error-boundary': 2,
     '@spinnaker/rest-prefer-static-strings-in-initializer': 2,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spinnaker/eslint-plugin",
-  "version": "2025.0.6",
+  "version": "2025.1.1",
   "main": "index.js",
   "license": "Apache-2.0",
   "publishConfig": {
@@ -24,18 +24,18 @@
     "@types/jest": "^26.0.24",
     "@types/lodash": "^4.14.165",
     "@types/node": "^16.4.13",
-    "@typescript-eslint/parser": "^4.29.1",
-    "@typescript-eslint/types": "^4.29.1",
-    "eslint": "^7.32.0",
+    "@typescript-eslint/parser": "5.59.8",
+    "@typescript-eslint/types": "5.59.8",
+    "eslint": "7.32.0",
     "fast-glob": "^3.2.7",
     "jest": "^27.0.6",
     "prettier": "*",
-    "typescript": "^4.3.5"
+    "typescript": "5.0.4"
   },
   "peerDependencies": {
-    "@typescript-eslint/eslint-plugin": "4.4.0",
-    "@typescript-eslint/parser": "4.4.0",
-    "eslint": "7.10.0",
+    "@typescript-eslint/eslint-plugin": "5.59.8",
+    "@typescript-eslint/parser": "5.59.8",
+    "eslint": "7.32.0",
     "eslint-config-prettier": "6.12.0",
     "eslint-plugin-react-hooks": "4.1.2"
   },
@@ -48,8 +48,9 @@
   ],
   "jest": {
     "testPathIgnorePatterns": [
-      "<rootDir>/template"
+      "<rootDir>/template",
+      "<rootDir>/rules/ng-strictdi.spec.ts"
     ]
   },
-  "gitHead": "9f1607115a075e95b75864f2304adb6c67157e86"
+  "gitHead": "69afffd9c232790ea4ae706269583e6f375610dc"
 }

package/rules/api-deprecation.ts

@@ -2,6 +2,7 @@ import type { Rule } from 'eslint';
 import type { CallExpression, ImportDeclaration, ImportSpecifier, MemberExpression, Node } from 'estree';
 import * as _ from 'lodash/fp';
 
+import { getImportName } from '../utils/ast';
 import {
   getCallChain,
   getCallingIdentifier,
@@ -171,7 +172,7 @@ function reportAPIDeprecatedUseREST(node: Node, context: Rule.RuleContext, callC
     .reduce((acc, x) => acc.concat(x), []) as ImportSpecifier[]; //flatten
 
   const apiImport = importSpecifiers.find((specifier) => {
-    return specifier.imported && specifier.imported?.name === 'API';
+    return specifier.imported && getImportName(specifier.imported) === 'API';
   });
 
   return context.report({

package/rules/import-from-presentation-not-core.ts

@@ -1,5 +1,6 @@
 import type { Rule } from 'eslint';
 import type { ImportDeclaration, ImportSpecifier } from 'estree';
+import { getImportName } from '../utils/ast';
 
 const migratedPresentationModules = ['Icon', 'IconNames', 'Illustration', 'IllustrationName'];
 
@@ -38,9 +39,9 @@ const addImportToPresentation = (
 
   // Use the alias if it is available in the old import specifier.
   const importSpecifierText =
-    importSpecifierNode.local.name === importSpecifierNode.imported.name
-      ? importSpecifierNode.imported.name
-      : `${importSpecifierNode.imported.name} as ${importSpecifierNode.local.name}`;
+    importSpecifierNode.local.name === getImportName(importSpecifierNode.imported)
+      ? getImportName(importSpecifierNode.imported)
+      : `${getImportName(importSpecifierNode.imported)} as ${importSpecifierNode.local.name}`;
 
   // Check if @spinnaker/presentation is already imported.
   const spinnakerPresentationImport = sourceCode.ast.body.find(
@@ -76,10 +77,10 @@ const rule = (context: Rule.RuleContext) => {
   return {
     ImportSpecifier(node: ImportSpecifier & Rule.NodeParentExtension) {
       if (
-        migratedPresentationModules.includes(node.imported.name) &&
+        migratedPresentationModules.includes(getImportName(node.imported)) &&
         (node.parent as ImportDeclaration).source.value === '@spinnaker/core'
       ) {
-        const message = `${node.imported.name} must be imported from @spinnaker/presentation`;
+        const message = `${getImportName(node.imported)} must be imported from @spinnaker/presentation`;
         const fix = (fixer) => moveImportToPresentation(context, node, fixer);
         context.report({
           node,

package/rules/import-sort.ts

@@ -1,5 +1,6 @@
 import type { Rule } from 'eslint';
 import type { ImportDeclaration, ImportDefaultSpecifier, ImportNamespaceSpecifier, ImportSpecifier } from 'estree';
+import { getImportName } from '../utils/ast';
 
 const CSS_IMPORT = /\.(css|less|scss|sass)$/;
 const MODULE_PATH_REGEX = /[./]*(.*)$/;
@@ -58,7 +59,7 @@ const sortImportSpecifiers = (importDeclaration: ImportDeclaration) => {
     return importDeclaration;
   }
 
-  importSpecifiers.sort((a, b) => a.imported.name.localeCompare(b.imported.name));
+  importSpecifiers.sort((a, b) => getImportName(a.imported).localeCompare(getImportName(b.imported)));
 
   importDeclaration.specifiers = [defaultSpecifier, namespaceSpecifier, ...importSpecifiers].filter(
     (specifier) => !!specifier,

package/rules/migrate-to-mock-http-client.ts

@@ -1,6 +1,7 @@
 import type { Rule } from 'eslint';
 import type { FunctionExpression, ImportDeclaration, ImportSpecifier } from 'estree';
 
+import { getImportName } from '../utils/ast';
 import { getProgram } from '../utils/utils';
 
 const ruleModule: Rule.RuleModule = {
@@ -46,7 +47,7 @@ const ruleModule: Rule.RuleModule = {
                   .reduce((acc, x) => acc.concat(x), []);
 
                 const mockHttpClientImport = importSpecifiers.find((specifier) => {
-                  return specifier.imported && specifier.imported.name === 'mockHttpClient';
+                  return specifier.imported && getImportName(specifier.imported) === 'mockHttpClient';
                 });
 
                 return context.report({

package/utils/ast.ts

@@ -0,0 +1,11 @@
+import type { Identifier, Literal } from 'estree';
+
+export function getImportName(node: Identifier | Literal): string {
+  if (node.type === 'Identifier') {
+    return node.name;
+  }
+  if (node.type === 'Literal' && typeof node.value === 'string') {
+    return node.value;
+  }
+  return '';
+}