@goast/typescript 0.4.1 → 0.4.2

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/generators/models/model-generator.js

@@ -352,7 +352,7 @@ export class DefaultTypeScriptModelGenerator extends TypeScriptFileGenerator {
         return toCasing(schema.name + '_Discriminator', ctx.config.typeNameCasing);
     }
     getBaseTypeName(ctx, schema) {
-        return toCasing(schema.name + '_Base', ctx.config.typeNameCasing);
+        return toCasing(schema.name, ctx.config.discriminatorBaseTypeCasing);
     }
     getInheritedSchemas(ctx, schema) {
         return schema.inheritedSchemas

package/esm/src/generators/models/models.d.ts

@@ -36,6 +36,11 @@ export type TypeScriptModelGeneratorConfig = TypeScriptGeneratorConfig & {
      * @default 'type'
      */
     typeDeclaration: 'type' | 'prefer-interface';
+    /**
+     * The casing to use for the base type of discriminator schemas.
+     * @default `_<SchemaName>Base`
+     */
+    discriminatorBaseTypeCasing: ExtendedStringCasing;
 };
 export type TypeScriptModelsGeneratorConfig = TypeScriptModelGeneratorConfig & {
     /**

package/esm/src/generators/models/models.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../../../src/src/generators/models/models.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,SAAS,EACT,+BAA+B,EAC/B,oBAAoB,EACpB,QAAQ,EACR,uCAAuC,EACxC,MAAM,aAAa,CAAC;AAErB,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AACzE,OAAO,EAAoC,KAAK,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAEnG,MAAM,MAAM,8BAA8B,GAAG,yBAAyB,GAAG;IACvE;;;;;OAKG;IACH,cAAc,EAAE,OAAO,GAAG,aAAa,CAAC;IAExC;;;OAGG;IACH,cAAc,EAAE,OAAO,CAAC;IAExB;;;OAGG;IACH,oBAAoB,EAAE,OAAO,CAAC;IAE9B;;;OAGG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;;OAGG;IACH,mBAAmB,EAAE,QAAQ,CAAC,oBAAoB,CAAC,CAAC;IAEpD;;;;;OAKG;IACH,eAAe,EAAE,MAAM,GAAG,kBAAkB,CAAC;CAC9C,CAAC;AAEF,MAAM,MAAM,+BAA+B,GAAG,8BAA8B,GAAG;IAC7E;;;OAGG;IACH,eAAe,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;CACnC,CAAC;AAEF,eAAO,MAAM,qCAAqC,EAAE,+BAA+B,CAAC,8BAA8B,CASjH,CAAC;AAEF,eAAO,MAAM,sCAAsC,EAAE,+BAA+B,CAAC,+BAA+B,CAKjH,CAAC;AAGJ,MAAM,MAAM,8BAA8B,GAAG,EAAE,CAAC;AAEhD,MAAM,MAAM,+BAA+B,GAAG;IAC5C,UAAU,EAAE;QACV,MAAM,EAAE;YACN,CAAC,QAAQ,EAAE,MAAM,GAAG,8BAA8B,CAAC;SACpD,CAAC;QACF,UAAU,EAAE;YACV,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;SAC1B,CAAC;KACH,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,8BAA8B,GAAG,yBAAyB,CAAC;AAEvE,MAAM,MAAM,gCAAgC,GAAG,uCAAuC,CACpF,8BAA8B,EAC9B,+BAA+B,EAC/B,+BAA+B,EAC/B,8BAA8B,CAC/B,CAAC;AAEF,MAAM,MAAM,+BAA+B,GAAG,gCAAgC,GAAG;IAC/E,MAAM,EAAE,SAAS,CAAC;CACnB,CAAC"}
+{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../../../src/src/generators/models/models.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,SAAS,EACT,+BAA+B,EAC/B,oBAAoB,EACpB,QAAQ,EACR,uCAAuC,EACxC,MAAM,aAAa,CAAC;AAErB,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AACzE,OAAO,EAAoC,KAAK,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAEnG,MAAM,MAAM,8BAA8B,GAAG,yBAAyB,GAAG;IACvE;;;;;OAKG;IACH,cAAc,EAAE,OAAO,GAAG,aAAa,CAAC;IAExC;;;OAGG;IACH,cAAc,EAAE,OAAO,CAAC;IAExB;;;OAGG;IACH,oBAAoB,EAAE,OAAO,CAAC;IAE9B;;;OAGG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;;OAGG;IACH,mBAAmB,EAAE,QAAQ,CAAC,oBAAoB,CAAC,CAAC;IAEpD;;;;;OAKG;IACH,eAAe,EAAE,MAAM,GAAG,kBAAkB,CAAC;IAE7C;;;OAGG;IACH,2BAA2B,EAAE,oBAAoB,CAAC;CACnD,CAAC;AAEF,MAAM,MAAM,+BAA+B,GAAG,8BAA8B,GAAG;IAC7E;;;OAGG;IACH,eAAe,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;CACnC,CAAC;AAEF,eAAO,MAAM,qCAAqC,EAAE,+BAA+B,CAAC,8BAA8B,CAUjH,CAAC;AAEF,eAAO,MAAM,sCAAsC,EAAE,+BAA+B,CAAC,+BAA+B,CAKjH,CAAC;AAGJ,MAAM,MAAM,8BAA8B,GAAG,EAAE,CAAC;AAEhD,MAAM,MAAM,+BAA+B,GAAG;IAC5C,UAAU,EAAE;QACV,MAAM,EAAE;YACN,CAAC,QAAQ,EAAE,MAAM,GAAG,8BAA8B,CAAC;SACpD,CAAC;QACF,UAAU,EAAE;YACV,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;SAC1B,CAAC;KACH,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,8BAA8B,GAAG,yBAAyB,CAAC;AAEvE,MAAM,MAAM,gCAAgC,GAAG,uCAAuC,CACpF,8BAA8B,EAC9B,+BAA+B,EAC/B,+BAA+B,EAC/B,8BAA8B,CAC/B,CAAC;AAEF,MAAM,MAAM,+BAA+B,GAAG,gCAAgC,GAAG;IAC/E,MAAM,EAAE,SAAS,CAAC;CACnB,CAAC"}

package/esm/src/generators/models/models.js

@@ -7,6 +7,7 @@ export const defaultTypeScriptModelGeneratorConfig = {
     modelsDir: 'models',
     modelFileNameCasing: undefined,
     typeDeclaration: 'type',
+    discriminatorBaseTypeCasing: { casing: 'pascal', prefix: '_', suffix: 'Base' },
 };
 export const defaultTypeScriptModelsGeneratorConfig = {
     ...defaultTypeScriptModelGeneratorConfig,

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

@@ -50,7 +50,9 @@ export class DefaultTypeScriptAngularServiceGenerator extends TypeScriptFileGene
                 ...Object.entries(statusCodes).map(([key, value]) => {
                     const isSuccess = key.startsWith('2');
                     return ts.intersectionType([
-                        isSuccess ? ts.refs.angular.httpResponse([value.type]) : ts.refs.angular.httpErrorResponse(),
+                        isSuccess
+                            ? ts.refs.angular.httpResponse([value.type])
+                            : ts.refs.omit([ts.refs.angular.httpErrorResponse(), ts.string('error')]),
                         ts.objectType({
                             members: [
                                 isSuccess ? null : ts.property('error', { type: ts.unionType([value.type, ts.refs.null_()]) }),
@@ -230,13 +232,13 @@ export class DefaultTypeScriptAngularServiceGenerator extends TypeScriptFileGene
                     }
                     : 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))
@@ -245,8 +247,8 @@ export class DefaultTypeScriptAngularServiceGenerator extends TypeScriptFileGene
                             return ts.property(key, { value: ts.string(value.parser) });
                         }),
                     ],
-                })}`}
-              }`}
+                })}`}
+              }`}
             )`,
             ], '\n'),
         });

package/esm/src/generators/services/easy-network-stub/easy-network-stub-generator.js

@@ -94,15 +94,15 @@ export class DefaultTypeScriptEasyNetworkStubGenerator extends TypeScriptFileGen
             ],
             returnType: 'this',
             body: appendValueGroup([
-                s `this.stubWrapper.stub2<${requestType}>()(${s.indent `
-              ${ts.string(endpoint.method.toUpperCase())},
-              ${this.getStubClassName(ctx)}.${this.getEndpointPathPropertyName(ctx, endpoint)},
-              async (request) => {${s.indent `
-                if (this.stubWrapper.options.rememberRequests) {${s.indent `
-                  this.${this.getEndpointRequestsFieldName(ctx, endpoint)}.push(request);`}
-                }
-                throw await response(${this.getResponderVariableName(ctx, endpoint)}, request);`}
-              }`}
+                s `this.stubWrapper.stub2<${requestType}>()(${s.indent `
+              ${ts.string(endpoint.method.toUpperCase())},
+              ${this.getStubClassName(ctx)}.${this.getEndpointPathPropertyName(ctx, endpoint)},
+              async (request) => {${s.indent `
+                if (this.stubWrapper.options.rememberRequests) {${s.indent `
+                  this.${this.getEndpointRequestsFieldName(ctx, endpoint)}.push(request);`}
+                }
+                throw await response(${this.getResponderVariableName(ctx, endpoint)}, request);`}
+              }`}
             );`,
                 'return this;',
             ], '\n'),