Move from apex_core v0.1.3 to v0.1.5 (#50)

Author: pkedy

.gitignore

@@ -9,3 +9,4 @@ bundle.js
 !/testdata/*/actual/go.*
 !/testdata/*/actual/package.*
 !/testdata/*/actual/requirements.txt
+npm

LICENSE.txt LICENSELICENSE.txt renamed to LICENSE

@@ -0,0 +1,46 @@
+// ex. scripts/build_npm.ts
+import { build, emptyDir } from "https://deno.land/x/dnt@0.40.0/mod.ts";
+
+await emptyDir("./npm");
+
+await build({
+  entryPoints: [
+    "./src/cs/mod.ts",
+    "./src/go/mod.ts",
+    "./src/json-schema/mod.ts",
+    "./src/markdown/mod.ts",
+    "./src/openapiv3/mod.ts",
+    "./src/proto/mod.ts",
+    "./src/python/mod.ts",
+    "./src/rest/mod.ts",
+    "./src/rust/mod.ts",
+    "./src/typescript/mod.ts",
+    "./src/utils/mod.ts",
+  ],
+  outDir: "./npm",
+  test: false,
+  shims: {
+    // see JS docs for overview and more options
+    deno: true,
+  },
+  package: {
+    // package.json properties
+    name: "@apexlang/core",
+    version: Deno.args[0],
+    description: "Apex language JavaScript support",
+    keywords: ["apex", "idl", "codegen"],
+    license: "Apache-2.0",
+    repository: {
+      type: "git",
+      url: "https://www.github.com/apexlang/apex-js",
+    },
+    bugs: {
+      url: "https://www.github.com/apexlang/apex-js/issues",
+    },
+  },
+  postBuild() {
+    // steps to run after building and before running the tests
+    Deno.copyFileSync("LICENSE", "npm/LICENSE");
+    Deno.copyFileSync("README.md", "npm/README.md");
+  },
+});

scripts/build_npm.ts

@@ -23,8 +23,8 @@ export class UnionVisitor extends BaseVisitor {
     const { union } = context;
     this.write(`  ${formatComment("// ", union.description)}`);
     this.write(`public record ${union.name} {\n`);
-    union.types.forEach((t) => {
-      const typeName = expandType(t);
+    union.members.forEach((member) => {
+      const typeName = expandType(member.type);
       this.write(`    public ${pascalCase(typeName)} ${typeName};`);
       this.triggerCallbacks(context, "UnionStructTags");
       this.write(`\n`);

src/cs/union_visitor.ts

@@ -1 +1 @@
-export * from "https://deno.land/x/apex_core@v0.1.3/ast/mod.ts";
+export * from "https://deno.land/x/apex_core@v0.1.5/ast/mod.ts";

src/deps/core/ast.ts

@@ -1 +1 @@
-export * from "https://deno.land/x/apex_core@v0.1.3/model/mod.ts";
+export * from "https://deno.land/x/apex_core@v0.1.5/model/mod.ts";

src/deps/core/model.ts

@@ -621,7 +621,8 @@ func New${iface.name}GRPCWrapper(service ${iface.name}) *${iface.name}GRPCWrappe
       }
       switch {\n`,
       );
-    union.types.forEach((ut) => {
+    union.members.forEach((member) => {
+      const ut = member.type;
       this.write(`case from.${pascalCase(expandType(ut))} != nil:
             return &pb.${union.name}{\n`);
       switch (ut.kind) {
@@ -844,7 +845,8 @@ func New${iface.name}GRPCWrapper(service ${iface.name}) *${iface.name}GRPCWrappe
       }
       switch v := from.Value.(type) {\n`,
       );
-    union.types.forEach((ut) => {
+    union.members.forEach((member) => {
+      const ut = member.type;
       if (ut.kind == Kind.Type) {
         const t = ut as Named;
         this.write(`case *pb.${union.name}_${pascalCase(expandType(ut))}Value:
@@ -919,7 +921,9 @@ func New${iface.name}GRPCWrapper(service ${iface.name}) *${iface.name}GRPCWrappe
       case Kind.Union: {
         const u = a as Union;
         m[u.name] = u;
-        u.types.forEach((t) => this.checkType(context, t, m, types));
+        u.members.forEach((member) =>
+          this.checkType(context, member.type, m, types)
+        );
         break;
       }
       case Kind.Alias: {

src/go/grpc_visitor.ts

@@ -30,17 +30,14 @@ export class UnionVisitor extends GoVisitor {
     const imports = getImports(context);
     this.write(formatComment("// ", union.description));
     this.write(`type ${union.name} struct {\n`);
-    union.types.forEach((t) => {
-      let tname = typeName(t);
-      const annotated = t as Annotated;
-      if (annotated.annotation) {
-        annotated.annotation("unionKey", (a) => {
-          tname = a.convert<UnionKey>().value;
-        });
-      }
+    union.members.forEach((member) => {
+      let tname = typeName(member.type);
+      member.annotation("unionKey", (a) => {
+        tname = a.convert<UnionKey>().value;
+      });
 
-      imports.type(t);
-      const expandedName = expandType(t);
+      imports.type(member.type);
+      const expandedName = expandType(member.type);
       this.write(
         `${
           fieldName(

src/go/union_visitor.ts

@@ -167,7 +167,7 @@ class UnionVisitor extends BaseVisitor {
     const { union } = context;
     const arr: SchemaObject[] = [];
     convertArrayToObject(
-      union.types,
+      union.members.map((m) => m.type),
       (t: AnyType) => {
         switch (t.kind) {
           case Kind.Union:

src/json-schema/json-schema.ts

@@ -107,6 +107,10 @@ export class MarkdownVisitor extends BaseVisitor {
   visitUnion(context: Context): void {
     const u = context.union;
     this.writeDefinitionName(u.name);
-    this.writeLn(`\`${u.name} = ${u.types.map(expandType).join(" | ")}\``);
+    this.writeLn(
+      `\`${u.name} = ${
+        u.members.map((m) => m.type).map(expandType).join(" | ")
+      }\``,
+    );
   }
 }