From 773d86686c15e9e831ad1c22405dee8d7251072e Mon Sep 17 00:00:00 2001
From: Aleksei Androsov <doochik@ya.ru>
Date: Tue, 18 May 2021 19:22:34 +0300
Subject: [PATCH] fix: resolve import collisions for interfaces (#300)

Fixes #298
---
 .../parameters.txt                                |   1 +
 .../simple-test.ts                                |  13 +++++++++++++
 .../avoid-import-conflicts-types-only/simple.bin  | Bin 0 -> 605 bytes
 .../simple.proto                                  |   8 ++++++++
 .../avoid-import-conflicts-types-only/simple.ts   |   9 +++++++++
 .../avoid-import-conflicts-types-only/simple2.bin | Bin 0 -> 301 bytes
 .../simple2.proto                                 |   8 ++++++++
 .../avoid-import-conflicts-types-only/simple2.ts  |   7 +++++++
 src/main.ts                                       |   3 ++-
 9 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 integration/avoid-import-conflicts-types-only/parameters.txt
 create mode 100644 integration/avoid-import-conflicts-types-only/simple-test.ts
 create mode 100644 integration/avoid-import-conflicts-types-only/simple.bin
 create mode 100644 integration/avoid-import-conflicts-types-only/simple.proto
 create mode 100644 integration/avoid-import-conflicts-types-only/simple.ts
 create mode 100644 integration/avoid-import-conflicts-types-only/simple2.bin
 create mode 100644 integration/avoid-import-conflicts-types-only/simple2.proto
 create mode 100644 integration/avoid-import-conflicts-types-only/simple2.ts

diff --git a/integration/avoid-import-conflicts-types-only/parameters.txt b/integration/avoid-import-conflicts-types-only/parameters.txt
new file mode 100644
index 000000000..456fdfbd2
--- /dev/null
+++ b/integration/avoid-import-conflicts-types-only/parameters.txt
@@ -0,0 +1 @@
+outputJsonMethods=false,outputEncodeMethods=false,outputClientImpl=false,nestJs=false
diff --git a/integration/avoid-import-conflicts-types-only/simple-test.ts b/integration/avoid-import-conflicts-types-only/simple-test.ts
new file mode 100644
index 000000000..328963459
--- /dev/null
+++ b/integration/avoid-import-conflicts-types-only/simple-test.ts
@@ -0,0 +1,13 @@
+import { Simple } from './simple';
+
+describe('Simple', () => {
+  it('type checking works correctly', () => {
+    const simple: Simple = {
+      name: 'foo',
+      otherSimple: {
+        simple2Name: 'bar',
+        simple2Age: 1,
+      },
+    }
+  });
+})
diff --git a/integration/avoid-import-conflicts-types-only/simple.bin b/integration/avoid-import-conflicts-types-only/simple.bin
new file mode 100644
index 0000000000000000000000000000000000000000..80f7ad10d3e9d3a4a91cdf73f74af985211e1b23
GIT binary patch
literal 605
zcmZwD&rX9t5C-tw*+0NQg-%qkF^ZgeBC$S!R}Pxs6KF!z#7a|p>Rb2<-t`$>VAn$8
zZNK?u4*SFC<8{4xYs$^G-L(tf7fGDyg6%&6XG66bI`V8RD%21C5#<=#;oal9$#~9}
zK|LPP1)|-!eQq)^3#uMXsxOY3Bx9PRk31s57<Dfo!C8WcAQ?%~^@u_;PD1!c7^0L6
z7zqhy7@_Kd>XPr0S(L%COTwfyvuCDKklKoyGX<VYUFVZa=1iTOKItCkX8!{?;UYc!
zZ84Q9?*D)Y<@-UVf73OF?e3-74u-u+xQa{5R1V{Myi<K!CGS6_7y|@hEP$mBOfs|T
rz~mTAf%{ztrY2x2n2o?xGCzQ6xN<0(goeZ=1E%NaE*UU=nLDswbE#Ra

literal 0
HcmV?d00001

diff --git a/integration/avoid-import-conflicts-types-only/simple.proto b/integration/avoid-import-conflicts-types-only/simple.proto
new file mode 100644
index 000000000..90c76b693
--- /dev/null
+++ b/integration/avoid-import-conflicts-types-only/simple.proto
@@ -0,0 +1,8 @@
+syntax = "proto3";
+package simple;
+import "simple2.proto";
+
+message Simple {
+  string name = 1;
+  simple2.Simple otherSimple = 2;
+}
diff --git a/integration/avoid-import-conflicts-types-only/simple.ts b/integration/avoid-import-conflicts-types-only/simple.ts
new file mode 100644
index 000000000..c8d73d508
--- /dev/null
+++ b/integration/avoid-import-conflicts-types-only/simple.ts
@@ -0,0 +1,9 @@
+/* eslint-disable */
+import { Simple as Simple1 } from './simple2';
+
+export const protobufPackage = 'simple';
+
+export interface Simple {
+  name: string;
+  otherSimple: Simple1 | undefined;
+}
diff --git a/integration/avoid-import-conflicts-types-only/simple2.bin b/integration/avoid-import-conflicts-types-only/simple2.bin
new file mode 100644
index 0000000000000000000000000000000000000000..3805b7bbfaa9cd39eb30b7b522a01ba86e8f977a
GIT binary patch
literal 301
zcmY+AO%4G;5QVF|x?6jGQ^5=i5i2VTPGD<c!3jtvA|WGKxrHk@scz{>*wy#G_cn#r
z{dBpWi^cqUD<9>^d+v5}H>KxG<KIawRi|sX-FGDuG*Y<PUy58!)U3Y!jbsd@#_Cw)
zIuz{oCt1H0oERdf;GvqrL=rD8tf&h>8xq6O18hhMvu~pTV@Q**(L*$0BiKm3qEIyT
hUPT-z%hN0<tFxq3m|0z`C^|0{g_-RS4(|J$<p*TwECv7o

literal 0
HcmV?d00001

diff --git a/integration/avoid-import-conflicts-types-only/simple2.proto b/integration/avoid-import-conflicts-types-only/simple2.proto
new file mode 100644
index 000000000..7eb16d390
--- /dev/null
+++ b/integration/avoid-import-conflicts-types-only/simple2.proto
@@ -0,0 +1,8 @@
+syntax = "proto3";
+package simple2;
+
+message Simple {
+  string simple2Name = 1;
+  int32 simple2Age = 2;
+}
+
diff --git a/integration/avoid-import-conflicts-types-only/simple2.ts b/integration/avoid-import-conflicts-types-only/simple2.ts
new file mode 100644
index 000000000..d76e0601e
--- /dev/null
+++ b/integration/avoid-import-conflicts-types-only/simple2.ts
@@ -0,0 +1,7 @@
+/* eslint-disable */
+export const protobufPackage = 'simple2';
+
+export interface Simple {
+  simple2Name: string;
+  simple2Age: number;
+}
diff --git a/src/main.ts b/src/main.ts
index 9495a6a50..7c307221b 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -498,7 +498,8 @@ function generateInterfaceDeclaration(
   const chunks: Code[] = [];
 
   maybeAddComment(sourceInfo, chunks, messageDesc.options?.deprecated);
-  chunks.push(code`export interface ${fullName} {`);
+  // interface name should be defined to avoid import collisions
+  chunks.push(code`export interface ${def(fullName)} {`);
 
   if (ctx.options.outputTypeRegistry) {
     chunks.push(code`$type: '${fullTypeName}',`);