diff --git a/package.json b/package.json
index 0d14f243..677ba698 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "openapi-typescript-codegen",
-    "version": "0.5.3",
+    "version": "0.5.4",
     "description": "NodeJS library that generates Typescript or Javascript clients based on the OpenAPI specification.",
     "author": "Ferdi Koomen",
     "homepage": "https://github.com/ferdikoomen/openapi-typescript-codegen",
diff --git a/src/openApi/v2/parser/getMappedType.spec.ts b/src/openApi/v2/parser/getMappedType.spec.ts
index b437f85d..46b82d5b 100644
--- a/src/openApi/v2/parser/getMappedType.spec.ts
+++ b/src/openApi/v2/parser/getMappedType.spec.ts
@@ -15,7 +15,7 @@ describe('getMappedType', () => {
         expect(getMappedType('object')).toEqual('any');
         expect(getMappedType('void')).toEqual('void');
         expect(getMappedType('null')).toEqual('null');
-        expect(getMappedType('unknown')).toEqual('unknown');
-        expect(getMappedType('')).toEqual('');
+        expect(getMappedType('unknown')).toEqual(undefined);
+        expect(getMappedType('')).toEqual(undefined);
     });
 });
diff --git a/src/openApi/v2/parser/getMappedType.ts b/src/openApi/v2/parser/getMappedType.ts
index ca11fa7e..8764d1f0 100644
--- a/src/openApi/v2/parser/getMappedType.ts
+++ b/src/openApi/v2/parser/getMappedType.ts
@@ -3,12 +3,8 @@ import { PrimaryType, TYPE_MAPPINGS } from './constants';
 /**
  * Get mapped type for given type to any basic Typescript/Javascript type.
  */
-export function getMappedType(type: string): PrimaryType | string {
-    const mapped = TYPE_MAPPINGS.get(type.toLowerCase());
-    if (mapped) {
-        return mapped;
-    }
-    return type;
+export function getMappedType(type: string): PrimaryType | undefined {
+    return TYPE_MAPPINGS.get(type.toLowerCase());
 }
 
 export function hasMappedType(type: string): boolean {
diff --git a/src/openApi/v2/parser/getType.spec.ts b/src/openApi/v2/parser/getType.spec.ts
index 9f4ab9a4..b16eaca2 100644
--- a/src/openApi/v2/parser/getType.spec.ts
+++ b/src/openApi/v2/parser/getType.spec.ts
@@ -56,4 +56,28 @@ describe('getType', () => {
         expect(type.template).toEqual(null);
         expect(type.imports).toEqual([]);
     });
+
+    it('should support dot', () => {
+        const type = getType('#/definitions/model.000');
+        expect(type.type).toEqual('model_000');
+        expect(type.base).toEqual('model_000');
+        expect(type.template).toEqual(null);
+        expect(type.imports).toEqual(['model_000']);
+    });
+
+    it('should support dashes', () => {
+        const type = getType('#/definitions/some_special-schema');
+        expect(type.type).toEqual('some_special_schema');
+        expect(type.base).toEqual('some_special_schema');
+        expect(type.template).toEqual(null);
+        expect(type.imports).toEqual(['some_special_schema']);
+    });
+
+    it('should support dollar sign', () => {
+        const type = getType('#/definitions/$some+special+schema');
+        expect(type.type).toEqual('$some_special_schema');
+        expect(type.base).toEqual('$some_special_schema');
+        expect(type.template).toEqual(null);
+        expect(type.imports).toEqual(['$some_special_schema']);
+    });
 });
diff --git a/src/openApi/v2/parser/getType.ts b/src/openApi/v2/parser/getType.ts
index 1e874e03..4b0a8991 100644
--- a/src/openApi/v2/parser/getType.ts
+++ b/src/openApi/v2/parser/getType.ts
@@ -3,6 +3,10 @@ import { PrimaryType } from './constants';
 import { getMappedType, hasMappedType } from './getMappedType';
 import { stripNamespace } from './stripNamespace';
 
