@ama-sdk/core 11.0.0-prerelease.5 → 11.0.0-prerelease.50

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.
Files changed (91) hide show
  1. package/cjs/clients/api-angular-client.js +0 -23
  2. package/cjs/clients/api-beacon-client.js +0 -15
  3. package/cjs/clients/api-fetch-client.js +0 -23
  4. package/cjs/fwk/core/api-client.js +1 -1
  5. package/cjs/fwk/core/base-api-constructor.js +5 -1
  6. package/cjs/fwk/index.js +0 -1
  7. package/cjs/plugins/abort/abort.fetch.js +5 -1
  8. package/cjs/plugins/perf-metric/perf-metric.fetch.js +44 -14
  9. package/cjs/plugins/perf-metric/perf-metric.probe.spec.js +11 -1
  10. package/cjs/plugins/session-id/session-id.request.js +1 -0
  11. package/cjs/plugins/timeout/timeout.fetch.js +14 -3
  12. package/cjs/plugins/timeout/timeout.spec.js +114 -0
  13. package/cjs/utils/generic-api.js +2 -20
  14. package/cjs/utils/index.js +0 -1
  15. package/esm2015/clients/api-angular-client.js +0 -23
  16. package/esm2015/clients/api-beacon-client.js +0 -15
  17. package/esm2015/clients/api-fetch-client.js +0 -23
  18. package/esm2015/fwk/core/api-client.js +1 -1
  19. package/esm2015/fwk/core/base-api-constructor.js +5 -1
  20. package/esm2015/fwk/index.js +0 -1
  21. package/esm2015/plugins/abort/abort.fetch.js +5 -1
  22. package/esm2015/plugins/perf-metric/perf-metric.fetch.js +44 -14
  23. package/esm2015/plugins/perf-metric/perf-metric.probe.spec.js +11 -1
  24. package/esm2015/plugins/session-id/session-id.request.js +1 -0
  25. package/esm2015/plugins/timeout/timeout.fetch.js +14 -3
  26. package/esm2015/plugins/timeout/timeout.spec.js +115 -1
  27. package/esm2015/utils/generic-api.js +2 -20
  28. package/esm2015/utils/index.js +0 -1
  29. package/package.json +33 -41
  30. package/schematics/ng-add/index.d.ts.map +1 -1
  31. package/schematics/ng-add/index.js +1 -4
  32. package/src/clients/api-angular-client.d.ts +2 -8
  33. package/src/clients/api-angular-client.d.ts.map +1 -1
  34. package/src/clients/api-angular-client.js +0 -13
  35. package/src/clients/api-angular-client.js.map +1 -1
  36. package/src/clients/api-beacon-client.d.ts +2 -8
  37. package/src/clients/api-beacon-client.d.ts.map +1 -1
  38. package/src/clients/api-beacon-client.js +0 -13
  39. package/src/clients/api-beacon-client.js.map +1 -1
  40. package/src/clients/api-fetch-client.d.ts +2 -8
  41. package/src/clients/api-fetch-client.d.ts.map +1 -1
  42. package/src/clients/api-fetch-client.js +0 -13
  43. package/src/clients/api-fetch-client.js.map +1 -1
  44. package/src/fwk/core/api-client.d.ts +6 -17
  45. package/src/fwk/core/api-client.d.ts.map +1 -1
  46. package/src/fwk/core/api-client.js +1 -1
  47. package/src/fwk/core/api-client.js.map +1 -1
  48. package/src/fwk/index.d.ts +0 -1
  49. package/src/fwk/index.d.ts.map +1 -1
  50. package/src/fwk/index.js +0 -1
  51. package/src/fwk/index.js.map +1 -1
  52. package/src/plugins/perf-metric/perf-metric.fetch.d.ts +45 -7
  53. package/src/plugins/perf-metric/perf-metric.fetch.d.ts.map +1 -1
  54. package/src/plugins/perf-metric/perf-metric.fetch.js +32 -17
  55. package/src/plugins/perf-metric/perf-metric.fetch.js.map +1 -1
  56. package/src/plugins/session-id/session-id.request.d.ts +1 -1
  57. package/src/plugins/session-id/session-id.request.d.ts.map +1 -1
  58. package/src/plugins/session-id/session-id.request.js +1 -0
  59. package/src/plugins/session-id/session-id.request.js.map +1 -1
  60. package/src/plugins/timeout/timeout.fetch.d.ts.map +1 -1
  61. package/src/plugins/timeout/timeout.fetch.js +11 -3
  62. package/src/plugins/timeout/timeout.fetch.js.map +1 -1
  63. package/src/utils/generic-api.d.ts.map +1 -1
  64. package/src/utils/generic-api.js +1 -3
  65. package/src/utils/generic-api.js.map +1 -1
  66. package/src/utils/index.d.ts +0 -1
  67. package/src/utils/index.d.ts.map +1 -1
  68. package/src/utils/index.js +0 -1
  69. package/src/utils/index.js.map +1 -1
  70. package/cjs/fwk/open-api-tools-configuration.js +0 -4
  71. package/cjs/utils/generators.js +0 -25
  72. package/cli/clear-index.cjs +0 -34
  73. package/cli/clear-index.d.cts +0 -3
  74. package/cli/clear-index.d.cts.map +0 -1
  75. package/cli/files-pack.cjs +0 -95
  76. package/cli/files-pack.d.cts +0 -3
  77. package/cli/files-pack.d.cts.map +0 -1
  78. package/cli/package.json +0 -3
  79. package/cli/update-spec-from-npm.cjs +0 -75
  80. package/cli/update-spec-from-npm.d.cts +0 -3
  81. package/cli/update-spec-from-npm.d.cts.map +0 -1
  82. package/esm2015/fwk/open-api-tools-configuration.js +0 -1
  83. package/esm2015/utils/generators.js +0 -5
  84. package/src/fwk/open-api-tools-configuration.d.ts +0 -28
  85. package/src/fwk/open-api-tools-configuration.d.ts.map +0 -1
  86. package/src/fwk/open-api-tools-configuration.js +0 -2
  87. package/src/fwk/open-api-tools-configuration.js.map +0 -1
  88. package/src/utils/generators.d.ts +0 -7
  89. package/src/utils/generators.d.ts.map +0 -1
  90. package/src/utils/generators.js +0 -9
  91. package/src/utils/generators.js.map +0 -1
