@zayne-labs/eslint-config 0.9.12 → 0.9.14

package/dist/index.js

@@ -1,4 +1,4 @@
-import { assert, defineEnum, isObject as isObject$1 } from "@zayne-labs/toolkit-type-helpers";
+import { assert, defineEnum, isFunction, isObject as isObject$1 } from "@zayne-labs/toolkit-type-helpers";
 import { fileURLToPath } from "node:url";
 import { isPackageExists } from "local-pkg";
 import { globalIgnores } from "eslint/config";
@@ -24,7 +24,7 @@ const GLOB_JSON5 = "**/*.json5";
 const GLOB_JSONC = "**/*.jsonc";
 const GLOB_MARKDOWN = "**/*.md";
 const GLOB_MARKDOWN_IN_MARKDOWN = "**/*.md/*.md";
-const GLOB_SVELTE = "**/*.svelte";
+const GLOB_SVELTE = "**/*.svelte?(.{js,ts})";
 const GLOB_VUE = "**/*.vue";
 const GLOB_YAML = "**/*.y?(a)ml";
 const GLOB_TOML = "**/*.toml";
@@ -138,28 +138,89 @@ const renamePlugins = (plugins, renameMap) => {
 	});
 	return Object.fromEntries(renamedPluginEntries);
 };
+const getResolvedOverrides = (options) => {
+	const { configItem, overrides } = options;
+	return isFunction(overrides) ? overrides(configItem) : overrides;
+};
+/**
+* @description - Override configurations in a flat configs array with either a static config object or a function that returns a config object
+* @param options - Configuration options
+* @param options.configs - Array of flat config items to override
+* @param options.overrides - Either a config object to merge or a function that takes a config and returns overrides
+* @returns Array of merged config items with overrides applied
+*
+* @example
+* ```ts
+* import { overrideConfigs } from '@zayne-labs/eslint-config'
+*
+* // Override with static config
+* overrideConfigs({
+*   configArray: existingConfigs,
+*   overrides: {
+*     rules: {
+*       'no-console': 'error'
+*     }
+*   }
+* })
+*
+* // Override with function
+* overrideConfigs({
+*   configArray: existingConfigs,
+*   overrides: (config) => ({
+*     ...config,
+*     rules: {
+*       ...config.rules,
+*       'no-console': 'error'
+*     }
+*   })
+* })
+* ```
+*/
+const overrideConfigs = (options) => {
+	const { configArray, overrides } = options;
+	return configArray.map((configItem) => ({
+		...configItem,
+		...getResolvedOverrides({
+			configItem,
+			overrides
+		})
+	}));
+};
 /**
-* @description - Rename plugin names a flat configs array
+* @description - Rename plugin names and rules in a flat configs array
+*
+* @param options - Configuration options
+* @param options.configArray - Array of flat config items to process
+* @param options.overrides - Optional config overrides to apply
+* @param options.renameMap - Map of old plugin names to new names
 *
 * @example
 * ```ts
 * import { renamePluginInConfigs } from '@zayne-labs/eslint-config'
 * import someConfigs from './some-configs'
 *
-* export default renamePluginInConfigs(someConfigs, {
-*   '@typescript-eslint': 'ts',
-*   'import-x': 'import',
+* renamePluginInConfigs({
+*   configArray: someConfigs,
+*   renameMap: {
+*     '@typescript-eslint': 'ts',
+*     'import-x': 'import',
+*   }
 * })
 * ```
 */
 const renamePluginInConfigs = (options) => {
-	const { configs, overrides, renameMap } = options;
-	const renamedConfigs = configs.map((config) => ({
-		...config,
-		...overrides,
-		...isObject(config.plugins) && { plugins: renamePlugins(config.plugins, renameMap) },
-		...isObject(config.rules) && { rules: renameRules(config.rules, renameMap) }
-	}));
+	const { configArray, overrides, renameMap } = options;
+	const renamedConfigs = overrideConfigs({
+		configArray,
+		overrides: (configItem) => ({
+			...getResolvedOverrides({
+				configItem,
+				overrides
+			}),
+			...isObject(configItem.plugins) && { plugins: renamePlugins(configItem.plugins, renameMap) },
+			...isObject(configItem.rules) && { rules: renameRules(configItem.rules, renameMap) }
+		})
+	});
 	return renamedConfigs;
 };
 const scopeUrl = fileURLToPath(new URL(".", import.meta.url));
