fix: required fields of object type was not required

Author: svolkov

src/schema.js

@@ -37,6 +37,7 @@ const getObjectTypeContent = (properties) => {
 
 
 const complexTypeGetter = ({description, ...schema}) => parseSchema(schema, null, inlineExtraFormatters).content
+
 const complexSchemaParsers = {
   'oneOf': (schema) => {
     // T1 | T2
@@ -83,6 +84,14 @@ const schemaParsers = {
     }
   },
   'object': (schema, typeName) => {
+    if (_.isArray(schema.required) && schema.properties) {
+      schema.required.forEach(requiredFieldName => {
+        if (schema.properties[requiredFieldName]) {
+          schema.properties[requiredFieldName].required = true
+        }
+      })
+    }
+
     return {
       type: 'object',
       typeIdentifier: 'interface',

tests/generated/v2.0/petstore-expanded.ts

@@ -11,16 +11,16 @@
 */
 
 
-export type Pet = NewPet & { id?: number }
+export type Pet = NewPet & { id: number }
 
 export interface NewPet {
-  name?: string;
+  name: string;
   tag?: string;
 }
 
 export interface Error {
-  code?: number;
-  message?: string;
+  code: number;
+  message: string;
 }
 
 export type RequestParams = Omit<RequestInit, "body" | "method"> & {

tests/generated/v2.0/petstore-minimal.ts

@@ -12,8 +12,8 @@
 
 
 export interface Pet {
-  id?: number;
-  name?: string;
+  id: number;
+  name: string;
   tag?: string;
 }
 

tests/generated/v2.0/petstore-simple.ts

@@ -11,16 +11,16 @@
 */
 
 
-export type Pet = NewPet & { id?: number }
+export type Pet = NewPet & { id: number }
 
 export interface NewPet {
-  name?: string;
+  name: string;
   tag?: string;
 }
 
 export interface ErrorModel {
-  code?: number;
-  message?: string;
+  code: number;
+  message: string;
 }
 
 export type RequestParams = Omit<RequestInit, "body" | "method"> & {

tests/generated/v2.0/petstore-with-external-docs.ts

@@ -11,16 +11,16 @@
 */
 
 
-export type Pet = NewPet & { id?: number }
+export type Pet = NewPet & { id: number }
 
 export interface NewPet {
-  name?: string;
+  name: string;
   tag?: string;
 }
 
 export interface ErrorModel {
-  code?: number;
-  message?: string;
+  code: number;
+  message: string;
 }
 
 export type RequestParams = Omit<RequestInit, "body" | "method"> & {

tests/generated/v2.0/petstore.ts

@@ -12,16 +12,16 @@
 
 
 export interface Pet {
-  id?: number;
-  name?: string;
+  id: number;
+  name: string;
   tag?: string;
 }
 
 export type Pets = Pet[]
 
 export interface Error {
-  code?: number;
-  message?: string;
+  code: number;
+  message: string;
 }
 
 export type RequestParams = Omit<RequestInit, "body" | "method"> & {

tests/generated/v3.0/anyof-example.ts

@@ -12,12 +12,12 @@
 
 
 export interface PetByAge {
-  age?: number;
+  age: number;
   nickname?: string;
 }
 
 export interface PetByType {
-  pet_type?: "Cat" | "Dog";
+  pet_type: "Cat" | "Dog";
   hunts?: boolean;
 }
 

tests/generated/v3.0/callback-example.ts

@@ -109,7 +109,7 @@ export class Api<SecurityDataType> {
     * @request POST:/streams
     */
     post: (query: { callbackUrl: string }, params?: RequestParams) =>
-      this.request<{ subscriptionId?: string }>(`/streams${this.addQueryParams(query)}`, "POST", params, null),
+      this.request<{ subscriptionId: string }>(`/streams${this.addQueryParams(query)}`, "POST", params, null),
   }
 
 }

tests/generated/v3.0/personal-api-example.ts

@@ -12,8 +12,8 @@
 
 
 export interface AuthUser {
-  username?: string;
-  password?: string;
+  username: string;
+  password: string;
 }
 
 export enum Kind {
@@ -24,8 +24,8 @@ export enum Kind {
  }
 
 export interface Job {
-  id?: string;
-  kind?: Kind;
+  id: string;
+  kind: Kind;
   name?: string;
   link?: string;
   github?: string;
@@ -35,7 +35,7 @@ export interface Job {
 }
 
 export interface JobUpdate {
-  kind?: Kind;
+  kind: Kind;
   name?: string;
   link?: string;
   github?: string;
@@ -45,8 +45,8 @@ export interface JobUpdate {
 }
 
 export interface UpdatedJob {
-  id?: string;
-  kind?: Kind;
+  id: string;
+  kind: Kind;
   name?: string;
   link?: string;
   github?: string;
@@ -56,43 +56,43 @@ export interface UpdatedJob {
 }
 
 export interface Project {
-  id?: string;
-  year?: number;
-  description?: string;
-  job?: Job;
+  id: string;
+  year: number;
+  description: string;
+  job: Job;
   name?: string;
   notImportant?: boolean;
   prefix?: string;
-  tags?: string[];
-  teamSize?: string;
+  tags: string[];
+  teamSize: string;
 }
 
 export interface ProjectUpdate {
-  year?: number;
-  description?: string;
+  year: number;
+  description: string;
   name?: string;
   notImportant?: boolean;
   prefix?: string;
-  tags?: string[];
-  teamSize?: string;
-  job?: string;
+  tags: string[];
+  teamSize: string;
+  job: string;
 }
 
 export interface UpdatedProject {
-  id?: string;
-  year?: number;
-  description?: string;
+  id: string;
+  year: number;
+  description: string;
   name?: string;
   notImportant?: boolean;
   prefix?: string;
-  tags?: string[];
-  teamSize?: string;
-  job?: string;
+  tags: string[];
+  teamSize: string;
+  job: string;
 }
 
 export interface User {
-  id?: string;
-  username?: string;
+  id: string;
+  username: string;
 }
 
 export interface UserUpdate {

tests/generated/v3.0/petstore-expanded.ts

@@ -11,16 +11,16 @@
 */
 
 
-export type Pet = NewPet & { id?: number }
+export type Pet = NewPet & { id: number }
 
 export interface NewPet {
-  name?: string;
+  name: string;
   tag?: string;
 }
 
 export interface Error {
-  code?: number;
-  message?: string;
+  code: number;
+  message: string;
 }
 
 export type RequestParams = Omit<RequestInit, "body" | "method"> & {