@eslint-react/shared 1.23.2-next.2 → 1.23.2-next.3

package/dist/index.d.mts

@@ -583,140 +583,6 @@ interface ESLintReactSettingsNormalized extends ESLintReactSettings {
     version: string;
 }
 
-/**
-Matches any [primitive value](https://developer.mozilla.org/en-US/docs/Glossary/Primitive).
-
-@category Type
-*/
-type Primitive =
-	| null
-	| undefined
-	| string
-	| number
-	| boolean
-	| symbol
-	| bigint;
-
-declare global {
-	// eslint-disable-next-line @typescript-eslint/consistent-type-definitions -- It has to be an `interface` so that it can be merged.
-	interface SymbolConstructor {
-		readonly observable: symbol;
-	}
-}
-
-/**
-Matches any primitive, `void`, `Date`, or `RegExp` value.
-*/
-type BuiltIns = Primitive | void | Date | RegExp;
-
-/**
-@see PartialDeep
-*/
-type PartialDeepOptions = {
-	/**
-	Whether to affect the individual elements of arrays and tuples.
-
-	@default false
-	*/
-	readonly recurseIntoArrays?: boolean;
-};
-
-/**
-Create a type from another type with all keys and nested keys set to optional.
-
-Use-cases:
-- Merging a default settings/config object with another object, the second object would be a deep partial of the default object.
-- Mocking and testing complex entities, where populating an entire object with its keys would be redundant in terms of the mock or test.
-
-@example
-```
-import type {PartialDeep} from 'type-fest';
-
-const settings: Settings = {
-	textEditor: {
-		fontSize: 14;
-		fontColor: '#000000';
-		fontWeight: 400;
-	}
-	autocomplete: false;
-	autosave: true;
-};
-
-const applySavedSettings = (savedSettings: PartialDeep<Settings>) => {
-	return {...settings, ...savedSettings};
-}
-
-settings = applySavedSettings({textEditor: {fontWeight: 500}});
-```
-
-By default, this does not affect elements in array and tuple types. You can change this by passing `{recurseIntoArrays: true}` as the second type argument:
-
-```
-import type {PartialDeep} from 'type-fest';
-
-interface Settings {
-	languages: string[];
-}
-
-const partialSettings: PartialDeep<Settings, {recurseIntoArrays: true}> = {
-	languages: [undefined]
-};
-```
-
-@category Object
-@category Array
-@category Set
-@category Map
-*/
-type PartialDeep<T, Options extends PartialDeepOptions = {}> = T extends BuiltIns | (((...arguments_: any[]) => unknown)) | (new (...arguments_: any[]) => unknown)
-	? T
-	: T extends Map<infer KeyType, infer ValueType>
-		? PartialMapDeep<KeyType, ValueType, Options>
-		: T extends Set<infer ItemType>
-			? PartialSetDeep<ItemType, Options>
-			: T extends ReadonlyMap<infer KeyType, infer ValueType>
-				? PartialReadonlyMapDeep<KeyType, ValueType, Options>
-				: T extends ReadonlySet<infer ItemType>
-					? PartialReadonlySetDeep<ItemType, Options>
-					: T extends object
-						? T extends ReadonlyArray<infer ItemType> // Test for arrays/tuples, per https://github.com/microsoft/TypeScript/issues/35156
-							? Options['recurseIntoArrays'] extends true
-								? ItemType[] extends T // Test for arrays (non-tuples) specifically
-									? readonly ItemType[] extends T // Differentiate readonly and mutable arrays
-										? ReadonlyArray<PartialDeep<ItemType | undefined, Options>>
-										: Array<PartialDeep<ItemType | undefined, Options>>
-									: PartialObjectDeep<T, Options> // Tuples behave properly
-								: T // If they don't opt into array testing, just use the original type
-							: PartialObjectDeep<T, Options>
-						: unknown;
-
-/**
-Same as `PartialDeep`, but accepts only `Map`s and as inputs. Internal helper for `PartialDeep`.
-*/
-type PartialMapDeep<KeyType, ValueType, Options extends PartialDeepOptions> = {} & Map<PartialDeep<KeyType, Options>, PartialDeep<ValueType, Options>>;
-
-/**
-Same as `PartialDeep`, but accepts only `Set`s as inputs. Internal helper for `PartialDeep`.
-*/
-type PartialSetDeep<T, Options extends PartialDeepOptions> = {} & Set<PartialDeep<T, Options>>;
-
-/**
-Same as `PartialDeep`, but accepts only `ReadonlyMap`s as inputs. Internal helper for `PartialDeep`.
-*/
-type PartialReadonlyMapDeep<KeyType, ValueType, Options extends PartialDeepOptions> = {} & ReadonlyMap<PartialDeep<KeyType, Options>, PartialDeep<ValueType, Options>>;
-
-/**
-Same as `PartialDeep`, but accepts only `ReadonlySet`s as inputs. Internal helper for `PartialDeep`.
-*/
-type PartialReadonlySetDeep<T, Options extends PartialDeepOptions> = {} & ReadonlySet<PartialDeep<T, Options>>;
-
-/**
-Same as `PartialDeep`, but accepts only `object`s as inputs. Internal helper for `PartialDeep`.
-*/
-type PartialObjectDeep<ObjectType extends object, Options extends PartialDeepOptions> = {
-	[KeyType in keyof ObjectType]?: PartialDeep<ObjectType[KeyType], Options>
-};
-
 /**
  * The default ESLint settings for "react-x".
  */
