Inherit common fields from OasSchema

Author: flaksp

package-lock.json

@@ -30,6 +30,7 @@
     "typescript": "3.9.10"
   },
   "dependencies": {
-    "@fosfad/json-schema-typescript-definitions": "0.0.7"
+    "@fosfad/json-schema-typescript-definitions": "0.0.9",
+    "@fosfad/openapi-typescript-definitions": "0.0.7"
   }
 }

package.json

@@ -1,7 +1,7 @@
 import {
   AnyJsonSchema,
   ArrayJsonSchema,
-  BooleanJsonSchema, IntegerJsonSchema,
+  BooleanJsonSchema, IntegerJsonSchema, JsonSchema,
   NullJsonSchema,
   NumberJsonSchema, ObjectJsonSchema,
   StringJsonSchema,
@@ -11,68 +11,60 @@ import { ExternalDocumentation } from './externalDocumentation';
 import { Reference } from './reference';
 import { XML } from './xml';
 
-export interface NullOasSchema extends NullJsonSchema {
+export interface OasSchema extends JsonSchema {
+  externalDocs?: ExternalDocumentation,
+  xml?: XML;
+}
+
+export interface NullOasSchema extends NullJsonSchema, OasSchema {
   allOf?: Array<NullOasSchema | Reference>;
   anyOf?: Array<NullOasSchema | Reference>;
-  externalDocs?: ExternalDocumentation,
   not?: NullOasSchema | Reference;
   oneOf?: Array<NullOasSchema | Reference>;
-  xml?: XML;
 }
 
-export interface BooleanOasSchema extends BooleanJsonSchema {
+export interface BooleanOasSchema extends BooleanJsonSchema, OasSchema {
   allOf?: Array<BooleanOasSchema | Reference>;
   anyOf?: Array<BooleanOasSchema | Reference>;
-  externalDocs?: ExternalDocumentation,
   not?: BooleanOasSchema | Reference;
   oneOf?: Array<BooleanOasSchema | Reference>;
-  xml?: XML;
 }
 
-export interface StringOasSchema extends StringJsonSchema {
+export interface StringOasSchema extends StringJsonSchema, OasSchema {
   allOf?: Array<StringOasSchema | Reference>;
   anyOf?: Array<StringOasSchema | Reference>;
-  externalDocs?: ExternalDocumentation,
   not?: StringOasSchema | Reference;
   oneOf?: Array<StringOasSchema | Reference>;
-  xml?: XML;
 }
 
-export interface NumberOasSchema extends NumberJsonSchema {
+export interface NumberOasSchema extends NumberJsonSchema, OasSchema {
   allOf?: Array<NumberOasSchema | Reference>;
   anyOf?: Array<NumberOasSchema | Reference>;
-  externalDocs?: ExternalDocumentation,
   not?: NumberOasSchema | Reference;
   oneOf?: Array<NumberOasSchema | Reference>;
-  xml?: XML;
 }
 
-export interface IntegerOasSchema extends IntegerJsonSchema {
+export interface IntegerOasSchema extends IntegerJsonSchema, OasSchema {
   allOf?: Array<IntegerOasSchema | Reference>;
   anyOf?: Array<IntegerOasSchema | Reference>;
-  externalDocs?: ExternalDocumentation,
   not?: IntegerOasSchema | Reference;
   oneOf?: Array<IntegerOasSchema | Reference>;
-  xml?: XML;
 }
 
-export interface ArrayOasSchema extends ArrayJsonSchema {
+export interface ArrayOasSchema extends ArrayJsonSchema, OasSchema {
   allOf?: Array<ArrayOasSchema | Reference>;
   anyOf?: Array<ArrayOasSchema | Reference>;
   contains?: OasSchema | Reference;
-  externalDocs?: ExternalDocumentation,
   items?: OasSchema | Reference;
   not?: ArrayOasSchema | Reference;
   oneOf?: Array<ArrayOasSchema | Reference>;
   prefixItems?: Array<OasSchema | Reference>;
-  xml?: XML;
 }
 
-export interface ObjectOasSchema extends ObjectJsonSchema {
+export interface ObjectOasSchema extends ObjectJsonSchema, OasSchema {
   allOf?: Array<ObjectOasSchema | Reference>;
   anyOf?: Array<ObjectOasSchema | Reference>;
   discriminator?: Discriminator;
-  externalDocs?: ExternalDocumentation,
   not?: ObjectOasSchema | Reference;
   oneOf?: Array<ObjectOasSchema | Reference>;
   patternProperties?: {
@@ -82,16 +74,11 @@ export interface ObjectOasSchema extends ObjectJsonSchema {
     [propertyName: string]: OasSchema | Reference;
   };
   propertyNames?: OasSchema | Reference;
-  xml?: XML;
 }
 
-export interface AnyOasSchema extends AnyJsonSchema {
+export interface AnyOasSchema extends AnyJsonSchema, OasSchema {
   allOf?: Array<OasSchema | Reference>;
   anyOf?: Array<OasSchema | Reference>;
-  externalDocs?: ExternalDocumentation,
   not?: OasSchema | Reference;
   oneOf?: Array<OasSchema | Reference>;
-  xml?: XML;
 }
-
-export type OasSchema = NullOasSchema | BooleanOasSchema | StringOasSchema | NumberOasSchema | IntegerOasSchema | ArrayOasSchema | ObjectOasSchema | AnyOasSchema;