@opra/client 0.22.0 → 0.23.0

package/browser.js

@@ -9,7 +9,7 @@ var __name = (target, value) => __defProp(target, "name", { value, configurable:
 // ../../build/client/esm/client.js
 import { lastValueFrom as lastValueFrom2, Observable as Observable2 } from "rxjs";
 import { isReadableStreamLike } from "rxjs/internal/util/isReadableStreamLike";
-import { DocumentFactory, HttpHeaderCodes, HttpParams, isBlob, joinPath } from "@opra/common";
+import { DocumentFactory, isBlob, OpraURL as OpraURL2 } from "@opra/common";
 
 // ../../build/client/esm/client-error.js
 var ClientError = class extends Error {
@@ -29,11 +29,15 @@ var ClientError = class extends Error {
   }
 };
 
+// ../../build/client/esm/collection-node.js
+import { toArrayDef } from "putil-varhelpers";
+
 // ../../build/client/esm/constants.js
 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 kHttpClientContext = Symbol("kContext");
+var kRequest = Symbol.for("kRequest");
+var kContext = Symbol.for("kContext");
 
 // ../../build/client/esm/http-request-observable.js
 import { lastValueFrom, Observable } from "rxjs";
@@ -72,24 +76,22 @@ var HttpRequest = class _HttpRequest {
     this.referrerPolicy = init?.referrerPolicy || "";
     this.signal = init?.signal || new AbortController().signal;
     this.body = init?.body;
-    this.urlInstance = new OpraURL(init?.url);
-    if (init?.params)
-      this.params.appendAll(init.params);
+    this.parsedUrl = new 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();
@@ -149,7 +151,6 @@ var HttpEventType;
 })(HttpEventType || (HttpEventType = {}));
 
 // ../../build/client/esm/http-request-observable.js
-var kRequest = Symbol("kRequest");
 var HttpRequestObservable = class extends Observable {
   static {
     __name(this, "HttpRequestObservable");
@@ -158,7 +159,7 @@ var HttpRequestObservable = class extends Observable {
     super((subscriber) => {
       context.send(options?.observe || HttpObserveType.Body, this[kRequest]).subscribe(subscriber);
     });
-    this[kHttpClientContext] = context;
+    this[kContext] = context;
     this[kRequest] = new HttpRequest(options?.http);
     this.contentId = uid(6);
   }
@@ -175,15 +176,13 @@ var HttpRequestObservable = class extends Observable {
     return this;
   }
   async fetch(observe) {
-    return lastValueFrom(this[kHttpClientContext].send(observe || HttpObserveType.Body, this[kRequest]));
+    return lastValueFrom(this[kContext].send(observe || HttpObserveType.Body, this[kRequest]));
   }
   with(cb) {
     cb(this);
     return this;
   }
 };
-HttpRequestObservable.kContext = kHttpClientContext;
-HttpRequestObservable.kRequest = kRequest;
 
 // ../../build/client/esm/collection-node.js
 var HttpCollectionNode = class {
@@ -191,105 +190,118 @@ var HttpCollectionNode = class {
     __name(this, "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;
   }
 };
@@ -316,63 +328,68 @@ var HttpResponse = class _HttpResponse {
 };
 
 // ../../build/client/esm/singleton-node.js
+import { toArrayDef as toArrayDef2 } from "putil-varhelpers";
 var HttpSingletonNode = class {
   static {
     __name(this, "HttpSingletonNode");
   }
   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.join(context.resourceName);
     request.body = data;
     if (options?.include)
-      request.params.set("$include", options.include);
+      request.params.set("$include", toArrayDef2(options.include, []).join(","));
     if (options?.pick)
-      request.params.set("$pick", options.pick);
+      request.params.set("$pick", toArrayDef2(options.pick, []).join(","));
     if (options?.omit)
-      request.params.set("$omit", options.omit);
+      request.params.set("$omit", toArrayDef2(options.omit, []).join(","));
     return requestHost;
   }
   delete(options) {
-    const context = this[kHttpClientContext];
+    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 });
+    request.url.join({ resource: context.resourceName });
     return requestHost;
   }
   get(options) {
-    const context = this[kHttpClientContext];
+    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 });
+    request.url.join({ resource: context.resourceName });
     if (options?.include)
-      request.params.set("$include", options.include);
+      request.params.set("$include", toArrayDef2(options.include, []).join(","));
     if (options?.pick)
-      request.params.set("$pick", options.pick);
+      request.params.set("$pick", toArrayDef2(options.pick, []).join(","));
     if (options?.omit)
-      request.params.set("$omit", options.omit);
+      request.params.set("$omit", toArrayDef2(options.omit, []).join(","));
     return requestHost;
   }
   update(data, options) {
-    const context = this[kHttpClientContext];
+    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 });
+    request.url.join({ resource: context.resourceName });
     request.body = data;
     if (options?.include)
-      request.params.set("$include", options.include);
+      request.params.set("$include", toArrayDef2(options.include, []).join(","));
     if (options?.pick)
-      request.params.set("$pick", options.pick);
+      request.params.set("$pick", toArrayDef2(options.pick, []).join(","));
     if (options?.omit)
-      request.params.set("$omit", options.omit);
+      request.params.set("$omit", toArrayDef2(options.omit, []).join(","));
     return requestHost;
   }
 };
