@opra/client 0.22.0 → 0.23.0

package/cjs/collection-node.js

@@ -1,109 +1,123 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpCollectionNode = void 0;
+const putil_varhelpers_1 = require("putil-varhelpers");
 const constants_js_1 = require("./constants.js");
 const http_request_observable_js_1 = require("./http-request-observable.js");
 class HttpCollectionNode {
     constructor(context) {
-        this[constants_js_1.kHttpClientContext] = context;
+        this[constants_js_1.kContext] = context;
     }
     create(data, options) {
-        const context = this[constants_js_1.kHttpClientContext];
+        const context = this[constants_js_1.kContext];
+        context.operation = 'create';
         const requestHost = new http_request_observable_js_1.HttpRequestObservable(context, options);
-        const request = requestHost[http_request_observable_js_1.HttpRequestObservable.kRequest];
+        const request = requestHost[constants_js_1.kRequest];
         request.method = 'POST';
-        request.url = context.resourceName;
+        request.url.resolve(context.resourceName);
         request.body = data;
         if (options?.include)
-            request.params.set('$include', options.include);
+            request.params.set('$include', (0, putil_varhelpers_1.toArrayDef)(options.include, []).join(','));
         if (options?.pick)
-            request.params.set('$pick', options.pick);
+            request.params.set('$pick', (0, putil_varhelpers_1.toArrayDef)(options.pick, []).join(','));
         if (options?.omit)
-            request.params.set('$omit', options.omit);
+            request.params.set('$omit', (0, putil_varhelpers_1.toArrayDef)(options.omit, []).join(','));
         return requestHost;
     }
     delete(id, options) {
-        const context = this[constants_js_1.kHttpClientContext];
+        if (id == null)
+            throw new TypeError(`'id' argument must have a value`);
+        const context = this[constants_js_1.kContext];
+        context.operation = 'delete';
         const requestHost = new http_request_observable_js_1.HttpRequestObservable(context, options);
-        const request = requestHost[http_request_observable_js_1.HttpRequestObservable.kRequest];
+        const request = requestHost[constants_js_1.kRequest];
         request.method = 'DELETE';
-        request.path.join({ resource: context.resourceName, key: id });
+        request.url.join({ resource: context.resourceName, key: id });
         return requestHost;
     }
     deleteMany(options) {
-        const context = this[constants_js_1.kHttpClientContext];
+        const context = this[constants_js_1.kContext];
+        context.operation = 'deleteMany';
         const requestHost = new http_request_observable_js_1.HttpRequestObservable(context, options);
-        const request = requestHost[http_request_observable_js_1.HttpRequestObservable.kRequest];
+        const request = requestHost[constants_js_1.kRequest];
         request.method = 'DELETE';
-        request.url = context.resourceName;
+        request.url.join(context.resourceName);
         if (options?.filter)
-            request.params.set('$filter', options.filter);
+            request.params.set('$filter', String(options.filter));
         return requestHost;
     }
     get(id, options) {
-        const context = this[constants_js_1.kHttpClientContext];
+        if (id == null)
+            throw new TypeError(`'id' argument must have a value`);
+        const context = this[constants_js_1.kContext];
+        context.operation = 'get';
         const requestHost = new http_request_observable_js_1.HttpRequestObservable(context, options);
-        const request = requestHost[http_request_observable_js_1.HttpRequestObservable.kRequest];
+        const request = requestHost[constants_js_1.kRequest];
         request.method = 'GET';
-        request.path.join({ resource: context.resourceName, key: id });
+        request.url.join({ resource: context.resourceName, key: id });
         if (options?.include)
-            request.params.set('$include', options.include);
+            request.params.set('$include', (0, putil_varhelpers_1.toArrayDef)(options.include, []).join(','));
         if (options?.pick)
-            request.params.set('$pick', options.pick);
+            request.params.set('$pick', (0, putil_varhelpers_1.toArrayDef)(options.pick, []).join(','));
         if (options?.omit)
-            request.params.set('$omit', options.omit);
+            request.params.set('$omit', (0, putil_varhelpers_1.toArrayDef)(options.omit, []).join(','));
         return requestHost;
     }
     findMany(options) {
-        const context = this[constants_js_1.kHttpClientContext];
+        const context = this[constants_js_1.kContext];
+        context.operation = 'findMany';
         const requestHost = new http_request_observable_js_1.HttpRequestObservable(context, options);
-        const request = requestHost[http_request_observable_js_1.HttpRequestObservable.kRequest];
+        const request = requestHost[constants_js_1.kRequest];
         request.method = 'GET';
-        request.url = context.resourceName;
+        request.url.join(context.resourceName);
         if (options?.include)
-            request.params.set('$include', options.include);
+            request.params.set('$include', (0, putil_varhelpers_1.toArrayDef)(options.include, []).join(','));
         if (options?.pick)
-            request.params.set('$pick', options.pick);
+            request.params.set('$pick', (0, putil_varhelpers_1.toArrayDef)(options.pick, []).join(','));
         if (options?.omit)
-            request.params.set('$omit', options.omit);
+            request.params.set('$omit', (0, putil_varhelpers_1.toArrayDef)(options.omit, []).join(','));
         if (options?.sort)
-            request.params.set('$sort', options.sort);
+            request.params.set('$sort', (0, putil_varhelpers_1.toArrayDef)(options.sort, []).join(','));
         if (options?.filter)
-            request.params.set('$filter', options.filter);
+            request.params.set('$filter', String(options.filter));
         if (options?.limit != null)
-            request.params.set('$limit', options.limit);
+            request.params.set('$limit', String(options.limit));
         if (options?.skip != null)
-            request.params.set('$skip', options.skip);
+            request.params.set('$skip', String(options.skip));
         if (options?.count != null)
-            request.params.set('$count', options.count);
+            request.params.set('$count', String(options.count));
         if (options?.distinct != null)
-            request.params.set('$distinct', options.distinct);
+            request.params.set('$distinct', String(options.distinct));
         return requestHost;
     }
     update(id, data, options) {
-        const context = this[constants_js_1.kHttpClientContext];
+        if (id == null)
+            throw new TypeError(`'id' argument must have a value`);
+        const context = this[constants_js_1.kContext];
+        context.operation = 'update';
         const requestHost = new http_request_observable_js_1.HttpRequestObservable(context, options);
-        const request = requestHost[http_request_observable_js_1.HttpRequestObservable.kRequest];
+        const request = requestHost[constants_js_1.kRequest];
         request.method = 'PATCH';
-        request.path.join({ resource: context.resourceName, key: id });
+        request.url.join({ resource: context.resourceName, key: id });
         request.body = data;
         if (options?.include)
-            request.params.set('$include', options.include);
+            request.params.set('$include', String(options.include));
         if (options?.pick)
-            request.params.set('$pick', options.pick);
+            request.params.set('$pick', String(options.pick));
         if (options?.omit)
-            request.params.set('$omit', options.omit);
+            request.params.set('$omit', String(options.omit));
         return requestHost;
     }
     updateMany(data, options) {
-        const context = this[constants_js_1.kHttpClientContext];
+        const context = this[constants_js_1.kContext];
+        context.operation = 'updateMany';
         const requestHost = new http_request_observable_js_1.HttpRequestObservable(context, options);
-        const request = requestHost[http_request_observable_js_1.HttpRequestObservable.kRequest];
+        const request = requestHost[constants_js_1.kRequest];
         request.method = 'PATCH';
-        request.url = context.resourceName;
+        request.url.join(context.resourceName);
         request.body = data;
         if (options?.filter)
-            request.params.set('$filter', options.filter);
+            request.params.set('$filter', String(options.filter));
         return requestHost;
     }
 }

