eslint-rule-forge 0.3.2 → 0.5.0

package/README.md

@@ -121,6 +121,12 @@ The range and the text of a node leave out the parentheses written around it.
 | `getRangeWithParens` | the node's range including them                                     |
 | `getArgumentText`    | the node's text for an argument list, `(a, b)` kept as one argument |
 
+## Statements
+
+| Helper      | What it gives                                                                                |
+| :---------- | :------------------------------------------------------------------------------------------- |
+| `siblingOf` | the statement after (`1`) or before (`-1`) a node in its statement list, through an `export` |
+
 ## Imports and bindings
 
 | Helper                  | What it gives                                                                                        |
@@ -128,19 +134,24 @@ The range and the text of a node leave out the parentheses written around it.
 | `getImportDeclarations` | every `import … from '<module>'` in the file, not only the first                                     |
 | `getNamedImports`       | the export names those declarations import                                                           |
 | `getImportedLocalName`  | the local name an export is imported as (`'y'` for `import { x as y }`)                              |
+| `importedNameOf`        | the export name an import specifier imports (`'x'` for `import { x as y }`)                          |
 | `buildCalleeResolver`   | which export a callee calls, through aliases, namespace imports and type wrappers                    |
-| `buildNamedImportFix`   | a fix inserting `import { … } from '<module>';`, for an import sorter to place                       |
+| `bindValueImports`      | the local names to write for exports, and the edits binding them as values (in the existing import)  |
+| `buildNamedImportFix`   | a fix inserting a new `import { … } from '<module>';` after the directive prologue                   |
+| `addTypeImports`        | the edits importing types: into an `import type { … }`, else as `type X` into another import         |
+| `addToImportBraces`     | a fix adding specifiers to a declaration's braces, empty ones included, or `undefined` without any   |
 | `hasForeignBinding`     | whether a name, at a node, is bound to something other than the module's import (a fix must give up) |
 | `isLocallyBound`        | whether a name, at a node, is declared in the file rather than a global or a standard-library type   |
