JSON deserialization - simple values in collections (refs #188)

Author: vojtechhabarta

typescript-generator-core/src/main/java/cz/habarta/typescript/generator/ext/JsonDeserializationExtension.java

@@ -227,11 +227,14 @@ private static TsIfStatement ifUndefinedThenReturnItStatement(String identifier)
 
     private static TsExpression getPropertyCopy(SymbolTable symbolTable, TsModel tsModel, TsBeanModel bean, TsPropertyModel property) {
         final TsExpression copyFunction = getCopyFunctionForTsType(symbolTable, tsModel, property.getTsType());
-        if (copyFunction instanceof TsIdentifierReference) {
-            final TsIdentifierReference reference = (TsIdentifierReference) copyFunction;
-            if (reference.getIdentifier().equals("__identity")) {
-                // function degenerates to the same value (data.property)
-                return new TsMemberExpression(new TsIdentifierReference("data"), property.name);
+        if (copyFunction instanceof TsCallExpression) {
+            final TsCallExpression callExpression = (TsCallExpression) copyFunction;
+            if (callExpression.getExpression() instanceof TsIdentifierReference) {
+                final TsIdentifierReference reference = (TsIdentifierReference) callExpression.getExpression();
+                if (reference.getIdentifier().equals("__identity")) {
+                    // function degenerates to the same value (data.property)
+                    return new TsMemberExpression(new TsIdentifierReference("data"), property.name);
+                }
             }
         }
         return new TsCallExpression(
@@ -289,7 +292,11 @@ private static TsExpression getCopyFunctionForTsType(SymbolTable symbolTable, Ts
             return new TsIdentifierReference("constructorFnOf" + genericVariableType.name);
         }
         // __identity
-        return new TsIdentifierReference("__identity");
+        return new TsCallExpression(
+                new TsIdentifierReference("__identity"),
+                Arrays.asList(tsType),
+                Collections.<TsExpression>emptyList()
+        );
     }
 
     private static TsMethodModel createDeserializationMethodForTaggedUnion(SymbolTable symbolTable, TsModel tsModel, TsBeanModel bean) {

typescript-generator-core/src/main/resources/helpers/jsonDeserialization.ts

@@ -24,6 +24,6 @@ function __copyObject<T>(object: { [index: string]: T }, itemCopyFn: (item: T) =
     return result;
 }
 
-function __identity<T>(value: T): T {
-    return value;
+function __identity<T>(): (value: T) => T {
+    return value => value;
 }

typescript-generator-core/src/test/java/cz/habarta/typescript/generator/JsonDeserializationTest.java

@@ -77,6 +77,9 @@ private static class User {
         public Map<String, Address> taggedAddresses;
         public Map<String, List<Address>> groupedAddresses;
         public List<Map<String, Address>> listOfTaggedAddresses;
+        public List<String> tags;
+        public Map<String, String> mapping;
+        public List<List<String>> listOfListOfString;
         public PagedList<Order, Authentication> orders;
         public List<PagedList<Order, Authentication>> allOrders;
         public Shape shape;

typescript-generator-core/src/test/resources/cz/habarta/typescript/generator/JsonDeserializationTest-expected.ts

@@ -9,6 +9,9 @@ export class User {
     taggedAddresses: { [index: string]: Address };
     groupedAddresses: { [index: string]: Address[] };
     listOfTaggedAddresses: { [index: string]: Address }[];
+    tags: string[];
+    mapping: { [index: string]: string };
+    listOfListOfString: string[][];
     orders: PagedList<Order, Authentication>;
     allOrders: PagedList<Order, Authentication>[];
     shape: ShapeUnion;
@@ -28,8 +31,11 @@ export class User {
         instance.taggedAddresses = __getCopyObjectFn(Address.fromData)(data.taggedAddresses);
         instance.groupedAddresses = __getCopyObjectFn(__getCopyArrayFn(Address.fromData))(data.groupedAddresses);
         instance.listOfTaggedAddresses = __getCopyArrayFn(__getCopyObjectFn(Address.fromData))(data.listOfTaggedAddresses);
-        instance.orders = PagedList.fromDataFn<Order, Authentication>(Order.fromData, __identity)(data.orders);
-        instance.allOrders = __getCopyArrayFn(PagedList.fromDataFn<Order, Authentication>(Order.fromData, __identity))(data.allOrders);
+        instance.tags = __getCopyArrayFn(__identity<string>())(data.tags);
+        instance.mapping = __getCopyObjectFn(__identity<string>())(data.mapping);
+        instance.listOfListOfString = __getCopyArrayFn(__getCopyArrayFn(__identity<string>()))(data.listOfListOfString);
+        instance.orders = PagedList.fromDataFn<Order, Authentication>(Order.fromData, __identity<Authentication>())(data.orders);
+        instance.allOrders = __getCopyArrayFn(PagedList.fromDataFn<Order, Authentication>(Order.fromData, __identity<Authentication>()))(data.allOrders);
         instance.shape = Shape.fromDataUnion(data.shape);
         instance.shapes = __getCopyArrayFn(Shape.fromDataUnion)(data.shapes);
         return instance;
@@ -204,6 +210,6 @@ function __copyObject<T>(object: { [index: string]: T }, itemCopyFn: (item: T) =
     return result;
 }
 
-function __identity<T>(value: T): T {
-    return value;
+function __identity<T>(): (value: T) => T {
+    return value => value;
 }

typescript-generator-core/src/test/ts/JsonDeserializationTest/JsonDeserializationTest-expected-test-data.json

@@ -35,6 +35,17 @@
             }
         }
     ],
+    "tags": [
+        "item"
+    ],
+    "mapping": {
+        "key": "value"
+    },
+    "listOfListOfString": [
+        [
+            "string"
+        ]
+    ],
     "orders": {
         "page": 7,
         "items": [

typescript-generator-core/src/test/ts/JsonDeserializationTest/JsonDeserializationTest-expected-test.ts

@@ -44,6 +44,19 @@ assertType(user.listOfTaggedAddresses, Array);
 assertType(user.listOfTaggedAddresses[0], "object");
 assertType(user.listOfTaggedAddresses[0]["address6"], Address);
 
+// .tags
+assertType(user.tags, Array);
+assertType(user.tags[0], "string");
+
+// .mapping
+assertType(user.mapping, "object");
+assertType(user.mapping["key"], "string");
+
+// .listOfListOfString
+assertType(user.listOfListOfString, Array);
+assertType(user.listOfListOfString[0], Array);
+assertType(user.listOfListOfString[0][0], "string");
+
 // .orders
 assertType(user.orders, PagedList);
 assertType(user.orders.page, "number");