@@ -729,19 +595,11 @@ declare const DEFAULT_ESLINT_REACT_SETTINGS: {
     readonly version: "detect";
 };
 /**
- * Unsafely casts settings from a data object from `context.settings`.
- * @internal
- * @param data The data object.
- * @returns settings The settings.
- */
-declare function unsafeReadSettings(data: unknown): PartialDeep<ESLintReactSettings>;
-/**
- * Normalizes the settings by converting all shorthand properties to their full form.
- * @param data The raw settings.
- * @returns The normalized settings.
- * @internal
+ * Get the normalized ESLint settings for "react-x" from the given context.
+ * @param context The context.
+ * @param context.settings The ESLint settings.
+ * @returns The normalized ESLint settings.
  */
-declare function normalizeSettings(data: unknown): ESLintReactSettingsNormalized;
 declare function getSettingsFromContext(context: {
     settings: unknown;
 }): ESLintReactSettingsNormalized;
@@ -757,4 +615,4 @@ declare module "@typescript-eslint/utils/ts-eslint" {
     }
 }
 
-export { type CustomAttribute, CustomAttributeSchema, type CustomComponent, type CustomComponentNormalized, CustomComponentNormalizedSchema, CustomComponentSchema, type CustomHook, CustomHookSchema, DEFAULT_ESLINT_REACT_SETTINGS, type ESLintReactSettings, type ESLintReactSettingsNormalized, ESLintReactSettingsSchema, type ESLintSettings, ESLintSettingsSchema, GITHUB_URL, HOST_HTML_COMPONENT_TYPES, HOST_SVG_COMPONENT_TYPES, NPM_SCOPE, REACT_BUILD_IN_HOOKS, RE_CAMEL_CASE, RE_CONSTANT_CASE, RE_JAVASCRIPT_PROTOCOL, RE_KEBAB_CASE, RE_PASCAL_CASE, RE_SNAKE_CASE, WEBSITE_URL, createRuleForPlugin, defineSettings, getReactVersion, getSettingsFromContext, normalizeSettings, unsafeReadSettings };
+export { type CustomAttribute, CustomAttributeSchema, type CustomComponent, type CustomComponentNormalized, CustomComponentNormalizedSchema, CustomComponentSchema, type CustomHook, CustomHookSchema, DEFAULT_ESLINT_REACT_SETTINGS, type ESLintReactSettings, type ESLintReactSettingsNormalized, ESLintReactSettingsSchema, type ESLintSettings, ESLintSettingsSchema, GITHUB_URL, HOST_HTML_COMPONENT_TYPES, HOST_SVG_COMPONENT_TYPES, NPM_SCOPE, REACT_BUILD_IN_HOOKS, RE_CAMEL_CASE, RE_CONSTANT_CASE, RE_JAVASCRIPT_PROTOCOL, RE_KEBAB_CASE, RE_PASCAL_CASE, RE_SNAKE_CASE, WEBSITE_URL, createRuleForPlugin, defineSettings, getReactVersion, getSettingsFromContext };

