@ercioko/meblotex-api 0.1.5 → 0.1.6

package/dist/api/Api.d.ts

@@ -1,17 +1,16 @@
 import { DataRow, Order } from '../app_types';
 import { createApi } from './createApi';
-export type RequestOptions<DataType = {
-    [key: string]: string;
-}> = {
+type QueryType<T> = {
+    page?: number;
+    records?: number;
+    fields?: (keyof T)[];
+    order?: Order[];
+} & Record<string, unknown>;
+export type RequestOptions<T> = {
     token?: string;
     id?: number | string;
     noId?: boolean;
-    query?: {
-        page?: number;
-        records?: number;
-        fields?: (keyof DataType)[];
-        order?: Order[];
-    } & Record<string, unknown>;
+    query?: QueryType<T>;
 };
 export type RequestData = Record<string, unknown>;
 export type ApiResponse<RowType = DataRow> = {
@@ -23,9 +22,12 @@ export default class Api {
     host: string;
     namespace: string;
     endpoint: string;
-    constructor(endpoint: string, host: string);
+    private endpointUrl;
+    constructor(endpoint: string, host?: string);
     get<DataType>(opts?: RequestOptions<DataType extends any[] ? DataType[0] : DataType>): Promise<any>;
-    post<T, ResponseType>(data?: T, opts?: RequestOptions): Promise<ResponseType>;
-    put(id: number, data: RequestData, opts?: RequestOptions): Promise<ApiResponse>;
-    delete(id: number, opts?: RequestOptions): Promise<ApiResponse>;
+    post<T, ResponseType>(data?: T, opts?: RequestOptions<T>): Promise<ResponseType>;
+    put(id: number, data: RequestData, opts?: RequestOptions<{}>): Promise<ApiResponse>;
+    delete(id: number, opts?: RequestOptions<{}>): Promise<ApiResponse>;
+    private getQuery;
 }
+export {};

package/dist/api/Api.js

@@ -68,6 +68,7 @@ var Api = /** @class */ (function () {
         this.host = host;
         this.namespace = '';
         this.endpoint = endpoint;
+        this.endpointUrl = "".concat(this.host).concat(this.namespace, "/").concat(this.endpoint);
     }
     Api.prototype.get = function (opts) {
         if (opts === void 0) { opts = {}; }
@@ -81,11 +82,8 @@ var Api = /** @class */ (function () {
                     credentials: 'include',
                     headers: headers,
                 };
-                url = new URL("".concat(this.host).concat(this.namespace, "/").concat(this.endpoint, "/").concat(opts.id || ''));
-                url.search = opts.query
-                    ? new URLSearchParams(utils_1.Query.encode(opts.query)).toString()
-                    : '';
-                return [2 /*return*/, fetch(url.href, options).then(handleResponse)];
+                url = "".concat(this.endpointUrl, "/").concat(opts.id || '', "?").concat(this.getQuery(opts.query));
+                return [2 /*return*/, fetch(url, options).then(handleResponse)];
             });
         });
     };