@@ -207,19 +207,31 @@ import { v4 } from 'uuid';
207
207
  * Callback function called when a mark is closed with an error.
208
208
  */ _define_property(this, "onMarkError", void 0);
209
209
  /**
210
+ * Callback function called when a mark is opened.
211
+ */ _define_property(this, "onMarkOpen", void 0);
212
+ /**
210
213
  * Opened marks.
211
214
  */ _define_property(this, "openMarks", {});
212
215
  /**
213
- * Method used to get the current time.
214
- * Date.now() is used by default, but we fall back on window.performance.now() if available.
216
+ * Performance reporter to use for performance measurements.
217
+ * @default window.performance on browser only, undefined on node
218
+ */ _define_property(this, "performance", void 0);
219
+ /**
220
+ * Method used to get the current time as default implementation if no Performance API available.
221
+ * Date.now() is used by default.
215
222
  */ _define_property(this, "getTime", Date.now);
223
+ /**
224
+ * Retrieve the performance tag name
225
+ * @param status status of the call
226
+ * @param markId Mark ID
227
+ */ _define_property(this, "getPerformanceTag", function(status, markId) {
228
+ return "sdk:".concat(status, ":").concat(markId);
229
+ });
230
+ this.getPerformanceTag = (options === null || options === void 0 ? void 0 : options.getPerformanceTag) || this.getPerformanceTag;
231
+ this.performance = (options === null || options === void 0 ? void 0 : options.performance) || (typeof window !== 'undefined' ? window.performance : undefined);
216
232
  this.onMarkComplete = options ? options.onMarkComplete : this.onMarkComplete;
217
233
  this.onMarkError = options ? options.onMarkError : this.onMarkError;
218
- if (typeof window !== 'undefined' && !!window.performance && !!window.performance.now) {
219
- this.getTime = function() {
220
- return window.performance.now();
221
- };
222
- }
234
+ this.onMarkOpen = options ? options.onMarkOpen : this.onMarkOpen;
223
235
  }
