Write Type Info tweaks (#54)

Author: pkedy

src/go/enum_visitor.ts

@@ -18,6 +18,10 @@ import { Context, Writer } from "../../deps/@apexlang/core/model/mod.ts";
 import { formatComment, pascalCase, snakeCase } from "../utils/mod.ts";
 import { IMPORTS } from "./constant.ts";
 import { getImporter, GoVisitor } from "./go_visitor.ts";
+import {
+  shouldWriteTypeInfo,
+  writeNamespaceEmbeddedStruct,
+} from "./helpers.ts";
 
 export class EnumVisitor extends GoVisitor {
   private writeTypeInfo: boolean;
@@ -29,6 +33,12 @@ export class EnumVisitor extends GoVisitor {
 
   public override visitEnumBefore(context: Context): void {
     super.triggerEnumsBefore(context);
+
+    const writeTypeInfo = shouldWriteTypeInfo(context, this.writeTypeInfo);
+    if (writeTypeInfo) {
+      writeNamespaceEmbeddedStruct(context, this.writer);
+    }
+
     this.write(formatComment("// ", context.enum.description));
     this.write(`type ${context.enum.name} int32
 

src/go/helpers.ts

@@ -32,6 +32,7 @@ import {
   PrimitiveName,
   Stream,
   Valued,
+  Writer,
 } from "../../deps/@apexlang/core/model/mod.ts";
 import { capitalize, renamed } from "../utils/mod.ts";
 import { Import } from "./alias_visitor.ts";
@@ -424,3 +425,38 @@ export function varAccessArg(
 export function receiver(iface: Interface): string {
   return iface.name[0].toLowerCase();
 }
+
+export function shouldWriteTypeInfo(
+  context: Context,
+  defaultValue: boolean,
+): boolean {
+  const writeTypeInfo = context.config.writeTypeInfo as boolean;
+  if (writeTypeInfo == undefined) {
+    return defaultValue;
+  }
+  return writeTypeInfo;
+}
+
+export function writeNamespaceEmbeddedStruct(context: Context, writer: Writer) {
+  if (context.config.nsWritten == true) {
+    return;
+  }
+
+  const { namespace: ns } = context;
+  writer.write(`\n\n
+const NAMESPACE = "${ns.name}"
+
+type ns struct{}
+
+func (n *ns) GetNamespace() string {
+  return NAMESPACE
+}\n\n`);
+
+  ns.annotation("version", (a) => {
+    writer.write(`func (n *ns) Version() string {
+      return "${a.arguments[0].value.getValue()}"
+    }\n\n`);
+  });
+
+  context.config.nsWritten = true;
+}

src/go/interfaces_visitor.ts

@@ -39,36 +39,10 @@ export class InterfacesVisitor extends GoVisitor {
   defaultsVisitor = (writer: Writer): Visitor => new DefaultsVisitor(writer);
   enumVisitor = (writer: Writer): Visitor =>
     new EnumVisitor(writer, this.writeTypeInfo);
-  unionVisitor = (writer: Writer): Visitor => new UnionVisitor(writer);
+  unionVisitor = (writer: Writer): Visitor =>
+    new UnionVisitor(writer, this.writeTypeInfo);
   aliasVisitor = (writer: Writer): Visitor => new AliasVisitor(writer);
 
-  public override visitNamespaceBefore(context: Context): void {
-    const { namespace: ns } = context;
-    this.writeTypeInfo = context.config.writeTypeInfo as boolean;
-    if (this.writeTypeInfo == undefined) {
-      this.writeTypeInfo = false;
-    }
-
-    if (this.writeTypeInfo) {
-      this.write(`\n\n
-
-        const NAMESPACE = "${ns.name}"
-
-        type ns struct{}
-
-        func (n *ns) GetNamespace() string {
-          return NAMESPACE
-        }\n\n`);
-
-      ns.annotation("version", (a) => {
-        this.write(`func (n *ns) Version() string {
-            return "${a.arguments[0].value.getValue()}"
-          }\n\n`);
-      });
-    }
-    super.triggerNamespaceBefore(context);
-  }
-
   public override visitFunctionBefore(context: Context): void {
     const { operation } = context;
     const visitor = this.serviceVisitor(this.writer);

src/go/struct_visitor.ts

@@ -21,7 +21,13 @@ import {
   Named,
   Writer,
 } from "../../deps/@apexlang/core/model/mod.ts";
-import { defaultValueForType, expandType, fieldName } from "./helpers.ts";
+import {
+  defaultValueForType,
+  expandType,
+  fieldName,
+  shouldWriteTypeInfo,
+  writeNamespaceEmbeddedStruct,
+} from "./helpers.ts";
 import { translateAlias } from "./alias_visitor.ts";
 import { formatComment } from "../utils/mod.ts";
 import { getImports, GoVisitor } from "./go_visitor.ts";
@@ -47,12 +53,10 @@ export class StructVisitor extends GoVisitor {
   public override visitTypeBefore(context: Context): void {
     const { type } = context;
     super.triggerTypeBefore(context);
-    let writeTypeInfo = context.config.writeTypeInfo as boolean;
-    if (writeTypeInfo == undefined) {
-      writeTypeInfo = this.writeTypeInfo;
-    }
 
+    const writeTypeInfo = shouldWriteTypeInfo(context, this.writeTypeInfo);
     if (writeTypeInfo) {
+      writeNamespaceEmbeddedStruct(context, this.writer);
       this.write(
         `const TYPE_${snakeCase(type.name).toUpperCase()} = "${type.name}"\n\n`,
       );

src/go/union_visitor.ts

@@ -14,22 +14,53 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { Annotated, Context } from "../../deps/@apexlang/core/model/mod.ts";
-import { formatComment, typeName } from "../utils/mod.ts";
+import {
+  Annotated,
+  Context,
+  Writer,
+} from "../../deps/@apexlang/core/model/mod.ts";
+import { formatComment, snakeCase, typeName } from "../utils/mod.ts";
 import { getImports, GoVisitor } from "./go_visitor.ts";
-import { expandType, fieldName } from "./helpers.ts";
+import {
+  expandType,
+  fieldName,
+  shouldWriteTypeInfo,
+  writeNamespaceEmbeddedStruct,
+} from "./helpers.ts";
 
 interface UnionKey {
   value: string;
 }
 
 export class UnionVisitor extends GoVisitor {
+  private writeTypeInfo: boolean;
+
+  constructor(writer: Writer, writeTypeInfo: boolean = false) {
+    super(writer);
+    this.writeTypeInfo = writeTypeInfo;
+  }
+
   public override visitUnion(context: Context): void {
     const tick = "`";
     const { union } = context;
     const imports = getImports(context);
+
+    const writeTypeInfo = shouldWriteTypeInfo(context, this.writeTypeInfo);
+    if (writeTypeInfo) {
+      writeNamespaceEmbeddedStruct(context, this.writer);
+
+      this.write(
+        `const UNION_${
+          snakeCase(union.name).toUpperCase()
+        } = "${union.name}"\n\n`,
+      );
+    }
+
     this.write(formatComment("// ", union.description));
     this.write(`type ${union.name} struct {\n`);
+    if (writeTypeInfo) {
+      this.write(`ns\n`);
+    }
     union.members.forEach((member) => {
       let tname = typeName(member.type);
       member.annotation("unionKey", (a) => {
@@ -50,5 +81,12 @@ export class UnionVisitor extends GoVisitor {
       this.write(`"${tick}\n`);
     });
     this.write(`}\n\n`);
+
+    if (writeTypeInfo) {
+      const receiver = union.name.substring(0, 1).toLowerCase();
+      this.write(`func (${receiver} *${union.name}) GetType() string {
+      return UNION_${snakeCase(union.name).toUpperCase()}
+    }\n\n`);
+    }
   }
 }

src/proto/proto_visitor.ts

@@ -122,7 +122,7 @@ package ${ns.name};\n\n`);
     this.write(
       `  ${typeSignature(field.type)} ${
         snakeCase(field.name)
-      } = ${fieldnum.value};\n`,
+      } = ${fieldnum.value} [json_name="${field.name}"];\n`,
     );
   }