eslint-config-typed 7.4.0 → 7.6.0

package/README.md

@@ -367,6 +367,15 @@ export default [
 ] satisfies readonly FlatConfig[];
 ```
 
+The presets report the built-in APIs, globals and syntax that the oldest
+Node.js in this package's `engines.node` lacks (`Temporal`, `Iterator.zip`,
+`using`, …), and turn off the rules whose fixes would write them. Files that run
+only on a known newer Node.js, such as a repository's own scripts, pass its
+major: `eslintConfigForNodeJs(['scripts/**'], { nodeMajor: 26 })` allows what
+Node.js 26 has and still reports what it lacks. With `nodeMajor` the preset sets
+the options of `no-restricted-globals`, `no-restricted-properties` and
+`no-restricted-syntax` for those files, replacing any set before it.
+
 ### Node.js TypeScript Project
 
 ```tsx
@@ -538,13 +547,14 @@ Pre-configured rule sets that can be imported and customized:
 
 ### Exported Pre-configured Rule Options
 
-| Pre-configured rule option              | Rule                    | Description                                                                                                                                                   |
-| :-------------------------------------- | :---------------------- | :------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| **`restrictedGlobals`**                 | `no-restricted-globals` | Array of restricted global variables                                                                                                                          |
-| **`restrictedGlobalsForBrowser`**       | `no-restricted-globals` | Browser-environment-specific restricted globals                                                                                                               |
-| **`restrictedSyntax`**                  | `no-restricted-syntax`  | Disallows the `in` operator, `Object.prototype.hasOwnProperty.call` (suggests using `Object.hasOwn`), and `new Array(*)` syntax (suggests using `Array.from`) |
-| **`restrictedImportsOptions`**          | `no-restricted-imports` | Disallows importing `index.mjs` by relative path                                                                                                              |
-| **`restrictedImportsOptionsForPreact`** | `no-restricted-imports` | `restrictedImportsOptions` plus the hooks of `preact/compat` (suggests `preact/hooks`)                                                                        |
+| Pre-configured rule option              | Rule                       | Description                                                                                                                                                                                                                                   |
+| :-------------------------------------- | :------------------------- | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| **`restrictedGlobals`**                 | `no-restricted-globals`    | Array of restricted global variables                                                                                                                                                                                                          |
+| **`restrictedGlobalsForBrowser`**       | `no-restricted-globals`    | Browser-environment-specific restricted globals                                                                                                                                                                                               |
+| **`restrictedSyntax`**                  | `no-restricted-syntax`     | Disallows the `in` operator, `Object.prototype.hasOwnProperty.call` (suggests using `Object.hasOwn`), `new Array(*)` syntax (suggests using `Array.from`), and the `globalThis.`-qualified forms of the APIs `restrictedProperties` disallows |
+| **`restrictedProperties`**              | `no-restricted-properties` | Disallows the built-in APIs in `nodeVersionGatedApis`, which not every Node.js in `engines` has: `Error.isError`, `Promise.try`, `RegExp.escape`, `Uint8Array` base64 and `Map#getOrInsert[Computed]`                                         |
+| **`restrictedImportsOptions`**          | `no-restricted-imports`    | Disallows importing `index.mjs` by relative path                                                                                                                                                                                              |
+| **`restrictedImportsOptionsForPreact`** | `no-restricted-imports`    | `restrictedImportsOptions` plus the hooks of `preact/compat` (suggests `preact/hooks`)                                                                                                                                                        |
 
 A config that sets a rule replaces the options an earlier config set. To restrict more imports after `eslintConfigForPreact`, concatenate yours with the ones it set, using `mergeRestrictedImportsOptions(restrictedImportsOptionsForPreact, { paths: [...], patterns: [...] })`.
 
@@ -570,7 +580,7 @@ The shape of the rule option varies depending on the rule, so please check the c
 
 **`eslintPluginTsRestrictions`** - Custom ESLint plugin with additional rules for TypeScript
 
-- Currently, this plugin only provides the `ts-restrictions/no-restricted-syntax` rule (which duplicates ESLint's `no-restricted-syntax` rule).
+- Provides the `ts-restrictions/*` rules; `eslintTsRestrictionsRules` lists each one with the severity the preset sets. `ts-restrictions/no-restricted-syntax` duplicates ESLint's `no-restricted-syntax` rule.
 - Can be used to set the error level to `error` or `warn` as needed.
 
 Example:

package/dist/configs/nodejs.d.mts

@@ -1,3 +1,16 @@
 import { type FlatConfig } from '../types/index.mjs';
-export declare const eslintConfigForNodeJs: (files?: readonly string[]) => FlatConfig;
+/**
+ * The Node.js globals and rules for `files`.
+ *
+ * `nodeMajor` is for files that run only on a known Node.js, newer than this
+ * package's `engines.node` floor — a repository's own scripts, say. The APIs,
+ * globals and syntax that the floor lacks and that runtime has are then
+ * allowed (`nodeVersionGateAt`); without it, every one the floor lacks is
+ * reported. With it, the preset sets the options of `no-restricted-globals`,
+ * `no-restricted-properties` and `no-restricted-syntax` for `files`, replacing
+ * any set before it there, as a flat config does.
+ */
+export declare const eslintConfigForNodeJs: (files?: readonly string[], options?: Readonly<{
+    nodeMajor?: number;
+}>) => FlatConfig;
 //# sourceMappingURL=nodejs.d.mts.map

package/dist/configs/nodejs.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"nodejs.d.mts","sourceRoot":"","sources":["../../src/configs/nodejs.mts"],"names":[],"mappings":"AAGA,OAAO,EAAoB,KAAK,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAEvE,eAAO,MAAM,qBAAqB,WAAY,SAAS,MAAM,EAAE,KAAG,UA8CrD,CAAC"}
+{"version":3,"file":"nodejs.d.mts","sourceRoot":"","sources":["../../src/configs/nodejs.mts"],"names":[],"mappings":"AAQA,OAAO,EAIL,KAAK,UAAU,EAChB,MAAM,oBAAoB,CAAC;AAE5B;;;;;;;;;;GAUG;AACH,eAAO,MAAM,qBAAqB,WACxB,SAAS,MAAM,EAAE,YACf,QAAQ,CAAC;IAAE,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,KACzC,UAmDU,CAAC"}

package/dist/configs/nodejs.mjs

@@ -1,8 +1,19 @@
 import globals from 'globals';
 import { Arr } from 'ts-data-forge';
