@openrewrite/rewrite 8.91.1 → 8.91.3

package/dist/javascript/recipes/change-import.js

@@ -24,9 +24,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ChangeImport = void 0;
 const recipe_1 = require("../../recipe");
 const index_1 = require("../index");
-const add_import_1 = require("../add-import");
-const java_1 = require("../../java");
-const mutative_1 = require("mutative");
+const binding_1 = require("../binding");
 /**
  * Changes an import from one module to another, updating all type attributions.
  *
@@ -46,15 +44,16 @@ const mutative_1 = require("mutative");
  * // After:  import { act } from 'react';
  *
  * @example
- * // Change a named import to a different name
+ * // Rename a member, carrying the references that resolve to it
  * const recipe = new ChangeImport({
  *     oldModule: "lodash",
  *     oldMember: "extend",
  *     newModule: "lodash",
  *     newMember: "assign"
  * });
- * // Before: import { extend } from 'lodash';
- * // After:  import { assign } from 'lodash';
+ * // Before: import { extend } from 'lodash';  extend({}, {});
+ * // After:  import { assign } from 'lodash';  assign({}, {});
+ * // Adding `newAlias: "extend"` instead binds it as `import { assign as extend }`.
  */
 class ChangeImport extends recipe_1.Recipe {
     constructor(options) {
@@ -70,506 +69,13 @@ class ChangeImport extends recipe_1.Recipe {
         const newModule = this.newModule;
         const newMember = (_a = this.newMember) !== null && _a !== void 0 ? _a : oldMember;
         const newAlias = this.newAlias;
-        // Build the old and new FQNs for type attribution updates
-        const oldFqn = oldMember === 'default' || oldMember === '*'
-            ? oldModule
-            : `${oldModule}.${oldMember}`;
-        const newFqn = newMember === 'default' || newMember === '*'
-            ? newModule
-            : `${newModule}.${newMember}`;
         return new class extends index_1.JavaScriptVisitor {
-            constructor() {
-                super(...arguments);
-                this.hasOldImport = false;
-                this.transformedImport = false;
-            }
             async visitJsCompilationUnit(cu, ctx) {
-                var _a;
-                // Reset tracking for each file
-                this.hasOldImport = false;
-                this.oldAlias = undefined;
-                this.transformedImport = false;
-                // First pass: check if the old import exists and capture any alias
-                for (const statement of cu.statements) {
-                    const stmt = (_a = statement.element) !== null && _a !== void 0 ? _a : statement;
-                    if (stmt.kind === index_1.JS.Kind.Import) {
-                        const jsImport = stmt;
-                        const aliasInfo = this.checkForOldImport(jsImport);
-                        if (aliasInfo.found) {
-                            this.hasOldImport = true;
-                            this.oldAlias = aliasInfo.alias;
-                            break;
-                        }
-                    }
-                }
-                // Visit the compilation unit (this will transform imports via visitJsImport)
-                let result = await super.visitJsCompilationUnit(cu, ctx);
-                // If we transformed an import but need to add to existing import from new module,
-                // or if we only removed a member from a multi-import, use maybeAddImport
-                if (this.hasOldImport && !this.transformedImport) {
-                    const aliasToUse = newAlias !== null && newAlias !== void 0 ? newAlias : this.oldAlias;
-                    if (newMember === 'default') {
-                        (0, add_import_1.maybeAddImport)(this, {
-                            module: newModule,
-                            member: 'default',
-                            alias: aliasToUse,
-                            onlyIfReferenced: false
-                        });
-                    }
-                    else if (newMember === '*') {
-                        (0, add_import_1.maybeAddImport)(this, {
-                            module: newModule,
-                            member: '*',
-                            alias: aliasToUse,
-                            onlyIfReferenced: false
-                        });
-                    }
-                    else {
-                        (0, add_import_1.maybeAddImport)(this, {
-                            module: newModule,
-                            member: newMember,
-                            // A moved binding keeps the local name it had. Pinning it also tells
-                            // `maybeAddImport` not to deconflict against the import being replaced,
-                            // which is still present in the tree it reads.
-                            alias: aliasToUse !== null && aliasToUse !== void 0 ? aliasToUse : newMember,
-                            onlyIfReferenced: false
-                        });
-                    }
-                }
-                return result;
-            }
-            async visitImportDeclaration(jsImport, ctx) {
-                var _a;
-                let imp = await super.visitImportDeclaration(jsImport, ctx);
-                if (!this.hasOldImport) {
-                    return imp;
-                }
-                const aliasInfo = this.checkForOldImport(imp);
-                if (!aliasInfo.found) {
-                    return imp;
-                }
-                // Check if this is the only import from the old module
-                const namedImports = this.getNamedImports(imp);
-                const isOnlyImport = namedImports.length === 1 ||
-                    (oldMember === 'default' && !((_a = imp.importClause) === null || _a === void 0 ? void 0 : _a.namedBindings)) ||
-                    (oldMember === '*');
-                if (isOnlyImport) {
-                    // Transform the module specifier in place
-                    this.transformedImport = true;
-                    return (0, mutative_1.create)(imp, draft => {
-                        var _a;
-                        if (draft.moduleSpecifier) {
-                            const literal = draft.moduleSpecifier.element;
-                            literal.value = newModule;
-                            // Update valueSource to preserve quote style
-                            const originalSource = literal.valueSource || `"${oldModule}"`;
-                            const quoteChar = originalSource.startsWith("'") ? "'" : '"';
-                            literal.valueSource = `${quoteChar}${newModule}${quoteChar}`;
-                        }
-                        // If we're also renaming the member, update the import specifier
-                        if (newMember !== oldMember && oldMember !== 'default' && oldMember !== '*') {
-                            const importClause = draft.importClause;
-                            if (((_a = importClause === null || importClause === void 0 ? void 0 : importClause.namedBindings) === null || _a === void 0 ? void 0 : _a.kind) === index_1.JS.Kind.NamedImports) {
-                                const namedImports = importClause.namedBindings;
-                                for (const elem of namedImports.elements.elements) {
-                                    const specifier = elem.element;
-                                    if (specifier.specifier.kind === java_1.J.Kind.Identifier &&
-                                        specifier.specifier.simpleName === oldMember) {
-                                        specifier.specifier.simpleName = newMember;
-                                    }
-                                    else if (specifier.specifier.kind === index_1.JS.Kind.Alias) {
-                                        const aliasNode = specifier.specifier;
-                                        const propertyName = aliasNode.propertyName.element;
-                                        if (propertyName.kind === java_1.J.Kind.Identifier &&
-                                            propertyName.simpleName === oldMember) {
-                                            propertyName.simpleName = newMember;
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    });
-                }
-                else {
-                    // Remove just the specific member from the import
-                    // maybeAddImport will add the new import
-                    return this.removeNamedImportMember(imp, oldMember, ctx);
-                }
-            }
-            async removeNamedImportMember(imp, memberToRemove, _ctx) {
-                return (0, mutative_1.create)(imp, draft => {
-                    const importClause = draft.importClause;
-                    if (!(importClause === null || importClause === void 0 ? void 0 : importClause.namedBindings))
-                        return;
-                    if (importClause.namedBindings.kind !== index_1.JS.Kind.NamedImports)
-                        return;
-                    const namedImports = importClause.namedBindings;
-                    const elements = namedImports.elements.elements;
-                    const filteredElements = elements.filter(elem => {
-                        const specifier = elem.element;
-                        const specifierNode = specifier.specifier;
-                        if (specifierNode.kind === java_1.J.Kind.Identifier) {
-                            return specifierNode.simpleName !== memberToRemove;
-                        }
-                        if (specifierNode.kind === index_1.JS.Kind.Alias) {
-                            const alias = specifierNode;
-                            const propertyName = alias.propertyName.element;
-                            if (propertyName.kind === java_1.J.Kind.Identifier) {
-                                return propertyName.simpleName !== memberToRemove;
-                            }
-                        }
-                        return true;
-                    });
-                    namedImports.elements.elements = filteredElements;
+                (0, binding_1.maybeRebind)(this, {
+                    from: { module: oldModule, member: oldMember },
+                    to: { module: newModule, member: newMember, alias: newAlias }
                 });
-            }
-            getNamedImports(imp) {
-                const imports = [];
-                const importClause = imp.importClause;
-                if (!importClause)
-                    return imports;
-                const namedBindings = importClause.namedBindings;
-                if (!namedBindings || namedBindings.kind !== index_1.JS.Kind.NamedImports)
-                    return imports;
-                const namedImports = namedBindings;
-                for (const elem of namedImports.elements.elements) {
-                    const specifier = elem.element;
-                    const specifierNode = specifier.specifier;
-                    if ((0, java_1.isIdentifier)(specifierNode)) {
-                        imports.push(specifierNode.simpleName);
-                    }
-                    else if (specifierNode.kind === index_1.JS.Kind.Alias) {
-                        const alias = specifierNode;
-                        const propertyName = alias.propertyName.element;
-                        if ((0, java_1.isIdentifier)(propertyName)) {
-                            imports.push(propertyName.simpleName);
-                        }
-                    }
-                }
-                return imports;
-            }
-            async visitIdentifier(identifier, ctx) {
-                let ident = await super.visitIdentifier(identifier, ctx);
-                if (!this.hasOldImport) {
-                    return ident;
-                }
-                // Check and update type attribution
-                let changed = false;
-                // Update type if it references the old module
-                const updatedType = this.updateType(ident.type);
-                if (updatedType !== ident.type) {
-                    changed = true;
-                }
-                // Update fieldType if it references the old module
-                // fieldType is specifically Type.Variable, so we need to handle it specially
-                let updatedFieldType = ident.fieldType;
-                if (ident.fieldType) {
-                    const updated = this.updateVariableType(ident.fieldType);
-                    if (updated !== ident.fieldType) {
-                        updatedFieldType = updated;
-                        changed = true;
-                    }
-                }
-                if (changed) {
-                    return (0, mutative_1.create)(ident, draft => {
-                        if (updatedType !== ident.type) {
-                            draft.type = updatedType;
-                        }
-                        if (updatedFieldType !== ident.fieldType) {
-                            draft.fieldType = updatedFieldType;
-                        }
-                    });
-                }
-                return ident;
-            }
-            async visitMethodInvocation(method, ctx) {
-                let m = await super.visitMethodInvocation(method, ctx);
-                if (!this.hasOldImport) {
-                    return m;
-                }
-                // Update methodType if it references the old module
-                const updatedMethodType = this.updateMethodType(m.methodType);
-                if (updatedMethodType !== m.methodType) {
-                    return (0, mutative_1.create)(m, draft => {
-                        draft.methodType = updatedMethodType;
-                    });
-                }
-                return m;
-            }
-            async visitFieldAccess(fieldAccess, ctx) {
-                let fa = await super.visitFieldAccess(fieldAccess, ctx);
-                if (!this.hasOldImport) {
-                    return fa;
-                }
-                // Update type if it references the old module
-                const updatedType = this.updateType(fa.type);
-                if (updatedType !== fa.type) {
-                    return (0, mutative_1.create)(fa, draft => {
-                        draft.type = updatedType;
-                    });
-                }
-                return fa;
-            }
-            async visitFunctionCall(functionCall, ctx) {
-                let fc = await super.visitFunctionCall(functionCall, ctx);
-                if (!this.hasOldImport) {
-                    return fc;
-                }
-                // Update methodType if it references the old module
-                const updatedMethodType = this.updateMethodType(fc.methodType);
-                if (updatedMethodType !== fc.methodType) {
-                    return (0, mutative_1.create)(fc, draft => {
-                        draft.methodType = updatedMethodType;
-                    });
-                }
-                return fc;
-            }
-            async visitNewClass(newClass, ctx) {
-                let nc = await super.visitNewClass(newClass, ctx);
-                if (!this.hasOldImport) {
-                    return nc;
-                }
-                let changed = false;
-                // Update methodType if it references the old module
-                const updatedMethodType = this.updateMethodType(nc.methodType);
-                if (updatedMethodType !== nc.methodType) {
-                    changed = true;
-                }
-                // Update constructorType if it references the old module
-                const updatedConstructorType = this.updateMethodType(nc.constructorType);
-                if (updatedConstructorType !== nc.constructorType) {
-                    changed = true;
-                }
-                // Update type if it references the old module
-                const updatedType = this.updateType(nc.type);
-                if (updatedType !== nc.type) {
-                    changed = true;
-                }
-                if (changed) {
-                    return (0, mutative_1.create)(nc, draft => {
-                        if (updatedMethodType !== nc.methodType) {
-                            draft.methodType = updatedMethodType;
-                        }
-                        if (updatedConstructorType !== nc.constructorType) {
-                            draft.constructorType = updatedConstructorType;
-                        }
-                        if (updatedType !== nc.type) {
-                            draft.type = updatedType;
-                        }
-                    });
-                }
-                return nc;
-            }
-            /**
-             * Update a type if it references the old module
-             */
-            updateType(type) {
-                if (!type)
-                    return type;
-                switch (type.kind) {
-                    case java_1.Type.Kind.Class:
-                    case java_1.Type.Kind.ShallowClass:
-                        return this.updateClassType(type);
-                    case java_1.Type.Kind.Method:
-                        return this.updateMethodType(type);
-                    case java_1.Type.Kind.Variable:
-                        return this.updateVariableType(type);
-                    case java_1.Type.Kind.Parameterized:
-                        return this.updateParameterizedType(type);
-                    case java_1.Type.Kind.Array:
-                        return this.updateArrayType(type);
-                    default:
-                        return type;
-                }
-            }
-            /**
-             * Update a Class type if its FQN references the old module
-             */
-            updateClassType(classType) {
-                let changed = false;
-                let newFullyQualifiedName = classType.fullyQualifiedName;
-                let newOwningClass = classType.owningClass;
-                // Check if the FQN matches or starts with the old module
-                if (classType.fullyQualifiedName === oldFqn) {
-                    newFullyQualifiedName = newFqn;
-                    changed = true;
-                }
-                else if (classType.fullyQualifiedName === oldModule) {
-                    newFullyQualifiedName = newModule;
-                    changed = true;
-                }
-                else if (classType.fullyQualifiedName.startsWith(oldModule + '.')) {
-                    newFullyQualifiedName = newModule + classType.fullyQualifiedName.substring(oldModule.length);
-                    changed = true;
-                }
-                // Recursively update owningClass
-                if (classType.owningClass) {
-                    const updatedOwningClass = this.updateClassType(classType.owningClass);
-                    if (updatedOwningClass !== classType.owningClass) {
-                        newOwningClass = updatedOwningClass;
-                        changed = true;
-                    }
-                }
-                if (changed) {
-                    // Type objects are marked as non-draftable, so we manually create new objects
-                    return Object.assign(Object.assign({}, classType), { fullyQualifiedName: newFullyQualifiedName, owningClass: newOwningClass });
-                }
-                return classType;
-            }
-            /**
-             * Update a Method type if its declaringType references the old module
-             */
-            updateMethodType(methodType) {
-                if (!methodType)
-                    return methodType;
-                // Update the declaring type
-                if (java_1.Type.isFullyQualified(methodType.declaringType)) {
-                    const declaringTypeFqn = java_1.Type.FullyQualified.getFullyQualifiedName(methodType.declaringType);
-                    if (declaringTypeFqn === oldModule ||
-                        declaringTypeFqn === oldFqn ||
-                        declaringTypeFqn.startsWith(oldModule + '.')) {
-                        // Need to update the declaring type
-                        const updatedDeclaringType = this.updateType(methodType.declaringType);
-                        // Also update the method name if we're renaming the member
-                        const updatedName = (oldMember !== 'default' && oldMember !== '*' &&
-                            methodType.name === oldMember && newMember !== oldMember)
-                            ? newMember
-                            : methodType.name;
-                        // Type objects are marked as non-draftable, so we manually create new objects
-                        return Object.assign(Object.assign({}, methodType), { declaringType: updatedDeclaringType, name: updatedName });
-                    }
-                }
-                return methodType;
-            }
-            /**
-             * Update a Variable type if its owner references the old module
-             */
-            updateVariableType(variableType) {
-                let changed = false;
-                let newOwner = variableType.owner;
-                let newInnerType = variableType.type;
-                // Update owner if it references the old module
-                if (variableType.owner) {
-                    const updatedOwner = this.updateType(variableType.owner);
-                    if (updatedOwner !== variableType.owner) {
-                        newOwner = updatedOwner;
-                        changed = true;
-                    }
-                }
-                // Update inner type if it references the old module
-                const updatedInnerType = this.updateType(variableType.type);
-                if (updatedInnerType !== variableType.type) {
-                    newInnerType = updatedInnerType;
-                    changed = true;
-                }
-                if (changed) {
-                    // Type objects are marked as non-draftable, so we manually create new objects
-                    return Object.assign(Object.assign({}, variableType), { owner: newOwner, type: newInnerType });
-                }
-                return variableType;
-            }
-            /**
-             * Update a Parameterized type if its base type references the old module
-             */
-            updateParameterizedType(paramType) {
-                let changed = false;
-                let newBaseType = paramType.type;
-                let newTypeParams = paramType.typeParameters;
-                // Update base type
-                if (java_1.Type.isFullyQualified(paramType.type)) {
-                    const updatedType = this.updateType(paramType.type);
-                    if (updatedType !== paramType.type) {
-                        newBaseType = updatedType;
-                        changed = true;
-                    }
-                }
-                // Update type parameters
-                const updatedParams = paramType.typeParameters.map(tp => this.updateType(tp));
-                if (updatedParams.some((p, i) => p !== paramType.typeParameters[i])) {
-                    newTypeParams = updatedParams;
-                    changed = true;
-                }
-                if (changed) {
-                    // Type objects are marked as non-draftable, so we manually create new objects
-                    return Object.assign(Object.assign({}, paramType), { type: newBaseType, typeParameters: newTypeParams });
-                }
-                return paramType;
-            }
-            /**
-             * Update an Array type if its element type references the old module
-             */
-            updateArrayType(arrayType) {
-                const updatedElemType = this.updateType(arrayType.elemType);
-                if (updatedElemType !== arrayType.elemType) {
-                    // Type objects are marked as non-draftable, so we manually create new objects
-                    return Object.assign(Object.assign({}, arrayType), { elemType: updatedElemType });
-                }
-                return arrayType;
-            }
-            checkForOldImport(jsImport) {
-                // Check if this import is from the old module
-                const moduleSpecifier = jsImport.moduleSpecifier;
-                if (!moduleSpecifier)
-                    return { found: false };
-                const literal = moduleSpecifier.element;
-                if (literal.kind !== java_1.J.Kind.Literal)
-                    return { found: false };
-                const value = literal.value;
-                if (value !== oldModule)
-                    return { found: false };
-                const importClause = jsImport.importClause;
-                if (!importClause) {
-                    // Side-effect import - not what we're looking for
-                    return { found: false };
-                }
-                // Check for default import
-                if (oldMember === 'default') {
-                    if (importClause.name) {
-                        const nameElem = importClause.name.element;
-                        if ((0, java_1.isIdentifier)(nameElem)) {
-                            return { found: true, alias: nameElem.simpleName };
-                        }
-                    }
-                    return { found: false };
-                }
-                // Check for namespace import
-                if (oldMember === '*') {
-                    const namedBindings = importClause.namedBindings;
-                    if ((namedBindings === null || namedBindings === void 0 ? void 0 : namedBindings.kind) === index_1.JS.Kind.Alias) {
-                        const alias = namedBindings;
-                        if ((0, java_1.isIdentifier)(alias.alias)) {
-                            return { found: true, alias: alias.alias.simpleName };
-                        }
-                    }
-                    return { found: false };
-                }
-                // Check for named imports
-                const namedBindings = importClause.namedBindings;
-                if (!namedBindings)
-                    return { found: false };
-                if (namedBindings.kind !== index_1.JS.Kind.NamedImports)
-                    return { found: false };
-                const namedImports = namedBindings;
-                const elements = namedImports.elements.elements;
-                for (const elem of elements) {
-                    const specifier = elem.element;
-                    const specifierNode = specifier.specifier;
-                    // Handle direct import: import { act }
-                    if ((0, java_1.isIdentifier)(specifierNode) && specifierNode.simpleName === oldMember) {
-                        return { found: true };
-                    }
-                    // Handle aliased import: import { act as something }
-                    if (specifierNode.kind === index_1.JS.Kind.Alias) {
-                        const alias = specifierNode;
-                        const propertyName = alias.propertyName.element;
-                        if ((0, java_1.isIdentifier)(propertyName) && propertyName.simpleName === oldMember) {
-                            if ((0, java_1.isIdentifier)(alias.alias)) {
-                                return { found: true, alias: alias.alias.simpleName };
-                            }
-                        }
-                    }
-                }
-                return { found: false };
+                return super.visitJsCompilationUnit(cu, ctx);
             }
         }();
     }
@@ -607,7 +113,9 @@ __decorate([
 __decorate([
     (0, recipe_1.Option)({
         displayName: "New alias",
-        description: "Optional alias for the new import. Required when newMember is 'default' or '*'.",
+        description: "The local name to bind the new member under. Defaults to the alias the import " +
+            "already had, or to the new member name where it had none.",
+        example: "act",
         required: false
     })
 ], ChangeImport.prototype, "newAlias", void 0);

package/dist/javascript/recipes/change-import.js.map

@@ -1 +1 @@
-{"version":3,"file":"change-import.js","sourceRoot":"","sources":["../../../src/javascript/recipes/change-import.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"change-import.js","sourceRoot":"","sources":["../../../src/javascript/recipes/change-import.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;;;;;;;AAEH,yCAA8C;AAG9C,oCAAiD;AACjD,wCAAyC;AAGzC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,MAAa,YAAa,SAAQ,eAAM;IA2CpC,YAAY,OAMX;QACG,KAAK,CAAC,OAAO,CAAC,CAAC;QAjDV,SAAI,GAAG,0CAA0C,CAAC;QAClD,gBAAW,GAAG,eAAe,CAAC;QAC9B,gBAAW,GAAG,sFAAsF,CAAC;IAgD9G,CAAC;IAED,KAAK,CAAC,MAAM;;QACR,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;QACjC,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;QACjC,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;QACjC,MAAM,SAAS,GAAG,MAAA,IAAI,CAAC,SAAS,mCAAI,SAAS,CAAC;QAC9C,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QAE/B,OAAO,IAAI,KAAM,SAAQ,yBAAmC;YAC/C,KAAK,CAAC,sBAAsB,CAAC,EAAsB,EAAE,GAAqB;gBAC/E,IAAA,qBAAW,EAAC,IAAI,EAAE;oBACd,IAAI,EAAE,EAAC,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAC;oBAC5C,EAAE,EAAE,EAAC,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAC;iBAC9D,CAAC,CAAC;gBACH,OAAO,KAAK,CAAC,sBAAsB,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;YACjD,CAAC;SACJ,EAAE,CAAC;IACR,CAAC;CACJ;AAtED,oCAsEC;AA5DG;IALC,IAAA,eAAM,EAAC;QACJ,WAAW,EAAE,YAAY;QACzB,WAAW,EAAE,mCAAmC;QAChD,OAAO,EAAE,sBAAsB;KAClC,CAAC;+CACiB;AAOnB;IALC,IAAA,eAAM,EAAC;QACJ,WAAW,EAAE,YAAY;QACzB,WAAW,EAAE,oFAAoF;QACjG,OAAO,EAAE,KAAK;KACjB,CAAC;+CACiB;AAOnB;IALC,IAAA,eAAM,EAAC;QACJ,WAAW,EAAE,YAAY;QACzB,WAAW,EAAE,iCAAiC;QAC9C,OAAO,EAAE,OAAO;KACnB,CAAC;+CACiB;AAQnB;IANC,IAAA,eAAM,EAAC;QACJ,WAAW,EAAE,YAAY;QACzB,WAAW,EAAE,oEAAoE;QACjF,OAAO,EAAE,KAAK;QACd,QAAQ,EAAE,KAAK;KAClB,CAAC;+CACiB;AASnB;IAPC,IAAA,eAAM,EAAC;QACJ,WAAW,EAAE,WAAW;QACxB,WAAW,EAAE,gFAAgF;YACzF,2DAA2D;QAC/D,OAAO,EAAE,KAAK;QACd,QAAQ,EAAE,KAAK;KAClB,CAAC;8CACgB"}

package/dist/javascript/remove-import.d.ts

@@ -1,33 +1,6 @@
 import { JavaScriptVisitor } from "./visitor";
 import { J } from "../java";
 import { JS } from "./tree";
-/**
- * @param visitor The visitor to add the import removal to
- * @param module The module name (e.g., 'fs', 'react') to remove imports from
- * @param member Optionally, the specific member to remove from the import.
- *               If not specified, removes all unused imports from the module.
- *               Special values:
- *               - 'default': Removes the default import from the module if unused,
- *                 regardless of its local name (e.g., `import React from 'react'`)
- *               - '*': Removes the namespace import if unused (e.g., `import * as fs from 'fs'`)
- *
- * @example
- * // Remove a specific named import if unused
- * maybeRemoveImport(visitor, 'fs', 'readFile');
- *
- * @example
- * // Remove the default import from 'react' if unused (regardless of local name)
- * maybeRemoveImport(visitor, 'react', 'default');
- *
- * @example
- * // Remove all unused imports from 'react' module
- * maybeRemoveImport(visitor, 'react');
- *
- * @example
- * // Remove namespace import if unused
- * maybeRemoveImport(visitor, 'fs', '*');
- */
-export declare function maybeRemoveImport(visitor: JavaScriptVisitor<any>, module: string, member?: string): void;
 export declare class RemoveImport<P> extends JavaScriptVisitor<P> {
     readonly module: string;
     readonly member?: string | undefined;
@@ -80,7 +53,8 @@ export declare class RemoveImport<P> extends JavaScriptVisitor<P> {
     private processObjectBindingPattern;
     private getImportName;
     private getImportAlias;
-    private getBindingElementName;
+    /** The names a pattern element binds, and for each the member of the module it reads. */
+    private boundByPatternElement;
     private shouldRemoveImport;
     private isTargetModule;
     /**

package/dist/javascript/remove-import.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"remove-import.d.ts","sourceRoot":"","sources":["../../src/javascript/remove-import.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,iBAAiB,EAAC,MAAM,WAAW,CAAC;AAC5C,OAAO,EAAC,CAAC,EAAC,MAAM,SAAS,CAAC;AAC1B,OAAO,EAAC,EAAE,EAAM,MAAM,QAAQ,CAAC;AAI/B;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,QAOjG;AAUD,qBAAa,YAAY,CAAC,CAAC,CAAE,SAAQ,iBAAiB,CAAC,CAAC,CAAC;IAUzC,QAAQ,CAAC,MAAM,EAAE,MAAM;IACvB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM;IAVpC;;;;;;;;OAQG;gBACkB,MAAM,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,MAAM,YAAA;IAIpC;;;;;OAKG;YACW,oCAAoC;IAgDlD;;OAEG;YACW,kBAAkB;IAejB,sBAAsB,CAAC,eAAe,EAAE,EAAE,CAAC,eAAe,EAAE,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;YA+F1F,aAAa;IAqK3B;;;OAGG;YACW,0BAA0B;IAmCxC;;OAEG;IACH,OAAO,CAAC,aAAa;IASrB;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAI3B;;OAEG;IACH,OAAO,CAAC,sBAAsB;YAOhB,mBAAmB;YA+DnB,0BAA0B;IA8DxC;;OAEG;IACH,OAAO,CAAC,wBAAwB;YAclB,2BAA2B;IAoDzC,OAAO,CAAC,aAAa;IAiBrB,OAAO,CAAC,cAAc;IActB,OAAO,CAAC,qBAAqB;IAQ7B,OAAO,CAAC,kBAAkB;IAmB1B,OAAO,CAAC,cAAc;IActB;;OAEG;YACW,kBAAkB;IA2BhC;;OAEG;YACW,kBAAkB;IAiBhC;;OAEG;YACW,mBAAmB;YASnB,sBAAsB;YAsOtB,gBAAgB;CAmFjC"}
+{"version":3,"file":"remove-import.d.ts","sourceRoot":"","sources":["../../src/javascript/remove-import.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,iBAAiB,EAAC,MAAM,WAAW,CAAC;AAC5C,OAAO,EAAC,CAAC,EAAC,MAAM,SAAS,CAAC;AAE1B,OAAO,EAAC,EAAE,EAAM,MAAM,QAAQ,CAAC;AAY/B,qBAAa,YAAY,CAAC,CAAC,CAAE,SAAQ,iBAAiB,CAAC,CAAC,CAAC;IAUzC,QAAQ,CAAC,MAAM,EAAE,MAAM;IACvB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM;IAVpC;;;;;;;;OAQG;gBACkB,MAAM,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,MAAM,YAAA;IAIpC;;;;;OAKG;YACW,oCAAoC;IAgDlD;;OAEG;YACW,kBAAkB;IAejB,sBAAsB,CAAC,eAAe,EAAE,EAAE,CAAC,eAAe,EAAE,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;YA+F1F,aAAa;IAqK3B;;;OAGG;YACW,0BAA0B;IAmCxC;;OAEG;IACH,OAAO,CAAC,aAAa;IASrB;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAI3B;;OAEG;IACH,OAAO,CAAC,sBAAsB;YAOhB,mBAAmB;YA+DnB,0BAA0B;IA8DxC;;OAEG;IACH,OAAO,CAAC,wBAAwB;YAclB,2BAA2B;IAgDzC,OAAO,CAAC,aAAa;IAiBrB,OAAO,CAAC,cAAc;IActB,yFAAyF;IACzF,OAAO,CAAC,qBAAqB;IAO7B,OAAO,CAAC,kBAAkB;IAqB1B,OAAO,CAAC,cAAc;IActB;;OAEG;YACW,kBAAkB;IA2BhC;;OAEG;YACW,kBAAkB;IAiBhC;;OAEG;YACW,mBAAmB;YASnB,sBAAsB;YAsOtB,gBAAgB;CAmFjC"}