224
236
  _create_class(PerformanceMetricPlugin, [
225
237
  {
@@ -229,13 +241,21 @@ import { v4 } from 'uuid';
229
241
  * @param url URL of the call associated to the mark to open
230
242
  * @param requestOptions Options of the call associated to the mark to open
231
243
  */ function openMark(url, requestOptions) {
244
+ var _this_performance;
232
245
  var markId = v4();
233
- this.openMarks = _object_spread_props(_object_spread({}, this.openMarks), _define_property({}, markId, {
246
+ var perfMark = ((_this_performance = this.performance) === null || _this_performance === void 0 ? void 0 : _this_performance.mark(this.getPerformanceTag('start', markId))) || undefined;
247
+ var _perfMark_startTime;
248
+ var startTime = (_perfMark_startTime = perfMark === null || perfMark === void 0 ? void 0 : perfMark.startTime) !== null && _perfMark_startTime !== void 0 ? _perfMark_startTime : this.getTime();
249
+ var mark = {
234
250
  markId: markId,
235
251
  url: url,
236
252
  requestOptions: requestOptions,
237
- startTime: this.getTime()
238
- }));
253
+ startTime: startTime
254
+ };
255
+ this.openMarks[markId] = mark;
256
+ if (this.onMarkOpen) {
257
+ void this.onMarkOpen(mark);
258
+ }
239
259
  return markId;
240
260
  }
241
261
  },
@@ -246,14 +266,19 @@ import { v4 } from 'uuid';
246
266
  * @param markId Id of the mark to close
247
267
  * @param response Response of the call associated to the mark to close
248
268
  */ function closeMark(markId, response) {
269
+ var _this_performance, _this_performance1;
270
+ var perfMark = ((_this_performance = this.performance) === null || _this_performance === void 0 ? void 0 : _this_performance.mark(this.getPerformanceTag('end', markId))) || undefined;
271
+ var _perfMark_startTime;
272
+ var endTime = (_perfMark_startTime = perfMark === null || perfMark === void 0 ? void 0 : perfMark.startTime) !== null && _perfMark_startTime !== void 0 ? _perfMark_startTime : this.getTime();
273
+ (_this_performance1 = this.performance) === null || _this_performance1 === void 0 ? void 0 : _this_performance1.measure(this.getPerformanceTag('measure', markId), this.getPerformanceTag('start', markId), this.getPerformanceTag('end', markId));
249
274
  var mark = this.openMarks[markId];
250
275
  if (!mark) {
251
276
  return;
252
277
  }
253
278
  if (this.onMarkComplete) {
254
- this.onMarkComplete(_object_spread_props(_object_spread({}, mark), {
279
+ void this.onMarkComplete(_object_spread_props(_object_spread({}, mark), {
255
280
  response: response,
256
- endTime: this.getTime()
281
+ endTime: endTime
257
282
  }));
258
283
  }
259
284
  delete this.openMarks[markId];
@@ -266,14 +291,19 @@ import { v4 } from 'uuid';
266
291
  * @param markId Id of the mark to close
267
292
  * @param error Optional error of the call associated to the mark to close
268
293
  */ function closeMarkWithError(markId, error) {
294
+ var _this_performance, _this_performance1;
295
+ var perfMark = ((_this_performance = this.performance) === null || _this_performance === void 0 ? void 0 : _this_performance.mark(this.getPerformanceTag('error', markId))) || undefined;
296
+ var _perfMark_startTime;
297
+ var endTime = (_perfMark_startTime = perfMark === null || perfMark === void 0 ? void 0 : perfMark.startTime) !== null && _perfMark_startTime !== void 0 ? _perfMark_startTime : this.getTime();
298
+ (_this_performance1 = this.performance) === null || _this_performance1 === void 0 ? void 0 : _this_performance1.measure(this.getPerformanceTag('measure', markId), this.getPerformanceTag('start', markId), this.getPerformanceTag('error', markId));
269
299
  var mark = this.openMarks[markId];
270
300
  if (!mark) {
271
301
  return;
272
302
  }
273
303
  if (this.onMarkError) {
274
- this.onMarkError(_object_spread_props(_object_spread({}, mark), {
304
+ void this.onMarkError(_object_spread_props(_object_spread({}, mark), {
275
305
  error: error,
276
- endTime: this.getTime()
306
+ endTime: endTime
277
307
  }));
278
308
  }
279
309
  delete this.openMarks[markId];
@@ -1,8 +1,12 @@
1
1
  import { PerformanceMetricPlugin } from './perf-metric.fetch';
2
2
  var perfPlugin;
3
3
  describe('PerformanceMetricPlugin', function() {
4
+ var onMarkOpen;
4
5
  beforeEach(function() {
5
- perfPlugin = new PerformanceMetricPlugin({});
6
+ onMarkOpen = jest.fn();
7
+ perfPlugin = new PerformanceMetricPlugin({
8
+ onMarkOpen: onMarkOpen
9
+ });
6
10
  });
7
11
  it('should generate new mark ids', function() {
8
12
  expect(perfPlugin.openMark('', {})).not.toEqual(perfPlugin.openMark('', {}));
@@ -43,4 +47,10 @@ describe('PerformanceMetricPlugin', function() {
43
47
  perfPlugin.closeMarkWithError(markId, {});
44
48
  return ret;
45
49
  });
50
+ it('should include call the open mark callback', function() {
51
+ var markId = perfPlugin.openMark('my-url', {});
52
+ expect(onMarkOpen).toHaveBeenCalledWith(expect.objectContaining({
53
+ markId: markId
54
+ }));
55
+ });
46
56
  });
@@ -58,6 +58,7 @@ import { v4 } from 'uuid';
58
58
  // Declaration done first since generateSessionId uses the logger
59
59
  this.sessionIdHeader = sessionIdHeader;
60
60
  this.requestIdActivated = activateRequestId;
61
+ this.sessionId = this.generateSessionId();
61
62
  }
62
63
  _create_class(SessionIdRequest, [
63
64
  {
@@ -59,6 +59,10 @@ function _define_property(obj, key, value) {
59
59
  }
60
60
  return obj;
61
61
  }
62
+ function _type_of(obj) {
63
+ "@swc/helpers - typeof";
64
+ return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
65
+ }
62
66
  function _ts_generator(thisArg, body) {
63
67
  var f, y, t, g, _ = {
64
68
  label: 0,
@@ -159,7 +163,7 @@ import { ResponseTimeoutError } from '../../fwk/errors';
159
163
  * Check if a message can be cast as an {@link ImpervaCaptchaMessage}
160
164
  * @param message
161
165
  */ function isImpervaCaptchaMessage(message) {
162
- return Object.prototype.hasOwnProperty.call(message, 'impervaChallenge') && Object.prototype.hasOwnProperty.call(message.impervaChallenge, 'status') && Object.prototype.hasOwnProperty.call(message.impervaChallenge, 'type') && message.impervaChallenge.type === 'captcha';
166
+ return !!message && Object.prototype.hasOwnProperty.call(message, 'impervaChallenge') && Object.prototype.hasOwnProperty.call(message.impervaChallenge, 'status') && Object.prototype.hasOwnProperty.call(message.impervaChallenge, 'type') && message.impervaChallenge.type === 'captcha';
163
167
  }
164
168
  /**
165
169
  * Captures Imperva captcha events and calls the event callback
@@ -174,8 +178,15 @@ import { ResponseTimeoutError } from '../../fwk/errors';
174
178
  if (originHostname !== location.hostname && ((config === null || config === void 0 ? void 0 : config.whiteListedHostNames) || []).indexOf(originHostname) === -1) {
175
179
  return;
176
180
  }
177
- var message = typeof event.data === 'string' ? JSON.parse(event.data) : event.data;
178
- if (message && isImpervaCaptchaMessage(message)) {
181
+ var message = event.data;
182
+ if (typeof event.data === 'string') {
183
+ try {
184
+ message = JSON.parse(event.data);
185
+ } catch (e) {
186
+ // This might not be an imperva message
187
+ }
188
+ }
189
+ if ((typeof message === "undefined" ? "undefined" : _type_of(message)) === 'object' && isImpervaCaptchaMessage(message)) {
179
190
  timeoutPauseCallback(message.impervaChallenge.status === 'started' ? 'timeoutStopped' : 'timeoutStarted');
180
191
  }
181
192
  };
@@ -27,6 +27,10 @@ function _async_to_generator(fn) {
27
27
  });
28
28
  };
29
29
  }
30
+ function _type_of(obj) {
31
+ "@swc/helpers - typeof";
32
+ return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
33
+ }
30
34
  function _ts_generator(thisArg, body) {
31
35
  var f, y, t, g, _ = {
32
36
  label: 0,
@@ -122,8 +126,9 @@ function _ts_generator(thisArg, body) {
122
126
  };
123
127
  }
124
128
  }
129
+ var _this = this;
125
130
  import { EmptyResponseError, ResponseTimeoutError } from '../../fwk/errors';
126
- import { TimeoutFetch } from './timeout.fetch';
131
+ import { impervaCaptchaEventHandlerFactory, TimeoutFetch } from './timeout.fetch';
127
132
  describe('Timeout Fetch Plugin', function() {
128
133
  it('should reject on timeout', /*#__PURE__*/ _async_to_generator(function() {
129
134
  var plugin, runner, call, callback;
@@ -323,3 +328,112 @@ describe('Timeout Fetch Plugin', function() {
323
328
  });
324
329
  }));
325
330
  });
331
+ describe('impervaCaptchaEventHandlerFactory', function() {
332
+ var postMessageTemp;
333
+ beforeAll(function() {
334
+ var _global, _global1;
335
+ (_global = global).location || (_global.location = {
336
+ hostname: 'test'
337
+ });
338
+ (_global1 = global).addEventListener || (_global1.addEventListener = jest.fn().mockImplementation(function(event, handler) {
339
+ if (event === 'message') {
340
+ postMessageTemp = function(msg, origin) {
341
+ var eventObject = {
342
+ origin: origin || 'https://test',
343
+ data: msg
344
+ };
345
+ if ((typeof handler === "undefined" ? "undefined" : _type_of(handler)) === 'object') {
346
+ handler.handleEvent(eventObject);
347
+ } else {
348
+ handler(eventObject);
349
+ }
350
+ };
351
+ }
352
+ }));
353
+ });
354
+ afterAll(function() {
355
+ jest.clearAllMocks();
356
+ });
357
+ it('should not throw on unexpected messages', function() {
358
+ var callback = jest.fn();
359
+ impervaCaptchaEventHandlerFactory({
360
+ whiteListedHostNames: []
361
+ })(callback, _this);
362
+ postMessageTemp('pouet');
363
+ expect(callback).not.toHaveBeenCalled();
364
+ postMessageTemp(JSON.stringify({
365
+ impervaChallenge: {
366
+ type: 'incorrectType'
367
+ }
368
+ }));
369
+ expect(callback).not.toHaveBeenCalled();
370
+ postMessageTemp(JSON.stringify({
371
+ impervaChallenge: {
372
+ incorrectFormat: true
373
+ }
374
+ }));
375
+ expect(callback).not.toHaveBeenCalled();
376
+ });
377
+ it('should not throw on null messages', function() {
378
+ var callback = jest.fn();
379
+ impervaCaptchaEventHandlerFactory({
380
+ whiteListedHostNames: []
381
+ })(callback, _this);
382
+ postMessageTemp(null);
383
+ expect(callback).not.toHaveBeenCalled();
384
+ });
385
+ it('should trigger a timeoutStopped if the captcha challenge has been started', function() {
386
+ var callback = jest.fn();
387
+ impervaCaptchaEventHandlerFactory({
388
+ whiteListedHostNames: []
389
+ })(callback, _this);
390
+ postMessageTemp(JSON.stringify({
391
+ impervaChallenge: {
392
+ status: 'started',
393
+ type: 'captcha'
394
+ }
395
+ }));
396
+ expect(callback).toHaveBeenCalledWith('timeoutStopped');
397
+ });
398
+ it('should trigger a timeoutStarted if the captcha challenge has been finished', function() {
399
+ var callback = jest.fn();
400
+ impervaCaptchaEventHandlerFactory({
401
+ whiteListedHostNames: []
402
+ })(callback, _this);
403
+ postMessageTemp({
404
+ impervaChallenge: {
405
+ status: 'ended',
406
+ type: 'captcha'
407
+ }
408
+ });
409
+ expect(callback).toHaveBeenCalledWith('timeoutStarted');
410
+ });
411
+ it('should trigger a timeoutStarted if the captcha challenge has been finished on a whitelisted domain', function() {
412
+ var callback = jest.fn();
413
+ impervaCaptchaEventHandlerFactory({
414
+ whiteListedHostNames: [
415
+ 'valid.domain'
416
+ ]
417
+ })(callback, _this);
418
+ postMessageTemp(JSON.stringify({
419
+ impervaChallenge: {
420
+ status: 'ended',
421
+ type: 'captcha'
422
+ }
423
+ }), 'http://valid.domain');
424
+ expect(callback).toHaveBeenCalledWith('timeoutStarted');
425
+ });
426
+ it('should ignore postMessage from non whitelisted domain', function() {
427
+ var callback = jest.fn();
428
+ impervaCaptchaEventHandlerFactory({
429
+ whiteListedHostNames: []
430
+ })(callback, _this);
431
+ postMessageTemp(JSON.stringify({
432
+ impervaChallenge: {
433
+ status: 'ended',
434
+ type: 'captcha'
435
+ }
436
+ }), 'http://invalid.domain');
437
+ expect(callback).not.toHaveBeenCalled();
438
+ });
439
+ });
@@ -189,7 +189,7 @@ import { ApiTypes } from '../fwk';
189
189
  */ function request(requestOptions) {
190
190
  var _this = this;
191
191
  return _async_to_generator(function() {
192
- var _requestOptions_metadata, _requestOptions_metadata1, metadataHeaderAccept, headers, requestParameters, options, _tmp, url, ret;
192
+ var _requestOptions_metadata, _requestOptions_metadata1, metadataHeaderAccept, headers, requestParameters, options, url, ret;
193
193
  return _ts_generator(this, function(_state) {
194
194
  switch(_state.label){
195
195
  case 0:
@@ -204,30 +204,12 @@ import { ApiTypes } from '../fwk';
204
204
  api: _this,
205
205
  headers: headers
206
206
  }, requestOptions);
207
- if (!_this.client.getRequestOptions) return [
208
- 3,
209
- 2
210
- ];
211
207
  return [
212
208
  4,
213
209
  _this.client.getRequestOptions(requestParameters)
214
210
  ];
215
211
  case 1:
216
- _tmp = _state.sent();
217
- return [
218
- 3,
219
- 4
220
- ];
221
- case 2:
222
- return [
223
- 4,
224
- _this.client.prepareOptions(requestParameters.basePath, requestParameters.method, requestParameters.queryParams || {}, requestParameters.headers)
225
- ];
226
- case 3:
227
- _tmp = _state.sent();
228
- _state.label = 4;
229
- case 4:
230
- options = _tmp;
212
+ options = _state.sent();
231
213
  url = _this.client.prepareUrl(options.basePath, options.queryParams);
232
214
  ret = _this.client.processCall(url, options, ApiTypes.DEFAULT, requestOptions.api.apiName, requestOptions.revivers, requestOptions.operationId);
233
215
  return [
@@ -4,4 +4,3 @@ export * from './ie11';
4
4
  export * from './json-token';
5
5
  export * from './mime-types';
6
6
  export * from './generic-api';
7
- export * from './generators';
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ama-sdk/core",
3
- "version": "11.0.0-prerelease.5",
3
+ "version": "11.0.0-prerelease.50",
4
4
  "publishConfig": {
5
5
  "access": "public"
6
6
  },
@@ -67,25 +67,21 @@
67
67
  "build:esm2020": "tsc -b tsconfig.build.json",
68
68
  "postbuild": "yarn cpy './package.json' dist && patch-package-json-main",
69
69
  "prepare:build:builders": "yarn cpy 'schematics/**/*.json' dist/schematics && yarn cpy 'collection.json' dist",
70
- "build:cli": "tsc -b tsconfig.cli.json --pretty && yarn generate-cjs-manifest",
71
70
  "build:builders": "tsc -b tsconfig.builders.json --pretty && yarn generate-cjs-manifest",
72
71
  "prepare:publish": "prepare-publish ./dist"
73
72
  },
74
73
  "dependencies": {
75
- "@swc/helpers": "^0.5.0",
74
+ "@swc/helpers": "~0.5.0",
76
75
  "tslib": "^2.6.2",
77
- "uuid": "^9.0.0"
76
+ "uuid": "^10.0.0"
78
77
  },
79
78
  "peerDependencies": {
80
- "@angular-devkit/schematics": "~17.3.0",
81
- "@angular/cli": "~17.3.0",
82
- "@angular/common": "~17.3.0",
83
- "@o3r/schematics": "^11.0.0-prerelease.5",
84
- "@schematics/angular": "~17.3.0",
85
- "chokidar": "^3.5.2",
86
- "globby": "^11.1.0",
79
+ "@angular-devkit/schematics": "~18.0.0",
80
+ "@angular/cli": "~18.0.0",
81
+ "@angular/common": "~18.0.0",
82
+ "@o3r/schematics": "^11.0.0-prerelease.50",
83
+ "@schematics/angular": "~18.0.0",
87
84
  "isomorphic-fetch": "^3.0.0",
88
- "minimist": "^1.2.6",
89
85
  "rxjs": "^7.8.1",
90
86
  "typescript": "~5.4.2"
91
87
  },
@@ -105,9 +101,6 @@
105
101
  "@schematics/angular": {
106
102
  "optional": true
107
103
  },
108
- "chokidar": {
109
- "optional": true
110
- },
111
104
  "isomorphic-fetch": {
112
105
  "optional": true
113
106
  },
@@ -119,43 +112,43 @@
119
112
  }
120
113
  },
121
114
  "devDependencies": {
122
- "@angular-devkit/core": "~17.3.0",
123
- "@angular-devkit/schematics": "~17.3.0",
124
- "@angular-eslint/eslint-plugin": "~17.5.0",
125
- "@angular/common": "~17.3.0",
126
- "@angular/core": "~17.3.0",
127
- "@nx/eslint-plugin": "~18.3.0",
128
- "@nx/jest": "~18.3.0",
129
- "@o3r/build-helpers": "^11.0.0-prerelease.5",
130
- "@o3r/eslint-plugin": "^11.0.0-prerelease.5",
131
- "@o3r/test-helpers": "^11.0.0-prerelease.5",
132
- "@schematics/angular": "~17.3.0",
133
- "@stylistic/eslint-plugin-ts": "^1.5.4",
134
- "@swc/cli": "^0.3.0",
135
- "@swc/core": "1.5.7",
115
+ "@angular-devkit/core": "~18.0.0",
116
+ "@angular-devkit/schematics": "~18.0.0",
117
+ "@angular-eslint/eslint-plugin": "~18.0.0",
118
+ "@angular/common": "~18.0.0",
119
+ "@angular/core": "~18.0.0",
120
+ "@nx/eslint-plugin": "~19.3.0",
121
+ "@nx/jest": "~19.3.0",
122
+ "@o3r/build-helpers": "^11.0.0-prerelease.50",
123
+ "@o3r/eslint-plugin": "^11.0.0-prerelease.50",
124
+ "@o3r/test-helpers": "^11.0.0-prerelease.50",
125
+ "@schematics/angular": "~18.0.0",
126
+ "@stylistic/eslint-plugin-ts": "^2.0.0",
127
+ "@swc/cli": "~0.3.0",
128
+ "@swc/core": "~1.6.0",
136
129
  "@types/jest": "~29.5.2",
137
- "@types/minimist": "^1.2.2",
138
130
  "@types/node": "^20.0.0",
139
131
  "@types/uuid": "^9.0.0",
140
132
  "@typescript-eslint/eslint-plugin": "^7.2.0",
141
133
  "@typescript-eslint/parser": "^7.2.0",
142
- "chokidar": "^3.5.2",
134
+ "@typescript-eslint/utils": "~7.14.1",
143
135
  "copyfiles": "^2.4.1",
144
136
  "cpy-cli": "^5.0.0",
145
137
  "eslint": "^8.57.0",
146
138
  "eslint-import-resolver-node": "^0.3.9",
147
- "eslint-plugin-jest": "~27.9.0",
139
+ "eslint-plugin-jest": "~28.6.0",
148
140
  "eslint-plugin-jsdoc": "~48.2.1",
149
141
  "eslint-plugin-prefer-arrow": "~1.2.3",
150
- "eslint-plugin-unicorn": "^51.0.1",
151
- "globby": "^11.1.0",
142
+ "eslint-plugin-unicorn": "^54.0.0",
152
143
  "isomorphic-fetch": "~3.0.0",
153
144
  "jest": "~29.7.0",
154
145
  "jest-junit": "~16.0.0",
155
146
  "jsonc-eslint-parser": "~2.4.0",
156
147
  "minimist": "^1.2.6",
148
+ "pid-from-port": "^1.1.3",
157
149
  "rimraf": "^5.0.1",
158
150
  "rxjs": "^7.8.1",
151
+ "semver": "^7.5.2",
159
152
  "ts-jest": "~29.1.2",
160
153
  "ts-node": "~10.9.2",
161
154
  "type-fest": "^4.10.2",
@@ -163,14 +156,9 @@
163
156
  "zone.js": "~0.14.2"
164
157
  },
165
158
  "engines": {
166
- "node": ">=18.0.0"
159
+ "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
167
160
  },
168
161
  "schematics": "./collection.json",
169
- "bin": {
170
- "amasdk-clear-index": "./cli/clear-index.cjs",
171
- "amasdk-files-pack": "./cli/files-pack.cjs",
172
- "amasdk-update-spec-from-npm": "./cli/update-spec-from-npm.cjs"
173
- },
174
162
  "contributors": [
175
163
  {
176
164
  "name": "Yannick Adam",
@@ -199,6 +187,7 @@
199
187
  },
200
188
  {
201
189
  "name": "Stephane Dalle",
190
+ "url": "https://github.com/sdalle-1A",
202
191
  "email": "sdalle-1A@users.noreply.github.com"
203
192
  },
204
193
  {
@@ -233,7 +222,10 @@
233
222
  }
234
223
  ],
235
224
  "bugs": "https://github.com/AmadeusITGroup/otter/issues",
236
- "repository": "https://github.com/AmadeusITGroup/otter",
225
+ "repository": {
226
+ "type": "git",
227
+ "url": "git+https://github.com/AmadeusITGroup/otter.git"
228
+ },
237
229
  "license": "BSD-3-Clause",
238
230
  "homepage": "https://amadeusitgroup.github.io/otter/"
239
231
  }
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,KAAK,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAI9D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AA0EtD;;;;GAIG;AACH,eAAO,MAAM,KAAK,YAAa,qBAAqB,KAAG,IAGtD,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,KAAK,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAI9D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAuEtD;;;;GAIG;AACH,eAAO,MAAM,KAAK,YAAa,qBAAqB,KAAG,IAGtD,CAAC"}
@@ -43,10 +43,7 @@ function ngAddFn(options) {
43
43
  const addMandatoryPeerDeps = async (tree, context) => {
44
44
  const { getPeerDepWithPattern, getWorkspaceConfig } = await Promise.resolve().then(() => require('@o3r/schematics'));
45
45
  const workingDirectory = options?.projectName && getWorkspaceConfig(tree)?.projects[options.projectName]?.root || '.';
46
- const peerDepToInstall = getPeerDepWithPattern(path.resolve(__dirname, '..', '..', 'package.json'), [
47
- 'chokidar',
48
- 'minimist'
49
- ]);
46
+ const peerDepToInstall = getPeerDepWithPattern(path.resolve(__dirname, '..', '..', 'package.json'));
50
47
  context.addTask(new tasks_1.NodePackageInstallTask({
51
48
  workingDirectory,
52
49
  packageName: Object.entries(peerDepToInstall.matchingPackagesVersions)
@@ -1,7 +1,7 @@
1
1
  import type { HttpClient } from '@angular/common/http';
2
- import { RequestBody, RequestMetadata, RequestOptions, TokenizedOptions } from '../plugins/core/index';
2
+ import type { RequestOptions, TokenizedOptions } from '../plugins/core/index';
3
3
  import { ApiTypes } from '../fwk/api';
4
- import type { Api, PartialExcept } from '../fwk/api.interface';
4
+ import type { PartialExcept } from '../fwk/api.interface';
5
5
  import type { ApiClient, RequestOptionsParameters } from '../fwk/core/api-client';
6
6
  import { BaseApiClientOptions } from '../fwk/core/base-api-constructor';
7
7
  import { ReviverType } from '../fwk/Reviver';
@@ -30,12 +30,6 @@ export declare class ApiAngularClient implements ApiClient {
30
30
  /** @inheritdoc */
31
31
  getRequestOptions(requestOptionsParameters: RequestOptionsParameters): Promise<RequestOptions>;
32
32
  /** @inheritdoc */
33
- prepareOptions(url: string, method: string, queryParams: {
34
- [key: string]: string | undefined;
35
- }, headers: {
36
- [key: string]: string | undefined;
37
- }, body?: RequestBody, tokenizedOptions?: TokenizedOptions, metadata?: RequestMetadata, api?: Api): Promise<RequestOptions>;
38
- /** @inheritdoc */
39
33
  prepareUrl(url: string, queryParameters?: {
40
34
  [key: string]: string | undefined;
41
35
  }): string;
@@ -1 +1 @@
1
- {"version":3,"file":"api-angular-client.d.ts","sourceRoot":"","sources":["../../../src/clients/api-angular-client.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"api-angular-client.d.ts","sourceRoot":"","sources":["../../../src/clients/api-angular-client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAgB,MAAM,sBAAsB,CAAC;AACrE,OAAO,KAAK,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAG9E,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,KAAK,EAAE,SAAS,EAAC,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AACjF,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAExE,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,gCAAgC;AAChC,MAAM,WAAW,2BAA4B,SAAQ,oBAAoB;IACvE,UAAU,EAAE,UAAU,CAAC;CACxB;AAED,8BAA8B;AAC9B,MAAM,WAAW,+BAAgC,SAAQ,aAAa,CAAC,2BAA2B,EAAE,UAAU,GAAG,YAAY,CAAC;CAC7H;AAUD,8DAA8D;AAC9D,qBAAa,gBAAiB,YAAW,SAAS;IAEhD,kBAAkB;IACX,OAAO,EAAE,2BAA2B,CAAC;IAE5C;;;OAGG;gBACS,OAAO,EAAE,+BAA+B;IAOpD,kBAAkB;IACX,kBAAkB,CAAC,CAAC,SAAS;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG;SAAG,CAAC,IAAI,MAAM,CAAC,GAAG,MAAM;KAAG;IAIrH,kBAAkB;IACL,iBAAiB,CAAC,wBAAwB,EAAE,wBAAwB,GAAG,OAAO,CAAC,cAAc,CAAC;IAkB3G,kBAAkB;IACX,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,eAAe,GAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAA;KAAO;IAI1F,kBAAkB;IACX,eAAe,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM;IAI9C,kBAAkB;IACX,sBAAsB,CAAC,GAAG,EAAE,MAAM,EAAE,eAAe,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EAAE,cAAc,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EAAE,IAAI,EAAE,GAAG,GAAG,gBAAgB,GAAG,SAAS;IAI1K,kBAAkB;IACL,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,QAAQ,GAAG,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,SAAS,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IACzJ,WAAW,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG;QAAE,CAAC,UAAU,EAAE,MAAM,GAAG,WAAW,CAAC,CAAC,CAAC,GAAG,SAAS,CAAA;KAAE,EACnL,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC;CAwEpC"}
@@ -43,19 +43,6 @@ export class ApiAngularClient {
43
43
  return opts;
44
44
  }
45
45
  /** @inheritdoc */
46
- async prepareOptions(url, method, queryParams, headers, body, tokenizedOptions, metadata, api) {
47
- return this.getRequestOptions({
48
- headers,
49
- method,
50
- basePath: url,
51
- queryParams,
52
- body,
53
- metadata,
54
- tokenizedOptions,
55
- api
56
- });
57
- }
58
- /** @inheritdoc */
59
46
  prepareUrl(url, queryParameters = {}) {
60
47
  return prepareUrl(url, queryParameters);
61
48
  }
@@ -1 +1 @@
1
- {"version":3,"file":"api-angular-client.js","sourceRoot":"","sources":["../../../src/clients/api-angular-client.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"api-angular-client.js","sourceRoot":"","sources":["../../../src/clients/api-angular-client.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,6 @@
1
- import type { RequestBody, RequestMetadata, RequestOptions, TokenizedOptions } from '../plugins';
1
+ import type { RequestBody, RequestOptions, TokenizedOptions } from '../plugins';
2
2
  import type { ApiTypes } from '../fwk/api';
3
- import type { Api, PartialExcept } from '../fwk/api.interface';
3
+ import type { PartialExcept } from '../fwk/api.interface';
4
4
  import type { ApiClient, RequestOptionsParameters } from '../fwk/core/api-client';
5
5
  import type { BaseApiClientOptions } from '../fwk/core/base-api-constructor';
6
6
  /** @see BaseApiClientOptions */
@@ -32,12 +32,6 @@ export declare class ApiBeaconClient implements ApiClient {
32
32
  /** @inheritdoc */
33
33
  getRequestOptions(options: RequestOptionsParameters): Promise<RequestOptions>;
34
34
  /** @inheritdoc */
35
- prepareOptions(url: string, method: string, queryParams: {
36
- [key: string]: string | undefined;
37
- }, headers: {
38
- [key: string]: string | undefined;
39
- }, body?: RequestBody, tokenizedOptions?: TokenizedOptions, metadata?: RequestMetadata, api?: Api): Promise<RequestOptions>;
40
- /** @inheritdoc */
41
35
  prepareUrl(url: string, queryParameters?: {
42
36
  [key: string]: string;
43
37
  }): string;
@@ -1 +1 @@
1
- {"version":3,"file":"api-beacon-client.d.ts","sourceRoot":"","sources":["../../../src/clients/api-beacon-client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AACjG,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAE3C,OAAO,KAAK,EAAE,GAAG,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,KAAK,EAAE,SAAS,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AAClF,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAE7E,gCAAgC;AAChC,MAAM,WAAW,0BAA2B,SAAQ,oBAAoB;IACtE,kBAAkB;IAClB,YAAY,EAAE,KAAK,EAAE,CAAC;CACvB;AAED,8BAA8B;AAC9B,MAAM,WAAW,8BAA+B,SAAQ,aAAa,CAAC,IAAI,CAAC,0BAA0B,EAAE,cAAc,CAAC,EAAE,UAAU,CAAC;CAClI;AAgBD;;;GAGG;AACH,qBAAa,eAAgB,YAAW,SAAS;IAE/C,kBAAkB;IACX,OAAO,EAAE,0BAA0B,CAAC;IAE3C;;;OAGG;gBACS,OAAO,EAAE,8BAA8B;IAYnD,kBAAkB;IACX,kBAAkB,CAAC,CAAC,SAAS;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG;SAAG,CAAC,IAAI,MAAM,CAAC,GAAG,MAAM;KAAG;IAIrH,kBAAkB;IACX,iBAAiB,CAAC,OAAO,EAAE,wBAAwB,GAAG,OAAO,CAAC,cAAc,CAAC;IAyBpF,kBAAkB;IACX,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAA;KAAE,EAAE,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAA;KAAE,EAAE,IAAI,CAAC,EAAE,WAAW,EACvK,gBAAgB,CAAC,EAAE,gBAAgB,EAAE,QAAQ,CAAC,EAAE,eAAe,EAAE,GAAG,CAAC,EAAE,GAAG;IAa5E,kBAAkB;IACX,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,eAAe,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,GAAG,MAAM;IAInF,kBAAkB;IACX,sBAAsB,CAAC,GAAG,EAAE,MAAM,EAAE,eAAe,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EAAE,cAAc,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EAAE,IAAI,EAAE,GAAG,GAAG,gBAAgB,GAAG,SAAS;IAI1K,kBAAkB;IACX,eAAe,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,GAAG,WAAW;IAI5D,kBAAkB;IACX,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,GAAG,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,OAAO,EAAE,YAAY,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC;CAanK"}
1
+ {"version":3,"file":"api-beacon-client.d.ts","sourceRoot":"","sources":["../../../src/clients/api-beacon-client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAChF,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAE3C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,KAAK,EAAE,SAAS,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AAClF,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAE7E,gCAAgC;AAChC,MAAM,WAAW,0BAA2B,SAAQ,oBAAoB;IACtE,kBAAkB;IAClB,YAAY,EAAE,KAAK,EAAE,CAAC;CACvB;AAED,8BAA8B;AAC9B,MAAM,WAAW,8BAA+B,SAAQ,aAAa,CAAC,IAAI,CAAC,0BAA0B,EAAE,cAAc,CAAC,EAAE,UAAU,CAAC;CAClI;AAgBD;;;GAGG;AACH,qBAAa,eAAgB,YAAW,SAAS;IAE/C,kBAAkB;IACX,OAAO,EAAE,0BAA0B,CAAC;IAE3C;;;OAGG;gBACS,OAAO,EAAE,8BAA8B;IAYnD,kBAAkB;IACX,kBAAkB,CAAC,CAAC,SAAS;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG;SAAG,CAAC,IAAI,MAAM,CAAC,GAAG,MAAM;KAAG;IAIrH,kBAAkB;IACX,iBAAiB,CAAC,OAAO,EAAE,wBAAwB,GAAG,OAAO,CAAC,cAAc,CAAC;IAyBpF,kBAAkB;IACX,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,eAAe,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,GAAG,MAAM;IAInF,kBAAkB;IACX,sBAAsB,CAAC,GAAG,EAAE,MAAM,EAAE,eAAe,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EAAE,cAAc,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EAAE,IAAI,EAAE,GAAG,GAAG,gBAAgB,GAAG,SAAS;IAI1K,kBAAkB;IACX,eAAe,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,GAAG,WAAW;IAI5D,kBAAkB;IACX,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,GAAG,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,OAAO,EAAE,YAAY,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC;CAanK"}