package/cjs/constants.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.kHttpClientContext = 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 = void 0;
 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.kHttpClientContext = Symbol('kContext');
+exports.kRequest = Symbol.for('kRequest');
+exports.kContext = Symbol.for('kContext');

package/cjs/http-request-observable.js

@@ -6,18 +6,18 @@ const common_1 = require("@opra/common");
 const constants_js_1 = require("./constants.js");
 const http_request_js_1 = require("./http-request.js");
 const types_js_1 = require("./types.js");
-const kRequest = Symbol('kRequest');
 class HttpRequestObservable extends rxjs_1.Observable {
     constructor(context, options) {
         super((subscriber) => {
-            context.send(options?.observe || types_js_1.HttpObserveType.Body, this[kRequest]).subscribe((subscriber));
+            context.send(options?.observe || types_js_1.HttpObserveType.Body, this[constants_js_1.kRequest])
+                .subscribe((subscriber));
         });
-        this[constants_js_1.kHttpClientContext] = context;
-        this[kRequest] = new http_request_js_1.HttpRequest(options?.http);
+        this[constants_js_1.kContext] = context;
+        this[constants_js_1.kRequest] = new http_request_js_1.HttpRequest(options?.http);
         this.contentId = (0, common_1.uid)(6);
     }
     header(name, value) {
-        const headers = this[kRequest].headers;
+        const headers = this[constants_js_1.kRequest].headers;
         if (Array.isArray(value))
             value.forEach(v => headers.append(name, String(v)));
         else
@@ -25,11 +25,12 @@ class HttpRequestObservable extends rxjs_1.Observable {
         return this;
     }
     param(name, value) {
-        this[kRequest].params.append(name, value);
+        this[constants_js_1.kRequest].params.append(name, value);
         return this;
     }
     async fetch(observe) {
-        return (0, rxjs_1.lastValueFrom)(this[constants_js_1.kHttpClientContext].send(observe || types_js_1.HttpObserveType.Body, this[kRequest]));
+        return (0, rxjs_1.lastValueFrom)(this[constants_js_1.kContext]
+            .send(observe || types_js_1.HttpObserveType.Body, this[constants_js_1.kRequest]));
     }
     with(cb) {
         cb(this);
@@ -37,5 +38,3 @@ class HttpRequestObservable extends rxjs_1.Observable {
     }
 }
 exports.HttpRequestObservable = HttpRequestObservable;
-HttpRequestObservable.kContext = constants_js_1.kHttpClientContext;
-HttpRequestObservable.kRequest = kRequest;

package/cjs/http-request.js

@@ -21,24 +21,22 @@ class HttpRequest {
         this.referrerPolicy = init?.referrerPolicy || '';
         this.signal = init?.signal || new AbortController().signal;
         this.body = init?.body;
-        this.urlInstance = new common_1.OpraURL(init?.url);
-        if (init?.params)
-            this.params.appendAll(init.params);
+        this.parsedUrl = new common_1.OpraURL(init?.url);
+        if (init?.params) {
+            const params = new URLSearchParams(init.params);
+            params.forEach((v, k) => this.params.set(k, v));
+        }
     }
     /** Returns the URL of request as a string. */
     get url() {
-        return this.urlInstance.href;
+        return this.parsedUrl;
     }
     set url(value) {
-        this.urlInstance.parse(value);
+        this.parsedUrl = value;
     }
     /** Returns the searchParams of the URL as OpraURLSearchParams */
     get params() {
-        return this.urlInstance.searchParams;
-    }
-    /** Returns the path part of URL as OpraURLPath */
-    get path() {
-        return this.urlInstance.path;
+        return this.parsedUrl.searchParams;
     }
     clone(...update) {
         const out = new HttpRequest();

package/cjs/singleton-node.js

@@ -1,62 +1,67 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpSingletonNode = void 0;
+const putil_varhelpers_1 = require("putil-varhelpers");
 const constants_js_1 = require("./constants.js");
 const http_request_observable_js_1 = require("./http-request-observable.js");
 class HttpSingletonNode {
     constructor(context) {
-        this[constants_js_1.kHttpClientContext] = context;
+        this[constants_js_1.kContext] = context;
     }
     create(data, options) {
-        const context = this[constants_js_1.kHttpClientContext];
+        const context = this[constants_js_1.kContext];
+        context.operation = 'create';
         const requestHost = new http_request_observable_js_1.HttpRequestObservable(context, options);
-        const request = requestHost[http_request_observable_js_1.HttpRequestObservable.kRequest];
+        const request = requestHost[constants_js_1.kRequest];
         request.method = 'POST';
-        request.url = context.resourceName;
+        request.url.join(context.resourceName);
         request.body = data;
         if (options?.include)
-            request.params.set('$include', options.include);
+            request.params.set('$include', (0, putil_varhelpers_1.toArrayDef)(options.include, []).join(','));
         if (options?.pick)
-            request.params.set('$pick', options.pick);
+            request.params.set('$pick', (0, putil_varhelpers_1.toArrayDef)(options.pick, []).join(','));
         if (options?.omit)
-            request.params.set('$omit', options.omit);
+            request.params.set('$omit', (0, putil_varhelpers_1.toArrayDef)(options.omit, []).join(','));
         return requestHost;
     }
     delete(options) {
-        const context = this[constants_js_1.kHttpClientContext];
+        const context = this[constants_js_1.kContext];
+        context.operation = 'delete';
         const requestHost = new http_request_observable_js_1.HttpRequestObservable(context, options);
-        const request = requestHost[http_request_observable_js_1.HttpRequestObservable.kRequest];
+        const request = requestHost[constants_js_1.kRequest];
         request.method = 'DELETE';
-        request.path.join({ resource: context.resourceName });
+        request.url.join({ resource: context.resourceName });
         return requestHost;
     }
     get(options) {
-        const context = this[constants_js_1.kHttpClientContext];
+        const context = this[constants_js_1.kContext];
+        context.operation = 'get';
         const requestHost = new http_request_observable_js_1.HttpRequestObservable(context, options);
-        const request = requestHost[http_request_observable_js_1.HttpRequestObservable.kRequest];
+        const request = requestHost[constants_js_1.kRequest];
         request.method = 'GET';
-        request.path.join({ resource: context.resourceName });
+        request.url.join({ resource: context.resourceName });
         if (options?.include)
-            request.params.set('$include', options.include);
+            request.params.set('$include', (0, putil_varhelpers_1.toArrayDef)(options.include, []).join(','));
         if (options?.pick)
-            request.params.set('$pick', options.pick);
+            request.params.set('$pick', (0, putil_varhelpers_1.toArrayDef)(options.pick, []).join(','));
         if (options?.omit)
-            request.params.set('$omit', options.omit);
+            request.params.set('$omit', (0, putil_varhelpers_1.toArrayDef)(options.omit, []).join(','));
         return requestHost;
     }
     update(data, options) {
-        const context = this[constants_js_1.kHttpClientContext];
+        const context = this[constants_js_1.kContext];
+        context.operation = 'update';
         const requestHost = new http_request_observable_js_1.HttpRequestObservable(context, options);
-        const request = requestHost[http_request_observable_js_1.HttpRequestObservable.kRequest];
+        const request = requestHost[constants_js_1.kRequest];
         request.method = 'PATCH';
-        request.path.join({ resource: context.resourceName });
+        request.url.join({ resource: context.resourceName });
         request.body = data;
         if (options?.include)
-            request.params.set('$include', options.include);
+            request.params.set('$include', (0, putil_varhelpers_1.toArrayDef)(options.include, []).join(','));
         if (options?.pick)
-            request.params.set('$pick', options.pick);
+            request.params.set('$pick', (0, putil_varhelpers_1.toArrayDef)(options.pick, []).join(','));
         if (options?.omit)
-            request.params.set('$omit', options.omit);
+            request.params.set('$omit', (0, putil_varhelpers_1.toArrayDef)(options.omit, []).join(','));
         return requestHost;
     }
 }

package/esm/client.js

@@ -1,6 +1,6 @@
 import { lastValueFrom, Observable } from 'rxjs';
 import { isReadableStreamLike } from 'rxjs/internal/util/isReadableStreamLike';
-import { DocumentFactory, HttpHeaderCodes, HttpParams, isBlob, joinPath } from '@opra/common';
+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';
@@ -24,8 +24,8 @@ export class OpraHttpClient {
             ...options?.defaults,
             headers: options?.defaults?.headers instanceof Headers
                 ? options?.defaults?.headers : new Headers(options?.defaults?.headers),
-            params: options?.defaults?.params instanceof HttpParams
-                ? options?.defaults?.params : new HttpParams(options?.defaults?.params)
+            params: options?.defaults?.params instanceof URLSearchParams
+                ? options?.defaults?.params : new URLSearchParams(options?.defaults?.params)
         };
     }
     get serviceUrl() {
@@ -38,7 +38,7 @@ export class OpraHttpClient {
         if (promise) {
             return promise;
         }
-        this[kAssets].metadataPromise = promise = lastValueFrom(this._sendRequest(HttpObserveType.Body, new HttpRequest({
+        this[kAssets].metadataPromise = promise = lastValueFrom(this._sendRequest('Singleton', 'get', HttpObserveType.Body, new HttpRequest({
             method: 'GET',
             url: '$metadata',
             headers: new Headers({ 'accept': 'application/json' })
@@ -50,7 +50,7 @@ export class OpraHttpClient {
             return api;
         })
             .catch((e) => {
-            e.message = 'Unable to fetch metadata from ' + this.serviceUrl + '. ' + e.message;
+            e.message = 'Unable to fetch metadata from service url (' + this.serviceUrl + '). ' + e.message;
             throw e;
         })
             .finally(() => delete this[kAssets].metadataPromise);
@@ -65,8 +65,10 @@ export class OpraHttpClient {
             resourceName = resourceName.name;
         const ctx = {
             client: this,
+            resourceKind: 'Collection',
+            operation: '',
             resourceName,
-            send: (observe, request) => this._sendRequest(observe, request, ctx),
+            send: (observe, request) => this._sendRequest('Collection', ctx.operation, observe, request, ctx),
             // requestInterceptors: [
             //   // Validate resource exists and is a collection resource
             //   async () => {
@@ -84,8 +86,10 @@ export class OpraHttpClient {
             resourceName = resourceName.name;
         const ctx = {
             client: this,
+            resourceKind: 'Singleton',
+            operation: '',
             resourceName,
-            send: (observe, request) => this._sendRequest(observe, request, ctx),
+            send: (observe, request) => this._sendRequest('Singleton', ctx.operation, observe, request, ctx),
             // requestInterceptors: [
             //   // Validate resource exists and is a singleton resource
             //   async () => {
@@ -97,11 +101,11 @@ export class OpraHttpClient {
         };
         return new HttpSingletonNode(ctx);
     }
-    _sendRequest(observe, request, ctx) {
+    _sendRequest(resourceKind, operation, observe, request, ctx) {
         return new Observable(subscriber => {
             (async () => {
                 request.inset(this.defaults);
-                const url = request.url.includes('://') ? request.url : joinPath(this.serviceUrl, request.url);
+                const url = new OpraURL(request.url, this.serviceUrl);
                 let body;
                 if (request.body) {
                     let contentType;
@@ -153,8 +157,8 @@ export class OpraHttpClient {
                         request,
                         event: HttpEventType.Sent,
                     });
-                const response = await this._fetch(url, request);
-                await this._handleResponse(observe, subscriber, request, response);
+                const response = await this._fetch(url.toString(), request);
+                await this._handleResponse(resourceKind, operation, observe, subscriber, request, response, ctx);
             })().catch(error => subscriber.error(error));
         });
     }
@@ -164,7 +168,7 @@ export class OpraHttpClient {
     _createResponse(init) {
         return new HttpResponse(init);
     }
-    async _handleResponse(observe, subscriber, request, fetchResponse, ctx) {
+    async _handleResponse(resourceKind, operation, observe, subscriber, request, fetchResponse, ctx) {
         const headers = fetchResponse.headers;
         if (observe === HttpObserveType.Events) {
             const response = this._createResponse({
@@ -182,11 +186,13 @@ export class OpraHttpClient {
             });
         }
         let body;
+        let totalCount;
         if (fetchResponse.body) {
             if (JSON_CONTENT_TYPE_PATTERN.test(headers.get('Content-Type') || '')) {
                 body = await fetchResponse.json();
                 if (typeof body === 'string')
                     body = JSON.parse(body);
+                totalCount = body.totalCount;
             }
             else if (TEXT_CONTENT_TYPE_PATTERN.test(headers.get('Content-Type') || ''))
                 body = await fetchResponse.text();
@@ -214,8 +220,8 @@ export class OpraHttpClient {
             statusText: fetchResponse.statusText,
             body
         };
-        if (fetchResponse.headers.has(HttpHeaderCodes.X_Total_Count))
-            responseInit.totalCount = parseInt(fetchResponse.headers.get(HttpHeaderCodes.X_Total_Count), 10);
+        if (totalCount != null)
+            responseInit.totalCount = totalCount;
         const response = this._createResponse(responseInit);
         if (ctx) {
             const responseInterceptors = [
@@ -227,7 +233,11 @@ export class OpraHttpClient {
             }
         }
         if (observe === HttpObserveType.Body) {
-            subscriber.next(body);
+            if ((resourceKind === 'Collection' || resourceKind === 'Singleton') &&
+                (operation === 'create' || operation === 'get' || operation === 'findMany' || operation === 'update'))
+                subscriber.next(body.data);
+            else
+                subscriber.next(body);
         }
         else {
             if (observe === HttpObserveType.Events)

package/esm/collection-node.js

@@ -1,106 +1,120 @@
-import { kHttpClientContext } from './constants.js';
+import { toArrayDef } from 'putil-varhelpers';
+import { kContext, kRequest } from './constants.js';
 import { HttpRequestObservable } from './http-request-observable.js';
 export class HttpCollectionNode {
     constructor(context) {
-        this[kHttpClientContext] = context;
+        this[kContext] = context;
     }
     create(data, options) {
-        const context = this[kHttpClientContext];
+        const context = this[kContext];
+        context.operation = 'create';
         const requestHost = new HttpRequestObservable(context, options);
-        const request = requestHost[HttpRequestObservable.kRequest];
+        const request = requestHost[kRequest];
         request.method = 'POST';
-        request.url = context.resourceName;
+        request.url.resolve(context.resourceName);
         request.body = data;
         if (options?.include)
-            request.params.set('$include', options.include);
+            request.params.set('$include', toArrayDef(options.include, []).join(','));
         if (options?.pick)
-            request.params.set('$pick', options.pick);
+            request.params.set('$pick', toArrayDef(options.pick, []).join(','));
         if (options?.omit)
-            request.params.set('$omit', options.omit);
+            request.params.set('$omit', toArrayDef(options.omit, []).join(','));
         return requestHost;
     }
     delete(id, options) {
-        const context = this[kHttpClientContext];
+        if (id == null)
+            throw new TypeError(`'id' argument must have a value`);
+        const context = this[kContext];
+        context.operation = 'delete';
         const requestHost = new HttpRequestObservable(context, options);
-        const request = requestHost[HttpRequestObservable.kRequest];
+        const request = requestHost[kRequest];
         request.method = 'DELETE';
-        request.path.join({ resource: context.resourceName, key: id });
+        request.url.join({ resource: context.resourceName, key: id });
         return requestHost;
     }
     deleteMany(options) {
-        const context = this[kHttpClientContext];
+        const context = this[kContext];
+        context.operation = 'deleteMany';
         const requestHost = new HttpRequestObservable(context, options);
-        const request = requestHost[HttpRequestObservable.kRequest];
+        const request = requestHost[kRequest];
         request.method = 'DELETE';
-        request.url = context.resourceName;
+        request.url.join(context.resourceName);
         if (options?.filter)
-            request.params.set('$filter', options.filter);
+            request.params.set('$filter', String(options.filter));
         return requestHost;
     }
     get(id, options) {
-        const context = this[kHttpClientContext];
+        if (id == null)
+            throw new TypeError(`'id' argument must have a value`);
+        const context = this[kContext];
+        context.operation = 'get';
         const requestHost = new HttpRequestObservable(context, options);
-        const request = requestHost[HttpRequestObservable.kRequest];
+        const request = requestHost[kRequest];
         request.method = 'GET';
-        request.path.join({ resource: context.resourceName, key: id });
+        request.url.join({ resource: context.resourceName, key: id });
         if (options?.include)
-            request.params.set('$include', options.include);
+            request.params.set('$include', toArrayDef(options.include, []).join(','));
         if (options?.pick)
-            request.params.set('$pick', options.pick);
+            request.params.set('$pick', toArrayDef(options.pick, []).join(','));
         if (options?.omit)
-            request.params.set('$omit', options.omit);
+            request.params.set('$omit', toArrayDef(options.omit, []).join(','));
         return requestHost;
     }
     findMany(options) {
-        const context = this[kHttpClientContext];
+        const context = this[kContext];
+        context.operation = 'findMany';
         const requestHost = new HttpRequestObservable(context, options);
-        const request = requestHost[HttpRequestObservable.kRequest];
+        const request = requestHost[kRequest];
         request.method = 'GET';
-        request.url = context.resourceName;
+        request.url.join(context.resourceName);
         if (options?.include)
-            request.params.set('$include', options.include);
+            request.params.set('$include', toArrayDef(options.include, []).join(','));
         if (options?.pick)
-            request.params.set('$pick', options.pick);
+            request.params.set('$pick', toArrayDef(options.pick, []).join(','));
         if (options?.omit)
-            request.params.set('$omit', options.omit);
+            request.params.set('$omit', toArrayDef(options.omit, []).join(','));
         if (options?.sort)
-            request.params.set('$sort', options.sort);
+            request.params.set('$sort', toArrayDef(options.sort, []).join(','));
         if (options?.filter)
-            request.params.set('$filter', options.filter);
+            request.params.set('$filter', String(options.filter));
         if (options?.limit != null)
-            request.params.set('$limit', options.limit);
+            request.params.set('$limit', String(options.limit));
         if (options?.skip != null)
-            request.params.set('$skip', options.skip);
+            request.params.set('$skip', String(options.skip));
         if (options?.count != null)
-            request.params.set('$count', options.count);
+            request.params.set('$count', String(options.count));
         if (options?.distinct != null)
-            request.params.set('$distinct', options.distinct);
+            request.params.set('$distinct', String(options.distinct));
         return requestHost;
     }
     update(id, data, options) {
-        const context = this[kHttpClientContext];
+        if (id == null)
+            throw new TypeError(`'id' argument must have a value`);
+        const context = this[kContext];
+        context.operation = 'update';
         const requestHost = new HttpRequestObservable(context, options);
-        const request = requestHost[HttpRequestObservable.kRequest];
+        const request = requestHost[kRequest];
         request.method = 'PATCH';
-        request.path.join({ resource: context.resourceName, key: id });
+        request.url.join({ resource: context.resourceName, key: id });
         request.body = data;
         if (options?.include)
-            request.params.set('$include', options.include);
+            request.params.set('$include', String(options.include));
         if (options?.pick)
-            request.params.set('$pick', options.pick);
+            request.params.set('$pick', String(options.pick));
         if (options?.omit)
-            request.params.set('$omit', options.omit);
+            request.params.set('$omit', String(options.omit));
         return requestHost;
     }
     updateMany(data, options) {
-        const context = this[kHttpClientContext];
+        const context = this[kContext];
+        context.operation = 'updateMany';
         const requestHost = new HttpRequestObservable(context, options);
-        const request = requestHost[HttpRequestObservable.kRequest];
+        const request = requestHost[kRequest];
         request.method = 'PATCH';
-        request.url = context.resourceName;
+        request.url.join(context.resourceName);
         request.body = data;
         if (options?.filter)
-            request.params.set('$filter', options.filter);
+            request.params.set('$filter', String(options.filter));
         return requestHost;
     }
 }