-import { restrictedGlobals } from '../rules/index.mjs';
-import { defineKnownRules } from '../types/index.mjs';
-export const eslintConfigForNodeJs = (files) => ({
+import { nodeVersionGateAt, restrictedGlobals, restrictedGlobalsWithoutNodeVersionGate, restrictedSyntaxWithoutNodeVersionGate, } from '../rules/index.mjs';
+import { defineKnownRules, } from '../types/index.mjs';
+
+
+
+
+
+
+
+
+
+
+
+export const eslintConfigForNodeJs = (files, options) => ({
     ...(files === undefined ? {} : { files }),
     languageOptions: {
 
@@ -11,7 +22,11 @@ export const eslintConfigForNodeJs = (files) => ({
         },
     },
     rules: defineKnownRules({
-        'no-restricted-globals': Arr.toUnshifted('error')(restrictedGlobals),
+        ...(options?.nodeMajor === undefined
+            ? {
+                'no-restricted-globals': Arr.toUnshifted('error')(restrictedGlobals),
+            }
+            : runtimeGate(options.nodeMajor)),
         'no-alert': 'off',
         'no-implicit-globals': 'off',
         'no-script-url': 'off',
@@ -47,4 +62,22 @@ export const eslintConfigForNodeJs = (files) => ({
         'unicorn/require-passive-events': 'off',
     }),
 });
+
+const runtimeGate = (nodeMajor) => {
+    const gate = nodeVersionGateAt(nodeMajor);
+    const globalsOption = [
+        ...restrictedGlobalsWithoutNodeVersionGate,
+        ...gate.globals,
+    ];
+    const propertiesOption = gate.properties;
+    const syntaxOption = [
+        ...restrictedSyntaxWithoutNodeVersionGate,
+        ...gate.syntax,
+    ];
+    return {
+        'no-restricted-globals': Arr.toUnshifted('error')(globalsOption),
+        'no-restricted-properties': Arr.toUnshifted('error')(propertiesOption),
+        'no-restricted-syntax': Arr.toUnshifted('error')(syntaxOption),
+    };
+};
 //# sourceMappingURL=nodejs.mjs.map

package/dist/configs/nodejs.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"nodejs.mjs","sourceRoot":"","sources":["../../src/configs/nodejs.mts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAmB,MAAM,oBAAoB,CAAC;AAEvE,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,KAAyB,EAAc,EAAE,CAC7E,CAAC;IACC,GAAG,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC;IACzC,eAAe,EAAE;QACf,iEAAiE;QACjE,OAAO,EAAE;YACP,GAAG,OAAO,CAAC,IAAI;SAChB;KACF;IACD,KAAK,EAAE,gBAAgB,CAAC;QACtB,uBAAuB,EAAE,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,iBAAiB,CAAC;QACpE,UAAU,EAAE,KAAK;QACjB,qBAAqB,EAAE,KAAK;QAC5B,eAAe,EAAE,KAAK;QAEtB,4BAA4B,EAAE,KAAK;QACnC,kCAAkC,EAAE,KAAK;QACzC,0CAA0C,EAAE,KAAK;QACjD,qCAAqC,EAAE,KAAK;QAC5C,iCAAiC,EAAE,KAAK;QACxC,gCAAgC,EAAE,KAAK;QACvC,0BAA0B,EAAE,KAAK;QACjC,gCAAgC,EAAE,KAAK;QACvC,sCAAsC,EAAE,KAAK;QAC7C,6BAA6B,EAAE,KAAK;QACpC,mCAAmC,EAAE,KAAK;QAC1C,gCAAgC,EAAE,KAAK;QACvC,+BAA+B,EAAE,KAAK;QACtC,4CAA4C,EAAE,KAAK;QACnD,mCAAmC,EAAE,KAAK;QAC1C,+BAA+B,EAAE,KAAK;QACtC,yBAAyB,EAAE,KAAK;QAChC,4BAA4B,EAAE,KAAK;QACnC,qCAAqC,EAAE,KAAK;QAC5C,sCAAsC,EAAE,KAAK;QAC7C,uCAAuC,EAAE,KAAK;QAC9C,4BAA4B,EAAE,KAAK;QACnC,2CAA2C,EAAE,KAAK;QAClD,sCAAsC,EAAE,KAAK;QAC7C,gCAAgC,EAAE,KAAK;QACvC,uBAAuB,EAAE,KAAK;QAC9B,gCAAgC,EAAE,KAAK;QACvC,qCAAqC,EAAE,KAAK;QAC5C,4BAA4B,EAAE,KAAK;QACnC,gCAAgC,EAAE,KAAK;KACxC,CAAC;CACH,CAAU,CAAC"}
+{"version":3,"file":"nodejs.mjs","sourceRoot":"","sources":["../../src/configs/nodejs.mts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AACpC,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EACjB,uCAAuC,EACvC,sCAAsC,GACvC,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,gBAAgB,GAIjB,MAAM,oBAAoB,CAAC;AAE5B;;;;;;;;;;GAUG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,CACnC,KAAyB,EACzB,OAA0C,EAC9B,EAAE,CACd,CAAC;IACC,GAAG,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC;IACzC,eAAe,EAAE;QACf,iEAAiE;QACjE,OAAO,EAAE;YACP,GAAG,OAAO,CAAC,IAAI;SAChB;KACF;IACD,KAAK,EAAE,gBAAgB,CAAC;QACtB,GAAG,CAAC,OAAO,EAAE,SAAS,KAAK,SAAS;YAClC,CAAC,CAAC;gBACE,uBAAuB,EACrB,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,iBAAiB,CAAC;aAC9C;YACH,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACnC,UAAU,EAAE,KAAK;QACjB,qBAAqB,EAAE,KAAK;QAC5B,eAAe,EAAE,KAAK;QAEtB,4BAA4B,EAAE,KAAK;QACnC,kCAAkC,EAAE,KAAK;QACzC,0CAA0C,EAAE,KAAK;QACjD,qCAAqC,EAAE,KAAK;QAC5C,iCAAiC,EAAE,KAAK;QACxC,gCAAgC,EAAE,KAAK;QACvC,0BAA0B,EAAE,KAAK;QACjC,gCAAgC,EAAE,KAAK;QACvC,sCAAsC,EAAE,KAAK;QAC7C,6BAA6B,EAAE,KAAK;QACpC,mCAAmC,EAAE,KAAK;QAC1C,gCAAgC,EAAE,KAAK;QACvC,+BAA+B,EAAE,KAAK;QACtC,4CAA4C,EAAE,KAAK;QACnD,mCAAmC,EAAE,KAAK;QAC1C,+BAA+B,EAAE,KAAK;QACtC,yBAAyB,EAAE,KAAK;QAChC,4BAA4B,EAAE,KAAK;QACnC,qCAAqC,EAAE,KAAK;QAC5C,sCAAsC,EAAE,KAAK;QAC7C,uCAAuC,EAAE,KAAK;QAC9C,4BAA4B,EAAE,KAAK;QACnC,2CAA2C,EAAE,KAAK;QAClD,sCAAsC,EAAE,KAAK;QAC7C,gCAAgC,EAAE,KAAK;QACvC,uBAAuB,EAAE,KAAK;QAC9B,gCAAgC,EAAE,KAAK;QACvC,qCAAqC,EAAE,KAAK;QAC5C,4BAA4B,EAAE,KAAK;QACnC,gCAAgC,EAAE,KAAK;KACxC,CAAC;CACH,CAAU,CAAC;AAEd,6DAA6D;AAC7D,MAAM,WAAW,GAAG,CAClB,SAAiB,EAKhB,EAAE;IACH,MAAM,IAAI,GAAG,iBAAiB,CAAC,SAAS,CAAC,CAAC;IAE1C,MAAM,aAAa,GAA+C;QAChE,GAAG,uCAAuC;QAC1C,GAAG,IAAI,CAAC,OAAO;KACP,CAAC;IAEX,MAAM,gBAAgB,GACpB,IAAI,CAAC,UAAU,CAAC;IAElB,MAAM,YAAY,GAA8C;QAC9D,GAAG,sCAAsC;QACzC,GAAG,IAAI,CAAC,MAAM;KACN,CAAC;IAEX,OAAO;QACL,uBAAuB,EAAE,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,aAAa,CAAC;QAChE,0BAA0B,EAAE,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,gBAAgB,CAAC;QACtE,sBAAsB,EAAE,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC;KAC/D,CAAC;AACJ,CAAC,CAAC"}

package/dist/plugins/immer-coding-style/rules/prefer-curried-produce.d.mts

@@ -3,8 +3,9 @@ type MessageIds = 'useCurriedProduce';
 /**
  * Rewrites `(state) => produce(state, recipe)` as `produce(recipe)`. The base
  * state is recognized through type wrappers (`produce(state satisfies State,
- * recipe)`), which change nothing at run time and go with the argument; the
- * type an `as` gives it is kept as the type argument (`produce<State>`).
+ * recipe)`), which change nothing at run time and go with the argument. The
+ * type argument is the call's own (`produce<State>(state, recipe)`), else the
+ * parameter's annotation, else the wrapper's return type.
  *
  * The curried form passes its extra arguments on to the recipe (`recipe(draft,
  * ...args)`), so `xs.map((s) => produce(s, r))` → `xs.map(produce(r))` would
@@ -19,7 +20,20 @@ type MessageIds = 'useCurriedProduce';
  * would have nowhere to declare, and so is a base under `!`
  * (`produce(state!, recipe)`): the curried form would take the draft's narrower
  * type, and its callers could no longer pass what the wrapper took.
- * An optional parameter is left alone for the same reason.
+ * An optional parameter is left alone for the same reason, and so is a base
+ * under an `as` or `<T>` whose type is not the parameter's annotation
+ * (`(state: State | undefined) => produce(state as State, recipe)`), or that
+ * casts an unannotated parameter, whose type may come from the context.
+ * A call under `as` or `<T>` (`produce(state, recipe) as View`) is left alone
+ * too, since no curried form returns the type it asserts.
+ *
+ * `produce` is immer's: a named, aliased, default or namespace import from
+ * `immer` that nothing nearer shadows. The call and its callee are read through
+ * type wrappers. A call under `satisfies` or `!`, and a callee or namespace
+ * object in any wrapper (`(produce as typeof produce)(state, recipe)`,
+ * `(immer as T).produce(…)`), are reported without a fix, which could not keep
+ * the wrapper; so is an updater with a comment outside the recipe, which the
+ * fix would delete.
  */
 export declare const preferCurriedProduceRule: TSESLint.RuleModule<MessageIds>;
 export {};

package/dist/plugins/immer-coding-style/rules/prefer-curried-produce.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"prefer-curried-produce.d.mts","sourceRoot":"","sources":["../../../../src/plugins/immer-coding-style/rules/prefer-curried-produce.mts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,QAAQ,EAEd,MAAM,0BAA0B,CAAC;AASlC,KAAK,UAAU,GAAG,mBAAmB,CAAC;AAOtC;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,eAAO,MAAM,wBAAwB,EAAE,QAAQ,CAAC,UAAU,CAAC,UAAU,CA0F3D,CAAC"}
+{"version":3,"file":"prefer-curried-produce.d.mts","sourceRoot":"","sources":["../../../../src/plugins/immer-coding-style/rules/prefer-curried-produce.mts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,QAAQ,EAEd,MAAM,0BAA0B,CAAC;AAalC,KAAK,UAAU,GAAG,mBAAmB,CAAC;AAOtC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,eAAO,MAAM,wBAAwB,EAAE,QAAQ,CAAC,UAAU,CAAC,UAAU,CAuL3D,CAAC"}

package/dist/plugins/immer-coding-style/rules/prefer-curried-produce.mjs

@@ -1,5 +1,5 @@
 import { AST_NODE_TYPES, } from '@typescript-eslint/utils';
-import { isTypeWrapper, skipTypeWrappers, typeWrapperLayers, } from 'eslint-rule-forge';
+import { buildCalleeResolver, getImportDeclarations, hasCommentWithin, hasForeignBinding, isTypeWrapper, skipTypeWrappers, typeWrapperLayers, } from 'eslint-rule-forge';
 import { Arr, hasKey, isRecord } from 'ts-data-forge';
 
 
@@ -15,6 +15,20 @@ import { Arr, hasKey, isRecord } from 'ts-data-forge';
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -37,6 +51,35 @@ export const preferCurriedProduceRule = {
     },
     create: (context) => {
         const sourceCode = context.sourceCode;
+        const immerImports = getImportDeclarations(sourceCode.ast, immerModule);
+        if (Arr.isEmpty(immerImports)) {
+            return {};
+        }
+        const resolveCallee = buildCalleeResolver(immerImports);
+
+        const defaultImportNames = new Set(immerImports.flatMap((declaration) => Arr.generate(function* () {
+            for (const specifier of declaration.specifiers) {
+                if (specifier.type === AST_NODE_TYPES.ImportDefaultSpecifier) {
+                    yield specifier.local.name;
+                }
+            }
+        })));
+        const isImmerProduce = (call) => {
+            const callee = call.callee;
+            const canonicalName = resolveCallee(callee)?.canonicalName;
+            const unwrapped = skipTypeWrappers(callee);
+            if (canonicalName !== 'produce' &&
+                canonicalName !== 'default' &&
+                !(unwrapped.type === AST_NODE_TYPES.Identifier &&
+                    defaultImportNames.has(unwrapped.name))) {
+                return false;
+            }
+            const bound = unwrapped.type === AST_NODE_TYPES.MemberExpression
+                ? skipTypeWrappers(unwrapped.object)
+                : unwrapped;
+            return (bound.type === AST_NODE_TYPES.Identifier &&
+                !hasForeignBinding(sourceCode, call, bound.name, immerModule));
+        };
         return {
             ArrowFunctionExpression: (node) => {
                 if (node.async ||
@@ -53,8 +96,12 @@ export const preferCurriedProduceRule = {
                     return;
                 }
                 const { name: parameterName } = param;
-                const callExpression = node.body;
-                if (!isProduceCall(callExpression)) {
+                const callExpression = skipTypeWrappers(node.body);
+
+
+                if (callExpression.type !== AST_NODE_TYPES.CallExpression ||
+                    !isImmerProduce(callExpression) ||
+                    typeWrapperLayers(node.body).some((layer) => castTypeOf(layer) !== undefined)) {
                     return;
                 }
                 const [baseArgument, ...restArguments] = callExpression.arguments;
@@ -68,6 +115,14 @@ export const preferCurriedProduceRule = {
                 if (typeWrapperLayers(baseArgument).some((layer) => layer.type === AST_NODE_TYPES.TSNonNullExpression)) {
                     return;
                 }
+
+
+
+                if (assertsOtherType(baseArgument, param.typeAnnotation === undefined
+                    ? undefined
+                    : tokensText(sourceCode, param.typeAnnotation.typeAnnotation), sourceCode)) {
+                    return;
+                }
                 const baseIdentifier = findIdentifier(baseArgument, parameterName);
                 if (baseIdentifier === undefined) {
                     return;
@@ -75,10 +130,17 @@ export const preferCurriedProduceRule = {
                 if (hasOtherReferences(context, parameterName, baseIdentifier)) {
                     return;
                 }
+                const recipe = restArguments[0];
+                const isFixable = node.body === callExpression &&
+                    !hasWrappedCallee(callExpression) &&
+                    !hasCommentWithin(sourceCode, node, [
+                        [node.range[0], recipe.range[0]],
+                        [recipe.range[1], node.range[1]],
+                    ]);
                 report(context, {
                     arrowFunction: node,
-                    baseArgument,
                     callExpression,
+                    isFixable,
                     remainingArguments: restArguments,
                     sourceCode,
                 });
@@ -97,17 +159,6 @@ const getTypeArguments = (node) => {
     }
     return undefined;
 };
-
-
-
-
-const getAssertedType = (node) => {
-    if (node.type === AST_NODE_TYPES.TSAsExpression ||
-        node.type === AST_NODE_TYPES.TSTypeAssertion) {
-        return node.typeAnnotation;
-    }
-    return isTypeWrapper(node) ? getAssertedType(node.expression) : undefined;
-};
 const getArrowFunctionParameterType = ({ arrowFunction, sourceCode, }) => {
     const [parameter] = arrowFunction.params;
     if (parameter?.type !== AST_NODE_TYPES.Identifier) {
@@ -124,16 +175,13 @@ const getArrowFunctionReturnType = ({ arrowFunction, sourceCode, }) => {
         ? undefined
         : sourceCode.getText(typeAnnotation);
 };
-const getTypeParametersText = ({ arrowFunction, baseArgument, callExpression, sourceCode, }) => {
+const getTypeParametersText = ({ arrowFunction, callExpression, sourceCode, }) => {
     const typeArguments = getTypeArguments(callExpression);
     if (typeArguments !== undefined) {
         return sourceCode.getText(typeArguments);
     }
 
-    const assertedType = getAssertedType(baseArgument);
-    if (assertedType !== undefined) {
-        return `<${sourceCode.getText(assertedType)}>`;
-    }
+
     const parameterType = getArrowFunctionParameterType({
         arrowFunction,
         sourceCode,
@@ -165,31 +213,67 @@ const normalizeMultilineText = (text) => {
     const normalized = lines.map((line, index) => index === 0 ? line : line.slice(minIndent));
     return normalized.join('\n');
 };
-const report = (context, { arrowFunction, baseArgument, callExpression, remainingArguments, sourceCode, }) => {
-    const calleeText = sourceCode.getText(callExpression.callee);
-    const typeParametersText = getTypeParametersText({
-        arrowFunction,
-        baseArgument,
-        callExpression,
-        sourceCode,
-    });
-    const remainingArgumentsText = remainingArguments
-        .map((argument) => normalizeMultilineText(sourceCode.getText(argument)))
-        .join(', ');
-    const replacement = `${calleeText}${typeParametersText}(${remainingArgumentsText})`;
+const report = (context, { arrowFunction, callExpression, isFixable, remainingArguments, sourceCode, }) => {
+    const buildReplacement = () => {
+        const calleeText = sourceCode.getText(callExpression.callee);
+        const typeParametersText = getTypeParametersText({
+            arrowFunction,
+            callExpression,
+            sourceCode,
+        });
+        const remainingArgumentsText = remainingArguments
+            .map((argument) => normalizeMultilineText(sourceCode.getText(argument)))
+            .join(', ');
+        return `${calleeText}${typeParametersText}(${remainingArgumentsText})`;
+    };
     context.report({
         node: arrowFunction,
         messageId: 'useCurriedProduce',
-        fix: (fixer) => fixer.replaceText(arrowFunction, replacement),
+        fix: isFixable
+            ? (fixer) => fixer.replaceText(arrowFunction, buildReplacement())
+            : null,
     });
 };
-const isProduceCall = (node) => {
-    if (node.type !== AST_NODE_TYPES.CallExpression) {
-        return false;
-    }
-    return (node.callee.type === AST_NODE_TYPES.Identifier &&
-        node.callee.name === 'produce');
-};
+const immerModule = 'immer';
+
+
+
+
+const castTypeOf = (node) => node.type === AST_NODE_TYPES.TSAsExpression ||
+    node.type === AST_NODE_TYPES.TSTypeAssertion
+    ? node.typeAnnotation
+    : undefined;
+
+
+
+
+
+const hasWrappedCallee = ({ callee, }) => isTypeWrapper(callee) ||
+    (callee.type === AST_NODE_TYPES.MemberExpression &&
+        isTypeWrapper(callee.object));
+
+
+
+
+const tokensText = (sourceCode, 
+
+node) => sourceCode
+    .getTokens(node)
+    .map((token) => token.value)
+    .join(' ');
+
+
+
+
+
+
+
+const assertsOtherType = (argument, parameterType, sourceCode) => argument.type !== AST_NODE_TYPES.SpreadElement &&
+    typeWrapperLayers(argument).some((layer) => {
+        const castType = castTypeOf(layer);
+        return (castType !== undefined &&
+            tokensText(sourceCode, castType) !== parameterType);
+    });
 
 
 

package/dist/plugins/immer-coding-style/rules/prefer-curried-produce.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"prefer-curried-produce.mjs","sourceRoot":"","sources":["../../../../src/plugins/immer-coding-style/rules/prefer-curried-produce.mts"],"names":[],"mappings":"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"}
+{"version":3,"file":"prefer-curried-produce.mjs","sourceRoot":"","sources":["../../../../src/plugins/immer-coding-style/rules/prefer-curried-produce.mts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,GAGf,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,mBAAmB,EACnB,qBAAqB,EACrB,gBAAgB,EAChB,iBAAiB,EACjB,aAAa,EACb,gBAAgB,EAChB,iBAAiB,GAClB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,GAAG,EAAE,eAAe,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAUvE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAoC;IACvE,IAAI,EAAE;QACJ,IAAI,EAAE,YAAY;QAClB,IAAI,EAAE;YACJ,WAAW,EACT,+EAA+E;SAClF;QACD,OAAO,EAAE,MAAM;QACf,MAAM,EAAE,EAAE;QACV,QAAQ,EAAE;YACR,iBAAiB,EACf,0GAA0G;SAC7G;QACD,cAAc,EAAE,EAAE;KACnB;IACD,MAAM,EAAE,CAAC,OAAO,EAAE,EAAE;QAClB,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;QAEtC,MAAM,YAAY,GAAG,qBAAqB,CAAC,UAAU,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;QAExE,IAAI,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;YAC9B,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,MAAM,aAAa,GAAG,mBAAmB,CAAC,YAAY,CAAC,CAAC;QAExD,2DAA2D;QAC3D,MAAM,kBAAkB,GAAwB,IAAI,GAAG,CACrD,YAAY,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE,CACnC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC;YACpB,KAAK,MAAM,SAAS,IAAI,WAAW,CAAC,UAAU,EAAE,CAAC;gBAC/C,IAAI,SAAS,CAAC,IAAI,KAAK,cAAc,CAAC,sBAAsB,EAAE,CAAC;oBAC7D,MAAM,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC;gBAC7B,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CACH,CACF,CAAC;QAEF,MAAM,cAAc,GAAG,CACrB,IAA2C,EAClC,EAAE;YACX,MAAM,MAAM,GAAG,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAE5C,MAAM,aAAa,GAAG,aAAa,CAAC,MAAM,CAAC,EAAE,aAAa,CAAC;YAE3D,MAAM,SAAS,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;YAE3C,IACE,aAAa,KAAK,SAAS;gBAC3B,aAAa,KAAK,SAAS;gBAC3B,CAAC,CACC,SAAS,CAAC,IAAI,KAAK,cAAc,CAAC,UAAU;oBAC5C,kBAAkB,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CACvC,EACD,CAAC;gBACD,OAAO,KAAK,CAAC;YACf,CAAC;YAED,MAAM,KAAK,GACT,SAAS,CAAC,IAAI,KAAK,cAAc,CAAC,gBAAgB;gBAChD,CAAC,CAAC,gBAAgB,CAAC,SAAS,CAAC,MAAM,CAAC;gBACpC,CAAC,CAAC,SAAS,CAAC;YAEhB,OAAO,CACL,KAAK,CAAC,IAAI,KAAK,cAAc,CAAC,UAAU;gBACxC,CAAC,iBAAiB,CAChB,UAAU,EACV,eAAe,CAAC,IAAI,CAAC,EACrB,KAAK,CAAC,IAAI,EACV,WAAW,CACZ,CACF,CAAC;QACJ,CAAC,CAAC;QAEF,OAAO;YACL,uBAAuB,EAAE,CACvB,IAAoD,EACpD,EAAE;gBACF,IACE,IAAI,CAAC,KAAK;oBACV,IAAI,CAAC,cAAc,KAAK,SAAS;oBACjC,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,EACvC,CAAC;oBACD,OAAO;gBACT,CAAC;gBAED,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;gBAE7B,oEAAoE;gBACpE,eAAe;gBACf,IACE,KAAK,CAAC,IAAI,KAAK,cAAc,CAAC,UAAU;oBACxC,KAAK,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC;oBACvB,KAAK,CAAC,QAAQ,EACd,CAAC;oBACD,OAAO;gBACT,CAAC;gBAED,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,GAAG,KAAK,CAAC;gBAEtC,MAAM,cAAc,GAAG,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAEnD,sEAAsE;gBACtE,wBAAwB;gBACxB,IACE,cAAc,CAAC,IAAI,KAAK,cAAc,CAAC,cAAc;oBACrD,CAAC,cAAc,CAAC,cAAc,CAAC;oBAC/B,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAC/B,CAAC,KAAK,EAAE,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,SAAS,CAC3C,EACD,CAAC;oBACD,OAAO;gBACT,CAAC;gBAED,MAAM,CAAC,YAAY,EAAE,GAAG,aAAa,CAAC,GAAG,cAAc,CAAC,SAAS,CAAC;gBAElE,IACE,YAAY,KAAK,SAAS;oBAC1B,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC,EAAE,aAAa,CAAC;oBACzC,CAAC,qBAAqB,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EACxC,CAAC;oBACD,OAAO;gBACT,CAAC;gBAED,oEAAoE;gBACpE,sCAAsC;gBACtC,IACE,iBAAiB,CAAC,YAAY,CAAC,CAAC,IAAI,CAClC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,cAAc,CAAC,mBAAmB,CAC7D,EACD,CAAC;oBACD,OAAO;gBACT,CAAC;gBAED,kEAAkE;gBAClE,+DAA+D;gBAC/D,eAAe;gBACf,IACE,gBAAgB,CACd,YAAY,EACZ,KAAK,CAAC,cAAc,KAAK,SAAS;oBAChC,CAAC,CAAC,SAAS;oBACX,CAAC,CAAC,UAAU,CACR,UAAU,EACV,eAAe,CAAC,KAAK,CAAC,cAAc,CAAC,cAAc,CAAC,CACrD,EACL,UAAU,CACX,EACD,CAAC;oBACD,OAAO;gBACT,CAAC;gBAED,MAAM,cAAc,GAAG,cAAc,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;gBAEnE,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;oBACjC,OAAO;gBACT,CAAC;gBAED,IAAI,kBAAkB,CAAC,OAAO,EAAE,aAAa,EAAE,cAAc,CAAC,EAAE,CAAC;oBAC/D,OAAO;gBACT,CAAC;gBAED,MAAM,MAAM,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;gBAEhC,MAAM,SAAS,GACb,IAAI,CAAC,IAAI,KAAK,cAAc;oBAC5B,CAAC,gBAAgB,CAAC,cAAc,CAAC;oBACjC,CAAC,gBAAgB,CAAC,UAAU,EAAE,eAAe,CAAC,IAAI,CAAC,EAAE;wBACnD,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;wBAChC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;qBACjC,CAAC,CAAC;gBAEL,MAAM,CAAC,OAAO,EAAE;oBACd,aAAa,EAAE,IAAI;oBACnB,cAAc;oBACd,SAAS;oBACT,kBAAkB,EAAE,aAAa;oBACjC,UAAU;iBACX,CAAC,CAAC;YACL,CAAC;SACF,CAAC;IACJ,CAAC;CACO,CAAC;AAYX,MAAM,gBAAgB,GAAG,CACvB,IAA2C,EACQ,EAAE;IACrD,MAAM,WAAW,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC;IAE1C,IAAI,QAAQ,CAAC,WAAW,CAAC,IAAI,MAAM,CAAC,WAAW,EAAE,eAAe,CAAC,EAAE,CAAC;QAClE,OACE,WAID,CAAC,aAAa,CAAC;IAClB,CAAC;IAED,IAAI,QAAQ,CAAC,WAAW,CAAC,IAAI,MAAM,CAAC,WAAW,EAAE,gBAAgB,CAAC,EAAE,CAAC;QACnE,OAAQ,WAAsD;aAC3D,cAAc,CAAC;IACpB,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAEF,MAAM,6BAA6B,GAAG,CAAC,EACrC,aAAa,EACb,UAAU,GAMV,EAAsB,EAAE;IACxB,MAAM,CAAC,SAAS,CAAC,GAAG,aAAa,CAAC,MAAM,CAAC;IAEzC,IAAI,SAAS,EAAE,IAAI,KAAK,cAAc,CAAC,UAAU,EAAE,CAAC;QAClD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,cAAc,GAAG,SAAS,CAAC,cAAc,EAAE,cAAc,CAAC;IAEhE,OAAO,cAAc,KAAK,SAAS;QACjC,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC,CAAC;AAC1D,CAAC,CAAC;AAEF,MAAM,0BAA0B,GAAG,CAAC,EAClC,aAAa,EACb,UAAU,GAMV,EAAsB,EAAE;IACxB,MAAM,cAAc,GAAG,aAAa,CAAC,UAAU,EAAE,cAAc,CAAC;IAEhE,OAAO,cAAc,KAAK,SAAS;QACjC,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC,CAAC;AAC1D,CAAC,CAAC;AAEF,MAAM,qBAAqB,GAAG,CAAC,EAC7B,aAAa,EACb,cAAc,EACd,UAAU,GAOV,EAAU,EAAE;IACZ,MAAM,aAAa,GAAG,gBAAgB,CAAC,cAAc,CAAC,CAAC;IAEvD,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;QAChC,OAAO,UAAU,CAAC,OAAO,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC,CAAC;IAC5D,CAAC;IAED,wEAAwE;IACxE,2DAA2D;IAC3D,MAAM,aAAa,GAAG,6BAA6B,CAAC;QAClD,aAAa;QACb,UAAU;KACX,CAAC,CAAC;IAEH,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;QAChC,OAAO,IAAI,aAAa,GAAG,CAAC;IAC9B,CAAC;IAED,MAAM,UAAU,GAAG,0BAA0B,CAAC;QAC5C,aAAa;QACb,UAAU;KACX,CAAC,CAAC;IAEH,OAAO,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,UAAU,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;AAC3D,CAAC,CAAC;AAEF,MAAM,sBAAsB,GAAG,CAAC,IAAY,EAAU,EAAE;IACtD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAE/B,IAAI,GAAG,CAAC,gBAAgB,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC;QACnC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC;SAC5B,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC;SACxC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC;IAEzD,IAAI,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QACzB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,CAAC;IAEvC,IAAI,SAAS,KAAK,CAAC,EAAE,CAAC;QACpB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,UAAU,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAC3C,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAC3C,CAAC;IAEF,OAAO,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC/B,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,CACb,OAA2D,EAC3D,EACE,aAAa,EACb,cAAc,EACd,SAAS,EACT,kBAAkB,EAClB,UAAU,GACI,EACV,EAAE;IACR,MAAM,gBAAgB,GAAG,GAAW,EAAE;QACpC,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,CACnC,eAAe,CAAC,cAAc,CAAC,MAAM,CAAC,CACvC,CAAC;QAEF,MAAM,kBAAkB,GAAG,qBAAqB,CAAC;YAC/C,aAAa;YACb,cAAc;YACd,UAAU;SACX,CAAC,CAAC;QAEH,MAAM,sBAAsB,GAAG,kBAAkB;aAC9C,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAChB,sBAAsB,CAAC,UAAU,CAAC,OAAO,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC,CACtE;aACA,IAAI,CAAC,IAAI,CAAC,CAAC;QAEd,OAAO,GAAG,UAAU,GAAG,kBAAkB,IAAI,sBAAsB,GAAG,CAAC;IACzE,CAAC,CAAC;IAEF,OAAO,CAAC,MAAM,CAAC;QACb,IAAI,EAAE,eAAe,CAAC,aAAa,CAAC;QACpC,SAAS,EAAE,mBAAmB;QAC9B,GAAG,EAAE,SAAS;YACZ,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CACR,KAAK,CAAC,WAAW,CAAC,eAAe,CAAC,aAAa,CAAC,EAAE,gBAAgB,EAAE,CAAC;YACzE,CAAC,CAAC,IAAI;KACT,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,WAAW,GAAG,OAAO,CAAC;AAE5B;;;GAGG;AACH,MAAM,UAAU,GAAG,CACjB,IAAiC,EACY,EAAE,CAC/C,IAAI,CAAC,IAAI,KAAK,cAAc,CAAC,cAAc;IAC3C,IAAI,CAAC,IAAI,KAAK,cAAc,CAAC,eAAe;IAC1C,CAAC,CAAC,IAAI,CAAC,cAAc;IACrB,CAAC,CAAC,SAAS,CAAC;AAEhB;;;;GAIG;AACH,MAAM,gBAAgB,GAAG,CAAC,EACxB,MAAM,GACgC,EAAW,EAAE,CACnD,aAAa,CAAC,MAAM,CAAC;IACrB,CAAC,MAAM,CAAC,IAAI,KAAK,cAAc,CAAC,gBAAgB;QAC9C,aAAa,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;AAElC;;;GAGG;AACH,MAAM,UAAU,GAAG,CACjB,UAAuB;AACvB,8EAA8E;AAC9E,IAAuB,EACf,EAAE,CACV,UAAU;KACP,SAAS,CAAC,IAAI,CAAC;KACf,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC;KAC3B,IAAI,CAAC,GAAG,CAAC,CAAC;AAEf;;;;;;GAMG;AACH,MAAM,gBAAgB,GAAG,CACvB,QAAuD,EACvD,aAAiC,EACjC,UAAuB,EACd,EAAE,CACX,QAAQ,CAAC,IAAI,KAAK,cAAc,CAAC,aAAa;IAC9C,iBAAiB,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE;QACzC,MAAM,QAAQ,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;QAEnC,OAAO,CACL,QAAQ,KAAK,SAAS;YACtB,UAAU,CAAC,UAAU,EAAE,eAAe,CAAC,QAAQ,CAAC,CAAC,KAAK,aAAa,CACpE,CAAC;IACJ,CAAC,CAAC,CAAC;AAML;;;;;GAKG;AACH,MAAM,qBAAqB,GAAG,CAC5B,MAAqD,EAC5C,EAAE;IACX,IAAI,MAAM,CAAC,IAAI,KAAK,cAAc,CAAC,aAAa,EAAE,CAAC;QACjD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,IAAI,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;IAEtC,OAAO,CACL,IAAI,CAAC,IAAI,KAAK,cAAc,CAAC,uBAAuB;QACpD,GAAG,CAAC,gBAAgB,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC;QACpC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,cAAc,CAAC,WAAW,CAAC,CACxE,CAAC;AACJ,CAAC,CAAC;AAEF;;;GAGG;AACH,MAAM,cAAc,GAAG,CACrB,QAAuD,EACvD,YAAoB,EAC2B,EAAE;IACjD,IAAI,QAAQ,CAAC,IAAI,KAAK,cAAc,CAAC,aAAa,EAAE,CAAC;QACnD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,IAAI,GAAG,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IAExC,OAAO,IAAI,CAAC,IAAI,KAAK,cAAc,CAAC,UAAU,IAAI,IAAI,CAAC,IAAI,KAAK,YAAY;QAC1E,CAAC,CAAC,IAAI;QACN,CAAC,CAAC,SAAS,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,CACzB,OAA2D,EAC3D,aAAqB,EACrB,cAAiD,EACxC,EAAE;IACX,MAAM,KAAK,GAAG,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC,CAAC;IAE3E,MAAM,QAAQ,GAAG,KAAK,CAAC,SAAS,CAAC,IAAI,CACnC,CAAC,YAAY,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,KAAK,aAAa,CACtD,CAAC;IAEF,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC3B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,QAAQ,CAAC,UAAU,CAAC,IAAI,CAC7B,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,UAAU,KAAK,cAAc,CACvD,CAAC;AACJ,CAAC,CAAC"}

package/dist/plugins/total-functions/rules/no-hidden-type-assertions.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"no-hidden-type-assertions.d.mts","sourceRoot":"","sources":["../../../../src/plugins/total-functions/rules/no-hidden-type-assertions.mts"],"names":[],"mappings":"AAIA,OAAO,EAEL,WAAW,EAEZ,MAAM,0BAA0B,CAAC;AA4BlC,oDAAoD;AAEpD,eAAO,MAAM,sBAAsB;;CAyQxB,CAAC"}
+{"version":3,"file":"no-hidden-type-assertions.d.mts","sourceRoot":"","sources":["../../../../src/plugins/total-functions/rules/no-hidden-type-assertions.mts"],"names":[],"mappings":"AAIA,OAAO,EAEL,WAAW,EAEZ,MAAM,0BAA0B,CAAC;AAmBlC,oDAAoD;AAEpD,eAAO,MAAM,sBAAsB;;CAoRxB,CAAC"}

package/dist/plugins/total-functions/rules/no-hidden-type-assertions.mjs

@@ -2,7 +2,7 @@ import { isTypeNeverType, isTypeUnknownType, } from '@typescript-eslint/type-uti
 import { AST_NODE_TYPES, ESLintUtils, } from '@typescript-eslint/utils';
 import { typeWrapperLayers } from 'eslint-rule-forge';
 import { Arr } from 'ts-data-forge';
-import { isArrayTypeNode, isConditionalTypeNode, isFunctionTypeNode, isIndexedAccessTypeNode, isIntersectionTypeNode, isNamedTupleMember, isTupleTypeNode, isTypeLiteralNode, isTypeNode, isTypeOperatorNode, isTypeReferenceNode, isUnionTypeNode, SyntaxKind, } from 'typescript';
+import { forEachChild, isIdentifier, isMappedTypeNode, isTypeParameterDeclaration, isTypeReferenceNode, SyntaxKind, } from 'typescript';
 import { createRule } from './common.mjs';
 
 export const noHiddenTypeAssertions = createRule({
@@ -26,30 +26,20 @@ export const noHiddenTypeAssertions = createRule({
 
 
 
-        const explodeTypeNode = (type) => {
-            const next = isTypeReferenceNode(type)
-                ? (type.typeArguments ?? [])
-                : isConditionalTypeNode(type)
-                    ? [type.checkType, type.trueType, type.falseType]
-                    : isIndexedAccessTypeNode(type)
-                        ? [type.objectType, type.indexType]
-                        : isFunctionTypeNode(type)
-                            ? Arr.toUnshifted(type.type)(parameterTypeNodes(type.parameters))
-                            : isTupleTypeNode(type)
-                                ? type.elements
-                                : isNamedTupleMember(type)
-                                    ? [type.type]
-                                    : isTypeLiteralNode(type)
-                                        ? type.members.flatMap((m) => hasTypeNode(m) ? [m.type] : [])
-                                        : isArrayTypeNode(type)
-                                            ? [type.elementType]
-                                            : isTypeOperatorNode(type)
-                                                ? [type.type]
-                                                : isUnionTypeNode(type) || isIntersectionTypeNode(type)
-                                                    ? type.types
-                                                    : [];
-            return Arr.toUnshifted(type)(next.flatMap(explodeTypeNode));
-        };
+
+
+
+
+
+
+
+        const referencesTypeParameter = (node, typeParameter) => (!isTypeParameterDeclaration(node) || isMappedTypeNode(node.parent)) &&
+            ((isTypeReferenceNode(node) &&
+                isIdentifier(node.typeName) &&
+                node.typeName.text === typeParameter.name &&
+                checker.getSymbolAtLocation(node.typeName) === typeParameter) ||
+                (forEachChild(node, (child) => referencesTypeParameter(child, typeParameter) || undefined) ??
+                    false));
 
 
 
@@ -62,25 +52,42 @@ export const noHiddenTypeAssertions = createRule({
                 typeParameters.length === 0) {
                 return undefined;
             }
-            const returnTypes = explodeTypeNode(returnType);
-            return typeParameters
-                .map((typeParameter, index) => ({ typeParameter, index }))
-                .filter((typeParameter) => returnTypes.some((retType) => isTypeReferenceNode(retType) &&
-                retType.typeName.kind === SyntaxKind.Identifier &&
-                retType.typeName.text === typeParameter.typeParameter.name.text));
+            const used = typeParameters.flatMap((typeParameter, index) => {
+                const symbol = checker.getSymbolAtLocation(typeParameter.name);
+                return symbol !== undefined &&
+                    referencesTypeParameter(returnType, symbol)
+                    ? [{ typeParameter, symbol, index }]
+                    : [];
+            });
+            return Arr.isNonEmpty(used) ? used : undefined;
         };
 
 
 
 
 
-        const returnTypeParamsAppearInValueParams = (declaration, typeParamsUsedInReturnType) => {
-            const parameters = parameterTypeNodes(declaration.parameters).flatMap(explodeTypeNode);
-            return typeParamsUsedInReturnType
-                .map(({ typeParameter }) => typeParameter)
-                .every((typeParameter) => parameters.some((parameter) => isTypeReferenceNode(parameter) &&
-                parameter.typeName.kind === SyntaxKind.Identifier &&
-                typeParameter.name.text === parameter.typeName.text));
+        const returnTypeParamsAppearInValueParams = (declaration, typeParamsUsedInReturnType) => typeParamsUsedInReturnType.every(({ symbol }) => declaration.parameters.some((parameter) => parameter.type !== undefined &&
+            referencesTypeParameter(parameter.type, symbol)));
+        const mut_analysisCache = new WeakMap();
+
+
+
+
+
+
+        const analyzeSignature = (declaration) => {
+            if (mut_analysisCache.has(declaration)) {
+                return mut_analysisCache.get(declaration);
+            }
+            const typeParamsUsedInReturnType = typeParamsUsedInReturnTypeOf(declaration);
+            const analysis = typeParamsUsedInReturnType === undefined
+                ? undefined
+                : {
+                    typeParamsUsedInReturnType,
+                    appearInValueParams: returnTypeParamsAppearInValueParams(declaration, typeParamsUsedInReturnType),
+                };
+            mut_analysisCache.set(declaration, analysis);
+            return analysis;
         };
 
 
@@ -92,9 +99,8 @@ export const noHiddenTypeAssertions = createRule({
                 declaration.kind === SyntaxKind.JSDocSignature) {
                 return false;
             }
-            const typeParamsUsedInReturnType = typeParamsUsedInReturnTypeOf(declaration);
-            return (typeParamsUsedInReturnType !== undefined &&
-                !returnTypeParamsAppearInValueParams(declaration, typeParamsUsedInReturnType));
+            const analysis = analyzeSignature(declaration);
+            return analysis !== undefined && !analysis.appearInValueParams;
         });
 
 
@@ -142,14 +148,15 @@ export const noHiddenTypeAssertions = createRule({
 
                     return;
                 }
-                const typeParamsUsedInReturnType = typeParamsUsedInReturnTypeOf(callSignature.declaration);
-                if (typeParamsUsedInReturnType === undefined) {
+                const analysis = analyzeSignature(callSignature.declaration);
+                if (analysis === undefined) {
                     return;
                 }
 
 
 
-                const allCorrespondingTypeArgumentsAreUnknownType = typeParamsUsedInReturnType.every(({ index, typeParameter }) => {
+
+                const allCorrespondingTypeArgumentsAreUnknownType = analysis.typeParamsUsedInReturnType.every(({ index, typeParameter }) => {
                     const typeArgument = (tsExpressionNode.typeArguments ?? [])[index];
                     const typeArgumentType = typeArgument !== undefined
                         ? checker.getTypeAtLocation(typeArgument)
@@ -164,7 +171,7 @@ export const noHiddenTypeAssertions = createRule({
                 if (allCorrespondingTypeArgumentsAreUnknownType) {
                     return;
                 }
-                if (!returnTypeParamsAppearInValueParams(callSignature.declaration, typeParamsUsedInReturnType)) {
+                if (!analysis.appearInValueParams) {
                     context.report({
                         node,
                         messageId: 'errorStringGeneric',
@@ -174,20 +181,4 @@ export const noHiddenTypeAssertions = createRule({
         };
     },
 });
-
-
-
-
-const parameterTypeNodes = (parameters) => parameters.flatMap((parameter) => parameter.type !== undefined ? [parameter.type] : []);
-const hasTypeNode = (typeElement) => {
-    try {
-
-        const typeAttr = typeElement
-            .type;
-        return typeAttr !== undefined && isTypeNode(typeAttr);
-    }
-    catch {
-        return false;
-    }
-};
 //# sourceMappingURL=no-hidden-type-assertions.mjs.map