Refactor schema definitions

Author: flaksp

package-lock.json

@@ -30,6 +30,6 @@
     "typescript": "3.9.10"
   },
   "dependencies": {
-    "@fosfad/json-schema-typescript-definitions": "0.0.3"
+    "@fosfad/json-schema-typescript-definitions": "0.0.5"
   }
 }

package.json

@@ -7,7 +7,7 @@ import { PathItem } from './pathItem';
 import { Reference } from './reference';
 import { RequestBody } from './requestBody';
 import { Response } from './response';
-import { Schema } from './schema';
+import { OasSchema } from './schema';
 import { SecurityScheme } from './securityScheme';
 
 export interface Components {
@@ -19,6 +19,6 @@ export interface Components {
   pathItems?: { [key: string]: PathItem | Reference },
   requestBodies?: { [key: string]: RequestBody | Reference },
   responses?: { [key: string]: Response | Reference },
-  schemas?: { [key: string]: Schema },
+  schemas?: { [key: string]: OasSchema },
   securitySchemes?: { [key: string]: SecurityScheme | Reference }
 }

src/components.ts

@@ -1,11 +1,11 @@
 import { Encoding } from './encoding';
 import { Example } from './example';
 import { Reference } from './reference';
-import { Schema } from './schema';
+import { OasSchema } from './schema';
 
 export interface MediaType {
   encoding?: { [propertyName: string]: Encoding },
   example?: any;
   examples?: { [key: string]: Example | Reference },
-  schema?: Schema;
+  schema?: OasSchema;
 }

src/mediaType.ts

@@ -1,7 +1,7 @@
 import { Example } from './example';
 import { MediaType } from './mediaType';
 import { Reference } from './reference';
-import { Schema } from './schema';
+import { OasSchema } from './schema';
 
 interface CommonParameter {
   content?: { [mediaType: string]: MediaType },
@@ -12,7 +12,7 @@ interface CommonParameter {
   explode?: boolean,
   name: string,
   required?: boolean,
-  schema?: Schema,
+  schema?: OasSchema,
   style?: string
 }
 

src/parameter.ts

@@ -1,10 +1,54 @@
-import { JsonSchema } from '@fosfad/json-schema-typescript-definitions';
+import {
+  AnyJsonSchema,
+  ArrayJsonSchema,
+  BooleanJsonSchema, IntegerJsonSchema,
+  NullJsonSchema,
+  NumberJsonSchema, ObjectJsonSchema,
+  StringJsonSchema,
+} from '@fosfad/json-schema-typescript-definitions';
 import { Discriminator } from './discriminator';
 import { ExternalDocumentation } from './externalDocumentation';
 import { XML } from './xml';
 
-export type Schema = JsonSchema & {
+export interface NullOasSchema extends NullJsonSchema {
+  externalDocs?: ExternalDocumentation,
+  xml?: XML;
+}
+
+export interface BooleanOasSchema extends BooleanJsonSchema {
+  externalDocs?: ExternalDocumentation,
+  xml?: XML;
+}
+
+export interface StringOasSchema extends StringJsonSchema {
+  externalDocs?: ExternalDocumentation,
+  xml?: XML;
+}
+
+export interface NumberOasSchema extends NumberJsonSchema {
+  externalDocs?: ExternalDocumentation,
+  xml?: XML;
+}
+
+export interface IntegerOasSchema extends IntegerJsonSchema {
+  externalDocs?: ExternalDocumentation,
+  xml?: XML;
+}
+
+export interface ArrayOasSchema extends ArrayJsonSchema {
+  externalDocs?: ExternalDocumentation,
+  xml?: XML;
+}
+
+export interface ObjectOasSchema extends ObjectJsonSchema {
   discriminator?: Discriminator;
   externalDocs?: ExternalDocumentation,
-  xml?: XML
-};
+  xml?: XML;
+}
+
+export interface AnyOasSchema extends AnyJsonSchema {
+  externalDocs?: ExternalDocumentation,
+  xml?: XML;
+}
+
+export type OasSchema = NullOasSchema | BooleanOasSchema | StringOasSchema | NumberOasSchema | IntegerOasSchema | ArrayOasSchema | ObjectOasSchema | AnyOasSchema;