diff --git a/package.json b/package.json index 495bd1b5..bc386d32 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "openapi-typescript-codegen", - "version": "0.1.2", + "version": "0.1.3", "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/templates/javascript/index.hbs b/src/templates/javascript/index.hbs index e8d78a13..00aa5b5c 100644 --- a/src/templates/javascript/index.hbs +++ b/src/templates/javascript/index.hbs @@ -25,15 +25,15 @@ export { {{{this}}} } from './services/{{{this}}}'; {{/if}} {{#if models}} -const schemas = { +const definitions = { {{#each models}} - '{{{this}}}': {{{this}}}.schema, + '{{{this}}}': {{{this}}}.definition, {{/each}} }; -export function getSchema(schema) { - if (schemas.hasOwnProperty(schema)) { - return schemas[schema]; +export function getDefinition(definition) { + if (definitions.hasOwnProperty(definition)) { + return definitions[definition]; } return null; } diff --git a/src/templates/javascript/models/Dictionary.js b/src/templates/javascript/models/Dictionary.js index 9810e6ba..df15b76a 100644 --- a/src/templates/javascript/models/Dictionary.js +++ b/src/templates/javascript/models/Dictionary.js @@ -7,7 +7,7 @@ export let Dictionary; (function (Dictionary) { - Dictionary.schema = { + Dictionary.definition = { type: 'Dictionary', item: { type: 'any' diff --git a/src/templates/javascript/partials/schema.hbs b/src/templates/javascript/partials/definition.hbs similarity index 56% rename from src/templates/javascript/partials/schema.hbs rename to src/templates/javascript/partials/definition.hbs index 68194de6..9b987f97 100644 --- a/src/templates/javascript/partials/schema.hbs +++ b/src/templates/javascript/partials/definition.hbs @@ -1,11 +1,11 @@ {{#equals export 'interface'}} -{{>schemaInterface}} +{{>definitionInterface}} {{else equals export 'enum'}} -{{>schemaEnum}} +{{>definitionEnum}} {{else equals export 'array'}} -{{>schemaArray}} +{{>definitionArray}} {{else equals export 'dictionary'}} -{{>schemaDictionary}} +{{>definitionDictionary}} {{else}} -{{>schemaGeneric}} +{{>definitionGeneric}} {{/equals}} diff --git a/src/templates/typescript/partials/schemaArray.hbs b/src/templates/javascript/partials/definitionArray.hbs similarity index 87% rename from src/templates/typescript/partials/schemaArray.hbs rename to src/templates/javascript/partials/definitionArray.hbs index b4a32661..fc098c05 100644 --- a/src/templates/typescript/partials/schemaArray.hbs +++ b/src/templates/javascript/partials/definitionArray.hbs @@ -1,11 +1,11 @@ { type: 'Array', {{#if link~}} - item: {{>schema link}}, + item: {{>definition link}}, {{else}} item: { type: '{{{base}}}', - } + }, {{/if}} {{#if isReadOnly~}} isReadOnly: {{{isReadOnly}}}, diff --git a/src/templates/typescript/partials/schemaDictionary.hbs b/src/templates/javascript/partials/definitionDictionary.hbs similarity index 87% rename from src/templates/typescript/partials/schemaDictionary.hbs rename to src/templates/javascript/partials/definitionDictionary.hbs index c560aa03..642428bb 100644 --- a/src/templates/typescript/partials/schemaDictionary.hbs +++ b/src/templates/javascript/partials/definitionDictionary.hbs @@ -1,11 +1,11 @@ { type: 'Dictionary', {{#if link~}} - item: {{>schema link}}, + item: {{>definition link}}, {{else}} item: { type: '{{{base}}}', - } + }, {{/if}} {{#if isReadOnly~}} isReadOnly: {{{isReadOnly}}}, diff --git a/src/templates/typescript/partials/schemaEnum.hbs b/src/templates/javascript/partials/definitionEnum.hbs similarity index 100% rename from src/templates/typescript/partials/schemaEnum.hbs rename to src/templates/javascript/partials/definitionEnum.hbs diff --git a/src/templates/javascript/partials/schemaGeneric.hbs b/src/templates/javascript/partials/definitionGeneric.hbs similarity index 100% rename from src/templates/javascript/partials/schemaGeneric.hbs rename to src/templates/javascript/partials/definitionGeneric.hbs diff --git a/src/templates/javascript/partials/schemaInterface.hbs b/src/templates/javascript/partials/definitionInterface.hbs similarity index 87% rename from src/templates/javascript/partials/schemaInterface.hbs rename to src/templates/javascript/partials/definitionInterface.hbs index 9e93369b..53362e64 100644 --- a/src/templates/javascript/partials/schemaInterface.hbs +++ b/src/templates/javascript/partials/definitionInterface.hbs @@ -1,6 +1,6 @@ { {{#each properties}} - {{{name}}}: {{>schema}}, + {{{name}}}: {{>definition}}, {{/each}} {{#if isReadOnly~}} isReadOnly: {{{isReadOnly}}}, diff --git a/src/templates/javascript/partials/exportEnum.hbs b/src/templates/javascript/partials/exportEnum.hbs index 4dcf4702..394c47df 100644 --- a/src/templates/javascript/partials/exportEnum.hbs +++ b/src/templates/javascript/partials/exportEnum.hbs @@ -12,6 +12,6 @@ export let {{{name}}}; {{/each}} {{/if}} - {{{name}}}.schema = {{>schema}}; + {{{name}}}.definition = {{>definition}}; })({{{name}}} || ({{{name}}} = {})); diff --git a/src/templates/javascript/partials/exportGeneric.hbs b/src/templates/javascript/partials/exportGeneric.hbs index da58a4ea..8dd1945f 100644 --- a/src/templates/javascript/partials/exportGeneric.hbs +++ b/src/templates/javascript/partials/exportGeneric.hbs @@ -6,6 +6,6 @@ export let {{{name}}}; (function ({{{name}}}) { - {{{name}}}.schema = {{>schema}}; + {{{name}}}.definition = {{>definition}}; })({{{name}}} || ({{{name}}} = {})); diff --git a/src/templates/javascript/partials/exportInterface.hbs b/src/templates/javascript/partials/exportInterface.hbs index 295ab02b..d4cdb529 100644 --- a/src/templates/javascript/partials/exportInterface.hbs +++ b/src/templates/javascript/partials/exportInterface.hbs @@ -21,6 +21,6 @@ export let {{{name}}}; {{/each}} {{/if}} - {{{name}}}.schema = {{>schema}}; + {{{name}}}.definition = {{>definition}}; })({{{name}}} || ({{{name}}} = {})); diff --git a/src/templates/typescript/core/Schema.ts b/src/templates/typescript/core/Definition.ts similarity index 55% rename from src/templates/typescript/core/Schema.ts rename to src/templates/typescript/core/Definition.ts index bf87673d..5673fbc1 100644 --- a/src/templates/typescript/core/Schema.ts +++ b/src/templates/typescript/core/Definition.ts @@ -5,7 +5,7 @@ import { Dictionary } from "../models/Dictionary"; -type FieldSchema = { +type FieldDefinition = { readonly type?: string; readonly isReadOnly?: boolean; readonly isRequired?: boolean; @@ -26,25 +26,25 @@ type FieldSchema = { readonly minProperties?: number; } -type ArraySchema = FieldSchema & { - readonly item: Schema; +type ArrayDefinition = FieldDefinition & { + readonly item: Definition; } -type DictionarySchema = FieldSchema & { - readonly item: Schema; +type DictionaryDefinition = FieldDefinition & { + readonly item: Definition; } -type ObjectSchema = FieldSchema & { - readonly [K in keyof T]: Schema; +type ObjectDefinition = FieldDefinition & { + readonly [K in keyof T]: Definition; } -export type Schema = - T extends string ? FieldSchema : - T extends number ? FieldSchema : - T extends boolean ? FieldSchema : - T extends File ? FieldSchema : - T extends Blob ? FieldSchema : - T extends Array ? ArraySchema : - T extends Dictionary ? DictionarySchema : - T extends Object ? ObjectSchema : - FieldSchema +export type Definition = + T extends string ? FieldDefinition : + T extends number ? FieldDefinition : + T extends boolean ? FieldDefinition : + T extends File ? FieldDefinition : + T extends Blob ? FieldDefinition : + T extends Array ? ArrayDefinition : + T extends Dictionary ? DictionaryDefinition : + T extends Object ? ObjectDefinition : + FieldDefinition diff --git a/src/templates/typescript/index.hbs b/src/templates/typescript/index.hbs index b3184993..4588e5d2 100644 --- a/src/templates/typescript/index.hbs +++ b/src/templates/typescript/index.hbs @@ -4,9 +4,9 @@ /* prettier-ignore */ export { ApiError } from './core/ApiError'; +export { Definition } from './core/Definition'; export { isSuccess } from './core/isSuccess'; export { OpenAPI } from './core/OpenAPI'; -import { Schema } from './core/Schema'; {{#if models}} {{#each models}} @@ -27,15 +27,15 @@ export { {{{this}}} } from './services/{{{this}}}'; {{/if}} {{#if models}} -const schemas = { +const definitions = { {{#each models}} - '{{{this}}}': {{{this}}}.schema, + '{{{this}}}': {{{this}}}.definition, {{/each}} }; -export function getSchema(schema: K) { - if (schemas.hasOwnProperty(schema)) { - return schemas[schema]; +export function getDefinition(definition: K) { + if (definitions.hasOwnProperty(definition)) { + return definitions[definition]; } return null; } diff --git a/src/templates/typescript/model.hbs b/src/templates/typescript/model.hbs index 0471144a..5c0d905a 100644 --- a/src/templates/typescript/model.hbs +++ b/src/templates/typescript/model.hbs @@ -3,7 +3,7 @@ /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; {{#if imports}} {{#each imports}} import { {{{this}}} } from '../models/{{{this}}}'; diff --git a/src/templates/typescript/models/Dictionary.ts b/src/templates/typescript/models/Dictionary.ts index 37a89f12..c88475db 100644 --- a/src/templates/typescript/models/Dictionary.ts +++ b/src/templates/typescript/models/Dictionary.ts @@ -3,7 +3,7 @@ /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; export interface Dictionary { @@ -17,7 +17,7 @@ export interface Dictionary { export namespace Dictionary { - export const schema: Schema> = { + export const definition: Definition> = { type: 'Dictionary', item: { type: 'any' diff --git a/src/templates/typescript/partials/schema.hbs b/src/templates/typescript/partials/definition.hbs similarity index 56% rename from src/templates/typescript/partials/schema.hbs rename to src/templates/typescript/partials/definition.hbs index 68194de6..9b987f97 100644 --- a/src/templates/typescript/partials/schema.hbs +++ b/src/templates/typescript/partials/definition.hbs @@ -1,11 +1,11 @@ {{#equals export 'interface'}} -{{>schemaInterface}} +{{>definitionInterface}} {{else equals export 'enum'}} -{{>schemaEnum}} +{{>definitionEnum}} {{else equals export 'array'}} -{{>schemaArray}} +{{>definitionArray}} {{else equals export 'dictionary'}} -{{>schemaDictionary}} +{{>definitionDictionary}} {{else}} -{{>schemaGeneric}} +{{>definitionGeneric}} {{/equals}} diff --git a/src/templates/javascript/partials/schemaArray.hbs b/src/templates/typescript/partials/definitionArray.hbs similarity index 75% rename from src/templates/javascript/partials/schemaArray.hbs rename to src/templates/typescript/partials/definitionArray.hbs index f8127b9c..fc098c05 100644 --- a/src/templates/javascript/partials/schemaArray.hbs +++ b/src/templates/typescript/partials/definitionArray.hbs @@ -1,9 +1,11 @@ { type: 'Array', {{#if link~}} - item: {{>schema link}}, + item: {{>definition link}}, {{else}} - item: '{{{base}}}', + item: { + type: '{{{base}}}', + }, {{/if}} {{#if isReadOnly~}} isReadOnly: {{{isReadOnly}}}, diff --git a/src/templates/javascript/partials/schemaDictionary.hbs b/src/templates/typescript/partials/definitionDictionary.hbs similarity index 75% rename from src/templates/javascript/partials/schemaDictionary.hbs rename to src/templates/typescript/partials/definitionDictionary.hbs index 9735207f..642428bb 100644 --- a/src/templates/javascript/partials/schemaDictionary.hbs +++ b/src/templates/typescript/partials/definitionDictionary.hbs @@ -1,9 +1,11 @@ { type: 'Dictionary', {{#if link~}} - item: {{>schema link}}, + item: {{>definition link}}, {{else}} - item: '{{{base}}}', + item: { + type: '{{{base}}}', + }, {{/if}} {{#if isReadOnly~}} isReadOnly: {{{isReadOnly}}}, diff --git a/src/templates/javascript/partials/schemaEnum.hbs b/src/templates/typescript/partials/definitionEnum.hbs similarity index 71% rename from src/templates/javascript/partials/schemaEnum.hbs rename to src/templates/typescript/partials/definitionEnum.hbs index b10ddfc2..9a4e7ac3 100644 --- a/src/templates/javascript/partials/schemaEnum.hbs +++ b/src/templates/typescript/partials/definitionEnum.hbs @@ -1,10 +1,5 @@ { type: 'Enum', - enums: [ - {{#each enum}} - {{{value}}}, - {{/each}} - ], {{#if isReadOnly~}} isReadOnly: {{{isReadOnly}}}, {{/if}} diff --git a/src/templates/typescript/partials/schemaGeneric.hbs b/src/templates/typescript/partials/definitionGeneric.hbs similarity index 100% rename from src/templates/typescript/partials/schemaGeneric.hbs rename to src/templates/typescript/partials/definitionGeneric.hbs diff --git a/src/templates/typescript/partials/schemaInterface.hbs b/src/templates/typescript/partials/definitionInterface.hbs similarity index 87% rename from src/templates/typescript/partials/schemaInterface.hbs rename to src/templates/typescript/partials/definitionInterface.hbs index 9e93369b..53362e64 100644 --- a/src/templates/typescript/partials/schemaInterface.hbs +++ b/src/templates/typescript/partials/definitionInterface.hbs @@ -1,6 +1,6 @@ { {{#each properties}} - {{{name}}}: {{>schema}}, + {{{name}}}: {{>definition}}, {{/each}} {{#if isReadOnly~}} isReadOnly: {{{isReadOnly}}}, diff --git a/src/templates/typescript/partials/exportEnum.hbs b/src/templates/typescript/partials/exportEnum.hbs index f586888d..c0531e30 100644 --- a/src/templates/typescript/partials/exportEnum.hbs +++ b/src/templates/typescript/partials/exportEnum.hbs @@ -11,6 +11,6 @@ export enum {{{name}}} { export namespace {{{name}}} { - export const schema: Schema<{{{name}}}> = {{>schema}}; + export const definition: Definition<{{{name}}}> = {{>definition}}; } diff --git a/src/templates/typescript/partials/exportGeneric.hbs b/src/templates/typescript/partials/exportGeneric.hbs index ce4c70d9..c43f121e 100644 --- a/src/templates/typescript/partials/exportGeneric.hbs +++ b/src/templates/typescript/partials/exportGeneric.hbs @@ -7,6 +7,6 @@ export type {{{name}}} = {{>type}}; export namespace {{{name}}} { - export const schema: Schema<{{{name}}}> = {{>schema}}; + export const definition: Definition<{{{name}}}> = {{>definition}}; } diff --git a/src/templates/typescript/partials/exportInterface.hbs b/src/templates/typescript/partials/exportInterface.hbs index 5269a046..d0264d70 100644 --- a/src/templates/typescript/partials/exportInterface.hbs +++ b/src/templates/typescript/partials/exportInterface.hbs @@ -31,6 +31,6 @@ export namespace {{{name}}} { {{/each}} {{/if}} - export const schema: Schema<{{{name}}}> = {{>schema}}; + export const definition: Definition<{{{name}}}> = {{>definition}}; } diff --git a/test/__snapshots__/index.spec.js.snap b/test/__snapshots__/index.spec.js.snap index 5b2402dc..9cbef9bb 100644 --- a/test/__snapshots__/index.spec.js.snap +++ b/test/__snapshots__/index.spec.js.snap @@ -463,50 +463,50 @@ export { ResponseService } from './services/ResponseService'; export { SimpleService } from './services/SimpleService'; export { TypesService } from './services/TypesService'; -const schemas = { - 'ArrayWithArray': ArrayWithArray.schema, - 'ArrayWithBooleans': ArrayWithBooleans.schema, - 'ArrayWithNumbers': ArrayWithNumbers.schema, - 'ArrayWithProperties': ArrayWithProperties.schema, - 'ArrayWithReferences': ArrayWithReferences.schema, - 'ArrayWithStrings': ArrayWithStrings.schema, - 'Dictionary': Dictionary.schema, - 'DictionaryWithArray': DictionaryWithArray.schema, - 'DictionaryWithDictionary': DictionaryWithDictionary.schema, - 'DictionaryWithProperties': DictionaryWithProperties.schema, - 'DictionaryWithReference': DictionaryWithReference.schema, - 'DictionaryWithString': DictionaryWithString.schema, - 'EnumFromDescription': EnumFromDescription.schema, - 'EnumWithNumbers': EnumWithNumbers.schema, - 'EnumWithStrings': EnumWithStrings.schema, - 'ModelLink': ModelLink.schema, - 'ModelThatExtends': ModelThatExtends.schema, - 'ModelThatExtendsExtends': ModelThatExtendsExtends.schema, - 'ModelWithArray': ModelWithArray.schema, - 'ModelWithBoolean': ModelWithBoolean.schema, - 'ModelWithCircularReference': ModelWithCircularReference.schema, - 'ModelWithDictionary': ModelWithDictionary.schema, - 'ModelWithDuplicateImports': ModelWithDuplicateImports.schema, - 'ModelWithDuplicateProperties': ModelWithDuplicateProperties.schema, - 'ModelWithEnum': ModelWithEnum.schema, - 'ModelWithEnumFromDescription': ModelWithEnumFromDescription.schema, - 'ModelWithInteger': ModelWithInteger.schema, - 'ModelWithLink': ModelWithLink.schema, - 'ModelWithNestedEnums': ModelWithNestedEnums.schema, - 'ModelWithNestedProperties': ModelWithNestedProperties.schema, - 'ModelWithProperties': ModelWithProperties.schema, - 'ModelWithReference': ModelWithReference.schema, - 'ModelWithString': ModelWithString.schema, - 'SimpleBoolean': SimpleBoolean.schema, - 'SimpleFile': SimpleFile.schema, - 'SimpleInteger': SimpleInteger.schema, - 'SimpleReference': SimpleReference.schema, - 'SimpleString': SimpleString.schema, +const definitions = { + 'ArrayWithArray': ArrayWithArray.definition, + 'ArrayWithBooleans': ArrayWithBooleans.definition, + 'ArrayWithNumbers': ArrayWithNumbers.definition, + 'ArrayWithProperties': ArrayWithProperties.definition, + 'ArrayWithReferences': ArrayWithReferences.definition, + 'ArrayWithStrings': ArrayWithStrings.definition, + 'Dictionary': Dictionary.definition, + 'DictionaryWithArray': DictionaryWithArray.definition, + 'DictionaryWithDictionary': DictionaryWithDictionary.definition, + 'DictionaryWithProperties': DictionaryWithProperties.definition, + 'DictionaryWithReference': DictionaryWithReference.definition, + 'DictionaryWithString': DictionaryWithString.definition, + 'EnumFromDescription': EnumFromDescription.definition, + 'EnumWithNumbers': EnumWithNumbers.definition, + 'EnumWithStrings': EnumWithStrings.definition, + 'ModelLink': ModelLink.definition, + 'ModelThatExtends': ModelThatExtends.definition, + 'ModelThatExtendsExtends': ModelThatExtendsExtends.definition, + 'ModelWithArray': ModelWithArray.definition, + 'ModelWithBoolean': ModelWithBoolean.definition, + 'ModelWithCircularReference': ModelWithCircularReference.definition, + 'ModelWithDictionary': ModelWithDictionary.definition, + 'ModelWithDuplicateImports': ModelWithDuplicateImports.definition, + 'ModelWithDuplicateProperties': ModelWithDuplicateProperties.definition, + 'ModelWithEnum': ModelWithEnum.definition, + 'ModelWithEnumFromDescription': ModelWithEnumFromDescription.definition, + 'ModelWithInteger': ModelWithInteger.definition, + 'ModelWithLink': ModelWithLink.definition, + 'ModelWithNestedEnums': ModelWithNestedEnums.definition, + 'ModelWithNestedProperties': ModelWithNestedProperties.definition, + 'ModelWithProperties': ModelWithProperties.definition, + 'ModelWithReference': ModelWithReference.definition, + 'ModelWithString': ModelWithString.definition, + 'SimpleBoolean': SimpleBoolean.definition, + 'SimpleFile': SimpleFile.definition, + 'SimpleInteger': SimpleInteger.definition, + 'SimpleReference': SimpleReference.definition, + 'SimpleString': SimpleString.definition, }; -export function getSchema(schema) { - if (schemas.hasOwnProperty(schema)) { - return schemas[schema]; +export function getDefinition(definition) { + if (definitions.hasOwnProperty(definition)) { + return definitions[definition]; } return null; } @@ -526,11 +526,13 @@ exports[`generation v2 javascript file(./test/result/v2/javascript/models/ArrayW export let ArrayWithArray; (function (ArrayWithArray) { - ArrayWithArray.schema = { + ArrayWithArray.definition = { type: 'Array', item: { type: 'Array', - item: 'ModelWithString', + item: { + type: 'ModelWithString', + }, }, }; @@ -550,7 +552,7 @@ exports[`generation v2 javascript file(./test/result/v2/javascript/models/ArrayW export let ArrayWithBooleans; (function (ArrayWithBooleans) { - ArrayWithBooleans.schema = { + ArrayWithBooleans.definition = { type: 'Array', item: { type: 'boolean', @@ -573,7 +575,7 @@ exports[`generation v2 javascript file(./test/result/v2/javascript/models/ArrayW export let ArrayWithNumbers; (function (ArrayWithNumbers) { - ArrayWithNumbers.schema = { + ArrayWithNumbers.definition = { type: 'Array', item: { type: 'number', @@ -596,7 +598,7 @@ exports[`generation v2 javascript file(./test/result/v2/javascript/models/ArrayW export let ArrayWithProperties; (function (ArrayWithProperties) { - ArrayWithProperties.schema = { + ArrayWithProperties.definition = { type: 'Array', item: { foo: { @@ -624,9 +626,11 @@ exports[`generation v2 javascript file(./test/result/v2/javascript/models/ArrayW export let ArrayWithReferences; (function (ArrayWithReferences) { - ArrayWithReferences.schema = { + ArrayWithReferences.definition = { type: 'Array', - item: 'ModelWithString', + item: { + type: 'ModelWithString', + }, }; })(ArrayWithReferences || (ArrayWithReferences = {}));" @@ -645,7 +649,7 @@ exports[`generation v2 javascript file(./test/result/v2/javascript/models/ArrayW export let ArrayWithStrings; (function (ArrayWithStrings) { - ArrayWithStrings.schema = { + ArrayWithStrings.definition = { type: 'Array', item: { type: 'string', @@ -665,7 +669,7 @@ exports[`generation v2 javascript file(./test/result/v2/javascript/models/Dictio export let Dictionary; (function (Dictionary) { - Dictionary.schema = { + Dictionary.definition = { type: 'Dictionary', item: { type: 'any' @@ -689,11 +693,13 @@ exports[`generation v2 javascript file(./test/result/v2/javascript/models/Dictio export let DictionaryWithArray; (function (DictionaryWithArray) { - DictionaryWithArray.schema = { + DictionaryWithArray.definition = { type: 'Dictionary', item: { type: 'Array', - item: 'ModelWithString', + item: { + type: 'ModelWithString', + }, }, }; @@ -713,7 +719,7 @@ exports[`generation v2 javascript file(./test/result/v2/javascript/models/Dictio export let DictionaryWithDictionary; (function (DictionaryWithDictionary) { - DictionaryWithDictionary.schema = { + DictionaryWithDictionary.definition = { type: 'Dictionary', item: { type: 'Dictionary', @@ -739,7 +745,7 @@ exports[`generation v2 javascript file(./test/result/v2/javascript/models/Dictio export let DictionaryWithProperties; (function (DictionaryWithProperties) { - DictionaryWithProperties.schema = { + DictionaryWithProperties.definition = { type: 'Dictionary', item: { foo: { @@ -767,9 +773,11 @@ exports[`generation v2 javascript file(./test/result/v2/javascript/models/Dictio export let DictionaryWithReference; (function (DictionaryWithReference) { - DictionaryWithReference.schema = { + DictionaryWithReference.definition = { type: 'Dictionary', - item: 'ModelWithString', + item: { + type: 'ModelWithString', + }, }; })(DictionaryWithReference || (DictionaryWithReference = {}));" @@ -788,7 +796,7 @@ exports[`generation v2 javascript file(./test/result/v2/javascript/models/Dictio export let DictionaryWithString; (function (DictionaryWithString) { - DictionaryWithString.schema = { + DictionaryWithString.definition = { type: 'Dictionary', item: { type: 'string', @@ -815,13 +823,8 @@ export let EnumFromDescription; EnumFromDescription.SUCCESS = 1; EnumFromDescription.WARNING = 2; - EnumFromDescription.schema = { + EnumFromDescription.definition = { type: 'Enum', - enums: [ - 3, - 1, - 2, - ], }; })(EnumFromDescription || (EnumFromDescription = {}));" @@ -844,13 +847,8 @@ export let EnumWithNumbers; EnumWithNumbers.NUM_2 = 2; EnumWithNumbers.NUM_3 = 3; - EnumWithNumbers.schema = { + EnumWithNumbers.definition = { type: 'Enum', - enums: [ - 1, - 2, - 3, - ], }; })(EnumWithNumbers || (EnumWithNumbers = {}));" @@ -873,13 +871,8 @@ export let EnumWithStrings; EnumWithStrings.SUCCESS = 'Success'; EnumWithStrings.WARNING = 'Warning'; - EnumWithStrings.schema = { + EnumWithStrings.definition = { type: 'Enum', - enums: [ - 'Error', - 'Success', - 'Warning', - ], }; })(EnumWithStrings || (EnumWithStrings = {}));" @@ -898,7 +891,7 @@ exports[`generation v2 javascript file(./test/result/v2/javascript/models/ModelL export let ModelLink; (function (ModelLink) { - ModelLink.schema = { + ModelLink.definition = { id: { type: 'string', }, @@ -920,7 +913,7 @@ exports[`generation v2 javascript file(./test/result/v2/javascript/models/ModelT export let ModelThatExtends; (function (ModelThatExtends) { - ModelThatExtends.schema = { + ModelThatExtends.definition = { propExtendsA: { type: 'string', }, @@ -945,7 +938,7 @@ exports[`generation v2 javascript file(./test/result/v2/javascript/models/ModelT export let ModelThatExtendsExtends; (function (ModelThatExtendsExtends) { - ModelThatExtendsExtends.schema = { + ModelThatExtendsExtends.definition = { propExtendsC: { type: 'string', }, @@ -970,10 +963,12 @@ exports[`generation v2 javascript file(./test/result/v2/javascript/models/ModelW export let ModelWithArray; (function (ModelWithArray) { - ModelWithArray.schema = { + ModelWithArray.definition = { prop: { type: 'Array', - item: 'ModelWithString', + item: { + type: 'ModelWithString', + }, }, propWithFile: { type: 'Array', @@ -1005,7 +1000,7 @@ exports[`generation v2 javascript file(./test/result/v2/javascript/models/ModelW export let ModelWithBoolean; (function (ModelWithBoolean) { - ModelWithBoolean.schema = { + ModelWithBoolean.definition = { prop: { type: 'boolean', }, @@ -1027,7 +1022,7 @@ exports[`generation v2 javascript file(./test/result/v2/javascript/models/ModelW export let ModelWithCircularReference; (function (ModelWithCircularReference) { - ModelWithCircularReference.schema = { + ModelWithCircularReference.definition = { prop: { type: 'ModelWithCircularReference', }, @@ -1049,7 +1044,7 @@ exports[`generation v2 javascript file(./test/result/v2/javascript/models/ModelW export let ModelWithDictionary; (function (ModelWithDictionary) { - ModelWithDictionary.schema = { + ModelWithDictionary.definition = { prop: { type: 'Dictionary', item: { @@ -1074,7 +1069,7 @@ exports[`generation v2 javascript file(./test/result/v2/javascript/models/ModelW export let ModelWithDuplicateImports; (function (ModelWithDuplicateImports) { - ModelWithDuplicateImports.schema = { + ModelWithDuplicateImports.definition = { propA: { type: 'ModelWithString', }, @@ -1102,7 +1097,7 @@ exports[`generation v2 javascript file(./test/result/v2/javascript/models/ModelW export let ModelWithDuplicateProperties; (function (ModelWithDuplicateProperties) { - ModelWithDuplicateProperties.schema = { + ModelWithDuplicateProperties.definition = { prop: { type: 'ModelWithString', }, @@ -1133,14 +1128,9 @@ export let ModelWithEnum; ERROR: 'Error', }; - ModelWithEnum.schema = { + ModelWithEnum.definition = { test: { type: 'Enum', - enums: [ - 'Success', - 'Warning', - 'Error', - ], }, }; @@ -1169,14 +1159,9 @@ export let ModelWithEnumFromDescription; ERROR: 3, }; - ModelWithEnumFromDescription.schema = { + ModelWithEnumFromDescription.definition = { test: { type: 'Enum', - enums: [ - 1, - 2, - 3, - ], }, }; @@ -1196,7 +1181,7 @@ exports[`generation v2 javascript file(./test/result/v2/javascript/models/ModelW export let ModelWithInteger; (function (ModelWithInteger) { - ModelWithInteger.schema = { + ModelWithInteger.definition = { prop: { type: 'number', }, @@ -1218,7 +1203,7 @@ exports[`generation v2 javascript file(./test/result/v2/javascript/models/ModelW export let ModelWithLink; (function (ModelWithLink) { - ModelWithLink.schema = { + ModelWithLink.definition = { prop: { type: 'ModelLink', }, @@ -1240,49 +1225,29 @@ exports[`generation v2 javascript file(./test/result/v2/javascript/models/ModelW export let ModelWithNestedEnums; (function (ModelWithNestedEnums) { - ModelWithNestedEnums.schema = { + ModelWithNestedEnums.definition = { arrayWithDescription: { type: 'Array', item: { type: 'Enum', - enums: [ - 1, - 2, - 3, - ], }, }, arrayWithEnum: { type: 'Array', item: { type: 'Enum', - enums: [ - 'Success', - 'Warning', - 'Error', - ], }, }, dictionaryWithEnum: { type: 'Dictionary', item: { type: 'Enum', - enums: [ - 'Success', - 'Warning', - 'Error', - ], }, }, dictionaryWithEnumFromDescription: { type: 'Dictionary', item: { type: 'Enum', - enums: [ - 1, - 2, - 3, - ], }, }, }; @@ -1303,7 +1268,7 @@ exports[`generation v2 javascript file(./test/result/v2/javascript/models/ModelW export let ModelWithNestedProperties; (function (ModelWithNestedProperties) { - ModelWithNestedProperties.schema = { + ModelWithNestedProperties.definition = { first: { second: { third: { @@ -1335,7 +1300,7 @@ exports[`generation v2 javascript file(./test/result/v2/javascript/models/ModelW export let ModelWithProperties; (function (ModelWithProperties) { - ModelWithProperties.schema = { + ModelWithProperties.definition = { boolean: { type: 'boolean', }, @@ -1375,7 +1340,7 @@ exports[`generation v2 javascript file(./test/result/v2/javascript/models/ModelW export let ModelWithReference; (function (ModelWithReference) { - ModelWithReference.schema = { + ModelWithReference.definition = { prop: { type: 'ModelWithString', }, @@ -1397,7 +1362,7 @@ exports[`generation v2 javascript file(./test/result/v2/javascript/models/ModelW export let ModelWithString; (function (ModelWithString) { - ModelWithString.schema = { + ModelWithString.definition = { prop: { type: 'string', }, @@ -1419,7 +1384,7 @@ exports[`generation v2 javascript file(./test/result/v2/javascript/models/Simple export let SimpleBoolean; (function (SimpleBoolean) { - SimpleBoolean.schema = { + SimpleBoolean.definition = { type: 'boolean', }; @@ -1439,7 +1404,7 @@ exports[`generation v2 javascript file(./test/result/v2/javascript/models/Simple export let SimpleFile; (function (SimpleFile) { - SimpleFile.schema = { + SimpleFile.definition = { type: 'File', }; @@ -1459,7 +1424,7 @@ exports[`generation v2 javascript file(./test/result/v2/javascript/models/Simple export let SimpleInteger; (function (SimpleInteger) { - SimpleInteger.schema = { + SimpleInteger.definition = { type: 'number', }; @@ -1479,7 +1444,7 @@ exports[`generation v2 javascript file(./test/result/v2/javascript/models/Simple export let SimpleReference; (function (SimpleReference) { - SimpleReference.schema = { + SimpleReference.definition = { type: 'ModelWithString', }; @@ -1499,7 +1464,7 @@ exports[`generation v2 javascript file(./test/result/v2/javascript/models/Simple export let SimpleString; (function (SimpleString) { - SimpleString.schema = { + SimpleString.definition = { type: 'string', }; @@ -1980,6 +1945,60 @@ export function catchGenericError(result: Result): void { " `; +exports[`generation v2 typescript file(./test/result/v2/typescript/core/Definition.ts): ./test/result/v2/typescript/core/Definition.ts 1`] = ` +"/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ +/* prettier-ignore */ + +import { Dictionary } from \\"../models/Dictionary\\"; + +type FieldDefinition = { + readonly type?: string; + readonly isReadOnly?: boolean; + readonly isRequired?: boolean; + readonly isNullable?: boolean; + readonly format?: 'int32' | 'int64' | 'float' | 'double' | 'string' | 'boolean' | 'byte' | 'binary' | 'date' | 'date-time' | 'password'; + readonly maximum?: number; + readonly exclusiveMaximum?: boolean; + readonly minimum?: number; + readonly exclusiveMinimum?: boolean; + readonly multipleOf?: number; + readonly maxLength?: number; + readonly minLength?: number; + readonly pattern?: string; + readonly maxItems?: number; + readonly minItems?: number; + readonly uniqueItems?: boolean; + readonly maxProperties?: number; + readonly minProperties?: number; +} + +type ArrayDefinition = FieldDefinition & { + readonly item: Definition; +} + +type DictionaryDefinition = FieldDefinition & { + readonly item: Definition; +} + +type ObjectDefinition = FieldDefinition & { + readonly [K in keyof T]: Definition; +} + +export type Definition = + T extends string ? FieldDefinition : + T extends number ? FieldDefinition : + T extends boolean ? FieldDefinition : + T extends File ? FieldDefinition : + T extends Blob ? FieldDefinition : + T extends Array ? ArrayDefinition : + T extends Dictionary ? DictionaryDefinition : + T extends Object ? ObjectDefinition : + FieldDefinition +" +`; + exports[`generation v2 typescript file(./test/result/v2/typescript/core/OpenAPI.ts): ./test/result/v2/typescript/core/OpenAPI.ts 1`] = ` "/* istanbul ignore file */ /* tslint:disable */ @@ -2028,60 +2047,6 @@ export interface Result { " `; -exports[`generation v2 typescript file(./test/result/v2/typescript/core/Schema.ts): ./test/result/v2/typescript/core/Schema.ts 1`] = ` -"/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ -/* prettier-ignore */ - -import { Dictionary } from \\"../models/Dictionary\\"; - -type FieldSchema = { - readonly type?: string; - readonly isReadOnly?: boolean; - readonly isRequired?: boolean; - readonly isNullable?: boolean; - readonly format?: 'int32' | 'int64' | 'float' | 'double' | 'string' | 'boolean' | 'byte' | 'binary' | 'date' | 'date-time' | 'password'; - readonly maximum?: number; - readonly exclusiveMaximum?: boolean; - readonly minimum?: number; - readonly exclusiveMinimum?: boolean; - readonly multipleOf?: number; - readonly maxLength?: number; - readonly minLength?: number; - readonly pattern?: string; - readonly maxItems?: number; - readonly minItems?: number; - readonly uniqueItems?: boolean; - readonly maxProperties?: number; - readonly minProperties?: number; -} - -type ArraySchema = FieldSchema & { - readonly item: Schema; -} - -type DictionarySchema = FieldSchema & { - readonly item: Schema; -} - -type ObjectSchema = FieldSchema & { - readonly [K in keyof T]: Schema; -} - -export type Schema = - T extends string ? FieldSchema : - T extends number ? FieldSchema : - T extends boolean ? FieldSchema : - T extends File ? FieldSchema : - T extends Blob ? FieldSchema : - T extends Array ? ArraySchema : - T extends Dictionary ? DictionarySchema : - T extends Object ? ObjectSchema : - FieldSchema -" -`; - exports[`generation v2 typescript file(./test/result/v2/typescript/core/getFormData.ts): ./test/result/v2/typescript/core/getFormData.ts 1`] = ` "/* istanbul ignore file */ /* tslint:disable */ @@ -2381,9 +2346,9 @@ exports[`generation v2 typescript file(./test/result/v2/typescript/index.ts): ./ /* prettier-ignore */ export { ApiError } from './core/ApiError'; +export { Definition } from './core/Definition'; export { isSuccess } from './core/isSuccess'; export { OpenAPI } from './core/OpenAPI'; -import { Schema } from './core/Schema'; import { ArrayWithArray } from './models/ArrayWithArray'; import { ArrayWithBooleans } from './models/ArrayWithBooleans'; @@ -2470,50 +2435,50 @@ export { ResponseService } from './services/ResponseService'; export { SimpleService } from './services/SimpleService'; export { TypesService } from './services/TypesService'; -const schemas = { - 'ArrayWithArray': ArrayWithArray.schema, - 'ArrayWithBooleans': ArrayWithBooleans.schema, - 'ArrayWithNumbers': ArrayWithNumbers.schema, - 'ArrayWithProperties': ArrayWithProperties.schema, - 'ArrayWithReferences': ArrayWithReferences.schema, - 'ArrayWithStrings': ArrayWithStrings.schema, - 'Dictionary': Dictionary.schema, - 'DictionaryWithArray': DictionaryWithArray.schema, - 'DictionaryWithDictionary': DictionaryWithDictionary.schema, - 'DictionaryWithProperties': DictionaryWithProperties.schema, - 'DictionaryWithReference': DictionaryWithReference.schema, - 'DictionaryWithString': DictionaryWithString.schema, - 'EnumFromDescription': EnumFromDescription.schema, - 'EnumWithNumbers': EnumWithNumbers.schema, - 'EnumWithStrings': EnumWithStrings.schema, - 'ModelLink': ModelLink.schema, - 'ModelThatExtends': ModelThatExtends.schema, - 'ModelThatExtendsExtends': ModelThatExtendsExtends.schema, - 'ModelWithArray': ModelWithArray.schema, - 'ModelWithBoolean': ModelWithBoolean.schema, - 'ModelWithCircularReference': ModelWithCircularReference.schema, - 'ModelWithDictionary': ModelWithDictionary.schema, - 'ModelWithDuplicateImports': ModelWithDuplicateImports.schema, - 'ModelWithDuplicateProperties': ModelWithDuplicateProperties.schema, - 'ModelWithEnum': ModelWithEnum.schema, - 'ModelWithEnumFromDescription': ModelWithEnumFromDescription.schema, - 'ModelWithInteger': ModelWithInteger.schema, - 'ModelWithLink': ModelWithLink.schema, - 'ModelWithNestedEnums': ModelWithNestedEnums.schema, - 'ModelWithNestedProperties': ModelWithNestedProperties.schema, - 'ModelWithProperties': ModelWithProperties.schema, - 'ModelWithReference': ModelWithReference.schema, - 'ModelWithString': ModelWithString.schema, - 'SimpleBoolean': SimpleBoolean.schema, - 'SimpleFile': SimpleFile.schema, - 'SimpleInteger': SimpleInteger.schema, - 'SimpleReference': SimpleReference.schema, - 'SimpleString': SimpleString.schema, +const definitions = { + 'ArrayWithArray': ArrayWithArray.definition, + 'ArrayWithBooleans': ArrayWithBooleans.definition, + 'ArrayWithNumbers': ArrayWithNumbers.definition, + 'ArrayWithProperties': ArrayWithProperties.definition, + 'ArrayWithReferences': ArrayWithReferences.definition, + 'ArrayWithStrings': ArrayWithStrings.definition, + 'Dictionary': Dictionary.definition, + 'DictionaryWithArray': DictionaryWithArray.definition, + 'DictionaryWithDictionary': DictionaryWithDictionary.definition, + 'DictionaryWithProperties': DictionaryWithProperties.definition, + 'DictionaryWithReference': DictionaryWithReference.definition, + 'DictionaryWithString': DictionaryWithString.definition, + 'EnumFromDescription': EnumFromDescription.definition, + 'EnumWithNumbers': EnumWithNumbers.definition, + 'EnumWithStrings': EnumWithStrings.definition, + 'ModelLink': ModelLink.definition, + 'ModelThatExtends': ModelThatExtends.definition, + 'ModelThatExtendsExtends': ModelThatExtendsExtends.definition, + 'ModelWithArray': ModelWithArray.definition, + 'ModelWithBoolean': ModelWithBoolean.definition, + 'ModelWithCircularReference': ModelWithCircularReference.definition, + 'ModelWithDictionary': ModelWithDictionary.definition, + 'ModelWithDuplicateImports': ModelWithDuplicateImports.definition, + 'ModelWithDuplicateProperties': ModelWithDuplicateProperties.definition, + 'ModelWithEnum': ModelWithEnum.definition, + 'ModelWithEnumFromDescription': ModelWithEnumFromDescription.definition, + 'ModelWithInteger': ModelWithInteger.definition, + 'ModelWithLink': ModelWithLink.definition, + 'ModelWithNestedEnums': ModelWithNestedEnums.definition, + 'ModelWithNestedProperties': ModelWithNestedProperties.definition, + 'ModelWithProperties': ModelWithProperties.definition, + 'ModelWithReference': ModelWithReference.definition, + 'ModelWithString': ModelWithString.definition, + 'SimpleBoolean': SimpleBoolean.definition, + 'SimpleFile': SimpleFile.definition, + 'SimpleInteger': SimpleInteger.definition, + 'SimpleReference': SimpleReference.definition, + 'SimpleString': SimpleString.definition, }; -export function getSchema(schema: K) { - if (schemas.hasOwnProperty(schema)) { - return schemas[schema]; +export function getDefinition(definition: K) { + if (definitions.hasOwnProperty(definition)) { + return definitions[definition]; } return null; } @@ -2527,7 +2492,7 @@ exports[`generation v2 typescript file(./test/result/v2/typescript/models/ArrayW /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; import { ModelWithString } from '../models/ModelWithString'; /** @@ -2537,13 +2502,13 @@ export type ArrayWithArray = Array>; export namespace ArrayWithArray { - export const schema: Schema = { + export const definition: Definition = { type: 'Array', item: { type: 'Array', item: { type: 'ModelWithString', - } + }, }, }; @@ -2556,7 +2521,7 @@ exports[`generation v2 typescript file(./test/result/v2/typescript/models/ArrayW /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; /** * This is a simple array with booleans @@ -2565,7 +2530,7 @@ export type ArrayWithBooleans = Array; export namespace ArrayWithBooleans { - export const schema: Schema = { + export const definition: Definition = { type: 'Array', item: { type: 'boolean', @@ -2581,7 +2546,7 @@ exports[`generation v2 typescript file(./test/result/v2/typescript/models/ArrayW /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; /** * This is a simple array with numbers @@ -2590,7 +2555,7 @@ export type ArrayWithNumbers = Array; export namespace ArrayWithNumbers { - export const schema: Schema = { + export const definition: Definition = { type: 'Array', item: { type: 'number', @@ -2606,7 +2571,7 @@ exports[`generation v2 typescript file(./test/result/v2/typescript/models/ArrayW /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; /** * This is a simple array with properties @@ -2618,7 +2583,7 @@ export type ArrayWithProperties = Array<{ export namespace ArrayWithProperties { - export const schema: Schema = { + export const definition: Definition = { type: 'Array', item: { foo: { @@ -2639,7 +2604,7 @@ exports[`generation v2 typescript file(./test/result/v2/typescript/models/ArrayW /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; import { ModelWithString } from '../models/ModelWithString'; /** @@ -2649,11 +2614,11 @@ export type ArrayWithReferences = Array; export namespace ArrayWithReferences { - export const schema: Schema = { + export const definition: Definition = { type: 'Array', item: { type: 'ModelWithString', - } + }, }; }" @@ -2665,7 +2630,7 @@ exports[`generation v2 typescript file(./test/result/v2/typescript/models/ArrayW /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; /** * This is a simple array with strings @@ -2674,7 +2639,7 @@ export type ArrayWithStrings = Array; export namespace ArrayWithStrings { - export const schema: Schema = { + export const definition: Definition = { type: 'Array', item: { type: 'string', @@ -2690,7 +2655,7 @@ exports[`generation v2 typescript file(./test/result/v2/typescript/models/Dictio /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; export interface Dictionary { @@ -2704,7 +2669,7 @@ export interface Dictionary { export namespace Dictionary { - export const schema: Schema> = { + export const definition: Definition> = { type: 'Dictionary', item: { type: 'any' @@ -2721,7 +2686,7 @@ exports[`generation v2 typescript file(./test/result/v2/typescript/models/Dictio /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; import { Dictionary } from '../models/Dictionary'; import { ModelWithString } from '../models/ModelWithString'; @@ -2732,13 +2697,13 @@ export type DictionaryWithArray = Dictionary>; export namespace DictionaryWithArray { - export const schema: Schema = { + export const definition: Definition = { type: 'Dictionary', item: { type: 'Array', item: { type: 'ModelWithString', - } + }, }, }; @@ -2751,7 +2716,7 @@ exports[`generation v2 typescript file(./test/result/v2/typescript/models/Dictio /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; import { Dictionary } from '../models/Dictionary'; /** @@ -2761,7 +2726,7 @@ export type DictionaryWithDictionary = Dictionary>; export namespace DictionaryWithDictionary { - export const schema: Schema = { + export const definition: Definition = { type: 'Dictionary', item: { type: 'Dictionary', @@ -2780,7 +2745,7 @@ exports[`generation v2 typescript file(./test/result/v2/typescript/models/Dictio /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; import { Dictionary } from '../models/Dictionary'; /** @@ -2793,7 +2758,7 @@ export type DictionaryWithProperties = Dictionary<{ export namespace DictionaryWithProperties { - export const schema: Schema = { + export const definition: Definition = { type: 'Dictionary', item: { foo: { @@ -2814,7 +2779,7 @@ exports[`generation v2 typescript file(./test/result/v2/typescript/models/Dictio /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; import { Dictionary } from '../models/Dictionary'; import { ModelWithString } from '../models/ModelWithString'; @@ -2825,11 +2790,11 @@ export type DictionaryWithReference = Dictionary; export namespace DictionaryWithReference { - export const schema: Schema = { + export const definition: Definition = { type: 'Dictionary', item: { type: 'ModelWithString', - } + }, }; }" @@ -2841,7 +2806,7 @@ exports[`generation v2 typescript file(./test/result/v2/typescript/models/Dictio /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; import { Dictionary } from '../models/Dictionary'; /** @@ -2851,7 +2816,7 @@ export type DictionaryWithString = Dictionary; export namespace DictionaryWithString { - export const schema: Schema = { + export const definition: Definition = { type: 'Dictionary', item: { type: 'string', @@ -2867,7 +2832,7 @@ exports[`generation v2 typescript file(./test/result/v2/typescript/models/EnumFr /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; /** * Success=1,Warning=2,Error=3 @@ -2880,7 +2845,7 @@ export enum EnumFromDescription { export namespace EnumFromDescription { - export const schema: Schema = { + export const definition: Definition = { type: 'Enum', }; @@ -2893,7 +2858,7 @@ exports[`generation v2 typescript file(./test/result/v2/typescript/models/EnumWi /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; /** * This is a simple enum with numbers @@ -2906,7 +2871,7 @@ export enum EnumWithNumbers { export namespace EnumWithNumbers { - export const schema: Schema = { + export const definition: Definition = { type: 'Enum', }; @@ -2919,7 +2884,7 @@ exports[`generation v2 typescript file(./test/result/v2/typescript/models/EnumWi /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; /** * This is a simple enum with strings @@ -2932,7 +2897,7 @@ export enum EnumWithStrings { export namespace EnumWithStrings { - export const schema: Schema = { + export const definition: Definition = { type: 'Enum', }; @@ -2945,7 +2910,7 @@ exports[`generation v2 typescript file(./test/result/v2/typescript/models/ModelL /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; /** * This is a model that can have a template?? @@ -2956,7 +2921,7 @@ export interface ModelLink { export namespace ModelLink { - export const schema: Schema = { + export const definition: Definition = { id: { type: 'string', }, @@ -2971,7 +2936,7 @@ exports[`generation v2 typescript file(./test/result/v2/typescript/models/ModelT /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; import { ModelWithString } from '../models/ModelWithString'; /** @@ -2984,7 +2949,7 @@ export interface ModelThatExtends extends ModelWithString { export namespace ModelThatExtends { - export const schema: Schema = { + export const definition: Definition = { propExtendsA: { type: 'string', }, @@ -3002,7 +2967,7 @@ exports[`generation v2 typescript file(./test/result/v2/typescript/models/ModelT /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; import { ModelThatExtends } from '../models/ModelThatExtends'; import { ModelWithString } from '../models/ModelWithString'; @@ -3016,7 +2981,7 @@ export interface ModelThatExtendsExtends extends ModelWithString, ModelThatExten export namespace ModelThatExtendsExtends { - export const schema: Schema = { + export const definition: Definition = { propExtendsC: { type: 'string', }, @@ -3034,7 +2999,7 @@ exports[`generation v2 typescript file(./test/result/v2/typescript/models/ModelW /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; import { ModelWithString } from '../models/ModelWithString'; /** @@ -3048,12 +3013,12 @@ export interface ModelWithArray { export namespace ModelWithArray { - export const schema: Schema = { + export const definition: Definition = { prop: { type: 'Array', item: { type: 'ModelWithString', - } + }, }, propWithFile: { type: 'Array', @@ -3078,7 +3043,7 @@ exports[`generation v2 typescript file(./test/result/v2/typescript/models/ModelW /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; /** * This is a model with one boolean property @@ -3092,7 +3057,7 @@ export interface ModelWithBoolean { export namespace ModelWithBoolean { - export const schema: Schema = { + export const definition: Definition = { prop: { type: 'boolean', }, @@ -3107,7 +3072,7 @@ exports[`generation v2 typescript file(./test/result/v2/typescript/models/ModelW /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; /** * This is a model with one property containing a circular reference @@ -3118,7 +3083,7 @@ export interface ModelWithCircularReference { export namespace ModelWithCircularReference { - export const schema: Schema = { + export const definition: Definition = { prop: { type: 'ModelWithCircularReference', }, @@ -3133,7 +3098,7 @@ exports[`generation v2 typescript file(./test/result/v2/typescript/models/ModelW /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; import { Dictionary } from '../models/Dictionary'; /** @@ -3145,7 +3110,7 @@ export interface ModelWithDictionary { export namespace ModelWithDictionary { - export const schema: Schema = { + export const definition: Definition = { prop: { type: 'Dictionary', item: { @@ -3163,7 +3128,7 @@ exports[`generation v2 typescript file(./test/result/v2/typescript/models/ModelW /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; import { ModelWithString } from '../models/ModelWithString'; /** @@ -3177,7 +3142,7 @@ export interface ModelWithDuplicateImports { export namespace ModelWithDuplicateImports { - export const schema: Schema = { + export const definition: Definition = { propA: { type: 'ModelWithString', }, @@ -3198,7 +3163,7 @@ exports[`generation v2 typescript file(./test/result/v2/typescript/models/ModelW /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; import { ModelWithString } from '../models/ModelWithString'; /** @@ -3210,7 +3175,7 @@ export interface ModelWithDuplicateProperties { export namespace ModelWithDuplicateProperties { - export const schema: Schema = { + export const definition: Definition = { prop: { type: 'ModelWithString', }, @@ -3225,7 +3190,7 @@ exports[`generation v2 typescript file(./test/result/v2/typescript/models/ModelW /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; /** * This is a model with one enum @@ -3248,7 +3213,7 @@ export namespace ModelWithEnum { ERROR = 'Error', } - export const schema: Schema = { + export const definition: Definition = { test: { type: 'Enum', }, @@ -3263,7 +3228,7 @@ exports[`generation v2 typescript file(./test/result/v2/typescript/models/ModelW /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; /** * This is a model with one enum @@ -3286,7 +3251,7 @@ export namespace ModelWithEnumFromDescription { ERROR = 3, } - export const schema: Schema = { + export const definition: Definition = { test: { type: 'Enum', }, @@ -3301,7 +3266,7 @@ exports[`generation v2 typescript file(./test/result/v2/typescript/models/ModelW /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; /** * This is a model with one number property @@ -3315,7 +3280,7 @@ export interface ModelWithInteger { export namespace ModelWithInteger { - export const schema: Schema = { + export const definition: Definition = { prop: { type: 'number', }, @@ -3330,7 +3295,7 @@ exports[`generation v2 typescript file(./test/result/v2/typescript/models/ModelW /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; import { ModelLink } from '../models/ModelLink'; import { ModelWithString } from '../models/ModelWithString'; @@ -3343,7 +3308,7 @@ export interface ModelWithLink { export namespace ModelWithLink { - export const schema: Schema = { + export const definition: Definition = { prop: { type: 'ModelLink', }, @@ -3358,7 +3323,7 @@ exports[`generation v2 typescript file(./test/result/v2/typescript/models/ModelW /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; import { Dictionary } from '../models/Dictionary'; /** @@ -3373,7 +3338,7 @@ export interface ModelWithNestedEnums { export namespace ModelWithNestedEnums { - export const schema: Schema = { + export const definition: Definition = { arrayWithDescription: { type: 'Array', item: { @@ -3409,7 +3374,7 @@ exports[`generation v2 typescript file(./test/result/v2/typescript/models/ModelW /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; /** * This is a model with one nested property @@ -3424,7 +3389,7 @@ export interface ModelWithNestedProperties { export namespace ModelWithNestedProperties { - export const schema: Schema = { + export const definition: Definition = { first: { second: { third: { @@ -3449,7 +3414,7 @@ exports[`generation v2 typescript file(./test/result/v2/typescript/models/ModelW /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; import { ModelWithString } from '../models/ModelWithString'; /** @@ -3466,7 +3431,7 @@ export interface ModelWithProperties { export namespace ModelWithProperties { - export const schema: Schema = { + export const definition: Definition = { boolean: { type: 'boolean', }, @@ -3499,7 +3464,7 @@ exports[`generation v2 typescript file(./test/result/v2/typescript/models/ModelW /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; import { ModelWithString } from '../models/ModelWithString'; /** @@ -3511,7 +3476,7 @@ export interface ModelWithReference { export namespace ModelWithReference { - export const schema: Schema = { + export const definition: Definition = { prop: { type: 'ModelWithString', }, @@ -3526,7 +3491,7 @@ exports[`generation v2 typescript file(./test/result/v2/typescript/models/ModelW /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; /** * This is a model with one string property @@ -3540,7 +3505,7 @@ export interface ModelWithString { export namespace ModelWithString { - export const schema: Schema = { + export const definition: Definition = { prop: { type: 'string', }, @@ -3555,7 +3520,7 @@ exports[`generation v2 typescript file(./test/result/v2/typescript/models/Simple /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; /** * This is a simple boolean @@ -3564,7 +3529,7 @@ export type SimpleBoolean = boolean; export namespace SimpleBoolean { - export const schema: Schema = { + export const definition: Definition = { type: 'boolean', }; @@ -3577,7 +3542,7 @@ exports[`generation v2 typescript file(./test/result/v2/typescript/models/Simple /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; /** * This is a simple file @@ -3586,7 +3551,7 @@ export type SimpleFile = File; export namespace SimpleFile { - export const schema: Schema = { + export const definition: Definition = { type: 'File', }; @@ -3599,7 +3564,7 @@ exports[`generation v2 typescript file(./test/result/v2/typescript/models/Simple /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; /** * This is a simple number @@ -3608,7 +3573,7 @@ export type SimpleInteger = number; export namespace SimpleInteger { - export const schema: Schema = { + export const definition: Definition = { type: 'number', }; @@ -3621,7 +3586,7 @@ exports[`generation v2 typescript file(./test/result/v2/typescript/models/Simple /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; import { ModelWithString } from '../models/ModelWithString'; /** @@ -3631,7 +3596,7 @@ export type SimpleReference = ModelWithString; export namespace SimpleReference { - export const schema: Schema = { + export const definition: Definition = { type: 'ModelWithString', }; @@ -3644,7 +3609,7 @@ exports[`generation v2 typescript file(./test/result/v2/typescript/models/Simple /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; /** * This is a simple string @@ -3653,7 +3618,7 @@ export type SimpleString = string; export namespace SimpleString { - export const schema: Schema = { + export const definition: Definition = { type: 'string', }; @@ -4543,50 +4508,50 @@ export { ResponseService } from './services/ResponseService'; export { SimpleService } from './services/SimpleService'; export { TypesService } from './services/TypesService'; -const schemas = { - 'ArrayWithArray': ArrayWithArray.schema, - 'ArrayWithBooleans': ArrayWithBooleans.schema, - 'ArrayWithNumbers': ArrayWithNumbers.schema, - 'ArrayWithProperties': ArrayWithProperties.schema, - 'ArrayWithReferences': ArrayWithReferences.schema, - 'ArrayWithStrings': ArrayWithStrings.schema, - 'Dictionary': Dictionary.schema, - 'DictionaryWithArray': DictionaryWithArray.schema, - 'DictionaryWithDictionary': DictionaryWithDictionary.schema, - 'DictionaryWithProperties': DictionaryWithProperties.schema, - 'DictionaryWithReference': DictionaryWithReference.schema, - 'DictionaryWithString': DictionaryWithString.schema, - 'EnumFromDescription': EnumFromDescription.schema, - 'EnumWithNumbers': EnumWithNumbers.schema, - 'EnumWithStrings': EnumWithStrings.schema, - 'ModelLink': ModelLink.schema, - 'ModelThatExtends': ModelThatExtends.schema, - 'ModelThatExtendsExtends': ModelThatExtendsExtends.schema, - 'ModelWithArray': ModelWithArray.schema, - 'ModelWithBoolean': ModelWithBoolean.schema, - 'ModelWithCircularReference': ModelWithCircularReference.schema, - 'ModelWithDictionary': ModelWithDictionary.schema, - 'ModelWithDuplicateImports': ModelWithDuplicateImports.schema, - 'ModelWithDuplicateProperties': ModelWithDuplicateProperties.schema, - 'ModelWithEnum': ModelWithEnum.schema, - 'ModelWithEnumFromDescription': ModelWithEnumFromDescription.schema, - 'ModelWithInteger': ModelWithInteger.schema, - 'ModelWithLink': ModelWithLink.schema, - 'ModelWithNestedEnums': ModelWithNestedEnums.schema, - 'ModelWithNestedProperties': ModelWithNestedProperties.schema, - 'ModelWithProperties': ModelWithProperties.schema, - 'ModelWithReference': ModelWithReference.schema, - 'ModelWithString': ModelWithString.schema, - 'SimpleBoolean': SimpleBoolean.schema, - 'SimpleFile': SimpleFile.schema, - 'SimpleInteger': SimpleInteger.schema, - 'SimpleReference': SimpleReference.schema, - 'SimpleString': SimpleString.schema, +const definitions = { + 'ArrayWithArray': ArrayWithArray.definition, + 'ArrayWithBooleans': ArrayWithBooleans.definition, + 'ArrayWithNumbers': ArrayWithNumbers.definition, + 'ArrayWithProperties': ArrayWithProperties.definition, + 'ArrayWithReferences': ArrayWithReferences.definition, + 'ArrayWithStrings': ArrayWithStrings.definition, + 'Dictionary': Dictionary.definition, + 'DictionaryWithArray': DictionaryWithArray.definition, + 'DictionaryWithDictionary': DictionaryWithDictionary.definition, + 'DictionaryWithProperties': DictionaryWithProperties.definition, + 'DictionaryWithReference': DictionaryWithReference.definition, + 'DictionaryWithString': DictionaryWithString.definition, + 'EnumFromDescription': EnumFromDescription.definition, + 'EnumWithNumbers': EnumWithNumbers.definition, + 'EnumWithStrings': EnumWithStrings.definition, + 'ModelLink': ModelLink.definition, + 'ModelThatExtends': ModelThatExtends.definition, + 'ModelThatExtendsExtends': ModelThatExtendsExtends.definition, + 'ModelWithArray': ModelWithArray.definition, + 'ModelWithBoolean': ModelWithBoolean.definition, + 'ModelWithCircularReference': ModelWithCircularReference.definition, + 'ModelWithDictionary': ModelWithDictionary.definition, + 'ModelWithDuplicateImports': ModelWithDuplicateImports.definition, + 'ModelWithDuplicateProperties': ModelWithDuplicateProperties.definition, + 'ModelWithEnum': ModelWithEnum.definition, + 'ModelWithEnumFromDescription': ModelWithEnumFromDescription.definition, + 'ModelWithInteger': ModelWithInteger.definition, + 'ModelWithLink': ModelWithLink.definition, + 'ModelWithNestedEnums': ModelWithNestedEnums.definition, + 'ModelWithNestedProperties': ModelWithNestedProperties.definition, + 'ModelWithProperties': ModelWithProperties.definition, + 'ModelWithReference': ModelWithReference.definition, + 'ModelWithString': ModelWithString.definition, + 'SimpleBoolean': SimpleBoolean.definition, + 'SimpleFile': SimpleFile.definition, + 'SimpleInteger': SimpleInteger.definition, + 'SimpleReference': SimpleReference.definition, + 'SimpleString': SimpleString.definition, }; -export function getSchema(schema) { - if (schemas.hasOwnProperty(schema)) { - return schemas[schema]; +export function getDefinition(definition) { + if (definitions.hasOwnProperty(definition)) { + return definitions[definition]; } return null; } @@ -4606,11 +4571,13 @@ exports[`generation v3 javascript file(./test/result/v3/javascript/models/ArrayW export let ArrayWithArray; (function (ArrayWithArray) { - ArrayWithArray.schema = { + ArrayWithArray.definition = { type: 'Array', item: { type: 'Array', - item: 'ModelWithString', + item: { + type: 'ModelWithString', + }, }, }; @@ -4630,7 +4597,7 @@ exports[`generation v3 javascript file(./test/result/v3/javascript/models/ArrayW export let ArrayWithBooleans; (function (ArrayWithBooleans) { - ArrayWithBooleans.schema = { + ArrayWithBooleans.definition = { type: 'Array', item: { type: 'boolean', @@ -4653,7 +4620,7 @@ exports[`generation v3 javascript file(./test/result/v3/javascript/models/ArrayW export let ArrayWithNumbers; (function (ArrayWithNumbers) { - ArrayWithNumbers.schema = { + ArrayWithNumbers.definition = { type: 'Array', item: { type: 'number', @@ -4676,7 +4643,7 @@ exports[`generation v3 javascript file(./test/result/v3/javascript/models/ArrayW export let ArrayWithProperties; (function (ArrayWithProperties) { - ArrayWithProperties.schema = { + ArrayWithProperties.definition = { type: 'Array', item: { foo: { @@ -4704,9 +4671,11 @@ exports[`generation v3 javascript file(./test/result/v3/javascript/models/ArrayW export let ArrayWithReferences; (function (ArrayWithReferences) { - ArrayWithReferences.schema = { + ArrayWithReferences.definition = { type: 'Array', - item: 'ModelWithString', + item: { + type: 'ModelWithString', + }, }; })(ArrayWithReferences || (ArrayWithReferences = {}));" @@ -4725,7 +4694,7 @@ exports[`generation v3 javascript file(./test/result/v3/javascript/models/ArrayW export let ArrayWithStrings; (function (ArrayWithStrings) { - ArrayWithStrings.schema = { + ArrayWithStrings.definition = { type: 'Array', item: { type: 'string', @@ -4745,7 +4714,7 @@ exports[`generation v3 javascript file(./test/result/v3/javascript/models/Dictio export let Dictionary; (function (Dictionary) { - Dictionary.schema = { + Dictionary.definition = { type: 'Dictionary', item: { type: 'any' @@ -4769,11 +4738,13 @@ exports[`generation v3 javascript file(./test/result/v3/javascript/models/Dictio export let DictionaryWithArray; (function (DictionaryWithArray) { - DictionaryWithArray.schema = { + DictionaryWithArray.definition = { type: 'Dictionary', item: { type: 'Array', - item: 'ModelWithString', + item: { + type: 'ModelWithString', + }, }, }; @@ -4793,7 +4764,7 @@ exports[`generation v3 javascript file(./test/result/v3/javascript/models/Dictio export let DictionaryWithDictionary; (function (DictionaryWithDictionary) { - DictionaryWithDictionary.schema = { + DictionaryWithDictionary.definition = { type: 'Dictionary', item: { type: 'Dictionary', @@ -4819,7 +4790,7 @@ exports[`generation v3 javascript file(./test/result/v3/javascript/models/Dictio export let DictionaryWithProperties; (function (DictionaryWithProperties) { - DictionaryWithProperties.schema = { + DictionaryWithProperties.definition = { type: 'Dictionary', item: { foo: { @@ -4847,9 +4818,11 @@ exports[`generation v3 javascript file(./test/result/v3/javascript/models/Dictio export let DictionaryWithReference; (function (DictionaryWithReference) { - DictionaryWithReference.schema = { + DictionaryWithReference.definition = { type: 'Dictionary', - item: 'ModelWithString', + item: { + type: 'ModelWithString', + }, }; })(DictionaryWithReference || (DictionaryWithReference = {}));" @@ -4868,7 +4841,7 @@ exports[`generation v3 javascript file(./test/result/v3/javascript/models/Dictio export let DictionaryWithString; (function (DictionaryWithString) { - DictionaryWithString.schema = { + DictionaryWithString.definition = { type: 'Dictionary', item: { type: 'string', @@ -4895,13 +4868,8 @@ export let EnumFromDescription; EnumFromDescription.SUCCESS = 1; EnumFromDescription.WARNING = 2; - EnumFromDescription.schema = { + EnumFromDescription.definition = { type: 'Enum', - enums: [ - 3, - 1, - 2, - ], }; })(EnumFromDescription || (EnumFromDescription = {}));" @@ -4924,13 +4892,8 @@ export let EnumWithNumbers; EnumWithNumbers.NUM_2 = 2; EnumWithNumbers.NUM_3 = 3; - EnumWithNumbers.schema = { + EnumWithNumbers.definition = { type: 'Enum', - enums: [ - 1, - 2, - 3, - ], }; })(EnumWithNumbers || (EnumWithNumbers = {}));" @@ -4953,13 +4916,8 @@ export let EnumWithStrings; EnumWithStrings.SUCCESS = 'Success'; EnumWithStrings.WARNING = 'Warning'; - EnumWithStrings.schema = { + EnumWithStrings.definition = { type: 'Enum', - enums: [ - 'Error', - 'Success', - 'Warning', - ], }; })(EnumWithStrings || (EnumWithStrings = {}));" @@ -4978,7 +4936,7 @@ exports[`generation v3 javascript file(./test/result/v3/javascript/models/ModelL export let ModelLink; (function (ModelLink) { - ModelLink.schema = { + ModelLink.definition = { id: { type: 'string', }, @@ -5000,7 +4958,7 @@ exports[`generation v3 javascript file(./test/result/v3/javascript/models/ModelT export let ModelThatExtends; (function (ModelThatExtends) { - ModelThatExtends.schema = { + ModelThatExtends.definition = { propExtendsA: { type: 'string', }, @@ -5025,7 +4983,7 @@ exports[`generation v3 javascript file(./test/result/v3/javascript/models/ModelT export let ModelThatExtendsExtends; (function (ModelThatExtendsExtends) { - ModelThatExtendsExtends.schema = { + ModelThatExtendsExtends.definition = { propExtendsC: { type: 'string', }, @@ -5050,10 +5008,12 @@ exports[`generation v3 javascript file(./test/result/v3/javascript/models/ModelW export let ModelWithArray; (function (ModelWithArray) { - ModelWithArray.schema = { + ModelWithArray.definition = { prop: { type: 'Array', - item: 'ModelWithString', + item: { + type: 'ModelWithString', + }, }, propWithFile: { type: 'Array', @@ -5085,7 +5045,7 @@ exports[`generation v3 javascript file(./test/result/v3/javascript/models/ModelW export let ModelWithBoolean; (function (ModelWithBoolean) { - ModelWithBoolean.schema = { + ModelWithBoolean.definition = { prop: { type: 'boolean', }, @@ -5107,7 +5067,7 @@ exports[`generation v3 javascript file(./test/result/v3/javascript/models/ModelW export let ModelWithCircularReference; (function (ModelWithCircularReference) { - ModelWithCircularReference.schema = { + ModelWithCircularReference.definition = { prop: { type: 'ModelWithCircularReference', }, @@ -5129,7 +5089,7 @@ exports[`generation v3 javascript file(./test/result/v3/javascript/models/ModelW export let ModelWithDictionary; (function (ModelWithDictionary) { - ModelWithDictionary.schema = { + ModelWithDictionary.definition = { prop: { type: 'Dictionary', item: { @@ -5154,7 +5114,7 @@ exports[`generation v3 javascript file(./test/result/v3/javascript/models/ModelW export let ModelWithDuplicateImports; (function (ModelWithDuplicateImports) { - ModelWithDuplicateImports.schema = { + ModelWithDuplicateImports.definition = { propA: { type: 'ModelWithString', }, @@ -5182,7 +5142,7 @@ exports[`generation v3 javascript file(./test/result/v3/javascript/models/ModelW export let ModelWithDuplicateProperties; (function (ModelWithDuplicateProperties) { - ModelWithDuplicateProperties.schema = { + ModelWithDuplicateProperties.definition = { prop: { type: 'ModelWithString', }, @@ -5213,14 +5173,9 @@ export let ModelWithEnum; ERROR: 'Error', }; - ModelWithEnum.schema = { + ModelWithEnum.definition = { Test: { type: 'Enum', - enums: [ - 'Success', - 'Warning', - 'Error', - ], }, }; @@ -5249,14 +5204,9 @@ export let ModelWithEnumFromDescription; ERROR: 3, }; - ModelWithEnumFromDescription.schema = { + ModelWithEnumFromDescription.definition = { Test: { type: 'Enum', - enums: [ - 1, - 2, - 3, - ], }, }; @@ -5276,7 +5226,7 @@ exports[`generation v3 javascript file(./test/result/v3/javascript/models/ModelW export let ModelWithInteger; (function (ModelWithInteger) { - ModelWithInteger.schema = { + ModelWithInteger.definition = { prop: { type: 'number', }, @@ -5298,7 +5248,7 @@ exports[`generation v3 javascript file(./test/result/v3/javascript/models/ModelW export let ModelWithLink; (function (ModelWithLink) { - ModelWithLink.schema = { + ModelWithLink.definition = { prop: { type: 'ModelLink', }, @@ -5320,49 +5270,29 @@ exports[`generation v3 javascript file(./test/result/v3/javascript/models/ModelW export let ModelWithNestedEnums; (function (ModelWithNestedEnums) { - ModelWithNestedEnums.schema = { + ModelWithNestedEnums.definition = { arrayWithDescription: { type: 'Array', item: { type: 'Enum', - enums: [ - 1, - 2, - 3, - ], }, }, arrayWithEnum: { type: 'Array', item: { type: 'Enum', - enums: [ - 'Success', - 'Warning', - 'Error', - ], }, }, dictionaryWithEnum: { type: 'Dictionary', item: { type: 'Enum', - enums: [ - 'Success', - 'Warning', - 'Error', - ], }, }, dictionaryWithEnumFromDescription: { type: 'Dictionary', item: { type: 'Enum', - enums: [ - 1, - 2, - 3, - ], }, }, }; @@ -5383,7 +5313,7 @@ exports[`generation v3 javascript file(./test/result/v3/javascript/models/ModelW export let ModelWithNestedProperties; (function (ModelWithNestedProperties) { - ModelWithNestedProperties.schema = { + ModelWithNestedProperties.definition = { first: { second: { third: { @@ -5418,7 +5348,7 @@ exports[`generation v3 javascript file(./test/result/v3/javascript/models/ModelW export let ModelWithProperties; (function (ModelWithProperties) { - ModelWithProperties.schema = { + ModelWithProperties.definition = { boolean: { type: 'boolean', }, @@ -5463,7 +5393,7 @@ exports[`generation v3 javascript file(./test/result/v3/javascript/models/ModelW export let ModelWithReference; (function (ModelWithReference) { - ModelWithReference.schema = { + ModelWithReference.definition = { prop: { type: 'ModelWithString', }, @@ -5485,7 +5415,7 @@ exports[`generation v3 javascript file(./test/result/v3/javascript/models/ModelW export let ModelWithString; (function (ModelWithString) { - ModelWithString.schema = { + ModelWithString.definition = { prop: { type: 'string', }, @@ -5507,7 +5437,7 @@ exports[`generation v3 javascript file(./test/result/v3/javascript/models/Simple export let SimpleBoolean; (function (SimpleBoolean) { - SimpleBoolean.schema = { + SimpleBoolean.definition = { type: 'boolean', }; @@ -5527,7 +5457,7 @@ exports[`generation v3 javascript file(./test/result/v3/javascript/models/Simple export let SimpleFile; (function (SimpleFile) { - SimpleFile.schema = { + SimpleFile.definition = { type: 'File', }; @@ -5547,7 +5477,7 @@ exports[`generation v3 javascript file(./test/result/v3/javascript/models/Simple export let SimpleInteger; (function (SimpleInteger) { - SimpleInteger.schema = { + SimpleInteger.definition = { type: 'number', }; @@ -5567,7 +5497,7 @@ exports[`generation v3 javascript file(./test/result/v3/javascript/models/Simple export let SimpleReference; (function (SimpleReference) { - SimpleReference.schema = { + SimpleReference.definition = { type: 'ModelWithString', }; @@ -5587,7 +5517,7 @@ exports[`generation v3 javascript file(./test/result/v3/javascript/models/Simple export let SimpleString; (function (SimpleString) { - SimpleString.schema = { + SimpleString.definition = { type: 'string', }; @@ -6105,6 +6035,60 @@ export function catchGenericError(result: Result): void { " `; +exports[`generation v3 typescript file(./test/result/v3/typescript/core/Definition.ts): ./test/result/v3/typescript/core/Definition.ts 1`] = ` +"/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ +/* prettier-ignore */ + +import { Dictionary } from \\"../models/Dictionary\\"; + +type FieldDefinition = { + readonly type?: string; + readonly isReadOnly?: boolean; + readonly isRequired?: boolean; + readonly isNullable?: boolean; + readonly format?: 'int32' | 'int64' | 'float' | 'double' | 'string' | 'boolean' | 'byte' | 'binary' | 'date' | 'date-time' | 'password'; + readonly maximum?: number; + readonly exclusiveMaximum?: boolean; + readonly minimum?: number; + readonly exclusiveMinimum?: boolean; + readonly multipleOf?: number; + readonly maxLength?: number; + readonly minLength?: number; + readonly pattern?: string; + readonly maxItems?: number; + readonly minItems?: number; + readonly uniqueItems?: boolean; + readonly maxProperties?: number; + readonly minProperties?: number; +} + +type ArrayDefinition = FieldDefinition & { + readonly item: Definition; +} + +type DictionaryDefinition = FieldDefinition & { + readonly item: Definition; +} + +type ObjectDefinition = FieldDefinition & { + readonly [K in keyof T]: Definition; +} + +export type Definition = + T extends string ? FieldDefinition : + T extends number ? FieldDefinition : + T extends boolean ? FieldDefinition : + T extends File ? FieldDefinition : + T extends Blob ? FieldDefinition : + T extends Array ? ArrayDefinition : + T extends Dictionary ? DictionaryDefinition : + T extends Object ? ObjectDefinition : + FieldDefinition +" +`; + exports[`generation v3 typescript file(./test/result/v3/typescript/core/OpenAPI.ts): ./test/result/v3/typescript/core/OpenAPI.ts 1`] = ` "/* istanbul ignore file */ /* tslint:disable */ @@ -6153,60 +6137,6 @@ export interface Result { " `; -exports[`generation v3 typescript file(./test/result/v3/typescript/core/Schema.ts): ./test/result/v3/typescript/core/Schema.ts 1`] = ` -"/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ -/* prettier-ignore */ - -import { Dictionary } from \\"../models/Dictionary\\"; - -type FieldSchema = { - readonly type?: string; - readonly isReadOnly?: boolean; - readonly isRequired?: boolean; - readonly isNullable?: boolean; - readonly format?: 'int32' | 'int64' | 'float' | 'double' | 'string' | 'boolean' | 'byte' | 'binary' | 'date' | 'date-time' | 'password'; - readonly maximum?: number; - readonly exclusiveMaximum?: boolean; - readonly minimum?: number; - readonly exclusiveMinimum?: boolean; - readonly multipleOf?: number; - readonly maxLength?: number; - readonly minLength?: number; - readonly pattern?: string; - readonly maxItems?: number; - readonly minItems?: number; - readonly uniqueItems?: boolean; - readonly maxProperties?: number; - readonly minProperties?: number; -} - -type ArraySchema = FieldSchema & { - readonly item: Schema; -} - -type DictionarySchema = FieldSchema & { - readonly item: Schema; -} - -type ObjectSchema = FieldSchema & { - readonly [K in keyof T]: Schema; -} - -export type Schema = - T extends string ? FieldSchema : - T extends number ? FieldSchema : - T extends boolean ? FieldSchema : - T extends File ? FieldSchema : - T extends Blob ? FieldSchema : - T extends Array ? ArraySchema : - T extends Dictionary ? DictionarySchema : - T extends Object ? ObjectSchema : - FieldSchema -" -`; - exports[`generation v3 typescript file(./test/result/v3/typescript/core/getFormData.ts): ./test/result/v3/typescript/core/getFormData.ts 1`] = ` "/* istanbul ignore file */ /* tslint:disable */ @@ -6506,9 +6436,9 @@ exports[`generation v3 typescript file(./test/result/v3/typescript/index.ts): ./ /* prettier-ignore */ export { ApiError } from './core/ApiError'; +export { Definition } from './core/Definition'; export { isSuccess } from './core/isSuccess'; export { OpenAPI } from './core/OpenAPI'; -import { Schema } from './core/Schema'; import { ArrayWithArray } from './models/ArrayWithArray'; import { ArrayWithBooleans } from './models/ArrayWithBooleans'; @@ -6596,50 +6526,50 @@ export { ResponseService } from './services/ResponseService'; export { SimpleService } from './services/SimpleService'; export { TypesService } from './services/TypesService'; -const schemas = { - 'ArrayWithArray': ArrayWithArray.schema, - 'ArrayWithBooleans': ArrayWithBooleans.schema, - 'ArrayWithNumbers': ArrayWithNumbers.schema, - 'ArrayWithProperties': ArrayWithProperties.schema, - 'ArrayWithReferences': ArrayWithReferences.schema, - 'ArrayWithStrings': ArrayWithStrings.schema, - 'Dictionary': Dictionary.schema, - 'DictionaryWithArray': DictionaryWithArray.schema, - 'DictionaryWithDictionary': DictionaryWithDictionary.schema, - 'DictionaryWithProperties': DictionaryWithProperties.schema, - 'DictionaryWithReference': DictionaryWithReference.schema, - 'DictionaryWithString': DictionaryWithString.schema, - 'EnumFromDescription': EnumFromDescription.schema, - 'EnumWithNumbers': EnumWithNumbers.schema, - 'EnumWithStrings': EnumWithStrings.schema, - 'ModelLink': ModelLink.schema, - 'ModelThatExtends': ModelThatExtends.schema, - 'ModelThatExtendsExtends': ModelThatExtendsExtends.schema, - 'ModelWithArray': ModelWithArray.schema, - 'ModelWithBoolean': ModelWithBoolean.schema, - 'ModelWithCircularReference': ModelWithCircularReference.schema, - 'ModelWithDictionary': ModelWithDictionary.schema, - 'ModelWithDuplicateImports': ModelWithDuplicateImports.schema, - 'ModelWithDuplicateProperties': ModelWithDuplicateProperties.schema, - 'ModelWithEnum': ModelWithEnum.schema, - 'ModelWithEnumFromDescription': ModelWithEnumFromDescription.schema, - 'ModelWithInteger': ModelWithInteger.schema, - 'ModelWithLink': ModelWithLink.schema, - 'ModelWithNestedEnums': ModelWithNestedEnums.schema, - 'ModelWithNestedProperties': ModelWithNestedProperties.schema, - 'ModelWithProperties': ModelWithProperties.schema, - 'ModelWithReference': ModelWithReference.schema, - 'ModelWithString': ModelWithString.schema, - 'SimpleBoolean': SimpleBoolean.schema, - 'SimpleFile': SimpleFile.schema, - 'SimpleInteger': SimpleInteger.schema, - 'SimpleReference': SimpleReference.schema, - 'SimpleString': SimpleString.schema, +const definitions = { + 'ArrayWithArray': ArrayWithArray.definition, + 'ArrayWithBooleans': ArrayWithBooleans.definition, + 'ArrayWithNumbers': ArrayWithNumbers.definition, + 'ArrayWithProperties': ArrayWithProperties.definition, + 'ArrayWithReferences': ArrayWithReferences.definition, + 'ArrayWithStrings': ArrayWithStrings.definition, + 'Dictionary': Dictionary.definition, + 'DictionaryWithArray': DictionaryWithArray.definition, + 'DictionaryWithDictionary': DictionaryWithDictionary.definition, + 'DictionaryWithProperties': DictionaryWithProperties.definition, + 'DictionaryWithReference': DictionaryWithReference.definition, + 'DictionaryWithString': DictionaryWithString.definition, + 'EnumFromDescription': EnumFromDescription.definition, + 'EnumWithNumbers': EnumWithNumbers.definition, + 'EnumWithStrings': EnumWithStrings.definition, + 'ModelLink': ModelLink.definition, + 'ModelThatExtends': ModelThatExtends.definition, + 'ModelThatExtendsExtends': ModelThatExtendsExtends.definition, + 'ModelWithArray': ModelWithArray.definition, + 'ModelWithBoolean': ModelWithBoolean.definition, + 'ModelWithCircularReference': ModelWithCircularReference.definition, + 'ModelWithDictionary': ModelWithDictionary.definition, + 'ModelWithDuplicateImports': ModelWithDuplicateImports.definition, + 'ModelWithDuplicateProperties': ModelWithDuplicateProperties.definition, + 'ModelWithEnum': ModelWithEnum.definition, + 'ModelWithEnumFromDescription': ModelWithEnumFromDescription.definition, + 'ModelWithInteger': ModelWithInteger.definition, + 'ModelWithLink': ModelWithLink.definition, + 'ModelWithNestedEnums': ModelWithNestedEnums.definition, + 'ModelWithNestedProperties': ModelWithNestedProperties.definition, + 'ModelWithProperties': ModelWithProperties.definition, + 'ModelWithReference': ModelWithReference.definition, + 'ModelWithString': ModelWithString.definition, + 'SimpleBoolean': SimpleBoolean.definition, + 'SimpleFile': SimpleFile.definition, + 'SimpleInteger': SimpleInteger.definition, + 'SimpleReference': SimpleReference.definition, + 'SimpleString': SimpleString.definition, }; -export function getSchema(schema: K) { - if (schemas.hasOwnProperty(schema)) { - return schemas[schema]; +export function getDefinition(definition: K) { + if (definitions.hasOwnProperty(definition)) { + return definitions[definition]; } return null; } @@ -6653,7 +6583,7 @@ exports[`generation v3 typescript file(./test/result/v3/typescript/models/ArrayW /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; import { ModelWithString } from '../models/ModelWithString'; /** @@ -6663,13 +6593,13 @@ export type ArrayWithArray = Array>; export namespace ArrayWithArray { - export const schema: Schema = { + export const definition: Definition = { type: 'Array', item: { type: 'Array', item: { type: 'ModelWithString', - } + }, }, }; @@ -6682,7 +6612,7 @@ exports[`generation v3 typescript file(./test/result/v3/typescript/models/ArrayW /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; /** * This is a simple array with booleans @@ -6691,7 +6621,7 @@ export type ArrayWithBooleans = Array; export namespace ArrayWithBooleans { - export const schema: Schema = { + export const definition: Definition = { type: 'Array', item: { type: 'boolean', @@ -6707,7 +6637,7 @@ exports[`generation v3 typescript file(./test/result/v3/typescript/models/ArrayW /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; /** * This is a simple array with numbers @@ -6716,7 +6646,7 @@ export type ArrayWithNumbers = Array; export namespace ArrayWithNumbers { - export const schema: Schema = { + export const definition: Definition = { type: 'Array', item: { type: 'number', @@ -6732,7 +6662,7 @@ exports[`generation v3 typescript file(./test/result/v3/typescript/models/ArrayW /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; /** * This is a simple array with properties @@ -6744,7 +6674,7 @@ export type ArrayWithProperties = Array<{ export namespace ArrayWithProperties { - export const schema: Schema = { + export const definition: Definition = { type: 'Array', item: { foo: { @@ -6765,7 +6695,7 @@ exports[`generation v3 typescript file(./test/result/v3/typescript/models/ArrayW /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; import { ModelWithString } from '../models/ModelWithString'; /** @@ -6775,11 +6705,11 @@ export type ArrayWithReferences = Array; export namespace ArrayWithReferences { - export const schema: Schema = { + export const definition: Definition = { type: 'Array', item: { type: 'ModelWithString', - } + }, }; }" @@ -6791,7 +6721,7 @@ exports[`generation v3 typescript file(./test/result/v3/typescript/models/ArrayW /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; /** * This is a simple array with strings @@ -6800,7 +6730,7 @@ export type ArrayWithStrings = Array; export namespace ArrayWithStrings { - export const schema: Schema = { + export const definition: Definition = { type: 'Array', item: { type: 'string', @@ -6816,7 +6746,7 @@ exports[`generation v3 typescript file(./test/result/v3/typescript/models/Dictio /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; export interface Dictionary { @@ -6830,7 +6760,7 @@ export interface Dictionary { export namespace Dictionary { - export const schema: Schema> = { + export const definition: Definition> = { type: 'Dictionary', item: { type: 'any' @@ -6847,7 +6777,7 @@ exports[`generation v3 typescript file(./test/result/v3/typescript/models/Dictio /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; import { Dictionary } from '../models/Dictionary'; import { ModelWithString } from '../models/ModelWithString'; @@ -6858,13 +6788,13 @@ export type DictionaryWithArray = Dictionary>; export namespace DictionaryWithArray { - export const schema: Schema = { + export const definition: Definition = { type: 'Dictionary', item: { type: 'Array', item: { type: 'ModelWithString', - } + }, }, }; @@ -6877,7 +6807,7 @@ exports[`generation v3 typescript file(./test/result/v3/typescript/models/Dictio /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; import { Dictionary } from '../models/Dictionary'; /** @@ -6887,7 +6817,7 @@ export type DictionaryWithDictionary = Dictionary>; export namespace DictionaryWithDictionary { - export const schema: Schema = { + export const definition: Definition = { type: 'Dictionary', item: { type: 'Dictionary', @@ -6906,7 +6836,7 @@ exports[`generation v3 typescript file(./test/result/v3/typescript/models/Dictio /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; import { Dictionary } from '../models/Dictionary'; /** @@ -6919,7 +6849,7 @@ export type DictionaryWithProperties = Dictionary<{ export namespace DictionaryWithProperties { - export const schema: Schema = { + export const definition: Definition = { type: 'Dictionary', item: { foo: { @@ -6940,7 +6870,7 @@ exports[`generation v3 typescript file(./test/result/v3/typescript/models/Dictio /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; import { Dictionary } from '../models/Dictionary'; import { ModelWithString } from '../models/ModelWithString'; @@ -6951,11 +6881,11 @@ export type DictionaryWithReference = Dictionary; export namespace DictionaryWithReference { - export const schema: Schema = { + export const definition: Definition = { type: 'Dictionary', item: { type: 'ModelWithString', - } + }, }; }" @@ -6967,7 +6897,7 @@ exports[`generation v3 typescript file(./test/result/v3/typescript/models/Dictio /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; import { Dictionary } from '../models/Dictionary'; /** @@ -6977,7 +6907,7 @@ export type DictionaryWithString = Dictionary; export namespace DictionaryWithString { - export const schema: Schema = { + export const definition: Definition = { type: 'Dictionary', item: { type: 'string', @@ -6993,7 +6923,7 @@ exports[`generation v3 typescript file(./test/result/v3/typescript/models/EnumFr /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; /** * Success=1,Warning=2,Error=3 @@ -7006,7 +6936,7 @@ export enum EnumFromDescription { export namespace EnumFromDescription { - export const schema: Schema = { + export const definition: Definition = { type: 'Enum', }; @@ -7019,7 +6949,7 @@ exports[`generation v3 typescript file(./test/result/v3/typescript/models/EnumWi /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; /** * This is a simple enum with numbers @@ -7032,7 +6962,7 @@ export enum EnumWithNumbers { export namespace EnumWithNumbers { - export const schema: Schema = { + export const definition: Definition = { type: 'Enum', }; @@ -7045,7 +6975,7 @@ exports[`generation v3 typescript file(./test/result/v3/typescript/models/EnumWi /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; /** * This is a simple enum with strings @@ -7058,7 +6988,7 @@ export enum EnumWithStrings { export namespace EnumWithStrings { - export const schema: Schema = { + export const definition: Definition = { type: 'Enum', }; @@ -7071,7 +7001,7 @@ exports[`generation v3 typescript file(./test/result/v3/typescript/models/ModelL /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; /** * This is a model that can have a template?? @@ -7082,7 +7012,7 @@ export interface ModelLink { export namespace ModelLink { - export const schema: Schema = { + export const definition: Definition = { id: { type: 'string', }, @@ -7097,7 +7027,7 @@ exports[`generation v3 typescript file(./test/result/v3/typescript/models/ModelT /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; import { ModelWithString } from '../models/ModelWithString'; /** @@ -7110,7 +7040,7 @@ export interface ModelThatExtends extends ModelWithString { export namespace ModelThatExtends { - export const schema: Schema = { + export const definition: Definition = { propExtendsA: { type: 'string', }, @@ -7128,7 +7058,7 @@ exports[`generation v3 typescript file(./test/result/v3/typescript/models/ModelT /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; import { ModelThatExtends } from '../models/ModelThatExtends'; import { ModelWithString } from '../models/ModelWithString'; @@ -7142,7 +7072,7 @@ export interface ModelThatExtendsExtends extends ModelWithString, ModelThatExten export namespace ModelThatExtendsExtends { - export const schema: Schema = { + export const definition: Definition = { propExtendsC: { type: 'string', }, @@ -7160,7 +7090,7 @@ exports[`generation v3 typescript file(./test/result/v3/typescript/models/ModelW /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; import { ModelWithString } from '../models/ModelWithString'; /** @@ -7174,12 +7104,12 @@ export interface ModelWithArray { export namespace ModelWithArray { - export const schema: Schema = { + export const definition: Definition = { prop: { type: 'Array', item: { type: 'ModelWithString', - } + }, }, propWithFile: { type: 'Array', @@ -7204,7 +7134,7 @@ exports[`generation v3 typescript file(./test/result/v3/typescript/models/ModelW /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; /** * This is a model with one boolean property @@ -7218,7 +7148,7 @@ export interface ModelWithBoolean { export namespace ModelWithBoolean { - export const schema: Schema = { + export const definition: Definition = { prop: { type: 'boolean', }, @@ -7233,7 +7163,7 @@ exports[`generation v3 typescript file(./test/result/v3/typescript/models/ModelW /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; /** * This is a model with one property containing a circular reference @@ -7244,7 +7174,7 @@ export interface ModelWithCircularReference { export namespace ModelWithCircularReference { - export const schema: Schema = { + export const definition: Definition = { prop: { type: 'ModelWithCircularReference', }, @@ -7259,7 +7189,7 @@ exports[`generation v3 typescript file(./test/result/v3/typescript/models/ModelW /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; import { Dictionary } from '../models/Dictionary'; /** @@ -7271,7 +7201,7 @@ export interface ModelWithDictionary { export namespace ModelWithDictionary { - export const schema: Schema = { + export const definition: Definition = { prop: { type: 'Dictionary', item: { @@ -7289,7 +7219,7 @@ exports[`generation v3 typescript file(./test/result/v3/typescript/models/ModelW /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; import { ModelWithString } from '../models/ModelWithString'; /** @@ -7303,7 +7233,7 @@ export interface ModelWithDuplicateImports { export namespace ModelWithDuplicateImports { - export const schema: Schema = { + export const definition: Definition = { propA: { type: 'ModelWithString', }, @@ -7324,7 +7254,7 @@ exports[`generation v3 typescript file(./test/result/v3/typescript/models/ModelW /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; import { ModelWithString } from '../models/ModelWithString'; /** @@ -7336,7 +7266,7 @@ export interface ModelWithDuplicateProperties { export namespace ModelWithDuplicateProperties { - export const schema: Schema = { + export const definition: Definition = { prop: { type: 'ModelWithString', }, @@ -7351,7 +7281,7 @@ exports[`generation v3 typescript file(./test/result/v3/typescript/models/ModelW /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; /** * This is a model with one enum @@ -7374,7 +7304,7 @@ export namespace ModelWithEnum { ERROR = 'Error', } - export const schema: Schema = { + export const definition: Definition = { Test: { type: 'Enum', }, @@ -7389,7 +7319,7 @@ exports[`generation v3 typescript file(./test/result/v3/typescript/models/ModelW /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; /** * This is a model with one enum @@ -7412,7 +7342,7 @@ export namespace ModelWithEnumFromDescription { ERROR = 3, } - export const schema: Schema = { + export const definition: Definition = { Test: { type: 'Enum', }, @@ -7427,7 +7357,7 @@ exports[`generation v3 typescript file(./test/result/v3/typescript/models/ModelW /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; /** * This is a model with one number property @@ -7441,7 +7371,7 @@ export interface ModelWithInteger { export namespace ModelWithInteger { - export const schema: Schema = { + export const definition: Definition = { prop: { type: 'number', }, @@ -7456,7 +7386,7 @@ exports[`generation v3 typescript file(./test/result/v3/typescript/models/ModelW /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; import { ModelLink } from '../models/ModelLink'; import { ModelWithString } from '../models/ModelWithString'; @@ -7469,7 +7399,7 @@ export interface ModelWithLink { export namespace ModelWithLink { - export const schema: Schema = { + export const definition: Definition = { prop: { type: 'ModelLink', }, @@ -7484,7 +7414,7 @@ exports[`generation v3 typescript file(./test/result/v3/typescript/models/ModelW /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; import { Dictionary } from '../models/Dictionary'; /** @@ -7499,7 +7429,7 @@ export interface ModelWithNestedEnums { export namespace ModelWithNestedEnums { - export const schema: Schema = { + export const definition: Definition = { arrayWithDescription: { type: 'Array', item: { @@ -7535,7 +7465,7 @@ exports[`generation v3 typescript file(./test/result/v3/typescript/models/ModelW /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; /** * This is a model with one nested property @@ -7550,7 +7480,7 @@ export interface ModelWithNestedProperties { export namespace ModelWithNestedProperties { - export const schema: Schema = { + export const definition: Definition = { first: { second: { third: { @@ -7578,7 +7508,7 @@ exports[`generation v3 typescript file(./test/result/v3/typescript/models/ModelW /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; import { ModelWithString } from '../models/ModelWithString'; /** @@ -7596,7 +7526,7 @@ export interface ModelWithProperties { export namespace ModelWithProperties { - export const schema: Schema = { + export const definition: Definition = { boolean: { type: 'boolean', }, @@ -7634,7 +7564,7 @@ exports[`generation v3 typescript file(./test/result/v3/typescript/models/ModelW /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; import { ModelWithString } from '../models/ModelWithString'; /** @@ -7646,7 +7576,7 @@ export interface ModelWithReference { export namespace ModelWithReference { - export const schema: Schema = { + export const definition: Definition = { prop: { type: 'ModelWithString', }, @@ -7661,7 +7591,7 @@ exports[`generation v3 typescript file(./test/result/v3/typescript/models/ModelW /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; /** * This is a model with one string property @@ -7675,7 +7605,7 @@ export interface ModelWithString { export namespace ModelWithString { - export const schema: Schema = { + export const definition: Definition = { prop: { type: 'string', }, @@ -7690,7 +7620,7 @@ exports[`generation v3 typescript file(./test/result/v3/typescript/models/Simple /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; /** * This is a simple boolean @@ -7699,7 +7629,7 @@ export type SimpleBoolean = boolean; export namespace SimpleBoolean { - export const schema: Schema = { + export const definition: Definition = { type: 'boolean', }; @@ -7712,7 +7642,7 @@ exports[`generation v3 typescript file(./test/result/v3/typescript/models/Simple /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; /** * This is a simple file @@ -7721,7 +7651,7 @@ export type SimpleFile = File; export namespace SimpleFile { - export const schema: Schema = { + export const definition: Definition = { type: 'File', }; @@ -7734,7 +7664,7 @@ exports[`generation v3 typescript file(./test/result/v3/typescript/models/Simple /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; /** * This is a simple number @@ -7743,7 +7673,7 @@ export type SimpleInteger = number; export namespace SimpleInteger { - export const schema: Schema = { + export const definition: Definition = { type: 'number', }; @@ -7756,7 +7686,7 @@ exports[`generation v3 typescript file(./test/result/v3/typescript/models/Simple /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; import { ModelWithString } from '../models/ModelWithString'; /** @@ -7766,7 +7696,7 @@ export type SimpleReference = ModelWithString; export namespace SimpleReference { - export const schema: Schema = { + export const definition: Definition = { type: 'ModelWithString', }; @@ -7779,7 +7709,7 @@ exports[`generation v3 typescript file(./test/result/v3/typescript/models/Simple /* eslint-disable */ /* prettier-ignore */ -import { Schema } from '../core/Schema'; +import { Definition } from '../core/Definition'; /** * This is a simple string @@ -7788,7 +7718,7 @@ export type SimpleString = string; export namespace SimpleString { - export const schema: Schema = { + export const definition: Definition = { type: 'string', };