@sima-land/isomorph 11.0.0-alpha.1 → 11.0.0-alpha.12

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 (131) hide show
  1. package/config/{index.d.ts → base.d.ts} +0 -0
  2. package/config/{index.js → base.js} +1 -1
  3. package/config/base.js.map +1 -0
  4. package/config/browser.js +10 -1
  5. package/config/browser.js.map +1 -1
  6. package/config/node.js +10 -5
  7. package/config/node.js.map +1 -1
  8. package/di/application.d.ts +6 -0
  9. package/{container → di}/application.js +17 -8
  10. package/di/application.js.map +1 -0
  11. package/di/container.d.ts +6 -0
  12. package/di/container.js +49 -0
  13. package/di/container.js.map +1 -0
  14. package/di/errors.d.ts +21 -0
  15. package/di/errors.js +33 -0
  16. package/di/errors.js.map +1 -0
  17. package/di/index.d.ts +6 -0
  18. package/di/index.js +16 -0
  19. package/di/index.js.map +1 -0
  20. package/di/preset.d.ts +9 -0
  21. package/{preset/index.js → di/preset.js} +4 -2
  22. package/di/preset.js.map +1 -0
  23. package/di/token.d.ts +7 -0
  24. package/di/token.js +17 -0
  25. package/di/token.js.map +1 -0
  26. package/di/types.d.ts +32 -0
  27. package/{container → di}/types.js +0 -0
  28. package/{tracer → di}/types.js.map +1 -1
  29. package/error-tracking/index.d.ts +22 -0
  30. package/{error-tracker/utils.js → error-tracking/index.js} +14 -3
  31. package/error-tracking/index.js.map +1 -0
  32. package/error-tracking/types.d.ts +13 -0
  33. package/{error-tracker → error-tracking}/types.js +0 -0
  34. package/{container → error-tracking}/types.js.map +1 -1
  35. package/http-client/middleware/logging.d.ts +15 -0
  36. package/http-client/middleware/logging.js +93 -0
  37. package/http-client/middleware/logging.js.map +1 -0
  38. package/http-client/sauce/index.d.ts +27 -0
  39. package/http-client/sauce/index.js +33 -0
  40. package/http-client/sauce/index.js.map +1 -0
  41. package/http-client/utils.d.ts +0 -27
  42. package/http-client/utils.js +1 -30
  43. package/http-client/utils.js.map +1 -1
  44. package/http-server/middleware/tracing.d.ts +8 -2
  45. package/http-server/middleware/tracing.js +22 -3
  46. package/http-server/middleware/tracing.js.map +1 -1
  47. package/http-server/template/index.js +6 -0
  48. package/http-server/template/index.js.map +1 -1
  49. package/http-server/types.d.ts +2 -0
  50. package/http-server/utils.d.ts +3 -5
  51. package/http-server/utils.js +16 -15
  52. package/http-server/utils.js.map +1 -1
  53. package/logger/handler/console.d.ts +1 -1
  54. package/logger/handler/console.js +8 -1
  55. package/logger/handler/console.js.map +1 -1
  56. package/logger/handler/sentry.d.ts +3 -3
  57. package/logger/handler/sentry.js +13 -7
  58. package/logger/handler/sentry.js.map +1 -1
  59. package/logger/index.d.ts +2 -6
  60. package/logger/index.js +2 -27
  61. package/logger/index.js.map +1 -1
  62. package/logger/logger.d.ts +6 -0
  63. package/logger/logger.js +31 -0
  64. package/logger/logger.js.map +1 -0
  65. package/package.json +4 -2
  66. package/preset/browser/index.d.ts +8 -0
  67. package/preset/browser/index.js +48 -0
  68. package/preset/browser/index.js.map +1 -0
  69. package/preset/node/index.d.ts +10 -6
  70. package/preset/node/index.js +73 -36
  71. package/preset/node/index.js.map +1 -1
  72. package/preset/node/response.d.ts +11 -8
  73. package/preset/node/response.js +26 -23
  74. package/preset/node/response.js.map +1 -1
  75. package/tokens.d.ts +25 -18
  76. package/tokens.js +23 -17
  77. package/tokens.js.map +1 -1
  78. package/tracing/index.d.ts +9 -0
  79. package/tracing/index.js +20 -0
  80. package/tracing/index.js.map +1 -0
  81. package/utils/react/error-handlers/index.js +1 -0
  82. package/utils/react/error-handlers/index.js.map +1 -1
  83. package/utils/redux-saga/index.d.ts +3 -0
  84. package/utils/redux-saga/index.js +8 -0
  85. package/utils/redux-saga/index.js.map +1 -0
  86. package/utils/redux-saga/middleware.d.ts +9 -0
  87. package/utils/redux-saga/middleware.js +87 -0
  88. package/utils/redux-saga/middleware.js.map +1 -0
  89. package/utils/redux-saga/types.d.ts +6 -0
  90. package/{preset → utils/redux-saga}/types.js +0 -0
  91. package/{error-tracker → utils/redux-saga}/types.js.map +1 -1
  92. package/utils/ssr/index.d.ts +30 -0
  93. package/utils/ssr/index.js +51 -0
  94. package/utils/ssr/index.js.map +1 -0
  95. package/utils/webpack/index.d.ts +23 -0
  96. package/utils/webpack/index.js +66 -0
  97. package/utils/webpack/index.js.map +1 -0
  98. package/config/index.js.map +0 -1
  99. package/config/utils.d.ts +0 -5
  100. package/config/utils.js +0 -12
  101. package/config/utils.js.map +0 -1
  102. package/container/application.d.ts +0 -25
  103. package/container/application.js.map +0 -1
  104. package/container/index.d.ts +0 -18
  105. package/container/index.js +0 -74
  106. package/container/index.js.map +0 -1
  107. package/container/types.d.ts +0 -14
  108. package/error-tracker/browser.d.ts +0 -8
  109. package/error-tracker/browser.js +0 -40
  110. package/error-tracker/browser.js.map +0 -1
  111. package/error-tracker/node.d.ts +0 -8
  112. package/error-tracker/node.js +0 -40
  113. package/error-tracker/node.js.map +0 -1
  114. package/error-tracker/types.d.ts +0 -18
  115. package/error-tracker/utils.d.ts +0 -12
  116. package/error-tracker/utils.js.map +0 -1
  117. package/preset/index.d.ts +0 -7
  118. package/preset/index.js.map +0 -1
  119. package/preset/types.d.ts +0 -7
  120. package/preset/types.js.map +0 -1
  121. package/saga-runner/index.d.ts +0 -8
  122. package/saga-runner/index.js +0 -79
  123. package/saga-runner/index.js.map +0 -1
  124. package/saga-runner/types.d.ts +0 -10
  125. package/saga-runner/types.js +0 -3
  126. package/saga-runner/types.js.map +0 -1
  127. package/tracer/node.d.ts +0 -10
  128. package/tracer/node.js +0 -38
  129. package/tracer/node.js.map +0 -1
  130. package/tracer/types.d.ts +0 -2
  131. package/tracer/types.js +0 -3
