@opra/client 0.23.2 → 0.24.1

package/browser.js

@@ -33,6 +33,7 @@ var ClientError = class extends Error {
 import { toArrayDef } from "putil-varhelpers";
 
 // ../../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;
@@ -194,11 +195,11 @@ var HttpCollectionNode = class {
   }
   create(data, options) {
     const context = this[kContext];
-    context.operation = "create";
+    context.endpoint = "create";
     const requestHost = new HttpRequestObservable(context, options);
     const request = requestHost[kRequest];
     request.method = "POST";
-    request.url.resolve(context.resourceName);
+    request.url.resolve(context.resource);
     request.body = data;
     if (options?.include)
       request.params.set("$include", toArrayDef(options.include, []).join(","));
@@ -212,20 +213,20 @@ var HttpCollectionNode = class {
     if (id == null)
       throw new TypeError(`'id' argument must have a value`);
     const context = this[kContext];
-    context.operation = "delete";
+    context.endpoint = "delete";
     const requestHost = new HttpRequestObservable(context, options);
     const request = requestHost[kRequest];
     request.method = "DELETE";
-    request.url.join({ resource: context.resourceName, key: id });
+    request.url.join({ resource: context.resource, key: id });
     return requestHost;
   }
   deleteMany(options) {
     const context = this[kContext];
-    context.operation = "deleteMany";
+    context.endpoint = "deleteMany";
     const requestHost = new HttpRequestObservable(context, options);
     const request = requestHost[kRequest];
     request.method = "DELETE";
-    request.url.join(context.resourceName);
+    request.url.join(context.resource);
     if (options?.filter)
       request.params.set("$filter", String(options.filter));
     return requestHost;
@@ -234,11 +235,11 @@ var HttpCollectionNode = class {
     if (id == null)
       throw new TypeError(`'id' argument must have a value`);
     const context = this[kContext];
-    context.operation = "get";
+    context.endpoint = "get";
     const requestHost = new HttpRequestObservable(context, options);
     const request = requestHost[kRequest];
     request.method = "GET";
-    request.url.join({ resource: context.resourceName, key: id });
+    request.url.join({ resource: context.resource, key: id });
     if (options?.include)
       request.params.set("$include", toArrayDef(options.include, []).join(","));
     if (options?.pick)
@@ -249,11 +250,11 @@ var HttpCollectionNode = class {
   }
   findMany(options) {
     const context = this[kContext];
-    context.operation = "findMany";
+    context.endpoint = "findMany";
     const requestHost = new HttpRequestObservable(context, options);
     const request = requestHost[kRequest];
     request.method = "GET";
-    request.url.join(context.resourceName);
+    request.url.join(context.resource);
     if (options?.include)
       request.params.set("$include", toArrayDef(options.include, []).join(","));
     if (options?.pick)
@@ -278,11 +279,11 @@ var HttpCollectionNode = class {
     if (id == null)
       throw new TypeError(`'id' argument must have a value`);
     const context = this[kContext];
-    context.operation = "update";
+    context.endpoint = "update";
     const requestHost = new HttpRequestObservable(context, options);
     const request = requestHost[kRequest];
     request.method = "PATCH";
-    request.url.join({ resource: context.resourceName, key: id });
+    request.url.join({ resource: context.resource, key: id });
     request.body = data;
     if (options?.include)
       request.params.set("$include", String(options.include));
@@ -294,11 +295,11 @@ var HttpCollectionNode = class {
   }
   updateMany(data, options) {
     const context = this[kContext];
-    context.operation = "updateMany";
+    context.endpoint = "updateMany";
     const requestHost = new HttpRequestObservable(context, options);
     const request = requestHost[kRequest];
     request.method = "PATCH";
-    request.url.join(context.resourceName);
+    request.url.join(context.resource);
     request.body = data;
     if (options?.filter)
       request.params.set("$filter", String(options.filter));
@@ -338,11 +339,11 @@ var HttpSingletonNode = class {
   }
   create(data, options) {
     const context = this[kContext];
-    context.operation = "create";
+    context.endpoint = "create";
     const requestHost = new HttpRequestObservable(context, options);
     const request = requestHost[kRequest];
     request.method = "POST";
-    request.url.join(context.resourceName);
+    request.url.join(context.resource);
     request.body = data;
     if (options?.include)
       request.params.set("$include", toArrayDef2(options.include, []).join(","));
@@ -354,20 +355,20 @@ var HttpSingletonNode = class {
   }
   delete(options) {
     const context = this[kContext];
-    context.operation = "delete";
+    context.endpoint = "delete";
     const requestHost = new HttpRequestObservable(context, options);
     const request = requestHost[kRequest];
     request.method = "DELETE";
-    request.url.join({ resource: context.resourceName });
+    request.url.join({ resource: context.resource });
     return requestHost;
   }
   get(options) {
     const context = this[kContext];
-    context.operation = "get";
+    context.endpoint = "get";
     const requestHost = new HttpRequestObservable(context, options);
     const request = requestHost[kRequest];
     request.method = "GET";
-    request.url.join({ resource: context.resourceName });
+    request.url.join({ resource: context.resource });
     if (options?.include)
       request.params.set("$include", toArrayDef2(options.include, []).join(","));
     if (options?.pick)
@@ -378,11 +379,11 @@ var HttpSingletonNode = class {
   }
   update(data, options) {
     const context = this[kContext];
-    context.operation = "update";
+    context.endpoint = "update";
     const requestHost = new HttpRequestObservable(context, options);
     const request = requestHost[kRequest];
     request.method = "PATCH";
-    request.url.join({ resource: context.resourceName });
+    request.url.join({ resource: context.resource });
     request.body = data;
     if (options?.include)
       request.params.set("$include", toArrayDef2(options.include, []).join(","));
@@ -426,12 +427,14 @@ var OpraHttpClient = class {
     if (promise) {
       return promise;
     }
-    this[kAssets].metadataPromise = promise = lastValueFrom2(this._sendRequest("Singleton", "get", HttpObserveType.Body, new HttpRequest({
+    this[kAssets].metadataPromise = promise = lastValueFrom2(this._sendRequest(HttpObserveType.Body, new HttpRequest({
       method: "GET",
-      url: "$metadata",
+      url: "",
       headers: new Headers({ "accept": "application/json" })
     })));
     return await promise.then(async (body) => {
+      if (!body)
+        throw new Error(`No response returned.`);
       const api = await DocumentFactory.createDocument(body);
       this[kAssets].api = api;
       return api;
@@ -449,42 +452,42 @@ var OpraHttpClient = class {
       resourceName = resourceName.name;
     const ctx = {
       client: this,
-      resourceKind: "Collection",
-      operation: "",
-      resourceName,
-      send: (observe, request) => this._sendRequest("Collection", ctx.operation, observe, request, ctx),
+      sourceKind: "Collection",
+      endpoint: "",
+      resource: resourceName,
+      send: (observe, request) => this._sendRequest(observe, request, "Collection", ctx.endpoint, ctx),
       // requestInterceptors: [
       //   // Validate resource exists and is a collection resource
       //   async () => {
       //     const metadata = await this.getMetadata();
-      //     metadata.getCollection(ctx.resourceName);
+      //     metadata.getCollection(ctx.sourceName);
       //   }
       // ],
       responseInterceptors: []
     };
     return new HttpCollectionNode(ctx);
   }
-  singleton(resourceName) {
-    if (typeof resourceName === "function")
-      resourceName = resourceName.name;
+  singleton(sourceName) {
+    if (typeof sourceName === "function")
+      sourceName = sourceName.name;
     const ctx = {
       client: this,
-      resourceKind: "Singleton",
-      operation: "",
-      resourceName,
-      send: (observe, request) => this._sendRequest("Singleton", ctx.operation, observe, request, ctx),
+      sourceKind: "Singleton",
+      endpoint: "",
+      resource: sourceName,
+      send: (observe, request) => this._sendRequest(observe, request, "Singleton", ctx.endpoint, ctx),
       // requestInterceptors: [
       //   // Validate resource exists and is a singleton resource
       //   async () => {
       //     const metadata = await this.getMetadata();
-      //     metadata.getSingleton(ctx.resourceName);
+      //     metadata.getSingleton(ctx.sourceName);
       //   }
       // ],
       responseInterceptors: []
     };
     return new HttpSingletonNode(ctx);
   }
-  _sendRequest(resourceKind, operation, observe, request, ctx) {
+  _sendRequest(observe, request, sourceKind, endpoint, ctx) {
     return new Observable2((subscriber) => {
       (async () => {
         request.inset(this.defaults);
@@ -537,7 +540,7 @@ var OpraHttpClient = class {
             event: HttpEventType.Sent
           });
         const response = await this._fetch(url.toString(), request);
-        await this._handleResponse(resourceKind, operation, observe, subscriber, request, response, ctx);
+        await this._handleResponse(observe, subscriber, request, response, sourceKind, endpoint, ctx);
       })().catch((error) => subscriber.error(error));
     });
   }
@@ -547,7 +550,7 @@ var OpraHttpClient = class {
   _createResponse(init) {
     return new HttpResponse(init);
   }
-  async _handleResponse(resourceKind, operation, observe, subscriber, request, fetchResponse, ctx) {
+  async _handleResponse(observe, subscriber, request, fetchResponse, sourceKind, endpoint, ctx) {
     const headers = fetchResponse.headers;
     if (observe === HttpObserveType.Events) {
       const response2 = this._createResponse({
@@ -566,12 +569,17 @@ var OpraHttpClient = class {
     }
     let body;
     let totalCount;
+    let affected;
+    const contentType = headers.get("Content-Type") || "";
     if (fetchResponse.body) {
-      if (JSON_CONTENT_TYPE_PATTERN.test(headers.get("Content-Type") || "")) {
+      if (JSON_CONTENT_TYPE_PATTERN.test(contentType)) {
         body = await fetchResponse.json();
         if (typeof body === "string")
           body = JSON.parse(body);
-        totalCount = body.totalCount;
+        if (OPRA_JSON_CONTENT_TYPE_PATTERN.test(contentType)) {
+          totalCount = body.totalCount;
+          affected = body.affected;
+        }
       } else if (TEXT_CONTENT_TYPE_PATTERN.test(headers.get("Content-Type") || ""))
         body = await fetchResponse.text();
       else if (FORMDATA_CONTENT_TYPE_PATTERN.test(headers.get("Content-Type") || ""))
@@ -600,6 +608,8 @@ var OpraHttpClient = class {
     };
     if (totalCount != null)
       responseInit.totalCount = totalCount;
+    if (affected != null)
+      responseInit.affected = affected;
     const response = this._createResponse(responseInit);
     if (ctx) {
       const responseInterceptors = [
@@ -611,7 +621,7 @@ var OpraHttpClient = class {
       }
     }
     if (observe === HttpObserveType.Body) {
-      if ((resourceKind === "Collection" || resourceKind === "Singleton") && (operation === "create" || operation === "get" || operation === "findMany" || operation === "update"))
+      if (OPRA_JSON_CONTENT_TYPE_PATTERN.test(contentType))
         subscriber.next(body.data);
       else
         subscriber.next(body);

package/cjs/client.js

@@ -41,13 +41,15 @@ class OpraHttpClient {
         if (promise) {
             return promise;
         }
-        this[kAssets].metadataPromise = promise = (0, rxjs_1.lastValueFrom)(this._sendRequest('Singleton', 'get', types_js_1.HttpObserveType.Body, new http_request_js_1.HttpRequest({
+        this[kAssets].metadataPromise = promise = (0, rxjs_1.lastValueFrom)(this._sendRequest(types_js_1.HttpObserveType.Body, new http_request_js_1.HttpRequest({
             method: 'GET',
-            url: '$metadata',
+            url: '',
             headers: new Headers({ 'accept': 'application/json' })
         })));
         return await promise
             .then(async (body) => {
+            if (!body)
+                throw new Error(`No response returned.`);
             const api = await common_1.DocumentFactory.createDocument(body);
             this[kAssets].api = api;
             return api;
@@ -68,43 +70,43 @@ class OpraHttpClient {
             resourceName = resourceName.name;
         const ctx = {
             client: this,
-            resourceKind: 'Collection',
-            operation: '',
-            resourceName,
-            send: (observe, request) => this._sendRequest('Collection', ctx.operation, observe, request, ctx),
+            sourceKind: 'Collection',
+            endpoint: '',
+            resource: resourceName,
+            send: (observe, request) => this._sendRequest(observe, request, 'Collection', ctx.endpoint, ctx),
             // requestInterceptors: [
             //   // Validate resource exists and is a collection resource
             //   async () => {
             //     const metadata = await this.getMetadata();
-            //     metadata.getCollection(ctx.resourceName);
+            //     metadata.getCollection(ctx.sourceName);
             //   }
             // ],
             responseInterceptors: []
         };
         return new collection_node_js_1.HttpCollectionNode(ctx);
     }
-    singleton(resourceName) {
+    singleton(sourceName) {
         // If name argument is a class, we extract name from the class
-        if (typeof resourceName === 'function')
-            resourceName = resourceName.name;
+        if (typeof sourceName === 'function')
+            sourceName = sourceName.name;
         const ctx = {
             client: this,
-            resourceKind: 'Singleton',
-            operation: '',
-            resourceName,
-            send: (observe, request) => this._sendRequest('Singleton', ctx.operation, observe, request, ctx),
+            sourceKind: 'Singleton',
+            endpoint: '',
+            resource: sourceName,
+            send: (observe, request) => this._sendRequest(observe, request, 'Singleton', ctx.endpoint, ctx),
             // requestInterceptors: [
             //   // Validate resource exists and is a singleton resource
             //   async () => {
             //     const metadata = await this.getMetadata();
-            //     metadata.getSingleton(ctx.resourceName);
+            //     metadata.getSingleton(ctx.sourceName);
             //   }
             // ],
             responseInterceptors: []
         };
         return new singleton_node_js_1.HttpSingletonNode(ctx);
     }
-    _sendRequest(resourceKind, operation, observe, request, ctx) {
+    _sendRequest(observe, request, sourceKind, endpoint, ctx) {
         return new rxjs_1.Observable(subscriber => {
             (async () => {
                 request.inset(this.defaults);
@@ -161,7 +163,7 @@ class OpraHttpClient {
                         event: types_js_1.HttpEventType.Sent,
                     });
                 const response = await this._fetch(url.toString(), request);
-                await this._handleResponse(resourceKind, operation, observe, subscriber, request, response, ctx);
+                await this._handleResponse(observe, subscriber, request, response, sourceKind, endpoint, ctx);
             })().catch(error => subscriber.error(error));
         });
     }
@@ -171,7 +173,7 @@ class OpraHttpClient {
     _createResponse(init) {
         return new http_response_js_1.HttpResponse(init);
     }
-    async _handleResponse(resourceKind, operation, observe, subscriber, request, fetchResponse, ctx) {
+    async _handleResponse(observe, subscriber, request, fetchResponse, sourceKind, endpoint, ctx) {
         const headers = fetchResponse.headers;
         if (observe === types_js_1.HttpObserveType.Events) {
             const response = this._createResponse({
@@ -190,12 +192,17 @@ class OpraHttpClient {
         }
         let body;
         let totalCount;
+        let affected;
+        const contentType = headers.get('Content-Type') || '';
         if (fetchResponse.body) {
-            if (constants_js_1.JSON_CONTENT_TYPE_PATTERN.test(headers.get('Content-Type') || '')) {
+            if (constants_js_1.JSON_CONTENT_TYPE_PATTERN.test(contentType)) {
                 body = await fetchResponse.json();
                 if (typeof body === 'string')
                     body = JSON.parse(body);
-                totalCount = body.totalCount;
+                if (constants_js_1.OPRA_JSON_CONTENT_TYPE_PATTERN.test(contentType)) {
+                    totalCount = body.totalCount;
+                    affected = body.affected;
+                }
             }
             else if (constants_js_1.TEXT_CONTENT_TYPE_PATTERN.test(headers.get('Content-Type') || ''))
                 body = await fetchResponse.text();
@@ -225,6 +232,8 @@ class OpraHttpClient {
         };
         if (totalCount != null)
             responseInit.totalCount = totalCount;
+        if (affected != null)
+            responseInit.affected = affected;
         const response = this._createResponse(responseInit);
         if (ctx) {
             const responseInterceptors = [
@@ -236,8 +245,7 @@ class OpraHttpClient {
             }
         }
         if (observe === types_js_1.HttpObserveType.Body) {
-            if ((resourceKind === 'Collection' || resourceKind === 'Singleton') &&
-                (operation === 'create' || operation === 'get' || operation === 'findMany' || operation === 'update'))
+            if (constants_js_1.OPRA_JSON_CONTENT_TYPE_PATTERN.test(contentType))
                 subscriber.next(body.data);
             else
                 subscriber.next(body);

package/cjs/collection-node.js

@@ -10,11 +10,11 @@ class HttpCollectionNode {
     }
     create(data, options) {
         const context = this[constants_js_1.kContext];
-        context.operation = 'create';
+        context.endpoint = 'create';
         const requestHost = new http_request_observable_js_1.HttpRequestObservable(context, options);
         const request = requestHost[constants_js_1.kRequest];
         request.method = 'POST';
-        request.url.resolve(context.resourceName);
+        request.url.resolve(context.resource);
         request.body = data;
         if (options?.include)
             request.params.set('$include', (0, putil_varhelpers_1.toArrayDef)(options.include, []).join(','));
@@ -28,20 +28,20 @@ class HttpCollectionNode {
         if (id == null)
             throw new TypeError(`'id' argument must have a value`);
         const context = this[constants_js_1.kContext];
-        context.operation = 'delete';
+        context.endpoint = 'delete';
         const requestHost = new http_request_observable_js_1.HttpRequestObservable(context, options);
         const request = requestHost[constants_js_1.kRequest];
         request.method = 'DELETE';
-        request.url.join({ resource: context.resourceName, key: id });
+        request.url.join({ resource: context.resource, key: id });
         return requestHost;
     }
     deleteMany(options) {
         const context = this[constants_js_1.kContext];
-        context.operation = 'deleteMany';
+        context.endpoint = 'deleteMany';
         const requestHost = new http_request_observable_js_1.HttpRequestObservable(context, options);
         const request = requestHost[constants_js_1.kRequest];
         request.method = 'DELETE';
-        request.url.join(context.resourceName);
+        request.url.join(context.resource);
         if (options?.filter)
             request.params.set('$filter', String(options.filter));
         return requestHost;
@@ -50,11 +50,11 @@ class HttpCollectionNode {
         if (id == null)
             throw new TypeError(`'id' argument must have a value`);
         const context = this[constants_js_1.kContext];
-        context.operation = 'get';
+        context.endpoint = 'get';
         const requestHost = new http_request_observable_js_1.HttpRequestObservable(context, options);
         const request = requestHost[constants_js_1.kRequest];
         request.method = 'GET';
-        request.url.join({ resource: context.resourceName, key: id });
+        request.url.join({ resource: context.resource, key: id });
         if (options?.include)
             request.params.set('$include', (0, putil_varhelpers_1.toArrayDef)(options.include, []).join(','));
         if (options?.pick)
@@ -65,11 +65,11 @@ class HttpCollectionNode {
     }
     findMany(options) {
         const context = this[constants_js_1.kContext];
-        context.operation = 'findMany';
+        context.endpoint = 'findMany';
         const requestHost = new http_request_observable_js_1.HttpRequestObservable(context, options);
         const request = requestHost[constants_js_1.kRequest];
         request.method = 'GET';
-        request.url.join(context.resourceName);
+        request.url.join(context.resource);
         if (options?.include)
             request.params.set('$include', (0, putil_varhelpers_1.toArrayDef)(options.include, []).join(','));
         if (options?.pick)
@@ -94,11 +94,11 @@ class HttpCollectionNode {
         if (id == null)
             throw new TypeError(`'id' argument must have a value`);
         const context = this[constants_js_1.kContext];
-        context.operation = 'update';
+        context.endpoint = 'update';
         const requestHost = new http_request_observable_js_1.HttpRequestObservable(context, options);
         const request = requestHost[constants_js_1.kRequest];
         request.method = 'PATCH';
-        request.url.join({ resource: context.resourceName, key: id });
+        request.url.join({ resource: context.resource, key: id });
         request.body = data;
         if (options?.include)
             request.params.set('$include', String(options.include));
@@ -110,11 +110,11 @@ class HttpCollectionNode {
     }
     updateMany(data, options) {
         const context = this[constants_js_1.kContext];
-        context.operation = 'updateMany';
+        context.endpoint = 'updateMany';
         const requestHost = new http_request_observable_js_1.HttpRequestObservable(context, options);
         const request = requestHost[constants_js_1.kRequest];
         request.method = 'PATCH';
-        request.url.join(context.resourceName);
+        request.url.join(context.resource);
         request.body = data;
         if (options?.filter)
             request.params.set('$filter', String(options.filter));

package/cjs/constants.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.kContext = exports.kRequest = exports.FORMDATA_CONTENT_TYPE_PATTERN = exports.TEXT_CONTENT_TYPE_PATTERN = exports.JSON_CONTENT_TYPE_PATTERN = void 0;
+exports.kContext = exports.kRequest = 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;

package/cjs/singleton-node.js

@@ -10,11 +10,11 @@ class HttpSingletonNode {
     }
     create(data, options) {
         const context = this[constants_js_1.kContext];
-        context.operation = 'create';
+        context.endpoint = 'create';
         const requestHost = new http_request_observable_js_1.HttpRequestObservable(context, options);
         const request = requestHost[constants_js_1.kRequest];
         request.method = 'POST';
-        request.url.join(context.resourceName);
+        request.url.join(context.resource);
         request.body = data;
         if (options?.include)
             request.params.set('$include', (0, putil_varhelpers_1.toArrayDef)(options.include, []).join(','));
@@ -26,20 +26,20 @@ class HttpSingletonNode {
     }
     delete(options) {
         const context = this[constants_js_1.kContext];
-        context.operation = 'delete';
+        context.endpoint = 'delete';
         const requestHost = new http_request_observable_js_1.HttpRequestObservable(context, options);
         const request = requestHost[constants_js_1.kRequest];
         request.method = 'DELETE';
-        request.url.join({ resource: context.resourceName });
+        request.url.join({ resource: context.resource });
         return requestHost;
     }
     get(options) {
         const context = this[constants_js_1.kContext];
-        context.operation = 'get';
+        context.endpoint = 'get';
         const requestHost = new http_request_observable_js_1.HttpRequestObservable(context, options);
         const request = requestHost[constants_js_1.kRequest];
         request.method = 'GET';
-        request.url.join({ resource: context.resourceName });
+        request.url.join({ resource: context.resource });
         if (options?.include)
             request.params.set('$include', (0, putil_varhelpers_1.toArrayDef)(options.include, []).join(','));
         if (options?.pick)
@@ -50,11 +50,11 @@ class HttpSingletonNode {
     }
     update(data, options) {
         const context = this[constants_js_1.kContext];
-        context.operation = 'update';
+        context.endpoint = 'update';
         const requestHost = new http_request_observable_js_1.HttpRequestObservable(context, options);
         const request = requestHost[constants_js_1.kRequest];
         request.method = 'PATCH';
-        request.url.join({ resource: context.resourceName });
+        request.url.join({ resource: context.resource });
         request.body = data;
         if (options?.include)
             request.params.set('$include', (0, putil_varhelpers_1.toArrayDef)(options.include, []).join(','));

package/esm/client.js

@@ -3,7 +3,7 @@ import { isReadableStreamLike } from 'rxjs/internal/util/isReadableStreamLike';
 import { DocumentFactory, isBlob, OpraURL } from '@opra/common';
 import { ClientError } from './client-error.js';
 import { HttpCollectionNode } from './collection-node.js';
-import { FORMDATA_CONTENT_TYPE_PATTERN, JSON_CONTENT_TYPE_PATTERN, TEXT_CONTENT_TYPE_PATTERN } from './constants.js';
+import { FORMDATA_CONTENT_TYPE_PATTERN, JSON_CONTENT_TYPE_PATTERN, OPRA_JSON_CONTENT_TYPE_PATTERN, TEXT_CONTENT_TYPE_PATTERN } from './constants.js';
 import { HttpRequest } from './http-request.js';
 import { HttpResponse } from './http-response.js';
 import { HttpSingletonNode } from './singleton-node.js';
@@ -38,13 +38,15 @@ export class OpraHttpClient {
         if (promise) {
             return promise;
         }
-        this[kAssets].metadataPromise = promise = lastValueFrom(this._sendRequest('Singleton', 'get', HttpObserveType.Body, new HttpRequest({
+        this[kAssets].metadataPromise = promise = lastValueFrom(this._sendRequest(HttpObserveType.Body, new HttpRequest({
             method: 'GET',
-            url: '$metadata',
+            url: '',
             headers: new Headers({ 'accept': 'application/json' })
         })));
         return await promise
             .then(async (body) => {
+            if (!body)
+                throw new Error(`No response returned.`);
             const api = await DocumentFactory.createDocument(body);
             this[kAssets].api = api;
             return api;
@@ -65,43 +67,43 @@ export class OpraHttpClient {
             resourceName = resourceName.name;
         const ctx = {
             client: this,
-            resourceKind: 'Collection',
-            operation: '',
-            resourceName,
-            send: (observe, request) => this._sendRequest('Collection', ctx.operation, observe, request, ctx),
+            sourceKind: 'Collection',
+            endpoint: '',
+            resource: resourceName,
+            send: (observe, request) => this._sendRequest(observe, request, 'Collection', ctx.endpoint, ctx),
             // requestInterceptors: [
             //   // Validate resource exists and is a collection resource
             //   async () => {
             //     const metadata = await this.getMetadata();
-            //     metadata.getCollection(ctx.resourceName);
+            //     metadata.getCollection(ctx.sourceName);
             //   }
             // ],
             responseInterceptors: []
         };
         return new HttpCollectionNode(ctx);
     }
-    singleton(resourceName) {
+    singleton(sourceName) {
         // If name argument is a class, we extract name from the class
-        if (typeof resourceName === 'function')
-            resourceName = resourceName.name;
+        if (typeof sourceName === 'function')
+            sourceName = sourceName.name;
         const ctx = {
             client: this,
-            resourceKind: 'Singleton',
-            operation: '',
-            resourceName,
-            send: (observe, request) => this._sendRequest('Singleton', ctx.operation, observe, request, ctx),
+            sourceKind: 'Singleton',
+            endpoint: '',
+            resource: sourceName,
+            send: (observe, request) => this._sendRequest(observe, request, 'Singleton', ctx.endpoint, ctx),
             // requestInterceptors: [
             //   // Validate resource exists and is a singleton resource
             //   async () => {
             //     const metadata = await this.getMetadata();
-            //     metadata.getSingleton(ctx.resourceName);
+            //     metadata.getSingleton(ctx.sourceName);
             //   }
             // ],
             responseInterceptors: []
         };
         return new HttpSingletonNode(ctx);
     }
-    _sendRequest(resourceKind, operation, observe, request, ctx) {
+    _sendRequest(observe, request, sourceKind, endpoint, ctx) {
         return new Observable(subscriber => {
             (async () => {
                 request.inset(this.defaults);
@@ -158,7 +160,7 @@ export class OpraHttpClient {
                         event: HttpEventType.Sent,
                     });
                 const response = await this._fetch(url.toString(), request);
-                await this._handleResponse(resourceKind, operation, observe, subscriber, request, response, ctx);
+                await this._handleResponse(observe, subscriber, request, response, sourceKind, endpoint, ctx);
             })().catch(error => subscriber.error(error));
         });
     }
@@ -168,7 +170,7 @@ export class OpraHttpClient {
     _createResponse(init) {
         return new HttpResponse(init);
     }
-    async _handleResponse(resourceKind, operation, observe, subscriber, request, fetchResponse, ctx) {
+    async _handleResponse(observe, subscriber, request, fetchResponse, sourceKind, endpoint, ctx) {
         const headers = fetchResponse.headers;
         if (observe === HttpObserveType.Events) {
             const response = this._createResponse({
@@ -187,12 +189,17 @@ export class OpraHttpClient {
         }
         let body;
         let totalCount;
+        let affected;
+        const contentType = headers.get('Content-Type') || '';
         if (fetchResponse.body) {
-            if (JSON_CONTENT_TYPE_PATTERN.test(headers.get('Content-Type') || '')) {
+            if (JSON_CONTENT_TYPE_PATTERN.test(contentType)) {
                 body = await fetchResponse.json();
                 if (typeof body === 'string')
                     body = JSON.parse(body);
-                totalCount = body.totalCount;
+                if (OPRA_JSON_CONTENT_TYPE_PATTERN.test(contentType)) {
+                    totalCount = body.totalCount;
+                    affected = body.affected;
+                }
             }
             else if (TEXT_CONTENT_TYPE_PATTERN.test(headers.get('Content-Type') || ''))
                 body = await fetchResponse.text();
@@ -222,6 +229,8 @@ export class OpraHttpClient {
         };
         if (totalCount != null)
             responseInit.totalCount = totalCount;
+        if (affected != null)
+            responseInit.affected = affected;
         const response = this._createResponse(responseInit);
         if (ctx) {
             const responseInterceptors = [
@@ -233,8 +242,7 @@ export class OpraHttpClient {
             }
         }
         if (observe === HttpObserveType.Body) {
-            if ((resourceKind === 'Collection' || resourceKind === 'Singleton') &&
-                (operation === 'create' || operation === 'get' || operation === 'findMany' || operation === 'update'))
+            if (OPRA_JSON_CONTENT_TYPE_PATTERN.test(contentType))
                 subscriber.next(body.data);
             else
                 subscriber.next(body);

package/esm/collection-node.js

@@ -7,11 +7,11 @@ export class HttpCollectionNode {
     }
     create(data, options) {
         const context = this[kContext];
-        context.operation = 'create';
+        context.endpoint = 'create';
         const requestHost = new HttpRequestObservable(context, options);
         const request = requestHost[kRequest];
         request.method = 'POST';
-        request.url.resolve(context.resourceName);
+        request.url.resolve(context.resource);
         request.body = data;
         if (options?.include)
             request.params.set('$include', toArrayDef(options.include, []).join(','));
@@ -25,20 +25,20 @@ export class HttpCollectionNode {
         if (id == null)
             throw new TypeError(`'id' argument must have a value`);
         const context = this[kContext];
-        context.operation = 'delete';
+        context.endpoint = 'delete';
         const requestHost = new HttpRequestObservable(context, options);
         const request = requestHost[kRequest];
         request.method = 'DELETE';
-        request.url.join({ resource: context.resourceName, key: id });
+        request.url.join({ resource: context.resource, key: id });
         return requestHost;
     }
     deleteMany(options) {
         const context = this[kContext];
-        context.operation = 'deleteMany';
+        context.endpoint = 'deleteMany';
         const requestHost = new HttpRequestObservable(context, options);
         const request = requestHost[kRequest];
         request.method = 'DELETE';
-        request.url.join(context.resourceName);
+        request.url.join(context.resource);
         if (options?.filter)
             request.params.set('$filter', String(options.filter));
         return requestHost;
@@ -47,11 +47,11 @@ export class HttpCollectionNode {
         if (id == null)
             throw new TypeError(`'id' argument must have a value`);
         const context = this[kContext];
-        context.operation = 'get';
+        context.endpoint = 'get';
         const requestHost = new HttpRequestObservable(context, options);
         const request = requestHost[kRequest];
         request.method = 'GET';
-        request.url.join({ resource: context.resourceName, key: id });
+        request.url.join({ resource: context.resource, key: id });
         if (options?.include)
             request.params.set('$include', toArrayDef(options.include, []).join(','));
         if (options?.pick)
@@ -62,11 +62,11 @@ export class HttpCollectionNode {
     }
     findMany(options) {
         const context = this[kContext];
-        context.operation = 'findMany';
+        context.endpoint = 'findMany';
         const requestHost = new HttpRequestObservable(context, options);
         const request = requestHost[kRequest];
         request.method = 'GET';
-        request.url.join(context.resourceName);
+        request.url.join(context.resource);
         if (options?.include)
             request.params.set('$include', toArrayDef(options.include, []).join(','));
         if (options?.pick)
@@ -91,11 +91,11 @@ export class HttpCollectionNode {
         if (id == null)
             throw new TypeError(`'id' argument must have a value`);
         const context = this[kContext];
-        context.operation = 'update';
+        context.endpoint = 'update';
         const requestHost = new HttpRequestObservable(context, options);
         const request = requestHost[kRequest];
         request.method = 'PATCH';
-        request.url.join({ resource: context.resourceName, key: id });
+        request.url.join({ resource: context.resource, key: id });
         request.body = data;
         if (options?.include)
             request.params.set('$include', String(options.include));
@@ -107,11 +107,11 @@ export class HttpCollectionNode {
     }
     updateMany(data, options) {
         const context = this[kContext];
-        context.operation = 'updateMany';
+        context.endpoint = 'updateMany';
         const requestHost = new HttpRequestObservable(context, options);
         const request = requestHost[kRequest];
         request.method = 'PATCH';
-        request.url.join(context.resourceName);
+        request.url.join(context.resource);
         request.body = data;
         if (options?.filter)
             request.params.set('$filter', String(options.filter));

package/esm/constants.js

@@ -1,3 +1,4 @@
+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;

package/esm/singleton-node.js

@@ -7,11 +7,11 @@ export class HttpSingletonNode {
     }
     create(data, options) {
         const context = this[kContext];
-        context.operation = 'create';
+        context.endpoint = 'create';
         const requestHost = new HttpRequestObservable(context, options);
         const request = requestHost[kRequest];
         request.method = 'POST';
-        request.url.join(context.resourceName);
+        request.url.join(context.resource);
         request.body = data;
         if (options?.include)
             request.params.set('$include', toArrayDef(options.include, []).join(','));
@@ -23,20 +23,20 @@ export class HttpSingletonNode {
     }
     delete(options) {
         const context = this[kContext];
-        context.operation = 'delete';
+        context.endpoint = 'delete';
         const requestHost = new HttpRequestObservable(context, options);
         const request = requestHost[kRequest];
         request.method = 'DELETE';
-        request.url.join({ resource: context.resourceName });
+        request.url.join({ resource: context.resource });
         return requestHost;
     }
     get(options) {
         const context = this[kContext];
-        context.operation = 'get';
+        context.endpoint = 'get';
         const requestHost = new HttpRequestObservable(context, options);
         const request = requestHost[kRequest];
         request.method = 'GET';
-        request.url.join({ resource: context.resourceName });
+        request.url.join({ resource: context.resource });
         if (options?.include)
             request.params.set('$include', toArrayDef(options.include, []).join(','));
         if (options?.pick)
@@ -47,11 +47,11 @@ export class HttpSingletonNode {
     }
     update(data, options) {
         const context = this[kContext];
-        context.operation = 'update';
+        context.endpoint = 'update';
         const requestHost = new HttpRequestObservable(context, options);
         const request = requestHost[kRequest];
         request.method = 'PATCH';
-        request.url.join({ resource: context.resourceName });
+        request.url.join({ resource: context.resource });
         request.body = data;
         if (options?.include)
             request.params.set('$include', toArrayDef(options.include, []).join(','));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/client",
-  "version": "0.23.2",
+  "version": "0.24.1",
   "description": "Opra Client package",
   "author": "Panates",
   "license": "MIT",
@@ -46,7 +46,7 @@
     "@browsery/i18next": "^0.6.0",
     "@browsery/stream": "^0.5.0",
     "@browsery/util": "^0.4.0",
-    "@opra/common": "^0.23.2",
+    "@opra/common": "^0.24.1",
     "accepts": "^1.3.8",
     "buffer": "^6.0.3",
     "cookie": "^0.5.0",

package/types/client.d.ts

@@ -36,10 +36,10 @@ export declare class OpraHttpClient {
     get serviceUrl(): string;
     getMetadata(): Promise<ApiDocument>;
     collection<TType = any>(resourceName: string | Type<TType>): HttpCollectionNode<TType>;
-    singleton<TType = any>(resourceName: string | Type<TType>): HttpSingletonNode<TType>;
-    protected _sendRequest<TBody>(resourceKind: OpraSchema.Resource.Kind, operation: string, observe: HttpObserveType, request: HttpRequest, ctx?: HttpClientContext): Observable<HttpResponse<TBody> | TBody | HttpEvent>;
+    singleton<TType = any>(sourceName: string | Type<TType>): HttpSingletonNode<TType>;
+    protected _sendRequest<TBody>(observe: HttpObserveType, request: HttpRequest, sourceKind?: OpraSchema.Resource.Kind, endpoint?: string, ctx?: HttpClientContext): Observable<HttpResponse<TBody> | TBody | HttpEvent>;
     protected _fetch(url: string, init?: RequestInit): Promise<Response>;
     protected _createResponse(init?: HttpResponse.Initiator): HttpResponse;
-    protected _handleResponse(resourceKind: OpraSchema.Resource.Kind, operation: string, observe: HttpObserveType, subscriber: Subscriber<any>, request: HttpRequest, fetchResponse: Response, ctx?: HttpClientContext): Promise<void>;
+    protected _handleResponse(observe: HttpObserveType, subscriber: Subscriber<any>, request: HttpRequest, fetchResponse: Response, sourceKind?: OpraSchema.Resource.Kind, endpoint?: string, ctx?: HttpClientContext): Promise<void>;
 }
 export {};

package/types/constants.d.ts

@@ -1,3 +1,4 @@
+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;

package/types/http-response.d.ts

@@ -7,6 +7,7 @@ export declare namespace HttpResponse {
         body?: any;
         hasBody?: boolean;
         totalCount?: number;
+        affected?: number;
     }
 }
 export declare class HttpResponse<TBody = any> {
@@ -35,6 +36,7 @@ export declare class HttpResponse<TBody = any> {
      */
     readonly body: TBody | null;
     readonly totalCount?: number;
+    readonly affected?: number;
     /**
      * Returns true if response has body to be received
      */

package/types/types.d.ts

@@ -46,9 +46,9 @@ export declare enum HttpEventType {
 }
 export interface HttpClientContext {
     client: OpraHttpClient;
-    resourceKind: OpraSchema.Resource.Kind;
-    resourceName: string;
-    operation: string;
+    sourceKind: OpraSchema.Resource.Kind;
+    resource: string;
+    endpoint: string;
     send: HttpRequestHandler;
     requestInterceptors?: RequestInterceptor[];
     responseInterceptors?: ResponseInterceptor[];