@goast/typescript 0.4.4 → 0.5.1-k6.1

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

@@ -1,259 +1,259 @@
-import type { EasyNetworkStub } from 'easy-network-stub';
-
-import type { ErrorResponse, HttpMethod, RouteResponseCallback } 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>,
-  ): void {
-    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>,
-  ) => void {
-    return <Route extends string>(method: HttpMethod, route: Route, response: RouteResponseCallback<Route, T>) => {
-      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['_config'].stubs = [];
-  }
-
-  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 } from 'easy-network-stub';
+
+import type { ErrorResponse, HttpMethod, RouteResponseCallback } 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>,
+  ): void {
+    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>,
+  ) => void {
+    return <Route extends string>(method: HttpMethod, route: Route, response: RouteResponseCallback<Route, T>) => {
+      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['_config'].stubs = [];
+  }
+
+  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/file-builder.js

@@ -69,7 +69,7 @@ export class TypeScriptFileBuilder extends SourceBuilder {
         }
     }
     appendModelUsage(type, options) {
-        this.append(type.component);
+        this.append((options === null || options === void 0 ? void 0 : options.type) === 'js-doc' ? type.component.replace(/\/\*\*.*\*\/\s*/gs, '') : type.component);
         for (const i of type.imports) {
             this.addImport(i.name, i.modulePath, { ...i, ...options });
         }

package/esm/src/generators/services/angular-services/angular-service-generator.d.ts

@@ -22,6 +22,7 @@ export declare class DefaultTypeScriptAngularServiceGenerator extends TypeScript
     protected getEndpointParamsType(ctx: Context, endpoint: ApiEndpoint): ts.TypeAlias<Builder>;
     protected getClass(ctx: Context): ts.Class<Builder>;
     protected getEndpointMethod(ctx: Context, endpoint: ApiEndpoint): ts.Method<Builder>;
+    protected getEndpointRequestContentType(ctx: Context, endpoint: ApiEndpoint): string;
     protected getEndpointSuccessResponseType(ctx: Context, endpoint: ApiEndpoint): string;
     protected getEndpointSuccessResponse(_ctx: Context, endpoint: ApiEndpoint): ApiResponse | undefined;
     protected getServiceClassName(ctx: Context): string;

package/esm/src/generators/services/angular-services/angular-service-generator.d.ts.map

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

package/esm/src/generators/services/angular-services/angular-service-generator.js

@@ -211,34 +211,31 @@ export class DefaultTypeScriptAngularServiceGenerator extends TypeScriptFileGene
             body: appendValueGroup([
                 s `const rb = new ${ctx.refs.requestBuilder()}(this.rootUrl, ${this.getServiceClassName(ctx)}.${this.getEndpointPathPropertyName(ctx, endpoint)}, '${endpoint.method}');`,
                 hasParams
-                    ? (b) => {
-                        var _a;
-                        return b.appendIf(paramsOptional, 'if (params) ').parenthesizeIf(paramsOptional, '{}', appendValueGroup([
-                            ...endpoint.parameters
-                                .filter((p) => p.target === 'path' || p.target === 'query' || p.target === 'header')
-                                .map((p) => {
-                                const options = ts.object({
-                                    members: [
-                                        p.style !== undefined ? ts.property('style', { value: ts.string(p.style) }) : null,
-                                        p.explode !== undefined ? ts.property('explode', { value: ts.toNode(p.explode) }) : null,
-                                    ],
-                                });
-                                return s `rb.${p.target}(${ts.string(p.name)}, params.${toCasing(p.name, ctx.config.propertyNameCasing)}, ${options});`;
-                            }),
-                            endpoint.requestBody
-                                ? s `rb.body(params.body, ${ts.string((_a = endpoint.requestBody.content[0].type) !== null && _a !== void 0 ? _a : 'application/json')});`
-                                : null,
-                        ], '\n'), { multiline: true });
-                    }
+                    ? (b) => b.appendIf(paramsOptional, 'if (params) ').parenthesizeIf(paramsOptional, '{}', appendValueGroup([
+                        ...endpoint.parameters
+                            .filter((p) => p.target === 'path' || p.target === 'query' || p.target === 'header')
+                            .map((p) => {
+                            const options = ts.object({
+                                members: [
+                                    p.style !== undefined ? ts.property('style', { value: ts.string(p.style) }) : null,
+                                    p.explode !== undefined ? ts.property('explode', { value: ts.toNode(p.explode) }) : null,
+                                ],
+                            });
+                            return s `rb.${p.target}(${ts.string(p.name)}, params.${toCasing(p.name, ctx.config.propertyNameCasing)}, ${options});`;
+                        }),
+                        endpoint.requestBody
+                            ? s `rb.body(params.body, ${ts.string(this.getEndpointRequestContentType(ctx, endpoint))});`
+                            : null,
+                    ], '\n'), { multiline: true })
                     : null,
                 '',
-                s `return ${ctx.refs.waitForResponse([responseModelType])}(${s.indent `
-              this.http.request(rb.build({${s.indent `
-                responseType: ${ts.string(responseType)},
-                accept: ${ts.string(accept)},
-                context,`}
-              })),
-              {${s.indent `
+                s `return ${ctx.refs.waitForResponse([responseModelType])}(${s.indent `
+              this.http.request(rb.build({${s.indent `
+                responseType: ${ts.string(responseType)},
+                accept: ${ts.string(accept)},
+                context,`}
+              })),
+              {${s.indent `
                 errorResponseTypes: ${ts.object({
                     members: [
                         ...Object.entries(this.getEndpointStatusCodes(ctx, endpoint))
@@ -247,20 +244,24 @@ export class DefaultTypeScriptAngularServiceGenerator extends TypeScriptFileGene
                             return ts.property(key, { value: ts.string(value.parser) });
                         }),
                     ],
-                })}`}
-              }`}
+                })}`}
+              }`}
             )`,
             ], '\n'),
         });
     }
+    getEndpointRequestContentType(ctx, endpoint) {
+        var _a, _b, _c;
+        return (_c = (_a = ctx.config.defaultRequestContentType) !== null && _a !== void 0 ? _a : (_b = endpoint === null || endpoint === void 0 ? void 0 : endpoint.requestBody) === null || _b === void 0 ? void 0 : _b.content[0].type) !== null && _c !== void 0 ? _c : 'application/json';
+    }
     getEndpointSuccessResponseType(ctx, endpoint) {
         var _a, _b, _c, _d, _e, _f;
         const response = this.getEndpointSuccessResponse(ctx, endpoint);
         if (!response)
             return '*/*';
-        if (!ctx.config.defaultSuccessResponseType)
+        if (!ctx.config.defaultSuccessResponseContentType)
             return (_b = (_a = response.contentOptions[0]) === null || _a === void 0 ? void 0 : _a.type) !== null && _b !== void 0 ? _b : '*/*';
-        return ((_f = (_d = (_c = response.contentOptions.find((x) => x.type === ctx.config.defaultSuccessResponseType)) === null || _c === void 0 ? void 0 : _c.type) !== null && _d !== void 0 ? _d : (_e = response.contentOptions[0]) === null || _e === void 0 ? void 0 : _e.type) !== null && _f !== void 0 ? _f : '*/*');
+        return ((_f = (_d = (_c = response.contentOptions.find((x) => x.type === ctx.config.defaultSuccessResponseContentType)) === null || _c === void 0 ? void 0 : _c.type) !== null && _d !== void 0 ? _d : (_e = response.contentOptions[0]) === null || _e === void 0 ? void 0 : _e.type) !== null && _f !== void 0 ? _f : '*/*');
     }
     getEndpointSuccessResponse(_ctx, endpoint) {
         var _a;