package/dist/index.d.ts

@@ -583,140 +583,6 @@ interface ESLintReactSettingsNormalized extends ESLintReactSettings {
     version: string;
 }
 
-/**
-Matches any [primitive value](https://developer.mozilla.org/en-US/docs/Glossary/Primitive).
-
-@category Type
-*/
-type Primitive =
-	| null
-	| undefined
-	| string
-	| number
-	| boolean
-	| symbol
-	| bigint;
-
-declare global {
-	// eslint-disable-next-line @typescript-eslint/consistent-type-definitions -- It has to be an `interface` so that it can be merged.
-	interface SymbolConstructor {
-		readonly observable: symbol;
-	}
-}
-
-/**
-Matches any primitive, `void`, `Date`, or `RegExp` value.
-*/
-type BuiltIns = Primitive | void | Date | RegExp;
-
-/**
-@see PartialDeep
-*/
-type PartialDeepOptions = {
-	/**
-	Whether to affect the individual elements of arrays and tuples.
-
-	@default false
-	*/
-	readonly recurseIntoArrays?: boolean;
-};
-
-/**
-Create a type from another type with all keys and nested keys set to optional.
-
-Use-cases:
-- Merging a default settings/config object with another object, the second object would be a deep partial of the default object.
-- Mocking and testing complex entities, where populating an entire object with its keys would be redundant in terms of the mock or test.
-
-@example
-```
-import type {PartialDeep} from 'type-fest';
-
-const settings: Settings = {
-	textEditor: {
-		fontSize: 14;
-		fontColor: '#000000';
-		fontWeight: 400;
-	}
-	autocomplete: false;
-	autosave: true;
-};
-
-const applySavedSettings = (savedSettings: PartialDeep<Settings>) => {
-	return {...settings, ...savedSettings};
-}
-
-settings = applySavedSettings({textEditor: {fontWeight: 500}});
-```
-
-By default, this does not affect elements in array and tuple types. You can change this by passing `{recurseIntoArrays: true}` as the second type argument:
-
-```
-import type {PartialDeep} from 'type-fest';
-
-interface Settings {
-	languages: string[];
-}
-
-const partialSettings: PartialDeep<Settings, {recurseIntoArrays: true}> = {
-	languages: [undefined]
-};
-```
-
-@category Object
-@category Array
-@category Set
-@category Map
-*/
-type PartialDeep<T, Options extends PartialDeepOptions = {}> = T extends BuiltIns | (((...arguments_: any[]) => unknown)) | (new (...arguments_: any[]) => unknown)
-	? T
-	: T extends Map<infer KeyType, infer ValueType>
-		? PartialMapDeep<KeyType, ValueType, Options>
-		: T extends Set<infer ItemType>
-			? PartialSetDeep<ItemType, Options>
-			: T extends ReadonlyMap<infer KeyType, infer ValueType>
-				? PartialReadonlyMapDeep<KeyType, ValueType, Options>
-				: T extends ReadonlySet<infer ItemType>
-					? PartialReadonlySetDeep<ItemType, Options>
-					: T extends object
-						? T extends ReadonlyArray<infer ItemType> // Test for arrays/tuples, per https://github.com/microsoft/TypeScript/issues/35156
-							? Options['recurseIntoArrays'] extends true
-								? ItemType[] extends T // Test for arrays (non-tuples) specifically
-									? readonly ItemType[] extends T // Differentiate readonly and mutable arrays
-										? ReadonlyArray<PartialDeep<ItemType | undefined, Options>>
-										: Array<PartialDeep<ItemType | undefined, Options>>
-									: PartialObjectDeep<T, Options> // Tuples behave properly
-								: T // If they don't opt into array testing, just use the original type
-							: PartialObjectDeep<T, Options>
-						: unknown;
-
-/**
-Same as `PartialDeep`, but accepts only `Map`s and as inputs. Internal helper for `PartialDeep`.
-*/
-type PartialMapDeep<KeyType, ValueType, Options extends PartialDeepOptions> = {} & Map<PartialDeep<KeyType, Options>, PartialDeep<ValueType, Options>>;
-
-/**
-Same as `PartialDeep`, but accepts only `Set`s as inputs. Internal helper for `PartialDeep`.
-*/
-type PartialSetDeep<T, Options extends PartialDeepOptions> = {} & Set<PartialDeep<T, Options>>;
-
-/**
-Same as `PartialDeep`, but accepts only `ReadonlyMap`s as inputs. Internal helper for `PartialDeep`.
-*/
-type PartialReadonlyMapDeep<KeyType, ValueType, Options extends PartialDeepOptions> = {} & ReadonlyMap<PartialDeep<KeyType, Options>, PartialDeep<ValueType, Options>>;
-
-/**
-Same as `PartialDeep`, but accepts only `ReadonlySet`s as inputs. Internal helper for `PartialDeep`.
-*/
-type PartialReadonlySetDeep<T, Options extends PartialDeepOptions> = {} & ReadonlySet<PartialDeep<T, Options>>;
-
-/**
-Same as `PartialDeep`, but accepts only `object`s as inputs. Internal helper for `PartialDeep`.
-*/
-type PartialObjectDeep<ObjectType extends object, Options extends PartialDeepOptions> = {
-	[KeyType in keyof ObjectType]?: PartialDeep<ObjectType[KeyType], Options>
-};
-
 /**
  * The default ESLint settings for "react-x".
  */
