Upgrade the typescript-generator backend (#54)

* Upgrade the typescript-generator backend * Fixed union types * Fix tests * Improve comment
palantir · May 19, 2017 · a1e65a6 · a1e65a6
1 parent 1a61e8f
commit a1e65a6
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 4 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -6,7 +6,7 @@ guavaVersion=18.0
 feignVersion=8.10.0
 jacksonVersion=2.6.1
 jaxRsVersion=2.0.1
-typescriptGeneratorVersion=1.7.190
+typescriptGeneratorVersion=1.25.322
 commonsIOVersion=2.4
 findbugsAnnotationsVersion=3.0.0
 

diff --git a/...src/main/java/com/palantir/code/ts/generator/TypescriptServiceGeneratorConfiguration.java b/...src/main/java/com/palantir/code/ts/generator/TypescriptServiceGeneratorConfiguration.java
@@ -213,6 +213,8 @@ public Settings getSettings() {
         settings.addTypeNamePrefix = generatedInterfacePrefix();
         settings.sortDeclarations = true;
         settings.noFileComment = true;
+        // behave like 0.9.0; also fixes when subtypes use generics
+        settings.disableTaggedUnions = true;
         settings.jsonLibrary = JsonLibrary.jackson2;
         settings.optionalAnnotations = optionalAnnotations();
         settings.outputKind = TypeScriptOutputKind.global;

diff --git a/...rvice-generator-core/src/test/java/com/palantir/code/ts/generator/ServiceEmitterTest.java b/...rvice-generator-core/src/test/java/com/palantir/code/ts/generator/ServiceEmitterTest.java
@@ -68,7 +68,7 @@ public void testComplexServiceClassEmitTypes() {
 "\n" +
 "    export interface MyObject {\n" +
 "        y: MyObject;\n" +
-"    }\n" +
+"    }\n\n\n    // Added by 'EnumConstantsExtension' extension\n" +
 "";
         assertEquals(expectedOutput, new String(stream.toByteArray()));
     }
@@ -232,7 +232,7 @@ public void testAdditionalClassesToOutput() {
         String expectedOutput = "\n" +
 "    export interface MyObject {\n" +
 "        y: MyObject;\n" +
-"    }\n";
+"    }\n\n\n    // Added by 'EnumConstantsExtension' extension\n";
         assertEquals(expectedOutput, new String(stream.toByteArray()));
     }
 
@@ -244,7 +244,7 @@ public void testEnumClass() {
         writer.close();
         String expectedOutput = "\n" +
 "    export type MyEnum = \"VALUE1\" | \"VALUE2\";\n" +
-"\n" +
+"\n\n    // Added by 'EnumConstantsExtension' extension\n\n" +
 "    export const MyEnum = {\n" +
 "        VALUE1: <MyEnum>\"VALUE1\",\n" +
 "        VALUE2: <MyEnum>\"VALUE2\",\n" +

diff --git a/...r-core/src/test/resources/eteTestData/complexServiceTestOutput/testComplexServiceClass.ts b/...r-core/src/test/resources/eteTestData/complexServiceTestOutput/testComplexServiceClass.ts
@@ -18,6 +18,9 @@ module ModuleName.TestComplexServiceClass {
         y: IMyObject;
     }
 
+
+    // Added by 'EnumConstantsExtension' extension
+
     export interface ITestComplexServiceClass {
         allOptionsPost(a: string, dataObject: IDataObject, b?: number): FooReturn<IGenericObject<IMyObject>>;
         queryGetter(x?: boolean): FooReturn<IMyObject>;

diff --git a/...e-generator-core/src/test/resources/eteTestData/simpleServiceTestOutput/simpleService1.ts b/...e-generator-core/src/test/resources/eteTestData/simpleServiceTestOutput/simpleService1.ts
@@ -2,6 +2,9 @@
 // Generated
 import { HttpEndpointOptions, HttpApiBridge } from "./httpApiBridge";
 
+
+// Added by 'EnumConstantsExtension' extension
+
 export interface SimpleService1 {
     method1(): FooReturn<string>;
 }