@codacy/tools-detekt-1 0.6.2 → 0.8.0

package/dist/index.js

@@ -1752,7 +1752,8 @@ var patterns_default = [
     title: "Avoid Redundant Suspend Modifier",
     enabled: false,
     languages: ["Kotlin"],
-    parameters: []
+    parameters: [],
+    tags: ["coroutines"]
   },
   {
     id: "RedundantVisibilityModifierRule",
@@ -1824,7 +1825,8 @@ var patterns_default = [
     title: "Avoid Usage of Thread.sleep() in Coroutines",
     enabled: false,
     languages: ["Kotlin"],
-    parameters: []
+    parameters: [],
+    tags: ["coroutines"]
   },
   {
     id: "SpacingAroundAngleBrackets",
@@ -2013,7 +2015,8 @@ var patterns_default = [
     title: "Avoid Using runCatching with suspend Lambda Blocks",
     enabled: false,
     languages: ["Kotlin"],
-    parameters: []
+    parameters: [],
+    tags: ["coroutines"]
   },
   {
     id: "SuspendFunWithCoroutineScopeReceiver",
@@ -2022,7 +2025,8 @@ var patterns_default = [
     title: "Avoid suspend modifier on functions with CoroutineScope receiver",
     enabled: false,
     languages: ["Kotlin"],
-    parameters: []
+    parameters: [],
+    tags: ["coroutines"]
   },
   {
     id: "SuspendFunWithFlowReturnType",
@@ -2031,7 +2035,8 @@ var patterns_default = [
     title: "Avoid suspend modifier on functions returning Flow",
     enabled: false,
     languages: ["Kotlin"],
-    parameters: []
+    parameters: [],
+    tags: ["coroutines"]
   },
   {
     id: "SwallowedException",
@@ -2727,6 +2732,8 @@ var TOOL_ID = "detekt";
 var DETEKT_VERSION = "1.23.8";
 var JAR_NAME = `detekt-cli-${DETEKT_VERSION}-all.jar`;
 var JAR_URL = `https://github.com/detekt/detekt/releases/download/v${DETEKT_VERSION}/${JAR_NAME}`;
+var FORMATTING_JAR_NAME = `detekt-formatting-${DETEKT_VERSION}.jar`;
+var FORMATTING_JAR_URL = `https://github.com/detekt/detekt/releases/download/v${DETEKT_VERSION}/${FORMATTING_JAR_NAME}`;
 var JAVA_VERSION_RANGE = ">=8";
 var PATTERN_META = new Map(
   patterns_default.map((p) => [
@@ -2737,6 +2744,152 @@ var PATTERN_META = new Map(
     }
   ])
 );
+var PATTERN_ID_ALIASES = /* @__PURE__ */ new Map([
+  ["ClassNaming", "ClassName"],
+  ["EnumNaming", "EnumEntryNameCase"],
+  ["NewLineAtEndOfFile", "FinalNewline"],
+  ["FunctionNaming", "FunctionName"],
+  ["MaxLineLength", "MaximumLineLength"],
+  ["ModifierOrder", "ModifierOrdering"],
+  ["EmptyClassBlock", "NoEmptyClassBody"],
+  ["PackageNaming", "PackageName"],
+  ["VariableNaming", "PropertyName"]
+]);
+var FORMATTING_RULES = /* @__PURE__ */ new Set([
+  "AnnotationOnSeparateLine",
+  "AnnotationSpacing",
+  "ArgumentListWrapping",
+  "BlockCommentInitialStarAlignment",
+  "CascadingCallWrapping",
+  "ChainWrapping",
+  "ClassName",
+  "CommentSpacing",
+  "CommentWrapping",
+  "EnumEntryNameCase",
+  "EnumWrapping",
+  "Filename",
+  "FinalNewline",
+  "FunKeywordSpacing",
+  "FunctionName",
+  "FunctionReturnTypeSpacing",
+  "FunctionSignature",
+  "FunctionStartOfBodySpacing",
+  "FunctionTypeReferenceSpacing",
+  "IfElseBracing",
+  "IfElseWrapping",
+  "ImportOrdering",
+  "Indentation",
+  "KdocWrapping",
+  "MandatoryBracesLoops",
+  "MaximumLineLength",
+  "ModifierListSpacing",
+  "ModifierOrdering",
+  "MultiLineIfElse",
+  "MultilineExpressionWrapping",
+  "NoBlankLineBeforeRbrace",
+  "NoBlankLineInList",
+  "NoBlankLinesInChainedMethodCalls",
+  "NoConsecutiveBlankLines",
+  "NoConsecutiveComments",
+  "NoEmptyClassBody",
+  "NoEmptyFirstLineInClassBody",
+  "NoEmptyFirstLineInMethodBlock",
+  "NoLineBreakAfterElse",
+  "NoLineBreakBeforeAssignment",
+  "NoMultipleSpaces",
+  "NoSemicolons",
+  "NoSingleLineBlockComment",
+  "NoTabs",
+  "NoTrailingSpaces",
+  "NoUnusedImports",
+  "NoWildcardImports",
+  "NullableTypeSpacing",
+  "PackageName",
+  "ParameterListSpacing",
+  "ParameterListWrapping",
+  "ParameterWrapping",
+  "PropertyName",
+  "PropertyWrapping",
+  "SpacingAroundAngleBrackets",
+  "SpacingAroundColon",
+  "SpacingAroundComma",
+  "SpacingAroundCurly",
+  "SpacingAroundDot",
+  "SpacingAroundDoubleColon",
+  "SpacingAroundKeyword",
+  "SpacingAroundOperators",
+  "SpacingAroundParens",
+  "SpacingAroundRangeOperator",
+  "SpacingAroundUnaryOperator",
+  "SpacingBetweenDeclarationsWithAnnotations",
+  "SpacingBetweenDeclarationsWithComments",
+  "SpacingBetweenFunctionNameAndOpeningParenthesis",
+  "StringTemplate",
+  "StringTemplateIndent",
+  "TrailingCommaOnCallSite",
+  "TrailingCommaOnDeclarationSite",
+  "TrailingWhitespace",
+  "TryCatchFinallySpacing",
+  "TypeArgumentListSpacing",
+  "TypeParameterListSpacing",
+  "UnnecessaryParenthesesBeforeTrailingLambda",
+  "Wrapping"
+]);
+var TYPE_RESOLUTION_RULES = /* @__PURE__ */ new Set([
+  "CanBeNonNullable",
+  "CastNullableToNonNullableType",
+  "CastToNullableType",
+  "CouldBeSequence",
+  "DontDowncastCollectionTypes",
+  "ElseCaseInsteadOfExhaustiveWhen",
+  "ExitOutsideMain",
+  "ExplicitCollectionElementAccessMethod",
+  "GlobalCoroutineUsage",
+  "HasPlatformType",
+  "IgnoredReturnValue",
+  "ImplicitDefaultLocale",
+  "ImplicitUnitReturnType",
+  "InjectDispatcher",
+  "LibraryCodeMustSpecifyReturnType",
+  "LibraryEntitiesShouldNotBePublic",
+  "MapGetWithNotNullAssertionOperator",
+  "MayBeConst",
+  "MissingWhenCase",
+  "NullCheckOnMutableProperty",
+  "NullableToStringCall",
+  "ObjectExtendsThrowable",
+  "ObjectLiteralToLambda",
+  "RedundantExplicitType",
+  "RedundantHigherOrderMapUsage",
+  "RedundantSuspendModifier",
+  "RedundantVisibilityModifierRule",
+  "SleepInsteadOfDelay",
+  "SpreadOperator",
+  "SuspendFunSwallowedCancellation",
+  "SuspendFunWithCoroutineScopeReceiver",
+  "SuspendFunWithFlowReturnType",
+  "UnconditionalJumpStatementInLoop",
+  "UnnecessaryAbstractClass",
+  "UnnecessaryAnnotationUseSiteTarget",
+  "UnnecessaryBackticks",
+  "UnnecessaryFilter",
+  "UnnecessaryInnerClass",
+  "UnnecessaryLet",
+  "UnnecessaryNotNullCheck",
+  "UnnecessaryNotNullOperator",
+  "UnnecessaryPartOfBinaryExpression",
+  "UnnecessarySafeCall",
+  "UnnecessaryTemporaryInstantiation",
+  "UnreachableCatchBlock",
+  "UnreachableCode",
+  "UnsafeCallOnNullableType",
+  "UnsafeCast",
+  "UseIfEmptyOrIfBlank",
+  "UseIsNullOrEmpty",
+  "UseSumOfInsteadOfFlatMapSize",
+  "UselessCallOnNotNull",
+  "VarCouldBeVal"
+]);
 function ruleMetadata(ruleId) {
   return PATTERN_META.get(ruleId) ?? { category: "CodeStyle", severity: "Info" };
 }
@@ -2757,23 +2910,36 @@ function extractRuleId(source) {
   }
   return ruleId;
 }
-async function resolveJavaPath(ctx) {
-  const jreDir = import_path.default.join(ctx.globalDir, "runtimes", "java-17");
-  const javaBin = import_path.default.join(jreDir, "bin", "java");
+async function resolveFormattingJarPath(ctx) {
+  const jarPath = import_path.default.join(ctx.toolInstallDir, FORMATTING_JAR_NAME);
   try {
-    await import_promises.default.access(javaBin);
-    return javaBin;
+    await import_promises.default.access(jarPath);
+    return jarPath;
   } catch {
+    return null;
   }
-  if (process.env.JAVA_HOME) {
-    const javaHome = import_path.default.join(process.env.JAVA_HOME, "bin", "java");
+}
+var CLASSPATH_CANDIDATES = [
+  "build/classes/kotlin/main",
+  "build/classes/java/main",
+  "target/classes"
+];
+async function resolveClasspath(ctx) {
+  const found = [];
+  for (const candidate of CLASSPATH_CANDIDATES) {
+    const fullPath = import_path.default.join(ctx.repositoryRoot, candidate);
     try {
-      await import_promises.default.access(javaHome);
-      return javaHome;
+      await import_promises.default.access(fullPath);
+      found.push(fullPath);
     } catch {
     }
   }
-  return "java";
+  if (found.length === 0) return null;
+  ctx.logger.debug("Resolved classpath for type resolution", {
+    toolId: TOOL_ID,
+    paths: found
+  });
+  return found.join(import_path.default.delimiter);
 }
 async function resolveJarPath(ctx) {
   const jarPath = import_path.default.join(ctx.toolInstallDir, JAR_NAME);
@@ -2787,6 +2953,7 @@ async function resolveJarPath(ctx) {
 var CONFIG_FILE_CANDIDATES = ["detekt.yml", "default-detekt-config.yml"];
 var adapter = {
   ...descriptor,
+  patternsMetadata: patterns_default,
   compatibleVersions: ">=1.20.0",
   website: "https://detekt.dev/",
   prerequisites: [
@@ -2800,35 +2967,24 @@ var adapter = {
   /**
    * Checks whether detekt is available (Java runtime + detekt JAR).
    *
-   * Checks:
-   * 1. Java runtime via findJava (JAVA_HOME, then PATH)
-   * 2. detekt CLI JAR in the tool install directory
-   *
+   * Uses checkJavaRuntime() to probe managed JRE, JAVA_HOME, and PATH.
    * Reports Java as a dependency in the return value.
    */
   async checkAvailability(ctx) {
     ctx.logger.debug("Checking availability", { toolId: TOOL_ID });
-    const javaInfo = await (0, import_tooling.findJava)(JAVA_VERSION_RANGE, ctx.logger).catch(() => null);
-    const dependencies = javaInfo ? [{ name: "Java", available: true, version: javaInfo.version, installation: "global" }] : [{ name: "Java", available: false, reason: `Java (${JAVA_VERSION_RANGE}) not found` }];
+    const { java: javaInfo, dependency: javaDep } = await (0, import_tooling.checkJavaRuntime)(
+      ctx.globalDir,
+      JAVA_VERSION_RANGE,
+      ctx.logger
+    );
+    const dependencies = [javaDep];
     if (!javaInfo) {
-      const jreDir = import_path.default.join(ctx.globalDir, "runtimes", "java-17");
-      const javaBin = import_path.default.join(jreDir, "bin", "java");
-      try {
-        await import_promises.default.access(javaBin);
-        dependencies[0] = {
-          name: "Java",
-          available: true,
-          version: "17",
-          installation: "codacy"
-        };
-      } catch {
-        return {
-          available: false,
-          reason: "Java runtime not found (required for detekt)",
-          installHint: "Install JDK 17+, or run with --install-dependencies for auto-download",
-          dependencies
-        };
-      }
+      return {
+        available: false,
+        reason: "Java runtime not found (required for detekt)",
+        installHint: "Install JDK 8+ (17 recommended), or run with --install-dependencies for auto-download",
+        dependencies
+      };
     }
     const jarPath = await resolveJarPath(ctx);
     if (jarPath) {
@@ -2875,6 +3031,9 @@ var adapter = {
       ctx.logger.info(`Downloading detekt CLI JAR to ${ctx.toolInstallDir}...`);
       const jarPath = await (0, import_tooling.downloadJar)(JAR_URL, ctx.toolInstallDir, JAR_NAME, ctx.logger);
       ctx.logger.info(`Installed detekt to ${jarPath}`);
+      ctx.logger.info(`Downloading detekt-formatting plugin JAR...`);
+      await (0, import_tooling.downloadJar)(FORMATTING_JAR_URL, ctx.toolInstallDir, FORMATTING_JAR_NAME, ctx.logger);
+      ctx.logger.info(`Installed detekt-formatting plugin`);
       return { success: true, installedPath: jarPath, installedVersion: DETEKT_VERSION };
     } catch (err) {
       return {
@@ -2939,7 +3098,21 @@ var adapter = {
     if (ctx.targetFiles.length === 0) {
       return (0, import_tooling.buildResult)(TOOL_ID, startedAt, /* @__PURE__ */ new Date(), issues, errors, 0);
     }
-    const javaBin = await resolveJavaPath(ctx);
+    const classpath = await resolveClasspath(ctx);
+    if (codacyConfig.patterns.length > 0) {
+      const typeResPatterns = codacyConfig.patterns.map((p) => p.patternId).filter((id) => TYPE_RESOLUTION_RULES.has(id));
+      if (typeResPatterns.length > 0 && !classpath) {
+        errors.push({
+          toolId: TOOL_ID,
+          phase: "toolConfig",
+          kind: "ParseWarning",
+          message: `${typeResPatterns.length} pattern(s) require type resolution but no compiled classes found (build/classes/ or target/classes/): ${typeResPatterns.slice(0, 5).join(", ")}${typeResPatterns.length > 5 ? ` and ${typeResPatterns.length - 5} more` : ""}. Build the project first to enable these patterns.`,
+          level: "warning"
+        });
+      }
+    }
+    const resolved = await (0, import_tooling.resolveJava)(ctx.globalDir, JAVA_VERSION_RANGE, ctx.logger);
+    const javaBin = resolved?.path ?? "java";
     const jarPath = await resolveJarPath(ctx);
     if (!jarPath) {
       errors.push({
@@ -2970,6 +3143,25 @@ var adapter = {
     if (useLocal) {
       args.push("--config", codacyConfig.localConfigurationFile);
     }
+    if (classpath) {
+      args.push("--classpath", classpath);
+    }
+    const hasFormattingRules = codacyConfig.patterns.some((p) => FORMATTING_RULES.has(p.patternId));
+    if (hasFormattingRules) {
+      const formattingJar = await resolveFormattingJarPath(ctx);
+      if (formattingJar) {
+        args.push("--plugins", formattingJar);
+      } else {
+        const formattingPatterns = codacyConfig.patterns.map((p) => p.patternId).filter((id) => FORMATTING_RULES.has(id));
+        errors.push({
+          toolId: TOOL_ID,
+          phase: "toolConfig",
+          kind: "ParseWarning",
+          message: `detekt-formatting plugin JAR not found; ${formattingPatterns.length} formatting pattern(s) will not produce findings: ${formattingPatterns.slice(0, 5).join(", ")}${formattingPatterns.length > 5 ? ` and ${formattingPatterns.length - 5} more` : ""}. Re-run install to download the plugin.`,
+          level: "warning"
+        });
+      }
+    }
     try {
       const { stderr, exitCode } = await (0, import_tooling.spawnTool)(javaBin, args, {
         cwd: ctx.repositoryRoot,
@@ -3034,13 +3226,13 @@ var adapter = {
           const source = error["@_source"] ?? "";
           const ruleId = extractRuleId(source);
           if (!ruleId) continue;
-          const patternId = ruleId;
-          if (enabledPatterns.size > 0 && !enabledPatterns.has(patternId)) {
+          const patternId = PATTERN_ID_ALIASES.get(ruleId) ?? ruleId;
+          if (enabledPatterns.size > 0 && !enabledPatterns.has(patternId) && !enabledPatterns.has(ruleId)) {
             continue;
           }
           const line = parseInt(error["@_line"], 10) || 1;
           const column = parseInt(error["@_column"] ?? "1", 10) || 1;
-          const meta = ruleMetadata(ruleId);
+          const meta = ruleMetadata(patternId);
           issues.push({
             filePath: relPath,
             patternId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codacy/tools-detekt-1",
-  "version": "0.6.2",
+  "version": "0.8.0",
   "description": "detekt adapter — CLI-mode Kotlin static analyzer",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -9,7 +9,7 @@
   ],
   "dependencies": {
     "fast-xml-parser": "^5.5.6",
-    "@codacy/tooling": "0.6.2"
+    "@codacy/tooling": "0.8.0"
   },
   "license": "MIT",
   "author": "Codacy <support@codacy.com> (https://www.codacy.com)",