finagle-ts: Generates inherited service, service and method annotations

Problem/Solution TypeScript generator should also support generating inherited services. Method annotations are located in the generated ThriftRequest(Call) schema. Service annotations are readonly fields. What also happened in this phab: By re-enabling goldfile test, found that bazel/pants cannot trace beyond its target, in this case, target1. So the target2 files cannot be tested. Removed the target2 files in gold files tests. generator.ts overwrite the generated path in node_module/gen when copying, we have to reset chmod every time when there are multiple thrift dependency targets. JIRA Issues: CSL-11991 Differential Revision: https://phabricator.twitter.biz/D904597
twitter · Jun 11, 2022 · 8c121f0 · 8c121f0
1 parent a6cc0f9
commit 8c121f0
Show file tree

Hide file tree

Showing 16 changed files with 18 additions and 2 deletions.
diff --git a/scrooge-generator-tests/src/test/thrift/scala/BUILD b/scrooge-generator-tests/src/test/thrift/scala/BUILD
@@ -5,6 +5,7 @@ create_thrift_libraries(
     generate_languages = [
         "java",
         "scala",
+        "typescript",
     ],
 )
 

diff --git a/scrooge-generator-tests/src/test/thrift/scala/bigservice.thrift b/scrooge-generator-tests/src/test/thrift/scala/bigservice.thrift
@@ -1,5 +1,6 @@
 #@namespace scala collisions.big.thriftscala
 namespace java collisions.big.thriftjava
+#@namespace typescript collisions.big.thriftts
 
 
 # Scala 2.10 can't handle case classes with 22+ arguments.

diff --git a/scrooge-generator-tests/src/test/thrift/scala/colliding_methods.thrift b/scrooge-generator-tests/src/test/thrift/scala/colliding_methods.thrift
@@ -1,5 +1,6 @@
 #@namespace scala collisions
 namespace java collisions_java
+#@namespace typescript collisions.thriftts
 
 
 // Test struct names colliding with capitalized method names.

diff --git a/scrooge-generator-tests/src/test/thrift/scala/colliding_types.thrift b/scrooge-generator-tests/src/test/thrift/scala/colliding_types.thrift
@@ -1,5 +1,6 @@
 #@namespace scala collisions
 namespace java collisions_java
+#@namespace typescript collisions.thriftts
 
 # Check for collisions between Result and MyService.MyMethod.Result
 struct Result {

diff --git a/scrooge-generator-tests/src/test/thrift/scala/colliding_unions.thrift b/scrooge-generator-tests/src/test/thrift/scala/colliding_unions.thrift
@@ -1,5 +1,6 @@
 #@namespace scala collisions.enums
 namespace java collisions.enums_java
+#@namespace typescript collisions.enums.thriftts
 
 union Result {
   string successValue

diff --git a/scrooge-generator-tests/src/test/thrift/scala/const.thrift b/scrooge-generator-tests/src/test/thrift/scala/const.thrift
@@ -1,5 +1,6 @@
 namespace java includes.a.thriftjava
 #@namespace scala includes.a.thriftscala
+#@namespace typescript includes.a.thriftts
 
 struct CityState {
   1: string city
@@ -25,4 +26,4 @@ struct TestName {
   2: string last
   3: string middle = ""
   4: Address address
-}
+}
diff --git a/scrooge-generator-tests/src/test/thrift/scala/const1.thrift b/scrooge-generator-tests/src/test/thrift/scala/const1.thrift
@@ -1,5 +1,6 @@
 namespace java includes.b.thriftjava
 #@namespace scala includes.b.thriftscala
+#@namespace typescript includes.b.thriftts
 
 include "const.thrift"
 
@@ -15,4 +16,4 @@ const const.TestName name1 = {
       }
     }
   }
-}
+}
diff --git a/scrooge-generator-tests/src/test/thrift/scala/duplicate_methods.thrift b/scrooge-generator-tests/src/test/thrift/scala/duplicate_methods.thrift
@@ -1,5 +1,6 @@
 #@namespace scala collisions.dupes.thriftscala
 namespace java collisions.dupes.thriftjava
+#@namespace typescript collisions.dups.thriftts
 
 
 service Aaa {

diff --git a/scrooge-generator-tests/src/test/thrift/scala/echo.thrift b/scrooge-generator-tests/src/test/thrift/scala/echo.thrift
@@ -1,5 +1,6 @@
 #@namespace scala collisions
 namespace java java_collisions
+#@namespace typescript collisions.thriftts
 
 /* Method colliding with service name */
 service Echo {

diff --git a/scrooge-generator-tests/src/test/thrift/scala/inheritance/aaa.thrift b/scrooge-generator-tests/src/test/thrift/scala/inheritance/aaa.thrift
@@ -1,5 +1,6 @@
 #@namespace scala inheritance.aaa
 namespace java inheritance.thriftjava.aaa
+#@namespace typescript inheritance.thriftts.aaa
 
 struct Box {
   1: i32 x

diff --git a/scrooge-generator-tests/src/test/thrift/scala/inheritance/bbb.thrift b/scrooge-generator-tests/src/test/thrift/scala/inheritance/bbb.thrift
@@ -1,5 +1,6 @@
 #@namespace scala inheritance.bbb
 namespace java inheritance.thriftjava.bbb
+#@namespace typescript inheritance.thriftts.bbb
 
 include "aaa.thrift"
 

diff --git a/scrooge-generator-tests/src/test/thrift/scala/inheritance/ccc.thrift b/scrooge-generator-tests/src/test/thrift/scala/inheritance/ccc.thrift
@@ -1,5 +1,6 @@
 #@namespace scala inheritance.ccc
 namespace java inheritance.thriftjava.ccc
+#@namespace typescript inheritance.thriftts.ccc
 
 include "bbb.thrift"
 

diff --git a/scrooge-generator-tests/src/test/thrift/scala/inheritance/ddd.thrift b/scrooge-generator-tests/src/test/thrift/scala/inheritance/ddd.thrift
@@ -1,5 +1,6 @@
 #@namespace scala inheritance.ddd
 namespace java inheritance.thriftjava.ddd
+#@namespace typescript inheritance.thriftts.ddd
 
 include "ccc.thrift"
 

diff --git a/scrooge-generator-tests/src/test/thrift/scala/inheritance/extending.thrift b/scrooge-generator-tests/src/test/thrift/scala/inheritance/extending.thrift
@@ -1,5 +1,6 @@
 #@namespace scala inheritance
 namespace java inheritance.thriftjava
+#@namespace typescript inheritance.thriftts
 
 include "lowercase.thrift"
 

diff --git a/scrooge-generator-tests/src/test/thrift/scala/inheritance/lowercase.thrift b/scrooge-generator-tests/src/test/thrift/scala/inheritance/lowercase.thrift
@@ -1,5 +1,6 @@
 #@namespace scala inheritance
 namespace java inheritance.thriftjava
+#@namespace typescript inheritance.thriftts
 
 service iamlowercase {
   i32 getInt()

diff --git a/scrooge-generator-tests/src/test/thrift/scala/very_big_service.thrift b/scrooge-generator-tests/src/test/thrift/scala/very_big_service.thrift
@@ -1,5 +1,6 @@
 #@namespace scala collisions.big.thriftscala
 namespace java collisions.big.thriftjava
+#@namespace typescript collisions.big.thriftts
 
 # We skip generation of ServiceIfaces for thrift services with 255+ methods.
 # see https://issues.scala-lang.org/browse/SI-7324