+function encode(value: string): string {
+    return value.replace(/^[^a-zA-Z_$]+/g, '').replace(/[^\w$]+/g, '_');
+}
+
 /**
  * Parse any string value into a type object.
  * @param value String value like "integer" or "Link[Model]".
@@ -21,8 +25,8 @@ export function getType(value?: string, template?: string): Type {
     if (/\[.*\]$/g.test(valueClean)) {
         const matches = valueClean.match(/(.*?)\[(.*)\]$/);
         if (matches && matches.length) {
-            const match1 = getType(matches[1]);
-            const match2 = getType(matches[2]);
+            const match1 = getType(encode(matches[1]));
+            const match2 = getType(encode(matches[2]));
 
             if (match1.type === PrimaryType.ARRAY) {
                 result.type = `${match2.type}[]`;
@@ -43,12 +47,15 @@ export function getType(value?: string, template?: string): Type {
         }
     } else if (hasMappedType(valueClean)) {
         const mapped = getMappedType(valueClean);
-        result.type = mapped;
-        result.base = mapped;
+        if (mapped) {
+            result.type = mapped;
+            result.base = mapped;
+        }
     } else if (valueClean) {
-        result.type = valueClean;
-        result.base = valueClean;
-        result.imports.push(valueClean);
+        const type = encode(valueClean);
+        result.type = type;
+        result.base = type;
+        result.imports.push(type);
     }
 
     // If the property that we found matched the parent template class
diff --git a/src/openApi/v2/parser/stripNamespace.spec.ts b/src/openApi/v2/parser/stripNamespace.spec.ts
index 796386e2..103f0868 100644
--- a/src/openApi/v2/parser/stripNamespace.spec.ts
+++ b/src/openApi/v2/parser/stripNamespace.spec.ts
@@ -6,9 +6,5 @@ describe('stripNamespace', () => {
         expect(stripNamespace('#/parameters/Item')).toEqual('Item');
         expect(stripNamespace('#/responses/Item')).toEqual('Item');
         expect(stripNamespace('#/securityDefinitions/Item')).toEqual('Item');
-        expect(stripNamespace('Template[Model]')).toEqual('Template[Model]');
-        expect(stripNamespace('namespace.Template[Model]')).toEqual('Template[Model]');
-        expect(stripNamespace('namespace.Template[namespace.Model]')).toEqual('Template[Model]');
-        expect(stripNamespace('Item')).toEqual('Item');
     });
 });
diff --git a/src/openApi/v2/parser/stripNamespace.ts b/src/openApi/v2/parser/stripNamespace.ts
index 9d9ff074..fa124be9 100644
--- a/src/openApi/v2/parser/stripNamespace.ts
+++ b/src/openApi/v2/parser/stripNamespace.ts
@@ -3,25 +3,10 @@
  * @param value
  */
 export function stripNamespace(value: string): string {
-    return (
-        value
-            .trim()
-            .replace(/^#\/definitions\//, '')
-            .replace(/^#\/parameters\//, '')
-            .replace(/^#\/responses\//, '')
-            .replace(/^#\/securityDefinitions\//, '')
-
-            // First we remove the namespace from template notation:
-            // Example: namespace.Template[namespace.Model] -> namespace.Template[Model]
-            .replace(/(\[.*\]$)/, (s: string): string => {
-                const v = s.replace('[', '').replace(']', '').split('.').pop()!;
-                return `[${v}]`;
-            })
-
-            // Then we remove the namespace from the complete result:
-            // Example: namespace.Template[Model] -> Template[Model]
-            .replace(/.*/, (s: string): string => {
-                return s.split('.').pop()!;
-            })
-    );
+    return value
+        .trim()
+        .replace(/^#\/definitions\//, '')
+        .replace(/^#\/parameters\//, '')
+        .replace(/^#\/responses\//, '')
+        .replace(/^#\/securityDefinitions\//, '');
 }
diff --git a/src/openApi/v3/parser/getMappedType.spec.ts b/src/openApi/v3/parser/getMappedType.spec.ts
index b437f85d..46b82d5b 100644
--- a/src/openApi/v3/parser/getMappedType.spec.ts
+++ b/src/openApi/v3/parser/getMappedType.spec.ts
@@ -15,7 +15,7 @@ describe('getMappedType', () => {
         expect(getMappedType('object')).toEqual('any');
         expect(getMappedType('void')).toEqual('void');
         expect(getMappedType('null')).toEqual('null');
-        expect(getMappedType('unknown')).toEqual('unknown');
-        expect(getMappedType('')).toEqual('');
+        expect(getMappedType('unknown')).toEqual(undefined);
+        expect(getMappedType('')).toEqual(undefined);
     });
 });
diff --git a/src/openApi/v3/parser/getMappedType.ts b/src/openApi/v3/parser/getMappedType.ts
index ca11fa7e..8764d1f0 100644
--- a/src/openApi/v3/parser/getMappedType.ts
+++ b/src/openApi/v3/parser/getMappedType.ts
@@ -3,12 +3,8 @@ import { PrimaryType, TYPE_MAPPINGS } from './constants';
 /**
  * Get mapped type for given type to any basic Typescript/Javascript type.
  */
-export function getMappedType(type: string): PrimaryType | string {
-    const mapped = TYPE_MAPPINGS.get(type.toLowerCase());
-    if (mapped) {
-        return mapped;
-    }
-    return type;
+export function getMappedType(type: string): PrimaryType | undefined {
+    return TYPE_MAPPINGS.get(type.toLowerCase());
 }
 
 export function hasMappedType(type: string): boolean {
diff --git a/src/openApi/v3/parser/getType.spec.ts b/src/openApi/v3/parser/getType.spec.ts
index a620b21a..9c50cfb2 100644
--- a/src/openApi/v3/parser/getType.spec.ts
+++ b/src/openApi/v3/parser/getType.spec.ts
@@ -56,4 +56,28 @@ describe('getType', () => {
         expect(type.template).toEqual(null);
         expect(type.imports).toEqual([]);
     });
+
+    it('should support dot', () => {
+        const type = getType('#/components/schemas/model.000');
+        expect(type.type).toEqual('model_000');
+        expect(type.base).toEqual('model_000');
+        expect(type.template).toEqual(null);
+        expect(type.imports).toEqual(['model_000']);
+    });
+
+    it('should support dashes', () => {
+        const type = getType('#/components/schemas/some_special-schema');
+        expect(type.type).toEqual('some_special_schema');
+        expect(type.base).toEqual('some_special_schema');
+        expect(type.template).toEqual(null);
+        expect(type.imports).toEqual(['some_special_schema']);
+    });
+
+    it('should support dollar sign', () => {
+        const type = getType('#/components/schemas/$some+special+schema');
+        expect(type.type).toEqual('$some_special_schema');
+        expect(type.base).toEqual('$some_special_schema');
+        expect(type.template).toEqual(null);
+        expect(type.imports).toEqual(['$some_special_schema']);
+    });
 });
diff --git a/src/openApi/v3/parser/getType.ts b/src/openApi/v3/parser/getType.ts
index c873f443..22980a3e 100644
--- a/src/openApi/v3/parser/getType.ts
+++ b/src/openApi/v3/parser/getType.ts
@@ -3,6 +3,10 @@ import { PrimaryType } from './constants';
 import { getMappedType, hasMappedType } from './getMappedType';
 import { stripNamespace } from './stripNamespace';
 
+function encode(value: string): string {
+    return value.replace(/^[^a-zA-Z_$]+/g, '').replace(/[^\w$]+/g, '_');
+}
+
 /**
  * Parse any string value into a type object.
  * @param value String value like "integer" or "Link[Model]".
@@ -21,8 +25,8 @@ export function getType(value?: string, template?: string): Type {
     if (/\[.*\]$/g.test(valueClean)) {
         const matches = valueClean.match(/(.*?)\[(.*)\]$/);
         if (matches && matches.length) {
-            const match1 = getType(matches[1]);
-            const match2 = getType(matches[2]);
+            const match1 = getType(encode(matches[1]));
+            const match2 = getType(encode(matches[2]));
 
             if (match1.type === PrimaryType.ARRAY) {
                 result.type = `${match2.type}[]`;
@@ -43,12 +47,15 @@ export function getType(value?: string, template?: string): Type {
         }
     } else if (hasMappedType(valueClean)) {
         const mapped = getMappedType(valueClean);
-        result.type = mapped;
-        result.base = mapped;
+        if (mapped) {
+            result.type = mapped;
+            result.base = mapped;
+        }
     } else if (valueClean) {
-        result.type = valueClean;
-        result.base = valueClean;
-        result.imports.push(valueClean);
+        const type = encode(valueClean);
+        result.type = type;
+        result.base = type;
+        result.imports.push(type);
     }
 
     // If the property that we found matched the parent template class
diff --git a/src/openApi/v3/parser/stripNamespace.spec.ts b/src/openApi/v3/parser/stripNamespace.spec.ts
index 6f6b668c..5b3cc4a1 100644
--- a/src/openApi/v3/parser/stripNamespace.spec.ts
+++ b/src/openApi/v3/parser/stripNamespace.spec.ts
@@ -11,9 +11,5 @@ describe('stripNamespace', () => {
         expect(stripNamespace('#/components/securitySchemes/Item')).toEqual('Item');
         expect(stripNamespace('#/components/links/Item')).toEqual('Item');
         expect(stripNamespace('#/components/callbacks/Item')).toEqual('Item');
-        expect(stripNamespace('Template[Model]')).toEqual('Template[Model]');
-        expect(stripNamespace('namespace.Template[Model]')).toEqual('Template[Model]');
-        expect(stripNamespace('namespace.Template[namespace.Model]')).toEqual('Template[Model]');
-        expect(stripNamespace('Item')).toEqual('Item');
     });
 });
diff --git a/src/openApi/v3/parser/stripNamespace.ts b/src/openApi/v3/parser/stripNamespace.ts
index 4e106e66..6ff55b7a 100644
--- a/src/openApi/v3/parser/stripNamespace.ts
+++ b/src/openApi/v3/parser/stripNamespace.ts
@@ -3,30 +3,15 @@
  * @param value
  */
 export function stripNamespace(value: string): string {
-    return (
-        value
-            .trim()
-            .replace(/^#\/components\/schemas\//, '')
-            .replace(/^#\/components\/responses\//, '')
-            .replace(/^#\/components\/parameters\//, '')
-            .replace(/^#\/components\/examples\//, '')
-            .replace(/^#\/components\/requestBodies\//, '')
-            .replace(/^#\/components\/headers\//, '')
-            .replace(/^#\/components\/securitySchemes\//, '')
-            .replace(/^#\/components\/links\//, '')
-            .replace(/^#\/components\/callbacks\//, '')
-
-            // First we remove the namespace from template notation:
-            // Example: namespace.Template[namespace.Model] -> namespace.Template[Model]
-            .replace(/(\[.*\]$)/, (s: string): string => {
-                const v = s.replace('[', '').replace(']', '').split('.').pop()!;
-                return `[${v}]`;
-            })
-
-            // Then we remove the namespace from the complete result:
-            // Example: namespace.Template[Model] -> Template[Model]
-            .replace(/.*/, (s: string): string => {
-                return s.split('.').pop()!;
-            })
-    );
+    return value
+        .trim()
+        .replace(/^#\/components\/schemas\//, '')
+        .replace(/^#\/components\/responses\//, '')
+        .replace(/^#\/components\/parameters\//, '')
+        .replace(/^#\/components\/examples\//, '')
+        .replace(/^#\/components\/requestBodies\//, '')
+        .replace(/^#\/components\/headers\//, '')
+        .replace(/^#\/components\/securitySchemes\//, '')
+        .replace(/^#\/components\/links\//, '')
+        .replace(/^#\/components\/callbacks\//, '');
 }
diff --git a/src/templates/exportModel.hbs b/src/templates/exportModel.hbs
index e61e96b2..f5985aa2 100644
--- a/src/templates/exportModel.hbs
+++ b/src/templates/exportModel.hbs
@@ -1,4 +1,5 @@
 {{>header}}
+
 {{#if imports}}
 
 {{#each imports}}
diff --git a/src/templates/exportSchema.hbs b/src/templates/exportSchema.hbs
index d0f33fb7..7e0899a9 100644
--- a/src/templates/exportSchema.hbs
+++ b/src/templates/exportSchema.hbs
@@ -1,4 +1,5 @@
 {{>header}}
+
 {{#if extends}}
 
 {{#each extends}}
diff --git a/test/__snapshots__/index.spec.js.snap b/test/__snapshots__/index.spec.js.snap
index 46904de4..b03efe7c 100644
--- a/test/__snapshots__/index.spec.js.snap
+++ b/test/__snapshots__/index.spec.js.snap
@@ -373,6 +373,7 @@ exports[`v2 should generate: ./test/generated/v2/models/ArrayWithArray.ts 1`] =
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 import type { ModelWithString } from './ModelWithString';
 
 /**
@@ -385,6 +386,7 @@ exports[`v2 should generate: ./test/generated/v2/models/ArrayWithBooleans.ts 1`]
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 /**
  * This is a simple array with booleans
  */
@@ -395,6 +397,7 @@ exports[`v2 should generate: ./test/generated/v2/models/ArrayWithNumbers.ts 1`]
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 /**
  * This is a simple array with numbers
  */
@@ -405,6 +408,7 @@ exports[`v2 should generate: ./test/generated/v2/models/ArrayWithProperties.ts 1
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 /**
  * This is a simple array with properties
  */
@@ -418,6 +422,7 @@ exports[`v2 should generate: ./test/generated/v2/models/ArrayWithReferences.ts 1
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 import type { ModelWithString } from './ModelWithString';
 
 /**
@@ -430,6 +435,7 @@ exports[`v2 should generate: ./test/generated/v2/models/ArrayWithStrings.ts 1`]
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 /**
  * This is a simple array with strings
  */
@@ -440,6 +446,7 @@ exports[`v2 should generate: ./test/generated/v2/models/DictionaryWithArray.ts 1
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 import type { ModelWithString } from './ModelWithString';
 
 /**
@@ -452,6 +459,7 @@ exports[`v2 should generate: ./test/generated/v2/models/DictionaryWithDictionary
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 /**
  * This is a string dictionary
  */
@@ -462,6 +470,7 @@ exports[`v2 should generate: ./test/generated/v2/models/DictionaryWithProperties
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 /**
  * This is a complex dictionary
  */
@@ -475,6 +484,7 @@ exports[`v2 should generate: ./test/generated/v2/models/DictionaryWithReference.
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 import type { ModelWithString } from './ModelWithString';
 
 /**
@@ -487,6 +497,7 @@ exports[`v2 should generate: ./test/generated/v2/models/DictionaryWithString.ts
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 /**
  * This is a string dictionary
  */
@@ -497,6 +508,7 @@ exports[`v2 should generate: ./test/generated/v2/models/EnumFromDescription.ts 1
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 /**
  * Success=1,Warning=2,Error=3
  */
@@ -511,6 +523,7 @@ exports[`v2 should generate: ./test/generated/v2/models/EnumWithExtensions.ts 1`
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 /**
  * This is a simple enum with numbers
  */
@@ -534,6 +547,7 @@ exports[`v2 should generate: ./test/generated/v2/models/EnumWithNumbers.ts 1`] =
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 /**
  * This is a simple enum with numbers
  */
@@ -548,6 +562,7 @@ exports[`v2 should generate: ./test/generated/v2/models/EnumWithStrings.ts 1`] =
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 /**
  * This is a simple enum with strings
  */
@@ -562,6 +577,7 @@ exports[`v2 should generate: ./test/generated/v2/models/ModelLink.ts 1`] = `
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 /**
  * This is a model that can have a template??
  */
@@ -575,6 +591,7 @@ exports[`v2 should generate: ./test/generated/v2/models/ModelThatExtends.ts 1`]
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 import type { ModelWithString } from './ModelWithString';
 
 /**
@@ -591,6 +608,7 @@ exports[`v2 should generate: ./test/generated/v2/models/ModelThatExtendsExtends.
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 import type { ModelThatExtends } from './ModelThatExtends';
 import type { ModelWithString } from './ModelWithString';
 
@@ -608,6 +626,7 @@ exports[`v2 should generate: ./test/generated/v2/models/ModelWithArray.ts 1`] =
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 import type { ModelWithString } from './ModelWithString';
 
 /**
@@ -625,6 +644,7 @@ exports[`v2 should generate: ./test/generated/v2/models/ModelWithBoolean.ts 1`]
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 /**
  * This is a model with one boolean property
  */
@@ -641,6 +661,7 @@ exports[`v2 should generate: ./test/generated/v2/models/ModelWithCircularReferen
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 /**
  * This is a model with one property containing a circular reference
  */
@@ -654,6 +675,7 @@ exports[`v2 should generate: ./test/generated/v2/models/ModelWithDictionary.ts 1
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 /**
  * This is a model with one property containing a dictionary
  */
@@ -667,6 +689,7 @@ exports[`v2 should generate: ./test/generated/v2/models/ModelWithDuplicateImport
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 import type { ModelWithString } from './ModelWithString';
 
 /**
@@ -684,6 +707,7 @@ exports[`v2 should generate: ./test/generated/v2/models/ModelWithDuplicateProper
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 import type { ModelWithString } from './ModelWithString';
 
 /**
@@ -699,6 +723,7 @@ exports[`v2 should generate: ./test/generated/v2/models/ModelWithEnum.ts 1`] = `
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 /**
  * This is a model with one enum
  */
@@ -745,6 +770,7 @@ exports[`v2 should generate: ./test/generated/v2/models/ModelWithEnumFromDescrip
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 /**
  * This is a model with one enum
  */
@@ -775,6 +801,7 @@ exports[`v2 should generate: ./test/generated/v2/models/ModelWithInteger.ts 1`]
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 /**
  * This is a model with one number property
  */
@@ -791,6 +818,7 @@ exports[`v2 should generate: ./test/generated/v2/models/ModelWithLink.ts 1`] = `
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 import type { ModelLink } from './ModelLink';
 import type { ModelWithString } from './ModelWithString';
 
@@ -807,6 +835,7 @@ exports[`v2 should generate: ./test/generated/v2/models/ModelWithNestedEnums.ts
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 /**
  * This is a model with nested enums
  */
@@ -823,6 +852,7 @@ exports[`v2 should generate: ./test/generated/v2/models/ModelWithNestedPropertie
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 /**
  * This is a model with one nested property
  */
@@ -840,6 +870,7 @@ exports[`v2 should generate: ./test/generated/v2/models/ModelWithNullableString.
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 /**
  * This is a model with one string property
  */
@@ -860,6 +891,7 @@ exports[`v2 should generate: ./test/generated/v2/models/ModelWithOrderedProperti
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 /**
  * This is a model with ordered properties
  */
@@ -875,6 +907,7 @@ exports[`v2 should generate: ./test/generated/v2/models/ModelWithPattern.ts 1`]
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 /**
  * This is a model that contains a some patterns
  */
@@ -893,6 +926,7 @@ exports[`v2 should generate: ./test/generated/v2/models/ModelWithProperties.ts 1
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 import type { ModelWithString } from './ModelWithString';
 
 /**
@@ -915,6 +949,7 @@ exports[`v2 should generate: ./test/generated/v2/models/ModelWithReference.ts 1`
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 import type { ModelWithProperties } from './ModelWithProperties';
 
 /**
@@ -930,6 +965,7 @@ exports[`v2 should generate: ./test/generated/v2/models/ModelWithString.ts 1`] =
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 /**
  * This is a model with one string property
  */
@@ -946,6 +982,7 @@ exports[`v2 should generate: ./test/generated/v2/models/MultilineComment.ts 1`]
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 /**
  * Testing multiline comments.
  * This must go to the next line.
@@ -959,6 +996,7 @@ exports[`v2 should generate: ./test/generated/v2/models/SimpleBoolean.ts 1`] = `
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 /**
  * This is a simple boolean
  */
@@ -969,6 +1007,7 @@ exports[`v2 should generate: ./test/generated/v2/models/SimpleFile.ts 1`] = `
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 /**
  * This is a simple file
  */
@@ -979,6 +1018,7 @@ exports[`v2 should generate: ./test/generated/v2/models/SimpleInteger.ts 1`] = `
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 /**
  * This is a simple number
  */
@@ -989,6 +1029,7 @@ exports[`v2 should generate: ./test/generated/v2/models/SimpleReference.ts 1`] =
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 import type { ModelWithString } from './ModelWithString';
 
 /**
@@ -1001,6 +1042,7 @@ exports[`v2 should generate: ./test/generated/v2/models/SimpleString.ts 1`] = `
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 /**
  * This is a simple string
  */
@@ -1011,6 +1053,7 @@ exports[`v2 should generate: ./test/generated/v2/models/SimpleStringWithPattern.
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 /**
  * This is a simple string
  */
@@ -1021,6 +1064,7 @@ exports[`v2 should generate: ./test/generated/v2/schemas/$ArrayWithArray.ts 1`]
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $ArrayWithArray = {
     type: 'array',
     contains: {
@@ -1036,6 +1080,7 @@ exports[`v2 should generate: ./test/generated/v2/schemas/$ArrayWithBooleans.ts 1
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $ArrayWithBooleans = {
     type: 'array',
     contains: {
@@ -1048,6 +1093,7 @@ exports[`v2 should generate: ./test/generated/v2/schemas/$ArrayWithNumbers.ts 1`
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $ArrayWithNumbers = {
     type: 'array',
     contains: {
@@ -1060,6 +1106,7 @@ exports[`v2 should generate: ./test/generated/v2/schemas/$ArrayWithProperties.ts
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $ArrayWithProperties = {
     type: 'array',
     contains: {
@@ -1079,6 +1126,7 @@ exports[`v2 should generate: ./test/generated/v2/schemas/$ArrayWithReferences.ts
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $ArrayWithReferences = {
     type: 'array',
     contains: {
@@ -1091,6 +1139,7 @@ exports[`v2 should generate: ./test/generated/v2/schemas/$ArrayWithStrings.ts 1`
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $ArrayWithStrings = {
     type: 'array',
     contains: {
@@ -1103,6 +1152,7 @@ exports[`v2 should generate: ./test/generated/v2/schemas/$DictionaryWithArray.ts
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $DictionaryWithArray = {
     type: 'dictionary',
     contains: {
@@ -1118,6 +1168,7 @@ exports[`v2 should generate: ./test/generated/v2/schemas/$DictionaryWithDictiona
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $DictionaryWithDictionary = {
     type: 'dictionary',
     contains: {
@@ -1133,6 +1184,7 @@ exports[`v2 should generate: ./test/generated/v2/schemas/$DictionaryWithProperti
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $DictionaryWithProperties = {
     type: 'dictionary',
     contains: {
@@ -1152,6 +1204,7 @@ exports[`v2 should generate: ./test/generated/v2/schemas/$DictionaryWithReferenc
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $DictionaryWithReference = {
     type: 'dictionary',
     contains: {
@@ -1164,6 +1217,7 @@ exports[`v2 should generate: ./test/generated/v2/schemas/$DictionaryWithString.t
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $DictionaryWithString = {
     type: 'dictionary',
     contains: {
@@ -1176,6 +1230,7 @@ exports[`v2 should generate: ./test/generated/v2/schemas/$EnumFromDescription.ts
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $EnumFromDescription = {
     type: 'Enum',
 };"
@@ -1185,6 +1240,7 @@ exports[`v2 should generate: ./test/generated/v2/schemas/$EnumWithExtensions.ts
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $EnumWithExtensions = {
     type: 'Enum',
 };"
@@ -1194,6 +1250,7 @@ exports[`v2 should generate: ./test/generated/v2/schemas/$EnumWithNumbers.ts 1`]
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $EnumWithNumbers = {
     type: 'Enum',
 };"
@@ -1203,6 +1260,7 @@ exports[`v2 should generate: ./test/generated/v2/schemas/$EnumWithStrings.ts 1`]
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $EnumWithStrings = {
     type: 'Enum',
 };"
@@ -1212,6 +1270,7 @@ exports[`v2 should generate: ./test/generated/v2/schemas/$ModelLink.ts 1`] = `
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $ModelLink = {
     properties: {
         id: {
@@ -1225,6 +1284,7 @@ exports[`v2 should generate: ./test/generated/v2/schemas/$ModelThatExtends.ts 1`
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 import { $ModelWithString } from './$ModelWithString';
 
 export const $ModelThatExtends = {
@@ -1244,6 +1304,7 @@ exports[`v2 should generate: ./test/generated/v2/schemas/$ModelThatExtendsExtend
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 import { $ModelWithString } from './$ModelWithString';
 import { $ModelThatExtends } from './$ModelThatExtends';
 
@@ -1265,6 +1326,7 @@ exports[`v2 should generate: ./test/generated/v2/schemas/$ModelWithArray.ts 1`]
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $ModelWithArray = {
     properties: {
         prop: {
@@ -1293,6 +1355,7 @@ exports[`v2 should generate: ./test/generated/v2/schemas/$ModelWithBoolean.ts 1`
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $ModelWithBoolean = {
     properties: {
         prop: {
@@ -1306,6 +1369,7 @@ exports[`v2 should generate: ./test/generated/v2/schemas/$ModelWithCircularRefer
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $ModelWithCircularReference = {
     properties: {
         prop: {
@@ -1319,6 +1383,7 @@ exports[`v2 should generate: ./test/generated/v2/schemas/$ModelWithDictionary.ts
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $ModelWithDictionary = {
     properties: {
         prop: {
@@ -1335,6 +1400,7 @@ exports[`v2 should generate: ./test/generated/v2/schemas/$ModelWithDuplicateImpo
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $ModelWithDuplicateImports = {
     properties: {
         propA: {
@@ -1354,6 +1420,7 @@ exports[`v2 should generate: ./test/generated/v2/schemas/$ModelWithDuplicateProp
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $ModelWithDuplicateProperties = {
     properties: {
         prop: {
@@ -1367,6 +1434,7 @@ exports[`v2 should generate: ./test/generated/v2/schemas/$ModelWithEnum.ts 1`] =
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $ModelWithEnum = {
     properties: {
         test: {
@@ -1383,6 +1451,7 @@ exports[`v2 should generate: ./test/generated/v2/schemas/$ModelWithEnumFromDescr
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $ModelWithEnumFromDescription = {
     properties: {
         test: {
@@ -1396,6 +1465,7 @@ exports[`v2 should generate: ./test/generated/v2/schemas/$ModelWithInteger.ts 1`
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $ModelWithInteger = {
     properties: {
         prop: {
@@ -1409,6 +1479,7 @@ exports[`v2 should generate: ./test/generated/v2/schemas/$ModelWithLink.ts 1`] =
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $ModelWithLink = {
     properties: {
         prop: {
@@ -1422,6 +1493,7 @@ exports[`v2 should generate: ./test/generated/v2/schemas/$ModelWithNestedEnums.t
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $ModelWithNestedEnums = {
     properties: {
         dictionaryWithEnum: {
@@ -1456,6 +1528,7 @@ exports[`v2 should generate: ./test/generated/v2/schemas/$ModelWithNestedPropert
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $ModelWithNestedProperties = {
     properties: {
         first: {
@@ -1483,6 +1556,7 @@ exports[`v2 should generate: ./test/generated/v2/schemas/$ModelWithNullableStrin
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $ModelWithNullableString = {
     properties: {
         nullableProp: {
@@ -1502,6 +1576,7 @@ exports[`v2 should generate: ./test/generated/v2/schemas/$ModelWithOrderedProper
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $ModelWithOrderedProperties = {
     properties: {
         zebra: {
@@ -1521,6 +1596,7 @@ exports[`v2 should generate: ./test/generated/v2/schemas/$ModelWithPattern.ts 1`
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $ModelWithPattern = {
     properties: {
         key: {
@@ -1559,6 +1635,7 @@ exports[`v2 should generate: ./test/generated/v2/schemas/$ModelWithProperties.ts
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $ModelWithProperties = {
     properties: {
         required: {
@@ -1598,6 +1675,7 @@ exports[`v2 should generate: ./test/generated/v2/schemas/$ModelWithReference.ts
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $ModelWithReference = {
     properties: {
         prop: {
@@ -1611,6 +1689,7 @@ exports[`v2 should generate: ./test/generated/v2/schemas/$ModelWithString.ts 1`]
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $ModelWithString = {
     properties: {
         prop: {
@@ -1624,6 +1703,7 @@ exports[`v2 should generate: ./test/generated/v2/schemas/$MultilineComment.ts 1`
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $MultilineComment = {
     type: 'number',
 };"
@@ -1633,6 +1713,7 @@ exports[`v2 should generate: ./test/generated/v2/schemas/$SimpleBoolean.ts 1`] =
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $SimpleBoolean = {
     type: 'boolean',
 };"
@@ -1642,6 +1723,7 @@ exports[`v2 should generate: ./test/generated/v2/schemas/$SimpleFile.ts 1`] = `
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $SimpleFile = {
     type: 'File',
 };"
@@ -1651,6 +1733,7 @@ exports[`v2 should generate: ./test/generated/v2/schemas/$SimpleInteger.ts 1`] =
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $SimpleInteger = {
     type: 'number',
 };"
@@ -1660,6 +1743,7 @@ exports[`v2 should generate: ./test/generated/v2/schemas/$SimpleReference.ts 1`]
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $SimpleReference = {
     type: 'ModelWithString',
 };"
@@ -1669,6 +1753,7 @@ exports[`v2 should generate: ./test/generated/v2/schemas/$SimpleString.ts 1`] =
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $SimpleString = {
     type: 'string',
 };"
@@ -1678,6 +1763,7 @@ exports[`v2 should generate: ./test/generated/v2/schemas/$SimpleStringWithPatter
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $SimpleStringWithPattern = {
     type: 'string',
     maxLength: 64,
@@ -2589,6 +2675,7 @@ exports[`v3 should generate: ./test/generated/v3/models/ArrayWithArray.ts 1`] =
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 import type { ModelWithString } from './ModelWithString';
 
 /**
@@ -2601,6 +2688,7 @@ exports[`v3 should generate: ./test/generated/v3/models/ArrayWithBooleans.ts 1`]
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 /**
  * This is a simple array with booleans
  */
@@ -2611,6 +2699,7 @@ exports[`v3 should generate: ./test/generated/v3/models/ArrayWithNumbers.ts 1`]
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 /**
  * This is a simple array with numbers
  */
@@ -2621,6 +2710,7 @@ exports[`v3 should generate: ./test/generated/v3/models/ArrayWithProperties.ts 1
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 /**
  * This is a simple array with properties
  */
@@ -2634,6 +2724,7 @@ exports[`v3 should generate: ./test/generated/v3/models/ArrayWithReferences.ts 1
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 import type { ModelWithString } from './ModelWithString';
 
 /**
@@ -2646,6 +2737,7 @@ exports[`v3 should generate: ./test/generated/v3/models/ArrayWithStrings.ts 1`]
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 /**
  * This is a simple array with strings
  */
@@ -2656,6 +2748,7 @@ exports[`v3 should generate: ./test/generated/v3/models/DictionaryWithArray.ts 1
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 import type { ModelWithString } from './ModelWithString';
 
 /**
@@ -2668,6 +2761,7 @@ exports[`v3 should generate: ./test/generated/v3/models/DictionaryWithDictionary
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 /**
  * This is a string dictionary
  */
@@ -2678,6 +2772,7 @@ exports[`v3 should generate: ./test/generated/v3/models/DictionaryWithProperties
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 /**
  * This is a complex dictionary
  */
@@ -2691,6 +2786,7 @@ exports[`v3 should generate: ./test/generated/v3/models/DictionaryWithReference.
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 import type { ModelWithString } from './ModelWithString';
 
 /**
@@ -2703,6 +2799,7 @@ exports[`v3 should generate: ./test/generated/v3/models/DictionaryWithString.ts
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 /**
  * This is a string dictionary
  */
@@ -2713,6 +2810,7 @@ exports[`v3 should generate: ./test/generated/v3/models/EnumFromDescription.ts 1
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 /**
  * Success=1,Warning=2,Error=3
  */
@@ -2727,6 +2825,7 @@ exports[`v3 should generate: ./test/generated/v3/models/EnumWithExtensions.ts 1`
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 /**
  * This is a simple enum with numbers
  */
@@ -2750,6 +2849,7 @@ exports[`v3 should generate: ./test/generated/v3/models/EnumWithNumbers.ts 1`] =
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 /**
  * This is a simple enum with numbers
  */
@@ -2764,6 +2864,7 @@ exports[`v3 should generate: ./test/generated/v3/models/EnumWithStrings.ts 1`] =
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 /**
  * This is a simple enum with strings
  */
@@ -2778,6 +2879,7 @@ exports[`v3 should generate: ./test/generated/v3/models/ModelLink.ts 1`] = `
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 /**
  * This is a model that can have a template??
  */
@@ -2791,6 +2893,7 @@ exports[`v3 should generate: ./test/generated/v3/models/ModelThatExtends.ts 1`]
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 import type { ModelWithString } from './ModelWithString';
 
 /**
@@ -2807,6 +2910,7 @@ exports[`v3 should generate: ./test/generated/v3/models/ModelThatExtendsExtends.
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 import type { ModelThatExtends } from './ModelThatExtends';
 import type { ModelWithString } from './ModelWithString';
 
@@ -2824,6 +2928,7 @@ exports[`v3 should generate: ./test/generated/v3/models/ModelWithAnyOf.ts 1`] =
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 import type { ModelWithArray } from './ModelWithArray';
 import type { ModelWithDictionary } from './ModelWithDictionary';
 import type { ModelWithEnum } from './ModelWithEnum';
@@ -2842,6 +2947,7 @@ exports[`v3 should generate: ./test/generated/v3/models/ModelWithArray.ts 1`] =
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 import type { ModelWithString } from './ModelWithString';
 
 /**
@@ -2859,6 +2965,7 @@ exports[`v3 should generate: ./test/generated/v3/models/ModelWithBoolean.ts 1`]
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 /**
  * This is a model with one boolean property
  */
@@ -2875,6 +2982,7 @@ exports[`v3 should generate: ./test/generated/v3/models/ModelWithCircularReferen
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 /**
  * This is a model with one property containing a circular reference
  */
@@ -2888,6 +2996,7 @@ exports[`v3 should generate: ./test/generated/v3/models/ModelWithDictionary.ts 1
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 /**
  * This is a model with one property containing a dictionary
  */
@@ -2901,6 +3010,7 @@ exports[`v3 should generate: ./test/generated/v3/models/ModelWithDuplicateImport
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 import type { ModelWithString } from './ModelWithString';
 
 /**
@@ -2918,6 +3028,7 @@ exports[`v3 should generate: ./test/generated/v3/models/ModelWithDuplicateProper
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 import type { ModelWithString } from './ModelWithString';
 
 /**
@@ -2933,6 +3044,7 @@ exports[`v3 should generate: ./test/generated/v3/models/ModelWithEnum.ts 1`] = `
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 /**
  * This is a model with one enum
  */
@@ -2979,6 +3091,7 @@ exports[`v3 should generate: ./test/generated/v3/models/ModelWithEnumFromDescrip
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 /**
  * This is a model with one enum
  */
@@ -3009,6 +3122,7 @@ exports[`v3 should generate: ./test/generated/v3/models/ModelWithInteger.ts 1`]
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 /**
  * This is a model with one number property
  */
@@ -3025,6 +3139,7 @@ exports[`v3 should generate: ./test/generated/v3/models/ModelWithLink.ts 1`] = `
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 import type { ModelLink } from './ModelLink';
 import type { ModelWithString } from './ModelWithString';
 
@@ -3041,6 +3156,7 @@ exports[`v3 should generate: ./test/generated/v3/models/ModelWithNestedEnums.ts
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 /**
  * This is a model with nested enums
  */
@@ -3057,6 +3173,7 @@ exports[`v3 should generate: ./test/generated/v3/models/ModelWithNestedPropertie
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 /**
  * This is a model with one nested property
  */
@@ -3074,6 +3191,7 @@ exports[`v3 should generate: ./test/generated/v3/models/ModelWithOneOf.ts 1`] =
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 import type { ModelWithArray } from './ModelWithArray';
 import type { ModelWithDictionary } from './ModelWithDictionary';
 import type { ModelWithEnum } from './ModelWithEnum';
@@ -3092,6 +3210,7 @@ exports[`v3 should generate: ./test/generated/v3/models/ModelWithOrderedProperti
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 /**
  * This is a model with ordered properties
  */
@@ -3107,6 +3226,7 @@ exports[`v3 should generate: ./test/generated/v3/models/ModelWithPattern.ts 1`]
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 /**
  * This is a model that contains a some patterns
  */
@@ -3125,6 +3245,7 @@ exports[`v3 should generate: ./test/generated/v3/models/ModelWithProperties.ts 1
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 import type { ModelWithString } from './ModelWithString';
 
 /**
@@ -3148,6 +3269,7 @@ exports[`v3 should generate: ./test/generated/v3/models/ModelWithReference.ts 1`
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 import type { ModelWithProperties } from './ModelWithProperties';
 
 /**
@@ -3163,6 +3285,7 @@ exports[`v3 should generate: ./test/generated/v3/models/ModelWithString.ts 1`] =
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 /**
  * This is a model with one string property
  */
@@ -3179,6 +3302,7 @@ exports[`v3 should generate: ./test/generated/v3/models/MultilineComment.ts 1`]
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 /**
  * Testing multiline comments.
  * This must go to the next line.
@@ -3192,6 +3316,7 @@ exports[`v3 should generate: ./test/generated/v3/models/SimpleBoolean.ts 1`] = `
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 /**
  * This is a simple boolean
  */
@@ -3202,6 +3327,7 @@ exports[`v3 should generate: ./test/generated/v3/models/SimpleFile.ts 1`] = `
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 /**
  * This is a simple file
  */
@@ -3212,6 +3338,7 @@ exports[`v3 should generate: ./test/generated/v3/models/SimpleInteger.ts 1`] = `
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 /**
  * This is a simple number
  */
@@ -3222,6 +3349,7 @@ exports[`v3 should generate: ./test/generated/v3/models/SimpleReference.ts 1`] =
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 import type { ModelWithString } from './ModelWithString';
 
 /**
@@ -3234,6 +3362,7 @@ exports[`v3 should generate: ./test/generated/v3/models/SimpleString.ts 1`] = `
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 /**
  * This is a simple string
  */
@@ -3244,6 +3373,7 @@ exports[`v3 should generate: ./test/generated/v3/models/SimpleStringWithPattern.
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 /**
  * This is a simple string
  */
@@ -3254,6 +3384,7 @@ exports[`v3 should generate: ./test/generated/v3/schemas/$ArrayWithArray.ts 1`]
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $ArrayWithArray = {
     type: 'array',
     contains: {
@@ -3269,6 +3400,7 @@ exports[`v3 should generate: ./test/generated/v3/schemas/$ArrayWithBooleans.ts 1
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $ArrayWithBooleans = {
     type: 'array',
     contains: {
@@ -3281,6 +3413,7 @@ exports[`v3 should generate: ./test/generated/v3/schemas/$ArrayWithNumbers.ts 1`
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $ArrayWithNumbers = {
     type: 'array',
     contains: {
@@ -3293,6 +3426,7 @@ exports[`v3 should generate: ./test/generated/v3/schemas/$ArrayWithProperties.ts
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $ArrayWithProperties = {
     type: 'array',
     contains: {
@@ -3312,6 +3446,7 @@ exports[`v3 should generate: ./test/generated/v3/schemas/$ArrayWithReferences.ts
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $ArrayWithReferences = {
     type: 'array',
     contains: {
@@ -3324,6 +3459,7 @@ exports[`v3 should generate: ./test/generated/v3/schemas/$ArrayWithStrings.ts 1`
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $ArrayWithStrings = {
     type: 'array',
     contains: {
@@ -3336,6 +3472,7 @@ exports[`v3 should generate: ./test/generated/v3/schemas/$DictionaryWithArray.ts
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $DictionaryWithArray = {
     type: 'dictionary',
     contains: {
@@ -3351,6 +3488,7 @@ exports[`v3 should generate: ./test/generated/v3/schemas/$DictionaryWithDictiona
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $DictionaryWithDictionary = {
     type: 'dictionary',
     contains: {
@@ -3366,6 +3504,7 @@ exports[`v3 should generate: ./test/generated/v3/schemas/$DictionaryWithProperti
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $DictionaryWithProperties = {
     type: 'dictionary',
     contains: {
@@ -3385,6 +3524,7 @@ exports[`v3 should generate: ./test/generated/v3/schemas/$DictionaryWithReferenc
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $DictionaryWithReference = {
     type: 'dictionary',
     contains: {
@@ -3397,6 +3537,7 @@ exports[`v3 should generate: ./test/generated/v3/schemas/$DictionaryWithString.t
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $DictionaryWithString = {
     type: 'dictionary',
     contains: {
@@ -3409,6 +3550,7 @@ exports[`v3 should generate: ./test/generated/v3/schemas/$EnumFromDescription.ts
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $EnumFromDescription = {
     type: 'Enum',
 };"
@@ -3418,6 +3560,7 @@ exports[`v3 should generate: ./test/generated/v3/schemas/$EnumWithExtensions.ts
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $EnumWithExtensions = {
     type: 'Enum',
 };"
@@ -3427,6 +3570,7 @@ exports[`v3 should generate: ./test/generated/v3/schemas/$EnumWithNumbers.ts 1`]
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $EnumWithNumbers = {
     type: 'Enum',
 };"
@@ -3436,6 +3580,7 @@ exports[`v3 should generate: ./test/generated/v3/schemas/$EnumWithStrings.ts 1`]
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $EnumWithStrings = {
     type: 'Enum',
 };"
@@ -3445,6 +3590,7 @@ exports[`v3 should generate: ./test/generated/v3/schemas/$ModelLink.ts 1`] = `
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $ModelLink = {
     properties: {
         id: {
@@ -3458,6 +3604,7 @@ exports[`v3 should generate: ./test/generated/v3/schemas/$ModelThatExtends.ts 1`
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 import { $ModelWithString } from './$ModelWithString';
 
 export const $ModelThatExtends = {
@@ -3477,6 +3624,7 @@ exports[`v3 should generate: ./test/generated/v3/schemas/$ModelThatExtendsExtend
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 import { $ModelWithString } from './$ModelWithString';
 import { $ModelThatExtends } from './$ModelThatExtends';
 
@@ -3498,6 +3646,7 @@ exports[`v3 should generate: ./test/generated/v3/schemas/$ModelWithAnyOf.ts 1`]
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $ModelWithAnyOf = {
     properties: {
         propA: {
@@ -3511,6 +3660,7 @@ exports[`v3 should generate: ./test/generated/v3/schemas/$ModelWithArray.ts 1`]
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $ModelWithArray = {
     properties: {
         prop: {
@@ -3539,6 +3689,7 @@ exports[`v3 should generate: ./test/generated/v3/schemas/$ModelWithBoolean.ts 1`
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $ModelWithBoolean = {
     properties: {
         prop: {
@@ -3552,6 +3703,7 @@ exports[`v3 should generate: ./test/generated/v3/schemas/$ModelWithCircularRefer
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $ModelWithCircularReference = {
     properties: {
         prop: {
@@ -3565,6 +3717,7 @@ exports[`v3 should generate: ./test/generated/v3/schemas/$ModelWithDictionary.ts
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $ModelWithDictionary = {
     properties: {
         prop: {
@@ -3581,6 +3734,7 @@ exports[`v3 should generate: ./test/generated/v3/schemas/$ModelWithDuplicateImpo
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $ModelWithDuplicateImports = {
     properties: {
         propA: {
@@ -3600,6 +3754,7 @@ exports[`v3 should generate: ./test/generated/v3/schemas/$ModelWithDuplicateProp
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $ModelWithDuplicateProperties = {
     properties: {
         prop: {
@@ -3613,6 +3768,7 @@ exports[`v3 should generate: ./test/generated/v3/schemas/$ModelWithEnum.ts 1`] =
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $ModelWithEnum = {
     properties: {
         test: {
@@ -3629,6 +3785,7 @@ exports[`v3 should generate: ./test/generated/v3/schemas/$ModelWithEnumFromDescr
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $ModelWithEnumFromDescription = {
     properties: {
         test: {
@@ -3642,6 +3799,7 @@ exports[`v3 should generate: ./test/generated/v3/schemas/$ModelWithInteger.ts 1`
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $ModelWithInteger = {
     properties: {
         prop: {
@@ -3655,6 +3813,7 @@ exports[`v3 should generate: ./test/generated/v3/schemas/$ModelWithLink.ts 1`] =
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $ModelWithLink = {
     properties: {
         prop: {
@@ -3668,6 +3827,7 @@ exports[`v3 should generate: ./test/generated/v3/schemas/$ModelWithNestedEnums.t
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $ModelWithNestedEnums = {
     properties: {
         dictionaryWithEnum: {
@@ -3702,6 +3862,7 @@ exports[`v3 should generate: ./test/generated/v3/schemas/$ModelWithNestedPropert
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $ModelWithNestedProperties = {
     properties: {
         first: {
@@ -3732,6 +3893,7 @@ exports[`v3 should generate: ./test/generated/v3/schemas/$ModelWithOneOf.ts 1`]
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $ModelWithOneOf = {
     properties: {
         propA: {
@@ -3745,6 +3907,7 @@ exports[`v3 should generate: ./test/generated/v3/schemas/$ModelWithOrderedProper
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $ModelWithOrderedProperties = {
     properties: {
         zebra: {
@@ -3764,6 +3927,7 @@ exports[`v3 should generate: ./test/generated/v3/schemas/$ModelWithPattern.ts 1`
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $ModelWithPattern = {
     properties: {
         key: {
@@ -3802,6 +3966,7 @@ exports[`v3 should generate: ./test/generated/v3/schemas/$ModelWithProperties.ts
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $ModelWithProperties = {
     properties: {
         required: {
@@ -3846,6 +4011,7 @@ exports[`v3 should generate: ./test/generated/v3/schemas/$ModelWithReference.ts
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $ModelWithReference = {
     properties: {
         prop: {
@@ -3859,6 +4025,7 @@ exports[`v3 should generate: ./test/generated/v3/schemas/$ModelWithString.ts 1`]
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $ModelWithString = {
     properties: {
         prop: {
@@ -3872,6 +4039,7 @@ exports[`v3 should generate: ./test/generated/v3/schemas/$MultilineComment.ts 1`
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $MultilineComment = {
     type: 'number',
 };"
@@ -3881,6 +4049,7 @@ exports[`v3 should generate: ./test/generated/v3/schemas/$SimpleBoolean.ts 1`] =
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $SimpleBoolean = {
     type: 'boolean',
 };"
@@ -3890,6 +4059,7 @@ exports[`v3 should generate: ./test/generated/v3/schemas/$SimpleFile.ts 1`] = `
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $SimpleFile = {
     type: 'File',
 };"
@@ -3899,6 +4069,7 @@ exports[`v3 should generate: ./test/generated/v3/schemas/$SimpleInteger.ts 1`] =
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $SimpleInteger = {
     type: 'number',
 };"
@@ -3908,6 +4079,7 @@ exports[`v3 should generate: ./test/generated/v3/schemas/$SimpleReference.ts 1`]
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $SimpleReference = {
     type: 'ModelWithString',
 };"
@@ -3917,6 +4089,7 @@ exports[`v3 should generate: ./test/generated/v3/schemas/$SimpleString.ts 1`] =
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $SimpleString = {
     type: 'string',
 };"
@@ -3926,6 +4099,7 @@ exports[`v3 should generate: ./test/generated/v3/schemas/$SimpleStringWithPatter
 "/* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+
 export const $SimpleStringWithPattern = {
     type: 'string',
     isNullable: true,
diff --git a/yarn.lock b/yarn.lock
index d0370055..101fd111 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1177,9 +1177,9 @@
   integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
 
 "@types/babel__core@^7.0.0", "@types/babel__core@^7.1.7":
-  version "7.1.10"
-  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.10.tgz#ca58fc195dd9734e77e57c6f2df565623636ab40"
-  integrity sha512-x8OM8XzITIMyiwl5Vmo2B1cR1S1Ipkyv4mdlbJjMa1lmuKvKY9FrBbEANIaMlnWn5Rf7uO+rC/VgYabNkE17Hw==
+  version "7.1.11"
+  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.11.tgz#7fae4660a009a4031e293f25b213f142d823b3c4"
+  integrity sha512-E5nSOzrjnvhURYnbOR2dClTqcyhPbPvtEwLHf7JJADKedPbcZsoJVfP+I2vBNfBjz4bnZIuhL/tNmRi5nJ7Jlw==
   dependencies:
     "@babel/parser" "^7.1.0"
     "@babel/types" "^7.0.0"
@@ -1310,7 +1310,12 @@
     "@types/node" "*"
     form-data "^3.0.0"
 
-"@types/node@*", "@types/node@14.14.5":
+"@types/node@*":
+  version "14.14.6"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.6.tgz#146d3da57b3c636cc0d1769396ce1cfa8991147f"
+  integrity sha512-6QlRuqsQ/Ox/aJEQWBEJG7A9+u7oSYl3mem/K8IzxXG/kAGbV1YPD9Bg9Zw3vyxC/YP+zONKwy8hGkSt1jxFMw==
+
+"@types/node@14.14.5":
   version "14.14.5"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.5.tgz#e92d3b8f76583efa26c1a63a21c9d3c1143daa29"
   integrity sha512-H5Wn24s/ZOukBmDn03nnGTp18A60ny9AmCwnEcgJiTgSGsCO7k+NWP7zjCCbhlcnVCoI+co52dUAt9GMhOSULw==
@@ -1639,9 +1644,9 @@ aws-sign2@~0.7.0:
   integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
 
 aws4@^1.8.0:
-  version "1.10.1"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.10.1.tgz#e1e82e4f3e999e2cfd61b161280d16a111f86428"
-  integrity sha512-zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA==
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
+  integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
 
 babel-jest@^26.6.1:
   version "26.6.1"
@@ -1878,12 +1883,20 @@ cache-base@^1.0.1:
     union-value "^1.0.0"
     unset-value "^1.0.0"
 
+call-bind@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.0.tgz#24127054bb3f9bdcb4b1fb82418186072f77b8ce"
+  integrity sha512-AEXsYIyyDY3MCzbwdhzG3Jx1R0J2wetQyUynn6dYHAO+bg8l1k7jwZtRv4ryryFs7EP+NDlikJlVe59jr0cM2w==
+  dependencies:
+    function-bind "^1.1.1"
+    get-intrinsic "^1.0.0"
+
 callsites@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
-camelcase@6.1.0, camelcase@^6.0.0:
+camelcase@6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.1.0.tgz#27dc176173725fb0adf8a48b647f4d7871944d78"
   integrity sha512-WCMml9ivU60+8rEJgELlFp1gxFcEGxwYleE3bziHEDeqsqAWGHdimB7beBFGjLzVNgPGyDsfgXLQEYMpmIFnVQ==
@@ -1893,10 +1906,15 @@ camelcase@^5.0.0, camelcase@^5.3.1:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
+camelcase@^6.0.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809"
+  integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==
+
 caniuse-lite@^1.0.30001135:
-  version "1.0.30001151"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001151.tgz#1ddfde5e6fff02aad7940b4edb7d3ac76b0cb00b"
-  integrity sha512-Zh3sHqskX6mHNrqUerh+fkf0N72cMxrmflzje/JyVImfpknscMnkeJrlFGJcqTmaa0iszdYptGpWMJCRQDkBVw==
+  version "1.0.30001154"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001154.tgz#f3bbc245ce55e4c1cd20fa731b097880181a7f17"
+  integrity sha512-y9DvdSti8NnYB9Be92ddMZQrcOe04kcQtcxtBx4NkB04+qZ+JUWotnXBJTmxlKudhxNTQ3RRknMwNU2YQl/Org==
 
 capture-exit@^2.0.0:
   version "2.0.0"
@@ -2323,9 +2341,9 @@ ee-first@1.1.1:
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
 electron-to-chromium@^1.3.571:
-  version "1.3.584"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.584.tgz#506cf7ba5895aafa8241876ab028654b61fd9ceb"
-  integrity sha512-NB3DzrTzJFhWkUp+nl2KtUtoFzrfGXTir2S+BU4tXGyXH9vlluPuFpE3pTKeH7+PY460tHLjKzh6K2+TWwW+Ww==
+  version "1.3.585"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.585.tgz#71cdb722c73488b9475ad1c572cf43a763ef9081"
+  integrity sha512-xoeqjMQhgHDZM7FiglJAb2aeOxHZWFruUc3MbAGTgE7GB8rr5fTn1Sdh5THGuQtndU3GuXlu91ZKqRivxoCZ/A==
 
 emittery@^0.7.1:
   version "0.7.2"
@@ -2368,33 +2386,6 @@ error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
-es-abstract@^1.18.0-next.0, es-abstract@^1.18.0-next.1:
-  version "1.18.0-next.1"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.1.tgz#6e3a0a4bda717e5023ab3b8e90bec36108d22c68"
-  integrity sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==
-  dependencies:
-    es-to-primitive "^1.2.1"
-    function-bind "^1.1.1"
-    has "^1.0.3"
-    has-symbols "^1.0.1"
-    is-callable "^1.2.2"
-    is-negative-zero "^2.0.0"
-    is-regex "^1.1.1"
-    object-inspect "^1.8.0"
-    object-keys "^1.1.1"
-    object.assign "^4.1.1"
-    string.prototype.trimend "^1.0.1"
-    string.prototype.trimstart "^1.0.1"
-
-es-to-primitive@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
-  integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==
-  dependencies:
-    is-callable "^1.1.4"
-    is-date-object "^1.0.1"
-    is-symbol "^1.0.2"
-
 escalade@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
@@ -2591,9 +2582,9 @@ execa@^1.0.0:
     strip-eof "^1.0.0"
 
 execa@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-4.0.3.tgz#0a34dabbad6d66100bd6f2c576c8669403f317f2"
-  integrity sha512-WFDXGHckXPWZX19t1kCsXzOpqX9LWYNqn4C+HqZlk/V0imTkzJZqf87ZBhvpHaftERYknpk0fjSylnXVlVgI0A==
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a"
+  integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==
   dependencies:
     cross-spawn "^7.0.0"
     get-stream "^5.0.0"
@@ -2759,9 +2750,9 @@ fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6:
   integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
 
 fastq@^1.6.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.8.0.tgz#550e1f9f59bbc65fe185cb6a9b4d95357107f481"
-  integrity sha512-SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q==
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.9.0.tgz#e16a72f338eaca48e91b5c23593bcc2ef66b7947"
+  integrity sha512-i7FVWL8HhVY+CTkwFxkN2mk3h+787ixS5S63eb78diVRc1MCssarHq3W5cj0av7YDSwmaV928RNag+U1etRQ7w==
   dependencies:
     reusify "^1.0.4"
 
@@ -2954,6 +2945,15 @@ get-caller-file@^2.0.1:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
+get-intrinsic@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.0.1.tgz#94a9768fcbdd0595a1c9273aacf4c89d075631be"
+  integrity sha512-ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg==
+  dependencies:
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.1"
+
 get-package-type@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
@@ -3323,11 +3323,6 @@ is-buffer@^1.1.5:
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
-is-callable@^1.1.4, is-callable@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9"
-  integrity sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==
-
 is-ci@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
@@ -3356,11 +3351,6 @@ is-data-descriptor@^1.0.0:
   dependencies:
     kind-of "^6.0.0"
 
-is-date-object@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e"
-  integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==
-
 is-descriptor@^0.1.0:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
@@ -3435,11 +3425,6 @@ is-module@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
   integrity sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=
 
-is-negative-zero@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.0.tgz#9553b121b0fac28869da9ed459e20c7543788461"
-  integrity sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE=
-
 is-number@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
@@ -3471,13 +3456,6 @@ is-reference@^1.2.1:
   dependencies:
     "@types/estree" "*"
 
-is-regex@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz#c6f98aacc546f6cec5468a07b7b153ab564a57b9"
-  integrity sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==
-  dependencies:
-    has-symbols "^1.0.1"
-
 is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
@@ -3488,13 +3466,6 @@ is-stream@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3"
   integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==
 
-is-symbol@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937"
-  integrity sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==
-  dependencies:
-    has-symbols "^1.0.1"
-
 is-typedarray@^1.0.0, is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
@@ -4370,9 +4341,9 @@ node-notifier@^8.0.0:
     which "^2.0.2"
 
 node-releases@^1.1.61:
-  version "1.1.64"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.64.tgz#71b4ae988e9b1dd7c1ffce58dd9e561752dfebc5"
-  integrity sha512-Iec8O9166/x2HRMJyLLLWkd0sFFLrFNy+Xf+JQfSQsdBJzPcHpNl3JQ9gD4j+aJxmCa25jNsIbM4bmACtSbkSg==
+  version "1.1.65"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.65.tgz#52d9579176bd60f23eba05c4438583f341944b81"
+  integrity sha512-YpzJOe2WFIW0V4ZkJQd/DGR/zdVwc/pI4Nl1CZrBO19FdRcSTmsuhdttw9rsTzzJLrNcSloLiBbEYx1C4f6gpA==
 
 normalize-package-data@^2.5.0:
   version "2.5.0"
@@ -4429,11 +4400,6 @@ object-copy@^0.1.0:
     define-property "^0.2.5"
     kind-of "^3.0.3"
 
-object-inspect@^1.8.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz#df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0"
-  integrity sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==
-
 object-keys@^1.0.12, object-keys@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
@@ -4446,13 +4412,13 @@ object-visit@^1.0.0:
   dependencies:
     isobject "^3.0.0"
 
-object.assign@^4.1.0, object.assign@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.1.tgz#303867a666cdd41936ecdedfb1f8f3e32a478cdd"
-  integrity sha512-VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA==
+object.assign@^4.1.0:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940"
+  integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==
   dependencies:
+    call-bind "^1.0.0"
     define-properties "^1.1.3"
-    es-abstract "^1.18.0-next.0"
     has-symbols "^1.0.1"
     object-keys "^1.1.1"
 
@@ -5444,22 +5410,6 @@ string-width@^4.1.0, string-width@^4.2.0:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.0"
 
-string.prototype.trimend@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.2.tgz#6ddd9a8796bc714b489a3ae22246a208f37bfa46"
-  integrity sha512-8oAG/hi14Z4nOVP0z6mdiVZ/wqjDtWSLygMigTzAb+7aPEDTleeFf+WrF+alzecxIRkckkJVn+dTlwzJXORATw==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.18.0-next.1"
-
-string.prototype.trimstart@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.2.tgz#22d45da81015309cd0cdd79787e8919fc5c613e7"
-  integrity sha512-7F6CdBTl5zyu30BJFdzSTlSlLPwODC23Od+iLoVH8X6+3fvDPPuBVVj9iaB1GOsSTSIgVfsfm27R2FGrAPznWg==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.18.0-next.1"
-
 string_decoder@^1.1.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
@@ -5896,9 +5846,9 @@ uuid@^8.0.0, uuid@^8.3.0:
   integrity sha512-FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg==
 
 v8-compile-cache@^2.0.3:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz#54bc3cdd43317bca91e35dcaf305b1a7237de745"
-  integrity sha512-8OQ9CL+VWyt3JStj7HX7/ciTL2V3Rl1Wf5OL+SNTm0yK1KvtReVulksyeRnCANHHuUxHlQig+JJDlUhBt1NQDQ==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz#9471efa3ef9128d2f7c6a7ca39c4dd6b5055b132"
+  integrity sha512-gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q==
 
 v8-to-istanbul@^6.0.1:
   version "6.0.1"