Merge pull request #13 from guardian/fix-handling-of-empty-collections

Fix Handling Of Empty Collections

.gitignore

@@ -1,3 +1,5 @@
 target
 
-.idea
+.idea
+
+node_modules

package.json

@@ -0,0 +1,22 @@
+{
+  "name": "scrooge-extras",
+  "version": "1.2.6",
+  "description": "An SBT plugin to generate typescript definitions from thrift files.",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/guardian/scrooge-extras.git"
+  },
+  "author": "",
+  "license": "Apache-2.0",
+  "bugs": {
+    "url": "https://github.com/guardian/scrooge-extras/issues"
+  },
+  "homepage": "https://github.com/guardian/scrooge-extras#readme",
+  "devDependencies": {
+    "typescript": "^4.1.5"
+  }
+}

scrooge-generator-typescript/src/main/resources/typescript/read_field.mustache

@@ -15,10 +15,8 @@ if (listInfo{{depth}}.etype === {{nestedType.thriftType}}) {
         {{/nestedType}}
         {{variableName}}.push({{nestedType.variableName}});
     }
-    protocol.{{endReadingStatement}}();
-} else {
-    protocol.skip(ftype);
 }
+protocol.{{endReadingStatement}}();
 {{/isCollection}}
 {{#isMap}}
 const mapInfo{{depth}} = protocol.readMapBegin();
@@ -34,8 +32,6 @@ if (mapInfo{{depth}}.ktype === {{keyType.thriftType}} && mapInfo{{depth}}.vtype
     {{/valueType}}
     {{variableName}}[{{keyType.variableName}}] = {{valueType.variableName}};
     }
-    protocol.readMapEnd();
-} else {
-    protocol.skip(ftype);
 }
+protocol.readMapEnd();
 {{/isMap}}

scrooge-generator-typescript/src/test/resources/school/university.thrift

@@ -10,4 +10,6 @@ struct School {
   6: required map<string,shared.Student> classes
   10: required map<i32,shared.Student> otherMapOfPeople
   11: optional i64 ageInMs
+  12: optional map<string,i32> emptyMap
+  13: optional list<string> emptyList
 }

scrooge-generator-typescript/src/test/scala/com/gu/scrooge/backend/typescript/TypescriptGeneratorSpec.scala

@@ -58,7 +58,7 @@ class TypescriptGeneratorSpec extends AnyFlatSpec with Matchers {
     val npmInstall = Process("npm install", npmProject.packageDirectory.toFile).!
     npmInstall shouldEqual 0
 
-    val tsc = Process("tsc", npmProject.packageDirectory.toFile).!
+    val tsc = Process("./node_modules/.bin/tsc", npmProject.packageDirectory.toFile).!
     tsc shouldEqual 0
   }
 
@@ -101,7 +101,9 @@ class TypescriptGeneratorSpec extends AnyFlatSpec with Matchers {
       schoolName = Some("Hogwarts School of Witchcraft and Wizardry"),
       students = Seq(harry, hermione),
       crazyNestedList = Seq(Set(Seq(harry), Seq(hermione))),
-      classes = Map("Magic" -> harry)
+      classes = Map("Magic" -> harry),
+      emptyMap = Some(Map.empty),
+      emptyList = Some(List.empty)
     )
   }