@@ -729,19 +595,11 @@ declare const DEFAULT_ESLINT_REACT_SETTINGS: {
     readonly version: "detect";
 };
 /**
- * Unsafely casts settings from a data object from `context.settings`.
- * @internal
- * @param data The data object.
- * @returns settings The settings.
- */
-declare function unsafeReadSettings(data: unknown): PartialDeep<ESLintReactSettings>;
-/**
- * Normalizes the settings by converting all shorthand properties to their full form.
- * @param data The raw settings.
- * @returns The normalized settings.
- * @internal
+ * Get the normalized ESLint settings for "react-x" from the given context.
+ * @param context The context.
+ * @param context.settings The ESLint settings.
+ * @returns The normalized ESLint settings.
  */
-declare function normalizeSettings(data: unknown): ESLintReactSettingsNormalized;
 declare function getSettingsFromContext(context: {
     settings: unknown;
 }): ESLintReactSettingsNormalized;
@@ -757,4 +615,4 @@ declare module "@typescript-eslint/utils/ts-eslint" {
     }
 }
 
-export { type CustomAttribute, CustomAttributeSchema, type CustomComponent, type CustomComponentNormalized, CustomComponentNormalizedSchema, CustomComponentSchema, type CustomHook, CustomHookSchema, DEFAULT_ESLINT_REACT_SETTINGS, type ESLintReactSettings, type ESLintReactSettingsNormalized, ESLintReactSettingsSchema, type ESLintSettings, ESLintSettingsSchema, GITHUB_URL, HOST_HTML_COMPONENT_TYPES, HOST_SVG_COMPONENT_TYPES, NPM_SCOPE, REACT_BUILD_IN_HOOKS, RE_CAMEL_CASE, RE_CONSTANT_CASE, RE_JAVASCRIPT_PROTOCOL, RE_KEBAB_CASE, RE_PASCAL_CASE, RE_SNAKE_CASE, WEBSITE_URL, createRuleForPlugin, defineSettings, getReactVersion, getSettingsFromContext, normalizeSettings, unsafeReadSettings };
+export { type CustomAttribute, CustomAttributeSchema, type CustomComponent, type CustomComponentNormalized, CustomComponentNormalizedSchema, CustomComponentSchema, type CustomHook, CustomHookSchema, DEFAULT_ESLINT_REACT_SETTINGS, type ESLintReactSettings, type ESLintReactSettingsNormalized, ESLintReactSettingsSchema, type ESLintSettings, ESLintSettingsSchema, GITHUB_URL, HOST_HTML_COMPONENT_TYPES, HOST_SVG_COMPONENT_TYPES, NPM_SCOPE, REACT_BUILD_IN_HOOKS, RE_CAMEL_CASE, RE_CONSTANT_CASE, RE_JAVASCRIPT_PROTOCOL, RE_KEBAB_CASE, RE_PASCAL_CASE, RE_SNAKE_CASE, WEBSITE_URL, createRuleForPlugin, defineSettings, getReactVersion, getSettingsFromContext };

