Move from apex_core v0.1.3 to v0.1.5

.gitignore

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

scripts/build_npm.ts

@@ -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");
+  },
+});

src/cs/union_visitor.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/deps/core/ast.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/model.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/go/grpc_visitor.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/union_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/json-schema/json-schema.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/markdown/markdown-visitor.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(" | ")
+      }\``,
+    );
   }
 }

src/openapiv3/openapiv3.ts

@@ -529,7 +529,7 @@ export class OpenAPIV3Visitor extends BaseVisitor {
       type: Types.OBJECT,
       description: union.description,
       properties: convertArrayToObject(
-        union.types,
+        union.members.map((m) => m.type),
         (t: AnyType) => {
           switch (t.kind) {
             case Kind.Union:

src/proto/proto_visitor.ts

@@ -162,12 +162,19 @@ package ${ns.name};\n\n`);
     this.write(formatComment("// ", u.description));
     this.write(`message ${pascalCase(u.name)} {\n`);
     this.write(`  oneof value {\n`);
-    let i = 0;
-    for (const t of u.types) {
-      const n = t as Named;
-      i++;
+
+    for (const member of u.members) {
+      const n = member.type as Named;
+
+      const fieldnumAnnotation = member.annotation("n");
+      if (!fieldnumAnnotation) {
+        throw new Error(`${u.name}.${n.name} requires a @n`);
+      }
+
       this.write(
-        `    ${typeSignature(t)} ${snakeCase(n.name)}_value = ${i};\n`,
+        `    ${typeSignature(member.type)} ${
+          snakeCase(n.name)
+        }_value = ${n};\n`,
       );
     }
     this.write(`  }\n`);

src/python/interfaces_visitor.ts

@@ -160,8 +160,8 @@ function tsort(context: Context): void {
       }
       case Kind.Union: {
         const un = t as Union;
-        un.types.map((ty) => {
-          visitNamed(ty, (name: string) => {
+        un.members.map((member) => {
+          visitNamed(member.type, (name: string) => {
             if (d.indexOf(name) == -1) {
               d.push(name);
             }

src/rust/visitors/union_visitor.ts

@@ -49,7 +49,8 @@ export class UnionVisitor extends SourceGenerator<Union> {
   }
 
   getSource(): string {
-    const variants = this.root.types.map((t) => {
+    const variants = this.root.members.map((member) => {
+      const t = member.type;
       const isRecursive = isRecursiveType(t);
       const isHeapAllocated = t.kind === Kind.Map || t.kind === Kind.List;
       const baseType = types.apexToRustType(t, this.config);

src/typescript/plugin.ts

@@ -1,23 +1,23 @@
 import { Configuration } from "https://deno.land/x/apex_cli@v0.0.18/src/config.ts";
-import * as apex from "https://deno.land/x/apex_core@v0.1.3/mod.ts";
+import * as ast from "https://deno.land/x/apex_core@v0.1.5/ast.ts";
 
 const importUrl = new URL(".", import.meta.url);
 
-function urlify(relpath: string): string {
+function _urlify(relpath: string): string {
   const url = new URL(relpath, importUrl).toString();
   console.error(url);
   return url;
 }
 
 export default function (
-  doc: apex.ast.Document,
+  _doc: ast.Document,
   config: Configuration,
 ): Configuration {
   config.generates ||= {};
 
   config.config ||= {};
   config.config.aliases ||= {};
-  (config.config.aliases as any).UUID = {
+  (config.config.aliases as Record<string, unknown>).UUID = {
     type: true,
     import: "v4 as uuidv4",
     from: "uuid",

src/utils/exposed_types.ts

@@ -55,7 +55,7 @@ export class ExposedTypesVisitor extends BaseVisitor {
       }
       case Kind.Union: {
         const u = any as Union;
-        u.types.forEach((t) => this.checkType(t));
+        u.members.forEach((member) => this.checkType(member.type));
         break;
       }
       case Kind.Alias: {

src/utils/utilities.ts

@@ -602,9 +602,9 @@ export function convertOperationToType(
 }
 
 export function convertUnionToType(tr: TypeResolver, union: Union): Type {
-  const fields = union.types.map((param) => {
-    const n = typeName(param);
-    const t = modelToAST(param);
+  const fields = union.members.map((member) => {
+    const n = typeName(member.type);
+    const t = modelToAST(member.type);
     return new FieldDefinition(
       undefined,
       new Name(undefined, n),
@@ -849,7 +849,8 @@ export function isRecursiveType(typ: AnyType, seen: NamedType[] = []): boolean {
     case Kind.Union: {
       const t = typ as Union;
 
-      return t.types.filter((t) => isRecursiveType(t, seen)).length > 0;
+      return t.members.filter((member) => isRecursiveType(member.type, seen))
+        .length > 0;
     }
 
     case Kind.Type: {

templates/generator/src/default-visitor.ts

@@ -1,7 +1,7 @@
 import {
   BaseVisitor,
   Context,
-} from "https://deno.land/x/apex_core@v0.1.3/model/mod.ts";
+} from "https://deno.land/x/apex_core@v0.1.5/model/mod.ts";
 import { TypeVisitor } from "./visitors/type-visitor.ts";
 import { InterfaceVisitor } from "./visitors/interface-visitor.ts";
 import { EnumVisitor } from "./visitors/enum-visitor.ts";

templates/generator/src/utils/conversions.ts

@@ -2,7 +2,7 @@ import {
   ObjectMap,
   Operation,
   Parameter,
-} from "https://deno.land/x/apex_core@v0.1.3/model/mod.ts";
+} from "https://deno.land/x/apex_core@v0.1.5/model/mod.ts";
 import * as utils from "https://deno.land/x/apex_codegen@v0.1.7/utils/mod.ts";
 import { convertType } from "./types.ts";
 

templates/generator/src/utils/types.ts

@@ -8,7 +8,7 @@ import {
   Optional,
   Primitive,
   PrimitiveName,
-} from "https://deno.land/x/apex_core@v0.1.3/model/mod.ts";
+} from "https://deno.land/x/apex_core@v0.1.5/model/mod.ts";
 
 /**
  * Convert an Apex type to a type suitable for the destination format.

templates/generator/src/visitors/alias-visitor.ts

@@ -1,7 +1,7 @@
 import {
   Alias,
   Context,
-} from "https://deno.land/x/apex_core@v0.1.3/model/mod.ts";
+} from "https://deno.land/x/apex_core@v0.1.5/model/mod.ts";
 import { convertDescription } from "../utils/conversions.ts";
 import { convertType } from "../utils/types.ts";
 

templates/generator/src/visitors/base.ts

@@ -8,7 +8,7 @@ import {
   Type,
   Union,
   Writer,
-} from "https://deno.land/x/apex_core@v0.1.3/model/mod.ts";
+} from "https://deno.land/x/apex_core@v0.1.5/model/mod.ts";
 
 export type VisitorTypes = Alias | Type | Union | Enum | Interface;
 

templates/generator/src/visitors/enum-visitor.ts

@@ -1,7 +1,7 @@
 import {
   Context,
   Enum,
-} from "https://deno.land/x/apex_core@v0.1.3/model/mod.ts";
+} from "https://deno.land/x/apex_core@v0.1.5/model/mod.ts";
 import { convertDescription } from "../utils/conversions.ts";
 
 import { SourceGenerator } from "./base.ts";

templates/generator/src/visitors/interface-visitor.ts

@@ -1,7 +1,7 @@
 import {
   Context,
   Interface,
-} from "https://deno.land/x/apex_core@v0.1.3/model/mod.ts";
+} from "https://deno.land/x/apex_core@v0.1.5/model/mod.ts";
 import { convertDescription, convertOperation } from "../utils/conversions.ts";
 
 import { SourceGenerator } from "./base.ts";

templates/generator/src/visitors/type-visitor.ts

@@ -1,7 +1,7 @@
 import {
   Context,
   Type,
-} from "https://deno.land/x/apex_core@v0.1.3/model/mod.ts";
+} from "https://deno.land/x/apex_core@v0.1.5/model/mod.ts";
 import { convertDescription } from "../utils/conversions.ts";
 import { convertType } from "../utils/types.ts";
 import { SourceGenerator } from "./base.ts";

templates/generator/src/visitors/union-visitor.ts

@@ -1,7 +1,7 @@
 import {
   Context,
   Union,
-} from "https://deno.land/x/apex_core@v0.1.3/model/mod.ts";
+} from "https://deno.land/x/apex_core@v0.1.5/model/mod.ts";
 import { convertDescription } from "../utils/conversions.ts";
 import { convertType } from "../utils/types.ts";
 

templates/generator/test/default.test.ts

@@ -1,6 +1,6 @@
 import { parse } from "./parse.ts";
 import { DefaultVisitor } from "../src/default-visitor.ts";
-import { Writer } from "https://deno.land/x/apex_core@v0.1.3/model/mod.ts";
+import { Writer } from "https://deno.land/x/apex_core@v0.1.5/model/mod.ts";
 import { assert } from "https://deno.land/std@0.167.0/testing/asserts.ts";
 
 Deno.test("should generate apex from apex", () => {

templates/generator/test/parse.ts

@@ -1,5 +1,5 @@
-import { parse as parseApex } from "https://deno.land/x/apex_core@v0.1.3/mod.ts";
-import { Context } from "https://deno.land/x/apex_core@v0.1.3/model/mod.ts";
+import { parse as parseApex } from "https://deno.land/x/apex_core@v0.1.5/mod.ts";
+import { Context } from "https://deno.land/x/apex_core@v0.1.5/model/mod.ts";
 
 export function parse(src: string): Context {
   const doc = parseApex(src);

test/parse.ts

@@ -1,4 +1,4 @@
-import { parse as parseApex } from "https://deno.land/x/apex_core@v0.1.3/mod.ts";
+import { parse as parseApex } from "https://deno.land/x/apex_core@v0.1.5/mod.ts";
 import { Context, Namespace, Type } from "../src/deps/core/model.ts";
 
 export function parse(src: string): Namespace {
@@ -9,6 +9,6 @@ export function parse(src: string): Namespace {
 
 export function getTypes(namespace: Namespace, types: string[]): Type[] {
   return Object.entries(namespace.types)
-    .filter(([name, type]) => (types.indexOf(name) === -1 ? false : true))
-    .map(([n, t]) => t);
+    .filter(([name, _type]) => (types.indexOf(name) === -1 ? false : true))
+    .map(([_n, t]) => t);
 }

test/utils/utilities.test.ts

@@ -1,7 +1,6 @@
-import { assert } from "https://deno.land/std@0.167.0/testing/asserts.ts";
+import { assert } from "https://deno.land/std@0.213.0/assert/assert.ts";
 import { isRecursiveType } from "../../src/utils/utilities.ts";
 import { getTypes, parse } from "../parse.ts";
-export * from "https://deno.land/std@0.167.0/testing/asserts.ts";
 
 Deno.test("should not identify recursive types", () => {
   const apex = `
@@ -16,7 +15,7 @@ Deno.test("should not identify recursive types", () => {
   }
   `;
   const model = parse(apex);
-  const [parent, child] = getTypes(model, ["Parent"]);
+  const [parent, _child] = getTypes(model, ["Parent"]);
   assert(isRecursiveType(parent));
 });
 

testdata/json-schema/expected/schema-test.json

@@ -217,4 +217,4 @@
       ]
     }
   }
-}
+}