@goast/typescript 0.8.0-beta.1 → 0.8.0-beta.2

package/assets/stubs/easy-network-stub/easy-network-stub.utils.ts

@@ -1,257 +1,257 @@
-import type { EasyNetworkStub, ErrorResponse, HttpMethod, RouteResponseCallback, StubHandle } from 'easy-network-stub';
-
-/**
- * Options for the `EasyNetworkStubWrapper`.
- */
-export type EasyNetworkStubWrapperOptions = {
-  /**
-   * Delay in milliseconds before responding.
-   * @default 0
-   */
-  delay: number;
-  /**
-   * Whether to log requests to the console.
-   * @default false
-   */
-  logRequests: boolean;
-  /**
-   * Whether to log responses to the console.
-   * @default false
-   */
-  logResponses: boolean;
-  /**
-   * Whether to remember requests. Remebered requests can be accessed via the `requests` property.
-   * @default false
-   */
-  rememberRequests: boolean;
-  /**
-   * Function to call when a response is sent.
-   * @param response The response that was sent.
-   * @default undefined
-   */
-  responseCallback?: (response: unknown) => void;
-  /**
-   * A prefix to add to the URL in log messages.
-   * @default /api/
-   */
-  logUrlPrefix: string;
-};
-
-/**
- * Represents a request intercepted by the `EasyNetworkStubWrapper`.
- */
-export type StubRequestItem = {
-  /**
-   * The HTTP method of the request.
-   */
-  method: HttpMethod;
-  /**
-   * The route of the request.
-   */
-  route: string;
-  /**
-   * The request information provided by `easy-network-stub`.
-   */
-  request: StubRequestInfo;
-};
-
-/**
- * Represents the request information provided by `easy-network-stub`.
- */
-export type StubRequestInfo<TRoute extends string = string, TBody = unknown> = Parameters<
-  RouteResponseCallback<TRoute, TBody>
->[0];
-
-/**
- * A strict version of `RouteResponseCallback` that allows for a responder to be passed as the first argument.
- */
-export type StrictRouteResponseCallback<T, P extends string, R> = (
-  respondWith: R,
-  ...args: Parameters<RouteResponseCallback<P, T>>
-) => ErrorResponse<any> | Promise<ErrorResponse<any>>;
-
-type _UnionToIntersection<U> = (U extends any ? (x: U) => void : never) extends (x: infer I) => void ? I : never;
-type __StubResponder<T extends Record<number, unknown>, S> = S extends number
-  ? [T[S]] extends [never] ? (statusCode: S) => ErrorResponse<T[S]>
-  : (statusCode: S, content: T[S]) => ErrorResponse<T[S]>
-  : never;
-type _StubResponder<T extends Record<number, unknown>> = _UnionToIntersection<__StubResponder<T, keyof T>>;
-const untypedResponder = (statusCode: number, content?: unknown) => ({ statusCode, content });
-
-/**
- * Gets the responder function typed to a specific set of status codes.
- * @returns The responder function.
- */
-export function getStubResponder<T extends Record<number, unknown>>(): _StubResponder<T> {
-  return untypedResponder as _StubResponder<T>;
-}
-
-/**
- * Wrapper for `EasyNetworkStub` that adds additional functionality.
- */
-export class EasyNetworkStubWrapper {
-  private _requests: StubRequestItem[] = [];
-
-  /**
-   * The options for the wrapper.
-   */
-  public readonly options: Readonly<EasyNetworkStubWrapperOptions>;
-
-  /**
-   * The requests that have been intercepted by the wrapper.
-   */
-  public get requests(): ReadonlyArray<StubRequestItem> {
-    return this._requests;
-  }
-
-  constructor(
-    public readonly wrappedStub: EasyNetworkStub,
-    options?: Partial<EasyNetworkStubWrapperOptions>,
-  ) {
-    this.options = {
-      delay: options?.delay ?? 0,
-      logRequests: options?.logRequests ?? false,
-      logResponses: options?.logResponses ?? false,
-      rememberRequests: options?.rememberRequests ?? false,
-      responseCallback: options?.responseCallback,
-      logUrlPrefix: options?.logUrlPrefix ?? '/api/',
-    };
-  }
-
-  /**
-   * Add a single api stub to your intercepted routes.
-   * @param method The http method that should be stubbed
-   * @param route The route that should be stubbed. Supports parameters in the form of {name:type}.
-   * @param response The callback in which you can process the request and reply with the stub. When a Promise is returned, the stub response will be delayed until it is resolved.
-   */
-  public stub<Route extends string>(
-    method: HttpMethod,
-    route: Route,
-    response: RouteResponseCallback<Route, unknown>,
-  ): StubHandle {
-    return this.wrappedStub.stub<Route>(method, route, async (request) => {
-      if (this.options.delay > 0) await sleep(this.options.delay);
-      return await this.runRequest(method, route, response, request);
-    });
-  }
-
-  /**
-   * The stub2 method provides a way to set the type of the body that is sent.
-   * Due to restrictions in TypeScript (https://github.com/microsoft/TypeScript/issues/10571, https://github.com/Microsoft/TypeScript/pull/26349),
-   * We have to hacke a bit here. Calling stub2<T>() will return the stub method with a body of type T.
-   *
-   * Usage:
-   * ```
-   * .stub2<MyRequest>()('GET', '/api/test', ({ body }) => {
-   *   // body is of type MyRequest
-   * });
-   * ```
-   * @returns The stub method with a body of type T.
-   */
-  public stub2<T>(): <Route extends string>(
-    method: HttpMethod,
-    route: Route,
-    response: RouteResponseCallback<Route, T>,
-  ) => StubHandle {
-    return <Route extends string>(method: HttpMethod, route: Route, response: RouteResponseCallback<Route, T>) => {
-      return this.wrappedStub.stub2<T>()<Route>(method, route, async (request) => {
-        if (this.options.delay > 0) await sleep(this.options.delay);
-        return await this.runRequest(method, route, response, request);
-      });
-    };
-  }
-
-  /**
-   * Reset the stubs and requests.
-   */
-  public reset(): void {
-    this._requests = [];
-    this.wrappedStub.unregisterAll();
-  }
-
-  private async runRequest<Route extends string, T>(
-    method: HttpMethod,
-    route: Route,
-    response: RouteResponseCallback<Route, T>,
-    request: StubRequestInfo<Route, T>,
-  ): Promise<unknown> {
-    if (this.options.rememberRequests) {
-      this._requests.push({ method, route, request });
-    }
-    this.log('request', method, route, request, '#7FFFFF');
-    try {
-      const r = await response(request);
-      this.options.responseCallback?.(r);
-      this.log('response', method, route, r, '#7FFF8E');
-      return r;
-    } catch (error: unknown) {
-      this.options.responseCallback?.(error);
-      if (isHttpResponse(error) && error.statusCode >= 200 && error.statusCode < 300) {
-        this.log('response', method, route, error.content, '#7FFF8E');
-        throw error;
-      } else {
-        const isError = isHttpResponse(error) && error.statusCode >= 400 && error.statusCode < 600;
-        this.log('response', method, route, error, isError ? '#FF7F7F' : '7F7F7F');
-        throw error;
-      }
-    }
-  }
-
-  private log(type: 'request' | 'response', method: HttpMethod, route: string, data: unknown, color: string) {
-    if (type === 'request' && !this.options.logRequests) return;
-    if (type === 'response' && !this.options.logResponses) return;
-    const typeDisplay = type === 'request' ? ' [req]' : '[resp]';
-    const strippedRoute = route.match(/[^?]*(?=\?)?/)?.[0];
-    console.log(`%c${typeDisplay} ${method}: ${this.options.logUrlPrefix}${strippedRoute}`, `color:${color};`, data);
-  }
-}
-
-/**
- * Base class for generated easy network stubs.
- */
-export class EasyNetworkStubBase {
-  protected readonly stubWrapper: EasyNetworkStubWrapper;
-  protected readonly ownsStubWrapper: boolean;
-
-  constructor(stub: EasyNetworkStub | EasyNetworkStubWrapper, options?: EasyNetworkStubWrapperOptions) {
-    this.stubWrapper = stub instanceof EasyNetworkStubWrapper ? stub : new EasyNetworkStubWrapper(stub, options);
-    this.ownsStubWrapper = !(stub instanceof EasyNetworkStubWrapper);
-  }
-
-  public reset() {
-    if (this.ownsStubWrapper) {
-      this.stubWrapper.reset();
-    }
-  }
-}
-
-export type EasyNetworkStubGroup<Group, GroupContainer> = Group & {
-  (stubActions: (stubs: Group) => void): GroupContainer;
-};
-
-// eslint-disable-next-line @typescript-eslint/ban-types
-declare interface GroupType<T> extends Function {
-  new (stubWrapper: EasyNetworkStubWrapper): T;
-}
-
-export function createEasyNetworkStubGroup<GroupContainer, Group>(
-  container: GroupContainer,
-  stubWrapper: EasyNetworkStubWrapper,
-  groupType: GroupType<Group>,
-): EasyNetworkStubGroup<Group, GroupContainer> {
-  const group = new groupType(stubWrapper);
-  const groupFn = (stubActions: (stubs: Group) => void) => {
-    stubActions(group);
-    return container;
-  };
-  Object.setPrototypeOf(groupFn, groupType.prototype);
-  return Object.assign(groupFn, group);
-}
-
-function sleep(ms: number): Promise<void> {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}
-
-function isHttpResponse(value: unknown): value is ErrorResponse<unknown> {
-  return typeof value === 'object' && value !== null && 'statusCode' in value;
-}
+import type { EasyNetworkStub, ErrorResponse, HttpMethod, RouteResponseCallback, StubHandle } from 'easy-network-stub';
+
+/**
+ * Options for the `EasyNetworkStubWrapper`.
+ */
+export type EasyNetworkStubWrapperOptions = {
+  /**
+   * Delay in milliseconds before responding.
+   * @default 0
+   */
+  delay: number;
+  /**
+   * Whether to log requests to the console.
+   * @default false
+   */
+  logRequests: boolean;
+  /**
+   * Whether to log responses to the console.
+   * @default false
+   */
+  logResponses: boolean;
+  /**
+   * Whether to remember requests. Remebered requests can be accessed via the `requests` property.
+   * @default false
+   */
+  rememberRequests: boolean;
+  /**
+   * Function to call when a response is sent.
+   * @param response The response that was sent.
+   * @default undefined
+   */
+  responseCallback?: (response: unknown) => void;
+  /**
+   * A prefix to add to the URL in log messages.
+   * @default /api/
+   */
+  logUrlPrefix: string;
+};
+
+/**
+ * Represents a request intercepted by the `EasyNetworkStubWrapper`.
+ */
+export type StubRequestItem = {
+  /**
+   * The HTTP method of the request.
+   */
+  method: HttpMethod;
+  /**
+   * The route of the request.
+   */
+  route: string;
+  /**
+   * The request information provided by `easy-network-stub`.
+   */
+  request: StubRequestInfo;
+};
+
+/**
+ * Represents the request information provided by `easy-network-stub`.
+ */
+export type StubRequestInfo<TRoute extends string = string, TBody = unknown> = Parameters<
+  RouteResponseCallback<TRoute, TBody>
+>[0];
+
+/**
+ * A strict version of `RouteResponseCallback` that allows for a responder to be passed as the first argument.
+ */
+export type StrictRouteResponseCallback<T, P extends string, R> = (
+  respondWith: R,
+  ...args: Parameters<RouteResponseCallback<P, T>>
+) => ErrorResponse<any> | Promise<ErrorResponse<any>>;
+
+type _UnionToIntersection<U> = (U extends any ? (x: U) => void : never) extends (x: infer I) => void ? I : never;
+type __StubResponder<T extends Record<number, unknown>, S> = S extends number
+  ? [T[S]] extends [never] ? (statusCode: S) => ErrorResponse<T[S]>
+  : (statusCode: S, content: T[S]) => ErrorResponse<T[S]>
+  : never;
+type _StubResponder<T extends Record<number, unknown>> = _UnionToIntersection<__StubResponder<T, keyof T>>;
+const untypedResponder = (statusCode: number, content?: unknown) => ({ statusCode, content });
+
+/**
+ * Gets the responder function typed to a specific set of status codes.
+ * @returns The responder function.
+ */
+export function getStubResponder<T extends Record<number, unknown>>(): _StubResponder<T> {
+  return untypedResponder as _StubResponder<T>;
+}
+
+/**
+ * Wrapper for `EasyNetworkStub` that adds additional functionality.
+ */
+export class EasyNetworkStubWrapper {
+  private _requests: StubRequestItem[] = [];
+
+  /**
+   * The options for the wrapper.
+   */
+  public readonly options: Readonly<EasyNetworkStubWrapperOptions>;
+
+  /**
+   * The requests that have been intercepted by the wrapper.
+   */
+  public get requests(): ReadonlyArray<StubRequestItem> {
+    return this._requests;
+  }
+
+  constructor(
+    public readonly wrappedStub: EasyNetworkStub,
+    options?: Partial<EasyNetworkStubWrapperOptions>,
+  ) {
+    this.options = {
+      delay: options?.delay ?? 0,
+      logRequests: options?.logRequests ?? false,
+      logResponses: options?.logResponses ?? false,
+      rememberRequests: options?.rememberRequests ?? false,
+      responseCallback: options?.responseCallback,
+      logUrlPrefix: options?.logUrlPrefix ?? '/api/',
+    };
+  }
+
+  /**
+   * Add a single api stub to your intercepted routes.
+   * @param method The http method that should be stubbed
+   * @param route The route that should be stubbed. Supports parameters in the form of {name:type}.
+   * @param response The callback in which you can process the request and reply with the stub. When a Promise is returned, the stub response will be delayed until it is resolved.
+   */
+  public stub<Route extends string>(
+    method: HttpMethod,
+    route: Route,
+    response: RouteResponseCallback<Route, unknown>,
+  ): StubHandle {
+    return this.wrappedStub.stub<Route>(method, route, async (request) => {
+      if (this.options.delay > 0) await sleep(this.options.delay);
+      return await this.runRequest(method, route, response, request);
+    });
+  }
+
+  /**
+   * The stub2 method provides a way to set the type of the body that is sent.
+   * Due to restrictions in TypeScript (https://github.com/microsoft/TypeScript/issues/10571, https://github.com/Microsoft/TypeScript/pull/26349),
+   * We have to hacke a bit here. Calling stub2<T>() will return the stub method with a body of type T.
+   *
+   * Usage:
+   * ```
+   * .stub2<MyRequest>()('GET', '/api/test', ({ body }) => {
+   *   // body is of type MyRequest
+   * });
+   * ```
+   * @returns The stub method with a body of type T.
+   */
+  public stub2<T>(): <Route extends string>(
+    method: HttpMethod,
+    route: Route,
+    response: RouteResponseCallback<Route, T>,
+  ) => StubHandle {
+    return <Route extends string>(method: HttpMethod, route: Route, response: RouteResponseCallback<Route, T>) => {
+      return this.wrappedStub.stub2<T>()<Route>(method, route, async (request) => {
+        if (this.options.delay > 0) await sleep(this.options.delay);
+        return await this.runRequest(method, route, response, request);
+      });
+    };
+  }
+
+  /**
+   * Reset the stubs and requests.
+   */
+  public reset(): void {
+    this._requests = [];
+    this.wrappedStub.unregisterAll();
+  }
+
+  private async runRequest<Route extends string, T>(
+    method: HttpMethod,
+    route: Route,
+    response: RouteResponseCallback<Route, T>,
+    request: StubRequestInfo<Route, T>,
+  ): Promise<unknown> {
+    if (this.options.rememberRequests) {
+      this._requests.push({ method, route, request });
+    }
+    this.log('request', method, route, request, '#7FFFFF');
+    try {
+      const r = await response(request);
+      this.options.responseCallback?.(r);
+      this.log('response', method, route, r, '#7FFF8E');
+      return r;
+    } catch (error: unknown) {
+      this.options.responseCallback?.(error);
+      if (isHttpResponse(error) && error.statusCode >= 200 && error.statusCode < 300) {
+        this.log('response', method, route, error.content, '#7FFF8E');
+        throw error;
+      } else {
+        const isError = isHttpResponse(error) && error.statusCode >= 400 && error.statusCode < 600;
+        this.log('response', method, route, error, isError ? '#FF7F7F' : '7F7F7F');
+        throw error;
+      }
+    }
+  }
+
+  private log(type: 'request' | 'response', method: HttpMethod, route: string, data: unknown, color: string) {
+    if (type === 'request' && !this.options.logRequests) return;
+    if (type === 'response' && !this.options.logResponses) return;
+    const typeDisplay = type === 'request' ? ' [req]' : '[resp]';
+    const strippedRoute = route.match(/[^?]*(?=\?)?/)?.[0];
+    console.log(`%c${typeDisplay} ${method}: ${this.options.logUrlPrefix}${strippedRoute}`, `color:${color};`, data);
+  }
+}
+
+/**
+ * Base class for generated easy network stubs.
+ */
+export class EasyNetworkStubBase {
+  protected readonly stubWrapper: EasyNetworkStubWrapper;
+  protected readonly ownsStubWrapper: boolean;
+
+  constructor(stub: EasyNetworkStub | EasyNetworkStubWrapper, options?: EasyNetworkStubWrapperOptions) {
+    this.stubWrapper = stub instanceof EasyNetworkStubWrapper ? stub : new EasyNetworkStubWrapper(stub, options);
+    this.ownsStubWrapper = !(stub instanceof EasyNetworkStubWrapper);
+  }
+
+  public reset() {
+    if (this.ownsStubWrapper) {
+      this.stubWrapper.reset();
+    }
+  }
+}
+
+export type EasyNetworkStubGroup<Group, GroupContainer> = Group & {
+  (stubActions: (stubs: Group) => void): GroupContainer;
+};
+
+// eslint-disable-next-line @typescript-eslint/ban-types
+declare interface GroupType<T> extends Function {
+  new (stubWrapper: EasyNetworkStubWrapper): T;
+}
+
+export function createEasyNetworkStubGroup<GroupContainer, Group>(
+  container: GroupContainer,
+  stubWrapper: EasyNetworkStubWrapper,
+  groupType: GroupType<Group>,
+): EasyNetworkStubGroup<Group, GroupContainer> {
+  const group = new groupType(stubWrapper);
+  const groupFn = (stubActions: (stubs: Group) => void) => {
+    stubActions(group);
+    return container;
+  };
+  Object.setPrototypeOf(groupFn, groupType.prototype);
+  return Object.assign(groupFn, group);
+}
+
+function sleep(ms: number): Promise<void> {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+function isHttpResponse(value: unknown): value is ErrorResponse<unknown> {
+  return typeof value === 'object' && value !== null && 'statusCode' in value;
+}

package/esm/src/generators/models/model-generator.d.ts

@@ -20,6 +20,28 @@ export declare class DefaultTypeScriptModelGenerator extends TypeScriptFileGener
     protected getEnumValuesVariable(ctx: Context, schema: ApiSchema): ts.Variable<Builder>;
     protected getIndexer(ctx: Context, schema: ObjectLikeApiSchema): ts.Indexer<Builder> | null;
     protected getProperties(ctx: Context, schema: ObjectLikeApiSchema): ts.Property<Builder>[];
+    /**
+     * The type of a schema used as a *member* of an enclosing type - a composition branch, an array element, an
+     * `additionalProperties` value - with the schema's own nullability applied.
+     *
+     * `getType` renders a schema's type without its `null` on purpose: the two contexts that render a schema's type
+     * as a whole declare nullability themselves. A property has it added by `getProperties`, and a top-level type
+     * alias deliberately does not hoist it, because that would change what every declared type means for consumers.
+     * A member position has neither - nothing downstream can add the `null` back - so unless it is admitted here the
+     * emitted type cannot represent a value the spec explicitly permits.
+     */
+    protected getMemberType(ctx: Context, schema: Nullable<ApiSchema>, options?: {
+        skipSchemas?: boolean;
+        useBaseType?: boolean;
+    }): ts.Type<Builder> | null;
+    /**
+     * Whether a schema needs a `null` added to the type `getType` renders for it. A schema that only ever renders as
+     * `null` (the null type itself) already admits it, and adding a second one would emit `(null) | (null)`.
+     *
+     * Nullability is read through the reference chain the same way `getType` reads the type, so a `$ref` to a
+     * declared nullable schema - whose own declaration does not hoist the `null` - still admits null where it is used.
+     */
+    protected isNullableMember(schema: ApiSchema): boolean;
     protected getType(ctx: Context, schema: Nullable<ApiSchema>, options?: {
         skipSchemas?: boolean;
         useBaseType?: boolean;

package/esm/src/generators/models/model-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model-generator.d.ts","sourceRoot":"","sources":["../../../../src/src/generators/models/model-generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"model-generator.d.ts","sourceRoot":"","sources":["../../../../src/src/generators/models/model-generator.ts"],"names":[],"mappings":"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"}

package/esm/src/generators/models/model-generator.js

@@ -158,7 +158,7 @@ export class DefaultTypeScriptModelGenerator extends TypeScriptFileGenerator {
     getIndexer(ctx, schema) {
         var _a;
         return schema.additionalProperties
-            ? ts.indexer(ts.refs.string(), (_a = (schema.additionalProperties === true ? null : this.getType(ctx, schema.additionalProperties))) !== null && _a !== void 0 ? _a : this.getAnyType(ctx), { readonly: ctx.config.immutableTypes })
+            ? ts.indexer(ts.refs.string(), (_a = (schema.additionalProperties === true ? null : this.getMemberType(ctx, schema.additionalProperties))) !== null && _a !== void 0 ? _a : this.getAnyType(ctx), { readonly: ctx.config.immutableTypes })
             : null;
     }
     getProperties(ctx, schema) {
@@ -174,6 +174,33 @@ export class DefaultTypeScriptModelGenerator extends TypeScriptFileGenerator {
             });
         });
     }