@@ -99,11 +97,8 @@ var Api = /** @class */ (function () {
                 headers.append('Content-Type', 'application/json');
                 if (opts.token)
                     headers.append('Authorization', "Bearer ".concat(opts.token));
-                url = new URL("".concat(this.host).concat(this.namespace, "/").concat(this.endpoint));
-                url.search = opts.query
-                    ? new URLSearchParams(utils_1.Query.encode(opts.query)).toString()
-                    : '';
-                return [2 /*return*/, fetch(url.href, {
+                url = "".concat(this.endpointUrl, "?").concat(this.getQuery(opts.query));
+                return [2 /*return*/, fetch(url, {
                         method: 'POST',
                         body: body,
                         headers: headers,
@@ -122,11 +117,8 @@ var Api = /** @class */ (function () {
                 headers.append('Content-Type', 'application/json');
                 if (opts.token)
                     headers.append('Authorization', "Bearer ".concat(opts.token));
-                url = new URL("".concat(this.host).concat(this.namespace, "/").concat(this.endpoint).concat(opts.noId ? '' : '/').concat(id || ''));
-                url.search = opts.query
-                    ? new URLSearchParams(utils_1.Query.encode(opts.query)).toString()
-                    : '';
-                return [2 /*return*/, fetch(url.href, {
+                url = "".concat(this.endpointUrl).concat(opts.noId ? '' : '/').concat(id || '', "?").concat(this.getQuery(opts.query));
+                return [2 /*return*/, fetch(url, {
                         method: 'PUT',
                         body: body,
                         headers: headers,
@@ -143,11 +135,8 @@ var Api = /** @class */ (function () {
                 headers = new Headers();
                 if (opts.token)
                     headers.append('Authorization', "Bearer ".concat(opts.token));
-                url = new URL("".concat(this.host).concat(this.namespace, "/").concat(this.endpoint, "/").concat(id));
-                url.search = opts.query
-                    ? new URLSearchParams(utils_1.Query.encode(opts.query)).toString()
-                    : '';
-                return [2 /*return*/, fetch(url.href, {
+                url = "".concat(this.endpointUrl, "/").concat(id, "?").concat(this.getQuery(opts.query));
+                return [2 /*return*/, fetch(url, {
                         headers: headers,
                         method: 'DELETE',
                         credentials: 'include',
@@ -155,6 +144,9 @@ var Api = /** @class */ (function () {
             });
         });
     };
+    Api.prototype.getQuery = function (query) {
+        return query ? new URLSearchParams(utils_1.Query.encode(query)).toString() : '';
+    };
     return Api;
 }());
 exports.default = Api;

package/dist/api/Endpoint.d.ts

@@ -3,11 +3,11 @@ type CallbackFunction<T> = (reason: unknown) => any;
 export default class Endpoint<GetResponseElement> extends Api {
     endpoint: string;
     errorCallback?: CallbackFunction<any>;
-    constructor(endpoint: string, host: string, errorCallback?: (reason: unknown) => ApiResponse<any>);
+    constructor(endpoint: string, host?: string, errorCallback?: (reason: unknown) => ApiResponse<any>);
     get<DataType = GetResponseElement>(opts?: RequestOptions<DataType extends any[] ? DataType[0] : DataType>): Promise<DataType extends any[] ? ApiResponse<DataType> : DataType>;
-    post<T = RequestData, ResponseType = T>(data?: T, opts?: RequestOptions): Promise<ResponseType>;
-    put(id: number, data: RequestData, opts?: RequestOptions): Promise<ApiResponse>;
-    delete(id: number, opts?: RequestOptions): Promise<ApiResponse>;
+    post<T = RequestData, ResponseType = T>(data?: T, opts?: RequestOptions<T>): Promise<ResponseType>;
+    put(id: number, data: RequestData, opts?: RequestOptions<{}>): Promise<ApiResponse>;
+    delete(id: number, opts?: RequestOptions<{}>): Promise<ApiResponse>;
     toJSON(proto: Record<string, unknown>): Record<string, unknown>;
 }
 export {};

package/dist/api/Endpoint.js

@@ -58,6 +58,7 @@ var Api_1 = __importDefault(require("./Api"));
 var Endpoint = /** @class */ (function (_super) {
     __extends(Endpoint, _super);
     function Endpoint(endpoint, host, errorCallback) {
+        if (host === void 0) { host = '/'; }
         var _this = _super.call(this, endpoint, host) || this;
         _this.endpoint = endpoint;
         _this.errorCallback = errorCallback;

package/dist/components/ApiHostProvider.js

@@ -25,7 +25,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useApiHost = exports.ApiHostProvider = void 0;
 var react_1 = __importStar(require("react"));
-var ApiHostContext = (0, react_1.createContext)('/api');
+var ApiHostContext = (0, react_1.createContext)('/');
 var ApiHostProvider = function (_a) {
     var children = _a.children, host = _a.host;
     return (react_1.default.createElement(ApiHostContext.Provider, { value: host }, children));

package/dist/src/api/Api.js

@@ -199,9 +199,11 @@ var Api = /*#__PURE__*/ function() {
         _define_property(this, "host", void 0);
         _define_property(this, "namespace", void 0);
         _define_property(this, "endpoint", void 0);
+        _define_property(this, "endpointUrl", void 0);
         this.host = host;
         this.namespace = '';
         this.endpoint = endpoint;
+        this.endpointUrl = "".concat(this.host).concat(this.namespace, "/").concat(this.endpoint);
     }
     _create_class(Api, [
         {
@@ -218,11 +220,10 @@ var Api = /*#__PURE__*/ function() {
                             credentials: 'include',
                             headers: headers
                         };
-                        url = new URL("".concat(_this.host).concat(_this.namespace, "/").concat(_this.endpoint, "/").concat(opts.id || ''));
-                        url.search = opts.query ? new URLSearchParams(Query.encode(opts.query)).toString() : '';
+                        url = "".concat(_this.endpointUrl, "/").concat(opts.id || '', "?").concat(_this.getQuery(opts.query));
                         return [
                             2,
-                            fetch(url.href, options).then(handleResponse)
+                            fetch(url, options).then(handleResponse)
                         ];
                     });
                 })();
@@ -240,11 +241,10 @@ var Api = /*#__PURE__*/ function() {
                         body = JSON.stringify(data);
                         headers.append('Content-Type', 'application/json');
                         if (opts.token) headers.append('Authorization', "Bearer ".concat(opts.token));
-                        url = new URL("".concat(_this.host).concat(_this.namespace, "/").concat(_this.endpoint));
-                        url.search = opts.query ? new URLSearchParams(Query.encode(opts.query)).toString() : '';
+                        url = "".concat(_this.endpointUrl, "?").concat(_this.getQuery(opts.query));
                         return [
                             2,
-                            fetch(url.href, {
+                            fetch(url, {
                                 method: 'POST',
                                 body: body,
                                 headers: headers,
@@ -267,11 +267,10 @@ var Api = /*#__PURE__*/ function() {
                         headers = new Headers();
                         headers.append('Content-Type', 'application/json');
                         if (opts.token) headers.append('Authorization', "Bearer ".concat(opts.token));
-                        url = new URL("".concat(_this.host).concat(_this.namespace, "/").concat(_this.endpoint).concat(opts.noId ? '' : '/').concat(id || ''));
-                        url.search = opts.query ? new URLSearchParams(Query.encode(opts.query)).toString() : '';
+                        url = "".concat(_this.endpointUrl).concat(opts.noId ? '' : '/').concat(id || '', "?").concat(_this.getQuery(opts.query));
                         return [
                             2,
-                            fetch(url.href, {
+                            fetch(url, {
                                 method: 'PUT',
                                 body: body,
                                 headers: headers,
@@ -292,11 +291,10 @@ var Api = /*#__PURE__*/ function() {
                     return _ts_generator(this, function(_state) {
                         headers = new Headers();
                         if (opts.token) headers.append('Authorization', "Bearer ".concat(opts.token));
-                        url = new URL("".concat(_this.host).concat(_this.namespace, "/").concat(_this.endpoint, "/").concat(id));
-                        url.search = opts.query ? new URLSearchParams(Query.encode(opts.query)).toString() : '';
+                        url = "".concat(_this.endpointUrl, "/").concat(id, "?").concat(_this.getQuery(opts.query));
                         return [
                             2,
-                            fetch(url.href, {
+                            fetch(url, {
                                 headers: headers,
                                 method: 'DELETE',
                                 credentials: 'include'
@@ -305,6 +303,12 @@ var Api = /*#__PURE__*/ function() {
                     });
                 })();
             }
+        },
+        {
+            key: "getQuery",
+            value: function getQuery(query) {
+                return query ? new URLSearchParams(Query.encode(query)).toString() : '';
+            }
         }
     ]);
     return Api;

package/dist/src/api/Endpoint.js

@@ -248,7 +248,8 @@ var Endpoint = /*#__PURE__*/ function(Api) {
     "use strict";
     _inherits(Endpoint, Api);
     var _super = _create_super(Endpoint);
-    function Endpoint(endpoint, host, errorCallback) {
+    function Endpoint(endpoint) {
+        var host = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : '/', errorCallback = arguments.length > 2 ? arguments[2] : void 0;
         _class_call_check(this, Endpoint);
         var _this;
         _this = _super.call(this, endpoint, host);

package/dist/src/components/ApiHostProvider.js

@@ -1,5 +1,5 @@
 import React, { createContext, useContext } from 'react';
-var ApiHostContext = /*#__PURE__*/ createContext('/api');
+var ApiHostContext = /*#__PURE__*/ createContext('/');
 export var ApiHostProvider = function(param) {
     var children = param.children, host = param.host;
     return /*#__PURE__*/ React.createElement(ApiHostContext.Provider, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ercioko/meblotex-api",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "Shared modules for Meblotex app",
   "main": "./dist/index.js",
   "typings": "./dist/index.d.ts",