@datadog/datadog-ci 3.1.0 → 3.3.0
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.
- package/README.md +3 -0
- package/dist/__tests__/cli.test.js +1 -0
- package/dist/__tests__/cli.test.js.map +1 -1
- package/dist/commands/coverage/__tests__/upload.test.js +48 -80
- package/dist/commands/coverage/__tests__/upload.test.js.map +1 -1
- package/dist/commands/coverage/__tests__/utils.test.js +4 -14
- package/dist/commands/coverage/__tests__/utils.test.js.map +1 -1
- package/dist/commands/coverage/renderer.d.ts +0 -2
- package/dist/commands/coverage/renderer.js +1 -9
- package/dist/commands/coverage/renderer.js.map +1 -1
- package/dist/commands/coverage/upload.d.ts +2 -3
- package/dist/commands/coverage/upload.js +29 -88
- package/dist/commands/coverage/upload.js.map +1 -1
- package/dist/commands/coverage/utils.d.ts +0 -1
- package/dist/commands/coverage/utils.js +11 -35
- package/dist/commands/coverage/utils.js.map +1 -1
- package/dist/commands/elf-symbols/__tests__/elf.test.js +12 -9
- package/dist/commands/elf-symbols/__tests__/elf.test.js.map +1 -1
- package/dist/commands/elf-symbols/__tests__/upload.test.js +9 -5
- package/dist/commands/elf-symbols/__tests__/upload.test.js.map +1 -1
- package/dist/commands/elf-symbols/elf.d.ts +2 -11
- package/dist/commands/elf-symbols/elf.js +52 -68
- package/dist/commands/elf-symbols/elf.js.map +1 -1
- package/dist/commands/elf-symbols/upload.js +3 -3
- package/dist/commands/elf-symbols/upload.js.map +1 -1
- package/dist/commands/junit/__tests__/upload.test.js +114 -65
- package/dist/commands/junit/__tests__/upload.test.js.map +1 -1
- package/dist/commands/junit/renderer.d.ts +2 -2
- package/dist/commands/junit/renderer.js +3 -1
- package/dist/commands/junit/renderer.js.map +1 -1
- package/dist/commands/junit/upload.d.ts +2 -0
- package/dist/commands/junit/upload.js +41 -37
- package/dist/commands/junit/upload.js.map +1 -1
- package/dist/commands/junit/utils.d.ts +0 -1
- package/dist/commands/junit/utils.js +1 -11
- package/dist/commands/junit/utils.js.map +1 -1
- package/dist/commands/pe-symbols/__tests__/pe.test.d.ts +1 -0
- package/dist/commands/pe-symbols/__tests__/pe.test.js +81 -0
- package/dist/commands/pe-symbols/__tests__/pe.test.js.map +1 -0
- package/dist/commands/pe-symbols/cli.d.ts +1 -0
- package/dist/commands/pe-symbols/cli.js +5 -0
- package/dist/commands/pe-symbols/cli.js.map +1 -0
- package/dist/commands/pe-symbols/helpers.d.ts +4 -0
- package/dist/commands/pe-symbols/helpers.js +30 -0
- package/dist/commands/pe-symbols/helpers.js.map +1 -0
- package/dist/commands/pe-symbols/interfaces.d.ts +17 -0
- package/dist/commands/pe-symbols/interfaces.js +7 -0
- package/dist/commands/pe-symbols/interfaces.js.map +1 -0
- package/dist/commands/pe-symbols/pe-constants.d.ts +51 -0
- package/dist/commands/pe-symbols/pe-constants.js +160 -0
- package/dist/commands/pe-symbols/pe-constants.js.map +1 -0
- package/dist/commands/pe-symbols/pe.d.ts +35 -0
- package/dist/commands/pe-symbols/pe.js +248 -0
- package/dist/commands/pe-symbols/pe.js.map +1 -0
- package/dist/commands/pe-symbols/renderer.d.ts +19 -0
- package/dist/commands/pe-symbols/renderer.js +87 -0
- package/dist/commands/pe-symbols/renderer.js.map +1 -0
- package/dist/commands/pe-symbols/upload.d.ts +32 -0
- package/dist/commands/pe-symbols/upload.js +412 -0
- package/dist/commands/pe-symbols/upload.js.map +1 -0
- package/dist/commands/sarif/__tests__/upload.test.js +79 -6
- package/dist/commands/sarif/__tests__/upload.test.js.map +1 -1
- package/dist/commands/sarif/renderer.d.ts +1 -0
- package/dist/commands/sarif/renderer.js +4 -2
- package/dist/commands/sarif/renderer.js.map +1 -1
- package/dist/commands/sarif/upload.d.ts +1 -0
- package/dist/commands/sarif/upload.js +3 -2
- package/dist/commands/sarif/upload.js.map +1 -1
- package/dist/commands/sbom/__tests__/payload.test.js +157 -26
- package/dist/commands/sbom/__tests__/payload.test.js.map +1 -1
- package/dist/commands/sbom/constants.d.ts +2 -0
- package/dist/commands/sbom/constants.js +4 -1
- package/dist/commands/sbom/constants.js.map +1 -1
- package/dist/commands/sbom/payload.js +44 -0
- package/dist/commands/sbom/payload.js.map +1 -1
- package/dist/commands/sbom/types.d.ts +4 -0
- package/dist/commands/sbom/upload.d.ts +1 -0
- package/dist/commands/sbom/upload.js +3 -2
- package/dist/commands/sbom/upload.js.map +1 -1
- package/dist/commands/synthetics/__tests__/api.test.js +2 -2
- package/dist/commands/synthetics/__tests__/api.test.js.map +1 -1
- package/dist/commands/synthetics/__tests__/batch.test.js +38 -37
- package/dist/commands/synthetics/__tests__/batch.test.js.map +1 -1
- package/dist/commands/synthetics/__tests__/build-and-test.test.d.ts +1 -0
- package/dist/commands/synthetics/__tests__/build-and-test.test.js +133 -0
- package/dist/commands/synthetics/__tests__/build-and-test.test.js.map +1 -0
- package/dist/commands/synthetics/__tests__/cli.test.js +83 -47
- package/dist/commands/synthetics/__tests__/cli.test.js.map +1 -1
- package/dist/commands/synthetics/__tests__/deploy-tests-lib.test.js +2 -2
- package/dist/commands/synthetics/__tests__/deploy-tests-lib.test.js.map +1 -1
- package/dist/commands/synthetics/__tests__/import-tests-lib.test.js +4 -4
- package/dist/commands/synthetics/__tests__/import-tests-lib.test.js.map +1 -1
- package/dist/commands/synthetics/__tests__/multilocator.test.js +13 -3
- package/dist/commands/synthetics/__tests__/multilocator.test.js.map +1 -1
- package/dist/commands/synthetics/__tests__/test.test.js +6 -7
- package/dist/commands/synthetics/__tests__/test.test.js.map +1 -1
- package/dist/commands/synthetics/__tests__/tunnel/websocket.test.js +1 -1
- package/dist/commands/synthetics/__tests__/tunnel/websocket.test.js.map +1 -1
- package/dist/commands/synthetics/__tests__/utils/public.test.js +10 -9
- package/dist/commands/synthetics/__tests__/utils/public.test.js.map +1 -1
- package/dist/commands/synthetics/api.js +2 -2
- package/dist/commands/synthetics/api.js.map +1 -1
- package/dist/commands/synthetics/base-command.d.ts +29 -0
- package/dist/commands/synthetics/base-command.js +125 -0
- package/dist/commands/synthetics/base-command.js.map +1 -0
- package/dist/commands/synthetics/batch.d.ts +1 -0
- package/dist/commands/synthetics/batch.js +3 -3
- package/dist/commands/synthetics/batch.js.map +1 -1
- package/dist/commands/synthetics/build-and-test.d.ts +8 -0
- package/dist/commands/synthetics/build-and-test.js +102 -0
- package/dist/commands/synthetics/build-and-test.js.map +1 -0
- package/dist/commands/synthetics/deploy-tests-command.d.ts +8 -16
- package/dist/commands/synthetics/deploy-tests-command.js +19 -91
- package/dist/commands/synthetics/deploy-tests-command.js.map +1 -1
- package/dist/commands/synthetics/import-tests-command.d.ts +6 -14
- package/dist/commands/synthetics/import-tests-command.js +15 -83
- package/dist/commands/synthetics/import-tests-command.js.map +1 -1
- package/dist/commands/synthetics/index.d.ts +1 -1
- package/dist/commands/synthetics/index.js +6 -6
- package/dist/commands/synthetics/index.js.map +1 -1
- package/dist/commands/synthetics/interfaces.d.ts +5 -2
- package/dist/commands/synthetics/multilocator.d.ts +0 -1
- package/dist/commands/synthetics/multilocator.js +7 -17
- package/dist/commands/synthetics/multilocator.js.map +1 -1
- package/dist/commands/synthetics/run-tests-command.d.ts +12 -17
- package/dist/commands/synthetics/run-tests-command.js +133 -190
- package/dist/commands/synthetics/run-tests-command.js.map +1 -1
- package/dist/commands/synthetics/run-tests-lib.d.ts +1 -0
- package/dist/commands/synthetics/run-tests-lib.js +8 -4
- package/dist/commands/synthetics/run-tests-lib.js.map +1 -1
- package/dist/commands/synthetics/test.d.ts +2 -0
- package/dist/commands/synthetics/test.js +9 -8
- package/dist/commands/synthetics/test.js.map +1 -1
- package/dist/commands/synthetics/upload-application-command.d.ts +6 -13
- package/dist/commands/synthetics/upload-application-command.js +22 -87
- package/dist/commands/synthetics/upload-application-command.js.map +1 -1
- package/dist/commands/synthetics/utils/internal.d.ts +2 -0
- package/dist/commands/synthetics/utils/internal.js +15 -1
- package/dist/commands/synthetics/utils/internal.js.map +1 -1
- package/dist/commands/synthetics/utils/public.js +1 -1
- package/dist/commands/synthetics/utils/public.js.map +1 -1
- package/dist/helpers/__tests__/ci.test.js +49 -0
- package/dist/helpers/__tests__/ci.test.js.map +1 -1
- package/dist/helpers/__tests__/tags.test.js +59 -0
- package/dist/helpers/__tests__/tags.test.js.map +1 -1
- package/dist/helpers/ci.d.ts +13 -0
- package/dist/helpers/ci.js +23 -1
- package/dist/helpers/ci.js.map +1 -1
- package/dist/helpers/file-finder.d.ts +17 -0
- package/dist/helpers/file-finder.js +138 -0
- package/dist/helpers/file-finder.js.map +1 -0
- package/dist/helpers/filereader.d.ts +21 -0
- package/dist/helpers/filereader.js +59 -0
- package/dist/helpers/filereader.js.map +1 -0
- package/dist/helpers/git/format-git-span-data.d.ts +1 -1
- package/dist/helpers/git/format-git-span-data.js +2 -2
- package/dist/helpers/git/format-git-span-data.js.map +1 -1
- package/dist/helpers/interfaces.d.ts +2 -1
- package/dist/helpers/prompt.d.ts +5 -3
- package/dist/helpers/prompt.js +14 -13
- package/dist/helpers/prompt.js.map +1 -1
- package/dist/helpers/tags.d.ts +1 -1
- package/dist/helpers/tags.js +4 -4
- package/dist/helpers/tags.js.map +1 -1
- package/dist/helpers/utils.d.ts +3 -0
- package/dist/helpers/utils.js +34 -1
- package/dist/helpers/utils.js.map +1 -1
- package/package.json +4 -3
|
@@ -39,41 +39,39 @@ describe('upload', () => {
|
|
|
39
39
|
test('should read all xml files and reject invalid ones', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
40
40
|
const context = (0, fixtures_1.createMockContext)();
|
|
41
41
|
const command = new upload_1.UploadJUnitXMLCommand();
|
|
42
|
-
const
|
|
43
|
-
basePaths: ['
|
|
42
|
+
const files = yield command['getMatchingJUnitXMLFiles'].call({
|
|
43
|
+
basePaths: ['src/commands/junit/__tests__/fixtures'],
|
|
44
44
|
config: {},
|
|
45
45
|
context,
|
|
46
46
|
service: 'service',
|
|
47
47
|
}, {}, {}, {}, {}, {});
|
|
48
|
-
expect(
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
expect(
|
|
52
|
-
xmlPath: './src/commands/junit/__tests__/fixtures/go-report.xml',
|
|
53
|
-
});
|
|
48
|
+
expect(files.length).toBe(2);
|
|
49
|
+
const filePaths = files.map((file) => file.xmlPath);
|
|
50
|
+
expect(filePaths).toContain('src/commands/junit/__tests__/fixtures/go-report.xml');
|
|
51
|
+
expect(filePaths).toContain('src/commands/junit/__tests__/fixtures/java-report.xml');
|
|
54
52
|
const output = context.stdout.toString();
|
|
55
|
-
expect(output).toContain((0, renderer_1.renderInvalidFile)('
|
|
56
|
-
expect(output).toContain((0, renderer_1.renderInvalidFile)('
|
|
53
|
+
expect(output).toContain((0, renderer_1.renderInvalidFile)('src/commands/junit/__tests__/fixtures/empty.xml', 'Start tag expected.'));
|
|
54
|
+
expect(output).toContain((0, renderer_1.renderInvalidFile)('src/commands/junit/__tests__/fixtures/invalid.xml', 'Neither <testsuites> nor <testsuite> are the root tag.'));
|
|
57
55
|
}));
|
|
58
56
|
test('should allow single files', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
59
57
|
const context = (0, fixtures_1.createMockContext)();
|
|
60
58
|
const command = new upload_1.UploadJUnitXMLCommand();
|
|
61
59
|
const files = yield command['getMatchingJUnitXMLFiles'].call({
|
|
62
|
-
basePaths: ['
|
|
60
|
+
basePaths: ['src/commands/junit/__tests__/fixtures/go-report.xml'],
|
|
63
61
|
config: {},
|
|
64
62
|
context,
|
|
65
63
|
service: 'service',
|
|
66
64
|
}, {}, {}, {}, {}, {});
|
|
67
65
|
expect(files.length).toEqual(1);
|
|
68
66
|
expect(files[0]).toMatchObject({
|
|
69
|
-
xmlPath: '
|
|
67
|
+
xmlPath: 'src/commands/junit/__tests__/fixtures/go-report.xml',
|
|
70
68
|
});
|
|
71
69
|
}));
|
|
72
70
|
test('should not fail for invalid single files', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
73
71
|
const context = (0, fixtures_1.createMockContext)();
|
|
74
72
|
const command = new upload_1.UploadJUnitXMLCommand();
|
|
75
73
|
const files = yield command['getMatchingJUnitXMLFiles'].call({
|
|
76
|
-
basePaths: ['
|
|
74
|
+
basePaths: ['src/commands/junit/__tests__/fixtures/does-not-exist.xml'],
|
|
77
75
|
config: {},
|
|
78
76
|
context,
|
|
79
77
|
service: 'service',
|
|
@@ -83,49 +81,41 @@ describe('upload', () => {
|
|
|
83
81
|
test('should allow folder and single unit paths', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
84
82
|
const context = (0, fixtures_1.createMockContext)();
|
|
85
83
|
const command = new upload_1.UploadJUnitXMLCommand();
|
|
86
|
-
const
|
|
84
|
+
const files = yield command['getMatchingJUnitXMLFiles'].call({
|
|
87
85
|
basePaths: [
|
|
88
|
-
'
|
|
89
|
-
'
|
|
86
|
+
'src/commands/junit/__tests__/fixtures',
|
|
87
|
+
'src/commands/junit/__tests__/fixtures/subfolder/js-report.xml',
|
|
90
88
|
],
|
|
91
89
|
config: {},
|
|
92
90
|
context,
|
|
93
91
|
service: 'service',
|
|
94
92
|
}, {}, {}, {}, {}, {});
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
expect(
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
expect(thirdFile).toMatchObject({
|
|
102
|
-
xmlPath: './src/commands/junit/__tests__/fixtures/subfolder/js-report.xml',
|
|
103
|
-
});
|
|
93
|
+
// Check that all expected files are present, regardless of order
|
|
94
|
+
const filePaths = files.map((file) => file.xmlPath);
|
|
95
|
+
expect(filePaths.length).toEqual(3);
|
|
96
|
+
expect(filePaths).toContain('src/commands/junit/__tests__/fixtures/go-report.xml');
|
|
97
|
+
expect(filePaths).toContain('src/commands/junit/__tests__/fixtures/java-report.xml');
|
|
98
|
+
expect(filePaths).toContain('src/commands/junit/__tests__/fixtures/subfolder/js-report.xml');
|
|
104
99
|
}));
|
|
105
100
|
test('should allow folders with extensions', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
106
101
|
const context = (0, fixtures_1.createMockContext)();
|
|
107
102
|
const command = new upload_1.UploadJUnitXMLCommand();
|
|
108
|
-
const
|
|
109
|
-
basePaths: ['
|
|
103
|
+
const files = yield command['getMatchingJUnitXMLFiles'].call({
|
|
104
|
+
basePaths: ['src/commands/junit/__tests__/fixtures/junit.xml'],
|
|
110
105
|
config: {},
|
|
111
106
|
context,
|
|
112
107
|
service: 'service',
|
|
113
108
|
}, {}, {}, {}, {}, {});
|
|
114
|
-
expect(
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
expect(
|
|
118
|
-
xmlPath: './src/commands/junit/__tests__/fixtures/junit.xml/valid-report-2.xml',
|
|
119
|
-
});
|
|
109
|
+
expect(files.length).toBe(2);
|
|
110
|
+
const filePaths = files.map((file) => file.xmlPath);
|
|
111
|
+
expect(filePaths).toContain('src/commands/junit/__tests__/fixtures/junit.xml/valid-report-2.xml');
|
|
112
|
+
expect(filePaths).toContain('src/commands/junit/__tests__/fixtures/junit.xml/valid-report.xml');
|
|
120
113
|
}));
|
|
121
114
|
test('should not have repeated files', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
122
115
|
const context = (0, fixtures_1.createMockContext)();
|
|
123
116
|
const command = new upload_1.UploadJUnitXMLCommand();
|
|
124
117
|
const files = yield command['getMatchingJUnitXMLFiles'].call({
|
|
125
|
-
basePaths: [
|
|
126
|
-
'./src/commands/junit/__tests__/fixtures',
|
|
127
|
-
'./src/commands/junit/__tests__/fixtures/go-report.xml',
|
|
128
|
-
],
|
|
118
|
+
basePaths: ['src/commands/junit/__tests__/fixtures', 'src/commands/junit/__tests__/fixtures/go-report.xml'],
|
|
129
119
|
config: {},
|
|
130
120
|
context,
|
|
131
121
|
service: 'service',
|
|
@@ -135,42 +125,46 @@ describe('upload', () => {
|
|
|
135
125
|
test('should set hostname', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
136
126
|
const context = (0, fixtures_1.createMockContext)();
|
|
137
127
|
const command = new upload_1.UploadJUnitXMLCommand();
|
|
138
|
-
const
|
|
139
|
-
basePaths: ['
|
|
128
|
+
const files = yield command['getMatchingJUnitXMLFiles'].call({
|
|
129
|
+
basePaths: ['src/commands/junit/__tests__/fixtures'],
|
|
140
130
|
config: {},
|
|
141
131
|
context,
|
|
142
132
|
service: 'service',
|
|
143
133
|
}, {}, {}, {}, {}, {});
|
|
144
|
-
expect(
|
|
145
|
-
|
|
134
|
+
expect(files.length).toBe(2);
|
|
135
|
+
files.forEach((file) => {
|
|
136
|
+
expect(file.hostname).toEqual(os_1.default.hostname());
|
|
137
|
+
});
|
|
146
138
|
}));
|
|
147
139
|
test('should set logsEnabled for each file', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
148
140
|
process.env.DD_CIVISIBILITY_LOGS_ENABLED = 'true';
|
|
149
141
|
const context = (0, fixtures_1.createMockContext)();
|
|
150
142
|
const command = new upload_1.UploadJUnitXMLCommand();
|
|
151
|
-
const
|
|
152
|
-
basePaths: ['
|
|
143
|
+
const files = yield command['getMatchingJUnitXMLFiles'].call({
|
|
144
|
+
basePaths: ['src/commands/junit/__tests__/fixtures'],
|
|
153
145
|
config: {},
|
|
154
146
|
context,
|
|
155
147
|
logs: true,
|
|
156
148
|
service: 'service',
|
|
157
149
|
}, {}, {}, {}, {}, {});
|
|
158
|
-
expect(
|
|
159
|
-
|
|
150
|
+
expect(files.length).toBe(2);
|
|
151
|
+
files.forEach((file) => {
|
|
152
|
+
expect(file.logsEnabled).toBe(true);
|
|
153
|
+
});
|
|
160
154
|
}));
|
|
161
155
|
test('should show different error on no test report', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
162
156
|
process.env.DD_CIVISIBILITY_LOGS_ENABLED = 'true';
|
|
163
157
|
const context = (0, fixtures_1.createMockContext)();
|
|
164
158
|
const command = new upload_1.UploadJUnitXMLCommand();
|
|
165
159
|
yield command['getMatchingJUnitXMLFiles'].call({
|
|
166
|
-
basePaths: ['
|
|
160
|
+
basePaths: ['src/commands/junit/__tests__/fixtures/subfolder/invalid-no-tests.xml'],
|
|
167
161
|
config: {},
|
|
168
162
|
context,
|
|
169
163
|
logs: true,
|
|
170
164
|
service: 'service',
|
|
171
165
|
}, {}, {}, {}, {}, {});
|
|
172
166
|
const output = context.stdout.toString();
|
|
173
|
-
expect(output).toContain((0, renderer_1.renderInvalidFile)('
|
|
167
|
+
expect(output).toContain((0, renderer_1.renderInvalidFile)('src/commands/junit/__tests__/fixtures/subfolder/invalid-no-tests.xml', 'The junit report file is empty, there are no <testcase> elements.'));
|
|
174
168
|
}));
|
|
175
169
|
test('should fetch nested folders', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
176
170
|
const context = (0, fixtures_1.createMockContext)();
|
|
@@ -182,13 +176,15 @@ describe('upload', () => {
|
|
|
182
176
|
service: 'service',
|
|
183
177
|
}, {}, {}, {}, {}, {});
|
|
184
178
|
const fileNames = files.map((file) => file.xmlPath);
|
|
185
|
-
expect(fileNames).
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
179
|
+
expect(fileNames.length).toBe(9);
|
|
180
|
+
expect(fileNames).toContain('./src/commands/junit/__tests__/fixtures/go-report.xml');
|
|
181
|
+
expect(fileNames).toContain('./src/commands/junit/__tests__/fixtures/java-report.xml');
|
|
182
|
+
expect(fileNames).toContain('./src/commands/junit/__tests__/fixtures/junit.xml/valid-report-2.xml');
|
|
183
|
+
expect(fileNames).toContain('./src/commands/junit/__tests__/fixtures/junit.xml/valid-report.xml');
|
|
184
|
+
expect(fileNames).toContain('./src/commands/junit/__tests__/fixtures/subfolder/js-report.xml');
|
|
185
|
+
expect(fileNames).toContain('./src/commands/junit/__tests__/fixtures/autodiscovery/junit-report.xml');
|
|
186
|
+
expect(fileNames).toContain('./src/commands/junit/__tests__/fixtures/autodiscovery/test-results.xml');
|
|
187
|
+
expect(fileNames).toContain('./src/commands/junit/__tests__/fixtures/autodiscovery/nested/TEST-suite.xml');
|
|
192
188
|
}));
|
|
193
189
|
test('should fetch nested folders and ignore non xml files', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
194
190
|
const context = (0, fixtures_1.createMockContext)();
|
|
@@ -200,13 +196,66 @@ describe('upload', () => {
|
|
|
200
196
|
service: 'service',
|
|
201
197
|
}, {}, {}, {}, {}, {});
|
|
202
198
|
const fileNames = files.map((file) => file.xmlPath);
|
|
203
|
-
expect(fileNames).
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
199
|
+
expect(fileNames.length).toBe(9);
|
|
200
|
+
expect(fileNames).toContain('./src/commands/junit/__tests__/fixtures/go-report.xml');
|
|
201
|
+
expect(fileNames).toContain('./src/commands/junit/__tests__/fixtures/java-report.xml');
|
|
202
|
+
expect(fileNames).toContain('./src/commands/junit/__tests__/fixtures/junit.xml/valid-report-2.xml');
|
|
203
|
+
expect(fileNames).toContain('./src/commands/junit/__tests__/fixtures/junit.xml/valid-report.xml');
|
|
204
|
+
expect(fileNames).toContain('./src/commands/junit/__tests__/fixtures/subfolder/js-report.xml');
|
|
205
|
+
expect(fileNames).toContain('./src/commands/junit/__tests__/fixtures/autodiscovery/junit-report.xml');
|
|
206
|
+
expect(fileNames).toContain('./src/commands/junit/__tests__/fixtures/autodiscovery/test-results.xml');
|
|
207
|
+
expect(fileNames).toContain('./src/commands/junit/__tests__/fixtures/autodiscovery/nested/TEST-suite.xml');
|
|
208
|
+
}));
|
|
209
|
+
test('should discover junit XML files automatically with recursive search', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
210
|
+
const context = (0, fixtures_1.createMockContext)();
|
|
211
|
+
const command = new upload_1.UploadJUnitXMLCommand();
|
|
212
|
+
const files = yield command['getMatchingJUnitXMLFiles'].call({
|
|
213
|
+
basePaths: ['src/commands/junit/__tests__/fixtures/autodiscovery'],
|
|
214
|
+
automaticReportsDiscovery: true,
|
|
215
|
+
config: {},
|
|
216
|
+
context,
|
|
217
|
+
service: 'service',
|
|
218
|
+
}, {}, {}, {}, {}, {});
|
|
219
|
+
const fileNames = files.map((file) => file.xmlPath);
|
|
220
|
+
expect(fileNames.length).toBe(3);
|
|
221
|
+
expect(fileNames).toContain('src/commands/junit/__tests__/fixtures/autodiscovery/junit-report.xml');
|
|
222
|
+
expect(fileNames).toContain('src/commands/junit/__tests__/fixtures/autodiscovery/test-results.xml');
|
|
223
|
+
expect(fileNames).toContain('src/commands/junit/__tests__/fixtures/autodiscovery/nested/TEST-suite.xml');
|
|
224
|
+
expect(fileNames).not.toContain('src/commands/junit/__tests__/fixtures/autodiscovery/regular-file.xml');
|
|
225
|
+
}));
|
|
226
|
+
test('should discover junit XML files automatically excluding ignored paths', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
227
|
+
const context = (0, fixtures_1.createMockContext)();
|
|
228
|
+
const command = new upload_1.UploadJUnitXMLCommand();
|
|
229
|
+
const files = yield command['getMatchingJUnitXMLFiles'].call({
|
|
230
|
+
basePaths: ['src/commands/junit/__tests__/fixtures/autodiscovery'],
|
|
231
|
+
automaticReportsDiscovery: true,
|
|
232
|
+
ignoredPaths: 'src/commands/junit/__tests__/fixtures/autodiscovery/nested',
|
|
233
|
+
config: {},
|
|
234
|
+
context,
|
|
235
|
+
service: 'service',
|
|
236
|
+
}, {}, {}, {}, {}, {});
|
|
237
|
+
const fileNames = files.map((file) => file.xmlPath);
|
|
238
|
+
expect(fileNames.length).toBe(2);
|
|
239
|
+
expect(fileNames).toContain('src/commands/junit/__tests__/fixtures/autodiscovery/junit-report.xml');
|
|
240
|
+
expect(fileNames).toContain('src/commands/junit/__tests__/fixtures/autodiscovery/test-results.xml');
|
|
241
|
+
}));
|
|
242
|
+
test('should combine explicit file paths with auto-discovered files', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
243
|
+
const context = (0, fixtures_1.createMockContext)();
|
|
244
|
+
const command = new upload_1.UploadJUnitXMLCommand();
|
|
245
|
+
const files = yield command['getMatchingJUnitXMLFiles'].call({
|
|
246
|
+
basePaths: [
|
|
247
|
+
'src/commands/junit/__tests__/fixtures/autodiscovery/nested',
|
|
248
|
+
'src/commands/junit/__tests__/fixtures/autodiscovery/junit-report.xml',
|
|
249
|
+
],
|
|
250
|
+
automaticReportsDiscovery: true,
|
|
251
|
+
config: {},
|
|
252
|
+
context,
|
|
253
|
+
service: 'service',
|
|
254
|
+
}, {}, {}, {}, {}, {});
|
|
255
|
+
const fileNames = files.map((file) => file.xmlPath);
|
|
256
|
+
expect(fileNames.length).toBe(2);
|
|
257
|
+
expect(fileNames).toContain('src/commands/junit/__tests__/fixtures/autodiscovery/junit-report.xml');
|
|
258
|
+
expect(fileNames).toContain('src/commands/junit/__tests__/fixtures/autodiscovery/nested/TEST-suite.xml');
|
|
210
259
|
}));
|
|
211
260
|
});
|
|
212
261
|
describe('getSpanTags', () => {
|
|
@@ -316,7 +365,7 @@ describe('upload', () => {
|
|
|
316
365
|
const context = (0, fixtures_1.createMockContext)();
|
|
317
366
|
const command = new upload_1.UploadJUnitXMLCommand();
|
|
318
367
|
const xPathTags = command['parseXPathTags'].call({
|
|
319
|
-
basePaths: ['
|
|
368
|
+
basePaths: ['src/commands/junit/__tests__/fixtures'],
|
|
320
369
|
config: {},
|
|
321
370
|
context,
|
|
322
371
|
service: 'service',
|
|
@@ -330,7 +379,7 @@ describe('upload', () => {
|
|
|
330
379
|
const context = (0, fixtures_1.createMockContext)();
|
|
331
380
|
const command = new upload_1.UploadJUnitXMLCommand();
|
|
332
381
|
command['parseXPathTags'].call({
|
|
333
|
-
basePaths: ['
|
|
382
|
+
basePaths: ['src/commands/junit/__tests__/fixtures'],
|
|
334
383
|
config: {},
|
|
335
384
|
context,
|
|
336
385
|
service: 'service',
|
|
@@ -349,7 +398,7 @@ describe('execute', () => {
|
|
|
349
398
|
return { context, code };
|
|
350
399
|
});
|
|
351
400
|
test('relative path with double dots', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
352
|
-
const { context, code } = yield runCLI(['
|
|
401
|
+
const { context, code } = yield runCLI(['src/commands/junit/__tests__/doesnotexist/../fixtures']);
|
|
353
402
|
const output = context.stdout.toString().split(os_1.default.EOL);
|
|
354
403
|
expect(code).toBe(0);
|
|
355
404
|
checkConsoleOutput(output, {
|
|
@@ -359,7 +408,7 @@ describe('execute', () => {
|
|
|
359
408
|
});
|
|
360
409
|
}));
|
|
361
410
|
test('multiple paths', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
362
|
-
const { context, code } = yield runCLI(['
|
|
411
|
+
const { context, code } = yield runCLI(['src/commands/junit/first/', 'src/commands/junit/second/']);
|
|
363
412
|
const output = context.stdout.toString().split(os_1.default.EOL);
|
|
364
413
|
expect(code).toBe(0);
|
|
365
414
|
checkConsoleOutput(output, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload.test.js","sourceRoot":"","sources":["../../../../src/commands/junit/__tests__/upload.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"upload.test.js","sourceRoot":"","sources":["../../../../src/commands/junit/__tests__/upload.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,4CAAmB;AAEnB,qDAA0C;AAE1C,kEAAqE;AACrE,6DAAoC;AAGpC,0CAA6C;AAC7C,sCAA+C;AAE/C,IAAI,CAAC,IAAI,CAAC,qBAAqB,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAA;AAEjD,MAAM,OAAO,GAAG,GAAG,EAAE;IACnB,MAAM,GAAG,GAAG,IAAI,cAAG,EAAE,CAAA;IACrB,GAAG,CAAC,QAAQ,CAAC,8BAAqB,CAAC,CAAA;IAEnC,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA;AAED,QAAQ,CAAC,QAAQ,EAAE,GAAG,EAAE;IACtB,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;QAC5B,IAAI,CAAC,+CAA+C,EAAE,GAAG,EAAE;YACzD,OAAO,CAAC,GAAG,GAAG,EAAE,CAAA;YAChB,MAAM,KAAK,GAAG,IAAI,CAAC,EAAE,EAAE,CAAA;YACvB,MAAM,OAAO,GAAG,IAAI,8BAAqB,EAAE,CAAA;YAC3C,OAAO,CAAC,OAAO,GAAG,EAAC,MAAM,EAAE,EAAC,KAAK,EAAC,EAAQ,CAAA;YAE1C,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAA;YAC3E,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,CAAA;QACxD,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IACF,QAAQ,CAAC,0BAA0B,EAAE,GAAG,EAAE;QACxC,IAAI,CAAC,mDAAmD,EAAE,GAAS,EAAE;YACnE,MAAM,OAAO,GAAG,IAAA,4BAAiB,GAAE,CAAA;YACnC,MAAM,OAAO,GAAG,IAAI,8BAAqB,EAAE,CAAA;YAC3C,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,0BAA0B,CAAC,CAAC,IAAI,CAC1D;gBACE,SAAS,EAAE,CAAC,uCAAuC,CAAC;gBACpD,MAAM,EAAE,EAAE;gBACV,OAAO;gBACP,OAAO,EAAE,SAAS;aACnB,EACD,EAAE,EACF,EAAE,EACF,EAAE,EACF,EAAE,EACF,EAAE,CACH,CAAA;YAED,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;YAC5B,MAAM,SAAS,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YACnD,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,qDAAqD,CAAC,CAAA;YAClF,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,uDAAuD,CAAC,CAAA;YAEpF,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAA;YACxC,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CACtB,IAAA,4BAAiB,EAAC,iDAAiD,EAAE,qBAAqB,CAAC,CAC5F,CAAA;YACD,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CACtB,IAAA,4BAAiB,EACf,mDAAmD,EACnD,wDAAwD,CACzD,CACF,CAAA;QACH,CAAC,CAAA,CAAC,CAAA;QACF,IAAI,CAAC,2BAA2B,EAAE,GAAS,EAAE;YAC3C,MAAM,OAAO,GAAG,IAAA,4BAAiB,GAAE,CAAA;YACnC,MAAM,OAAO,GAAG,IAAI,8BAAqB,EAAE,CAAA;YAC3C,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,0BAA0B,CAAC,CAAC,IAAI,CAC1D;gBACE,SAAS,EAAE,CAAC,qDAAqD,CAAC;gBAClE,MAAM,EAAE,EAAE;gBACV,OAAO;gBACP,OAAO,EAAE,SAAS;aACnB,EACD,EAAE,EACF,EAAE,EACF,EAAE,EACF,EAAE,EACF,EAAE,CACH,CAAA;YAED,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;YAE/B,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;gBAC7B,OAAO,EAAE,qDAAqD;aAC/D,CAAC,CAAA;QACJ,CAAC,CAAA,CAAC,CAAA;QACF,IAAI,CAAC,0CAA0C,EAAE,GAAS,EAAE;YAC1D,MAAM,OAAO,GAAG,IAAA,4BAAiB,GAAE,CAAA;YACnC,MAAM,OAAO,GAAG,IAAI,8BAAqB,EAAE,CAAA;YAC3C,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,0BAA0B,CAAC,CAAC,IAAI,CAC1D;gBACE,SAAS,EAAE,CAAC,0DAA0D,CAAC;gBACvE,MAAM,EAAE,EAAE;gBACV,OAAO;gBACP,OAAO,EAAE,SAAS;aACnB,EACD,EAAE,EACF,EAAE,EACF,EAAE,EACF,EAAE,EACF,EAAE,CACH,CAAA;YAED,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;QACjC,CAAC,CAAA,CAAC,CAAA;QACF,IAAI,CAAC,2CAA2C,EAAE,GAAS,EAAE;YAC3D,MAAM,OAAO,GAAG,IAAA,4BAAiB,GAAE,CAAA;YACnC,MAAM,OAAO,GAAG,IAAI,8BAAqB,EAAE,CAAA;YAC3C,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,0BAA0B,CAAC,CAAC,IAAI,CAC1D;gBACE,SAAS,EAAE;oBACT,uCAAuC;oBACvC,+DAA+D;iBAChE;gBACD,MAAM,EAAE,EAAE;gBACV,OAAO;gBACP,OAAO,EAAE,SAAS;aACnB,EACD,EAAE,EACF,EAAE,EACF,EAAE,EACF,EAAE,EACF,EAAE,CACH,CAAA;YAED,iEAAiE;YACjE,MAAM,SAAS,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YACnD,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;YACnC,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,qDAAqD,CAAC,CAAA;YAClF,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,uDAAuD,CAAC,CAAA;YACpF,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,+DAA+D,CAAC,CAAA;QAC9F,CAAC,CAAA,CAAC,CAAA;QACF,IAAI,CAAC,sCAAsC,EAAE,GAAS,EAAE;YACtD,MAAM,OAAO,GAAG,IAAA,4BAAiB,GAAE,CAAA;YACnC,MAAM,OAAO,GAAG,IAAI,8BAAqB,EAAE,CAAA;YAC3C,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,0BAA0B,CAAC,CAAC,IAAI,CAC1D;gBACE,SAAS,EAAE,CAAC,iDAAiD,CAAC;gBAC9D,MAAM,EAAE,EAAE;gBACV,OAAO;gBACP,OAAO,EAAE,SAAS;aACnB,EACD,EAAE,EACF,EAAE,EACF,EAAE,EACF,EAAE,EACF,EAAE,CACH,CAAA;YAED,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;YAC5B,MAAM,SAAS,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YACnD,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,oEAAoE,CAAC,CAAA;YACjG,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,kEAAkE,CAAC,CAAA;QACjG,CAAC,CAAA,CAAC,CAAA;QACF,IAAI,CAAC,gCAAgC,EAAE,GAAS,EAAE;YAChD,MAAM,OAAO,GAAG,IAAA,4BAAiB,GAAE,CAAA;YACnC,MAAM,OAAO,GAAG,IAAI,8BAAqB,EAAE,CAAA;YAC3C,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,0BAA0B,CAAC,CAAC,IAAI,CAC1D;gBACE,SAAS,EAAE,CAAC,uCAAuC,EAAE,qDAAqD,CAAC;gBAC3G,MAAM,EAAE,EAAE;gBACV,OAAO;gBACP,OAAO,EAAE,SAAS;aACnB,EACD,EAAE,EACF,EAAE,EACF,EAAE,EACF,EAAE,EACF,EAAE,CACH,CAAA;YAED,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;QACjC,CAAC,CAAA,CAAC,CAAA;QACF,IAAI,CAAC,qBAAqB,EAAE,GAAS,EAAE;YACrC,MAAM,OAAO,GAAG,IAAA,4BAAiB,GAAE,CAAA;YACnC,MAAM,OAAO,GAAG,IAAI,8BAAqB,EAAE,CAAA;YAC3C,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,0BAA0B,CAAC,CAAC,IAAI,CAC1D;gBACE,SAAS,EAAE,CAAC,uCAAuC,CAAC;gBACpD,MAAM,EAAE,EAAE;gBACV,OAAO;gBACP,OAAO,EAAE,SAAS;aACnB,EACD,EAAE,EACF,EAAE,EACF,EAAE,EACF,EAAE,EACF,EAAE,CACH,CAAA;YAED,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;YAC5B,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;gBACrB,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,YAAE,CAAC,QAAQ,EAAE,CAAC,CAAA;YAC9C,CAAC,CAAC,CAAA;QACJ,CAAC,CAAA,CAAC,CAAA;QACF,IAAI,CAAC,sCAAsC,EAAE,GAAS,EAAE;YACtD,OAAO,CAAC,GAAG,CAAC,4BAA4B,GAAG,MAAM,CAAA;YACjD,MAAM,OAAO,GAAG,IAAA,4BAAiB,GAAE,CAAA;YACnC,MAAM,OAAO,GAAG,IAAI,8BAAqB,EAAE,CAAA;YAC3C,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,0BAA0B,CAAC,CAAC,IAAI,CAC1D;gBACE,SAAS,EAAE,CAAC,uCAAuC,CAAC;gBACpD,MAAM,EAAE,EAAE;gBACV,OAAO;gBACP,IAAI,EAAE,IAAI;gBACV,OAAO,EAAE,SAAS;aACnB,EACD,EAAE,EACF,EAAE,EACF,EAAE,EACF,EAAE,EACF,EAAE,CACH,CAAA;YAED,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;YAC5B,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;gBACrB,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YACrC,CAAC,CAAC,CAAA;QACJ,CAAC,CAAA,CAAC,CAAA;QACF,IAAI,CAAC,+CAA+C,EAAE,GAAS,EAAE;YAC/D,OAAO,CAAC,GAAG,CAAC,4BAA4B,GAAG,MAAM,CAAA;YACjD,MAAM,OAAO,GAAG,IAAA,4BAAiB,GAAE,CAAA;YACnC,MAAM,OAAO,GAAG,IAAI,8BAAqB,EAAE,CAAA;YAC3C,MAAM,OAAO,CAAC,0BAA0B,CAAC,CAAC,IAAI,CAC5C;gBACE,SAAS,EAAE,CAAC,sEAAsE,CAAC;gBACnF,MAAM,EAAE,EAAE;gBACV,OAAO;gBACP,IAAI,EAAE,IAAI;gBACV,OAAO,EAAE,SAAS;aACnB,EACD,EAAE,EACF,EAAE,EACF,EAAE,EACF,EAAE,EACF,EAAE,CACH,CAAA;YACD,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAA;YACxC,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CACtB,IAAA,4BAAiB,EACf,sEAAsE,EACtE,mEAAmE,CACpE,CACF,CAAA;QACH,CAAC,CAAA,CAAC,CAAA;QACF,IAAI,CAAC,6BAA6B,EAAE,GAAS,EAAE;YAC7C,MAAM,OAAO,GAAG,IAAA,4BAAiB,GAAE,CAAA;YACnC,MAAM,OAAO,GAAG,IAAI,8BAAqB,EAAE,CAAA;YAC3C,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,0BAA0B,CAAC,CAAC,IAAI,CAC1D;gBACE,SAAS,EAAE,CAAC,mBAAmB,CAAC;gBAChC,MAAM,EAAE,EAAE;gBACV,OAAO;gBACP,OAAO,EAAE,SAAS;aACnB,EACD,EAAE,EACF,EAAE,EACF,EAAE,EACF,EAAE,EACF,EAAE,CACH,CAAA;YACD,MAAM,SAAS,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YAEnD,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;YAChC,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,uDAAuD,CAAC,CAAA;YACpF,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,yDAAyD,CAAC,CAAA;YACtF,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,sEAAsE,CAAC,CAAA;YACnG,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,oEAAoE,CAAC,CAAA;YACjG,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,iEAAiE,CAAC,CAAA;YAC9F,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,wEAAwE,CAAC,CAAA;YACrG,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,wEAAwE,CAAC,CAAA;YACrG,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,6EAA6E,CAAC,CAAA;QAC5G,CAAC,CAAA,CAAC,CAAA;QACF,IAAI,CAAC,sDAAsD,EAAE,GAAS,EAAE;YACtE,MAAM,OAAO,GAAG,IAAA,4BAAiB,GAAE,CAAA;YACnC,MAAM,OAAO,GAAG,IAAI,8BAAqB,EAAE,CAAA;YAC3C,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,0BAA0B,CAAC,CAAC,IAAI,CAC1D;gBACE,SAAS,EAAE,CAAC,aAAa,CAAC;gBAC1B,MAAM,EAAE,EAAE;gBACV,OAAO;gBACP,OAAO,EAAE,SAAS;aACnB,EACD,EAAE,EACF,EAAE,EACF,EAAE,EACF,EAAE,EACF,EAAE,CACH,CAAA;YACD,MAAM,SAAS,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YAEnD,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;YAChC,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,uDAAuD,CAAC,CAAA;YACpF,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,yDAAyD,CAAC,CAAA;YACtF,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,sEAAsE,CAAC,CAAA;YACnG,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,oEAAoE,CAAC,CAAA;YACjG,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,iEAAiE,CAAC,CAAA;YAC9F,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,wEAAwE,CAAC,CAAA;YACrG,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,wEAAwE,CAAC,CAAA;YACrG,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,6EAA6E,CAAC,CAAA;QAC5G,CAAC,CAAA,CAAC,CAAA;QACF,IAAI,CAAC,qEAAqE,EAAE,GAAS,EAAE;YACrF,MAAM,OAAO,GAAG,IAAA,4BAAiB,GAAE,CAAA;YACnC,MAAM,OAAO,GAAG,IAAI,8BAAqB,EAAE,CAAA;YAC3C,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,0BAA0B,CAAC,CAAC,IAAI,CAC1D;gBACE,SAAS,EAAE,CAAC,qDAAqD,CAAC;gBAClE,yBAAyB,EAAE,IAAI;gBAC/B,MAAM,EAAE,EAAE;gBACV,OAAO;gBACP,OAAO,EAAE,SAAS;aACnB,EACD,EAAE,EACF,EAAE,EACF,EAAE,EACF,EAAE,EACF,EAAE,CACH,CAAA;YAED,MAAM,SAAS,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YACnD,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;YAChC,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,sEAAsE,CAAC,CAAA;YACnG,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,sEAAsE,CAAC,CAAA;YACnG,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,2EAA2E,CAAC,CAAA;YACxG,MAAM,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,sEAAsE,CAAC,CAAA;QACzG,CAAC,CAAA,CAAC,CAAA;QACF,IAAI,CAAC,uEAAuE,EAAE,GAAS,EAAE;YACvF,MAAM,OAAO,GAAG,IAAA,4BAAiB,GAAE,CAAA;YACnC,MAAM,OAAO,GAAG,IAAI,8BAAqB,EAAE,CAAA;YAC3C,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,0BAA0B,CAAC,CAAC,IAAI,CAC1D;gBACE,SAAS,EAAE,CAAC,qDAAqD,CAAC;gBAClE,yBAAyB,EAAE,IAAI;gBAC/B,YAAY,EAAE,4DAA4D;gBAC1E,MAAM,EAAE,EAAE;gBACV,OAAO;gBACP,OAAO,EAAE,SAAS;aACnB,EACD,EAAE,EACF,EAAE,EACF,EAAE,EACF,EAAE,EACF,EAAE,CACH,CAAA;YAED,MAAM,SAAS,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YACnD,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;YAChC,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,sEAAsE,CAAC,CAAA;YACnG,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,sEAAsE,CAAC,CAAA;QACrG,CAAC,CAAA,CAAC,CAAA;QACF,IAAI,CAAC,+DAA+D,EAAE,GAAS,EAAE;YAC/E,MAAM,OAAO,GAAG,IAAA,4BAAiB,GAAE,CAAA;YACnC,MAAM,OAAO,GAAG,IAAI,8BAAqB,EAAE,CAAA;YAC3C,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,0BAA0B,CAAC,CAAC,IAAI,CAC1D;gBACE,SAAS,EAAE;oBACT,4DAA4D;oBAC5D,sEAAsE;iBACvE;gBACD,yBAAyB,EAAE,IAAI;gBAC/B,MAAM,EAAE,EAAE;gBACV,OAAO;gBACP,OAAO,EAAE,SAAS;aACnB,EACD,EAAE,EACF,EAAE,EACF,EAAE,EACF,EAAE,EACF,EAAE,CACH,CAAA;YAED,MAAM,SAAS,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YACnD,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;YAChC,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,sEAAsE,CAAC,CAAA;YACnG,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,2EAA2E,CAAC,CAAA;QAC1G,CAAC,CAAA,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IACF,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;QAC3B,IAAI,CAAC,0CAA0C,EAAE,GAAS,EAAE;YAC1D,OAAO,CAAC,GAAG,CAAC,MAAM,GAAG,IAAI,CAAA;YACzB,MAAM,OAAO,GAAG,IAAA,4BAAiB,GAAE,CAAA;YACnC,MAAM,OAAO,GAAG,IAAI,8BAAqB,EAAE,CAAA;YAC3C,MAAM,QAAQ,GAAa,MAAM,OAAO,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC;gBAC3D,MAAM,EAAE;oBACN,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,MAAM;iBACxB;gBACD,OAAO;aACR,CAAC,CAAA;YACF,MAAM,CAAC,QAAQ,CAAC,CAAC,aAAa,CAAC;gBAC7B,GAAG,EAAE,IAAI;aACV,CAAC,CAAA;QACJ,CAAC,CAAA,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IACF,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;QAC/B,IAAI,CAAC,4BAA4B,EAAE,GAAS,EAAE;YAC5C,MAAM,OAAO,GAAG,IAAA,4BAAiB,GAAE,CAAA;YACnC,MAAM,OAAO,GAAG,IAAI,8BAAqB,EAAE,CAAA;YAC3C,MAAM,QAAQ,GAAa,OAAO,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC;gBACvD,MAAM,EAAE,EAAE;gBACV,OAAO;gBACP,IAAI,EAAE,CAAC,aAAa,EAAE,aAAa,CAAC;aACrC,CAAC,CAAA;YAEF,MAAM,CAAC,QAAQ,CAAC,CAAC,aAAa,CAAC;gBAC7B,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,QAAQ;aACf,CAAC,CAAA;QACJ,CAAC,CAAA,CAAC,CAAA;QACF,IAAI,CAAC,2CAA2C,EAAE,GAAS,EAAE;YAC3D,OAAO,CAAC,GAAG,CAAC,OAAO,GAAG,qCAAqC,CAAA;YAC3D,MAAM,OAAO,GAAG,IAAA,4BAAiB,GAAE,CAAA;YACnC,MAAM,OAAO,GAAG,IAAI,8BAAqB,EAAE,CAAA;YAC3C,MAAM,QAAQ,GAAa,OAAO,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC;gBACvD,MAAM,EAAE;oBACN,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO;iBAChC;gBACD,OAAO;aACR,CAAC,CAAA;YACF,MAAM,CAAC,QAAQ,CAAC,CAAC,aAAa,CAAC;gBAC7B,IAAI,EAAE,oBAAoB;gBAC1B,IAAI,EAAE,QAAQ;aACf,CAAC,CAAA;QACJ,CAAC,CAAA,CAAC,CAAA;QACF,IAAI,CAAC,gCAAgC,EAAE,GAAS,EAAE;YAChD,MAAM,OAAO,GAAG,IAAA,4BAAiB,GAAE,CAAA;YACnC,MAAM,OAAO,GAAG,IAAI,8BAAqB,EAAE,CAAA;YAC3C,MAAM,QAAQ,GAAa,OAAO,CAAC,mBAAmB,CAAC,CAAC,IAAI,CAAC;gBAC3D,MAAM,EAAE,EAAE;gBACV,OAAO;gBACP,QAAQ,EAAE,CAAC,SAAS,EAAE,SAAS,CAAC;aACjC,CAAC,CAAA;YAEF,MAAM,CAAC,QAAQ,CAAC,CAAC,aAAa,CAAC;gBAC7B,IAAI,EAAE,EAAE;gBACR,IAAI,EAAE,EAAE;aACT,CAAC,CAAA;QACJ,CAAC,CAAA,CAAC,CAAA;QACF,IAAI,CAAC,+CAA+C,EAAE,GAAS,EAAE;YAC/D,OAAO,CAAC,GAAG,CAAC,WAAW,GAAG,kDAAkD,CAAA;YAC5E,MAAM,OAAO,GAAG,IAAA,4BAAiB,GAAE,CAAA;YACnC,MAAM,OAAO,GAAG,IAAI,8BAAqB,EAAE,CAAA;YAC3C,MAAM,QAAQ,GAAa,OAAO,CAAC,mBAAmB,CAAC,CAAC,IAAI,CAAC;gBAC3D,MAAM,EAAE;oBACN,cAAc,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW;iBACxC;gBACD,OAAO;aACR,CAAC,CAAA;YAEF,MAAM,CAAC,QAAQ,CAAC,CAAC,aAAa,CAAC;gBAC7B,IAAI,EAAE,GAAG;gBACT,IAAI,EAAE,GAAG;gBACT,IAAI,EAAE,KAAK;gBACX,IAAI,EAAE,CAAC,IAAI;aACZ,CAAC,CAAA;QACJ,CAAC,CAAA,CAAC,CAAA;QACF,IAAI,CAAC,mCAAmC,EAAE,GAAS,EAAE;YACnD,MAAM,OAAO,GAAG,IAAA,4BAAiB,GAAE,CAAA;YACnC,MAAM,OAAO,GAAG,IAAI,8BAAqB,EAAE,CAAA;YAC3C,MAAM,QAAQ,GAAa,OAAO,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC;gBACvD,MAAM,EAAE,EAAE;gBACV,OAAO;gBACP,UAAU,EAAE,CAAC,aAAa,EAAE,aAAa,CAAC;aAC3C,CAAC,CAAA;YAEF,MAAM,CAAC,QAAQ,CAAC,CAAC,aAAa,CAAC;gBAC7B,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,QAAQ;aACf,CAAC,CAAA;QACJ,CAAC,CAAA,CAAC,CAAA;QACF,IAAI,CAAC,uCAAuC,EAAE,GAAS,EAAE;YACvD,MAAM,OAAO,GAAG,IAAA,4BAAiB,GAAE,CAAA;YACnC,MAAM,OAAO,GAAG,IAAI,8BAAqB,EAAE,CAAA;YAC3C,MAAM,QAAQ,GAAa,OAAO,CAAC,mBAAmB,CAAC,CAAC,IAAI,CAAC;gBAC3D,MAAM,EAAE,EAAE;gBACV,OAAO;gBACP,cAAc,EAAE,CAAC,SAAS,EAAE,SAAS,CAAC;aACvC,CAAC,CAAA;YAEF,MAAM,CAAC,QAAQ,CAAC,CAAC,aAAa,CAAC;gBAC7B,IAAI,EAAE,EAAE;gBACR,IAAI,EAAE,EAAE;aACT,CAAC,CAAA;QACJ,CAAC,CAAA,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IACF,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;QAC9B,IAAI,CAAC,+BAA+B,EAAE,GAAS,EAAE;YAC/C,MAAM,OAAO,GAAG,IAAA,4BAAiB,GAAE,CAAA;YACnC,MAAM,OAAO,GAAG,IAAI,8BAAqB,EAAE,CAAA;YAC3C,MAAM,SAAS,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAC9C;gBACE,SAAS,EAAE,CAAC,uCAAuC,CAAC;gBACpD,MAAM,EAAE,EAAE;gBACV,OAAO;gBACP,OAAO,EAAE,SAAS;aACnB,EACD,CAAC,iCAAiC,EAAE,0DAA0D,CAAC,CAChG,CAAA;YACD,MAAM,CAAC,SAAS,CAAC,CAAC,aAAa,CAAC;gBAC9B,YAAY,EAAE,sBAAsB;gBACpC,UAAU,EAAE,+CAA+C;aAC5D,CAAC,CAAA;QACJ,CAAC,CAAA,CAAC,CAAA;QACF,IAAI,CAAC,gCAAgC,EAAE,GAAS,EAAE;YAChD,MAAM,OAAO,GAAG,IAAA,4BAAiB,GAAE,CAAA;YACnC,MAAM,OAAO,GAAG,IAAI,8BAAqB,EAAE,CAAA;YAC3C,OAAO,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAC5B;gBACE,SAAS,EAAE,CAAC,uCAAuC,CAAC;gBACpD,MAAM,EAAE,EAAE;gBACV,OAAO;gBACP,OAAO,EAAE,SAAS;aACnB,EACD,CAAC,iCAAiC,EAAE,SAAS,CAAC,CAC/C,CAAA;YACD,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,YAAE,CAAC,GAAG,CAAC,CAAA;YACzD,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,eAAe,CAAC,CAAA;QACjD,CAAC,CAAA,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA;AAEF,QAAQ,CAAC,SAAS,EAAE,GAAG,EAAE;IACvB,MAAM,MAAM,GAAG,CAAO,SAAmB,EAAE,EAAE;QAC3C,MAAM,GAAG,GAAG,OAAO,EAAE,CAAA;QACrB,MAAM,OAAO,GAAG,IAAA,4BAAiB,GAAS,CAAA;QAC1C,OAAO,CAAC,GAAG,GAAG,EAAC,UAAU,EAAE,aAAa,EAAC,CAAA;QACzC,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,GAAG,CACxB,CAAC,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,cAAc,EAAE,WAAW,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC,EACrF,OAAO,CACR,CAAA;QAED,OAAO,EAAC,OAAO,EAAE,IAAI,EAAC,CAAA;IACxB,CAAC,CAAA,CAAA;IACD,IAAI,CAAC,gCAAgC,EAAE,GAAS,EAAE;QAChD,MAAM,EAAC,OAAO,EAAE,IAAI,EAAC,GAAG,MAAM,MAAM,CAAC,CAAC,uDAAuD,CAAC,CAAC,CAAA;QAC/F,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,YAAE,CAAC,GAAG,CAAC,CAAA;QACtD,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QACpB,kBAAkB,CAAC,MAAM,EAAE;YACzB,SAAS,EAAE,CAAC,uCAAuC,CAAC;YACpD,WAAW,EAAE,EAAE;YACf,OAAO,EAAE,cAAc;SACxB,CAAC,CAAA;IACJ,CAAC,CAAA,CAAC,CAAA;IACF,IAAI,CAAC,gBAAgB,EAAE,GAAS,EAAE;QAChC,MAAM,EAAC,OAAO,EAAE,IAAI,EAAC,GAAG,MAAM,MAAM,CAAC,CAAC,2BAA2B,EAAE,4BAA4B,CAAC,CAAC,CAAA;QACjG,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,YAAE,CAAC,GAAG,CAAC,CAAA;QACtD,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QACpB,kBAAkB,CAAC,MAAM,EAAE;YACzB,SAAS,EAAE,CAAC,2BAA2B,EAAE,4BAA4B,CAAC;YACtE,WAAW,EAAE,EAAE;YACf,OAAO,EAAE,cAAc;SACxB,CAAC,CAAA;IACJ,CAAC,CAAA,CAAC,CAAA;IAEF,IAAI,CAAC,eAAe,EAAE,GAAS,EAAE;QAC/B,MAAM,EAAC,OAAO,EAAE,IAAI,EAAC,GAAG,MAAM,MAAM,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,wCAAwC,CAAC,CAAC,CAAA;QAChG,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,YAAE,CAAC,GAAG,CAAC,CAAA;QACtD,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QACpB,kBAAkB,CAAC,MAAM,EAAE;YACzB,SAAS,EAAE,CAAC,GAAG,OAAO,CAAC,GAAG,EAAE,wCAAwC,CAAC;YACrE,WAAW,EAAE,EAAE;YACf,OAAO,EAAE,cAAc;SACxB,CAAC,CAAA;IACJ,CAAC,CAAA,CAAC,CAAA;IAEF,IAAI,CAAC,aAAa,EAAE,GAAS,EAAE;QAC7B,MAAM,EAAC,OAAO,EAAE,IAAI,EAAC,GAAG,MAAM,MAAM,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,wDAAwD,CAAC,CAAC,CAAA;QAChH,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,YAAE,CAAC,GAAG,CAAC,CAAA;QACtD,MAAM,IAAI,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,wDAAwD,CAAA;QACrF,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QACpB,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,iDAAiD,CAAC,CAAA;QAC9E,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,sCAAsC,CAAC,CAAA;QACnE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,8BAA8B,IAAI,EAAE,CAAC,CAAA;QACjE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,uBAAuB,CAAC,CAAA;IACtD,CAAC,CAAA,CAAC,CAAA;IAEF,IAAI,CAAC,4DAA4D,EAAE,GAAS,EAAE;QAC5E,MAAM,EAAC,OAAO,EAAE,IAAI,EAAC,GAAG,MAAM,MAAM,CAAC;YACnC,WAAW;YACX,OAAO,CAAC,GAAG,EAAE,GAAG,wDAAwD;SACzE,CAAC,CAAA;QACF,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,YAAE,CAAC,GAAG,CAAC,CAAA;QACtD,MAAM,CAAC,YAAE,CAAC,CAAC,gBAAgB,EAAE,CAAA;QAC7B,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QACpB,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,sBAAsB,CAAC,CAAA;IACrD,CAAC,CAAA,CAAC,CAAA;IAEF,IAAI,CAAC,sCAAsC,EAAE,GAAS,EAAE;QACtD,MAAM,EAAC,OAAO,EAAE,IAAI,EAAC,GAAG,MAAM,MAAM,CAAC;YACnC,WAAW;YACX,4BAA4B;YAC5B,OAAO,CAAC,GAAG,EAAE,GAAG,wDAAwD;SACzE,CAAC,CAAA;QACF,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,YAAE,CAAC,GAAG,CAAC,CAAA;QACtD,MAAM,CAAC,YAAE,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAA;QACjC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QACpB,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,0DAA0D,CAAC,CAAA;IACzF,CAAC,CAAA,CAAC,CAAA;IAEF,IAAI,CAAC,+CAA+C,EAAE,GAAS,EAAE;QAC/D,MAAM,EAAC,OAAO,EAAE,IAAI,EAAC,GAAG,MAAM,MAAM,CAAC;YACnC,WAAW;YACX,8BAA8B;YAC9B,OAAO,CAAC,GAAG,EAAE,GAAG,wDAAwD;SACzE,CAAC,CAAA;QACF,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,YAAE,CAAC,GAAG,CAAC,CAAA;QACtD,MAAM,CAAC,YAAE,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAA;QACjC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QACpB,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,0DAA0D,CAAC,CAAA;IACzF,CAAC,CAAA,CAAC,CAAA;IAEF,IAAI,CAAC,4CAA4C,EAAE,GAAS,EAAE;QAC5D,MAAM,EAAC,OAAO,EAAE,IAAI,EAAC,GAAG,MAAM,MAAM,CAAC;YACnC,8BAA8B;YAC9B,OAAO,CAAC,GAAG,EAAE,GAAG,wDAAwD;SACzE,CAAC,CAAA;QACF,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,YAAE,CAAC,GAAG,CAAC,CAAA;QACtD,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QACpB,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,sBAAsB,CAAC,CAAA;IACrD,CAAC,CAAA,CAAC,CAAA;IAEF,IAAI,CAAC,oDAAoD,EAAE,GAAS,EAAE;QACpE,MAAM,MAAM,CAAC;YACX,8BAA8B;YAC9B,OAAO,CAAC,GAAG,EAAE,GAAG,wDAAwD;SACzE,CAAC,CAAA;QACF,MAAM,CAAC,YAAE,CAAC,CAAC,gBAAgB,EAAE,CAAA;IAC/B,CAAC,CAAA,EAAE,QAAQ,CAAC,CAAA;AACd,CAAC,CAAC,CAAA;AAQF,MAAM,kBAAkB,GAAG,CAAC,MAAgB,EAAE,QAAwB,EAAE,EAAE;IACxE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,iDAAiD,CAAC,CAAA;IAC9E,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,oCAAoC,QAAQ,CAAC,WAAW,GAAG,CAAC,CAAA;IACxF,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,oCAAoC,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;IAChG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,YAAY,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAA;AAC7D,CAAC,CAAA"}
|
|
@@ -6,7 +6,7 @@ export declare const renderFailedGitDBSync: (err: any) => string;
|
|
|
6
6
|
export declare const renderRetriedUpload: (payload: Payload, errorMessage: string, attempt: number) => string;
|
|
7
7
|
export declare const renderSuccessfulUpload: (dryRun: boolean, fileCount: number, duration: number) => string;
|
|
8
8
|
export declare const renderSuccessfulGitDBSync: (dryRun: boolean, elapsed: number) => string;
|
|
9
|
-
export declare const renderSuccessfulCommand: (spanTags: SpanTags, service
|
|
9
|
+
export declare const renderSuccessfulCommand: (spanTags: SpanTags, service?: string, env?: string) => string;
|
|
10
10
|
export declare const renderDryRunUpload: (payload: Payload) => string;
|
|
11
11
|
export declare const renderUpload: (payload: Payload) => string;
|
|
12
|
-
export declare const renderCommandInfo: (basePaths: string[], service: string, concurrency: number, dryRun: boolean) => string;
|
|
12
|
+
export declare const renderCommandInfo: (basePaths: string[], service: string | undefined, concurrency: number, dryRun: boolean) => string;
|
|
@@ -73,7 +73,9 @@ const renderCommandInfo = (basePaths, service, concurrency, dryRun) => {
|
|
|
73
73
|
else {
|
|
74
74
|
fullStr += chalk_1.default.green(`Will look for jUnit XML files in ${basePaths.join(', ')}\n`);
|
|
75
75
|
}
|
|
76
|
-
|
|
76
|
+
if (service) {
|
|
77
|
+
fullStr += chalk_1.default.green(`service: ${service}`);
|
|
78
|
+
}
|
|
77
79
|
return fullStr;
|
|
78
80
|
};
|
|
79
81
|
exports.renderCommandInfo = renderCommandInfo;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../../src/commands/junit/renderer.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAuB;AAEvB,kDAAyB;AAKzB,mCAAgE;AAEhE,MAAM,KAAK,GAAG;IACZ,MAAM,EAAE,GAAG;IACX,OAAO,EAAE,GAAG;IACZ,OAAO,EAAE,IAAI;CACd,CAAA;AAEM,MAAM,iBAAiB,GAAG,CAAC,OAAe,EAAE,YAAoB,EAAE,EAAE;IACzE,MAAM,YAAY,GAAG,IAAI,eAAK,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAA;IAEnD,OAAO,eAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,MAAM,0BAA0B,YAAY,KAAK,YAAY,IAAI,CAAC,CAAA;AAC9F,CAAC,CAAA;AAJY,QAAA,iBAAiB,qBAI7B;AAEM,MAAM,kBAAkB,GAAG,CAAC,OAAgB,EAAE,YAAoB,EAAE,EAAE;IAC3E,MAAM,YAAY,GAAG,IAAI,eAAK,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAA;IAE3D,OAAO,eAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,MAAM,+BAA+B,YAAY,KAAK,YAAY,IAAI,CAAC,CAAA;AACnG,CAAC,CAAA;AAJY,QAAA,kBAAkB,sBAI9B;AAEM,MAAM,qBAAqB,GAAG,CAAC,GAAQ,EAAE,EAAE;IAChD,OAAO,eAAK,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,MAAM,iCAAiC,GAAG,IAAI,CAAC,CAAA;AAChF,CAAC,CAAA;AAFY,QAAA,qBAAqB,yBAEjC;AAEM,MAAM,mBAAmB,GAAG,CAAC,OAAgB,EAAE,YAAoB,EAAE,OAAe,EAAE,EAAE;IAC7F,MAAM,YAAY,GAAG,IAAI,eAAK,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAA;IAE3D,OAAO,eAAK,CAAC,MAAM,CAAC,YAAY,OAAO,8BAA8B,YAAY,KAAK,YAAY,IAAI,CAAC,CAAA;AACzG,CAAC,CAAA;AAJY,QAAA,mBAAmB,uBAI/B;AAEM,MAAM,sBAAsB,GAAG,CAAC,MAAe,EAAE,SAAiB,EAAE,QAAgB,EAAE,EAAE;IAC7F,OAAO,eAAK,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,GAAG,KAAK,CAAC,OAAO,aAAa,SAAS,aAAa,QAAQ,WAAW,CAAC,CAAA;AACxH,CAAC,CAAA;AAFY,QAAA,sBAAsB,0BAElC;AAEM,MAAM,yBAAyB,GAAG,CAAC,MAAe,EAAE,OAAe,EAAE,EAAE;IAC5E,OAAO,eAAK,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,GAAG,KAAK,CAAC,OAAO,2BAA2B,OAAO,WAAW,CAAC,CAAA;AAC/G,CAAC,CAAA;AAFY,QAAA,yBAAyB,6BAErC;AAEM,MAAM,uBAAuB,GAAG,CAAC,QAAkB,EAAE,
|
|
1
|
+
{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../../src/commands/junit/renderer.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,6 +18,8 @@ export declare class UploadJUnitXMLCommand extends Command {
|
|
|
18
18
|
private skipGitMetadataUpload;
|
|
19
19
|
private fips;
|
|
20
20
|
private fipsIgnoreError;
|
|
21
|
+
private automaticReportsDiscovery;
|
|
22
|
+
private ignoredPaths;
|
|
21
23
|
private config;
|
|
22
24
|
private xpathTags?;
|
|
23
25
|
private logger;
|
|
@@ -42,12 +42,12 @@ const path_1 = __importDefault(require("path"));
|
|
|
42
42
|
const chalk_1 = __importDefault(require("chalk"));
|
|
43
43
|
const clipanion_1 = require("clipanion");
|
|
44
44
|
const fast_xml_parser_1 = require("fast-xml-parser");
|
|
45
|
-
const glob_1 = require("glob");
|
|
46
45
|
const t = __importStar(require("typanion"));
|
|
47
46
|
const constants_1 = require("../../constants");
|
|
48
47
|
const ci_1 = require("../../helpers/ci");
|
|
49
48
|
const concurrency_1 = require("../../helpers/concurrency");
|
|
50
49
|
const env_1 = require("../../helpers/env");
|
|
50
|
+
const file_finder_1 = require("../../helpers/file-finder");
|
|
51
51
|
const fips_1 = require("../../helpers/fips");
|
|
52
52
|
const format_git_span_data_1 = require("../../helpers/git/format-git-span-data");
|
|
53
53
|
const id_1 = __importDefault(require("../../helpers/id"));
|
|
@@ -57,15 +57,24 @@ const tags_1 = require("../../helpers/tags");
|
|
|
57
57
|
const user_provided_git_1 = require("../../helpers/user-provided-git");
|
|
58
58
|
const utils_1 = require("../../helpers/utils");
|
|
59
59
|
const validation = __importStar(require("../../helpers/validation"));
|
|
60
|
+
const git_metadata_1 = require("../git-metadata");
|
|
60
61
|
const git_1 = require("../git-metadata/git");
|
|
61
62
|
const gitdb_1 = require("../git-metadata/gitdb");
|
|
62
|
-
const library_1 = require("../git-metadata/library");
|
|
63
63
|
const api_1 = require("./api");
|
|
64
64
|
const renderer_1 = require("./renderer");
|
|
65
|
-
const utils_2 = require("./utils");
|
|
66
65
|
const TRACE_ID_HTTP_HEADER = 'x-datadog-trace-id';
|
|
67
66
|
const PARENT_ID_HTTP_HEADER = 'x-datadog-parent-id';
|
|
68
67
|
const errorCodesStopUpload = [400, 403];
|
|
68
|
+
const isJunitXmlReport = (file) => {
|
|
69
|
+
if (path_1.default.extname(file) !== '.xml') {
|
|
70
|
+
return false;
|
|
71
|
+
}
|
|
72
|
+
const filename = path_1.default.basename(file);
|
|
73
|
+
return (filename.includes('junit') || // *junit*.xml
|
|
74
|
+
filename.includes('test') || // *test*.xml
|
|
75
|
+
filename.includes('TEST-') // *TEST-*.xml
|
|
76
|
+
);
|
|
77
|
+
};
|
|
69
78
|
const validateXml = (xmlFilePath) => {
|
|
70
79
|
const xmlFileContentString = String(fs_1.default.readFileSync(xmlFilePath));
|
|
71
80
|
const validationOutput = fast_xml_parser_1.XMLValidator.validate(xmlFileContentString);
|
|
@@ -109,6 +118,11 @@ class UploadJUnitXMLCommand extends clipanion_1.Command {
|
|
|
109
118
|
});
|
|
110
119
|
this.fips = clipanion_1.Option.Boolean('--fips', false);
|
|
111
120
|
this.fipsIgnoreError = clipanion_1.Option.Boolean('--fips-ignore-error', false);
|
|
121
|
+
this.automaticReportsDiscovery = clipanion_1.Option.String('--auto-discovery', 'false', {
|
|
122
|
+
validator: t.isBoolean(),
|
|
123
|
+
tolerateBoolean: true,
|
|
124
|
+
});
|
|
125
|
+
this.ignoredPaths = clipanion_1.Option.String('--ignored-paths');
|
|
112
126
|
this.config = {
|
|
113
127
|
apiKey: process.env.DATADOG_API_KEY || process.env.DD_API_KEY,
|
|
114
128
|
env: process.env.DD_ENV,
|
|
@@ -125,10 +139,6 @@ class UploadJUnitXMLCommand extends clipanion_1.Command {
|
|
|
125
139
|
(0, fips_1.enableFips)(this.fips || this.config.fips, this.fipsIgnoreError || this.config.fipsIgnoreError);
|
|
126
140
|
this.logger.setLogLevel(this.verbose ? logger_1.LogLevel.DEBUG : logger_1.LogLevel.INFO);
|
|
127
141
|
this.logger.setShouldIncludeTime(this.verbose);
|
|
128
|
-
if (!this.service) {
|
|
129
|
-
this.context.stderr.write('Missing service\n');
|
|
130
|
-
return 1;
|
|
131
|
-
}
|
|
132
142
|
if (!this.basePaths || !this.basePaths.length) {
|
|
133
143
|
this.context.stderr.write('Missing basePath\n');
|
|
134
144
|
return 1;
|
|
@@ -159,7 +169,7 @@ class UploadJUnitXMLCommand extends clipanion_1.Command {
|
|
|
159
169
|
const totalTimeSeconds = (Date.now() - initialTime) / 1000;
|
|
160
170
|
this.logger.info((0, renderer_1.renderSuccessfulUpload)(this.dryRun, payloads.length, totalTimeSeconds));
|
|
161
171
|
if (!this.skipGitMetadataUpload) {
|
|
162
|
-
if (yield (0,
|
|
172
|
+
if (yield (0, git_metadata_1.isGitRepo)()) {
|
|
163
173
|
const traceId = (0, id_1.default)();
|
|
164
174
|
const requestBuilder = (0, utils_1.getRequestBuilder)({
|
|
165
175
|
baseUrl: api_1.apiUrl,
|
|
@@ -220,35 +230,21 @@ class UploadJUnitXMLCommand extends clipanion_1.Command {
|
|
|
220
230
|
}
|
|
221
231
|
getMatchingJUnitXMLFiles(spanTags, customTags, customMeasures, reportTags, reportMeasures) {
|
|
222
232
|
return __awaiter(this, void 0, void 0, function* () {
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
const filesToUpload = glob_1.glob
|
|
239
|
-
.sync(globPattern, { dotRelative: true })
|
|
240
|
-
.filter((file) => path_1.default.extname(file) === '.xml');
|
|
241
|
-
return acc.concat(filesToUpload);
|
|
242
|
-
}, [])
|
|
243
|
-
.filter(utils_2.isFile);
|
|
244
|
-
const validUniqueFiles = [...new Set(jUnitXMLFiles)].filter((jUnitXMLFilePath) => {
|
|
245
|
-
const validationErrorMessage = validateXml(jUnitXMLFilePath);
|
|
246
|
-
if (validationErrorMessage) {
|
|
247
|
-
this.context.stdout.write((0, renderer_1.renderInvalidFile)(jUnitXMLFilePath, validationErrorMessage));
|
|
248
|
-
return false;
|
|
249
|
-
}
|
|
250
|
-
return true;
|
|
251
|
-
});
|
|
233
|
+
let basePaths;
|
|
234
|
+
let searchFoldersRecursively;
|
|
235
|
+
let filterFile;
|
|
236
|
+
if (this.automaticReportsDiscovery) {
|
|
237
|
+
basePaths = this.basePaths || ['.'];
|
|
238
|
+
searchFoldersRecursively = true;
|
|
239
|
+
filterFile = isJunitXmlReport;
|
|
240
|
+
}
|
|
241
|
+
else {
|
|
242
|
+
// maintaining legacy matching logic for backward compatibility
|
|
243
|
+
basePaths = this.basePaths || [];
|
|
244
|
+
searchFoldersRecursively = false;
|
|
245
|
+
filterFile = (file) => path_1.default.extname(file) === '.xml';
|
|
246
|
+
}
|
|
247
|
+
const validUniqueFiles = (0, file_finder_1.findFiles)(basePaths, searchFoldersRecursively, (0, utils_1.parsePathsList)(this.ignoredPaths), filterFile, validateXml, (filePath, errorMessage) => this.context.stdout.write((0, renderer_1.renderInvalidFile)(filePath, errorMessage)));
|
|
252
248
|
return validUniqueFiles.map((jUnitXMLFilePath) => ({
|
|
253
249
|
hostname: os_1.default.hostname(),
|
|
254
250
|
logsEnabled: this.logs,
|
|
@@ -328,6 +324,14 @@ UploadJUnitXMLCommand.usage = clipanion_1.Command.Usage({
|
|
|
328
324
|
`,
|
|
329
325
|
examples: [
|
|
330
326
|
['Upload all jUnit XML test report files in current directory', 'datadog-ci junit upload --service my-service .'],
|
|
327
|
+
[
|
|
328
|
+
'Discover and upload all jUnit XML test report files doing recursive search in current directory',
|
|
329
|
+
'datadog-ci junit upload --service my-service --auto-discovery .',
|
|
330
|
+
],
|
|
331
|
+
[
|
|
332
|
+
'Discover and upload all jUnit XML test report files doing recursive search in current directory, ignoring src/ignored-module-a and src/ignored-module-b',
|
|
333
|
+
'datadog-ci junit upload --service my-service --ignored-paths src/ignored-module-a,src/ignored-module-b --auto-discovery .',
|
|
334
|
+
],
|
|
331
335
|
[
|
|
332
336
|
'Upload all jUnit XML test report files in src/unit-test-reports and src/acceptance-test-reports',
|
|
333
337
|
'datadog-ci junit upload --service my-service src/unit-test-reports src/acceptance-test-reports',
|