@api-client/core 0.8.9 → 0.8.11

package/src/models/HttpRequest.ts

@@ -1,5 +1,7 @@
 import { SerializablePayload } from './SerializablePayload.js';
 import { Payload } from '../lib/transformers/PayloadSerializer.js';
+import { IProperty } from './Property.js';
+import { HeadersArray } from './HeadersArray.js';
 
 export const Kind = 'Core#HttpRequest';
 
@@ -28,6 +30,12 @@ export interface IBaseHttpRequest {
  */
 export interface IHttpRequest extends IBaseHttpRequest {
   kind?: string;
+
+  /**
+   * Headers model, if any.
+   * When reading headers string, the value of `headers` is preferred over the model.
+   */
+  headersModel?: Array<IProperty>;
 }
 
 /**
@@ -55,6 +63,12 @@ export class HttpRequest extends SerializablePayload {
    */
   headers?: string;
 
+  /**
+   * Headers model, if any.
+   * When reading headers string, the value of `headers` is preferred over the model.
+   */
+  headersModel?: HeadersArray;
+
   static fromBaseValues(values: IBaseHttpRequest): HttpRequest {
     return new HttpRequest({
       ...values,
@@ -88,12 +102,15 @@ export class HttpRequest extends SerializablePayload {
    * Note, this throws an error when the object is not a request.
    */
   new(init: IHttpRequest): void {
-    const { url, method='GET', headers, payload, kind = Kind } = init;
+    const { url, method='GET', headers, payload, kind = Kind, headersModel } = init;
     this.kind = kind;
     this.url = url;
     this.method = method;
     this.headers = headers;
     this.payload = payload;
+    if (Array.isArray(headersModel)) {
+      this.headersModel = HeadersArray.from(headersModel);
+    }
   }
 
   /**
@@ -119,6 +136,9 @@ export class HttpRequest extends SerializablePayload {
     if (this.payload) {
       result.payload = this.payload;
     }
+    if (this.headersModel) {
+      result.headersModel = this.headersModel.toJSON();
+    }
     return result;
   }
 }

package/src/models/RequestLog.ts

@@ -1,4 +1,4 @@
-import { IResponseRedirect, ResponseRedirect  } from './ResponseRedirect.js';
+import { IResponseRedirect, ResponseRedirect } from './ResponseRedirect.js';
 import { ISentRequest, SentRequest } from './SentRequest.js';
 import { IErrorResponse, ErrorResponse } from './ErrorResponse.js';
 import { IResponse, Response } from './Response.js';
@@ -78,7 +78,7 @@ export class RequestLog {
   /**
    * @param input The response definition used to restore the state.
    */
-  constructor(input?: string|IRequestLog) {
+  constructor(input?: string | IRequestLog) {
     let init: IRequestLog;
     if (typeof input === 'string') {
       init = JSON.parse(input);

package/src/runtime/http-engine/HttpEngine.ts

@@ -128,6 +128,7 @@ export abstract class HttpEngine extends EventEmitter {
    * The current sent request
    */
   sentRequest: SentRequest;
+
   redirects: ResponseRedirect[] = [];
   /**
    * When true the request has been aborted.
@@ -589,7 +590,7 @@ Check your request parameters.`);
     }
     message = message || 'Unknown error occurred';
     const error = new SerializableError(message, opts.code);
-    const log = RequestLog.fromRequest(this.sentRequest);
+    const log = RequestLog.fromRequest(this.sentRequest.toJSON());
     const response = ErrorResponse.fromError(error);
     log.response = response;
     if (currentResponse && currentResponse.status) {
@@ -633,7 +634,7 @@ Check your request parameters.`);
       if (!response) {
         return;
       }
-      const result = RequestLog.fromRequestResponse(this.sentRequest, response.toJSON());
+      const result = RequestLog.fromRequestResponse(this.sentRequest.toJSON(), response.toJSON());
       if (this.redirects.length) {
         result.redirects = this.redirects;
       }