@contember/engine-server 1.1.0-beta.3 → 1.2.0-alpha.1

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 (126) hide show
  1. package/dist/src/MasterContainer.d.ts +12 -25
  2. package/dist/src/MasterContainer.d.ts.map +1 -1
  3. package/dist/src/MasterContainer.js +36 -80
  4. package/dist/src/MasterContainer.js.map +1 -1
  5. package/dist/src/bootstrap/Initializer.d.ts +3 -3
  6. package/dist/src/bootstrap/Initializer.d.ts.map +1 -1
  7. package/dist/src/bootstrap/Initializer.js +15 -6
  8. package/dist/src/bootstrap/Initializer.js.map +1 -1
  9. package/dist/src/config/config.d.ts +5 -4
  10. package/dist/src/config/config.d.ts.map +1 -1
  11. package/dist/src/config/config.js +2 -2
  12. package/dist/src/config/config.js.map +1 -1
  13. package/dist/src/config/configSchema.d.ts +45 -11
  14. package/dist/src/config/configSchema.d.ts.map +1 -1
  15. package/dist/src/config/configSchema.js +20 -18
  16. package/dist/src/config/configSchema.js.map +1 -1
  17. package/dist/src/config/configTemplate.d.ts.map +1 -1
  18. package/dist/src/config/configTemplate.js +23 -0
  19. package/dist/src/config/configTemplate.js.map +1 -1
  20. package/dist/src/index.d.ts +9 -3
  21. package/dist/src/index.d.ts.map +1 -1
  22. package/dist/src/index.js +23 -4
  23. package/dist/src/index.js.map +1 -1
  24. package/dist/src/project/ProjectContainer.js +1 -1
  25. package/dist/src/project/ProjectContainer.js.map +1 -1
  26. package/dist/src/project/ProjectContainerResolver.d.ts +6 -3
  27. package/dist/src/project/ProjectContainerResolver.d.ts.map +1 -1
  28. package/dist/src/project/ProjectContainerResolver.js +4 -16
  29. package/dist/src/project/ProjectContainerResolver.js.map +1 -1
  30. package/dist/src/projectGroup/ProjectGroupContainer.d.ts +2 -1
  31. package/dist/src/projectGroup/ProjectGroupContainer.d.ts.map +1 -1
  32. package/dist/src/projectGroup/ProjectGroupContainer.js +8 -4
  33. package/dist/src/projectGroup/ProjectGroupContainer.js.map +1 -1
  34. package/dist/src/projectGroup/ProjectGroupResolver.d.ts +7 -0
  35. package/dist/src/projectGroup/ProjectGroupResolver.d.ts.map +1 -0
  36. package/dist/src/projectGroup/ProjectGroupResolver.js +13 -0
  37. package/dist/src/projectGroup/ProjectGroupResolver.js.map +1 -0
  38. package/dist/src/start.js +15 -112
  39. package/dist/src/start.js.map +1 -1
  40. package/dist/src/tsconfig.tsbuildinfo +1 -1
  41. package/dist/src/utils/index.d.ts +0 -4
  42. package/dist/src/utils/index.d.ts.map +1 -1
  43. package/dist/src/utils/index.js +0 -4
  44. package/dist/src/utils/index.js.map +1 -1
  45. package/dist/src/utils/serverStartup.d.ts +31 -0
  46. package/dist/src/utils/serverStartup.d.ts.map +1 -0
  47. package/dist/src/utils/serverStartup.js +42 -0
  48. package/dist/src/utils/serverStartup.js.map +1 -0
  49. package/dist/src/utils/serverTermination.d.ts +12 -0
  50. package/dist/src/utils/serverTermination.d.ts.map +1 -0
  51. package/dist/src/utils/serverTermination.js +26 -0
  52. package/dist/src/utils/serverTermination.js.map +1 -0
  53. package/dist/tests/e2e/http.test.js +74 -157
  54. package/dist/tests/e2e/http.test.js.map +1 -1
  55. package/dist/tests/e2e/requests.d.ts +4 -0
  56. package/dist/tests/e2e/requests.d.ts.map +1 -0
  57. package/dist/tests/e2e/requests.js +59 -0
  58. package/dist/tests/e2e/requests.js.map +1 -0
  59. package/dist/tests/e2e/tester.d.ts +19 -0
  60. package/dist/tests/e2e/tester.d.ts.map +1 -0
  61. package/dist/tests/e2e/tester.js +99 -0
  62. package/dist/tests/e2e/tester.js.map +1 -0
  63. package/dist/tests/tsconfig.tsbuildinfo +1 -1
  64. package/esbuild.js +7 -14
  65. package/package.json +20 -20
  66. package/src/MasterContainer.ts +58 -110
  67. package/src/bootstrap/Initializer.ts +16 -6
  68. package/src/config/config.ts +7 -5
  69. package/src/config/configSchema.ts +30 -33
  70. package/src/config/configTemplate.ts +23 -0
  71. package/src/index.ts +15 -2
  72. package/src/project/ProjectContainer.ts +1 -1
  73. package/src/project/ProjectContainerResolver.ts +4 -17
  74. package/src/projectGroup/ProjectGroupContainer.ts +12 -3
  75. package/src/projectGroup/ProjectGroupResolver.ts +12 -0
  76. package/src/start.ts +18 -127
  77. package/src/utils/index.ts +0 -4
  78. package/src/utils/serverStartup.ts +42 -0
  79. package/src/utils/serverTermination.ts +20 -0
  80. package/tests/e2e/http.test.ts +84 -150
  81. package/tests/e2e/requests.ts +71 -0
  82. package/tests/e2e/tester.ts +118 -0
  83. package/alpine.dockerfile +0 -30
  84. package/debian.dockerfile +0 -27
  85. package/dist/src/http/CollectHttpMetricsMiddelware.d.ts +0 -5
  86. package/dist/src/http/CollectHttpMetricsMiddelware.d.ts.map +0 -1
  87. package/dist/src/http/CollectHttpMetricsMiddelware.js +0 -36
  88. package/dist/src/http/CollectHttpMetricsMiddelware.js.map +0 -1
  89. package/dist/src/http/ShowMetricsMiddleware.d.ts +0 -4
  90. package/dist/src/http/ShowMetricsMiddleware.d.ts.map +0 -1
  91. package/dist/src/http/ShowMetricsMiddleware.js +0 -20
  92. package/dist/src/http/ShowMetricsMiddleware.js.map +0 -1
  93. package/dist/src/http/index.d.ts +0 -3
  94. package/dist/src/http/index.d.ts.map +0 -1
  95. package/dist/src/http/index.js +0 -19
  96. package/dist/src/http/index.js.map +0 -1
  97. package/dist/src/projectGroup/ProjectGroupContainerResolver.d.ts +0 -12
  98. package/dist/src/projectGroup/ProjectGroupContainerResolver.d.ts.map +0 -1
  99. package/dist/src/projectGroup/ProjectGroupContainerResolver.js +0 -36
  100. package/dist/src/projectGroup/ProjectGroupContainerResolver.js.map +0 -1
  101. package/dist/src/utils/cluster.d.ts +0 -9
  102. package/dist/src/utils/cluster.d.ts.map +0 -1
  103. package/dist/src/utils/cluster.js +0 -47
  104. package/dist/src/utils/cluster.js.map +0 -1
  105. package/dist/src/utils/dbMetrics.d.ts +0 -16
  106. package/dist/src/utils/dbMetrics.d.ts.map +0 -1
  107. package/dist/src/utils/dbMetrics.js +0 -98
  108. package/dist/src/utils/dbMetrics.js.map +0 -1
  109. package/dist/src/utils/timeout.d.ts +0 -2
  110. package/dist/src/utils/timeout.d.ts.map +0 -1
  111. package/dist/src/utils/timeout.js +0 -8
  112. package/dist/src/utils/timeout.js.map +0 -1
  113. package/dist/src/utils/tuple.d.ts +0 -2
  114. package/dist/src/utils/tuple.d.ts.map +0 -1
  115. package/dist/src/utils/tuple.js +0 -6
  116. package/dist/src/utils/tuple.js.map +0 -1
  117. package/jasmine.json +0 -7
  118. package/src/http/CollectHttpMetricsMiddelware.ts +0 -32
  119. package/src/http/ShowMetricsMiddleware.ts +0 -12
  120. package/src/http/index.ts +0 -2
  121. package/src/projectGroup/ProjectGroupContainerResolver.ts +0 -47
  122. package/src/utils/cluster.ts +0 -40
  123. package/src/utils/dbMetrics.ts +0 -111
  124. package/src/utils/timeout.ts +0 -4
  125. package/src/utils/tuple.ts +0 -1
  126. package/tslint.json +0 -14
