Fix #1131

TypeStrong · Nov 13, 2019 · 6cdc62a · 6cdc62a
1 parent 87099f8
commit 6cdc62a
Show file tree

Hide file tree

Showing 5 changed files with 3,981 additions and 12 deletions.
diff --git a/src/lib/models/types/predicate.ts b/src/lib/models/types/predicate.ts
@@ -83,7 +83,7 @@ export class PredicateType extends Type {
             ...super.toObject(),
             name: this.name,
             asserts: this.asserts,
-            targetType: this.targetType
+            targetType: this.targetType?.toObject()
         };
     }
 

diff --git a/src/lib/serialization/serializers/types/predicate.ts b/src/lib/serialization/serializers/types/predicate.ts
@@ -13,7 +13,7 @@ export class PredicateTypeSerializer extends TypeSerializerComponent<PredicateTy
             ...obj,
             name: type.name,
             asserts: type.asserts,
-            targetType: type.targetType
+            targetType: type.targetType ? this.owner.toObject(type.targetType) : undefined
         };
     }
 }
diff --git a/src/test/converter.test.ts b/src/test/converter.test.ts
@@ -89,7 +89,7 @@ describe('Converter', function() {
 
             it('matches specs', function() {
                 const specs = JSON.parse(FS.readFileSync(Path.join(path, 'specs.json')).toString());
-                let data = JSON.stringify(result!.toObject(), null, '  ');
+                let data = JSON.stringify(app.serializer.toObject(result), null, '  ');
                 data = data.split(normalizePath(base)).join('%BASE%');
 
                 compareReflections(JSON.parse(data), specs);

diff --git a/src/test/converter/array/array.ts b/src/test/converter/array/array.ts
@@ -1,8 +1,7 @@
 /**
  * A custom array interface.
  */
-export interface Array<T>
-{
+export interface Array<T> {
 }
 
 /**
@@ -13,4 +12,14 @@ export const complex: ((Array<string>[] | number[])[] | string)[][] = [];
 /**
  * An exported const of the custom array type.
  */
-export const custom: Array<number> = {};
+export const custom: Array<number> = {};
+
+/**
+ * Class array class item
+ */
+export class Foo {}
+
+/**
+ * Custom list class
+ */
+export class FooList extends Array<Foo> {}