@@ -1,15 +1,19 @@
1
- import type { Preset } from '../types';
2
- import type { Provider } from '../../container/types';
3
1
  import type { BaseConfig } from '../../config/types';
4
2
  import type { Logger } from '../../logger/types';
5
3
  import type { Tracer } from '@opentelemetry/api';
6
4
  import type { DefaultMiddleware } from '../../http-server/types';
5
+ import { Resolve, Preset } from '../../di';
6
+ import { BasicTracerProvider, SpanExporter } from '@opentelemetry/tracing';
7
+ import { Resource } from '@opentelemetry/resources';
7
8
  /**
8
9
  * Возвращает preset с зависимостями по умолчанию для frontend-микросервисов на Node.js.
9
10
  * @return Preset.
10
11
  */
11
12
  export declare function PresetNode(): Preset;
12
- export declare const provideBaseConfig: Provider<BaseConfig>;
13
- export declare const provideLogger: Provider<Logger>;
14
- export declare const provideTracer: Provider<Tracer>;
15
- export declare const provideDefaultMiddleware: Provider<DefaultMiddleware>;
13
+ export declare function provideBaseConfig(resolve: Resolve): BaseConfig;
14
+ export declare function provideLogger(resolve: Resolve): Logger;
15
+ export declare function provideTracer(resolve: Resolve): Tracer;
16
+ export declare function provideSpanExporter(resolve: Resolve): SpanExporter;
17
+ export declare function provideTracerProvider(resolve: Resolve): BasicTracerProvider;
18
+ export declare function provideTracerProviderResource(resolve: Resolve): Resource;
19
+ export declare function provideDefaultMiddleware(resolve: Resolve): DefaultMiddleware;
@@ -3,77 +3,114 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.provideDefaultMiddleware = exports.provideTracer = exports.provideLogger = exports.provideBaseConfig = exports.PresetNode = void 0;
6
+ exports.provideDefaultMiddleware = exports.provideTracerProviderResource = exports.provideTracerProvider = exports.provideSpanExporter = exports.provideTracer = exports.provideLogger = exports.provideBaseConfig = exports.PresetNode = void 0;
7
+ const di_1 = require("../../di");
8
+ const tracing_1 = require("@opentelemetry/tracing");
7
9
  const tokens_1 = require("../../tokens");
8
- const __1 = require("..");
9
10
  const node_1 = require("../../config/node");
10
- const config_1 = require("../../config");
11
+ const base_1 = require("../../config/base");
11
12
  const logger_1 = require("../../logger");
12
- const node_2 = require("../../tracer/node");
13
13
  const console_1 = require("../../logger/handler/console");
14
14
  const sentry_1 = require("../../logger/handler/sentry");
15
- const node_3 = require("../../error-tracker/node");
16
15
  const logging_1 = require("../../http-server/middleware/logging");
17
- const tracing_1 = require("../../http-server/middleware/tracing");
16
+ const tracing_2 = require("../../http-server/middleware/tracing");
18
17
  const metrics_1 = require("../../http-server/middleware/metrics");
19
- const node_4 = require("../../metrics/node");
18
+ const node_2 = require("../../metrics/node");
20
19
  const exporter_jaeger_1 = require("@opentelemetry/exporter-jaeger");
21
20
  const middleware_axios_1 = require("middleware-axios");
22
21
  const express_1 = __importDefault(require("express"));
23
- const node_5 = require("@sentry/node");
22
+ const node_3 = require("@sentry/node");
23
+ const sdk_trace_node_1 = require("@opentelemetry/sdk-trace-node");
24
+ const resources_1 = require("@opentelemetry/resources");
25
+ const propagator_jaeger_1 = require("@opentelemetry/propagator-jaeger");
26
+ const semantic_conventions_1 = require("@opentelemetry/semantic-conventions");
27
+ const tracing_3 = require("../../tracing");
28
+ const os_1 = require("os");
24
29
  /**
25
30
  * Возвращает preset с зависимостями по умолчанию для frontend-микросервисов на Node.js.
26
31
  * @return Preset.
27
32
  */