@@ -0,0 +1,99 @@
1
+ "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
5
+ Object.defineProperty(exports, "__esModule", { value: true });
6
+ exports.createTester = exports.executeGraphql = exports.gql = exports.apiUrl = exports.loginToken = exports.rootToken = void 0;
7
+ const assert_1 = __importDefault(require("assert"));
8
+ const supertest_1 = __importDefault(require("supertest"));
9
+ const schema_migrations_1 = require("@contember/schema-migrations");
10
+ const schema_utils_1 = require("@contember/schema-utils");
11
+ const vitest_1 = require("vitest");
12
+ exports.rootToken = String(process.env.CONTEMBER_ROOT_TOKEN);
13
+ exports.loginToken = String(process.env.CONTEMBER_LOGIN_TOKEN);
14
+ exports.apiUrl = String(process.env.CONTEMBER_API_URL);
15
+ // Used to allow prettier formatting of GraphQL queries
16
+ const gql = (strings) => {
17
+ assert_1.default.strictEqual(strings.length, 1);
18
+ return strings[0];
19
+ };
20
+ exports.gql = gql;
21
+ const executeGraphql = (path, query, options) => {
22
+ return (0, supertest_1.default)(exports.apiUrl)
23
+ .post(path)
24
+ .set('Authorization', 'Bearer ' + (options.authorizationToken || exports.rootToken))
25
+ .send({
26
+ query,
27
+ variables: options.variables || {},
28
+ });
29
+ };
30
+ exports.executeGraphql = executeGraphql;
31
+ const createMigrations = (schema) => {
32
+ const modificationHandlerFactory = new schema_migrations_1.ModificationHandlerFactory(schema_migrations_1.ModificationHandlerFactory.defaultFactoryMap);
33
+ const differ = new schema_migrations_1.SchemaDiffer(new schema_migrations_1.SchemaMigrator(modificationHandlerFactory));
34
+ return differ.diffSchemas(schema_utils_1.emptySchema, schema);
35
+ };
36
+ const createProject = async (slug) => {
37
+ await (0, exports.executeGraphql)('/tenant', (0, exports.gql) `
38
+ mutation($projectSlug: String!, $config: Json!) {
39
+ createProject(projectSlug: $projectSlug, config: $config) {
40
+ ok
41
+ error { code }
42
+ }
43
+ }
44
+ `, {
45
+ variables: {
46
+ projectSlug: slug,
47
+ config: {},
48
+ },
49
+ })
50
+ .expect(response => {
51
+ vitest_1.assert.isOk(response.body);
52
+ vitest_1.assert.isOk(response.body.data);
53
+ vitest_1.assert.isOk(response.body.data.createProject);
54
+ vitest_1.assert.isOk(response.body.data.createProject.ok);
55
+ })
56
+ .expect(200);
57
+ };
58
+ const executeMigrations = async (projectSlug, modifications) => {
59
+ const [version, fullName] = schema_migrations_1.MigrationVersionHelper.createVersion('test');
60
+ await (0, exports.executeGraphql)('/system/' + projectSlug, (0, exports.gql) `
61
+ mutation($migrations: [Migration!]!) {
62
+ migrate(migrations: $migrations) {
63
+ ok
64
+ error { code }
65
+ }
66
+ }
67
+ `, {
68
+ variables: {
69
+ migrations: [{
70
+ formatVersion: schema_migrations_1.VERSION_LATEST,
71
+ modifications,
72
+ version,
73
+ name: fullName,
74
+ }],
75
+ },
76
+ })
77
+ .expect(response => {
78
+ vitest_1.assert.deepStrictEqual(response.body.data, {
79
+ migrate: {
80
+ error: null,
81
+ ok: true,
82
+ },
83
+ });
84
+ });
85
+ };
86
+ const createTester = async (schema) => {
87
+ const projectSlug = 'test_' + Date.now();
88
+ await createProject(projectSlug);
89
+ const migrations = createMigrations(schema);
90
+ await executeMigrations(projectSlug, migrations);
91
+ const queryCb = (query, options = {}) => {
92
+ var _a;
93
+ return (0, exports.executeGraphql)((_a = options.path) !== null && _a !== void 0 ? _a : '/content/' + projectSlug + '/live', query, options);
94
+ };
95
+ queryCb.projectSlug = projectSlug;
96
+ return queryCb;
97
+ };
98
+ exports.createTester = createTester;
99
+ //# sourceMappingURL=tester.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"tester.js","sourceRoot":"","sources":["../../../tests/e2e/tester.ts"],"names":[],"mappings":"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"}