Import declaration conflicts with local declaration with opts "outputJsonMethods=false,outputEncodeMethods=false"

[doochik]

This bug is similar to #36

My env

$ protoc --version
libprotoc 3.15.6
$ yarn --version
1.22.10
$ node --version
v14.17.0

Steps to reproduce

1. Checkout latest tag (v1.80.0 at this time).
2. This case works well

protoc \
  --proto_path=integration/avoid-import-conflicts \
  --plugin=./protoc-gen-ts_proto \
  --ts_proto_out=integration/avoid-import-conflicts \
  integration/avoid-import-conflicts/simple.proto integration/avoid-import-conflicts/simple2.proto

// Generated integration/avoid-import-conflicts/simple.ts looks like

import { Simple as Simple1 } from './simple2'; // Simple from simple2 is renamed
export interface Simple {
  name: string;
  otherSimple: Simple1 | undefined; // no conflicts
}

3. Add --ts_proto_opt=outputJsonMethods=false,outputEncodeMethods=false to reproduce bug

protoc \
  --proto_path=integration/avoid-import-conflicts \
  --plugin=./protoc-gen-ts_proto \
  --ts_proto_out=integration/avoid-import-conflicts \
  --ts_proto_opt=outputJsonMethods=false,outputEncodeMethods=false \
  integration/avoid-import-conflicts/simple.proto integration/avoid-import-conflicts/simple2.proto

// Generated integration/avoid-import-conflicts/simple.ts looks like

import { Simple } from './simple2'; // Simple from simple2 is NOT renamed
export interface Simple {
  name: string;
  otherSimple: Simple | undefined; // This is conflict!
}

[stephenh]

🎉 This issue has been resolved in version 1.80.1 🎉

The release is available on:

• npm package (@latest dist-tag)
• GitHub release

Your semantic-release bot 📦🚀