+    /**
+     * The type of a schema used as a *member* of an enclosing type - a composition branch, an array element, an
+     * `additionalProperties` value - with the schema's own nullability applied.
+     *
+     * `getType` renders a schema's type without its `null` on purpose: the two contexts that render a schema's type
+     * as a whole declare nullability themselves. A property has it added by `getProperties`, and a top-level type
+     * alias deliberately does not hoist it, because that would change what every declared type means for consumers.
+     * A member position has neither - nothing downstream can add the `null` back - so unless it is admitted here the
+     * emitted type cannot represent a value the spec explicitly permits.
+     */
+    getMemberType(ctx, schema, options) {
+        const type = this.getType(ctx, schema, options);
+        return type !== null && schema && this.isNullableMember(schema) ? ts.unionType([type, 'null']) : type;
+    }
+    /**
+     * Whether a schema needs a `null` added to the type `getType` renders for it. A schema that only ever renders as
+     * `null` (the null type itself) already admits it, and adding a second one would emit `(null) | (null)`.
+     *
+     * Nullability is read through the reference chain the same way `getType` reads the type, so a `$ref` to a
+     * declared nullable schema - whose own declaration does not hoist the `null` - still admits null where it is used.
+     */
+    isNullableMember(schema) {
+        const resolved = getSchemaReference(schema, DEFAULT_IGNORED_SCHEMA_PROPERTIES);
+        if (resolved.kind === 'null')
+            return false;
+        return schema.nullable === true || resolved.nullable === true;
+    }
     getType(ctx, schema, options) {
         if (!schema)
             return this.getAnyType(ctx);
@@ -228,7 +255,7 @@ export class DefaultTypeScriptModelGenerator extends TypeScriptFileGenerator {
     }
     getArrayType(ctx, schema) {
         var _a;
-        return ts.arrayType((_a = this.getType(ctx, schema.items)) !== null && _a !== void 0 ? _a : this.getAnyType(ctx), {
+        return ts.arrayType((_a = this.getMemberType(ctx, schema.items)) !== null && _a !== void 0 ? _a : this.getAnyType(ctx), {
             readonly: ctx.config.immutableTypes,
         });
     }
@@ -276,16 +303,21 @@ export class DefaultTypeScriptModelGenerator extends TypeScriptFileGenerator {
             return this.getAnyType(ctx);
         }
         const useBaseType = schema.id === ctx.schema.id;
+        // allOf branches must all hold at once, i.e. an intersection. anyOf branches only require at least one to hold,
+        // i.e. a union - TypeScript unions already admit values matching several branches, so no Partial<> wrapper is
+        // needed to express that overlap. A schema with both intersects the allOf branches with the anyOf union.
         return ts.intersectionType([
-            ...schema.allOf.map((x) => this.getType(ctx, x, { useBaseType })),
-            ...schema.anyOf.map((x) => ts.reference('Partial', null, { generics: [this.getType(ctx, x, { useBaseType })] })),
+            ...schema.allOf.map((x) => this.getMemberType(ctx, x, { useBaseType })),
+            schema.anyOf.length > 0
+                ? ts.unionType(schema.anyOf.map((x) => this.getMemberType(ctx, x, { useBaseType })))
+                : null,
         ]);
     }
     getOneOfType(ctx, schema) {
         if (schema.oneOf.length === 0) {
             return this.getAnyType(ctx);
         }
-        return ts.unionType(schema.oneOf.map((x) => this.getType(ctx, x)));
+        return ts.unionType(schema.oneOf.map((x) => this.getMemberType(ctx, x)));
     }
     getMultiType(ctx, schema) {
         if (schema.type.length === 0) {