quicktype 17.0.3 → 17.0.5

package/dist/quicktype-core/Transformers.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.followTargetType = exports.transformationForType = exports.transformationTypeAttributeKind = exports.Transformation = exports.MinMaxValueTransformer = exports.MinMaxLengthCheckTransformer = exports.StringifyTransformer = exports.ParseStringTransformer = exports.StringProducerTransformer = exports.UnionInstantiationTransformer = exports.StringMatchTransformer = exports.UnionMemberMatchTransformer = exports.DecodingChoiceTransformer = exports.ChoiceTransformer = exports.ArrayEncodingTransformer = exports.ArrayDecodingTransformer = exports.EncodingTransformer = exports.DecodingTransformer = exports.MatchTransformer = exports.ProducerTransformer = exports.Transformer = void 0;
 const collection_utils_1 = require("collection-utils");
 const Type_1 = require("./Type");
 const TypeAttributes_1 = require("./attributes/TypeAttributes");
@@ -14,19 +13,16 @@ function debugStringForType(t) {
     return `${t.kind} (${target.kind})`;
 }
 function getNumberOfNodes(xfer) {
-    return (0, collection_utils_1.definedMapWithDefault)(xfer, 0, x => x.getNumberOfNodes());
+    return collection_utils_1.definedMapWithDefault(xfer, 0, x => x.getNumberOfNodes());
 }
 class Transformer {
-    kind;
-    graph;
-    sourceTypeRef;
     constructor(kind, graph, sourceTypeRef) {
         this.kind = kind;
         this.graph = graph;
         this.sourceTypeRef = sourceTypeRef;
     }
     get sourceType() {
-        return (0, TypeGraph_1.derefTypeRef)(this.sourceTypeRef, this.graph);
+        return TypeGraph_1.derefTypeRef(this.sourceTypeRef, this.graph);
     }
     /** This must return a newly constructed set. */
     getChildren() {
@@ -41,7 +37,7 @@ class Transformer {
         return this.sourceTypeRef === other.sourceTypeRef;
     }
     hashCode() {
-        return (0, collection_utils_1.hashCodeOf)(this.sourceTypeRef);
+        return collection_utils_1.hashCodeOf(this.sourceTypeRef);
     }
     debugDescription() {
         return `${debugStringForType(this.sourceType)} -> ${this.kind}`;
@@ -50,13 +46,12 @@ class Transformer {
         return;
     }
     debugPrint(indent) {
-        console.log((0, Support_1.indentationString)(indent) + this.debugDescription());
+        console.log(Support_1.indentationString(indent) + this.debugDescription());
         this.debugPrintContinuations(indent + 1);
     }
 }
 exports.Transformer = Transformer;
 class ProducerTransformer extends Transformer {
-    consumer;
     constructor(kind, graph, sourceTypeRef, consumer) {
         super(kind, graph, sourceTypeRef);
         this.consumer = consumer;
@@ -65,7 +60,7 @@ class ProducerTransformer extends Transformer {
         const children = super.getChildren();
         if (this.consumer === undefined)
             return children;
-        return (0, collection_utils_1.setUnionInto)(children, this.consumer.getChildren());
+        return collection_utils_1.setUnionInto(children, this.consumer.getChildren());
     }
     getNumberOfNodes() {
         return super.getNumberOfNodes() + getNumberOfNodes(this.consumer);
@@ -75,11 +70,11 @@ class ProducerTransformer extends Transformer {
             return false;
         if (!(other instanceof ProducerTransformer))
             return false;
-        return (0, collection_utils_1.areEqual)(this.consumer, other.consumer);
+        return collection_utils_1.areEqual(this.consumer, other.consumer);
     }
     hashCode() {
         const h = super.hashCode();
-        return (0, collection_utils_1.addHashCode)(h, (0, collection_utils_1.hashCodeOf)(this.consumer));
+        return collection_utils_1.addHashCode(h, collection_utils_1.hashCodeOf(this.consumer));
     }
     debugPrintContinuations(indent) {
         if (this.consumer === undefined)
@@ -89,13 +84,12 @@ class ProducerTransformer extends Transformer {
 }
 exports.ProducerTransformer = ProducerTransformer;
 class MatchTransformer extends Transformer {
-    transformer;
     constructor(kind, graph, sourceTypeRef, transformer) {
         super(kind, graph, sourceTypeRef);
         this.transformer = transformer;
     }
     getChildren() {
-        return (0, collection_utils_1.setUnionInto)(super.getChildren(), this.transformer.getChildren());
+        return collection_utils_1.setUnionInto(super.getChildren(), this.transformer.getChildren());
     }
     getNumberOfNodes() {
         return super.getNumberOfNodes() + this.transformer.getNumberOfNodes();
@@ -109,7 +103,7 @@ class MatchTransformer extends Transformer {
     }
     hashCode() {
         const h = super.hashCode();
-        return (0, collection_utils_1.addHashCode)(h, this.transformer.hashCode());
+        return collection_utils_1.addHashCode(h, this.transformer.hashCode());
     }
     debugPrintContinuations(indent) {
         this.transformer.debugPrint(indent);
@@ -125,7 +119,7 @@ class DecodingTransformer extends ProducerTransformer {
     }
     reverse(targetTypeRef, continuationTransformer) {
         if (continuationTransformer !== undefined) {
-            return (0, Support_1.panic)("Reversing a decoding transformer cannot have a continuation");
+            return Support_1.panic("Reversing a decoding transformer cannot have a continuation");
         }
         if (this.consumer === undefined) {
             return new EncodingTransformer(this.graph, targetTypeRef);
@@ -135,7 +129,7 @@ class DecodingTransformer extends ProducerTransformer {
         }
     }
     reconstitute(builder) {
-        return new DecodingTransformer(builder.typeGraph, builder.reconstituteTypeRef(this.sourceTypeRef), (0, collection_utils_1.definedMap)(this.consumer, xfer => xfer.reconstitute(builder)));
+        return new DecodingTransformer(builder.typeGraph, builder.reconstituteTypeRef(this.sourceTypeRef), collection_utils_1.definedMap(this.consumer, xfer => xfer.reconstitute(builder)));
     }
     equals(other) {
         if (!super.equals(other))
@@ -152,7 +146,7 @@ class EncodingTransformer extends Transformer {
         return false;
     }
     reverse(_targetTypeRef, _continuationTransformer) {
-        return (0, Support_1.panic)("Can't reverse encoding transformer");
+        return Support_1.panic("Can't reverse encoding transformer");
     }
     reconstitute(builder) {
         return new EncodingTransformer(builder.typeGraph, builder.reconstituteTypeRef(this.sourceTypeRef));
@@ -167,8 +161,6 @@ class EncodingTransformer extends Transformer {
 }
 exports.EncodingTransformer = EncodingTransformer;
 class ArrayDecodingTransformer extends ProducerTransformer {
-    _itemTargetTypeRef;
-    itemTransformer;
     constructor(graph, sourceTypeRef, consumer, _itemTargetTypeRef, itemTransformer) {
         super("decode-array", graph, sourceTypeRef, consumer);
         this._itemTargetTypeRef = _itemTargetTypeRef;
@@ -177,7 +169,7 @@ class ArrayDecodingTransformer extends ProducerTransformer {
     getChildren() {
         const children = super.getChildren();
         children.add(this.itemTargetType);
-        return (0, collection_utils_1.setUnionInto)(children, this.itemTransformer.getChildren());
+        return collection_utils_1.setUnionInto(children, this.itemTransformer.getChildren());
     }
     getNumberOfNodes() {
         return super.getNumberOfNodes() + this.itemTransformer.getNumberOfNodes();
@@ -186,11 +178,11 @@ class ArrayDecodingTransformer extends ProducerTransformer {
         return false;
     }
     get itemTargetType() {
-        return (0, TypeGraph_1.derefTypeRef)(this._itemTargetTypeRef, this.graph);
+        return TypeGraph_1.derefTypeRef(this._itemTargetTypeRef, this.graph);
     }
     reverse(targetTypeRef, continuationTransformer) {
         if (continuationTransformer !== undefined) {
-            return (0, Support_1.panic)("Reversing a decoding transformer cannot have a continuation");
+            return Support_1.panic("Reversing a decoding transformer cannot have a continuation");
         }
         const itemTransformer = this.itemTransformer.reverse(this._itemTargetTypeRef, undefined);
         if (this.consumer === undefined) {
@@ -201,12 +193,12 @@ class ArrayDecodingTransformer extends ProducerTransformer {
         }
     }
     reconstitute(builder) {
-        return new ArrayDecodingTransformer(builder.typeGraph, builder.reconstituteTypeRef(this.sourceTypeRef), (0, collection_utils_1.definedMap)(this.consumer, xfer => xfer.reconstitute(builder)), builder.reconstituteTypeRef(this._itemTargetTypeRef), this.itemTransformer.reconstitute(builder));
+        return new ArrayDecodingTransformer(builder.typeGraph, builder.reconstituteTypeRef(this.sourceTypeRef), collection_utils_1.definedMap(this.consumer, xfer => xfer.reconstitute(builder)), builder.reconstituteTypeRef(this._itemTargetTypeRef), this.itemTransformer.reconstitute(builder));
     }
     hashCode() {
         let h = super.hashCode();
-        h = (0, collection_utils_1.addHashCode)(h, (0, collection_utils_1.hashCodeOf)(this._itemTargetTypeRef));
-        h = (0, collection_utils_1.addHashCode)(h, this.itemTransformer.hashCode());
+        h = collection_utils_1.addHashCode(h, collection_utils_1.hashCodeOf(this._itemTargetTypeRef));
+        h = collection_utils_1.addHashCode(h, this.itemTransformer.hashCode());
         return h;
     }
     equals(other) {
@@ -214,7 +206,7 @@ class ArrayDecodingTransformer extends ProducerTransformer {
             return false;
         if (!(other instanceof ArrayDecodingTransformer))
             return false;
-        if (!(0, collection_utils_1.areEqual)(this._itemTargetTypeRef, other._itemTargetTypeRef))
+        if (!collection_utils_1.areEqual(this._itemTargetTypeRef, other._itemTargetTypeRef))
             return false;
         return this.itemTransformer.equals(other.itemTransformer);
     }
@@ -225,8 +217,6 @@ class ArrayDecodingTransformer extends ProducerTransformer {
 }
 exports.ArrayDecodingTransformer = ArrayDecodingTransformer;
 class ArrayEncodingTransformer extends Transformer {
-    _itemTargetTypeRef;
-    itemTransformer;
     constructor(graph, sourceTypeRef, _itemTargetTypeRef, itemTransformer) {
         super("encode-array", graph, sourceTypeRef);
         this._itemTargetTypeRef = _itemTargetTypeRef;
@@ -235,7 +225,7 @@ class ArrayEncodingTransformer extends Transformer {
     getChildren() {
         const children = super.getChildren();
         children.add(this.itemTargetType);
-        return (0, collection_utils_1.setUnionInto)(children, this.itemTransformer.getChildren());
+        return collection_utils_1.setUnionInto(children, this.itemTransformer.getChildren());
     }
     getNumberOfNodes() {
         return super.getNumberOfNodes() + this.itemTransformer.getNumberOfNodes();
@@ -244,25 +234,25 @@ class ArrayEncodingTransformer extends Transformer {
         return false;
     }
     get itemTargetType() {
-        return (0, TypeGraph_1.derefTypeRef)(this._itemTargetTypeRef, this.graph);
+        return TypeGraph_1.derefTypeRef(this._itemTargetTypeRef, this.graph);
     }
     reverse(_targetTypeRef, _continuationTransformer) {
-        return (0, Support_1.panic)("Can't reverse array encoding transformer");
+        return Support_1.panic("Can't reverse array encoding transformer");
     }
     reconstitute(builder) {
         return new ArrayEncodingTransformer(builder.typeGraph, builder.reconstituteTypeRef(this.sourceTypeRef), builder.reconstituteTypeRef(this._itemTargetTypeRef), this.itemTransformer.reconstitute(builder));
     }
     hashCode() {
         let h = super.hashCode();
-        h = (0, collection_utils_1.addHashCode)(h, (0, collection_utils_1.hashCodeOf)(this._itemTargetTypeRef));
-        return (0, collection_utils_1.addHashCode)(h, this.itemTransformer.hashCode());
+        h = collection_utils_1.addHashCode(h, collection_utils_1.hashCodeOf(this._itemTargetTypeRef));
+        return collection_utils_1.addHashCode(h, this.itemTransformer.hashCode());
     }
     equals(other) {
         if (!super.equals(other))
             return false;
         if (!(other instanceof ArrayEncodingTransformer))
             return false;
-        if (!(0, collection_utils_1.areEqual)(this._itemTargetTypeRef, other._itemTargetTypeRef))
+        if (!collection_utils_1.areEqual(this._itemTargetTypeRef, other._itemTargetTypeRef))
             return false;
         return this.itemTransformer.equals(other.itemTransformer);
     }
@@ -273,16 +263,15 @@ class ArrayEncodingTransformer extends Transformer {
 }
 exports.ArrayEncodingTransformer = ArrayEncodingTransformer;
 class ChoiceTransformer extends Transformer {
-    transformers;
     constructor(graph, sourceTypeRef, transformers) {
         super("choice", graph, sourceTypeRef);
         this.transformers = transformers;
-        (0, Support_1.assert)(transformers.length > 0, "Choice must have at least one transformer");
+        Support_1.assert(transformers.length > 0, "Choice must have at least one transformer");
     }
     getChildren() {
         let children = super.getChildren();
         for (const xfer of this.transformers) {
-            (0, collection_utils_1.setUnionInto)(children, xfer.getChildren());
+            collection_utils_1.setUnionInto(children, xfer.getChildren());
         }
         return children;
     }
@@ -316,11 +305,11 @@ class ChoiceTransformer extends Transformer {
             return false;
         if (!(other instanceof ChoiceTransformer))
             return false;
-        return (0, collection_utils_1.areEqual)(this.transformers, other.transformers);
+        return collection_utils_1.areEqual(this.transformers, other.transformers);
     }
     hashCode() {
         const h = super.hashCode();
-        return (0, collection_utils_1.addHashCode)(h, (0, collection_utils_1.hashCodeOf)(this.transformers));
+        return collection_utils_1.addHashCode(h, collection_utils_1.hashCodeOf(this.transformers));
     }
     debugPrintContinuations(indent) {
         for (const xfer of this.transformers) {
@@ -330,13 +319,6 @@ class ChoiceTransformer extends Transformer {
 }
 exports.ChoiceTransformer = ChoiceTransformer;
 class DecodingChoiceTransformer extends Transformer {
-    nullTransformer;
-    integerTransformer;
-    doubleTransformer;
-    boolTransformer;
-    stringTransformer;
-    arrayTransformer;
-    objectTransformer;
     constructor(graph, sourceTypeRef, nullTransformer, integerTransformer, doubleTransformer, boolTransformer, stringTransformer, arrayTransformer, objectTransformer) {
         super("decoding-choice", graph, sourceTypeRef);
         this.nullTransformer = nullTransformer;
@@ -366,7 +348,7 @@ class DecodingChoiceTransformer extends Transformer {
     getChildren() {
         let children = super.getChildren();
         for (const xfer of this.transformers) {
-            (0, collection_utils_1.setUnionInto)(children, xfer.getChildren());
+            collection_utils_1.setUnionInto(children, xfer.getChildren());
         }
         return children;
     }
@@ -381,7 +363,7 @@ class DecodingChoiceTransformer extends Transformer {
         return false;
     }
     reverse(targetTypeRef, continuationTransformer) {
-        (0, Support_1.assert)(continuationTransformer === undefined, "Reversing a decoding transformer can't have a target transformer");
+        Support_1.assert(continuationTransformer === undefined, "Reversing a decoding transformer can't have a target transformer");
         let transformers = new Map();
         let memberMatchTransformers = new Map();
         function addCase(reversed) {
@@ -425,7 +407,7 @@ class DecodingChoiceTransformer extends Transformer {
         // just pick the "simplest" non-failing one, being the one with the least number
         // of nodes.
         function filter(xfers) {
-            (0, Support_1.assert)(xfers.length > 0, "Must have at least one transformer");
+            Support_1.assert(xfers.length > 0, "Must have at least one transformer");
             const nonfailing = xfers.filter(xfer => {
                 // For member match transformers we're deciding between
                 // multiple that match against the same member, so the fact
@@ -441,7 +423,7 @@ class DecodingChoiceTransformer extends Transformer {
             });
             if (nonfailing.length === 0)
                 return xfers;
-            const smallest = (0, collection_utils_1.arraySortByInto)(nonfailing.map(x => [x.getNumberOfNodes(), x]), ([c, _]) => c)[0][1];
+            const smallest = collection_utils_1.arraySortByInto(nonfailing.map(x => [x.getNumberOfNodes(), x]), ([c, _]) => c)[0][1];
             return [smallest];
         }
         this.transformers.forEach(reverseAndAdd);
@@ -466,31 +448,31 @@ class DecodingChoiceTransformer extends Transformer {
             return false;
         if (!(other instanceof DecodingChoiceTransformer))
             return false;
-        if (!(0, collection_utils_1.areEqual)(this.nullTransformer, other.nullTransformer))
+        if (!collection_utils_1.areEqual(this.nullTransformer, other.nullTransformer))
             return false;
-        if (!(0, collection_utils_1.areEqual)(this.integerTransformer, other.integerTransformer))
+        if (!collection_utils_1.areEqual(this.integerTransformer, other.integerTransformer))
             return false;
-        if (!(0, collection_utils_1.areEqual)(this.doubleTransformer, other.doubleTransformer))
+        if (!collection_utils_1.areEqual(this.doubleTransformer, other.doubleTransformer))
             return false;
-        if (!(0, collection_utils_1.areEqual)(this.boolTransformer, other.boolTransformer))
+        if (!collection_utils_1.areEqual(this.boolTransformer, other.boolTransformer))
             return false;
-        if (!(0, collection_utils_1.areEqual)(this.stringTransformer, other.stringTransformer))
+        if (!collection_utils_1.areEqual(this.stringTransformer, other.stringTransformer))
             return false;
-        if (!(0, collection_utils_1.areEqual)(this.arrayTransformer, other.arrayTransformer))
+        if (!collection_utils_1.areEqual(this.arrayTransformer, other.arrayTransformer))
             return false;
-        if (!(0, collection_utils_1.areEqual)(this.objectTransformer, other.objectTransformer))
+        if (!collection_utils_1.areEqual(this.objectTransformer, other.objectTransformer))
             return false;
         return true;
     }
     hashCode() {
         let h = super.hashCode();
-        h = (0, collection_utils_1.addHashCode)(h, (0, collection_utils_1.hashCodeOf)(this.nullTransformer));
-        h = (0, collection_utils_1.addHashCode)(h, (0, collection_utils_1.hashCodeOf)(this.integerTransformer));
-        h = (0, collection_utils_1.addHashCode)(h, (0, collection_utils_1.hashCodeOf)(this.doubleTransformer));
-        h = (0, collection_utils_1.addHashCode)(h, (0, collection_utils_1.hashCodeOf)(this.boolTransformer));
-        h = (0, collection_utils_1.addHashCode)(h, (0, collection_utils_1.hashCodeOf)(this.stringTransformer));
-        h = (0, collection_utils_1.addHashCode)(h, (0, collection_utils_1.hashCodeOf)(this.arrayTransformer));
-        h = (0, collection_utils_1.addHashCode)(h, (0, collection_utils_1.hashCodeOf)(this.objectTransformer));
+        h = collection_utils_1.addHashCode(h, collection_utils_1.hashCodeOf(this.nullTransformer));
+        h = collection_utils_1.addHashCode(h, collection_utils_1.hashCodeOf(this.integerTransformer));
+        h = collection_utils_1.addHashCode(h, collection_utils_1.hashCodeOf(this.doubleTransformer));
+        h = collection_utils_1.addHashCode(h, collection_utils_1.hashCodeOf(this.boolTransformer));
+        h = collection_utils_1.addHashCode(h, collection_utils_1.hashCodeOf(this.stringTransformer));
+        h = collection_utils_1.addHashCode(h, collection_utils_1.hashCodeOf(this.arrayTransformer));
+        h = collection_utils_1.addHashCode(h, collection_utils_1.hashCodeOf(this.objectTransformer));
         return h;
     }
     debugPrintContinuations(indent) {
@@ -501,15 +483,14 @@ class DecodingChoiceTransformer extends Transformer {
 }
 exports.DecodingChoiceTransformer = DecodingChoiceTransformer;
 class UnionMemberMatchTransformer extends MatchTransformer {
-    memberTypeRef;
     constructor(graph, sourceTypeRef, transformer, memberTypeRef) {
         super("union-member-match", graph, sourceTypeRef, transformer);
         this.memberTypeRef = memberTypeRef;
     }
     get sourceType() {
-        const t = (0, TypeGraph_1.derefTypeRef)(this.sourceTypeRef, this.graph);
+        const t = TypeGraph_1.derefTypeRef(this.sourceTypeRef, this.graph);
         if (!(t instanceof Type_1.UnionType)) {
-            return (0, Support_1.panic)("The source of a union member match transformer must be a union type");
+            return Support_1.panic("The source of a union member match transformer must be a union type");
         }
         return t;
     }
@@ -517,13 +498,13 @@ class UnionMemberMatchTransformer extends MatchTransformer {
         return true;
     }
     get memberType() {
-        return (0, TypeGraph_1.derefTypeRef)(this.memberTypeRef, this.graph);
+        return TypeGraph_1.derefTypeRef(this.memberTypeRef, this.graph);
     }
     getChildren() {
         return super.getChildren().add(this.memberType);
     }
     reverse(_targetTypeRef, _continuationTransformer) {
-        return (0, Support_1.panic)("Can't reverse union member match transformer");
+        return Support_1.panic("Can't reverse union member match transformer");
     }
     reconstitute(builder) {
         return new UnionMemberMatchTransformer(builder.typeGraph, builder.reconstituteTypeRef(this.sourceTypeRef), this.transformer.reconstitute(builder), builder.reconstituteTypeRef(this.memberTypeRef));
@@ -537,7 +518,7 @@ class UnionMemberMatchTransformer extends MatchTransformer {
     }
     hashCode() {
         const h = super.hashCode();
-        return (0, collection_utils_1.addHashCode)(h, (0, collection_utils_1.hashCodeOf)(this.memberTypeRef));
+        return collection_utils_1.addHashCode(h, collection_utils_1.hashCodeOf(this.memberTypeRef));
     }
     debugDescription() {
         return `${super.debugDescription()} - member: ${debugStringForType(this.memberType)}`;
@@ -548,15 +529,14 @@ exports.UnionMemberMatchTransformer = UnionMemberMatchTransformer;
  * This matches strings and enum cases.
  */
 class StringMatchTransformer extends MatchTransformer {
-    stringCase;
     constructor(graph, sourceTypeRef, transformer, stringCase) {
         super("string-match", graph, sourceTypeRef, transformer);
         this.stringCase = stringCase;
     }
     get sourceType() {
-        const t = (0, TypeGraph_1.derefTypeRef)(this.sourceTypeRef, this.graph);
+        const t = TypeGraph_1.derefTypeRef(this.sourceTypeRef, this.graph);
         if (!(t instanceof Type_1.EnumType) && !(t instanceof Type_1.PrimitiveType && t.kind === "string")) {
-            return (0, Support_1.panic)("The source of a string match transformer must be an enum or string type");
+            return Support_1.panic("The source of a string match transformer must be an enum or string type");
         }
         return t;
     }
@@ -578,7 +558,7 @@ class StringMatchTransformer extends MatchTransformer {
     }
     hashCode() {
         const h = super.hashCode();
-        return (0, collection_utils_1.addHashCode)(h, (0, collection_utils_1.hashString)(this.stringCase));
+        return collection_utils_1.addHashCode(h, collection_utils_1.hashString(this.stringCase));
     }
     debugDescription() {
         return `${super.debugDescription()} - case: ${this.stringCase}`;
@@ -594,7 +574,7 @@ class UnionInstantiationTransformer extends Transformer {
     }
     reverse(targetTypeRef, continuationTransformer) {
         if (continuationTransformer === undefined) {
-            return (0, Support_1.panic)("Union instantiation transformer reverse must have a continuation");
+            return Support_1.panic("Union instantiation transformer reverse must have a continuation");
         }
         return new UnionMemberMatchTransformer(this.graph, targetTypeRef, continuationTransformer, this.sourceTypeRef);
     }
@@ -612,7 +592,6 @@ exports.UnionInstantiationTransformer = UnionInstantiationTransformer;
  * Produces a string or an enum case.
  */
 class StringProducerTransformer extends ProducerTransformer {
-    result;
     constructor(graph, sourceTypeRef, consumer, result) {
         super("string-producer", graph, sourceTypeRef, consumer);
         this.result = result;
@@ -622,7 +601,7 @@ class StringProducerTransformer extends ProducerTransformer {
     }
     reverse(targetTypeRef, continuationTransformer) {
         if (continuationTransformer === undefined) {
-            return (0, Support_1.panic)("Reversing a string producer transformer must have a continuation");
+            return Support_1.panic("Reversing a string producer transformer must have a continuation");
         }
         if (this.consumer === undefined) {
             return new StringMatchTransformer(this.graph, targetTypeRef, continuationTransformer, this.result);
@@ -632,7 +611,7 @@ class StringProducerTransformer extends ProducerTransformer {
         }
     }
     reconstitute(builder) {
-        return new StringProducerTransformer(builder.typeGraph, builder.reconstituteTypeRef(this.sourceTypeRef), (0, collection_utils_1.definedMap)(this.consumer, xfer => xfer.reconstitute(builder)), this.result);
+        return new StringProducerTransformer(builder.typeGraph, builder.reconstituteTypeRef(this.sourceTypeRef), collection_utils_1.definedMap(this.consumer, xfer => xfer.reconstitute(builder)), this.result);
     }
     equals(other) {
         if (!super.equals(other))
@@ -643,7 +622,7 @@ class StringProducerTransformer extends ProducerTransformer {
     }
     hashCode() {
         const h = super.hashCode();
-        return (0, collection_utils_1.addHashCode)(h, (0, collection_utils_1.hashCodeOf)(this.consumer));
+        return collection_utils_1.addHashCode(h, collection_utils_1.hashCodeOf(this.consumer));
     }
     debugDescription() {
         return `${super.debugDescription()} - result: ${this.result}`;
@@ -666,7 +645,7 @@ class ParseStringTransformer extends ProducerTransformer {
         }
     }
     reconstitute(builder) {
-        return new ParseStringTransformer(builder.typeGraph, builder.reconstituteTypeRef(this.sourceTypeRef), (0, collection_utils_1.definedMap)(this.consumer, xfer => xfer.reconstitute(builder)));
+        return new ParseStringTransformer(builder.typeGraph, builder.reconstituteTypeRef(this.sourceTypeRef), collection_utils_1.definedMap(this.consumer, xfer => xfer.reconstitute(builder)));
     }
     equals(other) {
         if (!super.equals(other))
@@ -691,7 +670,7 @@ class StringifyTransformer extends ProducerTransformer {
         }
     }
     reconstitute(builder) {
-        return new StringifyTransformer(builder.typeGraph, builder.reconstituteTypeRef(this.sourceTypeRef), (0, collection_utils_1.definedMap)(this.consumer, xfer => xfer.reconstitute(builder)));
+        return new StringifyTransformer(builder.typeGraph, builder.reconstituteTypeRef(this.sourceTypeRef), collection_utils_1.definedMap(this.consumer, xfer => xfer.reconstitute(builder)));
     }
     equals(other) {
         if (!super.equals(other))
@@ -701,8 +680,6 @@ class StringifyTransformer extends ProducerTransformer {
 }
 exports.StringifyTransformer = StringifyTransformer;
 class MinMaxLengthCheckTransformer extends ProducerTransformer {
-    minLength;
-    maxLength;
     constructor(graph, sourceTypeRef, consumer, minLength, maxLength) {
         super("min-max-length-check", graph, sourceTypeRef, consumer);
         this.minLength = minLength;
@@ -720,7 +697,7 @@ class MinMaxLengthCheckTransformer extends ProducerTransformer {
         }
     }
     reconstitute(builder) {
-        return new MinMaxLengthCheckTransformer(builder.typeGraph, builder.reconstituteTypeRef(this.sourceTypeRef), (0, collection_utils_1.definedMap)(this.consumer, xfer => xfer.reconstitute(builder)), this.minLength, this.maxLength);
+        return new MinMaxLengthCheckTransformer(builder.typeGraph, builder.reconstituteTypeRef(this.sourceTypeRef), collection_utils_1.definedMap(this.consumer, xfer => xfer.reconstitute(builder)), this.minLength, this.maxLength);
     }
     equals(other) {
         if (!super.equals(other))
@@ -732,8 +709,6 @@ class MinMaxLengthCheckTransformer extends ProducerTransformer {
 }
 exports.MinMaxLengthCheckTransformer = MinMaxLengthCheckTransformer;
 class MinMaxValueTransformer extends ProducerTransformer {
-    minimum;
-    maximum;
     constructor(graph, sourceTypeRef, consumer, minimum, maximum) {
         super("min-max-value-check", graph, sourceTypeRef, consumer);
         this.minimum = minimum;
@@ -751,7 +726,7 @@ class MinMaxValueTransformer extends ProducerTransformer {
         }
     }
     reconstitute(builder) {
-        return new MinMaxValueTransformer(builder.typeGraph, builder.reconstituteTypeRef(this.sourceTypeRef), (0, collection_utils_1.definedMap)(this.consumer, xfer => xfer.reconstitute(builder)), this.minimum, this.maximum);
+        return new MinMaxValueTransformer(builder.typeGraph, builder.reconstituteTypeRef(this.sourceTypeRef), collection_utils_1.definedMap(this.consumer, xfer => xfer.reconstitute(builder)), this.minimum, this.maximum);
     }
     equals(other) {
         if (!super.equals(other))
@@ -761,9 +736,6 @@ class MinMaxValueTransformer extends ProducerTransformer {
 }
 exports.MinMaxValueTransformer = MinMaxValueTransformer;
 class Transformation {
-    _graph;
-    _targetTypeRef;
-    transformer;
     constructor(_graph, _targetTypeRef, transformer) {
         this._graph = _graph;
         this._targetTypeRef = _targetTypeRef;
@@ -773,7 +745,7 @@ class Transformation {
         return this.transformer.sourceType;
     }
     get targetType() {
-        return (0, TypeGraph_1.derefTypeRef)(this._targetTypeRef, this._graph);
+        return TypeGraph_1.derefTypeRef(this._targetTypeRef, this._graph);
     }
     get reverse() {
         return new Transformation(this._graph, this.transformer.sourceTypeRef, this.transformer.reverse(this._targetTypeRef, undefined));
@@ -790,8 +762,8 @@ class Transformation {
         return this._targetTypeRef === other._targetTypeRef && this.transformer.equals(other.transformer);
     }
     hashCode() {
-        let h = (0, collection_utils_1.hashCodeOf)(this._targetTypeRef);
-        h = (0, collection_utils_1.addHashCode)(h, this.transformer.hashCode());
+        let h = collection_utils_1.hashCodeOf(this._targetTypeRef);
+        h = collection_utils_1.addHashCode(h, this.transformer.hashCode());
         return h;
     }
     debugPrint() {