@code-pushup/eslint-plugin 0.44.1 → 0.44.4

package/bin.js

@@ -1185,8 +1185,11 @@ import { join as join2 } from "node:path";
 import { ESLint } from "eslint";
 function setupESLint(eslintrc) {
   return new ESLint({
-    ...typeof eslintrc === "string" ? { overrideConfigFile: eslintrc } : { baseConfig: eslintrc },
-    useEslintrc: false,
+    ...typeof eslintrc === "string" && { overrideConfigFile: eslintrc },
+    ...typeof eslintrc === "object" && {
+      baseConfig: eslintrc,
+      useEslintrc: false
+    },
     errorOnUnmatchedPattern: false
   });
 }
@@ -1209,8 +1212,8 @@ function executeLint({
       command: "npx",
       args: [
         "eslint",
-        `--config=${configPath}`,
-        "--no-eslintrc",
+        ...configPath ? [`--config=${configPath}`] : [],
+        ...typeof eslintrc === "object" ? ["--no-eslintrc"] : [],
         "--no-error-on-unmatched-pattern",
         "--format=json",
         ...toArray(patterns).map(
@@ -1252,7 +1255,7 @@ function loadRuleOptionsPerFile(eslintrc, results) {
   }, Promise.resolve({}));
 }
 async function withConfig(eslintrc, fn) {
-  if (typeof eslintrc === "string") {
+  if (typeof eslintrc !== "object") {
     return fn(eslintrc);
   }
   const configPath = generateTempConfigPath();

package/index.js

@@ -4,7 +4,7 @@ import { fileURLToPath } from "node:url";
 
 // packages/plugin-eslint/package.json
 var name = "@code-pushup/eslint-plugin";
-var version = "0.44.1";
+var version = "0.44.4";
 
 // packages/plugin-eslint/src/lib/config.ts
 import { z as z16 } from "zod";
@@ -1107,20 +1107,25 @@ var { details: details3 } = html;
 import chalk4 from "chalk";
 
 // packages/plugin-eslint/src/lib/config.ts
-var eslintTargetSchema = z16.object({
-  eslintrc: z16.union(
-    [
-      z16.string({ description: "Path to ESLint config file" }),
-      z16.record(z16.string(), z16.unknown(), {
-        description: "ESLint config object"
-      })
-    ],
-    { description: "ESLint config as file path or inline object" }
-  ),
-  patterns: z16.union([z16.string(), z16.array(z16.string()).min(1)], {
-    description: "Lint target files. May contain file paths, directory paths or glob patterns"
-  })
+var patternsSchema = z16.union([z16.string(), z16.array(z16.string()).min(1)], {
+  description: "Lint target files. May contain file paths, directory paths or glob patterns"
 });
+var eslintrcSchema = z16.union(
+  [
+    z16.string({ description: "Path to ESLint config file" }),
+    z16.record(z16.string(), z16.unknown(), {
+      description: "ESLint config object"
+    })
+  ],
+  { description: "ESLint config as file path or inline object" }
+);
+var eslintTargetObjectSchema = z16.object({
+  eslintrc: eslintrcSchema.optional(),
+  patterns: patternsSchema
+});
+var eslintTargetSchema = z16.union([patternsSchema, eslintTargetObjectSchema]).transform(
+  (target) => typeof target === "string" || Array.isArray(target) ? { patterns: target } : target
+);
 var eslintPluginConfigSchema = z16.union([eslintTargetSchema, z16.array(eslintTargetSchema).min(1)]).transform(toArray);
 
 // packages/plugin-eslint/src/lib/meta/hash.ts
@@ -1140,8 +1145,11 @@ function jsonHash(data, bytes = 8) {
 import { ESLint } from "eslint";
 function setupESLint(eslintrc) {
   return new ESLint({
-    ...typeof eslintrc === "string" ? { overrideConfigFile: eslintrc } : { baseConfig: eslintrc },
-    useEslintrc: false,
+    ...typeof eslintrc === "string" && { overrideConfigFile: eslintrc },
+    ...typeof eslintrc === "object" && {
+      baseConfig: eslintrc,
+      useEslintrc: false
+    },
     errorOnUnmatchedPattern: false
   });
 }

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@code-pushup/eslint-plugin",
-  "version": "0.44.1",
+  "version": "0.44.4",
   "license": "MIT",
   "dependencies": {
-    "@code-pushup/utils": "0.44.1",
-    "@code-pushup/models": "0.44.1",
+    "@code-pushup/utils": "0.44.4",
+    "@code-pushup/models": "0.44.4",
     "eslint": "^8.46.0",
     "zod": "^3.22.4"
   },

package/src/lib/config.d.ts

@@ -1,44 +1,62 @@
 import type { ESLint } from 'eslint';
 import { type ZodType, z } from 'zod';
-export declare const eslintTargetSchema: z.ZodObject<{
-    eslintrc: z.ZodUnion<[z.ZodString, ZodType<ESLint.ConfigData<import("eslint").Linter.RulesRecord>, z.ZodTypeDef, ESLint.ConfigData<import("eslint").Linter.RulesRecord>>]>;
+export declare const eslintTargetSchema: z.ZodEffects<z.ZodUnion<[z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>, z.ZodObject<{
+    eslintrc: z.ZodOptional<z.ZodUnion<[z.ZodString, ZodType<ESLint.ConfigData<import("eslint").Linter.RulesRecord>, z.ZodTypeDef, ESLint.ConfigData<import("eslint").Linter.RulesRecord>>]>>;
     patterns: z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>;
 }, "strip", z.ZodTypeAny, {
-    eslintrc: (string | ESLint.ConfigData<import("eslint").Linter.RulesRecord>) & (string | ESLint.ConfigData<import("eslint").Linter.RulesRecord> | undefined);
     patterns: (string | string[]) & (string | string[] | undefined);
+    eslintrc?: string | ESLint.ConfigData<import("eslint").Linter.RulesRecord> | undefined;
 }, {
-    eslintrc: (string | ESLint.ConfigData<import("eslint").Linter.RulesRecord>) & (string | ESLint.ConfigData<import("eslint").Linter.RulesRecord> | undefined);
     patterns: (string | string[]) & (string | string[] | undefined);
+    eslintrc?: string | ESLint.ConfigData<import("eslint").Linter.RulesRecord> | undefined;
+}>]>, {
+    patterns: (string | string[]) & (string | string[] | undefined);
+    eslintrc?: string | ESLint.ConfigData<import("eslint").Linter.RulesRecord> | undefined;
+}, string | string[] | {
+    patterns: (string | string[]) & (string | string[] | undefined);
+    eslintrc?: string | ESLint.ConfigData<import("eslint").Linter.RulesRecord> | undefined;
 }>;
 export type ESLintTarget = z.infer<typeof eslintTargetSchema>;
-export declare const eslintPluginConfigSchema: z.ZodEffects<z.ZodUnion<[z.ZodObject<{
-    eslintrc: z.ZodUnion<[z.ZodString, ZodType<ESLint.ConfigData<import("eslint").Linter.RulesRecord>, z.ZodTypeDef, ESLint.ConfigData<import("eslint").Linter.RulesRecord>>]>;
+export declare const eslintPluginConfigSchema: z.ZodEffects<z.ZodUnion<[z.ZodEffects<z.ZodUnion<[z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>, z.ZodObject<{
+    eslintrc: z.ZodOptional<z.ZodUnion<[z.ZodString, ZodType<ESLint.ConfigData<import("eslint").Linter.RulesRecord>, z.ZodTypeDef, ESLint.ConfigData<import("eslint").Linter.RulesRecord>>]>>;
     patterns: z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>;
 }, "strip", z.ZodTypeAny, {
-    eslintrc: (string | ESLint.ConfigData<import("eslint").Linter.RulesRecord>) & (string | ESLint.ConfigData<import("eslint").Linter.RulesRecord> | undefined);
     patterns: (string | string[]) & (string | string[] | undefined);
+    eslintrc?: string | ESLint.ConfigData<import("eslint").Linter.RulesRecord> | undefined;
 }, {
-    eslintrc: (string | ESLint.ConfigData<import("eslint").Linter.RulesRecord>) & (string | ESLint.ConfigData<import("eslint").Linter.RulesRecord> | undefined);
     patterns: (string | string[]) & (string | string[] | undefined);
-}>, z.ZodArray<z.ZodObject<{
-    eslintrc: z.ZodUnion<[z.ZodString, ZodType<ESLint.ConfigData<import("eslint").Linter.RulesRecord>, z.ZodTypeDef, ESLint.ConfigData<import("eslint").Linter.RulesRecord>>]>;
+    eslintrc?: string | ESLint.ConfigData<import("eslint").Linter.RulesRecord> | undefined;
+}>]>, {
+    patterns: (string | string[]) & (string | string[] | undefined);
+    eslintrc?: string | ESLint.ConfigData<import("eslint").Linter.RulesRecord> | undefined;
+}, string | string[] | {
+    patterns: (string | string[]) & (string | string[] | undefined);
+    eslintrc?: string | ESLint.ConfigData<import("eslint").Linter.RulesRecord> | undefined;
+}>, z.ZodArray<z.ZodEffects<z.ZodUnion<[z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>, z.ZodObject<{
+    eslintrc: z.ZodOptional<z.ZodUnion<[z.ZodString, ZodType<ESLint.ConfigData<import("eslint").Linter.RulesRecord>, z.ZodTypeDef, ESLint.ConfigData<import("eslint").Linter.RulesRecord>>]>>;
     patterns: z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>;
 }, "strip", z.ZodTypeAny, {
-    eslintrc: (string | ESLint.ConfigData<import("eslint").Linter.RulesRecord>) & (string | ESLint.ConfigData<import("eslint").Linter.RulesRecord> | undefined);
     patterns: (string | string[]) & (string | string[] | undefined);
+    eslintrc?: string | ESLint.ConfigData<import("eslint").Linter.RulesRecord> | undefined;
 }, {
-    eslintrc: (string | ESLint.ConfigData<import("eslint").Linter.RulesRecord>) & (string | ESLint.ConfigData<import("eslint").Linter.RulesRecord> | undefined);
     patterns: (string | string[]) & (string | string[] | undefined);
+    eslintrc?: string | ESLint.ConfigData<import("eslint").Linter.RulesRecord> | undefined;
+}>]>, {
+    patterns: (string | string[]) & (string | string[] | undefined);
+    eslintrc?: string | ESLint.ConfigData<import("eslint").Linter.RulesRecord> | undefined;
+}, string | string[] | {
+    patterns: (string | string[]) & (string | string[] | undefined);
+    eslintrc?: string | ESLint.ConfigData<import("eslint").Linter.RulesRecord> | undefined;
 }>, "many">]>, {
-    eslintrc: (string | ESLint.ConfigData<import("eslint").Linter.RulesRecord>) & (string | ESLint.ConfigData<import("eslint").Linter.RulesRecord> | undefined);
     patterns: (string | string[]) & (string | string[] | undefined);
-}[], {
-    eslintrc: (string | ESLint.ConfigData<import("eslint").Linter.RulesRecord>) & (string | ESLint.ConfigData<import("eslint").Linter.RulesRecord> | undefined);
+    eslintrc?: string | ESLint.ConfigData<import("eslint").Linter.RulesRecord> | undefined;
+}[], string | string[] | {
     patterns: (string | string[]) & (string | string[] | undefined);
-} | {
-    eslintrc: (string | ESLint.ConfigData<import("eslint").Linter.RulesRecord>) & (string | ESLint.ConfigData<import("eslint").Linter.RulesRecord> | undefined);
+    eslintrc?: string | ESLint.ConfigData<import("eslint").Linter.RulesRecord> | undefined;
+} | (string | string[] | {
     patterns: (string | string[]) & (string | string[] | undefined);
-}[]>;
+    eslintrc?: string | ESLint.ConfigData<import("eslint").Linter.RulesRecord> | undefined;
+})[]>;
 export type ESLintPluginConfig = z.input<typeof eslintPluginConfigSchema>;
 export type ESLintPluginRunnerConfig = {
     targets: ESLintTarget[];

package/src/lib/nx/utils.d.ts

@@ -1,4 +1,4 @@
 import type { ProjectConfiguration } from '@nx/devkit';
 export declare function findCodePushupEslintrc(project: ProjectConfiguration): Promise<string | null>;
 export declare function getLintFilePatterns(project: ProjectConfiguration): string[];
-export declare function getEslintConfig(project: ProjectConfiguration): string;
+export declare function getEslintConfig(project: ProjectConfiguration): string | undefined;