@dvukovic/style-guide 0.11.0 → 0.13.0

package/src/eslint/configs/package-json.js

@@ -7,15 +7,15 @@ export const packageJsonConfigs = [packageJsonRules]
 /**
  * Package.json ESLint configuration
  *
- * @param {import("@eslint/config-helpers").ConfigWithExtends & { onlyFiles?: string[] }} [config]
+ * @param {import("@eslint/config-helpers").ConfigWithExtends & { additionalFiles?: string[] }} [config]
  * @returns {import("@eslint/config-helpers").ConfigWithExtends}
  */
 export function packageJson(config) {
-    const { extends: extendsConfig, files, onlyFiles, ...rest } = config ?? {}
+    const { additionalFiles, extends: extendsConfig, files, ...rest } = config ?? {}
 
     return {
         extends: [...packageJsonConfigs, ...(extendsConfig ?? [])],
-        files: onlyFiles ?? ["**/package.json", ...(files ?? [])],
+        files: files ?? ["**/package.json", ...(additionalFiles ?? [])],
         ...rest,
     }
 }
@@ -28,13 +28,16 @@ export function packageJson(config) {
  * - Root package.json: all rules including volta.node requirement
  * - Nested packages: same rules but no volta.node requirement
  *
- * @param {{ workspacePatterns?: string[] } & import("@eslint/config-helpers").ConfigWithExtends} [config]
+ * @param {{
+ *     workspacePatterns?: string[]
+ *     additionalFiles?: string[]
+ * } & import("@eslint/config-helpers").ConfigWithExtends} [config]
  * @returns {import("@eslint/config-helpers").ConfigWithExtends[]}
  */
 export function packageJsonWorkspace(config) {
     const {
+        additionalFiles,
         extends: extendsConfig,
-        files,
         workspacePatterns = DEFAULT_WORKSPACE_PATTERNS,
         ...rest
     } = config ?? {}
@@ -42,7 +45,7 @@ export function packageJsonWorkspace(config) {
     return [
         {
             extends: [...packageJsonConfigs, ...(extendsConfig ?? [])],
-            files: ["package.json", ...(files ?? [])],
+            files: ["package.json", ...(additionalFiles ?? [])],
             ...rest,
         },
         {

package/src/eslint/configs/playwright.js

@@ -5,17 +5,17 @@ export const playwrightConfig = [playwrightPlugin]
 /**
  * Playwright testing configuration
  *
- * @param {import("@eslint/config-helpers").ConfigWithExtends & { onlyFiles?: string[] }} [config]
+ * @param {import("@eslint/config-helpers").ConfigWithExtends & { additionalFiles?: string[] }} [config]
  *   - Additional config
  *
  * @returns {import("@eslint/config-helpers").ConfigWithExtends} ESLint config
  */
 export function playwright(config) {
-    const { extends: extendsConfig, files, onlyFiles, ...rest } = config ?? {}
+    const { additionalFiles, extends: extendsConfig, files, ...rest } = config ?? {}
 
     return {
         extends: [...playwrightConfig, ...(extendsConfig ?? [])],
-        files: onlyFiles ?? [
+        files: files ?? [
             "**/*.test.js",
             "**/*.test.ts",
             "**/*.spec.js",
@@ -26,7 +26,7 @@ export function playwright(config) {
             "**/*.int.test.ts",
             "**/*.integration.test.js",
             "**/*.integration.test.ts",
-            ...(files ?? []),
+            ...(additionalFiles ?? []),
         ],
         ...rest,
     }

package/src/eslint/configs/react.js

@@ -6,17 +6,17 @@ export const reactConfig = [reactPlugin, reactHooksPlugin]
 /**
  * React framework configuration
  *
- * @param {import("@eslint/config-helpers").ConfigWithExtends & { onlyFiles?: string[] }} [config]
+ * @param {import("@eslint/config-helpers").ConfigWithExtends & { additionalFiles?: string[] }} [config]
  *   - Additional config
  *
  * @returns {import("@eslint/config-helpers").ConfigWithExtends} ESLint config
  */
 export function react(config) {
-    const { extends: extendsConfig, files, onlyFiles, ...rest } = config ?? {}
+    const { additionalFiles, extends: extendsConfig, files, ...rest } = config ?? {}
 
     return {
         extends: [...reactConfig, ...(extendsConfig ?? [])],
-        files: onlyFiles ?? ["**/*.jsx", "**/*.tsx", ...(files ?? [])],
+        files: files ?? ["**/*.jsx", "**/*.tsx", ...(additionalFiles ?? [])],
         ...rest,
     }
 }

package/src/eslint/configs/storybook.js

@@ -3,7 +3,7 @@ import { storybook as storybookPlugin } from "../plugins/storybook.js"
 /**
  * Storybook ESLint configuration with relaxed rules for story files
  *
- * @param {import("@eslint/config-helpers").ConfigWithExtends & { onlyFiles?: string[] }} [config]
+ * @param {import("@eslint/config-helpers").ConfigWithExtends & { additionalFiles?: string[] }} [config]
  *   - Additional config
  *
  * @returns {import("@eslint/config-helpers").ConfigWithExtends} ESLint config
@@ -21,16 +21,16 @@ export function storybook(config) {
             },
         },
     ]
-    const { extends: extendsConfig, files, onlyFiles, ...rest } = config ?? {}
+    const { additionalFiles, extends: extendsConfig, files, ...rest } = config ?? {}
 
     return {
         extends: [...storybookConfig, ...(extendsConfig ?? [])],
-        files: onlyFiles ?? [
+        files: files ?? [
             "**/*.stories.js",
             "**/*.stories.ts",
             "**/*.stories.jsx",
             "**/*.stories.tsx",
-            ...(files ?? []),
+            ...(additionalFiles ?? []),
         ],
         ...rest,
     }

package/src/eslint/configs/typescript-strict.js

@@ -33,17 +33,17 @@ export const typescriptStrictConfig = [
 /**
  * Strict TypeScript ESLint configuration with additional safety rules
  *
- * @param {import("@eslint/config-helpers").ConfigWithExtends & { onlyFiles?: string[] }} [config]
+ * @param {import("@eslint/config-helpers").ConfigWithExtends & { additionalFiles?: string[] }} [config]
  *   - Additional config
  *
  * @returns {import("@eslint/config-helpers").ConfigWithExtends} ESLint config
  */
 export function typescriptStrict(config) {
-    const { extends: extendsConfig, files, onlyFiles, ...rest } = config ?? {}
+    const { additionalFiles, extends: extendsConfig, files, ...rest } = config ?? {}
 
     return {
         extends: [...typescriptStrictConfig, ...(extendsConfig ?? [])],
-        files: onlyFiles ?? ["**/*.ts", "**/*.tsx", "**/*.cts", "**/*.mts", ...(files ?? [])],
+        files: files ?? ["**/*.ts", "**/*.tsx", "**/*.cts", "**/*.mts", ...(additionalFiles ?? [])],
         ...rest,
     }
 }

package/src/eslint/configs/typescript.js

@@ -3,6 +3,7 @@ import tseslint from "typescript-eslint"
 import { typescriptEslint } from "../plugins/typescript-eslint.js"
 import { typescriptSortKeys } from "../plugins/typescript-sort-keys.js"
 
+/** @type {import("eslint").Linter.Config[]} */
 export const typescriptConfig = [
     {
         files: ["**/*.js", "**/*.ts", "**/*.tsx", "**/*.cjs"],
@@ -27,24 +28,24 @@ export const typescriptConfig = [
 /**
  * TypeScript ESLint configuration with parser setup and rules
  *
- * @param {import("@eslint/config-helpers").ConfigWithExtends & { onlyFiles?: string[] }} [config]
+ * @param {import("@eslint/config-helpers").ConfigWithExtends & { additionalFiles?: string[] }} [config]
  *   - Additional config
  *
  * @returns {import("@eslint/config-helpers").ConfigWithExtends} ESLint config
  */
 export function typescript(config) {
-    const { extends: extendsConfig, files, onlyFiles, ...rest } = config ?? {}
+    const { additionalFiles, extends: extendsConfig, files, ...rest } = config ?? {}
 
     return {
         extends: [...typescriptConfig, ...(extendsConfig ?? [])],
-        files: onlyFiles ?? [
+        files: files ?? [
             "**/*.js",
             "**/*.ts",
             "**/*.tsx",
             "**/*.cjs",
             "**/*.cts",
             "**/*.mts",
-            ...(files ?? []),
+            ...(additionalFiles ?? []),
         ],
         ...rest,
     }

package/src/eslint/configs/vitest.js

@@ -5,17 +5,17 @@ export const vitestConfig = [vitestPlugin]
 /**
  * Vitest testing framework configuration
  *
- * @param {import("@eslint/config-helpers").ConfigWithExtends & { onlyFiles?: string[] }} [config]
+ * @param {import("@eslint/config-helpers").ConfigWithExtends & { additionalFiles?: string[] }} [config]
  *   - Additional config
  *
  * @returns {import("@eslint/config-helpers").ConfigWithExtends} ESLint config
  */
 export function vitest(config) {
-    const { extends: extendsConfig, files, onlyFiles, ...rest } = config ?? {}
+    const { additionalFiles, extends: extendsConfig, files, ...rest } = config ?? {}
 
     return {
         extends: [...vitestConfig, ...(extendsConfig ?? [])],
-        files: onlyFiles ?? [
+        files: files ?? [
             "**/*.test.js",
             "**/*.test.ts",
             "**/*.spec.js",
@@ -26,7 +26,7 @@ export function vitest(config) {
             "**/*.int.test.ts",
             "**/*.integration.test.js",
             "**/*.integration.test.ts",
-            ...(files ?? []),
+            ...(additionalFiles ?? []),
         ],
         ...rest,
     }

package/src/eslint/index.js

@@ -4,41 +4,40 @@ import { defineConfig, globalIgnores } from "eslint/config"
 /**
  * Custom wrapper for ESLint defineConfig with simplified API
  *
- * @param {string[]} ignores - Paths to ignore
- * @param {Array} configs - Array of ESLint config objects
+ * @param {{ configs: Array; ignores?: string[]; defaultIgnores?: boolean }} options
  * @returns {Array} ESLint configuration
  */
-export function customDefineConfig(ignores, configs = []) {
-    return defineConfig(
-        globalIgnores([
-            "node_modules",
-            "./*.js",
-            "./*.ts",
-            "./*.cjs",
-            "./*.mjs",
-            "./*.config.js",
-            "./*.config.cjs",
-            "./*.config.mjs",
-            "next-env.d.ts",
-            ".next",
-            "**/__generated__/**",
-            "**/*.d.json.ts",
-            ...ignores,
-        ]),
-        ...configs,
-    )
+export function customDefineConfig({ configs, defaultIgnores = true, ignores = [] }) {
+    const defaultIgnorePatterns = defaultIgnores
+        ? [
+              "node_modules",
+              "./*.js",
+              "./*.ts",
+              "./*.cjs",
+              "./*.mjs",
+              "./*.config.js",
+              "./*.config.cjs",
+              "./*.config.mjs",
+              "next-env.d.ts",
+              ".next",
+              "**/__generated__/**",
+              "**/*.d.json.ts",
+          ]
+        : []
+
+    return defineConfig(globalIgnores([...defaultIgnorePatterns, ...ignores]), ...configs.flat())
 }
 
-export * from "./configs/aws.js"
-export * from "./configs/core.js"
-export * from "./configs/jest.js"
-export * from "./configs/mobx.js"
-export * from "./configs/next.js"
-export * from "./configs/node.js"
-export * from "./configs/package-json.js"
-export * from "./configs/playwright.js"
-export * from "./configs/react.js"
-export * from "./configs/storybook.js"
-export * from "./configs/typescript.js"
-export * from "./configs/typescript-strict.js"
-export * from "./configs/vitest.js"
+export { aws } from "./configs/aws.js"
+export { core } from "./configs/core.js"
+export { jest } from "./configs/jest.js"
+export { mobx } from "./configs/mobx.js"
+export { next } from "./configs/next.js"
+export { node } from "./configs/node.js"
+export { packageJson, packageJsonWorkspace } from "./configs/package-json.js"
+export { playwright } from "./configs/playwright.js"
+export { react } from "./configs/react.js"
+export { storybook } from "./configs/storybook.js"
+export { typescript } from "./configs/typescript.js"
+export { typescriptStrict } from "./configs/typescript-strict.js"
+export { vitest } from "./configs/vitest.js"

package/src/eslint/plugins/jest.js

@@ -37,6 +37,7 @@ export const jest = {
         "jest/no-disabled-tests": "error",
         "jest/no-done-callback": "error",
         "jest/no-duplicate-hooks": "error",
+        "jest/no-error-equal": "error",
         "jest/no-export": "error",
         "jest/no-focused-tests": "error",
         "jest/no-identical-title": "error",
@@ -46,6 +47,8 @@ export const jest = {
         "jest/no-standalone-expect": "error",
         "jest/no-test-prefixes": "error",
         "jest/no-test-return-statement": "error",
+        "jest/no-unnecessary-assertion": "error",
+        "jest/no-unneeded-async-expect-function": "error",
         "jest/no-untyped-mock-factory": "error",
         "jest/padding-around-after-all-blocks": "error",
         "jest/padding-around-after-each-blocks": "error",
@@ -64,6 +67,7 @@ export const jest = {
         "jest/prefer-jest-mocked": "error",
         "jest/prefer-lowercase-title": ["error", { ignoreTopLevelDescribe: true }],
         "jest/prefer-mock-promise-shorthand": "error",
+        "jest/prefer-mock-return-shorthand": "error",
         "jest/prefer-spy-on": "error",
         "jest/prefer-strict-equal": "error",
         "jest/prefer-to-be": "error",
@@ -78,6 +82,7 @@ export const jest = {
         "jest/valid-describe-callback": "error",
         "jest/valid-expect": "error",
         "jest/valid-expect-in-promise": "error",
+        "jest/valid-expect-with-promise": "error",
         "jest/valid-mock-module-path": "error",
         "jest/valid-title": "error",
     },

package/src/eslint/plugins/playwright.js

@@ -6,6 +6,7 @@ export const playwright = {
         playwright: plugin,
     },
     rules: {
+        "playwright/enforce-consistent-spacing-between-blocks": "error",
         "playwright/expect-expect": "error",
         "playwright/max-expects": ["error", { max: 15 }],
         "playwright/max-nested-describe": ["error", { max: 4 }],

package/src/eslint/plugins/vitest.js

@@ -93,6 +93,7 @@ export const vitest = {
         "@vitest/valid-expect": "error",
         "@vitest/valid-expect-in-promise": "error",
         "@vitest/valid-title": "error",
+        "@vitest/vitest/prefer-mock-return-shorthand": "error",
         "@vitest/warn-todo": "warn",
     },
 }

package/dist/eslint/configs/typescript.d.ts

@@ -1,24 +0,0 @@
-/**
- * TypeScript ESLint configuration with parser setup and rules
- *
- * @param {import("@eslint/config-helpers").ConfigWithExtends & { onlyFiles?: string[] }} [config]
- *   - Additional config
- *
- * @returns {import("@eslint/config-helpers").ConfigWithExtends} ESLint config
- */
-export function typescript(config?: import("@eslint/config-helpers").ConfigWithExtends & {
-    onlyFiles?: string[];
-}): import("@eslint/config-helpers").ConfigWithExtends;
-export const typescriptConfig: {
-    name?: string;
-    basePath?: string;
-    files: (string | string[])[];
-    ignores?: string[];
-    language?: string;
-    languageOptions?: import("@eslint/core").LanguageOptions;
-    linterOptions?: import("@eslint/core").LinterOptionsConfig;
-    processor?: string | import("@eslint/core").Processor;
-    plugins?: Record<string, import("@eslint/core").Plugin>;
-    rules?: Partial<import("@eslint/core").RulesConfig> | undefined;
-    settings?: Record<string, unknown>;
-}[];

package/dist/eslint/index.d.ts

@@ -1,21 +0,0 @@
-/**
- * Custom wrapper for ESLint defineConfig with simplified API
- *
- * @param {string[]} ignores - Paths to ignore
- * @param {Array} configs - Array of ESLint config objects
- * @returns {Array} ESLint configuration
- */
-export function customDefineConfig(ignores: string[], configs?: any[]): any[];
-export * from "./configs/aws.js";
-export * from "./configs/core.js";
-export * from "./configs/jest.js";
-export * from "./configs/mobx.js";
-export * from "./configs/next.js";
-export * from "./configs/node.js";
-export * from "./configs/package-json.js";
-export * from "./configs/playwright.js";
-export * from "./configs/react.js";
-export * from "./configs/storybook.js";
-export * from "./configs/typescript.js";
-export * from "./configs/typescript-strict.js";
-export * from "./configs/vitest.js";