@@ -272,8 +333,11 @@ const depend = async (options = {}) => {
 const expo = async (options = {}) => {
 	const { overrides } = options;
 	await ensurePackages(["eslint-config-expo"]);
-	const eslintConfigExpo = await interopDefault(import("eslint-config-expo/flat/default.js"));
-	return [eslintConfigExpo, {
+	const eslintConfigExpo = await interopDefault(import("eslint-config-expo/flat/utils/expo.js"));
+	return [...overrideConfigs({
+		configArray: eslintConfigExpo,
+		overrides: { name: "zayne/expo/recommended" }
+	}), {
 		name: "zayne/expo/rules",
 		rules: { ...overrides }
 	}];
@@ -921,7 +985,7 @@ const defaultPluginRenameMap = defineEnum({
 	"@eslint-react/naming-convention": "react-naming-convention",
 	"@eslint-react/web-api": "react-web-api",
 	"@eslint-react": "react",
-	"@next/next": "nextjs-next",
+	"@next/next": "nextjs",
 	"@stylistic": "stylistic",
 	"@tanstack/query": "tanstack-query",
 	"@tanstack/router": "tanstack-router",
@@ -950,7 +1014,11 @@ const allowedReactRouterExportNames = [
 	"links",
 	"headers",
 	"loader",
-	"action"
+	"action",
+	"clientLoader",
+	"clientAction",
+	"handle",
+	"shouldRevalidate"
 ];
 
 //#endregion
@@ -1055,7 +1123,7 @@ const react = async (options = {}) => {
 	if (nextjs && eslintPluginNextjs) config.push({
 		files,
 		name: "zayne/react/nextjs",
-		plugins: { "nextjs-next": fixupPluginRules(eslintPluginNextjs) },
+		plugins: { nextjs: fixupPluginRules(eslintPluginNextjs) },
 		rules: renameRules({
 			...eslintPluginNextjs.configs?.recommended?.rules,
 			...eslintPluginNextjs.configs?.["core-web-vitals"]?.rules,
@@ -1205,7 +1273,7 @@ const sortPackageJson = () => [{
 * Requires `jsonc` config
 */
 const sortTsconfig = () => [{
-	files: ["**/tsconfig.json", "**/tsconfig.*.json"],
+	files: ["**/[jt]sconfig.json", "**/[jt]sconfig.*.json"],
 	name: "zayne/sort/tsconfig.json",
 	rules: { "jsonc/sort-keys": [
 		"error",
@@ -1527,7 +1595,7 @@ const typescript = async (options = {}) => {
 			...isTypeAware && makeParser(filesTypeAware, ignoresTypeAware)
 		},
 		...renamePluginInConfigs({
-			configs: tsEslint.configs[selectedBaseRuleSet],
+			configArray: tsEslint.configs[selectedBaseRuleSet],
 			overrides: {
 				files,
 				name: `zayne/ts-eslint/${selectedBaseRuleSet}`
@@ -1535,7 +1603,7 @@ const typescript = async (options = {}) => {
 			renameMap: { "@typescript-eslint": "ts-eslint" }
 		}),
 		...stylistic$1 ? renamePluginInConfigs({
-			configs: tsEslint.configs[selectedStylisticRuleSet],
+			configArray: tsEslint.configs[selectedStylisticRuleSet],
 			overrides: {
 				files,
 				name: `zayne/ts-eslint/${selectedStylisticRuleSet}`
@@ -1876,7 +1944,7 @@ const zayne = (options = {}, ...userConfigs) => {
 	const enableUnicorn = restOfOptions.unicorn ?? withDefaults;
 	const enableYaml = restOfOptions.yaml ?? withDefaults;
 	const isStylistic = Boolean(enableStylistic);
-	const tsconfigPath = isObject(enableTypeScript) && "tsconfigPath" in enableTypeScript ? enableTypeScript.tsconfigPath : restOfOptions.typescript === true ? true : null;
+	const tsconfigPath = isObject(enableTypeScript) && "tsconfigPath" in enableTypeScript ? enableTypeScript.tsconfigPath : enableTypeScript === true ? enableTypeScript : null;
 	const isTypeAware = Boolean(tsconfigPath);
 	const configs = [];
 	configs.push(ignores(restOfOptions.ignores), javascript(restOfOptions.javascript));
@@ -1959,5 +2027,5 @@ const zayne = (options = {}, ...userConfigs) => {
 };
 
 //#endregion
-export { GLOB_ALL_SRC, GLOB_ASTRO, GLOB_ASTRO_TS, GLOB_CSS, GLOB_EXCLUDE, GLOB_GRAPHQL, GLOB_HTML, GLOB_JS, GLOB_JSON, GLOB_JSON5, GLOB_JSONC, GLOB_JSX, GLOB_LESS, GLOB_MARKDOWN, GLOB_MARKDOWN_CODE, GLOB_MARKDOWN_IN_MARKDOWN, GLOB_POSTCSS, GLOB_SCSS, GLOB_SRC, GLOB_SRC_EXT, GLOB_STYLES, GLOB_SVELTE, GLOB_SVG, GLOB_TESTS, GLOB_TOML, GLOB_TS, GLOB_TSX, GLOB_VUE, GLOB_XML, GLOB_YAML, astro, combine, comments, depend, ensurePackages, expo, gitIgnores, ignores, imports, interopDefault, isObject, isPackageInScope, javascript, jsdoc, jsonc, node, perfectionist, pnpm, react, renamePluginInConfigs, renamePlugins, renameRules, resolveOptions, solid, sortPackageJson, sortTsconfig, stylistic, tailwindcssBetter, tanstack, toml, typescript, unicorn, vue, yaml, zayne };
+export { GLOB_ALL_SRC, GLOB_ASTRO, GLOB_ASTRO_TS, GLOB_CSS, GLOB_EXCLUDE, GLOB_GRAPHQL, GLOB_HTML, GLOB_JS, GLOB_JSON, GLOB_JSON5, GLOB_JSONC, GLOB_JSX, GLOB_LESS, GLOB_MARKDOWN, GLOB_MARKDOWN_CODE, GLOB_MARKDOWN_IN_MARKDOWN, GLOB_POSTCSS, GLOB_SCSS, GLOB_SRC, GLOB_SRC_EXT, GLOB_STYLES, GLOB_SVELTE, GLOB_SVG, GLOB_TESTS, GLOB_TOML, GLOB_TS, GLOB_TSX, GLOB_VUE, GLOB_XML, GLOB_YAML, allowedNextJsExportNames, allowedReactRouterExportNames, astro, combine, comments, defaultPluginRenameMap, depend, ensurePackages, expo, gitIgnores, ignores, imports, interopDefault, isObject, isPackageInScope, javascript, jsdoc, jsonc, node, overrideConfigs, perfectionist, pnpm, react, renamePluginInConfigs, renamePlugins, renameRules, resolveOptions, solid, sortPackageJson, sortTsconfig, stylistic, tailwindcssBetter, tanstack, toml, typescript, unicorn, vue, yaml, zayne };
 //# sourceMappingURL=index.js.map