+| `hasCommentWithin`      | whether a comment inside a node lies in ranges a fix would delete (the fix must give up)             |
 
 ```ts
 import type { TSESLint } from '@typescript-eslint/utils';
 import {
+    bindValueImports,
     buildCalleeResolver,
-    buildNamedImportFix,
     getImportDeclarations,
-    getImportedLocalName,
     hasForeignBinding,
+    type ValueImportBinding,
 } from 'eslint-rule-forge';
 
 const MODULE = 'my-lib';
@@ -156,9 +167,9 @@ export const preferIsNullish: TSESLint.RuleModule<'preferIsNullish'> = {
         defaultOptions: [],
     },
     create: (context) => {
-        const program = context.sourceCode.ast;
+        const sourceCode = context.sourceCode;
 
-        const declarations = getImportDeclarations(program, MODULE);
+        const declarations = getImportDeclarations(sourceCode.ast, MODULE);
 
         // `isNull(x)`, `n(x)` after `import { isNull as n }` and `lib.isNull(x)`
         // after `import * as lib` all call `isNull`.
@@ -172,37 +183,33 @@ export const preferIsNullish: TSESLint.RuleModule<'preferIsNullish'> = {
                     return;
                 }
 
-                const importedAs = getImportedLocalName(
-                    declarations,
-                    'isNullish',
-                );
-
-                const name = resolved.isNamespace
-                    ? 'isNullish'
-                    : (importedAs ?? 'isNullish');
+                // `lib.isNullish` needs no import. Otherwise `isNullish` is written by
+                // the name it is imported as, added to the existing named import, or
+                // has its `type` dropped; `undefined` when none of that can bind it.
+                const binding: ValueImportBinding | undefined =
+                    resolved.isNamespace
+                        ? { localNames: ['isNullish'], edits: () => [] }
+                        : bindValueImports(sourceCode, MODULE, ['isNullish']);
 
-                // A local `isNullish` that is not `my-lib`'s would capture the call.
-                const canFix =
-                    resolved.isNamespace ||
-                    !hasForeignBinding(context.sourceCode, node, name, MODULE);
+                const name = binding?.localNames[0];
 
                 context.report({
                     node,
                     messageId: 'preferIsNullish',
-                    fix: canFix
-                        ? (fixer) => [
-                              ...(importedAs !== undefined ||
-                              resolved.isNamespace
-                                  ? []
-                                  : buildNamedImportFix(
-                                        fixer,
-                                        program,
-                                        MODULE,
-                                        [name],
-                                    )),
-                              fixer.replaceText(resolved.propertyNode, name),
-                          ]
-                        : null,
+                    fix:
+                        binding === undefined ||
+                        name === undefined ||
+                        // A local `isNullish` that is not `my-lib`'s would capture the call.
+                        (!resolved.isNamespace &&
+                            hasForeignBinding(sourceCode, node, name, MODULE))
+                            ? null
+                            : (fixer) => [
+                                  ...binding.edits(fixer),
+                                  fixer.replaceText(
+                                      resolved.propertyNode,
+                                      name,
+                                  ),
+                              ],
                 });
             },
         };
@@ -213,18 +220,18 @@ export const preferIsNullish: TSESLint.RuleModule<'preferIsNullish'> = {
 ## Rule factories
 
 Rules that several plugins carry, differing only in the module whose functions
-the fix writes. Each factory takes the module name (and the namespace the
+the fix or suggestion writes. Each factory takes the module name (and the namespace the
 function is reached through, where there is one) and returns a complete rule,
 so that a fix to the rule reaches every plugin that builds it.
 
-| Factory                         | The rule it builds                                                                                        |
-| :------------------------------ | :-------------------------------------------------------------------------------------------------------- |
-| `createPreferIsNonNullObject`   | `typeof u === 'object' && u !== null` → `isNonNullObject(u)`                                              |
-| `createPreferIsRecordAndHasKey` | `Object.hasOwn(obj, key)` and `key in obj` → `isRecord(obj) && hasKey(obj, key)`, or `hasKey` on a record |
-| `createPreferArrayIsArray`      | `Array.isArray` → `<namespace>.isArray`                                                                   |
-| `createPreferSafeParseInt`      | `parseInt(x)`, `parseInt(x, 10)` → `Result.unwrapOkOr(<namespace>.<method>(x), Number.NaN)`               |
-| `createPreferSafeParseFloat`    | `parseFloat(x)`, `Number.parseFloat(x)`, `Number(x)` → the same, for a `string` `x`                       |
-| `createNoSideEffectImport`      | removes `import '<module>';`, with the reason the caller gives                                            |
+| Factory                         | The rule it builds                                                                                                                                      |
+| :------------------------------ | :------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| `createPreferIsNonNullObject`   | `typeof u === 'object' && u !== null` → `isNonNullObject(u)`                                                                                            |
+| `createPreferIsRecordAndHasKey` | `Object.hasOwn(obj, key)` and `key in obj` → `isRecord(obj) && hasKey(obj, key)`, or `hasKey` on a record                                               |
+| `createPreferArrayIsArray`      | `Array.isArray` → `<namespace>.isArray`                                                                                                                 |
+| `createPreferSafeParseInt`      | `parseInt(x)`, `parseInt(x, 10)` → `Result.unwrapOkOr(<namespace>.<method>(x), Number.NaN)`, as a suggestion only, since some strings parse differently |
+| `createPreferSafeParseFloat`    | `parseFloat(x)`, `Number.parseFloat(x)`, `Number(x)` → the same, for a `string` `x`, also a suggestion only                                             |
+| `createNoSideEffectImport`      | removes `import '<module>';`, with the reason the caller gives                                                                                          |
 
 ## License
 

package/dist/bindings.d.mts

@@ -1,7 +1,7 @@
 import { type TSESLint, type TSESTree } from '@typescript-eslint/utils';
 /**
- * Whether `name`, read at `node`, resolves to something this file writes down
- * — a declaration, a parameter, an import — rather than to a global or a
+ * Whether `name`, read at `node`, resolves to something this file writes down —
+ * a declaration, a parameter, an import — rather than to a global or a
  * standard-library type of the same name.
  *
  * The scope manager makes an implicit variable for every reference it cannot
@@ -12,9 +12,8 @@ export declare const isLocallyBound: (sourceCode: TSESLint.SourceCode, node: TSE
 /**
  * Whether `name`, read at `node`, resolves to a binding that is not an import
  * from `moduleName` — a declaration, a parameter, or an import from another
- * module. A fix that makes code at `node` refer to `moduleName`'s export
- * `name` has to give up then, because the name would refer to that binding
- * instead.
+ * module. A fix that makes code at `node` refer to `moduleName`'s export `name`
+ * has to give up then, because the name would refer to that binding instead.
  *
  * The innermost binding decides: an import from `moduleName` at the top of the
  * file does not help a name a function shadows around `node`.

package/dist/bindings.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"bindings.d.mts","sourceRoot":"","sources":["../src/bindings.mts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,QAAQ,EACb,KAAK,QAAQ,EACd,MAAM,0BAA0B,CAAC;AAIlC;;;;;;;;GAQG;AACH,eAAO,MAAM,cAAc,eACb,QAAQ,CAAC,UAAU,QACzB,QAAQ,CAAC,IAAI,QACb,MAAM,KACX,OAIF,CAAC;AAEF;;;;;;;;;GASG;AACH,eAAO,MAAM,iBAAiB,eAChB,QAAQ,CAAC,UAAU,QACzB,QAAQ,CAAC,IAAI,QACb,MAAM,cACA,MAAM,KACjB,OAIF,CAAC"}
+{"version":3,"file":"bindings.d.mts","sourceRoot":"","sources":["../src/bindings.mts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,QAAQ,EACb,KAAK,QAAQ,EACd,MAAM,0BAA0B,CAAC;AAIlC;;;;;;;;GAQG;AACH,eAAO,MAAM,cAAc,eACb,QAAQ,CAAC,UAAU,QACzB,QAAQ,CAAC,IAAI,QACb,MAAM,KACX,OAIF,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,iBAAiB,eAChB,QAAQ,CAAC,UAAU,QACzB,QAAQ,CAAC,IAAI,QACb,MAAM,cACA,MAAM,KACjB,OAIF,CAAC"}

package/dist/bindings.mjs

@@ -22,7 +22,6 @@ export const isLocallyBound = (sourceCode, node, name) => {
 
 
 
-
 export const hasForeignBinding = (sourceCode, node, name, moduleName) => {
     const variable = ASTUtils.findVariable(sourceCode.getScope(node), name);
     return variable?.defs.some((def) => !isImportFrom(def, moduleName)) ?? false;

package/dist/bindings.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"bindings.mjs","sourceRoot":"","sources":["../src/bindings.mts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,QAAQ,GAGT,MAAM,0BAA0B,CAAC;AAElC,uEAAuE;AAEvE;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,CAC5B,UAA+B,EAC/B,IAAmB,EACnB,IAAY,EACH,EAAE;IACX,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC;IAExE,OAAO,QAAQ,KAAK,IAAI,IAAI,QAAQ,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;AACvD,CAAC,CAAC;AAEF;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,UAA+B,EAC/B,IAAmB,EACnB,IAAY,EACZ,UAAkB,EACT,EAAE;IACX,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC;IAExE,OAAO,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,YAAY,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC,IAAI,KAAK,CAAC;AAC/E,CAAC,CAAC;AAEF;;;GAGG;AACH,MAAM,YAAY,GAAG,CACnB,GAA8B,EAC9B,UAAkB,EACT,EAAE,CACX,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,KAAK,cAAc,CAAC,eAAe;IAC/C,GAAG,CAAC,IAAI,CAAC,IAAI,KAAK,cAAc,CAAC,sBAAsB;IACvD,GAAG,CAAC,IAAI,CAAC,IAAI,KAAK,cAAc,CAAC,wBAAwB,CAAC;IAC5D,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,cAAc,CAAC,iBAAiB;IACzD,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,KAAK,UAAU,CAAC"}
+{"version":3,"file":"bindings.mjs","sourceRoot":"","sources":["../src/bindings.mts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,QAAQ,GAGT,MAAM,0BAA0B,CAAC;AAElC,uEAAuE;AAEvE;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,CAC5B,UAA+B,EAC/B,IAAmB,EACnB,IAAY,EACH,EAAE;IACX,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC;IAExE,OAAO,QAAQ,KAAK,IAAI,IAAI,QAAQ,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;AACvD,CAAC,CAAC;AAEF;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,UAA+B,EAC/B,IAAmB,EACnB,IAAY,EACZ,UAAkB,EACT,EAAE;IACX,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC;IAExE,OAAO,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,YAAY,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC,IAAI,KAAK,CAAC;AAC/E,CAAC,CAAC;AAEF;;;GAGG;AACH,MAAM,YAAY,GAAG,CACnB,GAA8B,EAC9B,UAAkB,EACT,EAAE,CACX,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,KAAK,cAAc,CAAC,eAAe;IAC/C,GAAG,CAAC,IAAI,CAAC,IAAI,KAAK,cAAc,CAAC,sBAAsB;IACvD,GAAG,CAAC,IAAI,CAAC,IAAI,KAAK,cAAc,CAAC,wBAAwB,CAAC;IAC5D,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,cAAc,CAAC,iBAAiB;IACzD,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,KAAK,UAAU,CAAC"}

package/dist/comments.d.mts

@@ -0,0 +1,10 @@
+import type { TSESLint, TSESTree } from '@typescript-eslint/utils';
+import type { DeepReadonly } from 'ts-type-forge';
+/**
+ * Whether a comment inside `node` lies within one of `ranges`, which a fix
+ * would delete along with it. Such a fix is dropped instead of the comment.
+ * Only comments inside `node` are looked at, so each range has to lie within
+ * it.
+ */
+export declare const hasCommentWithin: (sourceCode: TSESLint.SourceCode, node: TSESTree.Node, ranges: DeepReadonly<TSESTree.Range[]>) => boolean;
+//# sourceMappingURL=comments.d.mts.map

package/dist/comments.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"comments.d.mts","sourceRoot":"","sources":["../src/comments.mts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAIlD;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,eACf,QAAQ,CAAC,UAAU,QACzB,QAAQ,CAAC,IAAI,UACX,YAAY,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,KACrC,OAOE,CAAC"}

package/dist/comments.mjs

@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+export const hasCommentWithin = (sourceCode, node, ranges) => sourceCode
+    .getCommentsInside(node)
+    .some((comment) => ranges.some(([start, end]) => start <= comment.range[0] && comment.range[1] <= end));
+//# sourceMappingURL=comments.mjs.map

package/dist/comments.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"comments.mjs","sourceRoot":"","sources":["../src/comments.mts"],"names":[],"mappings":"AAGA,uEAAuE;AAEvE;;;;;GAKG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC9B,UAA+B,EAC/B,IAAmB,EACnB,MAAsC,EAC7B,EAAE,CACX,UAAU;KACP,iBAAiB,CAAC,IAAI,CAAC;KACvB,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAChB,MAAM,CAAC,IAAI,CACT,CAAC,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,GAAG,CACvE,CACF,CAAC"}

package/dist/imports.d.mts

@@ -22,8 +22,8 @@ export type ResolvedCallee = Readonly<{
     /** The exported name, whatever the callee calls it locally. */
     canonicalName: string;
     /**
-     * The identifier to rewrite to change what is called: the callee itself for
-     * a named import, the property for a namespace import.
+     * The identifier to rewrite to change what is called: the callee itself for a
+     * named import, the property for a namespace import.
      */
     propertyNode: TSESTree.Identifier;
     /** Whether the call goes through a namespace import (`m.f(...)`). */
@@ -41,14 +41,74 @@ export type ResolvedCallee = Readonly<{
 export declare const buildCalleeResolver: (declarations: DeepReadonly<TSESTree.ImportDeclaration[]>) => ((callee: TSESTree.Expression) => ResolvedCallee | undefined);
 /**
  * A fix that inserts `import { <specifiers> } from '<moduleName>';` at the top
- * of the file, or no fix when `specifiers` is empty. Each specifier is written
+ * of the file, after its directive prologue (`'use client';` stays a
+ * directive), or no fix when `specifiers` is empty. Each specifier is written
  * as given, so `type T` imports a type.
  *
- * The placement is deliberately naive: an import sorter
- * (prettier-plugin-organize-imports or any equivalent) merges and orders it
- * afterwards. Put every name one report needs into a single call: ESLint
- * merges the fixes of one report into one edit, and two fixes inserting at the
- * start of the file conflict, so that one of them is dropped.
+ * Use it only when the file does not import from `moduleName` by name;
+ * {@link bindValueImports} adds to an existing declaration instead, which keeps
+ * `import-x/no-duplicates` satisfied, and falls back to this. An import sorter
+ * orders the declaration afterwards. Put every name one report needs into a
+ * single call: ESLint merges the fixes of one report into one edit, and two
+ * fixes inserting at the same place conflict, so that one of them is dropped.
  */
 export declare const buildNamedImportFix: (fixer: TSESLint.RuleFixer, program: TSESTree.Program, moduleName: string, specifiers: readonly string[]) => readonly TSESLint.RuleFix[];
+/**
+ * The local names `moduleName`'s exports `exportNames` are bound to as values
+ * once `edits` are made, in the same order, or `undefined` when one of them
+ * cannot be bound.
+ *
+ * - Imported as a value: that local name, and no edit.
+ * - Imported by `import { type x }`: the edit drops `type`, keeping a comment
+ *   after it.
+ * - Not imported: the edit adds it to the braces of the first import from the
+ *   module that has a value specifier, or else of the first other one with
+ *   braces that is not `import type`, empty braces included (`import {}`,
+ *   `import D, {}`).
+ *   Adding it there rather than in a new declaration keeps
+ *   `import-x/no-duplicates` satisfied. Failing that, it goes into new braces
+ *   after a lone default import (`import D, { x }`), and when the module has
+ *   neither, a new declaration goes after the directive prologue
+ *   ({@link buildNamedImportFix}).
+ * - Refused when an import already binds the name to something else
+ *   (`import type { x }`, `import { y as x }`, `import { x } from 'other'`),
+ *   where adding it would be a duplicate binding.
+ *
+ * ESLint's default parser leaves `importKind` out, which counts as a value
+ * import. Every name a fix writes is bound by that fix's own edits rather than
+ * left to another report's: an editor applies one fix at a time, and a fix that
+ * loses a conflict with another in the same pass is dropped. Fixes that all add
+ * a name overlap, so `--fix` applies one per pass, and the rest in the next, by
+ * when the file imports it. Whether something other than an import binds the
+ * name where it is written is the caller's to check
+ * ({@link hasForeignBinding}).
+ */
+export declare const bindValueImports: (sourceCode: TSESLint.SourceCode, moduleName: string, exportNames: readonly string[]) => ValueImportBinding | undefined;
+/**
+ * The edits that import `moduleName`'s types `names` the file does not import
+ * yet: added to an existing `import type { … }` from the module (`, X`), else
+ * as `type X` to another import from it, chosen as {@link bindValueImports}
+ * chooses one, and only failing those as a new
+ * `import { type X } from '<module>'` after the directive prologue. Adding to
+ * an existing declaration keeps `import-x/no-duplicates` satisfied. Whether the
+ * file binds a name to something else is the caller's to check.
+ */
+export declare const addTypeImports: (fixer: TSESLint.RuleFixer, sourceCode: TSESLint.SourceCode, moduleName: string, names: readonly string[]) => readonly TSESLint.RuleFix[];
+/**
+ * Adds `specifiers` to the `{ … }` of `declaration`: after its last named
+ * specifier, or inside empty braces (`import d, {} from …`). `undefined` when
+ * the declaration has no braces (a default or namespace import alone) or there
+ * is nothing to add. The braces of import attributes (`with { … }`) are not
+ * taken for them.
+ */
+export declare const addToImportBraces: (fixer: TSESLint.RuleFixer, sourceCode: TSESLint.SourceCode, declaration: TSESTree.ImportDeclaration, specifiers: readonly string[]) => TSESLint.RuleFix | undefined;
+/** The exported name `specifier` imports: `x` for `import { x as y }`. */
+export declare const importedNameOf: (specifier: DeepReadonly<TSESTree.ImportSpecifier>) => string;
+/** What {@link bindValueImports} gives. */
+export type ValueImportBinding = Readonly<{
+    /** The names to write, in the order of the export names asked for. */
+    localNames: readonly string[];
+    /** The edits that bring every one of them into scope. */
+    edits: (fixer: TSESLint.RuleFixer) => readonly TSESLint.RuleFix[];
+}>;
 //# sourceMappingURL=imports.d.mts.map

package/dist/imports.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"imports.d.mts","sourceRoot":"","sources":["../src/imports.mts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,QAAQ,EACb,KAAK,QAAQ,EACd,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAKlD;;;;GAIG;AACH,eAAO,MAAM,qBAAqB,YACvB,QAAQ,CAAC,OAAO,cACb,MAAM,KACjB,SAAS,QAAQ,CAAC,iBAAiB,EAKnC,CAAC;AAEJ;;;GAGG;AACH,eAAO,MAAM,eAAe,iBACZ,YAAY,CAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC,KACvD,SAAS,MAAM,EAOf,CAAC;AAEJ;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,iBACjB,YAAY,CAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC,gBAC1C,MAAM,KACnB,MAAM,GAAG,SAOK,CAAC;AAElB,uEAAuE;AACvE,MAAM,MAAM,cAAc,GAAG,QAAQ,CAAC;IACpC,+DAA+D;IAC/D,aAAa,EAAE,MAAM,CAAC;IAEtB;;;OAGG;IACH,YAAY,EAAE,QAAQ,CAAC,UAAU,CAAC;IAElC,qEAAqE;IACrE,WAAW,EAAE,OAAO,CAAC;CACtB,CAAC,CAAC;AAEH;;;;;;;;GAQG;AACH,eAAO,MAAM,mBAAmB,iBAChB,YAAY,CAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC,KACvD,CAAC,CAAC,MAAM,EAAE,QAAQ,CAAC,UAAU,KAAK,cAAc,GAAG,SAAS,CAuD9D,CAAC;AAEF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,mBAAmB,UACvB,QAAQ,CAAC,SAAS,WAChB,QAAQ,CAAC,OAAO,cACb,MAAM,cACN,SAAS,MAAM,EAAE,KAC5B,SAAS,QAAQ,CAAC,OAAO,EAQX,CAAC"}
+{"version":3,"file":"imports.d.mts","sourceRoot":"","sources":["../src/imports.mts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,QAAQ,EACb,KAAK,QAAQ,EACd,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAKlD;;;;GAIG;AACH,eAAO,MAAM,qBAAqB,YACvB,QAAQ,CAAC,OAAO,cACb,MAAM,KACjB,SAAS,QAAQ,CAAC,iBAAiB,EAKnC,CAAC;AAEJ;;;GAGG;AACH,eAAO,MAAM,eAAe,iBACZ,YAAY,CAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC,KACvD,SAAS,MAAM,EAOf,CAAC;AAEJ;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,iBACjB,YAAY,CAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC,gBAC1C,MAAM,KACnB,MAAM,GAAG,SAOK,CAAC;AAElB,uEAAuE;AACvE,MAAM,MAAM,cAAc,GAAG,QAAQ,CAAC;IACpC,+DAA+D;IAC/D,aAAa,EAAE,MAAM,CAAC;IAEtB;;;OAGG;IACH,YAAY,EAAE,QAAQ,CAAC,UAAU,CAAC;IAElC,qEAAqE;IACrE,WAAW,EAAE,OAAO,CAAC;CACtB,CAAC,CAAC;AAEH;;;;;;;;GAQG;AACH,eAAO,MAAM,mBAAmB,iBAChB,YAAY,CAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC,KACvD,CAAC,CAAC,MAAM,EAAE,QAAQ,CAAC,UAAU,KAAK,cAAc,GAAG,SAAS,CAuD9D,CAAC;AAEF;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,mBAAmB,UACvB,QAAQ,CAAC,SAAS,WAChB,QAAQ,CAAC,OAAO,cACb,MAAM,cACN,SAAS,MAAM,EAAE,KAC5B,SAAS,QAAQ,CAAC,OAAO,EAgC3B,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,eAAO,MAAM,gBAAgB,eACf,QAAQ,CAAC,UAAU,cACnB,MAAM,eACL,SAAS,MAAM,EAAE,KAC7B,kBAAkB,GAAG,SAyCvB,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,cAAc,UAClB,QAAQ,CAAC,SAAS,cACb,QAAQ,CAAC,UAAU,cACnB,MAAM,SACX,SAAS,MAAM,EAAE,KACvB,SAAS,QAAQ,CAAC,OAAO,EAqB3B,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,iBAAiB,UACrB,QAAQ,CAAC,SAAS,cACb,QAAQ,CAAC,UAAU,eAClB,QAAQ,CAAC,iBAAiB,cAC3B,SAAS,MAAM,EAAE,KAC5B,QAAQ,CAAC,OAAO,GAAG,SAwBrB,CAAC;AAEF,0EAA0E;AAC1E,eAAO,MAAM,cAAc,cACd,YAAY,CAAC,QAAQ,CAAC,eAAe,CAAC,KAChD,MAG2B,CAAC;AAoD/B,2CAA2C;AAC3C,MAAM,MAAM,kBAAkB,GAAG,QAAQ,CAAC;IACxC,sEAAsE;IACtE,UAAU,EAAE,SAAS,MAAM,EAAE,CAAC;IAE9B,yDAAyD;IACzD,KAAK,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC,SAAS,KAAK,SAAS,QAAQ,CAAC,OAAO,EAAE,CAAC;CACnE,CAAC,CAAC"}

package/dist/imports.mjs

@@ -79,12 +79,208 @@ export const buildCalleeResolver = (declarations) => {
 
 
 
-export const buildNamedImportFix = (fixer, program, moduleName, specifiers) => specifiers.length === 0
-    ? []
-    : [
-        fixer.insertTextBefore(program, `import { ${specifiers.join(', ')} } from '${moduleName}';\n`),
-    ];
-const importedNameOf = (specifier) => specifier.imported.type === AST_NODE_TYPES.Identifier
+
+
+export const buildNamedImportFix = (fixer, program, moduleName, specifiers) => {
+    if (specifiers.length === 0) {
+        return [];
+    }
+    const declaration = `import { ${specifiers.join(', ')} } from '${moduleName}';`;
+    const lastDirective = program.body
+        .filter((statement) => statement.type === AST_NODE_TYPES.ExpressionStatement &&
+        statement.directive !== undefined)
+        .at(-1);
+    if (lastDirective === undefined) {
+        return [fixer.insertTextBefore(program, `${declaration}\n`)];
+    }
+
+
+    const anchor = (program.comments ?? [])
+        .filter((comment) => comment.range[0] >= lastDirective.range[1] &&
+        comment.loc.start.line === lastDirective.loc.end.line)
+        .at(-1) ?? lastDirective;
+    return [fixer.insertTextAfter(anchor, `\n${declaration}`)];
+};
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+export const bindValueImports = (sourceCode, moduleName, exportNames) => {
+    const program = sourceCode.ast;
+    const allImports = program.body.filter((node) => node.type === AST_NODE_TYPES.ImportDeclaration);
+    const declarations = getImportDeclarations(program, moduleName);
+    const named = declarations.flatMap((declaration) => declaration.specifiers.flatMap((specifier) => specifier.type === AST_NODE_TYPES.ImportSpecifier
+        ? [{ declaration, specifier }]
+        : []));
+    const bindings = exportNames.map((exportName) => bindingOf(sourceCode, allImports, named, exportName));
+    if (bindings.includes(undefined)) {
+        return undefined;
+    }
+    const defined = bindings.filter((b) => b !== undefined);
+    const toAdd = defined.flatMap((b) => (b.isAdded ? [b.localName] : []));
+    const hosts = hostsFor(declarations);
+    return {
+        localNames: defined.map((b) => b.localName),
+        edits: (fixer) => [
+            ...defined.flatMap((b) => b.edits(fixer)),
+            ...(toAdd.length === 0
+                ? []
+                : addToFirstHost(fixer, sourceCode, moduleName, hosts, toAdd)),
+        ],
+    };
+};
+
+
+
+
+
+
+
+
+
+export const addTypeImports = (fixer, sourceCode, moduleName, names) => {
+    if (names.length === 0) {
+        return [];
+    }
+    const declarations = getImportDeclarations(sourceCode.ast, moduleName);
+    const typeOnlyFix = firstFix(declarations.filter(isTypeOnlyDeclaration), (declaration) => addToImportBraces(fixer, sourceCode, declaration, names));
+    return typeOnlyFix !== undefined
+        ? [typeOnlyFix]
+        : addToFirstHost(fixer, sourceCode, moduleName, hostsFor(declarations), names.map((name) => `type ${name}`));
+};
+
+
+
+
+
+
+
+export const addToImportBraces = (fixer, sourceCode, declaration, specifiers) => {
+    if (specifiers.length === 0) {
+        return undefined;
+    }
+    const lastNamed = declaration.specifiers
+        .filter((specifier) => specifier.type === AST_NODE_TYPES.ImportSpecifier)
+        .at(-1);
+    if (lastNamed !== undefined) {
+        return fixer.insertTextAfter(lastNamed, `, ${specifiers.join(', ')}`);
+    }
+    const openingBrace = sourceCode.getFirstToken(declaration, {
+        filter: (token) => token.value === '{' && token.range[1] <= declaration.source.range[0],
+    });
+    return openingBrace === null
+        ? undefined
+        : fixer.insertTextAfter(openingBrace, ` ${specifiers.join(', ')} `);
+};
+
+export const importedNameOf = (specifier) => specifier.imported.type === AST_NODE_TYPES.Identifier
     ? specifier.imported.name
     : specifier.imported.value;
+
+const firstFix = (declarations, toFix) => {
+    for (const declaration of declarations) {
+        const fix = toFix(declaration);
+        if (fix !== undefined) {
+            return fix;
+        }
+    }
+    return undefined;
+};
+
+
+
+
+
+
+const addToFirstHost = (fixer, sourceCode, moduleName, hosts, specifiers) => {
+    const intoBraces = firstFix(hosts, (declaration) => addToImportBraces(fixer, sourceCode, declaration, specifiers));
+    if (intoBraces !== undefined) {
+        return [intoBraces];
+    }
+    const defaultHost = hosts.find((declaration) => declaration.specifiers.length === 1 &&
+        declaration.specifiers[0]?.type === AST_NODE_TYPES.ImportDefaultSpecifier)?.specifiers[0];
+    return defaultHost !== undefined
+        ? [fixer.insertTextAfter(defaultHost, `, { ${specifiers.join(', ')} }`)]
+        : buildNamedImportFix(fixer, sourceCode.ast, moduleName, specifiers);
+};
+
+const isTypeOnlyDeclaration = (declaration) => declaration.importKind === 'type';
+
+const isNotTypeOnly = ({ declaration }) => !isTypeOnlyDeclaration(declaration);
+
+const isValueImport = ({ declaration, specifier }) => isNotTypeOnly({ declaration, specifier }) && specifier.importKind !== 'type';
+
+
+
+
+
+
+const hostsFor = (declarations) => {
+    const notTypeOnly = declarations.filter((declaration) => !isTypeOnlyDeclaration(declaration));
+    const hasValueSpecifier = (declaration) => declaration.specifiers.some((specifier) => specifier.type === AST_NODE_TYPES.ImportSpecifier &&
+        isValueImport({ declaration, specifier }));
+    return [
+        ...notTypeOnly.filter(hasValueSpecifier),
+        ...notTypeOnly.filter((declaration) => !hasValueSpecifier(declaration)),
+    ];
+};
+const bindingOf = (sourceCode, allImports, named, exportName) => {
+    const matching = named.filter(({ specifier }) => importedNameOf(specifier) === exportName);
+    const value = matching.find(isValueImport);
+    if (value !== undefined) {
+        return {
+            localName: value.specifier.local.name,
+            isAdded: false,
+            edits: () => [],
+        };
+    }
+    const inlineType = matching.find(isNotTypeOnly)?.specifier;
+    if (inlineType !== undefined) {
+        const typeKeyword = sourceCode.getFirstToken(inlineType);
+
+
+        const next = typeKeyword === null
+            ? null
+            : sourceCode.getTokenAfter(typeKeyword, { includeComments: true });
+        return typeKeyword === null || next === null
+            ? undefined
+            : {
+                localName: inlineType.local.name,
+                isAdded: false,
+                edits: (fixer) => [
+                    fixer.removeRange([typeKeyword.range[0], next.range[0]]),
+                ],
+            };
+    }
+    const isTaken = allImports.some((declaration) => declaration.specifiers.some((specifier) => specifier.local.name === exportName));
+    return isTaken
+        ? undefined
+        : { localName: exportName, isAdded: true, edits: () => [] };
+};
 //# sourceMappingURL=imports.mjs.map

package/dist/imports.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"imports.mjs","sourceRoot":"","sources":["../src/imports.mts"],"names":[],"mappings":"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"}
+{"version":3,"file":"imports.mjs","sourceRoot":"","sources":["../src/imports.mts"],"names":[],"mappings":"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"}

package/dist/index.d.mts

@@ -1,7 +1,9 @@
 export * from './bindings.mjs';
+export * from './comments.mjs';
 export * from './imports.mjs';
 export * from './negation.mjs';
 export * from './parentheses.mjs';
 export * from './rules/index.mjs';
+export * from './statements.mjs';
 export * from './type-wrappers.mjs';
 //# sourceMappingURL=index.d.mts.map

package/dist/index.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.mts","sourceRoot":"","sources":["../src/index.mts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC"}
+{"version":3,"file":"index.d.mts","sourceRoot":"","sources":["../src/index.mts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AACjC,cAAc,qBAAqB,CAAC"}

package/dist/index.mjs

@@ -1,7 +1,9 @@
 export * from './bindings.mjs';
+export * from './comments.mjs';
 export * from './imports.mjs';
 export * from './negation.mjs';
 export * from './parentheses.mjs';
 export * from './rules/index.mjs';
+export * from './statements.mjs';
 export * from './type-wrappers.mjs';
 //# sourceMappingURL=index.mjs.map

package/dist/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","sourceRoot":"","sources":["../src/index.mts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC"}
+{"version":3,"file":"index.mjs","sourceRoot":"","sources":["../src/index.mts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AACjC,cAAc,qBAAqB,CAAC"}

package/dist/negation.d.mts

@@ -59,10 +59,9 @@ export type NegationContext = Readonly<{
     checker: ts.TypeChecker;
     getLayerTypes: GetLayerTypes;
     /**
-     * Whether `node`'s value is a boolean, so that the negation of `!node` may
-     * be `node` itself. Where only the truthiness of the negation is read — the
-     * test of an `if` — any value will do, and this may answer `true` for every
-     * node.
+     * Whether `node`'s value is a boolean, so that the negation of `!node` may be
+     * `node` itself. Where only the truthiness of the negation is read — the test
+     * of an `if` — any value will do, and this may answer `true` for every node.
      */
     isBoolean: (node: DeepReadonly<TSESTree.Expression>) => boolean;
 }>;
@@ -80,12 +79,12 @@ export type NegationContext = Readonly<{
  * | anything else      | `!a`, `!(a)`      | always                                |
  *
  * `undefined` when the first two rows' condition does not hold: then the only
- * exact negation is `!!a` or `!(a < b)`, and a caller decides whether to
- * write it (with {@link prefixedNegationOf}) or to give up. Inside `&&` and
- * `||`, a side with no short negation is written with `!`.
+ * exact negation is `!!a` or `!(a < b)`, and a caller decides whether to write
+ * it (with {@link prefixedNegationOf}) or to give up. Inside `&&` and `||`, a
+ * side with no short negation is written with `!`.
  *
- * The node is taken as written: a comparison under a type wrapper is not
- * looked into, since inverting it would drop the wrapper.
+ * The node is taken as written: a comparison under a type wrapper is not looked
+ * into, since inverting it would drop the wrapper.
  */
 export declare const negationOf: (node: DeepReadonly<TSESTree.Expression>, context: NegationContext, operandOf: '&&' | '||' | undefined) => string | undefined;
 /**