@commercelayer/sdk 6.0.0-alfa.4 → 6.0.0-alfa.5

package/lib/cjs/error.js

@@ -1,10 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleError = exports.ErrorType = exports.ApiError = exports.SdkError = void 0;
-const axios_1 = __importDefault(require("axios"));
+const fetch_1 = require("./fetch");
 var ErrorType;
 (function (ErrorType) {
     ErrorType["CLIENT"] = "client";
@@ -12,7 +9,7 @@ var ErrorType;
     ErrorType["RESPONSE"] = "response";
     ErrorType["CANCEL"] = "cancel";
     ErrorType["PARSE"] = "parse";
-    ErrorType["GENERIC"] = "generic";
+    ErrorType["TIMEOUT"] = "timeout"; // Timeout error
 })(ErrorType || (exports.ErrorType = ErrorType = {}));
 class SdkError extends Error {
     static isSdkError(error) {
@@ -20,8 +17,8 @@ class SdkError extends Error {
     }
     constructor(error) {
         super(error.message);
-        this.name = SdkError.NAME; // this.constructor.name
-        this.type = error.type || ErrorType.GENERIC;
+        this.name = SdkError.NAME;
+        this.type = error.type || ErrorType.CLIENT;
     }
 }
 exports.SdkError = SdkError;
@@ -33,7 +30,7 @@ class ApiError extends SdkError {
     constructor(error) {
         super({ ...error, type: ErrorType.RESPONSE });
         this.errors = [];
-        this.name = ApiError.NAME; // this.constructor.name
+        this.name = ApiError.NAME;
     }
     first() {
         return (this.errors?.length > 0) ? this.errors[0] : undefined;
@@ -41,36 +38,46 @@ class ApiError extends SdkError {
 }
 exports.ApiError = ApiError;
 ApiError.NAME = 'ApiError';
+const isRequestError = (error) => {
+    return error instanceof TypeError;
+};
+const isCancelError = (error) => {
+    return (error instanceof DOMException) && (error.name === 'AbortError');
+};
+const isTimeoutError = (error) => {
+    return (error instanceof DOMException) && (error.name === 'TimeoutError');
+};
 const handleError = (error) => {
     let sdkError = new SdkError({ message: error.message });
-    if (axios_1.default.isAxiosError(error)) {
-        if (error.response) {
-            // The request was made and the server responded with a status code that falls out of the range of 2xx
-            const apiError = new ApiError(sdkError);
-            apiError.type = ErrorType.RESPONSE;
-            apiError.status = error.response.status;
-            apiError.statusText = error.response.statusText;
-            apiError.code = String(apiError.status);
-            apiError.errors = error.response.data.errors;
-            if (!apiError.message && apiError.statusText)
-                apiError.message = apiError.statusText;
-            sdkError = apiError;
-        }
-        else if (error.request) {
-            // The request was made but no response was received
-            // `error.request` is an instance of XMLHttpRequest in the browser and an instance of http.ClientRequest in node.js
-            sdkError.type = ErrorType.REQUEST;
-            sdkError.request = error.request;
-        }
-        else {
-            // Something happened in setting up the request that triggered an Error
-            sdkError.type = ErrorType.CLIENT;
-        }
+    if (fetch_1.FetchError.isFetchError(error)) {
+        // console.log('********** FetchError')
+        const apiError = new ApiError(sdkError);
+        apiError.type = ErrorType.RESPONSE;
+        apiError.status = error.status;
+        apiError.statusText = error.statusText;
+        apiError.code = String(apiError.status);
+        apiError.errors = error.errors || [];
+        if (!apiError.message && apiError.statusText)
+            apiError.message = apiError.statusText;
+        sdkError = apiError;
     }
-    else if (axios_1.default.isCancel(error))
+    else if (isRequestError(error)) {
+        // console.log('********** RequestError')
+        sdkError.type = ErrorType.REQUEST;
+    }
+    else if (isCancelError(error)) {
+        // console.log('********** CancelError')
         sdkError.type = ErrorType.CANCEL;
-    else
+    }
+    else if (isTimeoutError(error)) {
+        // console.log('********** TimeoutError')
+        sdkError.type = ErrorType.TIMEOUT;
+    }
+    else {
+        // console.log('********** ClientError')
+        sdkError.type = ErrorType.CLIENT;
         sdkError.source = error;
+    }
     throw sdkError;
 };
 exports.handleError = handleError;

package/lib/cjs/fetch.d.ts

@@ -0,0 +1,13 @@
+import type { DocWithData } from 'jsonapi-typescript';
+import type { InterceptorManager } from './interceptor';
+export type FetchResponse = DocWithData;
+export type FetchOptions = RequestInit;
+export declare class FetchError extends Error {
+    #private;
+    static isFetchError: (error: any) => error is FetchError;
+    constructor(status: number, statusText: string, body?: any);
+    get errors(): any[] | undefined;
+    get status(): number;
+    get statusText(): string;
+}
+export declare const fetchURL: (url: URL, options: FetchOptions, interceptors?: InterceptorManager) => Promise<FetchResponse>;

package/lib/cjs/fetch.js

@@ -0,0 +1,67 @@
+"use strict";
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+var _FetchError_errors, _FetchError_status, _FetchError_statusText;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fetchURL = exports.FetchError = void 0;
+const debug_1 = __importDefault(require("./debug"));
+const debug = (0, debug_1.default)('fetch');
+class FetchError extends Error {
+    constructor(status, statusText, body) {
+        super(statusText);
+        _FetchError_errors.set(this, void 0);
+        _FetchError_status.set(this, void 0);
+        _FetchError_statusText.set(this, void 0);
+        __classPrivateFieldSet(this, _FetchError_status, status, "f");
+        __classPrivateFieldSet(this, _FetchError_statusText, statusText, "f");
+        if (body)
+            __classPrivateFieldSet(this, _FetchError_errors, body.errors, "f");
+    }
+    get errors() { return __classPrivateFieldGet(this, _FetchError_errors, "f"); }
+    get status() { return __classPrivateFieldGet(this, _FetchError_status, "f"); }
+    get statusText() { return __classPrivateFieldGet(this, _FetchError_statusText, "f"); }
+}
+exports.FetchError = FetchError;
+_FetchError_errors = new WeakMap(), _FetchError_status = new WeakMap(), _FetchError_statusText = new WeakMap();
+FetchError.isFetchError = (error) => {
+    return error instanceof FetchError;
+};
+const fetchURL = async (url, options, interceptors) => {
+    debug('fetch: %s, %O', url, options || {});
+    if (interceptors?.request?.onSuccess)
+        ({ url, options } = await interceptors.request.onSuccess({ url, options }));
+    // const request: Request = new Request(url, options)
+    let response = await fetch(url, options);
+    if (response.ok) {
+        if (interceptors?.rawReader?.onSuccess)
+            await interceptors.rawReader.onSuccess(response);
+        if (interceptors?.response?.onSuccess)
+            response = await interceptors.response.onSuccess(response);
+    }
+    else {
+        if (interceptors?.rawReader?.onFailure)
+            await interceptors.rawReader.onFailure(response);
+    }
+    const responseBody = await response.json().catch(() => { });
+    if (!response.ok) {
+        let error = new FetchError(response.status, response.statusText, responseBody);
+        if (interceptors?.response?.onFailure)
+            error = await interceptors.response.onFailure(error);
+        if (error)
+            throw error;
+    }
+    return responseBody;
+};
+exports.fetchURL = fetchURL;

package/lib/cjs/interceptor.d.ts

@@ -1,25 +1,37 @@
-import type { AxiosError, AxiosInterceptorManager, AxiosRequestConfig, AxiosResponse, AxiosResponseHeaders, RawAxiosResponseHeaders } from 'axios';
+import type { FetchError, FetchOptions } from "./fetch";
+type InterceptorEventManager<S extends (RequestInterceptor | ResponseInterceptor), F extends (ErrorInterceptor | ResponseInterceptor)> = {
+    onSuccess?: S;
+    onFailure?: F;
+};
+type RequestEventManager = InterceptorEventManager<RequestInterceptor, ErrorInterceptor>;
+type ResponseEventManager = InterceptorEventManager<ResponseInterceptor, ErrorInterceptor>;
+type ErrorEventManager = InterceptorEventManager<ResponseInterceptor, ResponseInterceptor>;
 type InterceptorManager = {
-    request: AxiosInterceptorManager<AxiosRequestConfig>;
-    response: AxiosInterceptorManager<any>;
+    request?: RequestEventManager;
+    response?: ResponseEventManager;
+    rawReader?: ErrorEventManager;
+};
+type RequestObj = {
+    url: URL;
+    options: FetchOptions;
 };
-type RequestObj = AxiosRequestConfig;
 type RequestInterceptor = (request: RequestObj) => RequestObj | Promise<RequestObj>;
-type ResponseObj = AxiosResponse;
-type ResponseInterceptor = (response: ResponseObj) => ResponseObj;
+type ResponseObj = Response;
+type ResponseInterceptor = (response: ResponseObj) => ResponseObj | Promise<ResponseObj>;
 type ApiHeadersList = 'x-ratelimit-limit' | 'x-ratelimit-count' | 'x-ratelimit-period' | 'x-ratelimit-interval' | 'x-ratelimit-remaining';
 type ApiHeaders = {
     [key in ApiHeadersList]: string | number | boolean;
 };
-type HeadersObj = (AxiosResponseHeaders | RawAxiosResponseHeaders) & ApiHeaders;
-type ErrorObj = AxiosError;
-type ErrorInterceptor = (error: ErrorObj) => ErrorObj;
+type HeadersObj = Record<string, string> | ApiHeaders;
+type ErrorObj = FetchError;
+type ErrorInterceptor = (error: ErrorObj) => ErrorObj | Promise<ErrorObj>;
 type InterceptorType = 'request' | 'response';
 export type { InterceptorManager, RequestInterceptor, ResponseInterceptor, ErrorInterceptor, InterceptorType };
 export type { RequestObj, ResponseObj, ErrorObj, HeadersObj };
 type RawResponseReader = {
-    id: number | undefined;
-    rawResponse: ResponseObj | undefined;
-    headers: HeadersObj | undefined;
+    id?: number;
+    rawResponse?: any;
+    headers?: HeadersObj;
+    ok: boolean;
 };
 export type { RawResponseReader };

package/lib/cjs/query.d.ts

@@ -14,4 +14,5 @@ type QueryParams = QueryParamsRetrieve | QueryParamsList;
 export type { QueryParamsRetrieve, QueryParamsList, QueryParams, QueryFilter };
 declare const isParamsList: (params: any) => params is QueryParamsList;
 declare const generateQueryStringParams: (params: QueryParamsRetrieve | QueryParamsList | undefined, res: string | ResourceType) => Record<string, string>;
-export { generateQueryStringParams, isParamsList };
+declare const generateSearchString: (params?: QueryParams, questionMark?: boolean) => string;
+export { generateQueryStringParams, isParamsList, generateSearchString };

package/lib/cjs/query.js

@@ -3,9 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isParamsList = exports.generateQueryStringParams = void 0;
-const debug_1 = __importDefault(require("./debug"));
+exports.generateSearchString = exports.isParamsList = exports.generateQueryStringParams = void 0;
 const error_1 = require("./error");
+const debug_1 = __importDefault(require("./debug"));
 const debug = (0, debug_1.default)('query');
 const arrayFilters = ['_any', '_all', '_in'];
 const objectFilters = ['_jcont'];
@@ -67,3 +67,9 @@ const generateQueryStringParams = (params, res) => {
     return qp;
 };
 exports.generateQueryStringParams = generateQueryStringParams;
+const generateSearchString = (params, questionMark = true) => {
+    if (!params || (Object.keys(params).length === 0))
+        return '';
+    return `${questionMark ? '?' : ''}${Object.entries(params).map(([key, val]) => `${key}=${String(val)}`).join('&')}`;
+};
+exports.generateSearchString = generateSearchString;

package/lib/cjs/resource.d.ts

@@ -1,7 +1,6 @@
 import ApiClient, { type ApiClientInitConfig } from './client';
 import type { QueryParamsRetrieve, QueryParamsList, QueryFilter, QueryParams } from './query';
 import type { ResourceTypeLock } from './api';
-import type { InterceptorManager } from './interceptor';
 type ResourceNull = {
     id: null;
 } & ResourceType;
@@ -53,7 +52,6 @@ type ResourcesConfig = Partial<ResourcesInitConfig>;
 declare class ResourceAdapter {
     #private;
     constructor(config: ResourcesInitConfig);
-    get interceptors(): InterceptorManager;
     private localConfig;
     config(config: ResourcesConfig): ResourceAdapter;
     get client(): Readonly<ApiClient>;
@@ -73,9 +71,6 @@ declare abstract class ApiResourceBase<R extends Resource> {
     protected relationshipOneToOne<RR extends ResourceRel>(id: string | ResourceId | null): RR;
     protected relationshipOneToMany<RR extends ResourceRel>(...ids: string[]): RR[];
     abstract type(): ResourceTypeLock;
-    parse(resource: string, options?: {
-        ignoreSlug?: boolean;
-    }): R | R[];
     update(resource: ResourceUpdate, params?: QueryParamsRetrieve, options?: ResourcesConfig): Promise<R>;
 }
 declare abstract class ApiResource<R extends Resource> extends ApiResourceBase<R> {

package/lib/cjs/resource.js

@@ -20,7 +20,6 @@ const client_1 = __importDefault(require("./client"));
 const jsonapi_1 = require("./jsonapi");
 const query_1 = require("./query");
 const config_1 = __importDefault(require("./config"));
-const error_1 = require("./error");
 const debug_1 = __importDefault(require("./debug"));
 const debug = (0, debug_1.default)('resource');
 class ListResponse extends Array {
@@ -45,7 +44,6 @@ class ResourceAdapter {
         __classPrivateFieldSet(this, _ResourceAdapter_client, client_1.default.create(config), "f");
         this.localConfig(config);
     }
-    get interceptors() { return __classPrivateFieldGet(this, _ResourceAdapter_client, "f").interceptors; }
     localConfig(config) {
         // if (typeof config.xyz !== 'undefined') this.#config.xyz = config.xyz
     }
@@ -65,7 +63,7 @@ class ResourceAdapter {
         const queryParams = (0, query_1.generateQueryStringParams)(params, resource);
         if (options?.params)
             Object.assign(queryParams, options?.params);
-        const res = await __classPrivateFieldGet(this, _ResourceAdapter_client, "f").request('get', `${resource.type}`, undefined, { ...options, params: queryParams });
+        const res = await __classPrivateFieldGet(this, _ResourceAdapter_client, "f").request('GET', `${resource.type}`, undefined, { ...options, params: queryParams });
         const r = (0, jsonapi_1.denormalize)(res);
         return r;
     }
@@ -74,7 +72,7 @@ class ResourceAdapter {
         const queryParams = (0, query_1.generateQueryStringParams)(params, resource);
         if (options?.params)
             Object.assign(queryParams, options?.params);
-        const res = await __classPrivateFieldGet(this, _ResourceAdapter_client, "f").request('get', `${resource.type}/${resource.id}`, undefined, { ...options, params: queryParams });
+        const res = await __classPrivateFieldGet(this, _ResourceAdapter_client, "f").request('GET', `${resource.type}/${resource.id}`, undefined, { ...options, params: queryParams });
         const r = (0, jsonapi_1.denormalize)(res);
         return r;
     }
@@ -83,7 +81,7 @@ class ResourceAdapter {
         const queryParams = (0, query_1.generateQueryStringParams)(params, resource);
         if (options?.params)
             Object.assign(queryParams, options?.params);
-        const res = await __classPrivateFieldGet(this, _ResourceAdapter_client, "f").request('get', `${resource.type}`, undefined, { ...options, params: queryParams });
+        const res = await __classPrivateFieldGet(this, _ResourceAdapter_client, "f").request('GET', `${resource.type}`, undefined, { ...options, params: queryParams });
         const r = (0, jsonapi_1.denormalize)(res);
         const meta = {
             pageCount: Number(res.meta?.page_count),
@@ -99,7 +97,7 @@ class ResourceAdapter {
         if (options?.params)
             Object.assign(queryParams, options?.params);
         const data = (0, jsonapi_1.normalize)(resource);
-        const res = await __classPrivateFieldGet(this, _ResourceAdapter_client, "f").request('post', resource.type, data, { ...options, params: queryParams });
+        const res = await __classPrivateFieldGet(this, _ResourceAdapter_client, "f").request('POST', resource.type, data, { ...options, params: queryParams });
         const r = (0, jsonapi_1.denormalize)(res);
         return r;
     }
@@ -109,20 +107,20 @@ class ResourceAdapter {
         if (options?.params)
             Object.assign(queryParams, options?.params);
         const data = (0, jsonapi_1.normalize)(resource);
-        const res = await __classPrivateFieldGet(this, _ResourceAdapter_client, "f").request('patch', `${resource.type}/${resource.id}`, data, { ...options, params: queryParams });
+        const res = await __classPrivateFieldGet(this, _ResourceAdapter_client, "f").request('PATCH', `${resource.type}/${resource.id}`, data, { ...options, params: queryParams });
         const r = (0, jsonapi_1.denormalize)(res);
         return r;
     }
     async delete(resource, options) {
         debug('delete: %o, %O', resource, options || {});
-        await __classPrivateFieldGet(this, _ResourceAdapter_client, "f").request('delete', `${resource.type}/${resource.id}`, undefined, options);
+        await __classPrivateFieldGet(this, _ResourceAdapter_client, "f").request('DELETE', `${resource.type}/${resource.id}`, undefined, options);
     }
     async fetch(resource, path, params, options) {
         debug('fetch: %o, %O, %O', path, params || {}, options || {});
         const queryParams = (0, query_1.generateQueryStringParams)(params, resource);
         if (options?.params)
             Object.assign(queryParams, options?.params);
-        const res = await __classPrivateFieldGet(this, _ResourceAdapter_client, "f").request('get', path, undefined, { ...options, params: queryParams });
+        const res = await __classPrivateFieldGet(this, _ResourceAdapter_client, "f").request('GET', path, undefined, { ...options, params: queryParams });
         const r = (0, jsonapi_1.denormalize)(res);
         if (Array.isArray(r)) {
             const p = params;
@@ -143,6 +141,7 @@ class ApiResourceBase {
     constructor(adapter) {
         debug('new resource instance: %s', this.type());
         this.resources = adapter;
+        console.log('CONSTRUCTOR ' + this.type());
     }
     relationshipOneToOne(id) {
         return (((id === null) || (typeof id === 'string')) ? { id, type: this.type() } : { id: id.id, type: this.type() });
@@ -150,29 +149,36 @@ class ApiResourceBase {
     relationshipOneToMany(...ids) {
         return (((ids === null) || (ids.length === 0) || (ids[0] === null)) ? [{ id: null, type: this.type() }] : ids.map(id => { return { id, type: this.type() }; }));
     }
-    parse(resource, options) {
-        try {
-            const res = JSON.parse(resource);
-            // Resource type always checked
-            const rtype = res.data?.type;
-            if (rtype !== this.type())
-                throw new error_1.SdkError({ message: `Invalid resource type [${rtype}]`, type: error_1.ErrorType.PARSE });
-            // Parse options
-            const { ignoreSlug } = options || {};
-            if (!ignoreSlug) {
-                const links = res.data.links.self;
-                if (!links || !String(links).match(`^${this.resources.client.baseUrl}/${this.type()}/*`))
-                    throw new error_1.SdkError({ message: `Resource contains invalid links [${links}]`, type: error_1.ErrorType.PARSE });
+    /*
+        parse(resource: string, options?: { ignoreSlug?: boolean }): R | R[] {
+    
+            try {
+    
+                const res = JSON.parse(resource)
+    
+                // Resource type always checked
+                const rtype = res.data?.type
+                if (rtype !== this.type()) throw new SdkError({ message: `Invalid resource type [${rtype}]`, type: ErrorType.PARSE })
+                
+                // Parse options
+                const { ignoreSlug } = options || {}
+    
+                if (!ignoreSlug) {
+                    const links = res.data.links.self
+                    if (!links || !String(links).match(`^${this.resources.client.baseUrl}/${this.type()}/*`))
+                        throw new SdkError({ message: `Resource contains invalid links [${links}]`, type: ErrorType.PARSE })
+                }
+    
+    
+                return denormalize<R>(res as DocWithData)
+    
+            } catch (error: any) {
+                if (SdkError.isSdkError(error)) throw error
+                else throw new SdkError({ message: `Payload parse error [${error.message}]`, type: ErrorType.PARSE })
             }
-            return (0, jsonapi_1.denormalize)(res);
+    
         }
-        catch (error) {
-            if (error_1.SdkError.isSdkError(error))
-                throw error;
-            else
-                throw new error_1.SdkError({ message: `Payload parse error [${error.message}]`, type: error_1.ErrorType.PARSE });
-        }
-    }
+        */
     // reference, reference_origin and metadata attributes are always updatable
     async update(resource, params, options) {
         return this.resources.update({ ...resource, type: this.type() }, params, options);

package/lib/esm/client.d.ts

@@ -1,19 +1,11 @@
-import type { AxiosAdapter, AxiosProxyConfig, Method } from 'axios';
 import type { InterceptorManager } from './interceptor';
-type ProxyConfig = AxiosProxyConfig | false;
-type Adapter = AxiosAdapter;
+import { type FetchResponse } from './fetch';
 type RequestParams = Record<string, string | number | boolean>;
 type RequestHeaders = Record<string, string>;
 type RequestConfig = {
     timeout?: number;
     params?: RequestParams;
-    httpAgent?: any;
-    httpsAgent?: any;
-    proxy?: ProxyConfig;
     headers?: RequestHeaders;
-};
-type RequestConfigExtra = {
-    adapter?: Adapter;
     userAgent?: string;
 };
 type ApiConfig = {
@@ -21,18 +13,18 @@ type ApiConfig = {
     domain?: string;
     accessToken: string;
 };
-type ApiClientInitConfig = ApiConfig & RequestConfig & RequestConfigExtra;
+type ApiClientInitConfig = ApiConfig & RequestConfig;
 type ApiClientConfig = Partial<ApiClientInitConfig>;
+export type Method = 'GET' | 'DELETE' | 'POST' | 'PUT' | 'PATCH';
 declare class ApiClient {
     #private;
     static create(options: ApiClientInitConfig): ApiClient;
-    baseUrl: string;
-    interceptors: InterceptorManager;
     private constructor();
+    get interceptors(): InterceptorManager;
+    get requestHeaders(): RequestHeaders;
     config(config: ApiClientConfig): ApiClient;
     userAgent(userAgent: string): ApiClient;
-    adapter(adapter: Adapter): ApiClient;
-    request(method: Method, path: string, body?: any, options?: ApiClientConfig): Promise<any>;
+    request(method: Method, path: string, body?: any, options?: ApiClientConfig): Promise<FetchResponse>;
     private customHeaders;
 }
 export default ApiClient;