@driveflux/api-swr 4.0.75 → 4.0.77

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -31,7 +31,7 @@ export type UsePaginationReponse<S, E = Problem> = SWRInfiniteResponse<S, E> & {
31
31
  * @important instead of returning a result, this will always return Success or throw an error containing Error
32
32
  * @important if the 3rd param provides an Authorization header, it will be ignored!
33
33
  */
34
- export declare const fetchWithAuth: <Success = any, Error = Problem>(urlParams: string | [url: string, accessToken: string], options?: RequestInit) => Promise<Success>;
34
+ export declare const fetchWithAuth: <Success = any, Error = Problem>(urlParams: string | [url: string, accessToken: string, options?: RequestInit], options?: RequestInit) => Promise<Success>;
35
35
  export declare const isStructuredResponse: <Payload, Metadata>(obj: any) => obj is ApiStructuredResponse<Payload, Metadata>;
36
36
  export declare const swrFetch: <Success = any, Error = Problem>(url: string, options?: RequestInit) => Promise<Success>;
37
37
  export declare const useApi: <S, E = Problem>(key: Key, config?: SWRConfiguration) => {
@@ -43,7 +43,7 @@ export declare const useApi: <S, E = Problem>(key: Key, config?: SWRConfiguratio
43
43
  isLoading: import("swr/_internal").IsLoadingResponse<Data, Config>;
44
44
  };
45
45
  export declare const useApiWithAuth: <S, E = Problem>(key: Key, config?: SWRConfiguration) => {
46
- revalidate: () => Promise<boolean>;
46
+ revalidate: import("swr").KeyedMutator<S>;
47
47
  data: S | undefined;
48
48
  error: E | undefined;
49
49
  mutate: import("swr").KeyedMutator<S>;
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/api-legacy/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/api-legacy/index.ts"],"names":[],"mappings":"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"}
@@ -1,225 +1,3 @@
1
- function _array_like_to_array(arr, len) {
2
- if (len == null || len > arr.length) len = arr.length;
3
- for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
4
- return arr2;
5
- }
6
- function _array_with_holes(arr) {
7
- if (Array.isArray(arr)) return arr;
8
- }
9
- function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
10
- try {
11
- var info = gen[key](arg);
12
- var value = info.value;
13
- } catch (error) {
14
- reject(error);
15
- return;
16
- }
17
- if (info.done) {
18
- resolve(value);
19
- } else {
20
- Promise.resolve(value).then(_next, _throw);
21
- }
22
- }
23
- function _async_to_generator(fn) {
24
- return function() {
25
- var self = this, args = arguments;
26
- return new Promise(function(resolve, reject) {
27
- var gen = fn.apply(self, args);
28
- function _next(value) {
29
- asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
30
- }
31
- function _throw(err) {
32
- asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
33
- }
34
- _next(undefined);
35
- });
36
- };
37
- }
38
- function _define_property(obj, key, value) {
39
- if (key in obj) {
40
- Object.defineProperty(obj, key, {
41
- value: value,
42
- enumerable: true,
43
- configurable: true,
44
- writable: true
45
- });
46
- } else {
47
- obj[key] = value;
48
- }
49
- return obj;
50
- }
51
- function _iterable_to_array_limit(arr, i) {
52
- var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
53
- if (_i == null) return;
54
- var _arr = [];
55
- var _n = true;
56
- var _d = false;
57
- var _s, _e;
58
- try {
59
- for(_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true){
60
- _arr.push(_s.value);
61
- if (i && _arr.length === i) break;
62
- }
63
- } catch (err) {
64
- _d = true;
65
- _e = err;
66
- } finally{
67
- try {
68
- if (!_n && _i["return"] != null) _i["return"]();
69
- } finally{
70
- if (_d) throw _e;
71
- }
72
- }
73
- return _arr;
74
- }
75
- function _non_iterable_rest() {
76
- throw new TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
77
- }
78
- function _object_spread(target) {
79
- for(var i = 1; i < arguments.length; i++){
80
- var source = arguments[i] != null ? arguments[i] : {};
81
- var ownKeys = Object.keys(source);
82
- if (typeof Object.getOwnPropertySymbols === "function") {
83
- ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
84
- return Object.getOwnPropertyDescriptor(source, sym).enumerable;
85
- }));
86
- }
87
- ownKeys.forEach(function(key) {
88
- _define_property(target, key, source[key]);
89
- });
90
- }
91
- return target;
92
- }
93
- function ownKeys(object, enumerableOnly) {
94
- var keys = Object.keys(object);
95
- if (Object.getOwnPropertySymbols) {
96
- var symbols = Object.getOwnPropertySymbols(object);
97
- if (enumerableOnly) {
98
- symbols = symbols.filter(function(sym) {
99
- return Object.getOwnPropertyDescriptor(object, sym).enumerable;
100
- });
101
- }
102
- keys.push.apply(keys, symbols);
103
- }
104
- return keys;
105
- }
106
- function _object_spread_props(target, source) {
107
- source = source != null ? source : {};
108
- if (Object.getOwnPropertyDescriptors) {
109
- Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
110
- } else {
111
- ownKeys(Object(source)).forEach(function(key) {
112
- Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
113
- });
114
- }
115
- return target;
116
- }
117
- function _sliced_to_array(arr, i) {
118
- return _array_with_holes(arr) || _iterable_to_array_limit(arr, i) || _unsupported_iterable_to_array(arr, i) || _non_iterable_rest();
119
- }
120
- function _type_of(obj) {
121
- "@swc/helpers - typeof";
122
- return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
123
- }
124
- function _unsupported_iterable_to_array(o, minLen) {
125
- if (!o) return;
126
- if (typeof o === "string") return _array_like_to_array(o, minLen);
127
- var n = Object.prototype.toString.call(o).slice(8, -1);
128
- if (n === "Object" && o.constructor) n = o.constructor.name;
129
- if (n === "Map" || n === "Set") return Array.from(n);
130
- if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
131
- }
132
- function _ts_generator(thisArg, body) {
133
- var f, y, t, _ = {
134
- label: 0,
135
- sent: function() {
136
- if (t[0] & 1) throw t[1];
137
- return t[1];
138
- },
139
- trys: [],
140
- ops: []
141
- }, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
142
- return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() {
143
- return this;
144
- }), g;
145
- function verb(n) {
146
- return function(v) {
147
- return step([
148
- n,
149
- v
150
- ]);
151
- };
152
- }
153
- function step(op) {
154
- if (f) throw new TypeError("Generator is already executing.");
155
- while(g && (g = 0, op[0] && (_ = 0)), _)try {
156
- if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
157
- if (y = 0, t) op = [
158
- op[0] & 2,
159
- t.value
160
- ];
161
- switch(op[0]){
162
- case 0:
163
- case 1:
164
- t = op;
165
- break;
166
- case 4:
167
- _.label++;
168
- return {
169
- value: op[1],
170
- done: false
171
- };
172
- case 5:
173
- _.label++;
174
- y = op[1];
175
- op = [
176
- 0
177
- ];
178
- continue;
179
- case 7:
180
- op = _.ops.pop();
181
- _.trys.pop();
182
- continue;
183
- default:
184
- if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
185
- _ = 0;
186
- continue;
187
- }
188
- if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
189
- _.label = op[1];
190
- break;
191
- }
192
- if (op[0] === 6 && _.label < t[1]) {
193
- _.label = t[1];
194
- t = op;
195
- break;
196
- }
197
- if (t && _.label < t[2]) {
198
- _.label = t[2];
199
- _.ops.push(op);
200
- break;
201
- }
202
- if (t[2]) _.ops.pop();
203
- _.trys.pop();
204
- continue;
205
- }
206
- op = body.call(thisArg, _);
207
- } catch (e) {
208
- op = [
209
- 6,
210
- e
211
- ];
212
- y = 0;
213
- } finally{
214
- f = t = 0;
215
- }
216
- if (op[0] & 5) throw op[1];
217
- return {
218
- value: op[0] ? op[1] : void 0,
219
- done: true
220
- };
221
- }
222
- }
223
1
  import { useAuth } from '@driveflux/auth/react/providers';