28
33
  function PresetNode() {
29
- return (0, __1.createPreset)([
34
+ return (0, di_1.createPreset)([
30
35
  [tokens_1.KnownToken.Config.source, node_1.createConfigSource],
31
- [tokens_1.KnownToken.Config.base, exports.provideBaseConfig],
32
- [tokens_1.KnownToken.logger, exports.provideLogger],
33
- [tokens_1.KnownToken.tracer, exports.provideTracer],
36
+ [tokens_1.KnownToken.Config.base, provideBaseConfig],
37
+ [tokens_1.KnownToken.logger, provideLogger],
38
+ [tokens_1.KnownToken.Tracing.tracer, provideTracer],
39
+ [tokens_1.KnownToken.Tracing.spanExporter, provideSpanExporter],
40
+ [tokens_1.KnownToken.Tracing.tracerProvider, provideTracerProvider],
41
+ [tokens_1.KnownToken.Tracing.tracerProviderResource, provideTracerProviderResource],
34
42
  [tokens_1.KnownToken.Http.Client.factory, () => middleware_axios_1.create],
35
43
  [tokens_1.KnownToken.Http.Server.factory, () => express_1.default],
36
- [tokens_1.KnownToken.Http.Server.Defaults.middleware, exports.provideDefaultMiddleware],
37
- [tokens_1.KnownToken.Metrics.httpApp, node_4.createMetricsHttpApp],
44
+ [tokens_1.KnownToken.Http.Server.Defaults.middleware, provideDefaultMiddleware],
45
+ [tokens_1.KnownToken.Metrics.httpApp, node_2.createMetricsHttpApp],
38
46
  ]);
39
47
  }
40
48
  exports.PresetNode = PresetNode;
41
- const provideBaseConfig = resolve => {
49
+ function provideBaseConfig(resolve) {
42
50
  const source = resolve(tokens_1.KnownToken.Config.source);
43
- return (0, config_1.createBaseConfig)(source);
44
- };
51
+ return (0, base_1.createBaseConfig)(source);
52
+ }
45
53
  exports.provideBaseConfig = provideBaseConfig;
46
- const provideLogger = resolve => {
54
+ function provideLogger(resolve) {
47
55
  const source = resolve(tokens_1.KnownToken.Config.source);
48
56
  const config = resolve(tokens_1.KnownToken.Config.base);
49
- const sentry = (0, node_3.createSentryLib)({
50
- dsn: source.get('SENTRY_DSN'),
51
- release: source.get('SENTRY_RELEASE'),
52
- environment: source.get('SENTRY_ENVIRONMENT'),
57
+ const client = new node_3.NodeClient({
58
+ dsn: source.require('SENTRY_SERVER_DSN'),
59
+ release: source.require('SENTRY_RELEASE'),
60
+ environment: source.require('SENTRY_ENVIRONMENT'),
61
+ integrations: [...node_3.defaultIntegrations],
53
62
  });
63
+ const hub = new node_3.Hub(client);
54
64
  const logger = (0, logger_1.createLogger)();
55
65
  logger.subscribe((0, console_1.createConsoleHandler)(config));
56
- logger.subscribe((0, sentry_1.createSentryHandler)(sentry));
66
+ logger.subscribe((0, sentry_1.createSentryHandler)(hub));
57
67
  return logger;
58
- };
68
+ }
59
69
  exports.provideLogger = provideLogger;
60
- const provideTracer = resolve => {
70
+ function provideTracer(resolve) {
71
+ const config = resolve(tokens_1.KnownToken.Config.base);
72
+ const provider = resolve(tokens_1.KnownToken.Tracing.tracerProvider);
73
+ return provider.getTracer(config.appName, config.appVersion);
74
+ }
75
+ exports.provideTracer = provideTracer;
76
+ function provideSpanExporter(resolve) {
61
77
  const source = resolve(tokens_1.KnownToken.Config.source);
62
78
  const exporter = new exporter_jaeger_1.JaegerExporter({
63
- endpoint: source.require('JAEGER_ENDPOINT'),
79
+ host: source.require('JAEGER_AGENT_HOST'),
80
+ port: parseInt(source.require('JAEGER_AGENT_PORT')) || undefined,
64
81
  });
65
- return (0, node_2.createTracer)(resolve(tokens_1.KnownToken.Config.base), exporter);
66
- };
67
- exports.provideTracer = provideTracer;
68
- const provideDefaultMiddleware = resolve => {
82
+ return exporter;
83
+ }
84
+ exports.provideSpanExporter = provideSpanExporter;
85
+ function provideTracerProvider(resolve) {
86
+ const exporter = resolve(tokens_1.KnownToken.Tracing.spanExporter);
87
+ const resource = resolve(tokens_1.KnownToken.Tracing.tracerProviderResource);
88
+ const provider = new sdk_trace_node_1.NodeTracerProvider({
89
+ resource,
90
+ });
91
+ provider.addSpanProcessor(new tracing_1.BatchSpanProcessor(exporter)); // @todo разобраться с as any
92
+ provider.register({
93
+ propagator: new propagator_jaeger_1.JaegerPropagator(),
94
+ });
95
+ return provider; // @todo разобраться с as any
96
+ }
97
+ exports.provideTracerProvider = provideTracerProvider;
98
+ function provideTracerProviderResource(resolve) {
99
+ const config = resolve(tokens_1.KnownToken.Config.base);
100
+ return (0, tracing_3.getConventionalResource)(config).merge(new resources_1.Resource({
101
+ [semantic_conventions_1.SemanticResourceAttributes.HOST_NAME]: (0, os_1.hostname)(),
102
+ }));
103
+ }
104
+ exports.provideTracerProviderResource = provideTracerProviderResource;
105
+ function provideDefaultMiddleware(resolve) {
69
106
  const config = resolve(tokens_1.KnownToken.Config.base);
70
107
  const logger = resolve(tokens_1.KnownToken.logger);
71
- const tracer = resolve(tokens_1.KnownToken.tracer);
72
- const metrics = (0, node_4.createDefaultMetrics)();
108
+ const tracer = resolve(tokens_1.KnownToken.Tracing.tracer);
109
+ const metrics = (0, node_2.createDefaultMetrics)();
73
110
  return {
74
- start: [node_5.Handlers.requestHandler()],
111
+ start: [node_3.Handlers.requestHandler()],
75
112
  logging: [(0, logging_1.loggingMiddleware)(config, logger)],
76
- tracing: [(0, tracing_1.tracingMiddleware)(tracer)],
113
+ tracing: [(0, tracing_2.tracingMiddleware)(tracer)],
77
114
  metrics: [
78
115
  (0, metrics_1.responseMetricsMiddleware)(config, {
79
116
  counter: metrics.requestCount,
@@ -83,8 +120,8 @@ const provideDefaultMiddleware = resolve => {
83
120
  histogram: metrics.renderDuration,
84
121
  }),
85
122
  ],
86
- finish: [node_5.Handlers.errorHandler()],
123
+ finish: [node_3.Handlers.errorHandler()],
87
124
  };
88
- };
125
+ }
89
126
  exports.provideDefaultMiddleware = provideDefaultMiddleware;
90
127
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/preset/node/index.ts"],"names":[],"mappings":";;;;;;AAOA,yCAAmD;AACnD,0BAAkC;AAClC,4CAAuD;AACvD,yCAAgD;AAChD,yCAA4C;AAC5C,4CAAiD;AACjD,0DAAoE;AACpE,wDAAkE;AAClE,mDAA2D;AAC3D,kEAAyE;AACzE,kEAAyE;AACzE,kEAG8C;AAC9C,6CAAgF;AAChF,oEAAgE;AAChE,uDAA0C;AAC1C,sDAA8B;AAC9B,uCAAwC;AAExC;;;GAGG;AACH,SAAgB,UAAU;IACxB,OAAO,IAAA,gBAAY,EAAC;QAClB,CAAC,mBAAK,CAAC,MAAM,CAAC,MAAM,EAAE,yBAAkB,CAAC;QACzC,CAAC,mBAAK,CAAC,MAAM,CAAC,IAAI,EAAE,yBAAiB,CAAC;QACtC,CAAC,mBAAK,CAAC,MAAM,EAAE,qBAAa,CAAC;QAC7B,CAAC,mBAAK,CAAC,MAAM,EAAE,qBAAa,CAAC;QAC7B,CAAC,mBAAK,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,yBAAM,CAAC;QACzC,CAAC,mBAAK,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,iBAAO,CAAC;QAC1C,CAAC,mBAAK,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,gCAAwB,CAAC;QACjE,CAAC,mBAAK,CAAC,OAAO,CAAC,OAAO,EAAE,2BAAoB,CAAC;KAC9C,CAAC,CAAC;AACL,CAAC;AAXD,gCAWC;AAEM,MAAM,iBAAiB,GAAyB,OAAO,CAAC,EAAE;IAC/D,MAAM,MAAM,GAAG,OAAO,CAAC,mBAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAE5C,OAAO,IAAA,yBAAgB,EAAC,MAAM,CAAC,CAAC;AAClC,CAAC,CAAC;AAJW,QAAA,iBAAiB,qBAI5B;AAEK,MAAM,aAAa,GAAqB,OAAO,CAAC,EAAE;IACvD,MAAM,MAAM,GAAG,OAAO,CAAC,mBAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC5C,MAAM,MAAM,GAAG,OAAO,CAAC,mBAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAE1C,MAAM,MAAM,GAAG,IAAA,sBAAe,EAAC;QAC7B,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC;QAC7B,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC;QACrC,WAAW,EAAE,MAAM,CAAC,GAAG,CAAC,oBAAoB,CAAC;KAC9C,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,IAAA,qBAAY,GAAE,CAAC;IAC9B,MAAM,CAAC,SAAS,CAAC,IAAA,8BAAoB,EAAC,MAAM,CAAC,CAAC,CAAC;IAC/C,MAAM,CAAC,SAAS,CAAC,IAAA,4BAAmB,EAAC,MAAM,CAAC,CAAC,CAAC;IAE9C,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAfW,QAAA,aAAa,iBAexB;AAEK,MAAM,aAAa,GAAqB,OAAO,CAAC,EAAE;IACvD,MAAM,MAAM,GAAG,OAAO,CAAC,mBAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAE5C,MAAM,QAAQ,GAAG,IAAI,gCAAc,CAAC;QAClC,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC;KAC5C,CAAC,CAAC;IAEH,OAAO,IAAA,mBAAY,EAAC,OAAO,CAAC,mBAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,CAAC;AAC5D,CAAC,CAAC;AARW,QAAA,aAAa,iBAQxB;AAEK,MAAM,wBAAwB,GAAgC,OAAO,CAAC,EAAE;IAC7E,MAAM,MAAM,GAAG,OAAO,CAAC,mBAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC1C,MAAM,MAAM,GAAG,OAAO,CAAC,mBAAK,CAAC,MAAM,CAAC,CAAC;IACrC,MAAM,MAAM,GAAG,OAAO,CAAC,mBAAK,CAAC,MAAM,CAAC,CAAC;IAErC,MAAM,OAAO,GAAG,IAAA,2BAAoB,GAAE,CAAC;IAEvC,OAAO;QACL,KAAK,EAAE,CAAC,eAAQ,CAAC,cAAc,EAAE,CAAC;QAClC,OAAO,EAAE,CAAC,IAAA,2BAAiB,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC5C,OAAO,EAAE,CAAC,IAAA,2BAAiB,EAAC,MAAM,CAAC,CAAC;QACpC,OAAO,EAAE;YACP,IAAA,mCAAyB,EAAC,MAAM,EAAE;gBAChC,OAAO,EAAE,OAAO,CAAC,YAAY;gBAC7B,SAAS,EAAE,OAAO,CAAC,gBAAgB;aACpC,CAAC;YACF,IAAA,iCAAuB,EAAC,MAAM,EAAE;gBAC9B,SAAS,EAAE,OAAO,CAAC,cAAc;aAClC,CAAC;SACH;QACD,MAAM,EAAE,CAAC,eAAQ,CAAC,YAAY,EAAE,CAAC;KAClC,CAAC;AACJ,CAAC,CAAC;AAtBW,QAAA,wBAAwB,4BAsBnC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/preset/node/index.ts"],"names":[],"mappings":"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"}
@@ -1,17 +1,20 @@
1
1
  /// <reference types="react" />
2
- import type { Preset } from '../types';
3
- import type { Provider, Resolve } from '../../container/types';
4
- import type { SagaRunner } from '../../saga-runner/types';
5
2
  import type { PageTemplate } from '../../http-server/types';
6
3
  import type { Handler } from 'express';
7
- import { Application } from '../../container/application';
4
+ import { Application, Preset, Resolve } from '../../di';
5
+ import { SagaExtendedMiddleware } from '../../utils/redux-saga';
8
6
  /**
9
7
  * Возвращает preset с зависимостями по умолчанию для работы в рамках ответа на http-запрос.
10
8
  * @return Preset.
11
9
  */
12
10
  export declare function PresetResponse(): Preset;
13
- export declare const provideSagaRunner: Provider<SagaRunner>;
14
- export declare const provideRender: Provider<(el: JSX.Element) => string | Promise<string>>;
15
- export declare const provideTemplate: Provider<PageTemplate>;
16
- export declare const provideMain: Provider<() => void>;
11
+ export declare function provideSagaMiddleware(resolve: Resolve): SagaExtendedMiddleware;
12
+ export declare function provideRender(resolve: Resolve): (element: JSX.Element) => string;
13
+ export declare function provideTemplate(resolve: Resolve): PageTemplate;
14
+ export declare function provideMain(resolve: Resolve): VoidFunction;
15
+ /**
16
+ * Возвращает express-handler, создающий дочернее di-приложение при запросе.
17
+ * @param appFactory Фабрика di-приложения запроса.
18
+ * @return Обработчик.
19
+ */
17
20
  export declare function HandlerProvider(appFactory: () => Application): (resolve: Resolve) => Handler;
@@ -1,33 +1,32 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.HandlerProvider = exports.provideMain = exports.provideTemplate = exports.provideRender = exports.provideSagaRunner = exports.PresetResponse = void 0;
4
- const application_1 = require("../../container/application");
3
+ exports.HandlerProvider = exports.provideMain = exports.provideTemplate = exports.provideRender = exports.provideSagaMiddleware = exports.PresetResponse = void 0;
4
+ const di_1 = require("../../di");
5
5
  const tokens_1 = require("../../tokens");
6
- const __1 = require("..");
7
6
  const server_1 = require("react-dom/server");
8
- const saga_runner_1 = require("../../saga-runner");
9
7
  const constants_1 = require("../../http-server/constants");
10
8
  const template_1 = require("../../http-server/template");
11
9
  const utils_1 = require("../../http-server/utils");
10
+ const redux_saga_1 = require("../../utils/redux-saga");
12
11
  /**
13
12
  * Возвращает preset с зависимостями по умолчанию для работы в рамках ответа на http-запрос.
14
13
  * @return Preset.
15
14
  */
16
15
  function PresetResponse() {
17
- return (0, __1.createPreset)([
18
- [tokens_1.KnownToken.Response.sagaRunner, exports.provideSagaRunner],
19
- [tokens_1.KnownToken.Response.render, exports.provideRender],
20
- [tokens_1.KnownToken.Response.template, exports.provideTemplate],
21
- [tokens_1.KnownToken.Response.main, exports.provideMain],
16
+ return (0, di_1.createPreset)([
17
+ [tokens_1.KnownToken.sagaMiddleware, provideSagaMiddleware],
18
+ [tokens_1.KnownToken.Response.render, provideRender],
19
+ [tokens_1.KnownToken.Response.template, provideTemplate],
20
+ [tokens_1.KnownToken.Response.main, provideMain],
22
21
  ]);
23
22
  }
24
23
  exports.PresetResponse = PresetResponse;
25
- const provideSagaRunner = resolve => {
24
+ function provideSagaMiddleware(resolve) {
26
25
  const logger = resolve(tokens_1.KnownToken.logger);
27
- return (0, saga_runner_1.createSagaRunner)(logger);
28
- };
29
- exports.provideSagaRunner = provideSagaRunner;
30
- const provideRender = resolve => {
26
+ return (0, redux_saga_1.createSagaMiddleware)(logger);
27
+ }
28
+ exports.provideSagaMiddleware = provideSagaMiddleware;
29
+ function provideRender(resolve) {
31
30
  const { res } = resolve(tokens_1.KnownToken.Response.context);
32
31
  return function render(element) {
33
32
  res.emit(constants_1.RESPONSE_EVENT.renderStart);
@@ -35,37 +34,41 @@ const provideRender = resolve => {
35
34
  res.emit(constants_1.RESPONSE_EVENT.renderFinish);
36
35
  return result;
37
36
  };
38
- };
37
+ }
39
38
  exports.provideRender = provideRender;
40
- const provideTemplate = resolve => {
39
+ function provideTemplate(resolve) {
41
40
  const config = resolve(tokens_1.KnownToken.Config.base);
42
41
  return function template(data) {
43
42
  return data.type === 'html'
44
43
  ? (0, template_1.pageTemplate)({ ...data, title: `[dev] ${config.appName}` })
45
44
  : data.markup;
46
45
  };
47
- };
46
+ }
48
47
  exports.provideTemplate = provideTemplate;
49
- const provideMain = resolve => {
48
+ function provideMain(resolve) {
50
49
  const context = resolve(tokens_1.KnownToken.Response.context);
51
50
  const assets = resolve(tokens_1.KnownToken.Response.assets);
52
51
  const prepare = resolve(tokens_1.KnownToken.Response.prepare);
53
52
  const render = resolve(tokens_1.KnownToken.Response.render);
54
53
  const template = resolve(tokens_1.KnownToken.Response.template);
55
54
  return async function main() {
56
- utils_1.PageResponse.create()
55
+ new utils_1.PageResponse()
57
56
  .markup(await render(await prepare()))
58
- .script(assets.js)
59
- .styles(assets.css)
57
+ .assets(assets)
60
58
  .format(utils_1.PageResponse.defineFormat(context.req))
61
59
  .template(template)
62
60
  .send(context.res);
63
61
  };
64
- };
62
+ }
65
63
  exports.provideMain = provideMain;
64
+ /**
65
+ * Возвращает express-handler, создающий дочернее di-приложение при запросе.
66
+ * @param appFactory Фабрика di-приложения запроса.
67
+ * @return Обработчик.
68
+ */
66
69
  function HandlerProvider(appFactory) {
67
70
  return function provider(resolve) {
68
- const parent = resolve(application_1.Application.self);
71
+ const parent = resolve(di_1.CURRENT_APP);
69
72
  return function handler(req, res, next) {
70
73
  const app = appFactory();
71
74
  app.attach(parent);
@@ -1 +1 @@
1
- {"version":3,"file":"response.js","sourceRoot":"","sources":["../../../src/preset/node/response.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"response.js","sourceRoot":"","sources":["../../../src/preset/node/response.ts"],"names":[],"mappings":"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"}
package/tokens.d.ts CHANGED
@@ -1,41 +1,48 @@
1
1
  /// <reference types="react" />
2
2
  import type { Application } from 'express';
3
3
  import type { DefaultMiddleware, PageAssets, PageTemplate, ResponseContext } from './http-server/types';
4
- import type { SagaRunner } from './saga-runner/types';
4
+ import type { SagaExtendedMiddleware } from './utils/redux-saga';
5
5
  import type { Logger } from './logger/types';
6
6
  import type { HttpClientFactory } from './http-client/types';
7
7
  import type { BaseConfig } from './config/types';
8
- import type { Tracer } from './tracer/types';
8
+ import type { Tracer } from '@opentelemetry/api';
9
9
  import type { Cache } from './cache/types';
10
+ import type { BasicTracerProvider, SpanExporter } from '@opentelemetry/tracing';
11
+ import type { Resource } from '@opentelemetry/resources';
10
12
  export declare const KnownToken: {
11
13
  readonly Config: {
12
- readonly source: import("./container/types").Token<import("@humanwhocodes/env").Env>;
13
- readonly base: import("./container/types").Token<BaseConfig>;
14
+ readonly source: import("./di").Token<import("@humanwhocodes/env").Env>;
15
+ readonly base: import("./di").Token<BaseConfig>;
16
+ };
17
+ readonly cache: import("./di").Token<Cache>;
18
+ readonly logger: import("./di").Token<Logger>;
19
+ readonly sagaMiddleware: import("./di").Token<SagaExtendedMiddleware>;
20
+ readonly Tracing: {
21
+ readonly tracer: import("./di").Token<Tracer>;
22
+ readonly spanExporter: import("./di").Token<SpanExporter>;
23
+ readonly tracerProvider: import("./di").Token<BasicTracerProvider>;
24
+ readonly tracerProviderResource: import("./di").Token<Resource>;
14
25
  };
15
- readonly cache: import("./container/types").Token<Cache>;
16
- readonly logger: import("./container/types").Token<Logger>;
17
- readonly tracer: import("./container/types").Token<Tracer>;
18
26
  readonly Metrics: {
19
- readonly httpApp: import("./container/types").Token<Application>;
27
+ readonly httpApp: import("./di").Token<Application>;
20
28
  };
21
29
  readonly Http: {
22
30
  readonly Client: {
23
- readonly factory: import("./container/types").Token<HttpClientFactory>;
31
+ readonly factory: import("./di").Token<HttpClientFactory>;
24
32
  };
25
33
  readonly Server: {
26
- readonly factory: import("./container/types").Token<() => Application>;
34
+ readonly factory: import("./di").Token<() => Application>;
27
35
  readonly Defaults: {
28
- readonly middleware: import("./container/types").Token<DefaultMiddleware>;
36
+ readonly middleware: import("./di").Token<DefaultMiddleware>;
29
37
  };
30
38
  };
31
39
  };
32
40
  readonly Response: {
33
- readonly template: import("./container/types").Token<PageTemplate>;
34
- readonly context: import("./container/types").Token<ResponseContext>;
35
- readonly assets: import("./container/types").Token<PageAssets>;
36
- readonly prepare: import("./container/types").Token<() => JSX.Element | Promise<JSX.Element>>;
37
- readonly render: import("./container/types").Token<(element: JSX.Element) => string | Promise<string>>;
38
- readonly main: import("./container/types").Token<() => void>;
39
- readonly sagaRunner: import("./container/types").Token<SagaRunner>;
41
+ readonly template: import("./di").Token<PageTemplate>;
42
+ readonly context: import("./di").Token<ResponseContext>;
43
+ readonly assets: import("./di").Token<PageAssets>;
44
+ readonly prepare: import("./di").Token<() => JSX.Element | Promise<JSX.Element>>;
45
+ readonly render: import("./di").Token<(element: JSX.Element) => string | Promise<string>>;
46
+ readonly main: import("./di").Token<() => void>;
40
47
  };
41
48
  };
package/tokens.js CHANGED
@@ -1,44 +1,50 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.KnownToken = void 0;
4
- const container_1 = require("./container");
4
+ const di_1 = require("./di");
5
5
  exports.KnownToken = {
6
6
  // config
7
7
  Config: {
8
- source: (0, container_1.createToken)('config.source'),
9
- base: (0, container_1.createToken)('config.base'),
8
+ source: (0, di_1.createToken)('config.source'),
9
+ base: (0, di_1.createToken)('config.base'),
10
10
  },
11
11
  // cache
12
- cache: (0, container_1.createToken)('cache'),
12
+ cache: (0, di_1.createToken)('cache'),
13
13
  // logging
14
- logger: (0, container_1.createToken)('logger'),
14
+ logger: (0, di_1.createToken)('logger'),
15
+ // saga runner
16
+ sagaMiddleware: (0, di_1.createToken)('saga-middleware'),
15
17
  // tracing
16
- tracer: (0, container_1.createToken)('tracer'),
18
+ Tracing: {
19
+ tracer: (0, di_1.createToken)('tracing.tracer'),
20
+ spanExporter: (0, di_1.createToken)('tracing.span-exporter'),
21
+ tracerProvider: (0, di_1.createToken)('tracing.tracer-provider'),
22
+ tracerProviderResource: (0, di_1.createToken)('tracing.tracer-provider-resource'),
23
+ },
17
24
  // metrics
18
25
  Metrics: {
19
- httpApp: (0, container_1.createToken)('metrics.http-app'),
26
+ httpApp: (0, di_1.createToken)('metrics.http-app'),
20
27
  },
21
28
  // http
22
29
  Http: {
23
30
  Client: {
24
- factory: (0, container_1.createToken)('http.client.factory'),
31
+ factory: (0, di_1.createToken)('http.client.factory'),
25
32
  },
26
33
  Server: {
27
- factory: (0, container_1.createToken)('http.server.factory'),
34
+ factory: (0, di_1.createToken)('http.server.factory'),
28
35
  Defaults: {
29
- middleware: (0, container_1.createToken)('http.server.defaults.middleware'),
36
+ middleware: (0, di_1.createToken)('http.server.defaults.middleware'),
30
37
  },
31
38
  },
32
39
  },
33
40
  // scope: page response
34
41
  Response: {
35
- template: (0, container_1.createToken)('response/template'),
36
- context: (0, container_1.createToken)('response/context'),
37
- assets: (0, container_1.createToken)('response/assets'),
38
- prepare: (0, container_1.createToken)('response/prepare'),
39
- render: (0, container_1.createToken)('response/render'),
40
- main: (0, container_1.createToken)('response/main'),
41
- sagaRunner: (0, container_1.createToken)('response/saga-runner'),
42
+ template: (0, di_1.createToken)('response/template'),
43
+ context: (0, di_1.createToken)('response/context'),
44
+ assets: (0, di_1.createToken)('response/assets'),
45
+ prepare: (0, di_1.createToken)('response/prepare'),
46
+ render: (0, di_1.createToken)('response/render'),
47
+ main: (0, di_1.createToken)('response/main'),
42
48
  },
43
49
  };
44
50
  //# sourceMappingURL=tokens.js.map
package/tokens.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"tokens.js","sourceRoot":"","sources":["../src/tokens.ts"],"names":[],"mappings":";;;AAAA,2CAA0C;AAe7B,QAAA,UAAU,GAAG;IACxB,SAAS;IACT,MAAM,EAAE;QACN,MAAM,EAAE,IAAA,uBAAW,EAAe,eAAe,CAAC;QAClD,IAAI,EAAE,IAAA,uBAAW,EAAa,aAAa,CAAC;KAC7C;IAED,QAAQ;IACR,KAAK,EAAE,IAAA,uBAAW,EAAQ,OAAO,CAAC;IAElC,UAAU;IACV,MAAM,EAAE,IAAA,uBAAW,EAAS,QAAQ,CAAC;IAErC,UAAU;IACV,MAAM,EAAE,IAAA,uBAAW,EAAS,QAAQ,CAAC;IAErC,UAAU;IACV,OAAO,EAAE;QACP,OAAO,EAAE,IAAA,uBAAW,EAAc,kBAAkB,CAAC;KACtD;IAED,OAAO;IACP,IAAI,EAAE;QACJ,MAAM,EAAE;YACN,OAAO,EAAE,IAAA,uBAAW,EAAoB,qBAAqB,CAAC;SAC/D;QACD,MAAM,EAAE;YACN,OAAO,EAAE,IAAA,uBAAW,EAAoB,qBAAqB,CAAC;YAC9D,QAAQ,EAAE;gBACR,UAAU,EAAE,IAAA,uBAAW,EAAoB,iCAAiC,CAAC;aAC9E;SACF;KACF;IAED,uBAAuB;IACvB,QAAQ,EAAE;QACR,QAAQ,EAAE,IAAA,uBAAW,EAAe,mBAAmB,CAAC;QACxD,OAAO,EAAE,IAAA,uBAAW,EAAkB,kBAAkB,CAAC;QACzD,MAAM,EAAE,IAAA,uBAAW,EAAa,iBAAiB,CAAC;QAClD,OAAO,EAAE,IAAA,uBAAW,EAA2C,kBAAkB,CAAC;QAClF,MAAM,EAAE,IAAA,uBAAW,EAAqD,iBAAiB,CAAC;QAC1F,IAAI,EAAE,IAAA,uBAAW,EAAa,eAAe,CAAC;QAC9C,UAAU,EAAE,IAAA,uBAAW,EAAa,sBAAsB,CAAC;KAC5D;CACO,CAAC"}
1
+ {"version":3,"file":"tokens.js","sourceRoot":"","sources":["../src/tokens.ts"],"names":[],"mappings":";;;AAAA,6BAAmC;AAiBtB,QAAA,UAAU,GAAG;IACxB,SAAS;IACT,MAAM,EAAE;QACN,MAAM,EAAE,IAAA,gBAAW,EAAe,eAAe,CAAC;QAClD,IAAI,EAAE,IAAA,gBAAW,EAAa,aAAa,CAAC;KAC7C;IAED,QAAQ;IACR,KAAK,EAAE,IAAA,gBAAW,EAAQ,OAAO,CAAC;IAElC,UAAU;IACV,MAAM,EAAE,IAAA,gBAAW,EAAS,QAAQ,CAAC;IAErC,cAAc;IACd,cAAc,EAAE,IAAA,gBAAW,EAAyB,iBAAiB,CAAC;IAEtE,UAAU;IACV,OAAO,EAAE;QACP,MAAM,EAAE,IAAA,gBAAW,EAAS,gBAAgB,CAAC;QAC7C,YAAY,EAAE,IAAA,gBAAW,EAAe,uBAAuB,CAAC;QAChE,cAAc,EAAE,IAAA,gBAAW,EAAsB,yBAAyB,CAAC;QAC3E,sBAAsB,EAAE,IAAA,gBAAW,EAAW,kCAAkC,CAAC;KAClF;IAED,UAAU;IACV,OAAO,EAAE;QACP,OAAO,EAAE,IAAA,gBAAW,EAAc,kBAAkB,CAAC;KACtD;IAED,OAAO;IACP,IAAI,EAAE;QACJ,MAAM,EAAE;YACN,OAAO,EAAE,IAAA,gBAAW,EAAoB,qBAAqB,CAAC;SAC/D;QACD,MAAM,EAAE;YACN,OAAO,EAAE,IAAA,gBAAW,EAAoB,qBAAqB,CAAC;YAC9D,QAAQ,EAAE;gBACR,UAAU,EAAE,IAAA,gBAAW,EAAoB,iCAAiC,CAAC;aAC9E;SACF;KACF;IAED,uBAAuB;IACvB,QAAQ,EAAE;QACR,QAAQ,EAAE,IAAA,gBAAW,EAAe,mBAAmB,CAAC;QACxD,OAAO,EAAE,IAAA,gBAAW,EAAkB,kBAAkB,CAAC;QACzD,MAAM,EAAE,IAAA,gBAAW,EAAa,iBAAiB,CAAC;QAClD,OAAO,EAAE,IAAA,gBAAW,EAA2C,kBAAkB,CAAC;QAClF,MAAM,EAAE,IAAA,gBAAW,EAAqD,iBAAiB,CAAC;QAC1F,IAAI,EAAE,IAAA,gBAAW,EAAa,eAAe,CAAC;KAC/C;CACO,CAAC"}
@@ -0,0 +1,9 @@
1
+ import type { BaseConfig } from '../config/types';
2
+ import { Resource } from '@opentelemetry/resources';
3
+ /**
4
+ * Возвращает ресурс для BasicTracerProvider, заполненный данными по соглашению.
5
+ * Может быть дополнен с помощью метода merge.
6
+ * @param config Конфиг.
7
+ * @return Ресурс для провайдера.
8
+ */
9
+ export declare function getConventionalResource(config: BaseConfig): Resource;
@@ -0,0 +1,20 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.getConventionalResource = void 0;
4
+ const resources_1 = require("@opentelemetry/resources");
5
+ const semantic_conventions_1 = require("@opentelemetry/semantic-conventions");
6
+ /**
7
+ * Возвращает ресурс для BasicTracerProvider, заполненный данными по соглашению.
8
+ * Может быть дополнен с помощью метода merge.
9
+ * @param config Конфиг.
10
+ * @return Ресурс для провайдера.
11
+ */
12
+ function getConventionalResource(config) {
13
+ return new resources_1.Resource({
14
+ [semantic_conventions_1.SemanticResourceAttributes.SERVICE_NAME]: config.appName,
15
+ [semantic_conventions_1.SemanticResourceAttributes.SERVICE_VERSION]: config.appVersion,
16
+ [semantic_conventions_1.SemanticResourceAttributes.DEPLOYMENT_ENVIRONMENT]: config.env,
17
+ });
18
+ }
19
+ exports.getConventionalResource = getConventionalResource;
20
+ //# sourceMappingURL=index.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/tracing/index.ts"],"names":[],"mappings":";;;AACA,wDAAoD;AACpD,8EAAiF;AAEjF;;;;;GAKG;AACH,SAAgB,uBAAuB,CAAC,MAAkB;IACxD,OAAO,IAAI,oBAAQ,CAAC;QAClB,CAAC,iDAA0B,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC,OAAO;QACzD,CAAC,iDAA0B,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC,UAAU;QAC/D,CAAC,iDAA0B,CAAC,sBAAsB,CAAC,EAAE,MAAM,CAAC,GAAG;KAChE,CAAC,CAAC;AACL,CAAC;AAND,0DAMC"}
@@ -22,6 +22,7 @@ class ErrorBoundary extends react_1.default.Component {
22
22
  }
23
23
  /** @inheritdoc */
24
24
  componentDidCatch(error, errorInfo) {
25
+ // @todo добавить возможность брать onError из специального контекста (это упростит передачу из di-контейнера)
25
26
  const { onError } = this.props;
26
27
  onError?.(error, errorInfo);
27
28
  }
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/utils/react/error-handlers/index.tsx"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAa1B;;GAEG;AACH,MAAa,aAAc,SAAQ,eAAK,CAAC,SAAuC;IAC9E;;OAEG;IACH,YAAY,KAAY;QACtB,KAAK,CAAC,KAAK,CAAC,CAAC;QAEb,IAAI,CAAC,KAAK,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;IACnC,CAAC;IAED,kBAAkB;IAClB,MAAM,CAAC,wBAAwB;QAC7B,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC5B,CAAC;IAED,kBAAkB;IAClB,iBAAiB,CAAC,KAAY,EAAE,SAA0B;QACxD,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAE/B,OAAO,EAAE,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IAC9B,CAAC;IAED;;;OAGG;IACH,MAAM;QACJ,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAE1C,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC;IACnD,CAAC;CACF;AA/BD,sCA+BC;AAED;;;;;GAKG;AACI,MAAM,YAAY,GAAG,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAS,EAAE,EAAE,CAAC,CACtE,8BAAC,eAAK,CAAC,QAAQ,IAAC,QAAQ,EAAE,QAAQ;IAChC,8BAAC,aAAa,IAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,IAChD,QAAQ,CACK,CACD,CAClB,CAAC;AANW,QAAA,YAAY,gBAMvB"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/utils/react/error-handlers/index.tsx"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAa1B;;GAEG;AACH,MAAa,aAAc,SAAQ,eAAK,CAAC,SAAuC;IAC9E;;OAEG;IACH,YAAY,KAAY;QACtB,KAAK,CAAC,KAAK,CAAC,CAAC;QAEb,IAAI,CAAC,KAAK,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;IACnC,CAAC;IAED,kBAAkB;IAClB,MAAM,CAAC,wBAAwB;QAC7B,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC5B,CAAC;IAED,kBAAkB;IAClB,iBAAiB,CAAC,KAAY,EAAE,SAA0B;QACxD,8GAA8G;QAC9G,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAE/B,OAAO,EAAE,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IAC9B,CAAC;IAED;;;OAGG;IACH,MAAM;QACJ,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAE1C,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC;IACnD,CAAC;CACF;AAhCD,sCAgCC;AAED;;;;;GAKG;AACI,MAAM,YAAY,GAAG,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAS,EAAE,EAAE,CAAC,CACtE,8BAAC,eAAK,CAAC,QAAQ,IAAC,QAAQ,EAAE,QAAQ;IAChC,8BAAC,aAAa,IAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,IAChD,QAAQ,CACK,CACD,CAClB,CAAC;AANW,QAAA,YAAY,gBAMvB"}
@@ -0,0 +1,3 @@
1
+ export type { SagaExtendedMiddleware } from './types';
2
+ export { takeChain } from './take-chain';
3
+ export { createSagaMiddleware } from './middleware';
@@ -0,0 +1,8 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.createSagaMiddleware = exports.takeChain = void 0;
4
+ var take_chain_1 = require("./take-chain");
5
+ Object.defineProperty(exports, "takeChain", { enumerable: true, get: function () { return take_chain_1.takeChain; } });
6
+ var middleware_1 = require("./middleware");
7
+ Object.defineProperty(exports, "createSagaMiddleware", { enumerable: true, get: function () { return middleware_1.createSagaMiddleware; } });
8
+ //# sourceMappingURL=index.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/redux-saga/index.ts"],"names":[],"mappings":";;;AACA,2CAAyC;AAAhC,uGAAA,SAAS,OAAA;AAClB,2CAAoD;AAA3C,kHAAA,oBAAoB,OAAA"}
@@ -0,0 +1,9 @@
1
+ import { SagaExtendedMiddleware } from './types';
2
+ import { Logger } from '../../logger';
3
+ /**
4
+ * Возвращает расширенную версию SagaMiddleware.
5
+ * @param logger Logger.
6
+ * @return Middleware.
7
+ */
8
+ declare function createSagaExtendedMiddleware(logger: Logger): SagaExtendedMiddleware;
9
+ export { createSagaExtendedMiddleware as createSagaMiddleware };