@rws-framework/client 2.18.4 → 2.18.6

package/src/services/_api/backend.ts

@@ -1,87 +1,87 @@
-import { ApiServiceInstance, IBackendRoute, IHTTProute } from "../ApiService";
-import { ConfigServiceInstance } from "../ConfigService";
-
-export const backend = {
-    getBackendUrl(this: ApiServiceInstance, routeName: string, params: {[key: string]: string} = {}): string
-    {       
-        const config = this.config;
-        const routesPackage = config.get('backendRoutes');
-
-        let routes: IHTTProute[] = [];       
-
-        routesPackage.forEach((item: IBackendRoute) => {
-            // Check if item is an instance of IPrefixedHTTProutes
-            if ('prefix' in item && 'routes' in item && Array.isArray(item.routes)) {
-                // Handle the case where item is of type IPrefixedHTTProutes
-                if(item.exportAutoRoutes){
-                    item.routes = [...item.routes, 
-                        {
-                            name: `list`,
-                            path: '/',
-                            method: 'GET'
-                        },
-                        {
-                            name: `create`,
-                            path: '/',
-                            method: 'POST'
-                        },
-                        {
-                            name: `show`,
-                            path: '/:id',
-                            method: 'GET'
-                        },                      
-                        {
-                            name: `update`,
-                            path: '/:id',
-                            method: 'PUT'
-                        },
-                        {
-                            name: `delete`,
-                            path: '/:id',
-                            method: 'DELETE'
-                        },
-                    ];
-                }
-
-                routes = [...routes, ...item.routes.map((subRouteItem: IHTTProute): IHTTProute => {
-                    const subRoute: IHTTProute = {
-                        path: item.prefix + subRouteItem.path,
-                        name: backend.checkPrefixedRouteName(subRouteItem.name, item.controllerName),
-                        method: subRouteItem.method || 'GET'
-                    };
-            
-                    return subRoute;
-                })];
-
-            } else {
-                // Handle the case where item is of type IHTTProute
-                routes.push(item as IHTTProute);
-            }          
-        });        
-
-        const route = routes.find((item: IHTTProute) => item.name === routeName);        
-
-        if(!route){
-            throw new Error(`Backend route '${routeName}' does not exist.`);
-        }
-
-        let apiPath = route.path;
-
-        Object.keys(params).forEach((paramKey: string) => {
-            const paramValue = params[paramKey];
-
-            apiPath = apiPath.replace(`:${paramKey}`, paramValue);
-        });
-
-        return `${config.get('backendUrl')}${config.get('apiPrefix') || ''}${apiPath}`;
-    },
-    checkPrefixedRouteName(routeName: string, prefixName: string){
-        let finalRoute = routeName;
-
-        if(routeName.indexOf(prefixName) === -1){
-            finalRoute = `${prefixName}:${routeName}`;
-        }
-
-        return finalRoute;
-    }
+import { ApiServiceInstance, IBackendRoute, IHTTProute } from "../ApiService";
+import { ConfigServiceInstance } from "../ConfigService";
+
+export const backend = {
+    getBackendUrl(this: ApiServiceInstance, routeName: string, params: {[key: string]: string} = {}): string
+    {       
+        const config = this.config;
+        const routesPackage = config.get('backendRoutes');
+
+        let routes: IHTTProute[] = [];       
+
+        routesPackage.forEach((item: IBackendRoute) => {
+            // Check if item is an instance of IPrefixedHTTProutes
+            if ('prefix' in item && 'routes' in item && Array.isArray(item.routes)) {
+                // Handle the case where item is of type IPrefixedHTTProutes
+                if(item.exportAutoRoutes){
+                    item.routes = [...item.routes, 
+                        {
+                            name: `list`,
+                            path: '/',
+                            method: 'GET'
+                        },
+                        {
+                            name: `create`,
+                            path: '/',
+                            method: 'POST'
+                        },
+                        {
+                            name: `show`,
+                            path: '/:id',
+                            method: 'GET'
+                        },                      
+                        {
+                            name: `update`,
+                            path: '/:id',
+                            method: 'PUT'
+                        },
+                        {
+                            name: `delete`,
+                            path: '/:id',
+                            method: 'DELETE'
+                        },
+                    ];
+                }
+
+                routes = [...routes, ...item.routes.map((subRouteItem: IHTTProute): IHTTProute => {
+                    const subRoute: IHTTProute = {
+                        path: item.prefix + subRouteItem.path,
+                        name: backend.checkPrefixedRouteName(subRouteItem.name, item.controllerName),
+                        method: subRouteItem.method || 'GET'
+                    };
+            
+                    return subRoute;
+                })];
+
+            } else {
+                // Handle the case where item is of type IHTTProute
+                routes.push(item as IHTTProute);
+            }          
+        });        
+
+        const route = routes.find((item: IHTTProute) => item.name === routeName);        
+
+        if(!route){
+            throw new Error(`Backend route '${routeName}' does not exist.`);
+        }
+
+        let apiPath = route.path;
+
+        Object.keys(params).forEach((paramKey: string) => {
+            const paramValue = params[paramKey];
+
+            apiPath = apiPath.replace(`:${paramKey}`, paramValue);
+        });
+
+        return `${config.get('backendUrl')}${config.get('apiPrefix') || ''}${apiPath}`;
+    },
+    checkPrefixedRouteName(routeName: string, prefixName: string){
+        let finalRoute = routeName;
+
+        if(routeName.indexOf(prefixName) === -1){
+            finalRoute = `${prefixName}:${routeName}`;
+        }
+
+        return finalRoute;
+    }
 }

package/src/services/_api/calls.ts

@@ -1,116 +1,116 @@
-import { ApiServiceInstance, IAPIOptions } from "../ApiService";
-
-const _DEFAULT_CONTENT_TYPE = 'application/json';
-
-type HeadersType = Headers | [string, string][] | Record<string, string>;
-
-export const calls = {
-    addHeader(headers: HeadersType, key: string, val: string): void {
-        if (headers instanceof Headers) {
-            headers.append(key, val);
-        } else if (Array.isArray(headers)) {
-            headers.push([key, val]);
-        } else {
-            headers[key] = val;
-        }
-    },
-
-    getHeaders(token: string | null = null, optHeaders: HeadersInit = {}): HeadersInit {
-        const headers: Record<string, string> = { ...(optHeaders as Record<string, string>) };
-
-        if (!('Content-Type' in headers)) {
-            this.addHeader(headers, 'Content-Type', _DEFAULT_CONTENT_TYPE);
-        }
-
-        if (token) {
-            this.addHeader(headers, 'Authorization', `Bearer ${token}`);
-        }
-
-        if (headers['Content-Type']) {
-            this.addHeader(headers, 'Accept', '*/*');
-        } else {
-            this.addHeader(headers, 'Accept', headers['Content-Type'] || _DEFAULT_CONTENT_TYPE);
-        }
-
-        return headers;
-    },
-
-    async pureGet(this: ApiServiceInstance, url: string, options: IAPIOptions = {}): Promise<string> {
-        try {
-            const response = await fetch(url, {
-                headers: calls.getHeaders(this.token, options.headers),
-            });
-            return await response.text();
-        } catch (error) {
-            console.error('GET request failed:', error);
-            throw error;
-        }
-    },
-
-    async get<T>(this: ApiServiceInstance, url: string, options: IAPIOptions = {}): Promise<T> {
-        try {
-            const response = await fetch(url, {
-                headers: calls.getHeaders(this.token, options.headers),
-            });
-            const data: T = await response.json();
-            return data;
-        } catch (error) {
-            console.error('GET request failed:', error);
-            throw error;
-        }
-    },
-
-    async post<T, P extends object = object>(
-        this: ApiServiceInstance,
-        url: string,
-        payload?: P,
-        options: IAPIOptions = {}
-    ): Promise<T> {
-        try {
-            const response = await fetch(url, {
-                method: 'POST',
-                headers: calls.getHeaders(this.token, options.headers),
-                body: payload ? JSON.stringify(payload) : null,
-            });
-            const data: T = await response.json();
-            return data;
-        } catch (error) {
-            console.error('POST request failed:', error);
-            throw error;
-        }
-    },
-
-    async put<T, P extends object = object>(
-        this: ApiServiceInstance,
-        url: string,
-        payload: P,
-        options: IAPIOptions = {}
-    ): Promise<T> {
-        try {
-            const response = await fetch(url, {
-                method: 'PUT',
-                headers: calls.getHeaders(this.token, options.headers),
-                body: JSON.stringify(payload),
-            });
-            const data: T = await response.json();
-            return data;
-        } catch (error) {
-            console.error('PUT request failed:', error);
-            throw error;
-        }
-    },
-
-    async delete<T>(this: ApiServiceInstance, url: string, options: IAPIOptions = {}): Promise<T> {
-        try {
-            const response = await fetch(url, {
-                method: 'DELETE',
-                headers: calls.getHeaders(this.token, options.headers),
-            });
-            const data: T = await response.json();
-            return data;
-        } catch (error) {
-            console.error('DELETE request failed:', error);
-            throw error;
-        }
-    }
+import { ApiServiceInstance, IAPIOptions } from "../ApiService";
+
+const _DEFAULT_CONTENT_TYPE = 'application/json';
+
+type HeadersType = Headers | [string, string][] | Record<string, string>;
+
+export const calls = {
+    addHeader(headers: HeadersType, key: string, val: string): void {
+        if (headers instanceof Headers) {
+            headers.append(key, val);
+        } else if (Array.isArray(headers)) {
+            headers.push([key, val]);
+        } else {
+            headers[key] = val;
+        }
+    },
+
+    getHeaders(token: string | null = null, optHeaders: HeadersInit = {}): HeadersInit {
+        const headers: Record<string, string> = { ...(optHeaders as Record<string, string>) };
+
+        if (!('Content-Type' in headers)) {
+            this.addHeader(headers, 'Content-Type', _DEFAULT_CONTENT_TYPE);
+        }
+
+        if (token) {
+            this.addHeader(headers, 'Authorization', `Bearer ${token}`);
+        }
+
+        if (headers['Content-Type']) {
+            this.addHeader(headers, 'Accept', '*/*');
+        } else {
+            this.addHeader(headers, 'Accept', headers['Content-Type'] || _DEFAULT_CONTENT_TYPE);
+        }
+
+        return headers;
+    },
+
+    async pureGet(this: ApiServiceInstance, url: string, options: IAPIOptions = {}): Promise<string> {
+        try {
+            const response = await fetch(url, {
+                headers: calls.getHeaders(this.token, options.headers),
+            });
+            return await response.text();
+        } catch (error) {
+            console.error('GET request failed:', error);
+            throw error;
+        }
+    },
+
+    async get<T>(this: ApiServiceInstance, url: string, options: IAPIOptions = {}): Promise<T> {
+        try {
+            const response = await fetch(url, {
+                headers: calls.getHeaders(this.token, options.headers),
+            });
+            const data: T = await response.json();
+            return data;
+        } catch (error) {
+            console.error('GET request failed:', error);
+            throw error;
+        }
+    },
+
+    async post<T, P extends object = object>(
+        this: ApiServiceInstance,
+        url: string,
+        payload?: P,
+        options: IAPIOptions = {}
+    ): Promise<T> {
+        try {
+            const response = await fetch(url, {
+                method: 'POST',
+                headers: calls.getHeaders(this.token, options.headers),
+                body: payload ? JSON.stringify(payload) : null,
+            });
+            const data: T = await response.json();
+            return data;
+        } catch (error) {
+            console.error('POST request failed:', error);
+            throw error;
+        }
+    },
+
+    async put<T, P extends object = object>(
+        this: ApiServiceInstance,
+        url: string,
+        payload: P,
+        options: IAPIOptions = {}
+    ): Promise<T> {
+        try {
+            const response = await fetch(url, {
+                method: 'PUT',
+                headers: calls.getHeaders(this.token, options.headers),
+                body: JSON.stringify(payload),
+            });
+            const data: T = await response.json();
+            return data;
+        } catch (error) {
+            console.error('PUT request failed:', error);
+            throw error;
+        }
+    },
+
+    async delete<T>(this: ApiServiceInstance, url: string, options: IAPIOptions = {}): Promise<T> {
+        try {
+            const response = await fetch(url, {
+                method: 'DELETE',
+                headers: calls.getHeaders(this.token, options.headers),
+            });
+            const data: T = await response.json();
+            return data;
+        } catch (error) {
+            console.error('DELETE request failed:', error);
+            throw error;
+        }
+    }
 };