@commercelayer/sdk 5.35.0 → 6.0.0-alfa.2

package/lib/cjs/client.js

@@ -120,16 +120,16 @@ class ApiClient {
     async request(method, path, body, options) {
         debug('request %s %s, %O, %O', method, path, body || {}, options || {});
         // Ignored params alerts (in debug mode)
-        if (options === null || options === void 0 ? void 0 : options.adapter)
+        if (options?.adapter)
             debug('Adapter ignored in request config');
-        if (options === null || options === void 0 ? void 0 : options.userAgent)
+        if (options?.userAgent)
             debug('User-Agent header ignored in request config');
         const data = body ? { data: body } : undefined;
         const url = path;
         // Runtime request parameters
-        const baseUrl = (options === null || options === void 0 ? void 0 : options.organization) ? baseURL(options.organization, options.domain) : undefined;
-        const accessToken = (options === null || options === void 0 ? void 0 : options.accessToken) || __classPrivateFieldGet(this, _ApiClient_accessToken, "f");
-        const headers = this.customHeaders(options === null || options === void 0 ? void 0 : options.headers);
+        const baseUrl = options?.organization ? baseURL(options.organization, options.domain) : undefined;
+        const accessToken = options?.accessToken || __classPrivateFieldGet(this, _ApiClient_accessToken, "f");
+        const headers = this.customHeaders(options?.headers);
         if (accessToken)
             headers.Authorization = 'Bearer ' + accessToken;
         const requestParams = { method, baseURL: baseUrl, url, data, ...options, headers };

package/lib/cjs/commercelayer.d.ts

@@ -139,8 +139,8 @@ declare class CommerceLayerClient {
     singletons(): readonly string[];
     isSingleton(resource: api.ResourceTypeLock): boolean;
     isApiError(error: any): error is ApiError;
-    addRequestInterceptor(onFulfilled?: RequestInterceptor | null, onRejected?: ErrorInterceptor | null): number;
-    addResponseInterceptor(onFulfilled?: ResponseInterceptor | null, onRejected?: ErrorInterceptor | null): number;
+    addRequestInterceptor(onFulfilled?: RequestInterceptor, onRejected?: ErrorInterceptor): number;
+    addResponseInterceptor(onFulfilled?: ResponseInterceptor, onRejected?: ErrorInterceptor): number;
     removeInterceptor(type: InterceptorType, id: number): void;
     addRawResponseReader(options?: {
         headers: boolean;

package/lib/cjs/commercelayer.js

@@ -230,8 +230,8 @@ class CommerceLayerClient {
             headers: undefined,
         };
         function rawResponseInterceptor(response) {
-            reader.rawResponse = response === null || response === void 0 ? void 0 : response.data;
-            if (options === null || options === void 0 ? void 0 : options.headers)
+            reader.rawResponse = response?.data;
+            if (options?.headers)
                 reader.headers = response.headers;
             return response;
         }
@@ -240,7 +240,7 @@ class CommerceLayerClient {
         return reader;
     }
     removeRawResponseReader(reader) {
-        const id = (typeof reader === 'number') ? reader : reader === null || reader === void 0 ? void 0 : reader.id;
+        const id = (typeof reader === 'number') ? reader : reader?.id;
         if (id && (id >= 0))
             this.removeInterceptor('response', id);
     }

package/lib/cjs/common.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.isResourceType = exports.isResourceId = void 0;
 const api_1 = require("./api");
 const isResourceId = (resource) => {
-    return ((resource === null || resource === void 0 ? void 0 : resource.type) && resource.id) && api_1.resourceList.includes(resource.type);
+    return (resource?.type && resource.id) && api_1.resourceList.includes(resource.type);
 };
 exports.isResourceId = isResourceId;
 const isResourceType = (resource) => {

package/lib/cjs/error.js

@@ -36,8 +36,7 @@ class ApiError extends SdkError {
         this.name = ApiError.NAME; // this.constructor.name
     }
     first() {
-        var _a;
-        return (((_a = this.errors) === null || _a === void 0 ? void 0 : _a.length) > 0) ? this.errors[0] : undefined;
+        return (this.errors?.length > 0) ? this.errors[0] : undefined;
     }
 }
 exports.ApiError = ApiError;

package/lib/cjs/interceptor.d.ts

@@ -6,14 +6,14 @@ type InterceptorManager = {
 type RequestObj = AxiosRequestConfig;
 type RequestInterceptor = (request: RequestObj) => RequestObj | Promise<RequestObj>;
 type ResponseObj = AxiosResponse;
-type ResponseInterceptor = (response: ResponseObj) => ResponseObj | Promise<ResponseObj>;
+type ResponseInterceptor = (response: ResponseObj) => 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 | Promise<ErrorObj>;
+type ErrorInterceptor = (error: ErrorObj) => ErrorObj;
 type InterceptorType = 'request' | 'response';
 export type { InterceptorManager, RequestInterceptor, ResponseInterceptor, ErrorInterceptor, InterceptorType };
 export type { RequestObj, ResponseObj, ErrorObj, HeadersObj };

package/lib/cjs/resource.js

@@ -63,8 +63,8 @@ class ResourceAdapter {
     async singleton(resource, params, options) {
         debug('singleton: %o, %O, %O', resource, params || {}, options || {});
         const queryParams = (0, query_1.generateQueryStringParams)(params, resource);
-        if (options === null || options === void 0 ? void 0 : options.params)
-            Object.assign(queryParams, options === null || options === void 0 ? void 0 : options.params);
+        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 r = (0, jsonapi_1.denormalize)(res);
         return r;
@@ -72,33 +72,32 @@ class ResourceAdapter {
     async retrieve(resource, params, options) {
         debug('retrieve: %o, %O, %O', resource, params || {}, options || {});
         const queryParams = (0, query_1.generateQueryStringParams)(params, resource);
-        if (options === null || options === void 0 ? void 0 : options.params)
-            Object.assign(queryParams, options === null || options === void 0 ? void 0 : options.params);
+        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 r = (0, jsonapi_1.denormalize)(res);
         return r;
     }
     async list(resource, params, options) {
-        var _a, _b;
         debug('list: %o, %O, %O', resource, params || {}, options || {});
         const queryParams = (0, query_1.generateQueryStringParams)(params, resource);
-        if (options === null || options === void 0 ? void 0 : options.params)
-            Object.assign(queryParams, options === null || options === void 0 ? void 0 : options.params);
+        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 r = (0, jsonapi_1.denormalize)(res);
         const meta = {
-            pageCount: Number((_a = res.meta) === null || _a === void 0 ? void 0 : _a.page_count),
-            recordCount: Number((_b = res.meta) === null || _b === void 0 ? void 0 : _b.record_count),
-            currentPage: (params === null || params === void 0 ? void 0 : params.pageNumber) || config_1.default.default.pageNumber,
-            recordsPerPage: (params === null || params === void 0 ? void 0 : params.pageSize) || config_1.default.default.pageSize
+            pageCount: Number(res.meta?.page_count),
+            recordCount: Number(res.meta?.record_count),
+            currentPage: params?.pageNumber || config_1.default.default.pageNumber,
+            recordsPerPage: params?.pageSize || config_1.default.default.pageSize
         };
         return new ListResponse(meta, r);
     }
     async create(resource, params, options) {
         debug('create: %o, %O, %O', resource, params || {}, options || {});
         const queryParams = (0, query_1.generateQueryStringParams)(params, resource);
-        if (options === null || options === void 0 ? void 0 : options.params)
-            Object.assign(queryParams, options === null || options === void 0 ? void 0 : options.params);
+        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 r = (0, jsonapi_1.denormalize)(res);
@@ -107,8 +106,8 @@ class ResourceAdapter {
     async update(resource, params, options) {
         debug('update: %o, %O, %O', resource, params || {}, options || {});
         const queryParams = (0, query_1.generateQueryStringParams)(params, resource);
-        if (options === null || options === void 0 ? void 0 : options.params)
-            Object.assign(queryParams, options === null || options === void 0 ? void 0 : options.params);
+        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 r = (0, jsonapi_1.denormalize)(res);
@@ -119,20 +118,19 @@ class ResourceAdapter {
         await __classPrivateFieldGet(this, _ResourceAdapter_client, "f").request('delete', `${resource.type}/${resource.id}`, undefined, options);
     }
     async fetch(resource, path, params, options) {
-        var _a, _b;
         debug('fetch: %o, %O, %O', path, params || {}, options || {});
         const queryParams = (0, query_1.generateQueryStringParams)(params, resource);
-        if (options === null || options === void 0 ? void 0 : options.params)
-            Object.assign(queryParams, options === null || options === void 0 ? void 0 : options.params);
+        if (options?.params)
+            Object.assign(queryParams, options?.params);
         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;
             const meta = {
-                pageCount: Number((_a = res.meta) === null || _a === void 0 ? void 0 : _a.page_count),
-                recordCount: Number((_b = res.meta) === null || _b === void 0 ? void 0 : _b.record_count),
-                currentPage: (p === null || p === void 0 ? void 0 : p.pageNumber) || config_1.default.default.pageNumber,
-                recordsPerPage: (p === null || p === void 0 ? void 0 : p.pageSize) || config_1.default.default.pageSize
+                pageCount: Number(res.meta?.page_count),
+                recordCount: Number(res.meta?.record_count),
+                currentPage: p?.pageNumber || config_1.default.default.pageNumber,
+                recordsPerPage: p?.pageSize || config_1.default.default.pageSize
             };
             return new ListResponse(meta, r);
         }
@@ -147,11 +145,10 @@ class ApiResourceBase {
         this.resources = adapter;
     }
     parse(resource, options) {
-        var _a;
         try {
             const res = JSON.parse(resource);
             // Resource type always checked
-            const rtype = (_a = res.data) === null || _a === void 0 ? void 0 : _a.type;
+            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

package/lib/esm/client.js

@@ -1,15 +1,3 @@
-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 _ApiClient_accessToken, _ApiClient_client;
 import axios from 'axios';
 import { SdkError, handleError } from './error';
 import config from './config';
@@ -28,12 +16,14 @@ class ApiClient {
                 throw new SdkError({ message: `Undefined '${attr}' parameter` });
         return new ApiClient(options);
     }
+    baseUrl;
+    #accessToken;
+    #client;
+    interceptors;
     constructor(options) {
-        _ApiClient_accessToken.set(this, void 0);
-        _ApiClient_client.set(this, void 0);
         debug('new client instance %O', options);
         this.baseUrl = baseURL(options.organization, options.domain);
-        __classPrivateFieldSet(this, _ApiClient_accessToken, options.accessToken, "f");
+        this.#accessToken = options.accessToken;
         const axiosConfig = {
             timeout: options.timeout || config.client.timeout,
             proxy: options.proxy,
@@ -47,7 +37,7 @@ class ApiClient {
             ...customHeaders,
             'Accept': 'application/vnd.api+json',
             'Content-Type': 'application/vnd.api+json',
-            'Authorization': 'Bearer ' + __classPrivateFieldGet(this, _ApiClient_accessToken, "f")
+            'Authorization': 'Bearer ' + this.#accessToken
         };
         // Set User-Agent
         let userAgent = options.userAgent; // || `SDK-core axios/${axios.VERSION}`
@@ -65,12 +55,12 @@ class ApiClient {
         if (options.adapter)
             axiosOptions.adapter = options.adapter;
         debug('axios options: %O', axiosOptions);
-        __classPrivateFieldSet(this, _ApiClient_client, axios.create(axiosOptions), "f");
-        this.interceptors = __classPrivateFieldGet(this, _ApiClient_client, "f").interceptors;
+        this.#client = axios.create(axiosOptions);
+        this.interceptors = this.#client.interceptors;
     }
     config(config) {
         debug('config %o', config);
-        const def = __classPrivateFieldGet(this, _ApiClient_client, "f").defaults;
+        const def = this.#client.defaults;
         // Axios config
         if (config.timeout)
             def.timeout = config.timeout;
@@ -88,8 +78,8 @@ class ApiClient {
         if (config.organization)
             this.baseUrl = baseURL(config.organization, config.domain);
         if (config.accessToken) {
-            __classPrivateFieldSet(this, _ApiClient_accessToken, config.accessToken, "f");
-            def.headers.common.Authorization = 'Bearer ' + __classPrivateFieldGet(this, _ApiClient_accessToken, "f");
+            this.#accessToken = config.accessToken;
+            def.headers.common.Authorization = 'Bearer ' + this.#accessToken;
         }
         if (config.headers)
             def.headers.common = this.customHeaders(config.headers);
@@ -103,34 +93,34 @@ class ApiClient {
                 if (axios.VERSION)
                     ua += ` axios/${axios.VERSION}`;
             }
-            __classPrivateFieldGet(this, _ApiClient_client, "f").defaults.headers['User-Agent'] = ua;
+            this.#client.defaults.headers['User-Agent'] = ua;
         }
         return this;
     }
     adapter(adapter) {
         if (adapter)
-            __classPrivateFieldGet(this, _ApiClient_client, "f").defaults.adapter = adapter;
+            this.#client.defaults.adapter = adapter;
         return this;
     }
     async request(method, path, body, options) {
         debug('request %s %s, %O, %O', method, path, body || {}, options || {});
         // Ignored params alerts (in debug mode)
-        if (options === null || options === void 0 ? void 0 : options.adapter)
+        if (options?.adapter)
             debug('Adapter ignored in request config');
-        if (options === null || options === void 0 ? void 0 : options.userAgent)
+        if (options?.userAgent)
             debug('User-Agent header ignored in request config');
         const data = body ? { data: body } : undefined;
         const url = path;
         // Runtime request parameters
-        const baseUrl = (options === null || options === void 0 ? void 0 : options.organization) ? baseURL(options.organization, options.domain) : undefined;
-        const accessToken = (options === null || options === void 0 ? void 0 : options.accessToken) || __classPrivateFieldGet(this, _ApiClient_accessToken, "f");
-        const headers = this.customHeaders(options === null || options === void 0 ? void 0 : options.headers);
+        const baseUrl = options?.organization ? baseURL(options.organization, options.domain) : undefined;
+        const accessToken = options?.accessToken || this.#accessToken;
+        const headers = this.customHeaders(options?.headers);
         if (accessToken)
             headers.Authorization = 'Bearer ' + accessToken;
         const requestParams = { method, baseURL: baseUrl, url, data, ...options, headers };
         debug('request params: %O', requestParams);
         // const start = Date.now()
-        return __classPrivateFieldGet(this, _ApiClient_client, "f").request(requestParams)
+        return this.#client.request(requestParams)
             .then(response => response.data)
             .catch((error) => handleError(error));
         // .finally(() => console.log(`<<-- ${method} ${path} ${Date.now() - start}`))
@@ -145,5 +135,4 @@ class ApiClient {
         return customHeaders;
     }
 }
-_ApiClient_accessToken = new WeakMap(), _ApiClient_client = new WeakMap();
 export default ApiClient;

package/lib/esm/commercelayer.d.ts

@@ -139,8 +139,8 @@ declare class CommerceLayerClient {
     singletons(): readonly string[];
     isSingleton(resource: api.ResourceTypeLock): boolean;
     isApiError(error: any): error is ApiError;
-    addRequestInterceptor(onFulfilled?: RequestInterceptor | null, onRejected?: ErrorInterceptor | null): number;
-    addResponseInterceptor(onFulfilled?: ResponseInterceptor | null, onRejected?: ErrorInterceptor | null): number;
+    addRequestInterceptor(onFulfilled?: RequestInterceptor, onRejected?: ErrorInterceptor): number;
+    addResponseInterceptor(onFulfilled?: ResponseInterceptor, onRejected?: ErrorInterceptor): number;
     removeInterceptor(type: InterceptorType, id: number): void;
     addRawResponseReader(options?: {
         headers: boolean;