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

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 (63) 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/di/application.d.ts +6 -0
  5. package/{container → di}/application.js +16 -8
  6. package/di/application.js.map +1 -0
  7. package/di/container.d.ts +6 -0
  8. package/di/container.js +49 -0
  9. package/di/container.js.map +1 -0
  10. package/di/errors.d.ts +21 -0
  11. package/di/errors.js +33 -0
  12. package/di/errors.js.map +1 -0
  13. package/di/index.d.ts +6 -0
  14. package/di/index.js +16 -0
  15. package/di/index.js.map +1 -0
  16. package/{preset/index.d.ts → di/preset.d.ts} +3 -1
  17. package/{preset/index.js → di/preset.js} +1 -1
  18. package/di/preset.js.map +1 -0
  19. package/di/token.d.ts +7 -0
  20. package/di/token.js +17 -0
  21. package/di/token.js.map +1 -0
  22. package/di/types.d.ts +32 -0
  23. package/{container → di}/types.js +0 -0
  24. package/{preset → di}/types.js.map +1 -1
  25. package/http-client/sauce/index.d.ts +27 -0
  26. package/http-client/sauce/index.js +33 -0
  27. package/http-client/sauce/index.js.map +1 -0
  28. package/http-client/utils.d.ts +0 -27
  29. package/http-client/utils.js +1 -30
  30. package/http-client/utils.js.map +1 -1
  31. package/http-server/middleware/tracing.d.ts +8 -2
  32. package/http-server/middleware/tracing.js +22 -3
  33. package/http-server/middleware/tracing.js.map +1 -1
  34. package/package.json +2 -2
  35. package/preset/node/index.d.ts +6 -2
  36. package/preset/node/index.js +52 -21
  37. package/preset/node/index.js.map +1 -1
  38. package/preset/node/response.d.ts +1 -3
  39. package/preset/node/response.js +3 -4
  40. package/preset/node/response.js.map +1 -1
  41. package/tokens.d.ts +24 -17
  42. package/tokens.js +22 -17
  43. package/tokens.js.map +1 -1
  44. package/tracing/utils.d.ts +9 -0
  45. package/tracing/utils.js +22 -0
  46. package/tracing/utils.js.map +1 -0
  47. package/config/index.js.map +0 -1
  48. package/container/application.d.ts +0 -25
  49. package/container/application.js.map +0 -1
  50. package/container/index.d.ts +0 -18
  51. package/container/index.js +0 -74
  52. package/container/index.js.map +0 -1
  53. package/container/types.d.ts +0 -14
  54. package/container/types.js.map +0 -1
  55. package/preset/index.js.map +0 -1
  56. package/preset/types.d.ts +0 -7
  57. package/preset/types.js +0 -3
  58. package/tracer/node.d.ts +0 -10
  59. package/tracer/node.js +0 -38
  60. package/tracer/node.js.map +0 -1
  61. package/tracer/types.d.ts +0 -2
  62. package/tracer/types.js +0 -3
  63. package/tracer/types.js.map +0 -1
File without changes
@@ -17,4 +17,4 @@ function createBaseConfig(source) {
17
17
  };
18
18
  }
19
19
  exports.createBaseConfig = createBaseConfig;