package/dist/index.js

@@ -384,7 +384,7 @@ var ESLintSettingsSchema = valibot.optional(
 );
 
 // src/cache.ts
-var normalizedSettingsCache = /* @__PURE__ */ new Map();
+var normalizedSettingsCache = /* @__PURE__ */ new WeakMap();
 
 // src/settings.ts
 var DEFAULT_ESLINT_REACT_SETTINGS = {
@@ -395,19 +395,20 @@ var DEFAULT_ESLINT_REACT_SETTINGS = {
   strictImportCheck: false,
   version: "detect"
 };
-function unsafeReadSettings(data) {
-  return data?.["react-x"] ?? {};
-}
-function normalizeSettings(data) {
-  const memoized = normalizedSettingsCache.get(data);
-  if (memoized) return memoized;
-  const settings = {
+function getSettingsFromContext(context) {
+  valibot.assert(ESLintSettingsSchema, context.settings);
+  const raw = context.settings?.["react-x"] ?? {};
+  const memoized = normalizedSettingsCache.get(raw);
+  if (memoized) {
+    return memoized;
+  }
+  const rawWithDefaults = {
     ...DEFAULT_ESLINT_REACT_SETTINGS,
-    ...valibot.parse(ESLintSettingsSchema, data)["react-x"] ?? {}
+    ...raw
   };
-  const additionalComponents = settings.additionalComponents ?? [];
+  const additionalComponents = rawWithDefaults.additionalComponents ?? [];
   const normalized = {
-    ...settings,
+    ...rawWithDefaults,
     additionalComponents: additionalComponents.map((component) => ({
       ...component,
       attributes: component.attributes?.map((attr) => ({
@@ -422,14 +423,11 @@ function normalizeSettings(data) {
       if (!/^[\w-]+$/u.test(name)) return acc;
       return acc.set(name, as);
     }, /* @__PURE__ */ new Map()),
-    version: tsPattern.match(settings.version).with(tsPattern.P.union(tsPattern.P.nullish, "", "detect"), () => eff.E.getOrElse(getReactVersion(), eff.F.constant("19.0.0"))).otherwise(eff.F.identity)
+    version: tsPattern.match(rawWithDefaults.version).with(tsPattern.P.union(tsPattern.P.nullish, "", "detect"), () => eff.E.getOrElse(getReactVersion(), eff.F.constant("19.0.0"))).otherwise(eff.F.identity)
   };
-  normalizedSettingsCache.set(data, normalized);
+  normalizedSettingsCache.set(raw, normalized);
   return normalized;
 }
-function getSettingsFromContext(context) {
-  return normalizeSettings(context.settings);
-}
 var defineSettings = eff.F.identity;
 
 exports.CustomAttributeSchema = CustomAttributeSchema;
@@ -455,5 +453,3 @@ exports.createRuleForPlugin = createRuleForPlugin;
 exports.defineSettings = defineSettings;
 exports.getReactVersion = getReactVersion;
 exports.getSettingsFromContext = getSettingsFromContext;
-exports.normalizeSettings = normalizeSettings;
-exports.unsafeReadSettings = unsafeReadSettings;

package/dist/index.mjs

@@ -2,7 +2,7 @@ import { ESLintUtils } from '@typescript-eslint/utils';
 import { F, E } from '@eslint-react/eff';
 import { isMatching, P, match } from 'ts-pattern';
 import module from 'node:module';
-import { object, string, optional, boolean, array, instance, parse } from 'valibot';
+import { object, string, optional, boolean, array, instance, assert } from 'valibot';
 import pm from 'picomatch';
 
 // src/constants.ts
@@ -376,7 +376,7 @@ var ESLintSettingsSchema = optional(
 );
 
 // src/cache.ts
-var normalizedSettingsCache = /* @__PURE__ */ new Map();
+var normalizedSettingsCache = /* @__PURE__ */ new WeakMap();
 
 // src/settings.ts
 var DEFAULT_ESLINT_REACT_SETTINGS = {
@@ -387,19 +387,20 @@ var DEFAULT_ESLINT_REACT_SETTINGS = {
   strictImportCheck: false,
   version: "detect"
 };
-function unsafeReadSettings(data) {
-  return data?.["react-x"] ?? {};
-}
-function normalizeSettings(data) {
-  const memoized = normalizedSettingsCache.get(data);
-  if (memoized) return memoized;
-  const settings = {
+function getSettingsFromContext(context) {
+  assert(ESLintSettingsSchema, context.settings);
+  const raw = context.settings?.["react-x"] ?? {};
+  const memoized = normalizedSettingsCache.get(raw);
+  if (memoized) {
+    return memoized;
+  }
+  const rawWithDefaults = {
     ...DEFAULT_ESLINT_REACT_SETTINGS,
-    ...parse(ESLintSettingsSchema, data)["react-x"] ?? {}
+    ...raw
   };
-  const additionalComponents = settings.additionalComponents ?? [];
+  const additionalComponents = rawWithDefaults.additionalComponents ?? [];
   const normalized = {
-    ...settings,
+    ...rawWithDefaults,
     additionalComponents: additionalComponents.map((component) => ({
       ...component,
       attributes: component.attributes?.map((attr) => ({
@@ -414,14 +415,11 @@ function normalizeSettings(data) {
       if (!/^[\w-]+$/u.test(name)) return acc;
       return acc.set(name, as);
     }, /* @__PURE__ */ new Map()),
-    version: match(settings.version).with(P.union(P.nullish, "", "detect"), () => E.getOrElse(getReactVersion(), F.constant("19.0.0"))).otherwise(F.identity)
+    version: match(rawWithDefaults.version).with(P.union(P.nullish, "", "detect"), () => E.getOrElse(getReactVersion(), F.constant("19.0.0"))).otherwise(F.identity)
   };
-  normalizedSettingsCache.set(data, normalized);
+  normalizedSettingsCache.set(raw, normalized);
   return normalized;
 }
-function getSettingsFromContext(context) {
-  return normalizeSettings(context.settings);
-}
 var defineSettings = F.identity;
 
-export { CustomAttributeSchema, CustomComponentNormalizedSchema, CustomComponentSchema, CustomHookSchema, DEFAULT_ESLINT_REACT_SETTINGS, ESLintReactSettingsSchema, ESLintSettingsSchema, GITHUB_URL, HOST_HTML_COMPONENT_TYPES, HOST_SVG_COMPONENT_TYPES, NPM_SCOPE, REACT_BUILD_IN_HOOKS, RE_CAMEL_CASE, RE_CONSTANT_CASE, RE_JAVASCRIPT_PROTOCOL, RE_KEBAB_CASE, RE_PASCAL_CASE, RE_SNAKE_CASE, WEBSITE_URL, createRuleForPlugin, defineSettings, getReactVersion, getSettingsFromContext, normalizeSettings, unsafeReadSettings };
+export { CustomAttributeSchema, CustomComponentNormalizedSchema, CustomComponentSchema, CustomHookSchema, DEFAULT_ESLINT_REACT_SETTINGS, ESLintReactSettingsSchema, ESLintSettingsSchema, GITHUB_URL, HOST_HTML_COMPONENT_TYPES, HOST_SVG_COMPONENT_TYPES, NPM_SCOPE, REACT_BUILD_IN_HOOKS, RE_CAMEL_CASE, RE_CONSTANT_CASE, RE_JAVASCRIPT_PROTOCOL, RE_KEBAB_CASE, RE_PASCAL_CASE, RE_SNAKE_CASE, WEBSITE_URL, createRuleForPlugin, defineSettings, getReactVersion, getSettingsFromContext };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/shared",
-  "version": "1.23.2-next.2",
+  "version": "1.23.2-next.3",
   "description": "ESLint React's Shared constants and functions.",
   "homepage": "https://github.com/rEl1cx/eslint-react",
   "bugs": {
@@ -36,8 +36,8 @@
     "@typescript-eslint/utils": "^8.19.0",
     "picomatch": "^4.0.2",
     "ts-pattern": "^5.6.0",
-    "valibot": "^1.0.0-beta.9",
-    "@eslint-react/eff": "1.23.2-next.2"
+    "valibot": "^1.0.0-beta.10",
+    "@eslint-react/eff": "1.23.2-next.3"
   },
   "devDependencies": {
     "@types/picomatch": "^3.0.1",