fix(go): Only embed behavioral interfaces (#1966)

Previously, datatype structs were being embedded in the struct interface. This fix moves the logic for looking up inherited interfaces into classes only.
aws · Aug 28, 2020 · e1f4e18 · e1f4e18
1 parent 78b7b7d
commit e1f4e18
Show file tree

Hide file tree

Showing 3 changed files with 177 additions and 20 deletions.
diff --git a/packages/jsii-pacmak/lib/targets/golang/types/class.ts b/packages/jsii-pacmak/lib/targets/golang/types/class.ts
@@ -32,8 +32,18 @@ export class GoClass extends GoStruct {
   }
 
   protected emitInterface(code: CodeMaker): void {
+    code.line('// Class interface'); // FIXME for debugging
     code.openBlock(`type ${this.interfaceName} interface`);
 
+    const extended = this.type.getInterfaces(true);
+
+    // embed extended interfaces
+    if (extended.length !== 0) {
+      for (const iface of extended) {
+        code.line(iface.fqn);
+      }
+    }
+
     for (const property of this.properties) {
       property.emitGetterDecl(code);
       property.emitSetterDecl(code);

diff --git a/packages/jsii-pacmak/lib/targets/golang/types/go-type.ts b/packages/jsii-pacmak/lib/targets/golang/types/go-type.ts
@@ -126,15 +126,6 @@ export abstract class GoStruct extends GoType implements GoEmitter {
     code.line('// Struct interface'); // FIXME for debugging
     code.openBlock(`type ${this.interfaceName} interface`);
 
-    const extended = this.type.getInterfaces(true);
-
-    // embed extended interfaces
-    if (extended.length !== 0) {
-      for (const iface of extended) {
-        code.line(iface.fqn);
-      }
-    }
-
     for (const property of this.properties) {
       property.emitGetterDecl(code);
     }