20
- //# sourceMappingURL=index.js.map
20
+ //# sourceMappingURL=base.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"base.js","sourceRoot":"","sources":["../../src/config/base.ts"],"names":[],"mappings":";;;AAEA;;;;GAIG;AACH,SAAgB,gBAAgB,CAAC,MAAoB;IACnD,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IACvC,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAC3C,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IAEjD,OAAO;QACL,GAAG;QACH,OAAO;QACP,UAAU;KACX,CAAC;AACJ,CAAC;AAVD,4CAUC"}
@@ -0,0 +1,6 @@
1
+ import type { Application, Token } from './types';
2
+ /**
3
+ * Токен, с помощью которого можно достать из приложения само приложение.
4
+ */
5
+ export declare const CURRENT_APP: Token<never>;
6
+ export declare function createApplication(): Application;
@@ -1,8 +1,14 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.Application = void 0;
4
- const _1 = require(".");
5
- class Application {
3
+ exports.createApplication = exports.CURRENT_APP = void 0;
4
+ const errors_1 = require("./errors");
5
+ const token_1 = require("./token");
6
+ const container_1 = require("./container");
7
+ /**
8
+ * Токен, с помощью которого можно достать из приложения само приложение.
9
+ */
10
+ exports.CURRENT_APP = (0, token_1.createToken)('application/self');
11
+ class ApplicationImplementation {
6
12
  constructor() {
7
13
  this.providers = new Map();
8
14
  this.presets = [];
@@ -22,7 +28,7 @@ class Application {
22
28
  return this.getContainer().get(token);
23
29
  }
24
30
  catch (error) {
25
- if (error instanceof _1.NothingBoundError && this.parent) {
31
+ if (error instanceof errors_1.NothingBoundError && this.parent) {
26
32
  return this.parent.get(token);
27
33
  }
28
34
  else {
@@ -37,8 +43,8 @@ class Application {
37
43
  return this.container;
38
44
  }
39
45
  configureContainer() {
40
- const container = (0, _1.createContainer)();
41
- container.set(Application.self, () => this);
46
+ const container = (0, container_1.createContainer)();
47
+ container.set(exports.CURRENT_APP, () => this);
42
48
  for (const preset of this.presets) {
43
49
  preset.apply(this);
44
50
  }
@@ -58,6 +64,8 @@ class Application {
58
64
  fn(...tokens.map(token => this.get(token)));
59
65
  }
60
66
  }
61
- exports.Application = Application;
62
- Application.self = (0, _1.createToken)('application/self');
67
+ function createApplication() {
68
+ return new ApplicationImplementation();
69
+ }
70
+ exports.createApplication = createApplication;
63
71
  //# sourceMappingURL=application.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"application.js","sourceRoot":"","sources":["../../src/di/application.ts"],"names":[],"mappings":";;;AAWA,qCAA6C;AAC7C,mCAAsC;AACtC,2CAA8C;AAE9C;;GAEG;AACU,QAAA,WAAW,GAAG,IAAA,mBAAW,EAAC,kBAAkB,CAAC,CAAC;AAE3D,MAAM,yBAAyB;IAM7B;QACE,IAAI,CAAC,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;QAC3B,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;IACpB,CAAC;IAED,IAAI,CAAI,KAAe;QACrB,OAAO;YACL,OAAO,EAAE,KAAK,CAAC,EAAE;gBACf,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC;YACzC,CAAC;YACD,UAAU,EAAE,QAAQ,CAAC,EAAE;gBACrB,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;YACtC,CAAC;SACF,CAAC;IACJ,CAAC;IAED,GAAG,CAAI,KAAe;QACpB,IAAI;YACF,OAAO,IAAI,CAAC,YAAY,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SACvC;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,KAAK,YAAY,0BAAiB,IAAI,IAAI,CAAC,MAAM,EAAE;gBACrD,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;aAC/B;iBAAM;gBACL,MAAM,KAAK,CAAC;aACb;SACF;IACH,CAAC;IAEO,YAAY;QAClB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACnB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC;SAC5C;QAED,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAEO,kBAAkB;QACxB,MAAM,SAAS,GAAG,IAAA,2BAAe,GAAE,CAAC;QAEpC,SAAS,CAAC,GAAG,CAAC,mBAAW,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;QAEvC,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,OAAO,EAAE;YACjC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;SACpB;QAED,MAAM,OAAO,GAAY,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAElD,KAAK,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,IAAI,IAAI,CAAC,SAAS,EAAE;YAC9C,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;SAC/C;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,CAAC,MAAmB;QACxB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAED,MAAM,CAAC,MAAc;QACnB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC5B,CAAC;IAED,MAAM,CACJ,MAAmB,EACnB,EAA0C;QAE1C,EAAE,CAAC,GAAI,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAS,CAAC,CAAC;IACvD,CAAC;CACF;AAED,SAAgB,iBAAiB;IAC/B,OAAO,IAAI,yBAAyB,EAAE,CAAC;AACzC,CAAC;AAFD,8CAEC"}
@@ -0,0 +1,6 @@
1
+ import type { Container } from './types';
2
+ /**
3
+ * Возвращает новый DI-контейнер.
4
+ * @return DI-контейнер.
5
+ */
6
+ export declare function createContainer(): Container;
@@ -0,0 +1,49 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.createContainer = void 0;
4
+ const errors_1 = require("./errors");
5
+ class ContainerImplementation {
6
+ constructor() {
7
+ this.cache = new Map();
8
+ this.registry = new Map();
9
+ }
10
+ set(token, provider) {
11
+ this.registry.set(token._key, provider);
12
+ }
13
+ get(token) {
14
+ return this.resolve(token, []);
15
+ }
16
+ resolve(token, chain) {
17
+ if (chain.includes(token)) {
18
+ throw new errors_1.CircularDependencyError([...chain, token]);
19
+ }
20
+ else {
21
+ chain.push(token);
22
+ }
23
+ if (this.cache.has(token._key)) {
24
+ return this.cache.get(token._key);
25
+ }
26
+ else if (this.registry.has(token._key)) {
27
+ const provider = this.registry.get(token._key);
28
+ if (typeof provider !== 'function') {
29
+ throw new Error('Provider is not a function');
30
+ }
31
+ const value = provider(otherToken => this.resolve(otherToken, chain));
32
+ // всегда как singleton
33
+ this.cache.set(token._key, value);
34
+ return value;
35
+ }
36
+ else {
37
+ throw new errors_1.NothingBoundError(token._key);
38
+ }
39
+ }
40
+ }
41
+ /**
42
+ * Возвращает новый DI-контейнер.
43
+ * @return DI-контейнер.
44
+ */
45
+ function createContainer() {
46
+ return new ContainerImplementation();
47
+ }
48
+ exports.createContainer = createContainer;
49
+ //# sourceMappingURL=container.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"container.js","sourceRoot":"","sources":["../../src/di/container.ts"],"names":[],"mappings":";;;AAEA,qCAAsE;AAEtE,MAAM,uBAAuB;IAI3B;QACE,IAAI,CAAC,KAAK,GAAG,IAAI,GAAG,EAAe,CAAC;QACpC,IAAI,CAAC,QAAQ,GAAG,IAAI,GAAG,EAAyB,CAAC;IACnD,CAAC;IAED,GAAG,CAAI,KAAe,EAAE,QAAqB;QAC3C,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC1C,CAAC;IAED,GAAG,CAAI,KAAe;QACpB,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IACjC,CAAC;IAEO,OAAO,CAAI,KAAe,EAAE,KAAmB;QACrD,IAAI,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;YACzB,MAAM,IAAI,gCAAuB,CAAC,CAAC,GAAG,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;SACtD;aAAM;YACL,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SACnB;QAED,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;YAC9B,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;SACnC;aAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;YACxC,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAE/C,IAAI,OAAO,QAAQ,KAAK,UAAU,EAAE;gBAClC,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;aAC/C;YAED,MAAM,KAAK,GAAG,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC,CAAC;YAEtE,uBAAuB;YACvB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YAElC,OAAO,KAAK,CAAC;SACd;aAAM;YACL,MAAM,IAAI,0BAAiB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;SACzC;IACH,CAAC;CACF;AAED;;;GAGG;AACH,SAAgB,eAAe;IAC7B,OAAO,IAAI,uBAAuB,EAAE,CAAC;AACvC,CAAC;AAFD,0CAEC"}
package/di/errors.d.ts ADDED
@@ -0,0 +1,21 @@
1
+ import type { Token } from './types';
2
+ /**
3
+ * Ошибка, сообщающая, что в контейнере нет сервиса по заданному ключу.
4
+ */
5
+ export declare class NothingBoundError extends Error {
6
+ /**
7
+ * Конструктор.
8
+ * @param key Ключ целевой зависимости.
9
+ */
10
+ constructor(key: symbol);
11
+ }
12
+ /**
13
+ * Ошибка, сообщающая, что обнаружена циклическая зависимость.
14
+ */
15
+ export declare class CircularDependencyError extends Error {
16
+ /**
17
+ * Конструктор.
18
+ * @param trace Список токенов, в котором обнаружен цикл.
19
+ */
20
+ constructor(trace: Token<any>[]);
21
+ }
package/di/errors.js ADDED
@@ -0,0 +1,33 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.CircularDependencyError = exports.NothingBoundError = void 0;
4
+ /**
5
+ * Ошибка, сообщающая, что в контейнере нет сервиса по заданному ключу.
6
+ */
7
+ class NothingBoundError extends Error {
8
+ /**
9
+ * Конструктор.
10
+ * @param key Ключ целевой зависимости.
11
+ */
12
+ constructor(key) {
13
+ super(`Nothing bound to ${String(key)}`);
14
+ this.name = 'NothingBoundError';
15
+ }
16
+ }
17
+ exports.NothingBoundError = NothingBoundError;
18
+ /**
19
+ * Ошибка, сообщающая, что обнаружена циклическая зависимость.
20
+ */
21
+ class CircularDependencyError extends Error {
22
+ /**
23
+ * Конструктор.
24
+ * @param trace Список токенов, в котором обнаружен цикл.
25
+ */
26
+ constructor(trace) {
27
+ const names = trace.map(token => String(token._key)).join(' >> ');
28
+ super(`Circular dependency found, trace: ${names}`);
29
+ this.name = 'CircularDependencyError';
30
+ }
31
+ }
32
+ exports.CircularDependencyError = CircularDependencyError;
33
+ //# sourceMappingURL=errors.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/di/errors.ts"],"names":[],"mappings":";;;AAEA;;GAEG;AACH,MAAa,iBAAkB,SAAQ,KAAK;IAC1C;;;OAGG;IACH,YAAY,GAAW;QACrB,KAAK,CAAC,oBAAoB,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACzC,IAAI,CAAC,IAAI,GAAG,mBAAmB,CAAC;IAClC,CAAC;CACF;AATD,8CASC;AAED;;GAEG;AACH,MAAa,uBAAwB,SAAQ,KAAK;IAChD;;;OAGG;IACH,YAAY,KAAmB;QAC7B,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAClE,KAAK,CAAC,qCAAqC,KAAK,EAAE,CAAC,CAAC;QACpD,IAAI,CAAC,IAAI,GAAG,yBAAyB,CAAC;IACxC,CAAC;CACF;AAVD,0DAUC"}
package/di/index.d.ts ADDED
@@ -0,0 +1,6 @@
1
+ export { Token, Resolve, Provider, Container, Application, Preset } from './types';
2
+ export { NothingBoundError, CircularDependencyError } from './errors';
3
+ export { createToken } from './token';
4
+ export { createContainer } from './container';
5
+ export { createPreset } from './preset';
6
+ export { createApplication, CURRENT_APP } from './application';
package/di/index.js ADDED
@@ -0,0 +1,16 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.CURRENT_APP = exports.createApplication = exports.createPreset = exports.createContainer = exports.createToken = exports.CircularDependencyError = exports.NothingBoundError = void 0;
4
+ var errors_1 = require("./errors");
5
+ Object.defineProperty(exports, "NothingBoundError", { enumerable: true, get: function () { return errors_1.NothingBoundError; } });
6
+ Object.defineProperty(exports, "CircularDependencyError", { enumerable: true, get: function () { return errors_1.CircularDependencyError; } });
7
+ var token_1 = require("./token");
8
+ Object.defineProperty(exports, "createToken", { enumerable: true, get: function () { return token_1.createToken; } });
9
+ var container_1 = require("./container");
10
+ Object.defineProperty(exports, "createContainer", { enumerable: true, get: function () { return container_1.createContainer; } });
11
+ var preset_1 = require("./preset");
12
+ Object.defineProperty(exports, "createPreset", { enumerable: true, get: function () { return preset_1.createPreset; } });
13
+ var application_1 = require("./application");
14
+ Object.defineProperty(exports, "createApplication", { enumerable: true, get: function () { return application_1.createApplication; } });
15
+ Object.defineProperty(exports, "CURRENT_APP", { enumerable: true, get: function () { return application_1.CURRENT_APP; } });
16
+ //# sourceMappingURL=index.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/di/index.ts"],"names":[],"mappings":";;;AACA,mCAAsE;AAA7D,2GAAA,iBAAiB,OAAA;AAAE,iHAAA,uBAAuB,OAAA;AACnD,iCAAsC;AAA7B,oGAAA,WAAW,OAAA;AACpB,yCAA8C;AAArC,4GAAA,eAAe,OAAA;AACxB,mCAAwC;AAA/B,sGAAA,YAAY,OAAA;AACrB,6CAA+D;AAAtD,gHAAA,iBAAiB,OAAA;AAAE,0GAAA,WAAW,OAAA"}
@@ -1,7 +1,9 @@
1
- import type { Preset, PresetEntry } from './types';
1
+ import type { Provider, Token, Preset } from './types';
2
+ declare type PresetEntry<T = any> = [Token<T>, Provider<T>];
2
3
  /**
3
4
  * Возвращает новый "preset" приложения - набор предустановленных компонентов которые можно переопределять.
4
5
  * @param defaults Предустановленные зависимости.
5
6
  * @return Preset.
6
7
  */
7
8
  export declare function createPreset(defaults: PresetEntry[]): Preset;
9
+ export {};
@@ -22,4 +22,4 @@ function createPreset(defaults) {
22
22
  return preset;
23
23
  }
24
24
  exports.createPreset = createPreset;
25
- //# sourceMappingURL=index.js.map
25
+ //# sourceMappingURL=preset.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"preset.js","sourceRoot":"","sources":["../../src/di/preset.ts"],"names":[],"mappings":";;;AAIA;;;;GAIG;AACH,SAAgB,YAAY,CAAC,QAAuB;IAClD,MAAM,QAAQ,GAAG,IAAI,GAAG,CAA4B,QAAQ,CAAC,CAAC;IAE9D,MAAM,MAAM,GAAG;QACb,QAAQ,EAAE,CAAI,KAAe,EAAE,QAAqB,EAAE,EAAE;YACtD,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;YAC9B,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,KAAK,EAAE,CAAC,GAAgB,EAAE,EAAE;YAC1B,KAAK,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,IAAI,QAAQ,EAAE;gBACxC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;aACtC;QACH,CAAC;KACF,CAAC;IAEF,OAAO,MAAM,CAAC;AAChB,CAAC;AAjBD,oCAiBC"}
package/di/token.d.ts ADDED
@@ -0,0 +1,7 @@
1
+ import { Token } from './types';
2
+ /**
3
+ * Возвращает новый токен.
4
+ * @param name Имя токена для отладки в случае ошибок.
5
+ * @return Токен.
6
+ */
7
+ export declare function createToken<T = never>(name?: string): Token<T>;
package/di/token.js ADDED
@@ -0,0 +1,17 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.createToken = void 0;
4
+ /**
5
+ * Возвращает новый токен.
6
+ * @param name Имя токена для отладки в случае ошибок.
7
+ * @return Токен.
8
+ */
9
+ function createToken(name) {
10
+ const key = Symbol(name);
11
+ return {
12
+ _key: key,
13
+ _resolve: source => source.get(key),
14
+ };
15
+ }
16
+ exports.createToken = createToken;
17
+ //# sourceMappingURL=token.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"token.js","sourceRoot":"","sources":["../../src/di/token.ts"],"names":[],"mappings":";;;AAEA;;;;GAIG;AACH,SAAgB,WAAW,CAAY,IAAa;IAClD,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;IAEzB,OAAO;QACL,IAAI,EAAE,GAAG;QACT,QAAQ,EAAE,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC;KACpC,CAAC;AACJ,CAAC;AAPD,kCAOC"}
package/di/types.d.ts ADDED
@@ -0,0 +1,32 @@
1
+ export interface Token<T> {
2
+ readonly _key: symbol;
3
+ readonly _resolve: (registry: Map<symbol, any>) => T;
4
+ }
5
+ export interface Resolve {
6
+ <T>(token: Token<T>): T;
7
+ }
8
+ export interface Provider<T> {
9
+ (resolve: Resolve): T;
10
+ }
11
+ export interface Container {
12
+ set: <T = never>(token: Token<T>, provider: Provider<T>) => void;
13
+ get: Resolve;
14
+ }
15
+ export interface Binding<T> {
16
+ toValue: (value: T) => void;
17
+ toProvider: (provider: Provider<T>) => void;
18
+ }
19
+ export declare type ExtractType<T extends readonly Token<any>[]> = {
20
+ [index in keyof T]: T[index] extends T[number] ? ReturnType<T[index]['_resolve']> : never;
21
+ };
22
+ export interface Application {
23
+ preset(preset: Preset): void;
24
+ attach(parent: Application): void;
25
+ bind<T>(token: Token<T>): Binding<T>;
26
+ get<T>(token: Token<T>): T;
27
+ invoke<Tokens extends readonly Token<any>[]>(tokens: [...Tokens], fn: (...args: ExtractType<Tokens>) => void): void;
28
+ }
29
+ export interface Preset {
30
+ override: <T>(token: Token<T>, provider: Provider<T>) => this;
31
+ apply: (app: Application) => void;
32
+ }
File without changes
@@ -1 +1 @@
1
- {"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/preset/types.ts"],"names":[],"mappings":""}
1
+ {"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/di/types.ts"],"names":[],"mappings":""}
@@ -0,0 +1,27 @@
1
+ import type { AxiosInstance } from 'axios';
2
+ import type { AxiosInstanceWrapper, MethodName } from 'middleware-axios';
3
+ export declare type SauceResponse<T = any> = {
4
+ ok: true;
5
+ data: T;
6
+ } | {
7
+ ok: false;
8
+ error: any;
9
+ };
10
+ export interface SauceMethod<K extends MethodName> {
11
+ <T>(...args: Parameters<AxiosInstanceWrapper[K]>): Promise<SauceResponse<T>>;
12
+ }
13
+ export interface Sauce {
14
+ readonly get: SauceMethod<'get'>;
15
+ readonly delete: SauceMethod<'delete'>;
16
+ readonly head: SauceMethod<'head'>;
17
+ readonly options: SauceMethod<'options'>;
18
+ readonly post: SauceMethod<'post'>;
19
+ readonly put: SauceMethod<'put'>;
20
+ readonly patch: SauceMethod<'patch'>;
21
+ }
22
+ /**
23
+ * Оборачивает экземпляр axios. Все методы обертки возвращают promise, который никогда не попадают в состояние rejected.
24
+ * @param instance Экземпляр axios или AxiosInstanceWrapper.
25
+ * @return Обертка.
26
+ */
27
+ export declare function sauce(instance: AxiosInstance | AxiosInstanceWrapper): Sauce;
@@ -0,0 +1,33 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.sauce = void 0;
4
+ /**
5
+ * Оборачивает экземпляр axios. Все методы обертки возвращают promise, который никогда не попадают в состояние rejected.
6
+ * @param instance Экземпляр axios или AxiosInstanceWrapper.
7
+ * @return Обертка.
8
+ */
9
+ function sauce(instance) {
10
+ // eslint-disable-next-line require-jsdoc, jsdoc/require-jsdoc
11
+ function createMethod(methodName) {
12
+ return async function (...args) {
13
+ try {
14
+ const response = await instance[methodName](...args);
15
+ return { ok: true, data: response.data };
16
+ }
17
+ catch (error) {
18
+ return { ok: false, error };
19
+ }
20
+ };
21
+ }
22
+ return {
23
+ get: createMethod('get'),
24
+ delete: createMethod('delete'),
25
+ head: createMethod('head'),
26
+ options: createMethod('options'),
27
+ post: createMethod('post'),
28
+ put: createMethod('put'),
29
+ patch: createMethod('patch'),
30
+ };
31
+ }
32
+ exports.sauce = sauce;
33
+ //# sourceMappingURL=index.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/http-client/sauce/index.ts"],"names":[],"mappings":";;;AA4BA;;;;GAIG;AACH,SAAgB,KAAK,CAAC,QAA8C;IAClE,8DAA8D;IAC9D,SAAS,YAAY,CAAyB,UAAe;QAC3D,OAAO,KAAK,WACV,GAAG,IAAoC;YAEvC,IAAI;gBACF,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,UAAU,CAAC,CAAC,GAAI,IAAc,CAAC,CAAC;gBAChE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAC;aAC1C;YAAC,OAAO,KAAK,EAAE;gBACd,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;aAC7B;QACH,CAAC,CAAC;IACJ,CAAC;IAED,OAAO;QACL,GAAG,EAAE,YAAY,CAAC,KAAK,CAAC;QACxB,MAAM,EAAE,YAAY,CAAC,QAAQ,CAAC;QAC9B,IAAI,EAAE,YAAY,CAAC,MAAM,CAAC;QAC1B,OAAO,EAAE,YAAY,CAAC,SAAS,CAAC;QAChC,IAAI,EAAE,YAAY,CAAC,MAAM,CAAC;QAC1B,GAAG,EAAE,YAAY,CAAC,KAAK,CAAC;QACxB,KAAK,EAAE,YAAY,CAAC,OAAO,CAAC;KAC7B,CAAC;AACJ,CAAC;AAxBD,sBAwBC"}
@@ -1,32 +1,5 @@
1
1
  import type { Request } from 'express';
2
2
  import type { BaseConfig } from '../config/types';
3
- import type { AxiosInstance } from 'axios';
4
- import type { AxiosInstanceWrapper, MethodName } from 'middleware-axios';
5
- export declare type SauceResponse<T = any> = {
6
- ok: true;
7
- data: T;
8
- } | {
9
- ok: false;
10
- error: any;
11
- };
12
- export interface SauceMethod<K extends MethodName> {
13
- <T>(...args: Parameters<AxiosInstanceWrapper[K]>): Promise<SauceResponse<T>>;
14
- }
15
- export interface Sauce {
16
- readonly get: SauceMethod<'get'>;
17
- readonly delete: SauceMethod<'delete'>;
18
- readonly head: SauceMethod<'head'>;
19
- readonly options: SauceMethod<'options'>;
20
- readonly post: SauceMethod<'post'>;
21
- readonly put: SauceMethod<'put'>;
22
- readonly patch: SauceMethod<'patch'>;
23
- }
24
- /**
25
- * Оборачивает экземпляр axios. Все методы обертки возвращают promise, который никогда не попадают в состояние rejected.
26
- * @param instance Экземпляр axios или AxiosInstanceWrapper.
27
- * @return Обертка.
28
- */
29
- export declare function sauce(instance: AxiosInstance | AxiosInstanceWrapper): Sauce;
30
3
  /**
31
4
  * Формирует заголовки для исходящих запросов с сервера по соглашению.
32
5
  * @param config Конфиг.
@@ -1,36 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.getRequestHeaders = exports.sauce = void 0;
3
+ exports.getRequestHeaders = void 0;
4
4
  const utils_1 = require("../http-server/utils");
5
- /**
6
- * Оборачивает экземпляр axios. Все методы обертки возвращают promise, который никогда не попадают в состояние rejected.
7
- * @param instance Экземпляр axios или AxiosInstanceWrapper.
8
- * @return Обертка.
9
- */
10
- function sauce(instance) {
11
- // eslint-disable-next-line require-jsdoc, jsdoc/require-jsdoc
12
- function createMethod(methodName) {
13
- return async function (...args) {
14
- try {
15
- const response = await instance[methodName](...args);
16
- return { ok: true, data: response.data };
17
- }
18
- catch (error) {
19
- return { ok: false, error };
20
- }
21
- };
22
- }
23
- return {
24
- get: createMethod('get'),
25
- delete: createMethod('delete'),
26
- head: createMethod('head'),
27
- options: createMethod('options'),
28
- post: createMethod('post'),
29
- put: createMethod('put'),
30
- patch: createMethod('patch'),
31
- };
32
- }
33
- exports.sauce = sauce;
34
5
  /**
35
6
  * Формирует заголовки для исходящих запросов с сервера по соглашению.
36
7
  * @param config Конфиг.
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/http-client/utils.ts"],"names":[],"mappings":";;;AAAA,gDAAuE;AA+BvE;;;;GAIG;AACH,SAAgB,KAAK,CAAC,QAA8C;IAClE,8DAA8D;IAC9D,SAAS,YAAY,CAAyB,UAAe;QAC3D,OAAO,KAAK,WACV,GAAG,IAAoC;YAEvC,IAAI;gBACF,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,UAAU,CAAC,CAAC,GAAI,IAAc,CAAC,CAAC;gBAChE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAC;aAC1C;YAAC,OAAO,KAAK,EAAE;gBACd,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;aAC7B;QACH,CAAC,CAAC;IACJ,CAAC;IAED,OAAO;QACL,GAAG,EAAE,YAAY,CAAC,KAAK,CAAC;QACxB,MAAM,EAAE,YAAY,CAAC,QAAQ,CAAC;QAC9B,IAAI,EAAE,YAAY,CAAC,MAAM,CAAC;QAC1B,OAAO,EAAE,YAAY,CAAC,SAAS,CAAC;QAChC,IAAI,EAAE,YAAY,CAAC,MAAM,CAAC;QAC1B,GAAG,EAAE,YAAY,CAAC,KAAK,CAAC;QACxB,KAAK,EAAE,YAAY,CAAC,OAAO,CAAC;KAC7B,CAAC;AACJ,CAAC;AAxBD,sBAwBC;AAED;;;;;GAKG;AACH,SAAgB,iBAAiB,CAAC,MAAkB,EAAE,OAAgB;IACpE,OAAO;QACL,aAAa,EAAE,IAAA,oBAAY,EAAC,OAAO,CAAC;QACpC,YAAY,EAAE,YAAY,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,UAAU,EAAE;QAC/D,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE;QACnC,GAAG,IAAA,yBAAiB,EAAC,OAAO,CAAC;KAC9B,CAAC;AACJ,CAAC;AAPD,8CAOC"}
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/http-client/utils.ts"],"names":[],"mappings":";;;AAAA,gDAAuE;AAIvE;;;;;GAKG;AACH,SAAgB,iBAAiB,CAAC,MAAkB,EAAE,OAAgB;IACpE,OAAO;QACL,aAAa,EAAE,IAAA,oBAAY,EAAC,OAAO,CAAC;QACpC,YAAY,EAAE,YAAY,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,UAAU,EAAE;QAC/D,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE;QACnC,GAAG,IAAA,yBAAiB,EAAC,OAAO,CAAC;KAC9B,CAAC;AACJ,CAAC;AAPD,8CAOC"}
@@ -1,8 +1,14 @@
1
- import type { Tracer } from '../../tracer/types';
2
- import type { Handler } from 'express';
1
+ import { Tracer } from '@opentelemetry/api';
2
+ import type { Request, Handler } from 'express';
3
3
  /**
4
4
  * Возвращает новый middleware для трассировки стадий входящего запроса.
5
5
  * @param tracer Tracer.
6
6
  * @return Middleware.
7
7
  */
8
8
  export declare function tracingMiddleware(tracer: Tracer): Handler;
9
+ /**
10
+ * Возвращает набор стандартных атрибутов для спана.
11
+ * @param req Входящий http-запрос.
12
+ * @return Атрибуты.
13
+ */
14
+ export declare function getConventionalRequestAttrs(req: Request): Record<string, string | undefined>;
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.tracingMiddleware = void 0;
3
+ exports.getConventionalRequestAttrs = exports.tracingMiddleware = void 0;
4
4
  const constants_1 = require("../constants");
5
5
  const api_1 = require("@opentelemetry/api");
6
6
  /**
@@ -10,8 +10,10 @@ const api_1 = require("@opentelemetry/api");
10
10
  */
11
11
  function tracingMiddleware(tracer) {
12
12
  return (req, res, next) => {
13
- const rootContext = api_1.propagation.extract(api_1.ROOT_CONTEXT, req.headers);
14
- const rootSpan = tracer.startSpan('response', undefined, rootContext);
13
+ const externalContext = api_1.propagation.extract(api_1.ROOT_CONTEXT, req.headers);
14
+ const rootSpan = tracer.startSpan('response', undefined, externalContext);
15
+ rootSpan.setAttributes(getConventionalRequestAttrs(req));
16
+ const rootContext = api_1.trace.setSpan(externalContext, rootSpan);
15
17
  res.locals.tracing = {
16
18
  rootSpan,
17
19
  rootContext,
@@ -29,4 +31,21 @@ function tracingMiddleware(tracer) {
29
31
  };
30
32
  }
31
33
  exports.tracingMiddleware = tracingMiddleware;
34
+ /**
35
+ * Возвращает набор стандартных атрибутов для спана.
36
+ * @param req Входящий http-запрос.
37
+ * @return Атрибуты.
38
+ */
39
+ function getConventionalRequestAttrs(req) {
40
+ const result = {
41
+ 'request.path': req.path,
42
+ };
43
+ for (const headerName in req.headers) {
44
+ if (headerName.toLowerCase().startsWith('simaland-')) {
45
+ result[headerName] = req.header(headerName);
46
+ }
47
+ }
48
+ return result;
49
+ }
50
+ exports.getConventionalRequestAttrs = getConventionalRequestAttrs;
32
51
  //# sourceMappingURL=tracing.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"tracing.js","sourceRoot":"","sources":["../../../src/http-server/middleware/tracing.ts"],"names":[],"mappings":";;;AAAA,4CAA8C;AAC9C,4CAA+D;AAI/D;;;;GAIG;AACH,SAAgB,iBAAiB,CAAC,MAAc;IAC9C,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QACxB,MAAM,WAAW,GAAG,iBAAW,CAAC,OAAO,CAAC,kBAAY,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;QACnE,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,CAAC,UAAU,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;QAEtE,GAAG,CAAC,MAAM,CAAC,OAAO,GAAG;YACnB,QAAQ;YACR,WAAW;SACZ,CAAC;QAEF,GAAG,CAAC,IAAI,CAAC,0BAAc,CAAC,WAAW,EAAE,GAAG,EAAE;YACxC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,GAAG,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;QACrF,CAAC,CAAC,CAAC;QAEH,GAAG,CAAC,IAAI,CAAC,0BAAc,CAAC,YAAY,EAAE,GAAG,EAAE;YACzC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC;QACtC,CAAC,CAAC,CAAC;QAEH,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,EAAE;YACtB,QAAQ,CAAC,GAAG,EAAE,CAAC;QACjB,CAAC,CAAC,CAAC;QAEH,IAAI,EAAE,CAAC;IACT,CAAC,CAAC;AACJ,CAAC;AAxBD,8CAwBC"}
1
+ {"version":3,"file":"tracing.js","sourceRoot":"","sources":["../../../src/http-server/middleware/tracing.ts"],"names":[],"mappings":";;;AAAA,4CAA8C;AAC9C,4CAA8E;AAG9E;;;;GAIG;AACH,SAAgB,iBAAiB,CAAC,MAAc;IAC9C,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QACxB,MAAM,eAAe,GAAG,iBAAW,CAAC,OAAO,CAAC,kBAAY,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;QACvE,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,CAAC,UAAU,EAAE,SAAS,EAAE,eAAe,CAAC,CAAC;QAE1E,QAAQ,CAAC,aAAa,CAAC,2BAA2B,CAAC,GAAG,CAAC,CAAC,CAAC;QAEzD,MAAM,WAAW,GAAG,WAAK,CAAC,OAAO,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;QAE7D,GAAG,CAAC,MAAM,CAAC,OAAO,GAAG;YACnB,QAAQ;YACR,WAAW;SACZ,CAAC;QAEF,GAAG,CAAC,IAAI,CAAC,0BAAc,CAAC,WAAW,EAAE,GAAG,EAAE;YACxC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,GAAG,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;QACrF,CAAC,CAAC,CAAC;QAEH,GAAG,CAAC,IAAI,CAAC,0BAAc,CAAC,YAAY,EAAE,GAAG,EAAE;YACzC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC;QACtC,CAAC,CAAC,CAAC;QAEH,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,EAAE;YACtB,QAAQ,CAAC,GAAG,EAAE,CAAC;QACjB,CAAC,CAAC,CAAC;QAEH,IAAI,EAAE,CAAC;IACT,CAAC,CAAC;AACJ,CAAC;AA5BD,8CA4BC;AAED;;;;GAIG;AACH,SAAgB,2BAA2B,CAAC,GAAY;IACtD,MAAM,MAAM,GAAuC;QACjD,cAAc,EAAE,GAAG,CAAC,IAAI;KACzB,CAAC;IAEF,KAAK,MAAM,UAAU,IAAI,GAAG,CAAC,OAAO,EAAE;QACpC,IAAI,UAAU,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE;YACpD,MAAM,CAAC,UAAU,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;SAC7C;KACF;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAZD,kEAYC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sima-land/isomorph",
3
- "version": "11.0.0-alpha.1",
3
+ "version": "11.0.0-alpha.4",
4
4
  "description": "Tiny framework for fast start frontend microservices",
5
5
  "author": "www.sima-land.ru team",
6
6
  "license": "Apache-2.0",
@@ -32,7 +32,7 @@
32
32
  },
33
33
  "dependencies": {
34
34
  "@humanwhocodes/env": "^2.2.0",
35
- "@opentelemetry/api": "^1.0.4",
35
+ "@opentelemetry/api": "^1.1.0",
36
36
  "@opentelemetry/exporter-jaeger": "^1.0.1",
37
37
  "@opentelemetry/instrumentation": "^0.27.0",
38
38
  "@opentelemetry/instrumentation-express": "^0.28.0",
@@ -1,9 +1,10 @@
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 { Provider, 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.
@@ -12,4 +13,7 @@ export declare function PresetNode(): Preset;
12
13
  export declare const provideBaseConfig: Provider<BaseConfig>;
13
14
  export declare const provideLogger: Provider<Logger>;
14
15
  export declare const provideTracer: Provider<Tracer>;
16
+ export declare const provideSpanExporter: Provider<SpanExporter>;
17
+ export declare const provideTracerProvider: Provider<BasicTracerProvider>;
18
+ export declare const provideTracerProviderResource: Provider<Resource>;
15
19
  export declare const provideDefaultMiddleware: Provider<DefaultMiddleware>;