@@ -396,7 +413,7 @@ var OpraHttpClient = class {
     this.defaults = {
       ...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() {
@@ -409,7 +426,7 @@ var OpraHttpClient = class {
     if (promise) {
       return promise;
     }
-    this[kAssets].metadataPromise = promise = lastValueFrom2(this._sendRequest(HttpObserveType.Body, new HttpRequest({
+    this[kAssets].metadataPromise = promise = lastValueFrom2(this._sendRequest("Singleton", "get", HttpObserveType.Body, new HttpRequest({
       method: "GET",
       url: "$metadata",
       headers: new Headers({ "accept": "application/json" })
@@ -419,7 +436,7 @@ var OpraHttpClient = class {
       this[kAssets].api = api;
       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);
   }
@@ -432,8 +449,10 @@ var OpraHttpClient = class {
       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 () => {
@@ -450,8 +469,10 @@ var OpraHttpClient = class {
       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 () => {
@@ -463,11 +484,11 @@ var OpraHttpClient = class {
     };
     return new HttpSingletonNode(ctx);
   }
-  _sendRequest(observe, request, ctx) {
+  _sendRequest(resourceKind, operation, observe, request, ctx) {
     return new Observable2((subscriber) => {
       (async () => {
         request.inset(this.defaults);
-        const url = request.url.includes("://") ? request.url : joinPath(this.serviceUrl, request.url);
+        const url = new OpraURL2(request.url, this.serviceUrl);
         let body;
         if (request.body) {
           let contentType;
@@ -515,8 +536,8 @@ var OpraHttpClient = class {
             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));
     });
   }
@@ -526,7 +547,7 @@ var OpraHttpClient = class {
   _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 response2 = this._createResponse({
@@ -544,11 +565,13 @@ var OpraHttpClient = class {
       });
     }
     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();
       else if (FORMDATA_CONTENT_TYPE_PATTERN.test(headers.get("Content-Type") || ""))
@@ -575,8 +598,8 @@ var OpraHttpClient = class {
       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 = [
@@ -588,7 +611,10 @@ var OpraHttpClient = class {
       }
     }
     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)
         subscriber.next({

package/cjs/client.js

@@ -27,8 +27,8 @@ class OpraHttpClient {
             ...options?.defaults,
             headers: options?.defaults?.headers instanceof Headers
                 ? options?.defaults?.headers : new Headers(options?.defaults?.headers),
-            params: options?.defaults?.params instanceof common_1.HttpParams
-                ? options?.defaults?.params : new common_1.HttpParams(options?.defaults?.params)
+            params: options?.defaults?.params instanceof URLSearchParams
+                ? options?.defaults?.params : new URLSearchParams(options?.defaults?.params)
         };
     }
     get serviceUrl() {
@@ -41,7 +41,7 @@ class OpraHttpClient {
         if (promise) {
             return promise;
         }
-        this[kAssets].metadataPromise = promise = (0, rxjs_1.lastValueFrom)(this._sendRequest(types_js_1.HttpObserveType.Body, new http_request_js_1.HttpRequest({
+        this[kAssets].metadataPromise = promise = (0, rxjs_1.lastValueFrom)(this._sendRequest('Singleton', 'get', types_js_1.HttpObserveType.Body, new http_request_js_1.HttpRequest({
             method: 'GET',
             url: '$metadata',
             headers: new Headers({ 'accept': 'application/json' })
@@ -53,7 +53,7 @@ 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);
@@ -68,8 +68,10 @@ 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 () => {
@@ -87,8 +89,10 @@ 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 () => {
@@ -100,11 +104,11 @@ class OpraHttpClient {
         };
         return new singleton_node_js_1.HttpSingletonNode(ctx);
     }
-    _sendRequest(observe, request, ctx) {
+    _sendRequest(resourceKind, operation, observe, request, ctx) {
         return new rxjs_1.Observable(subscriber => {
             (async () => {
                 request.inset(this.defaults);
-                const url = request.url.includes('://') ? request.url : (0, common_1.joinPath)(this.serviceUrl, request.url);
+                const url = new common_1.OpraURL(request.url, this.serviceUrl);
                 let body;
                 if (request.body) {
                     let contentType;
@@ -156,8 +160,8 @@ class OpraHttpClient {
                         request,
                         event: types_js_1.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));
         });
     }
@@ -167,7 +171,7 @@ class OpraHttpClient {
     _createResponse(init) {
         return new http_response_js_1.HttpResponse(init);
     }
-    async _handleResponse(observe, subscriber, request, fetchResponse, ctx) {
+    async _handleResponse(resourceKind, operation, observe, subscriber, request, fetchResponse, ctx) {
         const headers = fetchResponse.headers;
         if (observe === types_js_1.HttpObserveType.Events) {
             const response = this._createResponse({
@@ -185,11 +189,13 @@ class OpraHttpClient {
             });
         }
         let body;
+        let totalCount;
         if (fetchResponse.body) {
             if (constants_js_1.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 (constants_js_1.TEXT_CONTENT_TYPE_PATTERN.test(headers.get('Content-Type') || ''))
                 body = await fetchResponse.text();
@@ -217,8 +223,8 @@ class OpraHttpClient {
             statusText: fetchResponse.statusText,
             body
         };
-        if (fetchResponse.headers.has(common_1.HttpHeaderCodes.X_Total_Count))
-            responseInit.totalCount = parseInt(fetchResponse.headers.get(common_1.HttpHeaderCodes.X_Total_Count), 10);
+        if (totalCount != null)
+            responseInit.totalCount = totalCount;
         const response = this._createResponse(responseInit);
         if (ctx) {
             const responseInterceptors = [
@@ -230,7 +236,11 @@ class OpraHttpClient {
             }
         }
         if (observe === types_js_1.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 === types_js_1.HttpObserveType.Events)