224
2
  import { config } from '@driveflux/config/frontend';
225
3
  import { enhancedFetch } from '@driveflux/fetch';
@@ -231,182 +9,124 @@ import useSWRInfinite from 'swr/infinite';
231
9
  *
232
10
  * @important instead of returning a result, this will always return Success or throw an error containing Error
233
11
  * @important if the 3rd param provides an Authorization header, it will be ignored!
234
- */ export var fetchWithAuth = function(urlParams) {
235
- var options = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
236
- return _async_to_generator(function() {
237
- var _result_metadata, _ref, url, accessToken, apiHost, finalUrl, correlationIdFromSessionStorage, result, correlationId, _result_metadata1;
238
- return _ts_generator(this, function(_state) {
239
- switch(_state.label){
240
- case 0:
241
- _ref = _sliced_to_array(Array.isArray(urlParams) ? urlParams : [
242
- urlParams,
243
- null
244
- ], 2), url = _ref[0], accessToken = _ref[1];
245
- apiHost = config.appUrl;
246
- finalUrl = url.startsWith('/') ? "".concat(apiHost).concat(url) : url;
247
- correlationIdFromSessionStorage = typeof sessionStorage !== 'undefined' ? sessionStorage.getItem('x-correlation-id') : null;
248
- return [
249
- 4,
250
- enhancedFetch(finalUrl, _object_spread_props(_object_spread({}, options), {
251
- headers: _object_spread({}, options.headers || {}, accessToken ? {
252
- Authorization: "Bearer ".concat(accessToken)
253
- } : {}, correlationIdFromSessionStorage ? {
254
- 'x-correlation-id': correlationIdFromSessionStorage
255
- } : {})
256
- }))
257
- ];
258
- case 1:
259
- result = _state.sent();
260
- correlationId = (_result_metadata = result.metadata) === null || _result_metadata === void 0 ? void 0 : _result_metadata.headers.get('x-correlation-id');
261
- if (correlationId && typeof sessionStorage !== 'undefined') {
262
- ;
263
- // We store the correlation id in the session storage so that we can use it in the next request
264
- sessionStorage.setItem('x-correlation-id', ((_result_metadata1 = result.metadata) === null || _result_metadata1 === void 0 ? void 0 : _result_metadata1.headers.get('x-correlation-id')) || '');
265
- }
266
- if (!result.ok) {
267
- throw result.val;
268
- }
269
- return [
270
- 2,
271
- result.val
272
- ];
273
- }
274
- });
275
- })();
276
- };
277
- export var isStructuredResponse = function(obj) {
278
- return obj && (typeof obj === "undefined" ? "undefined" : _type_of(obj)) === 'object' && obj.metadata;
12
+ */
13
+ export const fetchWithAuth = async (urlParams, options = {}) => {
14
+ const [url, accessToken, otherOptions] = Array.isArray(urlParams)
15
+ ? urlParams
16
+ : [urlParams, null];
17
+ const apiHost = config.appUrl;
18
+ const finalUrl = url.startsWith('/') ? `${apiHost}${url}` : url;
19
+ const correlationIdFromSessionStorage = typeof sessionStorage !== 'undefined'
20
+ ? sessionStorage.getItem('x-correlation-id')
21
+ : null;
22
+ const result = await enhancedFetch(finalUrl, {
23
+ ...options,
24
+ ...otherOptions,
25
+ headers: {
26
+ ...(options.headers || {}),
27
+ ...(otherOptions?.headers || {}),
28
+ ...(accessToken ? { Authorization: `Bearer ${accessToken}` } : {}),
29
+ ...(correlationIdFromSessionStorage
30
+ ? { 'x-correlation-id': correlationIdFromSessionStorage }
31
+ : {}),
32
+ },
33
+ });
34
+ const correlationId = result.metadata?.headers.get('x-correlation-id');
35
+ if (correlationId && typeof sessionStorage !== 'undefined') {
36
+ // We store the correlation id in the session storage so that we can use it in the next request
37
+ sessionStorage.setItem('x-correlation-id', result.metadata?.headers.get('x-correlation-id') || '');
38
+ }
39
+ if (!result.ok) {
40
+ throw result.val;
41
+ }
42
+ return result.val;
279
43
  };
280
- export var swrFetch = function(url) {
281
- var options = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
282
- return _async_to_generator(function() {
283
- var _response_metadata, correlationIdFromSessionStorage, response, correlationId, _response_metadata1;
284
- return _ts_generator(this, function(_state) {
285
- switch(_state.label){
286
- case 0:
287
- correlationIdFromSessionStorage = typeof sessionStorage !== 'undefined' ? sessionStorage.getItem('x-correlation-id') : null;
288
- return [
289
- 4,
290
- enhancedFetch(url, _object_spread_props(_object_spread({}, options), {
291
- headers: _object_spread({}, options.headers || {}, correlationIdFromSessionStorage ? {
292
- 'x-correlation-id': correlationIdFromSessionStorage
293
- } : {})
294
- }))
295
- ];
296
- case 1:
297
- response = _state.sent();
298
- correlationId = (_response_metadata = response.metadata) === null || _response_metadata === void 0 ? void 0 : _response_metadata.headers.get('x-correlation-id');
299
- if (correlationId && typeof sessionStorage !== 'undefined') {
300
- ;
301
- // We store the correlation id in the session storage so that we can use it in the next request
302
- sessionStorage.setItem('x-correlation-id', ((_response_metadata1 = response.metadata) === null || _response_metadata1 === void 0 ? void 0 : _response_metadata1.headers.get('x-correlation-id')) || '');
303
- }
304
- if (response.ok) {
305
- return [
306
- 2,
307
- response.val
308
- ];
309
- }
310
- throw response.val;
311
- }
312
- });
313
- })();
44
+ export const isStructuredResponse = (obj) => {
45
+ return obj && typeof obj === 'object' && obj.metadata;
314
46
  };
315
- export var useApi = function(key, config) {
316
- var result = useSWR(key, function(url) {
317
- return swrFetch(url);
318
- }, config);
319
- return _object_spread_props(_object_spread({}, result), {
320
- revalidate: function() {
321
- return _async_to_generator(function() {
322
- return _ts_generator(this, function(_state) {
323
- switch(_state.label){
324
- case 0:
325
- return [
326
- 4,
327
- result.mutate()
328
- ];
329
- case 1:
330
- return [
331
- 2,
332
- !!_state.sent()
333
- ];
334
- }
335
- });
336
- })();
337
- }
47
+ export const swrFetch = async (url, options = {}) => {
48
+ const correlationIdFromSessionStorage = typeof sessionStorage !== 'undefined'
49
+ ? sessionStorage.getItem('x-correlation-id')
50
+ : null;
51
+ const response = await enhancedFetch(url, {
52
+ ...options,
53
+ headers: {
54
+ ...(options.headers || {}),
55
+ ...(correlationIdFromSessionStorage
56
+ ? { 'x-correlation-id': correlationIdFromSessionStorage }
57
+ : {}),
58
+ },
338
59
  });
60
+ const correlationId = response.metadata?.headers.get('x-correlation-id');
61
+ if (correlationId && typeof sessionStorage !== 'undefined') {
62
+ // We store the correlation id in the session storage so that we can use it in the next request
63
+ sessionStorage.setItem('x-correlation-id', response.metadata?.headers.get('x-correlation-id') || '');
64
+ }
65
+ if (response.ok) {
66
+ return response.val;
67
+ }
68
+ throw response.val;
69
+ };
70
+ export const useApi = (key, config) => {
71
+ const result = useSWR(key, (url) => swrFetch(url), config);
72
+ return {
73
+ ...result,
74
+ revalidate: async () => !!(await result.mutate()),
75
+ };
339
76
  };
340
- export var useApiWithAuth = function(key, config) {
77
+ export const useApiWithAuth = (key, config) => {
341
78
  // TODO
342
- var accessToken = useAuth().accessToken;
343
- var result = useSWR(key ? [
344
- key,
345
- accessToken
346
- ] : null, fetchWithAuth, config);
347
- return _object_spread_props(_object_spread({}, result), {
348
- revalidate: result.mutate
349
- });
79
+ const { accessToken } = useAuth();
80
+ const result = useSWR(key ? (Array.isArray(key) ? key : [key, accessToken]) : null, fetchWithAuth, config);
81
+ return {
82
+ ...result,
83
+ revalidate: result.mutate,
84
+ };
350
85
  };
351
- export var usePaginationApiWithAuth = function(key, config) {
86
+ export const usePaginationApiWithAuth = (key, config) => {
352
87
  // TODO
353
- var accessToken = useAuth().accessToken;
354
- var result = useSWRInfinite(function(i, p) {
355
- var res = null;
88
+ const { accessToken } = useAuth();
89
+ const result = useSWRInfinite((i, p) => {
90
+ let res = null;
356
91
  if (typeof key === 'function') {
357
92
  res = key(i, p);
358
- } else if (isStructuredResponse(p) && key) {
359
- var _p_metadata, _p_metadata1;
360
- if (((_p_metadata = p.metadata) === null || _p_metadata === void 0 ? void 0 : _p_metadata.nextSkip) === null) {
361
- return null // reached the end
362
- ;
93
+ }
94
+ else if (isStructuredResponse(p) && key) {
95
+ if (p.metadata?.nextSkip === null) {
96
+ return null; // reached the end
363
97
  }
364
- var separator = key.indexOf('?') !== -1 ? '&' : '?';
365
- res = ((_p_metadata1 = p.metadata) === null || _p_metadata1 === void 0 ? void 0 : _p_metadata1.nextSkip) ? "".concat(key).concat(separator, "skip=").concat(p.metadata.nextSkip) : key;
366
- } else if (!p) {
98
+ const separator = key.indexOf('?') !== -1 ? '&' : '?';
99
+ res = p.metadata?.nextSkip
100
+ ? `${key}${separator}skip=${p.metadata.nextSkip}`
101
+ : key;
102
+ }
103
+ else if (!p) {
367
104
  res = key;
368
- } else {
105
+ }
106
+ else {
369
107
  console.error('Wrong key loader or data type supplied to pagination');
370
108
  return null;
371
109
  }
372
- return [
373
- res,
374
- accessToken
375
- ];
110
+ return [res, accessToken];
376
111
  }, fetchWithAuth, config);
377
- return _object_spread_props(_object_spread({}, result), {
378
- revalidate: function() {
379
- return _async_to_generator(function() {
380
- return _ts_generator(this, function(_state) {
381
- switch(_state.label){
382
- case 0:
383
- return [
384
- 4,
385
- result.mutate()
386
- ];
387
- case 1:
388
- return [
389
- 2,
390
- !!_state.sent()
391
- ];
392
- }
393
- });
394
- })();
395
- }
396
- });
112
+ return {
113
+ ...result,
114
+ revalidate: async () => !!(await result.mutate()),
115
+ };
397
116
  };
398
117
  /**
399
118
  * TODO
400
119
  * @deprecated
401
- */ export var useAuthenticatedFetch = function(url) {
402
- var options = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
403
- var accessToken = useAuth().accessToken;
404
- var headers = _object_spread({}, accessToken ? {
405
- Authorization: "Bearer ".concat(accessToken)
406
- } : undefined, (options === null || options === void 0 ? void 0 : options.headers) || {});
407
- return function() {
408
- return enhancedFetch(url, _object_spread({
409
- headers: headers
410
- }, options));
120
+ */
121
+ export const useAuthenticatedFetch = (url, options = {}) => {
122
+ const { accessToken } = useAuth();
123
+ const headers = {
124
+ ...(accessToken ? { Authorization: `Bearer ${accessToken}` } : undefined),
125
+ ...(options?.headers || {}),
411
126
  };
127
+ return () => enhancedFetch(url, {
128
+ headers,
129
+ ...options,
130
+ });
412
131
  };
132
+ //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/api-legacy/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,iCAAiC,CAAA;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAA;AACnD,OAAO,EAA4B,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAG1E,OAAO,MAAM,MAAM,KAAK,CAAA;AACxB,OAAO,cAA4C,MAAM,cAAc,CAAA;AAwCvE;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,EACjC,SAAsD,EACtD,UAAuB,EAAE,EACN,EAAE;IACrB,MAAM,CAAC,GAAG,EAAE,WAAW,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC;QAClD,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;IACpB,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAA;IAC7B,MAAM,QAAQ,GAAG,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,CAAA;IAE/D,MAAM,+BAA+B,GACpC,OAAO,cAAc,KAAK,WAAW;QACpC,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,kBAAkB,CAAC;QAC5C,CAAC,CAAC,IAAI,CAAA;IACR,MAAM,MAAM,GAAG,MAAM,aAAa,CAAiB,QAAQ,EAAE;QAC5D,GAAG,OAAO;QACV,OAAO,EAAE;YACR,GAAG,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC;YAC1B,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,UAAU,WAAW,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAClE,GAAG,CAAC,+BAA+B;gBAClC,CAAC,CAAC,EAAE,kBAAkB,EAAE,+BAA+B,EAAE;gBACzD,CAAC,CAAC,EAAE,CAAC;SACN;KACD,CAAC,CAAA;IAEF,MAAM,aAAa,GAAG,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAA;IACtE,IAAI,aAAa,IAAI,OAAO,cAAc,KAAK,WAAW,EAAE,CAAC;QAC5D,+FAA+F;QAC/F,cAAc,CAAC,OAAO,CACrB,kBAAkB,EAClB,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,IAAI,EAAE,CACtD,CAAA;IACF,CAAC;IAED,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;QAChB,MAAM,MAAM,CAAC,GAAG,CAAA;IACjB,CAAC;IAED,OAAO,MAAM,CAAC,GAAG,CAAA;AAClB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,oBAAoB,GAAG,CACnC,GAAQ,EAC0C,EAAE;IACpD,OAAO,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,CAAC,QAAQ,CAAA;AACtD,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,QAAQ,GAAG,KAAK,EAC5B,GAAW,EACX,UAAuB,EAAE,EACxB,EAAE;IACH,MAAM,+BAA+B,GACpC,OAAO,cAAc,KAAK,WAAW;QACpC,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,kBAAkB,CAAC;QAC5C,CAAC,CAAC,IAAI,CAAA;IACR,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAiB,GAAG,EAAE;QACzD,GAAG,OAAO;QACV,OAAO,EAAE;YACR,GAAG,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC;YAC1B,GAAG,CAAC,+BAA+B;gBAClC,CAAC,CAAC,EAAE,kBAAkB,EAAE,+BAA+B,EAAE;gBACzD,CAAC,CAAC,EAAE,CAAC;SACN;KACD,CAAC,CAAA;IAEF,MAAM,aAAa,GAAG,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAA;IACxE,IAAI,aAAa,IAAI,OAAO,cAAc,KAAK,WAAW,EAAE,CAAC;QAC5D,+FAA+F;QAC/F,cAAc,CAAC,OAAO,CACrB,kBAAkB,EAClB,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,IAAI,EAAE,CACxD,CAAA;IACF,CAAC;IAED,IAAI,QAAQ,CAAC,EAAE,EAAE,CAAC;QACjB,OAAO,QAAQ,CAAC,GAAG,CAAA;IACpB,CAAC;IACD,MAAM,QAAQ,CAAC,GAAG,CAAA;AACnB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,MAAM,GAAG,CAAiB,GAAQ,EAAE,MAAyB,EAAE,EAAE;IAC7E,MAAM,MAAM,GAAG,MAAM,CAAO,GAAG,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAO,GAAG,CAAC,EAAE,MAAM,CAAC,CAAA;IACtE,OAAO;QACN,GAAG,MAAM;QACT,UAAU,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,MAAM,CAAC,MAAM,EAAE,CAAC;KACjD,CAAA;AACF,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,CAC7B,GAAQ,EACR,MAAyB,EACxB,EAAE;IACH,OAAO;IACP,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,EAAE,CAAA;IAEjC,MAAM,MAAM,GAAG,MAAM,CACpB,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,EAC/B,aAAa,EACb,MAAM,CACN,CAAA;IACD,OAAO;QACN,GAAG,MAAM;QACT,UAAU,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,MAAM,CAAC,MAAM,EAAE,CAAC;KACjD,CAAA;AACF,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,wBAAwB,GAAG,CACvC,GAAiC,EACjC,MAAyB,EACI,EAAE;IAC/B,OAAO;IACP,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,EAAE,CAAA;IAEjC,MAAM,MAAM,GAAG,cAAc,CAC5B,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QACR,IAAI,GAAG,GAAG,IAAI,CAAA;QACd,IAAI,OAAO,GAAG,KAAK,UAAU,EAAE,CAAC;YAC/B,GAAG,GAAG,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;QAChB,CAAC;aAAM,IAAI,oBAAoB,CAAuB,CAAC,CAAC,IAAI,GAAG,EAAE,CAAC;YACjE,IAAI,CAAC,CAAC,QAAQ,EAAE,QAAQ,KAAK,IAAI,EAAE,CAAC;gBACnC,OAAO,IAAI,CAAA,CAAC,kBAAkB;YAC/B,CAAC;YACD,MAAM,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAA;YACrD,GAAG,GAAG,CAAC,CAAC,QAAQ,EAAE,QAAQ;gBACzB,CAAC,CAAC,GAAG,GAAG,GAAG,SAAS,QAAQ,CAAC,CAAC,QAAQ,CAAC,QAAQ,EAAE;gBACjD,CAAC,CAAC,GAAG,CAAA;QACP,CAAC;aAAM,IAAI,CAAC,CAAC,EAAE,CAAC;YACf,GAAG,GAAG,GAAG,CAAA;QACV,CAAC;aAAM,CAAC;YACP,OAAO,CAAC,KAAK,CAAC,sDAAsD,CAAC,CAAA;YACrE,OAAO,IAAI,CAAA;QACZ,CAAC;QAED,OAAO,CAAC,GAAG,EAAE,WAAW,CAAC,CAAA;IAC1B,CAAC,EACD,aAAa,EACb,MAAM,CACN,CAAA;IAED,OAAO;QACN,GAAG,MAAM;QACT,UAAU,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,MAAM,CAAC,MAAM,EAAE,CAAC;KACjD,CAAA;AACF,CAAC,CAAA;AAED;;;GAGG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,CACpC,GAAW,EACX,UAAuB,EAAE,EACS,EAAE;IACpC,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,EAAE,CAAA;IACjC,MAAM,OAAO,GAAG;QACf,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,UAAU,WAAW,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;QACzE,GAAG,CAAC,OAAO,EAAE,OAAO,IAAI,EAAE,CAAC;KAC3B,CAAA;IAED,OAAO,GAAG,EAAE,CACX,aAAa,CAAO,GAAG,EAAE;QACxB,OAAO;QACP,GAAG,OAAO;KACV,CAAC,CAAA;AACJ,CAAC,CAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/api-legacy/index.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,5 @@
1
1
  import { config } from '@driveflux/config/frontend';
2
- export var API_MODELS_URLS = {
2
+ export const API_MODELS_URLS = {
3
3
  Business: '/api/businesses',
4
4
  User: '/api/users',
5
5
  Inquiry: '/api/inquiries',
@@ -10,11 +10,14 @@ export var API_MODELS_URLS = {
10
10
  Cycle: '/api/cycles',
11
11
  Invoice: '/api/invoices',
12
12
  SubscriptionReservation: '/api/reservations',
13
- SubscriptionContract: '/api/subscription-contracts'
13
+ SubscriptionContract: '/api/subscription-contracts',
14
14
  };
15
15
  export function getApiUrl(model) {
16
- if (model.startsWith('/api') || model.startsWith("".concat(config.apiUrl))) {
16
+ if (model.startsWith('/api') || model.startsWith(`${config.apiUrl}`)) {
17
17
  return model;
18
18
  }
19
- return model in API_MODELS_URLS ? API_MODELS_URLS[model] : "/api/".concat(model);
19
+ return model in API_MODELS_URLS
20
+ ? API_MODELS_URLS[model]
21
+ : `/api/${model}`;
20
22
  }
23
+ //# sourceMappingURL=api-models.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"api-models.js","sourceRoot":"","sources":["../src/api-models.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAA;AAUnD,MAAM,CAAC,MAAM,eAAe,GAAG;IAC9B,QAAQ,EAAE,iBAAiB;IAC3B,IAAI,EAAE,YAAY;IAClB,OAAO,EAAE,gBAAgB;IACzB,OAAO,EAAE,eAAe;IACxB,aAAa,EAAE,sBAAsB;IACrC,IAAI,EAAE,YAAY;IAClB,YAAY,EAAE,oBAAoB;IAClC,KAAK,EAAE,aAAa;IACpB,OAAO,EAAE,eAAe;IACxB,uBAAuB,EAAE,mBAAmB;CACT,CAAA;AAQpC,MAAM,UAAU,SAAS,CACxB,KAAQ;IAER,IAAI,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC;QACtE,OAAO,KAAK,CAAA;IACb,CAAC;IACD,OAAO,KAAK,IAAI,eAAe;QAC9B,CAAC,CAAC,eAAe,CAAC,KAAqC,CAAC;QACxD,CAAC,CAAC,QAAQ,KAAK,EAAE,CAAA;AACnB,CAAC"}
1
+ {"version":3,"file":"api-models.js","sourceRoot":"","sources":["../src/api-models.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAA;AAUnD,MAAM,CAAC,MAAM,eAAe,GAAG;IAC9B,QAAQ,EAAE,iBAAiB;IAC3B,IAAI,EAAE,YAAY;IAClB,OAAO,EAAE,gBAAgB;IACzB,OAAO,EAAE,eAAe;IACxB,aAAa,EAAE,sBAAsB;IACrC,IAAI,EAAE,YAAY;IAClB,YAAY,EAAE,oBAAoB;IAClC,KAAK,EAAE,aAAa;IACpB,OAAO,EAAE,eAAe;IACxB,uBAAuB,EAAE,mBAAmB;IAC5C,oBAAoB,EAAE,6BAA6B;CAChB,CAAA;AAQpC,MAAM,UAAU,SAAS,CACxB,KAAQ;IAER,IAAI,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC;QACtE,OAAO,KAAK,CAAA;IACb,CAAC;IACD,OAAO,KAAK,IAAI,eAAe;QAC9B,CAAC,CAAC,eAAe,CAAC,KAAqC,CAAC;QACxD,CAAC,CAAC,QAAQ,KAAK,EAAE,CAAA;AACnB,CAAC"}
package/dist/fetcher.js CHANGED
@@ -1,221 +1,3 @@
1
- function _array_like_to_array(arr, len) {
2
- if (len == null || len > arr.length) len = arr.length;
3
- for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
4
- return arr2;
5
- }
6
- function _array_with_holes(arr) {
7
- if (Array.isArray(arr)) return arr;
8
- }
9
- function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
10
- try {
11
- var info = gen[key](arg);
12
- var value = info.value;
13
- } catch (error) {
14
- reject(error);
15
- return;
16
- }
17
- if (info.done) {
18
- resolve(value);
19
- } else {
20
- Promise.resolve(value).then(_next, _throw);
21
- }
22
- }
23
- function _async_to_generator(fn) {
24
- return function() {
25
- var self = this, args = arguments;
26
- return new Promise(function(resolve, reject) {
27
- var gen = fn.apply(self, args);
28
- function _next(value) {
29
- asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
30
- }
31
- function _throw(err) {
32
- asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
33
- }
34
- _next(undefined);
35
- });
36
- };
37
- }
38
- function _define_property(obj, key, value) {
39
- if (key in obj) {
40
- Object.defineProperty(obj, key, {
41
- value: value,
42
- enumerable: true,
43
- configurable: true,
44
- writable: true
45
- });
46
- } else {
47
- obj[key] = value;
48
- }
49
- return obj;
50
- }
51
- function _iterable_to_array_limit(arr, i) {
52
- var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
53
- if (_i == null) return;
54
- var _arr = [];
55
- var _n = true;
56
- var _d = false;
57
- var _s, _e;
58
- try {
59
- for(_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true){
60
- _arr.push(_s.value);
61
- if (i && _arr.length === i) break;
62
- }
63
- } catch (err) {
64
- _d = true;
65
- _e = err;
66
- } finally{
67
- try {
68
- if (!_n && _i["return"] != null) _i["return"]();
69
- } finally{
70
- if (_d) throw _e;
71
- }
72
- }
73
- return _arr;
74
- }
75
- function _non_iterable_rest() {
76
- throw new TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
77
- }
78
- function _object_spread(target) {
79
- for(var i = 1; i < arguments.length; i++){
80
- var source = arguments[i] != null ? arguments[i] : {};
81
- var ownKeys = Object.keys(source);
82
- if (typeof Object.getOwnPropertySymbols === "function") {
83
- ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
84
- return Object.getOwnPropertyDescriptor(source, sym).enumerable;
85
- }));
86
- }
87
- ownKeys.forEach(function(key) {
88
- _define_property(target, key, source[key]);
89
- });
90
- }
91
- return target;
92
- }
93
- function ownKeys(object, enumerableOnly) {
94
- var keys = Object.keys(object);
95
- if (Object.getOwnPropertySymbols) {
96
- var symbols = Object.getOwnPropertySymbols(object);
97
- if (enumerableOnly) {
98
- symbols = symbols.filter(function(sym) {
99
- return Object.getOwnPropertyDescriptor(object, sym).enumerable;
100
- });
101
- }
102
- keys.push.apply(keys, symbols);
103
- }
104
- return keys;
105
- }
106
- function _object_spread_props(target, source) {
107
- source = source != null ? source : {};
108
- if (Object.getOwnPropertyDescriptors) {
109
- Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
110
- } else {
111
- ownKeys(Object(source)).forEach(function(key) {
112
- Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
113
- });
114
- }
115
- return target;
116
- }
117
- function _sliced_to_array(arr, i) {
118
- return _array_with_holes(arr) || _iterable_to_array_limit(arr, i) || _unsupported_iterable_to_array(arr, i) || _non_iterable_rest();
119
- }
120
- function _unsupported_iterable_to_array(o, minLen) {
121
- if (!o) return;
122
- if (typeof o === "string") return _array_like_to_array(o, minLen);
123
- var n = Object.prototype.toString.call(o).slice(8, -1);
124
- if (n === "Object" && o.constructor) n = o.constructor.name;
125
- if (n === "Map" || n === "Set") return Array.from(n);
126
- if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
127
- }
128
- function _ts_generator(thisArg, body) {
129
- var f, y, t, _ = {
130
- label: 0,
131
- sent: function() {
132
- if (t[0] & 1) throw t[1];
133
- return t[1];
134
- },
135
- trys: [],
136
- ops: []
137
- }, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
138
- return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() {
139
- return this;
140
- }), g;
141
- function verb(n) {
142
- return function(v) {
143
- return step([
144
- n,
145
- v
146
- ]);
147
- };
148
- }
149
- function step(op) {
150
- if (f) throw new TypeError("Generator is already executing.");
151
- while(g && (g = 0, op[0] && (_ = 0)), _)try {
152
- if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
153
- if (y = 0, t) op = [
154
- op[0] & 2,
155
- t.value
156
- ];
157
- switch(op[0]){
158
- case 0:
159
- case 1:
160
- t = op;
161
- break;
162
- case 4:
163
- _.label++;
164
- return {
165
- value: op[1],
166
- done: false
167
- };
168
- case 5:
169
- _.label++;
170
- y = op[1];
171
- op = [
172
- 0
173
- ];
174
- continue;
175
- case 7:
176
- op = _.ops.pop();
177
- _.trys.pop();
178
- continue;
179
- default:
180
- if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
181
- _ = 0;
182
- continue;
183
- }
184
- if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
185
- _.label = op[1];
186
- break;
187
- }
188
- if (op[0] === 6 && _.label < t[1]) {
189
- _.label = t[1];
190
- t = op;
191
- break;
192
- }
193
- if (t && _.label < t[2]) {
194
- _.label = t[2];
195
- _.ops.push(op);
196
- break;
197
- }
198
- if (t[2]) _.ops.pop();
199
- _.trys.pop();
200
- continue;
201
- }
202
- op = body.call(thisArg, _);
203
- } catch (e) {
204
- op = [
205
- 6,
206
- e
207
- ];
208
- y = 0;
209
- } finally{
210
- f = t = 0;
211
- }
212
- if (op[0] & 5) throw op[1];
213
- return {
214
- value: op[0] ? op[1] : void 0,
215
- done: true
216
- };
217
- }
218
- }
219
1
  import { config } from '@driveflux/config/frontend';
220
2
  import { enhancedFetch } from '@driveflux/fetch';
221
3
  /**
@@ -224,46 +6,34 @@ import { enhancedFetch } from '@driveflux/fetch';
224
6
  *
225
7
  * @important instead of returning a result, this will always return Success or throw an error containing Error
226
8
  * @important if the 3rd param provides an Authorization header, it will be ignored!
227
- */ export var fetchWithAuth = function(urlParams) {
228
- var options = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
229
- return _async_to_generator(function() {
230
- var _result_metadata, _ref, url, accessToken, apiHost, finalUrl, correlationIdFromSessionStorage, result, correlationId, _result_metadata1;
231
- return _ts_generator(this, function(_state) {
232
- switch(_state.label){
233
- case 0:
234
- _ref = _sliced_to_array(Array.isArray(urlParams) ? urlParams : [
235
- urlParams,
236
- null
237
- ], 2), url = _ref[0], accessToken = _ref[1];
238
- apiHost = config.appUrl;
239
- finalUrl = url.startsWith('/') ? "".concat(apiHost).concat(url) : url;
240
- correlationIdFromSessionStorage = typeof sessionStorage !== 'undefined' ? sessionStorage.getItem('x-correlation-id') : null;
241
- return [
242
- 4,
243
- enhancedFetch(finalUrl, _object_spread_props(_object_spread({}, options), {
244
- headers: _object_spread({}, options.headers || {}, accessToken ? {
245
- Authorization: "Bearer ".concat(accessToken)
246
- } : {}, correlationIdFromSessionStorage ? {
247
- 'x-correlation-id': correlationIdFromSessionStorage
248
- } : {})
249
- }))
250
- ];
251
- case 1:
252
- result = _state.sent();
253
- correlationId = (_result_metadata = result.metadata) === null || _result_metadata === void 0 ? void 0 : _result_metadata.headers.get('x-correlation-id');
254
- if (correlationId && typeof sessionStorage !== 'undefined') {
255
- ;
256
- // We store the correlation id in the session storage so that we can use it in the next request
257
- sessionStorage.setItem('x-correlation-id', ((_result_metadata1 = result.metadata) === null || _result_metadata1 === void 0 ? void 0 : _result_metadata1.headers.get('x-correlation-id')) || '');
258
- }
259
- if (!result.ok) {
260
- throw result.val;
261
- }
262
- return [
263
- 2,
264
- result.val
265
- ];
266
- }
267
- });
268
- })();
9
+ */
10
+ export const fetchWithAuth = async (urlParams, options = {}) => {
11
+ const [url, accessToken] = Array.isArray(urlParams)
12
+ ? urlParams
13
+ : [urlParams, null];
14
+ const apiHost = config.appUrl;
15
+ const finalUrl = url.startsWith('/') ? `${apiHost}${url}` : url;
16
+ const correlationIdFromSessionStorage = typeof sessionStorage !== 'undefined'
17
+ ? sessionStorage.getItem('x-correlation-id')
18
+ : null;
19
+ const result = await enhancedFetch(finalUrl, {
20
+ ...options,
21
+ headers: {
22
+ ...(options.headers || {}),
23
+ ...(accessToken ? { Authorization: `Bearer ${accessToken}` } : {}),
24
+ ...(correlationIdFromSessionStorage
25
+ ? { 'x-correlation-id': correlationIdFromSessionStorage }
26
+ : {}),
27
+ },
28
+ });
29
+ const correlationId = result.metadata?.headers.get('x-correlation-id');
30
+ if (correlationId && typeof sessionStorage !== 'undefined') {
31
+ // We store the correlation id in the session storage so that we can use it in the next request
32
+ sessionStorage.setItem('x-correlation-id', result.metadata?.headers.get('x-correlation-id') || '');
33
+ }
34
+ if (!result.ok) {
35
+ throw result.val;
36
+ }
37
+ return result.val;
269
38
  };
39
+ //# sourceMappingURL=fetcher.js.map
package/dist/index.js CHANGED
@@ -1,82 +1,3 @@
1
- function _define_property(obj, key, value) {
2
- if (key in obj) {
3
- Object.defineProperty(obj, key, {
4
- value: value,
5
- enumerable: true,
6
- configurable: true,
7
- writable: true
8
- });
9
- } else {
10
- obj[key] = value;
11
- }
12
- return obj;
13
- }
14
- function _object_spread(target) {
15
- for(var i = 1; i < arguments.length; i++){
16
- var source = arguments[i] != null ? arguments[i] : {};
17
- var ownKeys = Object.keys(source);
18
- if (typeof Object.getOwnPropertySymbols === "function") {
19
- ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
20
- return Object.getOwnPropertyDescriptor(source, sym).enumerable;
21
- }));
22
- }
23
- ownKeys.forEach(function(key) {
24
- _define_property(target, key, source[key]);
25
- });
26
- }
27
- return target;
28
- }
29
- function ownKeys(object, enumerableOnly) {
30
- var keys = Object.keys(object);
31
- if (Object.getOwnPropertySymbols) {
32
- var symbols = Object.getOwnPropertySymbols(object);
33
- if (enumerableOnly) {
34
- symbols = symbols.filter(function(sym) {
35
- return Object.getOwnPropertyDescriptor(object, sym).enumerable;
36
- });
37
- }
38
- keys.push.apply(keys, symbols);
39
- }
40
- return keys;
41
- }
42
- function _object_spread_props(target, source) {
43
- source = source != null ? source : {};
44
- if (Object.getOwnPropertyDescriptors) {
45
- Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
46
- } else {
47
- ownKeys(Object(source)).forEach(function(key) {
48
- Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
49
- });
50
- }
51
- return target;
52
- }
53
- function _object_without_properties(source, excluded) {
54
- if (source == null) return {};
55
- var target = _object_without_properties_loose(source, excluded);
56
- var key, i;
57
- if (Object.getOwnPropertySymbols) {
58
- var sourceSymbolKeys = Object.getOwnPropertySymbols(source);
59
- for(i = 0; i < sourceSymbolKeys.length; i++){
60
- key = sourceSymbolKeys[i];
61
- if (excluded.indexOf(key) >= 0) continue;
62
- if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue;
63
- target[key] = source[key];
64
- }
65
- }
66
- return target;
67
- }
68
- function _object_without_properties_loose(source, excluded) {
69
- if (source == null) return {};
70
- var target = {};
71
- var sourceKeys = Object.keys(source);
72
- var key, i;
73
- for(i = 0; i < sourceKeys.length; i++){
74
- key = sourceKeys[i];
75
- if (excluded.indexOf(key) >= 0) continue;
76
- target[key] = source[key];
77
- }
78
- return target;
79
- }
80
1
  import { useAuth } from '@driveflux/auth/react/providers';
81
2
  import isEmpty from 'lodash/isEmpty.js';
82
3
  import { useCallback } from 'react';
@@ -85,62 +6,55 @@ import useSWRInfinite from 'swr/infinite';
85
6
  import { getApiUrl } from './api-models.js';
86
7
  import { fetchWithAuth } from './fetcher.js';
87
8
  import { makeQueryParams } from './utils.js';
88
- var getKeyMaker = function(model, pageSize, query, accessToken) {
89
- var resource = getApiUrl(model);
90
- var loader = function(pageIndex, previousPageData) {
9
+ const getKeyMaker = (model, pageSize, query, accessToken) => {
10
+ const resource = getApiUrl(model);
11
+ const loader = (pageIndex, previousPageData) => {
91
12
  if (previousPageData && !previousPageData.next) {
92
13
  return null;
93
14
  }
94
- var makeFinalQuery = function(index) {
95
- var take = (previousPageData === null || previousPageData === void 0 ? void 0 : previousPageData.take) || pageSize;
96
- return _object_spread_props(_object_spread({}, query), {
97
- skip: (previousPageData === null || previousPageData === void 0 ? void 0 : previousPageData.skip) || (take ? index * take : undefined),
98
- take: take
99
- });
15
+ const makeFinalQuery = (index) => {
16
+ const take = previousPageData?.take || pageSize;
17
+ return {
18
+ ...query,
19
+ skip: previousPageData?.skip || (take ? index * take : undefined),
20
+ take,
21
+ };
100
22
  };
101
- var finalQuery = makeFinalQuery(pageIndex);
102
- var queryString = !isEmpty(finalQuery) ? "?".concat(makeQueryParams(finalQuery)) : '';
103
- var url = "".concat(resource).concat(queryString);
104
- var nextQuery = makeFinalQuery(pageIndex + 1);
105
- var nextQueryString = !isEmpty(nextQuery) ? "?".concat(makeQueryParams(nextQuery)) : '';
106
- var nextUrl = "".concat(resource).concat(nextQueryString);
23
+ const finalQuery = makeFinalQuery(pageIndex);
24
+ const queryString = !isEmpty(finalQuery)
25
+ ? `?${makeQueryParams(finalQuery)}`
26
+ : '';
27
+ const url = `${resource}${queryString}`;
28
+ const nextQuery = makeFinalQuery(pageIndex + 1);
29
+ const nextQueryString = !isEmpty(nextQuery)
30
+ ? `?${makeQueryParams(nextQuery)}`
31
+ : '';
32
+ const nextUrl = `${resource}${nextQueryString}`;
107
33
  // Preload next page
108
- preload([
109
- nextUrl,
110
- accessToken
111
- ], fetchWithAuth);
112
- return [
113
- url,
114
- accessToken
115
- ];
34
+ preload([nextUrl, accessToken], fetchWithAuth);
35
+ return [url, accessToken];
116
36
  };
117
37
  return loader;
118
38
  };
119
- export var useApiPagination = function(model, _param) {
120
- var pageSize = _param.pageSize, query = _param.query, swrConfig = _object_without_properties(_param, [
121
- "pageSize",
122
- "query"
123
- ]);
124
- var _result_data_, _result_data;
39
+ export const useApiPagination = (model, { pageSize, query, ...swrConfig }) => {
125
40
  // TODO
126
- var accessToken = useAuth().accessToken;
127
- var result = useSWRInfinite(getKeyMaker(model, pageSize || 20, query, accessToken), fetchWithAuth, _object_spread({
128
- parallel: true
129
- }, swrConfig));
130
- var hasMore = ((result === null || result === void 0 ? void 0 : (_result_data = result.data) === null || _result_data === void 0 ? void 0 : (_result_data_ = _result_data[0]) === null || _result_data_ === void 0 ? void 0 : _result_data_.count) || 0) > result.size * (pageSize || 20);
131
- var next = useCallback(function() {
41
+ const { accessToken } = useAuth();
42
+ const result = useSWRInfinite(getKeyMaker(model, pageSize || 20, query, accessToken), fetchWithAuth, {
43
+ parallel: true,
44
+ ...swrConfig,
45
+ });
46
+ const hasMore = (result?.data?.[0]?.count || 0) > result.size * (pageSize || 20);
47
+ const next = useCallback(() => {
132
48
  if (!hasMore) {
133
49
  return;
134
50
  }
135
51
  result.setSize(result.size + 1);
136
- }, [
52
+ }, [hasMore, result?.size, result.setSize]);
53
+ return {
54
+ ...result,
55
+ next,
137
56
  hasMore,
138
- result === null || result === void 0 ? void 0 : result.size,
139
- result.setSize
140
- ]);
141
- return _object_spread_props(_object_spread({}, result), {
142
- next: next,
143
- hasMore: hasMore
144
- });
57
+ };
145
58
  };
146
59
  export * from './utils.js';
60
+ //# sourceMappingURL=index.js.map
package/dist/utils.js CHANGED
@@ -1,108 +1,24 @@
1
- function _array_like_to_array(arr, len) {
2
- if (len == null || len > arr.length) len = arr.length;
3
- for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
4
- return arr2;
5
- }
6
- function _array_with_holes(arr) {
7
- if (Array.isArray(arr)) return arr;
8
- }
9
- function _instanceof(left, right) {
10
- if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
11
- return !!right[Symbol.hasInstance](left);
12
- } else {
13
- return left instanceof right;
14
- }
15
- }
16
- function _iterable_to_array_limit(arr, i) {
17
- var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
18
- if (_i == null) return;
19
- var _arr = [];
20
- var _n = true;
21
- var _d = false;
22
- var _s, _e;
23
- try {
24
- for(_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true){
25
- _arr.push(_s.value);
26
- if (i && _arr.length === i) break;
27
- }
28
- } catch (err) {
29
- _d = true;
30
- _e = err;
31
- } finally{
32
- try {
33
- if (!_n && _i["return"] != null) _i["return"]();
34
- } finally{
35
- if (_d) throw _e;
36
- }
37
- }
38
- return _arr;
39
- }
40
- function _non_iterable_rest() {
41
- throw new TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
42
- }
43
- function _sliced_to_array(arr, i) {
44
- return _array_with_holes(arr) || _iterable_to_array_limit(arr, i) || _unsupported_iterable_to_array(arr, i) || _non_iterable_rest();
45
- }
46
- function _unsupported_iterable_to_array(o, minLen) {
47
- if (!o) return;
48
- if (typeof o === "string") return _array_like_to_array(o, minLen);
49
- var n = Object.prototype.toString.call(o).slice(8, -1);
50
- if (n === "Object" && o.constructor) n = o.constructor.name;
51
- if (n === "Map" || n === "Set") return Array.from(n);
52
- if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
53
- }
54
- export var makeQueryParams = function(params) {
55
- if (_instanceof(params, URLSearchParams)) {
1
+ export const makeQueryParams = (params) => {
2
+ if (params instanceof URLSearchParams) {
56
3
  return params.toString();
57
4
  }
58
- var newParams = new URLSearchParams();
59
- var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
60
- try {
61
- for(var _iterator = Object.entries(params)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
62
- var _step_value = _sliced_to_array(_step.value, 2), key = _step_value[0], value = _step_value[1];
63
- appendParam(newParams, key, value);
64
- }
65
- } catch (err) {
66
- _didIteratorError = true;
67
- _iteratorError = err;
68
- } finally{
69
- try {
70
- if (!_iteratorNormalCompletion && _iterator.return != null) {
71
- _iterator.return();
72
- }
73
- } finally{
74
- if (_didIteratorError) {
75
- throw _iteratorError;
76
- }
77
- }
5
+ const newParams = new URLSearchParams();
6
+ for (const [key, value] of Object.entries(params)) {
7
+ appendParam(newParams, key, value);
78
8
  }
79
9
  return newParams.toString();
80
10
  };
81
- var appendParam = function(params, key, value) {
11
+ const appendParam = (params, key, value) => {
82
12
  if (Array.isArray(value)) {
83
- var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
84
- try {
85
- for(var _iterator = value[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
86
- var v = _step.value;
87
- appendParam(params, key, v);
88
- }
89
- } catch (err) {
90
- _didIteratorError = true;
91
- _iteratorError = err;
92
- } finally{
93
- try {
94
- if (!_iteratorNormalCompletion && _iterator.return != null) {
95
- _iterator.return();
96
- }
97
- } finally{
98
- if (_didIteratorError) {
99
- throw _iteratorError;
100
- }
101
- }
13
+ for (const v of value) {
14
+ appendParam(params, key, v);
102
15
  }
103
- } else if (_instanceof(value, Date)) {
16
+ }
17
+ else if (value instanceof Date) {
104
18
  params.append(key, value.toISOString());
105
- } else if (value !== undefined && value !== null) {
19
+ }
20
+ else if (value !== undefined && value !== null) {
106
21
  params.append(key, value.toString());
107
22
  }
108
23
  };
24
+ //# sourceMappingURL=utils.js.map
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@driveflux/api-swr",
3
- "version": "4.0.75",
3
+ "version": "4.0.77",
4
4
  "type": "module",
5
5
  "exports": {
6
6
  ".": {
@@ -16,9 +16,9 @@
16
16
  "dist"
17
17
  ],
18
18
  "dependencies": {
19
- "@driveflux/auth": "4.0.75",
19
+ "@driveflux/auth": "4.0.76",
20
20
  "@driveflux/config": "3.0.9",
21
- "@driveflux/db": "4.1.7",
21
+ "@driveflux/db": "4.1.8",
22
22
  "@driveflux/fetch": "8.0.1",
23
23
  "@driveflux/problem": "6.0.1",
24
24
  "@driveflux/result": "6.0.1",