@opra/client 0.26.4 → 0.27.0

package/browser.js

@@ -10,10 +10,6 @@ var __name = (target, value) => __defProp(target, "name", { value, configurable:
 import { ApiDocumentFactory } from "@opra/common";
 
 // ../../build/client/esm/constants.js
-var OPRA_JSON_CONTENT_TYPE_PATTERN = /^application\/\bopra\+json\b/i;
-var JSON_CONTENT_TYPE_PATTERN = /^application\/([\w-]+\+)?\bjson\b/i;
-var TEXT_CONTENT_TYPE_PATTERN = /^text\/.*$/i;
-var FORMDATA_CONTENT_TYPE_PATTERN = /^multipart\/\bform-data\b/i;
 var kClient = Symbol.for("kClient");
 var kContext = Symbol.for("kContext");
 
@@ -24,6 +20,7 @@ import { OpraURL as OpraURL3 } from "@opra/common";
 // ../../build/client/esm/impl/http-request-observable.js
 import { lastValueFrom, Observable } from "rxjs";
 import { isReadableStreamLike } from "rxjs/internal/util/isReadableStreamLike";
+import typeIs from "type-is";
 import { isBlob, OpraURL as OpraURL2 } from "@opra/common";
 
 // ../../build/client/esm/client-error.js
@@ -164,6 +161,7 @@ var HttpRequestObservable = class extends Observable {
     return this;
   }
   observe(observe) {
+    observe = observe || HttpObserveType.Body;
     return new Observable((subscriber) => {
       this[kIntlObservable].subscribe((event) => {
         if (observe === HttpObserveType.Events) {
@@ -175,22 +173,33 @@ var HttpRequestObservable = class extends Observable {
           subscriber.complete();
           return;
         }
-        if (observe === HttpObserveType.Body && event.event === HttpEventType.Response) {
-          subscriber.next(event.response.body);
-          subscriber.complete();
-          return;
-        }
         if (event.event === HttpEventType.Response) {
-          subscriber.next(event.response);
+          const { response } = event;
+          const isOpraResponse = typeIs.is(event.response.contentType || "", ["application/opra+json"]);
+          if (observe === HttpObserveType.Response) {
+            subscriber.next(response);
+            subscriber.complete();
+            return;
+          }
+          if (response.status >= 400 && response.status < 600) {
+            subscriber.error(new ClientError({
+              message: response.status + " " + response.statusText,
+              status: response.status,
+              issues: isOpraResponse ? response.body.errors : void 0
+            }));
+            subscriber.complete();
+            return;
+          }
+          subscriber.next(event.response.body);
           subscriber.complete();
         }
       }, (error) => subscriber.error(error), () => subscriber.complete());
     });
   }
   toPromise() {
-    return this.getData();
+    return this.getBody();
   }
-  getData() {
+  getBody() {
     return lastValueFrom(this.observe(HttpObserveType.Body));
   }
   getResponse() {
@@ -211,12 +220,14 @@ var HttpRequestObservable = class extends Observable {
         });
         const url = new OpraURL2(request.url, clientContext.serviceUrl);
         const fetchResponse = await clientContext.fetch(url.toString(), request);
+        const contentType = (fetchResponse.headers.get("content-type") || "").split(";")[0];
         const headersResponse = clientContext.createResponse({
           url: fetchResponse.url,
           headers: fetchResponse.headers,
           status: fetchResponse.status,
           statusText: fetchResponse.statusText,
-          hasBody: !!fetchResponse.body
+          hasBody: !!fetchResponse.body,
+          contentType
         });
         subscriber.next({
           request,
@@ -224,30 +235,17 @@ var HttpRequestObservable = class extends Observable {
           response: headersResponse
         });
         const body = fetchResponse.body ? await this._parseBody(fetchResponse) : void 0;
-        if (fetchResponse.status >= 400 && fetchResponse.status <= 599) {
-          subscriber.error(new ClientError({
-            message: fetchResponse.status + " " + fetchResponse.statusText,
-            status: fetchResponse.status,
-            issues: body.errors
-          }));
-          subscriber.complete();
-          return;
-        }
-        const contentType = fetchResponse.headers.get("Content-Type") || "";
         const responseInit = {
           url: fetchResponse.url,
           headers: fetchResponse.headers,
           status: fetchResponse.status,
           statusText: fetchResponse.statusText,
+          contentType,
           body
         };
-        if (OPRA_JSON_CONTENT_TYPE_PATTERN.test(contentType)) {
-          responseInit.totalCount = body?.totalCount;
-          responseInit.affected = body?.affected;
-        }
         const response = clientContext.createResponse(responseInit);
         for (const interceptor of clientContext.responseInterceptors) {
-          await interceptor(response);
+          await interceptor(response, request);
         }
         subscriber.next({
           request,
@@ -296,13 +294,13 @@ var HttpRequestObservable = class extends Observable {
   async _parseBody(fetchResponse) {
     let body;
     const contentType = fetchResponse.headers.get("Content-Type") || "";
-    if (JSON_CONTENT_TYPE_PATTERN.test(contentType)) {
+    if (typeIs.is(contentType, ["json", "application/*+json"])) {
       body = await fetchResponse.json();
       if (typeof body === "string")
         body = JSON.parse(body);
-    } else if (TEXT_CONTENT_TYPE_PATTERN.test(contentType))
+    } else if (typeIs.is(contentType, ["text"]))
       body = await fetchResponse.text();
-    else if (FORMDATA_CONTENT_TYPE_PATTERN.test(contentType))
+    else if (typeIs.is(contentType, ["multipart"]))
       body = await fetchResponse.formData();
     else {
       const buf = await fetchResponse.arrayBuffer();
@@ -441,7 +439,6 @@ var HttpResponse = class _HttpResponse {
     this.ok = this.status >= 200 && this.status < 300;
     this.body = init?.body;
     this.hasBody = init?.body != null || !!init?.hasBody;
-    this.totalCount = init?.totalCount;
   }
   clone(update) {
     return new _HttpResponse({ ...this, ...update });
@@ -549,7 +546,7 @@ var OpraHttpClient = class {
       url: "",
       headers: { "accept": "application/json" }
     });
-    this._metadataPromise = promise = controller.getData();
+    this._metadataPromise = promise = controller.getBody();
     return await promise.then(async (body) => {
       if (!body)
         throw new Error(`No response returned.`);

package/cjs/client.js

@@ -47,7 +47,7 @@ class OpraHttpClient {
             url: '',
             headers: { 'accept': 'application/json' }
         });
-        this._metadataPromise = promise = controller.getData();
+        this._metadataPromise = promise = controller.getBody();
         return await promise
             .then(async (body) => {
             if (!body)

package/cjs/constants.js

@@ -1,9 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.kContext = exports.kClient = exports.FORMDATA_CONTENT_TYPE_PATTERN = exports.TEXT_CONTENT_TYPE_PATTERN = exports.JSON_CONTENT_TYPE_PATTERN = exports.OPRA_JSON_CONTENT_TYPE_PATTERN = void 0;
-exports.OPRA_JSON_CONTENT_TYPE_PATTERN = /^application\/\bopra\+json\b/i;
-exports.JSON_CONTENT_TYPE_PATTERN = /^application\/([\w-]+\+)?\bjson\b/i;
-exports.TEXT_CONTENT_TYPE_PATTERN = /^text\/.*$/i;
-exports.FORMDATA_CONTENT_TYPE_PATTERN = /^multipart\/\bform-data\b/i;
+exports.kContext = exports.kClient = void 0;
 exports.kClient = Symbol.for('kClient');
 exports.kContext = Symbol.for('kContext');

package/cjs/impl/http-request-observable.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpRequestObservable = void 0;
+const tslib_1 = require("tslib");
 const rxjs_1 = require("rxjs");
 const isReadableStreamLike_1 = require("rxjs/internal/util/isReadableStreamLike");
+const type_is_1 = tslib_1.__importDefault(require("type-is"));
 const common_1 = require("@opra/common");
 const client_error_js_1 = require("../client-error.js");
 const constants_js_1 = require("../constants.js");
@@ -78,6 +80,7 @@ class HttpRequestObservable extends rxjs_1.Observable {
         return this;
     }
     observe(observe) {
+        observe = observe || index_js_1.HttpObserveType.Body;
         return new rxjs_1.Observable((subscriber) => {
             this[kIntlObservable].subscribe((event) => {
                 if (observe === index_js_1.HttpObserveType.Events) {
@@ -89,22 +92,33 @@ class HttpRequestObservable extends rxjs_1.Observable {
                     subscriber.complete();
                     return;
                 }
-                if (observe === index_js_1.HttpObserveType.Body && event.event === index_js_2.HttpEventType.Response) {
-                    subscriber.next(event.response.body);
-                    subscriber.complete();
-                    return;
-                }
                 if (event.event === index_js_2.HttpEventType.Response) {
-                    subscriber.next(event.response);
+                    const { response } = event;
+                    const isOpraResponse = type_is_1.default.is(event.response.contentType || '', ['application/opra+json']);
+                    if (observe === index_js_1.HttpObserveType.Response) {
+                        subscriber.next(response);
+                        subscriber.complete();
+                        return;
+                    }
+                    if (response.status >= 400 && response.status < 600) {
+                        subscriber.error(new client_error_js_1.ClientError({
+                            message: response.status + ' ' + response.statusText,
+                            status: response.status,
+                            issues: isOpraResponse ? response.body.errors : undefined
+                        }));
+                        subscriber.complete();
+                        return;
+                    }
+                    subscriber.next(event.response.body);
                     subscriber.complete();
                 }
             }, (error) => subscriber.error(error), () => subscriber.complete());
         });
     }
     toPromise() {
-        return this.getData();
+        return this.getBody();
     }
-    getData() {
+    getBody() {
         return (0, rxjs_1.lastValueFrom)(this.observe(index_js_1.HttpObserveType.Body));
     }
     getResponse() {
@@ -129,13 +143,15 @@ class HttpRequestObservable extends rxjs_1.Observable {
                 // Send request
                 const url = new common_1.OpraURL(request.url, clientContext.serviceUrl);
                 const fetchResponse = await clientContext.fetch(url.toString(), request);
+                const contentType = (fetchResponse.headers.get('content-type') || '').split(';')[0];
                 // Emit 'response-header' event
                 const headersResponse = clientContext.createResponse({
                     url: fetchResponse.url,
                     headers: fetchResponse.headers,
                     status: fetchResponse.status,
                     statusText: fetchResponse.statusText,
-                    hasBody: !!fetchResponse.body
+                    hasBody: !!fetchResponse.body,
+                    contentType
                 });
                 subscriber.next({
                     request,
@@ -146,33 +162,19 @@ class HttpRequestObservable extends rxjs_1.Observable {
                 const body = fetchResponse.body
                     ? await this._parseBody(fetchResponse)
                     : undefined;
-                // Handle errors
-                if (fetchResponse.status >= 400 && fetchResponse.status <= 599) {
-                    subscriber.error(new client_error_js_1.ClientError({
-                        message: fetchResponse.status + ' ' + fetchResponse.statusText,
-                        status: fetchResponse.status,
-                        issues: body.errors
-                    }));
-                    subscriber.complete();
-                    return;
-                }
                 // Create response
-                const contentType = fetchResponse.headers.get('Content-Type') || '';
                 const responseInit = {
                     url: fetchResponse.url,
                     headers: fetchResponse.headers,
                     status: fetchResponse.status,
                     statusText: fetchResponse.statusText,
+                    contentType,
                     body,
                 };
-                if (constants_js_1.OPRA_JSON_CONTENT_TYPE_PATTERN.test(contentType)) {
-                    responseInit.totalCount = body?.totalCount;
-                    responseInit.affected = body?.affected;
-                }
                 const response = clientContext.createResponse(responseInit);
                 // Call response Interceptors
                 for (const interceptor of clientContext.responseInterceptors) {
-                    await interceptor(response);
+                    await interceptor(response, request);
                 }
                 // Emit 'response' event
                 subscriber.next({
@@ -225,15 +227,15 @@ class HttpRequestObservable extends rxjs_1.Observable {
     }
     async _parseBody(fetchResponse) {
         let body;
-        const contentType = fetchResponse.headers.get('Content-Type') || '';
-        if (constants_js_1.JSON_CONTENT_TYPE_PATTERN.test(contentType)) {
+        const contentType = (fetchResponse.headers.get('Content-Type') || '');
+        if (type_is_1.default.is(contentType, ['json', 'application/*+json'])) {
             body = await fetchResponse.json();
             if (typeof body === 'string')
                 body = JSON.parse(body);
         }
-        else if (constants_js_1.TEXT_CONTENT_TYPE_PATTERN.test(contentType))
+        else if (type_is_1.default.is(contentType, ['text']))
             body = await fetchResponse.text();
-        else if (constants_js_1.FORMDATA_CONTENT_TYPE_PATTERN.test(contentType))
+        else if (type_is_1.default.is(contentType, ['multipart']))
             body = await fetchResponse.formData();
         else {
             const buf = await fetchResponse.arrayBuffer();

package/cjs/impl/http-response.js

@@ -15,7 +15,6 @@ class HttpResponse {
         this.ok = this.status >= 200 && this.status < 300;
         this.body = init?.body;
         this.hasBody = init?.body != null || !!init?.hasBody;
-        this.totalCount = init?.totalCount;
     }
     clone(update) {
         return new HttpResponse({ ...this, ...update });

package/esm/client.js

@@ -44,7 +44,7 @@ export class OpraHttpClient {
             url: '',
             headers: { 'accept': 'application/json' }
         });
-        this._metadataPromise = promise = controller.getData();
+        this._metadataPromise = promise = controller.getBody();
         return await promise
             .then(async (body) => {
             if (!body)

package/esm/constants.js

@@ -1,6 +1,2 @@
-export const OPRA_JSON_CONTENT_TYPE_PATTERN = /^application\/\bopra\+json\b/i;
-export const JSON_CONTENT_TYPE_PATTERN = /^application\/([\w-]+\+)?\bjson\b/i;
-export const TEXT_CONTENT_TYPE_PATTERN = /^text\/.*$/i;
-export const FORMDATA_CONTENT_TYPE_PATTERN = /^multipart\/\bform-data\b/i;
 export const kClient = Symbol.for('kClient');
 export const kContext = Symbol.for('kContext');

package/esm/impl/http-request-observable.js

@@ -1,8 +1,9 @@
 import { lastValueFrom, Observable } from 'rxjs';
 import { isReadableStreamLike } from 'rxjs/internal/util/isReadableStreamLike';
+import typeIs from 'type-is';
 import { isBlob, OpraURL } from '@opra/common';
 import { ClientError } from '../client-error.js';
-import { FORMDATA_CONTENT_TYPE_PATTERN, JSON_CONTENT_TYPE_PATTERN, kClient, kContext, OPRA_JSON_CONTENT_TYPE_PATTERN, TEXT_CONTENT_TYPE_PATTERN } from '../constants.js';
+import { kClient, kContext } from '../constants.js';
 import { HttpObserveType } from '../enums/index.js';
 import { HttpEventType } from '../interfaces/index.js';
 import { HttpRequest } from './http-request.js';
@@ -75,6 +76,7 @@ export class HttpRequestObservable extends Observable {
         return this;
     }
     observe(observe) {
+        observe = observe || HttpObserveType.Body;
         return new Observable((subscriber) => {
             this[kIntlObservable].subscribe((event) => {
                 if (observe === HttpObserveType.Events) {
@@ -86,22 +88,33 @@ export class HttpRequestObservable extends Observable {
                     subscriber.complete();
                     return;
                 }
-                if (observe === HttpObserveType.Body && event.event === HttpEventType.Response) {
-                    subscriber.next(event.response.body);
-                    subscriber.complete();
-                    return;
-                }
                 if (event.event === HttpEventType.Response) {
-                    subscriber.next(event.response);
+                    const { response } = event;
+                    const isOpraResponse = typeIs.is(event.response.contentType || '', ['application/opra+json']);
+                    if (observe === HttpObserveType.Response) {
+                        subscriber.next(response);
+                        subscriber.complete();
+                        return;
+                    }
+                    if (response.status >= 400 && response.status < 600) {
+                        subscriber.error(new ClientError({
+                            message: response.status + ' ' + response.statusText,
+                            status: response.status,
+                            issues: isOpraResponse ? response.body.errors : undefined
+                        }));
+                        subscriber.complete();
+                        return;
+                    }
+                    subscriber.next(event.response.body);
                     subscriber.complete();
                 }
             }, (error) => subscriber.error(error), () => subscriber.complete());
         });
     }
     toPromise() {
-        return this.getData();
+        return this.getBody();
     }
-    getData() {
+    getBody() {
         return lastValueFrom(this.observe(HttpObserveType.Body));
     }
     getResponse() {
@@ -126,13 +139,15 @@ export class HttpRequestObservable extends Observable {
                 // Send request
                 const url = new OpraURL(request.url, clientContext.serviceUrl);
                 const fetchResponse = await clientContext.fetch(url.toString(), request);
+                const contentType = (fetchResponse.headers.get('content-type') || '').split(';')[0];
                 // Emit 'response-header' event
                 const headersResponse = clientContext.createResponse({
                     url: fetchResponse.url,
                     headers: fetchResponse.headers,
                     status: fetchResponse.status,
                     statusText: fetchResponse.statusText,
-                    hasBody: !!fetchResponse.body
+                    hasBody: !!fetchResponse.body,
+                    contentType
                 });
                 subscriber.next({
                     request,
@@ -143,33 +158,19 @@ export class HttpRequestObservable extends Observable {
                 const body = fetchResponse.body
                     ? await this._parseBody(fetchResponse)
                     : undefined;
-                // Handle errors
-                if (fetchResponse.status >= 400 && fetchResponse.status <= 599) {
-                    subscriber.error(new ClientError({
-                        message: fetchResponse.status + ' ' + fetchResponse.statusText,
-                        status: fetchResponse.status,
-                        issues: body.errors
-                    }));
-                    subscriber.complete();
-                    return;
-                }
                 // Create response
-                const contentType = fetchResponse.headers.get('Content-Type') || '';
                 const responseInit = {
                     url: fetchResponse.url,
                     headers: fetchResponse.headers,
                     status: fetchResponse.status,
                     statusText: fetchResponse.statusText,
+                    contentType,
                     body,
                 };
-                if (OPRA_JSON_CONTENT_TYPE_PATTERN.test(contentType)) {
-                    responseInit.totalCount = body?.totalCount;
-                    responseInit.affected = body?.affected;
-                }
                 const response = clientContext.createResponse(responseInit);
                 // Call response Interceptors
                 for (const interceptor of clientContext.responseInterceptors) {
-                    await interceptor(response);
+                    await interceptor(response, request);
                 }
                 // Emit 'response' event
                 subscriber.next({
@@ -222,15 +223,15 @@ export class HttpRequestObservable extends Observable {
     }
     async _parseBody(fetchResponse) {
         let body;
-        const contentType = fetchResponse.headers.get('Content-Type') || '';
-        if (JSON_CONTENT_TYPE_PATTERN.test(contentType)) {
+        const contentType = (fetchResponse.headers.get('Content-Type') || '');
+        if (typeIs.is(contentType, ['json', 'application/*+json'])) {
             body = await fetchResponse.json();
             if (typeof body === 'string')
                 body = JSON.parse(body);
         }
-        else if (TEXT_CONTENT_TYPE_PATTERN.test(contentType))
+        else if (typeIs.is(contentType, ['text']))
             body = await fetchResponse.text();
-        else if (FORMDATA_CONTENT_TYPE_PATTERN.test(contentType))
+        else if (typeIs.is(contentType, ['multipart']))
             body = await fetchResponse.formData();
         else {
             const buf = await fetchResponse.arrayBuffer();

package/esm/impl/http-response.js

@@ -12,7 +12,6 @@ export class HttpResponse {
         this.ok = this.status >= 200 && this.status < 300;
         this.body = init?.body;
         this.hasBody = init?.body != null || !!init?.hasBody;
-        this.totalCount = init?.totalCount;
     }
     clone(update) {
         return new HttpResponse({ ...this, ...update });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/client",
-  "version": "0.26.4",
+  "version": "0.27.0",
   "description": "Opra Client package",
   "author": "Panates",
   "license": "MIT",
@@ -38,7 +38,7 @@
     "@browsery/i18next": "^0.6.0",
     "@browsery/stream": "^0.5.0",
     "@browsery/util": "^0.4.0",
-    "@opra/common": "^0.26.4",
+    "@opra/common": "^0.27.0",
     "accepts": "^1.3.8",
     "buffer": "^6.0.3",
     "cookie": "^0.5.0",
@@ -51,7 +51,7 @@
     "path-browserify": "^1.0.1",
     "process": "^0.11.10",
     "putil-isplainobject": "^1.1.5",
-    "putil-merge": "^3.11.0",
+    "putil-merge": "^3.12.1",
     "putil-promisify": "^1.10.1",
     "putil-varhelpers": "^1.6.5",
     "reflect-metadata": "^0.1.13",

package/types/constants.d.ts

@@ -1,6 +1,2 @@
-export declare const OPRA_JSON_CONTENT_TYPE_PATTERN: RegExp;
-export declare const JSON_CONTENT_TYPE_PATTERN: RegExp;
-export declare const TEXT_CONTENT_TYPE_PATTERN: RegExp;
-export declare const FORMDATA_CONTENT_TYPE_PATTERN: RegExp;
 export declare const kClient: unique symbol;
 export declare const kContext: unique symbol;

package/types/impl/collection-node.d.ts

@@ -1,5 +1,5 @@
 import type { PartialInput } from '@opra/common';
-import { OpraFilter } from '@opra/common';
+import { OperationResult, OpraFilter } from '@opra/common';
 import type { OpraHttpClient } from '../client.js';
 import { HttpRequestObservable } from './http-request-observable.js';
 /**
@@ -9,13 +9,13 @@ export declare class HttpCollectionNode<TType, TResponseExt = {}> {
     protected _client: OpraHttpClient;
     protected _path: string;
     constructor(client: OpraHttpClient<any>, path: string);
-    create(data: PartialInput<TType>, options?: HttpCollectionNode.CreateOptions): HttpRequestObservable<TType, TResponseExt>;
-    delete(id: any): HttpRequestObservable<never, TResponseExt>;
-    deleteMany(options?: HttpCollectionNode.DeleteManyOptions): HttpRequestObservable<HttpCollectionNode.DeleteManyBody, TResponseExt>;
-    get(id: any, options?: HttpCollectionNode.GetOptions): HttpRequestObservable<TType, TResponseExt>;
-    findMany(options?: HttpCollectionNode.FindManyOptions): HttpRequestObservable<HttpCollectionNode.FindManyBody<TType>, TResponseExt>;
-    update(id: any, data: PartialInput<TType>, options?: HttpCollectionNode.UpdateOptions): HttpRequestObservable<TType, TResponseExt>;
-    updateMany(data: PartialInput<TType>, options?: HttpCollectionNode.UpdateManyOptions): HttpRequestObservable<HttpCollectionNode.UpdateManyBody, TResponseExt>;
+    create(data: PartialInput<TType>, options?: HttpCollectionNode.CreateOptions): HttpRequestObservable<OperationResult<TType>, TResponseExt>;
+    delete(id: any): HttpRequestObservable<OperationResult<never>, TResponseExt>;
+    deleteMany(options?: HttpCollectionNode.DeleteManyOptions): HttpRequestObservable<OperationResult<never>, TResponseExt>;
+    get(id: any, options?: HttpCollectionNode.GetOptions): HttpRequestObservable<OperationResult<TType>, TResponseExt>;
+    findMany(options?: HttpCollectionNode.FindManyOptions): HttpRequestObservable<OperationResult<TType[]>, TResponseExt>;
+    update(id: any, data: PartialInput<TType>, options?: HttpCollectionNode.UpdateOptions): HttpRequestObservable<OperationResult<TType>, TResponseExt>;
+    updateMany(data: PartialInput<TType>, options?: HttpCollectionNode.UpdateManyOptions): HttpRequestObservable<OperationResult<never>, TResponseExt>;
 }
 /**
  * @namespace
@@ -53,14 +53,4 @@ export declare namespace HttpCollectionNode {
     interface UpdateManyOptions {
         filter?: string | OpraFilter.Expression;
     }
-    interface DeleteManyBody {
-        affected: number;
-    }
-    interface UpdateManyBody {
-        affected: number;
-    }
-    interface FindManyBody<TType> {
-        totalCount?: number;
-        data: TType[];
-    }
 }

package/types/impl/http-request-observable.d.ts

@@ -21,7 +21,7 @@ declare const kIntlObservable: unique symbol;
 /**
  * @class HttpRequestObservable
  */
-export declare class HttpRequestObservable<TBody = any, TResponseExt = {}> extends Observable<TBody> {
+export declare class HttpRequestObservable<TPayload = any, TResponseExt = {}> extends Observable<TPayload> {
     [kClient]: OpraHttpClient;
     [kIntlObservable]: Observable<HttpEvent>;
     request: HttpRequest;
@@ -31,15 +31,16 @@ export declare class HttpRequestObservable<TBody = any, TResponseExt = {}> exten
     header(name: string, value?: string | number | boolean | null): this;
     param(params: URLSearchParamsInit): this;
     param(name: string, value: any): this;
-    observe(observe: HttpObserveType.Body): Observable<TBody>;
+    observe(): Observable<TPayload>;
+    observe(observe: HttpObserveType.Body): Observable<any>;
     observe(observe: HttpObserveType.ResponseHeader): Observable<HttpResponse<void> & TResponseExt>;
-    observe(observe: HttpObserveType.Response): Observable<HttpResponse<TBody> & TResponseExt>;
+    observe(observe: HttpObserveType.Response): Observable<HttpResponse<any> & TResponseExt>;
     observe(observe: HttpObserveType.Events): Observable<HttpEvent>;
-    toPromise(): Promise<TBody>;
-    getData(): Promise<TBody>;
-    getResponse(): Promise<HttpResponse<TBody> & TResponseExt>;
+    toPromise(): Promise<TPayload>;
+    getBody(): Promise<TPayload>;
+    getResponse(): Promise<HttpResponse<TPayload> & TResponseExt>;
     protected _send(): Observable<HttpEvent>;
     protected _prepareRequest(): void;
-    protected _parseBody(fetchResponse: Response): Promise<TBody>;
+    protected _parseBody(fetchResponse: Response): Promise<TPayload>;
 }
 export {};

package/types/impl/http-response.d.ts

@@ -6,8 +6,7 @@ export declare namespace HttpResponse {
         url?: string;
         body?: any;
         hasBody?: boolean;
-        totalCount?: number;
-        affected?: number;
+        contentType: string;
     }
 }
 export declare class HttpResponse<TBody = any> {
@@ -34,9 +33,11 @@ export declare class HttpResponse<TBody = any> {
     /**
      * Body contents
      */
-    readonly body: TBody | null;
-    readonly totalCount?: number;
-    readonly affected?: number;
+    readonly body: TBody;
+    /**
+     * Content-Type header value without encoding part
+     */
+    readonly contentType: string;
     /**
      * Returns true if response has body to be received
      */

package/types/impl/singleton-node.d.ts

@@ -1,4 +1,4 @@
-import { PartialInput } from '@opra/common';
+import { OperationResult, PartialInput } from '@opra/common';
 import type { OpraHttpClient } from '../client.js';
 import { HttpRequestObservable } from './http-request-observable.js';
 /**
@@ -8,10 +8,10 @@ export declare class HttpSingletonNode<TType, TResponseExt = {}> {
     protected _client: OpraHttpClient;
     protected _path: string;
     constructor(client: OpraHttpClient<any>, path: string);
-    create(data: PartialInput<TType>, options?: HttpSingletonNode.CreateOptions): HttpRequestObservable<TType, TResponseExt>;
-    delete(): HttpRequestObservable<never, TResponseExt>;
-    get(options?: HttpSingletonNode.GetOptions): HttpRequestObservable<TType, TResponseExt>;
-    update(data: PartialInput<TType>, options?: HttpSingletonNode.UpdateOptions): HttpRequestObservable<TType, TResponseExt>;
+    create(data: PartialInput<TType>, options?: HttpSingletonNode.CreateOptions): HttpRequestObservable<OperationResult<TType>, TResponseExt>;
+    delete(): HttpRequestObservable<OperationResult<never>, TResponseExt>;
+    get(options?: HttpSingletonNode.GetOptions): HttpRequestObservable<OperationResult<TType>, TResponseExt>;
+    update(data: PartialInput<TType>, options?: HttpSingletonNode.UpdateOptions): HttpRequestObservable<OperationResult<TType>, TResponseExt>;
 }
 /**
  * @namespace HttpSingletonNode

package/types/types.d.ts

@@ -1,7 +1,5 @@
-import type { Observable } from 'rxjs';
-import type { HttpObserveType } from './enums/http-observable-type.enum.js';
 import type { HttpRequest } from './impl/http-request';
-export type HttpRequestHandler = (observe: HttpObserveType, request: HttpRequest) => Observable<any>;
+import type { HttpResponse } from './impl/http-response.js';
 export type RequestInterceptor = (request: HttpRequest) => void | Promise<void>;
-export type ResponseInterceptor = (response: any) => void | Promise<void>;
+export type ResponseInterceptor = (response: HttpResponse, request: HttpRequest) => void | Promise<void>;
 export type URLSearchParamsInit = string[][] | Record<string, string> | string | URLSearchParams;