spec-box-tms-sync 0.4.0 → 0.4.2
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 +11 -2
- package/dist/commands/markdown.d.ts.map +1 -1
- package/dist/commands/markdown.js +2 -2
- package/dist/commands/markdown.js.map +1 -1
- package/dist/commands/sync.d.ts.map +1 -1
- package/dist/commands/sync.js +2 -2
- package/dist/commands/sync.js.map +1 -1
- package/dist/commands/validate-only.d.ts.map +1 -1
- package/dist/commands/validate-only.js +2 -2
- package/dist/commands/validate-only.js.map +1 -1
- package/dist/lib/config/index.d.ts +2 -2
- package/dist/lib/config/index.d.ts.map +1 -1
- package/dist/lib/config/index.js +3 -3
- package/dist/lib/config/index.js.map +1 -1
- package/dist/lib/config/models.d.ts +5 -0
- package/dist/lib/config/models.d.ts.map +1 -1
- package/dist/lib/config/models.js +6 -2
- package/dist/lib/config/models.js.map +1 -1
- package/dist/lib/domain/keys.js +1 -1
- package/dist/lib/domain/keys.js.map +1 -1
- package/dist/lib/markdown/index.js +1 -1
- package/dist/lib/markdown/index.js.map +1 -1
- package/dist/lib/test-matcher/index.d.ts.map +1 -1
- package/dist/lib/test-matcher/index.js +11 -2
- package/dist/lib/test-matcher/index.js.map +1 -1
- package/dist/lib/test-matcher/junit/index.d.ts.map +1 -1
- package/dist/lib/test-matcher/junit/index.js +12 -5
- package/dist/lib/test-matcher/junit/index.js.map +1 -1
- package/dist/lib/test-matcher/junit/models.d.ts +3 -0
- package/dist/lib/test-matcher/junit/models.d.ts.map +1 -1
- package/dist/lib/test-matcher/junit/models.js +2 -0
- package/dist/lib/test-matcher/junit/models.js.map +1 -1
- package/dist/lib/validators/models.d.ts +2 -2
- package/dist/lib/validators/models.d.ts.map +1 -1
- package/dist/lib/validators/models.js +2 -2
- package/dist/lib/validators/models.js.map +1 -1
- package/dist/lib/validators/renderer.d.ts +3 -3
- package/dist/lib/validators/renderer.d.ts.map +1 -1
- package/dist/lib/validators/renderer.js +10 -7
- package/dist/lib/validators/renderer.js.map +1 -1
- package/dist/lib/validators/validator.d.ts +3 -0
- package/dist/lib/validators/validator.d.ts.map +1 -1
- package/dist/lib/validators/validator.js +16 -13
- package/dist/lib/validators/validator.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -254,8 +254,9 @@ describe('Главная страница', () => {
|
|
|
254
254
|
- `"assertionTitle"` — название ФТ
|
|
255
255
|
- `"filePath"` — путь к yml файлу, относительно корня проекта
|
|
256
256
|
- `"fileName"` — название yml файла без расширения (от начала до первого символа `.`)
|
|
257
|
-
-
|
|
258
|
-
-
|
|
257
|
+
- `"@<attribute>"` — значение указанного атрибута (идентификатор значения)
|
|
258
|
+
- `"$<attribute>"` — значение указанного атрибута (человеко-понятное название)
|
|
259
|
+
- `"Любой текст"` - значение может быть использовано как разделитель
|
|
259
260
|
|
|
260
261
|
## Экспорт спецификаций в формате Markdown
|
|
261
262
|
|
|
@@ -283,6 +284,14 @@ describe('Главная страница', () => {
|
|
|
283
284
|
"host": "http://localhost:5059",
|
|
284
285
|
"project": "id"
|
|
285
286
|
},
|
|
287
|
+
// уровни ошибок: error / warning / info / off
|
|
288
|
+
"validation": {
|
|
289
|
+
// ссылка на несуществующую фичу
|
|
290
|
+
"feature-missing-link": "error",
|
|
291
|
+
|
|
292
|
+
// тест, не описанный в yml
|
|
293
|
+
"jest-unused": "error"
|
|
294
|
+
}
|
|
286
295
|
"yml": {
|
|
287
296
|
// путь к файлу с мета-информацией, относительно корня проекта, опционально
|
|
288
297
|
"metaPath": "./configs/spec-box-meta.yml",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"markdown.d.ts","sourceRoot":"","sources":["../../src/commands/markdown.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAEtC,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAI7C,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,EAAE,EAAE,aAAa,
|
|
1
|
+
{"version":3,"file":"markdown.d.ts","sourceRoot":"","sources":["../../src/commands/markdown.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAEtC,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAI7C,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,EAAE,EAAE,aAAa,CAwBxD,CAAC"}
|
|
@@ -8,8 +8,8 @@ exports.cmdMarkdown = {
|
|
|
8
8
|
handler: async (args) => {
|
|
9
9
|
console.log('Export to Markdown');
|
|
10
10
|
const { config } = args;
|
|
11
|
-
const { yml, api, markdown, projectPath } = await (0, config_1.loadConfig)(config);
|
|
12
|
-
const { projectData, validationContext } = await (0, config_1.loadProject)(yml.metaPath, yml.files, projectPath);
|
|
11
|
+
const { yml, api, markdown, projectPath, validation = {} } = await (0, config_1.loadConfig)(config);
|
|
12
|
+
const { projectData, validationContext } = await (0, config_1.loadProject)(yml.metaPath, yml.files, projectPath, validation);
|
|
13
13
|
validationContext.printReport();
|
|
14
14
|
if (validationContext.hasCriticalErrors) {
|
|
15
15
|
throw Error('Экспорт невозможен из-за наличия критических ошибок');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"markdown.js","sourceRoot":"","sources":["../../src/commands/markdown.ts"],"names":[],"mappings":";;;AAGA,0CAAwD;AACxD,8CAAiD;AAEpC,QAAA,WAAW,GAAqC;IAC3D,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QACtB,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;QAClC,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;QACxB,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,MAAM,IAAA,mBAAU,EAAC,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"markdown.js","sourceRoot":"","sources":["../../src/commands/markdown.ts"],"names":[],"mappings":";;;AAGA,0CAAwD;AACxD,8CAAiD;AAEpC,QAAA,WAAW,GAAqC;IAC3D,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QACtB,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;QAClC,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;QACxB,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,WAAW,EAAE,UAAU,GAAG,EAAE,EAAE,GAAG,MAAM,IAAA,mBAAU,EAAC,MAAM,CAAC,CAAC;QAEtF,MAAM,EAAE,WAAW,EAAE,iBAAiB,EAAE,GAAG,MAAM,IAAA,oBAAW,EAC1D,GAAG,CAAC,QAAQ,EACZ,GAAG,CAAC,KAAK,EACT,WAAW,EACX,UAAU,CACX,CAAC;QAGF,iBAAiB,CAAC,WAAW,EAAE,CAAC;QAChC,IAAI,iBAAiB,CAAC,iBAAiB,EAAE;YACvC,MAAM,KAAK,CAAC,qDAAqD,CAAC,CAAC;SACpE;QAED,MAAM,IAAA,yBAAc,EAAC,WAAW,EAAE,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,KAAI,MAAM,CAAC,CAAC;QAE5D,OAAO,CAAC,GAAG,CAAC,mBAAmB,GAAG,CAAC,OAAO,mBAAmB,CAAC,CAAC;IACjE,CAAC;CACF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../src/commands/sync.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAOtC,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C,eAAO,MAAM,OAAO,EAAE,aAAa,CAAC,EAAE,EAAE,aAAa,
|
|
1
|
+
{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../src/commands/sync.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAOtC,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C,eAAO,MAAM,OAAO,EAAE,aAAa,CAAC,EAAE,EAAE,aAAa,CAmCpD,CAAC"}
|
package/dist/commands/sync.js
CHANGED
|
@@ -11,8 +11,8 @@ exports.cmdSync = {
|
|
|
11
11
|
handler: async (args) => {
|
|
12
12
|
console.log('SYNC');
|
|
13
13
|
const { config, prjversion: version } = args;
|
|
14
|
-
const { yml, api, jest, JUnit, projectPath } = await (0, config_1.loadConfig)(config);
|
|
15
|
-
const { projectData, validationContext } = await (0, config_1.loadProject)(yml.metaPath, yml.files, projectPath);
|
|
14
|
+
const { yml, api, jest, JUnit, projectPath, validation = {} } = await (0, config_1.loadConfig)(config);
|
|
15
|
+
const { projectData, validationContext } = await (0, config_1.loadProject)(yml.metaPath, yml.files, projectPath, validation);
|
|
16
16
|
if (jest) {
|
|
17
17
|
const jestReport = await (0, jest_1.loadJestReport)(jest.reportPath, projectPath);
|
|
18
18
|
(0, test_matcher_1.applyTestReport)(validationContext, projectData, jestReport, jest.keys);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync.js","sourceRoot":"","sources":["../../src/commands/sync.ts"],"names":[],"mappings":";;;AAEA,0CAAwD;AACxD,sDAAsD;AACtD,mDAA0D;AAC1D,qDAA4D;AAC5D,mEAA+D;AAGlD,QAAA,OAAO,GAAqC;IACvD,OAAO,EAAE,MAAM;IACf,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QACtB,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACpB,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;QAC7C,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,MAAM,IAAA,mBAAU,EAAC,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"sync.js","sourceRoot":"","sources":["../../src/commands/sync.ts"],"names":[],"mappings":";;;AAEA,0CAAwD;AACxD,sDAAsD;AACtD,mDAA0D;AAC1D,qDAA4D;AAC5D,mEAA+D;AAGlD,QAAA,OAAO,GAAqC;IACvD,OAAO,EAAE,MAAM;IACf,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QACtB,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACpB,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;QAC7C,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,UAAU,GAAG,EAAE,EAAE,GAAG,MAAM,IAAA,mBAAU,EAAC,MAAM,CAAC,CAAC;QAEzF,MAAM,EAAE,WAAW,EAAE,iBAAiB,EAAE,GAAG,MAAM,IAAA,oBAAW,EAC1D,GAAG,CAAC,QAAQ,EACZ,GAAG,CAAC,KAAK,EACT,WAAW,EACX,UAAU,CACX,CAAC;QAEF,IAAI,IAAI,EAAE;YACR,MAAM,UAAU,GAAG,MAAM,IAAA,qBAAc,EAAC,IAAI,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;YAEtE,IAAA,8BAAe,EAAC,iBAAiB,EAAE,WAAW,EAAE,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;SACxE;QAED,IAAI,KAAK,EAAE;YACT,MAAM,WAAW,GAAG,MAAM,IAAA,uBAAe,EAAC,KAAK,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;YAEzE,IAAA,8BAAe,EAAC,iBAAiB,EAAE,WAAW,EAAE,WAAW,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;SAC1E;QAED,iBAAiB,CAAC,WAAW,EAAE,CAAC;QAChC,IAAI,iBAAiB,CAAC,iBAAiB,EAAE;YACvC,MAAM,KAAK,CAAC,sDAAsD,CAAC,CAAC;SACrE;QAED,OAAO,CAAC,GAAG,CAAC,oBAAoB,GAAG,CAAC,OAAO,WAAW,OAAO,EAAE,CAAC,CAAC;QACjE,MAAM,IAAA,gCAAc,EAAC,WAAW,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;QAChD,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;IAC5C,CAAC;CACF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate-only.d.ts","sourceRoot":"","sources":["../../src/commands/validate-only.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAMtC,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C,eAAO,MAAM,eAAe,EAAE,aAAa,CAAC,EAAE,EAAE,aAAa,
|
|
1
|
+
{"version":3,"file":"validate-only.d.ts","sourceRoot":"","sources":["../../src/commands/validate-only.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAMtC,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C,eAAO,MAAM,eAAe,EAAE,aAAa,CAAC,EAAE,EAAE,aAAa,CA4B5D,CAAC"}
|
|
@@ -9,8 +9,8 @@ exports.cmdValidateOnly = {
|
|
|
9
9
|
command: 'validate',
|
|
10
10
|
handler: async (args) => {
|
|
11
11
|
console.log('VALIDATION');
|
|
12
|
-
const { yml, jest, JUnit, projectPath } = await (0, config_1.loadConfig)(args.config);
|
|
13
|
-
const { projectData, validationContext } = await (0, config_1.loadProject)(yml.metaPath, yml.files, projectPath);
|
|
12
|
+
const { yml, jest, JUnit, projectPath, validation = {} } = await (0, config_1.loadConfig)(args.config);
|
|
13
|
+
const { projectData, validationContext } = await (0, config_1.loadProject)(yml.metaPath, yml.files, projectPath, validation);
|
|
14
14
|
if (jest) {
|
|
15
15
|
const jestReport = await (0, jest_1.loadJestReport)(jest.reportPath, projectPath);
|
|
16
16
|
(0, test_matcher_1.applyTestReport)(validationContext, projectData, jestReport, jest.keys);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate-only.js","sourceRoot":"","sources":["../../src/commands/validate-only.ts"],"names":[],"mappings":";;;AAEA,0CAAwD;AACxD,sDAAsD;AACtD,mDAA0D;AAC1D,qDAA4D;AAG/C,QAAA,eAAe,GAAqC;IAC/D,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QACtB,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QAE1B,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,MAAM,IAAA,mBAAU,EAAC,IAAI,CAAC,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"validate-only.js","sourceRoot":"","sources":["../../src/commands/validate-only.ts"],"names":[],"mappings":";;;AAEA,0CAAwD;AACxD,sDAAsD;AACtD,mDAA0D;AAC1D,qDAA4D;AAG/C,QAAA,eAAe,GAAqC;IAC/D,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QACtB,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QAE1B,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,UAAU,GAAG,EAAE,EAAE,GAAG,MAAM,IAAA,mBAAU,EAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAEzF,MAAM,EAAE,WAAW,EAAE,iBAAiB,EAAE,GAAG,MAAM,IAAA,oBAAW,EAC1D,GAAG,CAAC,QAAQ,EACZ,GAAG,CAAC,KAAK,EACT,WAAW,EACX,UAAU,CACX,CAAC;QAEF,IAAI,IAAI,EAAE;YACR,MAAM,UAAU,GAAG,MAAM,IAAA,qBAAc,EAAC,IAAI,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;YAEtE,IAAA,8BAAe,EAAC,iBAAiB,EAAE,WAAW,EAAE,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;SACxE;QAED,IAAI,KAAK,EAAE;YACT,MAAM,WAAW,GAAG,MAAM,IAAA,uBAAe,EAAC,KAAK,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;YAEzE,IAAA,8BAAe,EAAC,iBAAiB,EAAE,WAAW,EAAE,WAAW,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;SAC1E;QAED,iBAAiB,CAAC,WAAW,EAAE,CAAC;IAClC,CAAC;CACF,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Validator } from '../validators';
|
|
2
|
-
import { Meta, RootConfig } from './models';
|
|
2
|
+
import { Meta, RootConfig, ValidationConfig } from './models';
|
|
3
3
|
export type { YmlConfig, Attribute, AttributeValue, Tree } from './models';
|
|
4
4
|
export declare const DEFAULT_CONFIG_PATH = ".tms.json";
|
|
5
5
|
export declare const DEFAULT_META_PATH = ".spec-box-meta.yml";
|
|
@@ -8,7 +8,7 @@ export declare const loadMeta: (validationContext: Validator, path?: string, bas
|
|
|
8
8
|
filePath: string;
|
|
9
9
|
meta: Meta;
|
|
10
10
|
}>;
|
|
11
|
-
export declare const loadProject: (metaPath: string | undefined, filePaths: string[], projectPath: string | undefined) => Promise<{
|
|
11
|
+
export declare const loadProject: (metaPath: string | undefined, filePaths: string[], projectPath: string | undefined, validation: ValidationConfig) => Promise<{
|
|
12
12
|
projectData: import("../domain").ProjectData;
|
|
13
13
|
validationContext: Validator;
|
|
14
14
|
}>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/lib/config/index.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,SAAS,EAAc,MAAM,eAAe,CAAC;AAEtD,OAAO,EAAE,IAAI,EAAE,UAAU,EAA8B,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/lib/config/index.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,SAAS,EAAc,MAAM,eAAe,CAAC;AAEtD,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,gBAAgB,EAA8B,MAAM,UAAU,CAAC;AAI1F,YAAY,EAAE,SAAS,EAAE,SAAS,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;AAE3E,eAAO,MAAM,mBAAmB,cAAc,CAAC;AAC/C,eAAO,MAAM,iBAAiB,uBAAuB,CAAC;AAEtD,eAAO,MAAM,UAAU,qBAEpB,QAAQ,UAAU,CAOpB,CAAC;AAEF,eAAO,MAAM,QAAQ,sBACA,SAAS,SACrB,MAAM,aACH,MAAM;cACK,MAAM;UAAQ,IAAI;EAexC,CAAC;AAEF,eAAO,MAAM,WAAW,aACZ,MAAM,GAAG,SAAS,aACjB,MAAM,EAAE,eACN,MAAM,GAAG,SAAS,cACnB,gBAAgB;;;EAgB7B,CAAC"}
|
package/dist/lib/config/index.js
CHANGED
|
@@ -29,13 +29,13 @@ const loadMeta = async (validationContext, path, basePath = utils_1.CWD // TODO:
|
|
|
29
29
|
return { filePath, meta };
|
|
30
30
|
}
|
|
31
31
|
catch (error) {
|
|
32
|
-
(0, validators_1.printError)((0, validator_1.getLoaderError)(error, filePath, 'config'));
|
|
32
|
+
(0, validators_1.printError)((0, validator_1.getLoaderError)(error, filePath, 'config'), validationContext.severity);
|
|
33
33
|
throw Error('Ошибка загрузки файла конфигурации');
|
|
34
34
|
}
|
|
35
35
|
};
|
|
36
36
|
exports.loadMeta = loadMeta;
|
|
37
|
-
const loadProject = async (metaPath, filePaths, projectPath) => {
|
|
38
|
-
const validationContext = new validators_1.Validator();
|
|
37
|
+
const loadProject = async (metaPath, filePaths, projectPath, validation) => {
|
|
38
|
+
const validationContext = new validators_1.Validator(validation);
|
|
39
39
|
const meta = await (0, exports.loadMeta)(validationContext, metaPath, projectPath);
|
|
40
40
|
const files = await (0, fast_glob_1.glob)(filePaths, { cwd: projectPath });
|
|
41
41
|
const yamls = await Promise.all(files.map((path) => (0, yaml_1.loadYaml)(validationContext, path, projectPath)));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/config/index.ts"],"names":[],"mappings":";;;AAAA,yCAAiC;AACjC,oCAMkB;AAClB,8CAAsD;AACtD,uDAAyD;AACzD,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/config/index.ts"],"names":[],"mappings":";;;AAAA,yCAAiC;AACjC,oCAMkB;AAClB,8CAAsD;AACtD,uDAAyD;AACzD,qCAA0F;AAC1F,kCAA6C;AAC7C,sCAA6C;AAIhC,QAAA,mBAAmB,GAAG,WAAW,CAAC;AAClC,QAAA,iBAAiB,GAAG,oBAAoB,CAAC;AAE/C,MAAM,UAAU,GAAG,KAAK,EAC7B,IAAI,GAAG,2BAAmB,EACL,EAAE;IACvB,MAAM,IAAI,GAAG,MAAM,IAAA,oBAAY,EAAC,IAAI,CAAC,CAAC;IACtC,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAE9B,MAAM,MAAM,GAAG,IAAA,mBAAW,EAAC,IAAI,EAAE,sBAAa,CAAC,CAAC;IAEhD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AATW,QAAA,UAAU,cASrB;AAEK,MAAM,QAAQ,GAAG,KAAK,EAC3B,iBAA4B,EAC5B,IAAa,EACb,WAAmB,WAAG,CAAC,gCAAgC;EACZ,EAAE;IAC7C,MAAM,QAAQ,GAAG,IAAI,IAAI,yBAAiB,CAAC;IAC3C,IAAI,UAAU,GAAG,IAAI;QACnB,CAAC,CAAC,IAAA,gBAAQ,EAAC,oBAAW,EAAE,QAAQ,EAAE,QAAQ,CAAC;QAC3C,CAAC,CAAC,IAAA,wBAAgB,EAAC,oBAAW,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAEtD,IAAI;QACF,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC;QACjC,MAAM,IAAI,GAAG,OAAO,IAAI,EAAE,CAAC;QAE3B,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;KAC3B;IAAC,OAAO,KAAK,EAAE;QACd,IAAA,uBAAU,EAAC,IAAA,0BAAc,EAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAAC,EAAE,iBAAiB,CAAC,QAAQ,CAAC,CAAC;QAClF,MAAM,KAAK,CAAC,oCAAoC,CAAC,CAAC;KACnD;AACH,CAAC,CAAC;AAnBW,QAAA,QAAQ,YAmBnB;AAEK,MAAM,WAAW,GAAG,KAAK,EAC9B,QAA4B,EAC5B,SAAmB,EACnB,WAA+B,EAC/B,UAA4B,EAC5B,EAAE;IACF,MAAM,iBAAiB,GAAG,IAAI,sBAAS,CAAC,UAAU,CAAC,CAAC;IAEpD,MAAM,IAAI,GAAG,MAAM,IAAA,gBAAQ,EAAC,iBAAiB,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;IACtE,MAAM,KAAK,GAAG,MAAM,IAAA,gBAAI,EAAC,SAAS,EAAE,EAAE,GAAG,EAAE,WAAW,EAAE,CAAC,CAAC;IAE1D,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,GAAG,CAC7B,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,eAAQ,EAAC,iBAAiB,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC,CACpE,CAAC;IACF,MAAM,YAAY,GAAG,IAAI,KAAK,EAAY,CAAC;IAC3C,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,IAAI,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAEzD,MAAM,WAAW,GAAG,IAAA,yBAAgB,EAAC,YAAY,EAAE,IAAI,CAAC,CAAC;IACzD,iBAAiB,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IACxC,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,CAAC;AAC5C,CAAC,CAAC;AApBW,QAAA,WAAW,eAoBtB"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import * as d from "io-ts/Decoder";
|
|
2
|
+
export declare const validationSeverityDecoder: d.Decoder<unknown, "error" | "off" | "warning" | "info">;
|
|
3
|
+
export declare const validationConfigDecoder: d.Decoder<unknown, Record<string, "error" | "off" | "warning" | "info">>;
|
|
2
4
|
export declare const attributeValueDecoder: d.Decoder<unknown, {
|
|
3
5
|
code: string;
|
|
4
6
|
title: string;
|
|
@@ -54,6 +56,7 @@ export declare const testReportConfigDecoder: d.Decoder<unknown, {
|
|
|
54
56
|
}>;
|
|
55
57
|
export declare const configDecoder: d.Decoder<unknown, Partial<{
|
|
56
58
|
projectPath: string;
|
|
59
|
+
validation: Record<string, "error" | "off" | "warning" | "info">;
|
|
57
60
|
jest: {
|
|
58
61
|
reportPath: string;
|
|
59
62
|
keys: string[];
|
|
@@ -81,6 +84,8 @@ export type ApiConfig = d.TypeOf<typeof apiConfigDecoder>;
|
|
|
81
84
|
export type YmlConfig = d.TypeOf<typeof ymlConfigDecoder>;
|
|
82
85
|
export type MarkdownConfig = d.TypeOf<typeof markdownConfigDecoder>;
|
|
83
86
|
export type TestConfig = d.TypeOf<typeof testReportConfigDecoder>;
|
|
87
|
+
export type ValidationConfig = d.TypeOf<typeof validationConfigDecoder>;
|
|
88
|
+
export type ValidationSeverity = d.TypeOf<typeof validationSeverityDecoder>;
|
|
84
89
|
export type Meta = d.TypeOf<typeof metaDecoder>;
|
|
85
90
|
export type Tree = d.TypeOf<typeof treeDecoder>;
|
|
86
91
|
export type Attribute = d.TypeOf<typeof attributeDecoder>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../../src/lib/config/models.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,CAAC,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../../src/lib/config/models.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,CAAC,MAAM,eAAe,CAAC;AAInC,eAAO,MAAM,yBAAyB,0DAKrC,CAAC;AAEF,eAAO,MAAM,uBAAuB,0EAAsC,CAAC;AAG3E,eAAO,MAAM,qBAAqB;;;EAGhC,CAAC;AAEH,eAAO,MAAM,gBAAgB;;;;;;;EAI3B,CAAC;AAEH,eAAO,MAAM,WAAW;;;;EAItB,CAAC;AAEH,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;;GAMtB,CAAC;AAGH,eAAO,MAAM,gBAAgB;;;EAG3B,CAAC;AAEH,eAAO,MAAM,gBAAgB;;;;EAQ5B,CAAC;AAEF,eAAO,MAAM,qBAAqB;;EAEhC,CAAC;AAEH,eAAO,MAAM,qBAAqB,gHAOjC,CAAC;AAEF,eAAO,MAAM,uBAAuB,4BASnC,CAAC;AAEF,eAAO,MAAM,uBAAuB;;;EAGlC,CAAC;AAEH,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;EAazB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,aAAa,CAAC,CAAC;AACxD,MAAM,MAAM,SAAS,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAC1D,MAAM,MAAM,SAAS,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAC1D,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,qBAAqB,CAAC,CAAC;AACpE,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,uBAAuB,CAAC,CAAC;AAClE,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,uBAAuB,CAAC,CAAC;AACxE,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,yBAAyB,CAAC,CAAC;AAE5E,MAAM,MAAM,IAAI,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,WAAW,CAAC,CAAC;AAChD,MAAM,MAAM,IAAI,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,WAAW,CAAC,CAAC;AAChD,MAAM,MAAM,SAAS,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAC1D,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,qBAAqB,CAAC,CAAC"}
|
|
@@ -1,9 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.configDecoder = exports.testReportConfigDecoder = exports.attributeKeyPartDecoder = exports.literalKeyPartDecoder = exports.markdownConfigDecoder = exports.ymlConfigDecoder = exports.apiConfigDecoder = exports.metaDecoder = exports.treeDecoder = exports.attributeDecoder = exports.attributeValueDecoder = void 0;
|
|
3
|
+
exports.configDecoder = exports.testReportConfigDecoder = exports.attributeKeyPartDecoder = exports.literalKeyPartDecoder = exports.markdownConfigDecoder = exports.ymlConfigDecoder = exports.apiConfigDecoder = exports.metaDecoder = exports.treeDecoder = exports.attributeDecoder = exports.attributeValueDecoder = exports.validationConfigDecoder = exports.validationSeverityDecoder = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const function_1 = require("fp-ts/lib/function");
|
|
6
6
|
const d = tslib_1.__importStar(require("io-ts/Decoder"));
|
|
7
|
+
// validation
|
|
8
|
+
exports.validationSeverityDecoder = d.union(d.literal('error'), d.literal('warning'), d.literal('info'), d.literal('off'));
|
|
9
|
+
exports.validationConfigDecoder = d.record(exports.validationSeverityDecoder);
|
|
7
10
|
// meta
|
|
8
11
|
exports.attributeValueDecoder = d.struct({
|
|
9
12
|
code: d.string,
|
|
@@ -48,13 +51,14 @@ exports.attributeKeyPartDecoder = (0, function_1.pipe)(d.string, d.parse((str) =
|
|
|
48
51
|
}));
|
|
49
52
|
exports.testReportConfigDecoder = d.struct({
|
|
50
53
|
reportPath: d.string,
|
|
51
|
-
keys: d.array(d.union(exports.literalKeyPartDecoder, exports.attributeKeyPartDecoder)),
|
|
54
|
+
keys: d.array(d.union(exports.literalKeyPartDecoder, exports.attributeKeyPartDecoder, d.string)),
|
|
52
55
|
});
|
|
53
56
|
exports.configDecoder = d.intersect(d.struct({
|
|
54
57
|
api: exports.apiConfigDecoder,
|
|
55
58
|
yml: exports.ymlConfigDecoder,
|
|
56
59
|
}))(d.partial({
|
|
57
60
|
projectPath: d.string,
|
|
61
|
+
validation: exports.validationConfigDecoder,
|
|
58
62
|
jest: exports.testReportConfigDecoder,
|
|
59
63
|
JUnit: exports.testReportConfigDecoder,
|
|
60
64
|
markdown: exports.markdownConfigDecoder,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"models.js","sourceRoot":"","sources":["../../../src/lib/config/models.ts"],"names":[],"mappings":";;;;AAAA,iDAA0C;AAC1C,yDAAmC;AAEnC,OAAO;AACM,QAAA,qBAAqB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC5C,IAAI,EAAE,CAAC,CAAC,MAAM;IACd,KAAK,EAAE,CAAC,CAAC,MAAM;CAChB,CAAC,CAAC;AAEU,QAAA,gBAAgB,GAAG,CAAC,CAAC,MAAM,CAAC;IACvC,IAAI,EAAE,CAAC,CAAC,MAAM;IACd,KAAK,EAAE,CAAC,CAAC,MAAM;IACf,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,6BAAqB,CAAC;CACvC,CAAC,CAAC;AAEU,QAAA,WAAW,GAAG,CAAC,CAAC,MAAM,CAAC;IAClC,IAAI,EAAE,CAAC,CAAC,MAAM;IACd,KAAK,EAAE,CAAC,CAAC,MAAM;IACf,UAAU,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC;CAC9B,CAAC,CAAC;AAEU,QAAA,WAAW,GAAG,CAAC,CAAC,OAAO,CAAC;IACnC,KAAK,EAAE,CAAC,CAAC,MAAM;IACf,WAAW,EAAE,CAAC,CAAC,MAAM;IACrB,UAAU,EAAE,CAAC,CAAC,MAAM;IACpB,UAAU,EAAE,CAAC,CAAC,KAAK,CAAC,wBAAgB,CAAC;IACrC,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,mBAAW,CAAC;CAC5B,CAAC,CAAC;AAEH,SAAS;AACI,QAAA,gBAAgB,GAAG,CAAC,CAAC,MAAM,CAAC;IACvC,IAAI,EAAE,CAAC,CAAC,MAAM;IACd,OAAO,EAAE,CAAC,CAAC,MAAM;CAClB,CAAC,CAAC;AAEU,QAAA,gBAAgB,GAAG,CAAC,CAAC,SAAS,CACzC,CAAC,CAAC,MAAM,CAAC;IACP,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC;CACzB,CAAC,CACH,CACC,CAAC,CAAC,OAAO,CAAC;IACR,QAAQ,EAAE,CAAC,CAAC,MAAM;CACnB,CAAC,CACH,CAAC;AAEW,QAAA,qBAAqB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC5C,IAAI,EAAE,CAAC,CAAC,MAAM;CACf,CAAC,CAAC;AAEU,QAAA,qBAAqB,GAAG,CAAC,CAAC,OAAO,CAC5C,cAAc,EACd,aAAa,EACb,YAAY,EACZ,gBAAgB,EAChB,UAAU,EACV,UAAU,CACX,CAAC;AAEW,QAAA,uBAAuB,GAAG,IAAA,eAAI,EACzC,CAAC,CAAC,MAAM,EACR,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;IACd,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;QACrB,OAAO,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;KAC9B;IAED,OAAO,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,2BAA2B,CAAC,CAAC;AACrD,CAAC,CAAC,CACH,CAAC;AAEW,QAAA,uBAAuB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC9C,UAAU,EAAE,CAAC,CAAC,MAAM;IACpB,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,6BAAqB,EAAE,+BAAuB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"models.js","sourceRoot":"","sources":["../../../src/lib/config/models.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/domain/keys.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keys.js","sourceRoot":"","sources":["../../../src/lib/domain/keys.ts"],"names":[],"mappings":";;;AAEa,QAAA,SAAS,GAAG,WAAW,CAAC;AACxB,QAAA,SAAS,GAAG,WAAW,CAAC;AAc9B,MAAM,oBAAoB,GAAG,CAClC,gBAA6B,EAAE,EACZ,EAAE;IACrB,MAAM,GAAG,GAAsB,EAAE,CAAC;IAElC,KAAK,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,aAAa,EAAE;QAC1C,6BAA6B;QAC7B,MAAM,IAAI,GAA2B,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;QAEtD,KAAK,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,MAAM,EAAE;YAClC,IAAI,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;SACpB;KACF;IAED,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAfW,QAAA,oBAAoB,wBAe/B;AAEF,MAAM,iBAAiB,GAAG,CACxB,aAAqB,EACrB,EAAE,UAAU,EAAoB,EAChC,aAAgC,EACa,EAAE;;IAC/C,MAAM,MAAM,GAAG,UAAU,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC;IAE/C,QAAQ,MAAM,CAAC,MAAM,EAAE;QACrB,KAAK,CAAC;YACJ,OAAO,SAAS,CAAC;QACnB,KAAK,CAAC;YACJ,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC;YACtB,MAAM,KAAK,GAAG,CAAA,MAAA,aAAa,CAAC,aAAa,CAAC,0CAAG,IAAI,CAAC,KAAI,IAAI,CAAC;YAE3D,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;QACzB;YACE,OAAO,EAAE,IAAI,EAAE,iBAAS,EAAE,KAAK,EAAE,iBAAS,EAAE,CAAC;KAChD;AACH,CAAC,CAAC;AAEK,MAAM,UAAU,GAAG,CACxB,KAAa,EACb,SAA2B,EAC3B,UAA6B,EACrB,EAAE;;IACV,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;QACzB,MAAM,aAAa,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAChD,OAAO,CACL,CAAA,MAAA,iBAAiB,CAAC,aAAa,EAAE,SAAS,EAAE,UAAU,CAAC,0CAAE,KAAK;YAC9D,iBAAS,CACV,CAAC;KACH;SAAM,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;QAChC,MAAM,aAAa,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC9C,OAAO,CACL,CAAA,MAAA,iBAAiB,CAAC,aAAa,EAAE,SAAS,EAAE,UAAU,CAAC,0CAAE,IAAI,KAAI,iBAAS,CAC3E,CAAC;KACH;IAED,QAAQ,KAAK,EAAE;QACb,KAAK,cAAc;YACjB,OAAO,SAAS,CAAC,YAAY,CAAC;QAChC,KAAK,aAAa;YAChB,OAAO,SAAS,CAAC,WAAW,CAAC;QAC/B,KAAK,YAAY;YACf,OAAO,SAAS,CAAC,UAAU,CAAC;QAC9B,KAAK,gBAAgB;YACnB,OAAO,SAAS,CAAC,cAAc,CAAC;QAClC,KAAK,UAAU;YACb,OAAO,SAAS,CAAC,QAAQ,CAAC;QAC5B,KAAK,UAAU;YACb,OAAO,SAAS,CAAC,QAAQ,CAAC;QAC5B;YACE,OAAO,
|
|
1
|
+
{"version":3,"file":"keys.js","sourceRoot":"","sources":["../../../src/lib/domain/keys.ts"],"names":[],"mappings":";;;AAEa,QAAA,SAAS,GAAG,WAAW,CAAC;AACxB,QAAA,SAAS,GAAG,WAAW,CAAC;AAc9B,MAAM,oBAAoB,GAAG,CAClC,gBAA6B,EAAE,EACZ,EAAE;IACrB,MAAM,GAAG,GAAsB,EAAE,CAAC;IAElC,KAAK,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,aAAa,EAAE;QAC1C,6BAA6B;QAC7B,MAAM,IAAI,GAA2B,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;QAEtD,KAAK,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,MAAM,EAAE;YAClC,IAAI,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;SACpB;KACF;IAED,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAfW,QAAA,oBAAoB,wBAe/B;AAEF,MAAM,iBAAiB,GAAG,CACxB,aAAqB,EACrB,EAAE,UAAU,EAAoB,EAChC,aAAgC,EACa,EAAE;;IAC/C,MAAM,MAAM,GAAG,UAAU,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC;IAE/C,QAAQ,MAAM,CAAC,MAAM,EAAE;QACrB,KAAK,CAAC;YACJ,OAAO,SAAS,CAAC;QACnB,KAAK,CAAC;YACJ,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC;YACtB,MAAM,KAAK,GAAG,CAAA,MAAA,aAAa,CAAC,aAAa,CAAC,0CAAG,IAAI,CAAC,KAAI,IAAI,CAAC;YAE3D,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;QACzB;YACE,OAAO,EAAE,IAAI,EAAE,iBAAS,EAAE,KAAK,EAAE,iBAAS,EAAE,CAAC;KAChD;AACH,CAAC,CAAC;AAEK,MAAM,UAAU,GAAG,CACxB,KAAa,EACb,SAA2B,EAC3B,UAA6B,EACrB,EAAE;;IACV,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;QACzB,MAAM,aAAa,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAChD,OAAO,CACL,CAAA,MAAA,iBAAiB,CAAC,aAAa,EAAE,SAAS,EAAE,UAAU,CAAC,0CAAE,KAAK;YAC9D,iBAAS,CACV,CAAC;KACH;SAAM,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;QAChC,MAAM,aAAa,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC9C,OAAO,CACL,CAAA,MAAA,iBAAiB,CAAC,aAAa,EAAE,SAAS,EAAE,UAAU,CAAC,0CAAE,IAAI,KAAI,iBAAS,CAC3E,CAAC;KACH;IAED,QAAQ,KAAK,EAAE;QACb,KAAK,cAAc;YACjB,OAAO,SAAS,CAAC,YAAY,CAAC;QAChC,KAAK,aAAa;YAChB,OAAO,SAAS,CAAC,WAAW,CAAC;QAC/B,KAAK,YAAY;YACf,OAAO,SAAS,CAAC,UAAU,CAAC;QAC9B,KAAK,gBAAgB;YACnB,OAAO,SAAS,CAAC,cAAc,CAAC;QAClC,KAAK,UAAU;YACb,OAAO,SAAS,CAAC,QAAQ,CAAC;QAC5B,KAAK,UAAU;YACb,OAAO,SAAS,CAAC,QAAQ,CAAC;QAC5B;YACE,OAAO,KAAK,CAAC;KAChB;AACH,CAAC,CAAC;AAlCW,QAAA,UAAU,cAkCrB;AAEK,MAAM,MAAM,GAAG,CACpB,KAAe,EACf,SAA2B,EAC3B,UAA6B,EAC7B,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAA,kBAAU,EAAC,GAAG,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC;AAJnD,QAAA,MAAM,UAI6C"}
|
|
@@ -19,7 +19,7 @@ const exportMarkdown = async (projectData, path) => {
|
|
|
19
19
|
const featureCodeToPath = new Map();
|
|
20
20
|
for (const feature of projectData.features) {
|
|
21
21
|
const featurePath = feature.filePath.slice(0, feature.filePath.lastIndexOf('.'));
|
|
22
|
-
featureCodeToPath.set(`$${feature.code}`, featurePath);
|
|
22
|
+
featureCodeToPath.set(`$${feature.code}`, featurePath + '.md');
|
|
23
23
|
}
|
|
24
24
|
for (const feature of projectData.features) {
|
|
25
25
|
const markDown = replaceInternalLinks((0, feature_to_markdown_1.featureToMarkdown)(feature), featureCodeToPath);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/markdown/index.ts"],"names":[],"mappings":";;;AACA,uDAAoD;AACpD,+CAA2C;AAC3C,+DAA0D;AAC1D,0CAA+C;AAE/C,MAAM,oBAAoB,GAAG,CAC3B,QAAgB,EAChB,OAA4B,EAC5B,EAAE;IACF,MAAM,EAAE,GAAG,IAAI,MAAM,CAAC,qBAAS,CAAC,CAAC;IACjC,OAAO,QAAQ,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,EAAE;QACnC,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC/B,IAAG,IAAI,EAAE;YACP,OAAO,KAAK,IAAI,MAAM,IAAI,IAAI,CAAA;SAC/B;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEK,MAAM,cAAc,GAAG,KAAK,EACjC,WAAwB,EACxB,IAAY,EACZ,EAAE;IACF,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAAkB,CAAC;IACpD,KAAK,MAAM,OAAO,IAAI,WAAW,CAAC,QAAQ,EAAE;QAC1C,MAAM,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,KAAK,CACxC,CAAC,EACD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG,CAAC,CAClC,CAAC;QACF,iBAAiB,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,IAAI,EAAE,EAAE,WAAW,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/markdown/index.ts"],"names":[],"mappings":";;;AACA,uDAAoD;AACpD,+CAA2C;AAC3C,+DAA0D;AAC1D,0CAA+C;AAE/C,MAAM,oBAAoB,GAAG,CAC3B,QAAgB,EAChB,OAA4B,EAC5B,EAAE;IACF,MAAM,EAAE,GAAG,IAAI,MAAM,CAAC,qBAAS,CAAC,CAAC;IACjC,OAAO,QAAQ,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,EAAE;QACnC,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC/B,IAAG,IAAI,EAAE;YACP,OAAO,KAAK,IAAI,MAAM,IAAI,IAAI,CAAA;SAC/B;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEK,MAAM,cAAc,GAAG,KAAK,EACjC,WAAwB,EACxB,IAAY,EACZ,EAAE;IACF,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAAkB,CAAC;IACpD,KAAK,MAAM,OAAO,IAAI,WAAW,CAAC,QAAQ,EAAE;QAC1C,MAAM,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,KAAK,CACxC,CAAC,EACD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG,CAAC,CAClC,CAAC;QACF,iBAAiB,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,IAAI,EAAE,EAAE,WAAW,GAAG,KAAK,CAAC,CAAC;KAChE;IAED,KAAK,MAAM,OAAO,IAAI,WAAW,CAAC,QAAQ,EAAE;QAC1C,MAAM,QAAQ,GAAG,oBAAoB,CAAC,IAAA,uCAAiB,EAAC,OAAO,CAAC,EAAE,iBAAiB,CAAC,CAAC;QAErF,MAAM,QAAQ,GACZ,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC;QACvE,MAAM,UAAU,GAAG,GAAG,IAAI,IAAI,QAAQ,EAAE,CAAC;QACzC,MAAM,eAAe,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,UAAU,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;QAEzE,MAAM,IAAA,gBAAK,EAAC,eAAe,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAClD,MAAM,IAAA,oBAAS,EAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;KACvC;IAED,IAAG,iBAAiB,CAAC,IAAI,GAAG,CAAC,EAAE;QAC7B,IAAA,oBAAS,EAAC,GAAG,IAAI,WAAW,EAAE,IAAA,wBAAU,EAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC,CAAC;KAC3E;AACH,CAAC,CAAC;AA5BW,QAAA,cAAc,kBA4BzB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/lib/test-matcher/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,WAAW,EACZ,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAEvD,eAAO,MAAM,WAAW,aAAc,MAAM,EAAE,WAAoB,CAAC;AAEnE,eAAO,MAAM,eAAe,sBAI1B,CAAC;AAEH,eAAO,MAAM,eAAe,sBACP,SAAS,4BACF,WAAW,UAC7B,UAAU,YACR,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/lib/test-matcher/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,WAAW,EACZ,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAEvD,eAAO,MAAM,WAAW,aAAc,MAAM,EAAE,WAAoB,CAAC;AAEnE,eAAO,MAAM,eAAe,sBAI1B,CAAC;AAEH,eAAO,MAAM,eAAe,sBACP,SAAS,4BACF,WAAW,UAC7B,UAAU,YACR,MAAM,EAAE,SA0DnB,CAAC"}
|
|
@@ -16,6 +16,7 @@ const applyTestReport = (validationContext, { features, attributes }, report, ke
|
|
|
16
16
|
paths.push(filePath || '');
|
|
17
17
|
names.set(name, paths);
|
|
18
18
|
}
|
|
19
|
+
const searchNames = [...names.keys()];
|
|
19
20
|
const attributesCtx = (0, domain_1.getAttributesContext)(attributes);
|
|
20
21
|
// заполняем поле isAutomated
|
|
21
22
|
for (let { title: featureTitle, code: featureCode, groups, fileName, filePath, attributes = {}, } of features) {
|
|
@@ -33,8 +34,16 @@ const applyTestReport = (validationContext, { features, attributes }, report, ke
|
|
|
33
34
|
};
|
|
34
35
|
const parts = (0, domain_1.getKey)(keyParts, assertionCtx, attributesCtx);
|
|
35
36
|
const fullName = (0, exports.getFullName)(...parts);
|
|
36
|
-
|
|
37
|
-
|
|
37
|
+
const fullyEquals = names.has(fullName);
|
|
38
|
+
if (fullyEquals) {
|
|
39
|
+
assertion.isAutomated = true;
|
|
40
|
+
names.delete(fullName);
|
|
41
|
+
}
|
|
42
|
+
const partlyEquals = searchNames.find(name => name.endsWith(fullName));
|
|
43
|
+
if (partlyEquals) {
|
|
44
|
+
assertion.isAutomated = true;
|
|
45
|
+
names.delete(partlyEquals);
|
|
46
|
+
}
|
|
38
47
|
}
|
|
39
48
|
}
|
|
40
49
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/test-matcher/index.ts"],"names":[],"mappings":";;;AAAA,sCAKmB;AAIZ,MAAM,WAAW,GAAG,CAAC,GAAG,KAAe,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAAtD,QAAA,WAAW,eAA2C;AAEtD,QAAA,eAAe,GAAG,IAAI,GAAG,CAAkB;IACtD,SAAS;IACT,MAAM;IACN,SAAS;CACV,CAAC,CAAC;AAEI,MAAM,eAAe,GAAG,CAC7B,iBAA4B,EAC5B,EAAE,QAAQ,EAAE,UAAU,EAAe,EACrC,MAAkB,EAClB,QAAkB,EAClB,EAAE;IACF,MAAM,KAAK,GAAG,IAAI,GAAG,EAAoB,CAAC;IAE1C,KAAK,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,MAAM,CAAC,WAAW,EAAE;QACjD,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QACpC,KAAK,CAAC,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC;QAC3B,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;KACxB;IAED,MAAM,aAAa,GAAG,IAAA,6BAAoB,EAAC,UAAU,CAAC,CAAC;IAEvD,6BAA6B;IAC7B,KAAK,IAAI,EACP,KAAK,EAAE,YAAY,EACnB,IAAI,EAAE,WAAW,EACjB,MAAM,EACN,QAAQ,EACR,QAAQ,EACR,UAAU,GAAG,EAAE,GAChB,IAAI,QAAQ,EAAE;QACb,KAAK,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,IAAI,MAAM,IAAI,EAAE,EAAE;YAC1D,KAAK,IAAI,SAAS,IAAI,UAAU,IAAI,EAAE,EAAE;gBACtC,4BAA4B;gBAC5B,MAAM,YAAY,GAAqB;oBACrC,YAAY;oBACZ,WAAW;oBACX,UAAU;oBACV,cAAc,EAAE,SAAS,CAAC,KAAK;oBAC/B,UAAU;oBACV,QAAQ;oBACR,QAAQ;iBACT,CAAC;gBAEF,MAAM,KAAK,GAAG,IAAA,eAAM,EAAC,QAAQ,EAAE,YAAY,EAAE,aAAa,CAAC,CAAC;gBAC5D,MAAM,QAAQ,GAAG,IAAA,mBAAW,EAAC,GAAG,KAAK,CAAC,CAAC;gBAEvC,SAAS,CAAC,WAAW,GAAG,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/test-matcher/index.ts"],"names":[],"mappings":";;;AAAA,sCAKmB;AAIZ,MAAM,WAAW,GAAG,CAAC,GAAG,KAAe,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAAtD,QAAA,WAAW,eAA2C;AAEtD,QAAA,eAAe,GAAG,IAAI,GAAG,CAAkB;IACtD,SAAS;IACT,MAAM;IACN,SAAS;CACV,CAAC,CAAC;AAEI,MAAM,eAAe,GAAG,CAC7B,iBAA4B,EAC5B,EAAE,QAAQ,EAAE,UAAU,EAAe,EACrC,MAAkB,EAClB,QAAkB,EAClB,EAAE;IACF,MAAM,KAAK,GAAG,IAAI,GAAG,EAAoB,CAAC;IAE1C,KAAK,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,MAAM,CAAC,WAAW,EAAE;QACjD,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QACpC,KAAK,CAAC,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC;QAC3B,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;KACxB;IAED,MAAM,WAAW,GAAG,CAAC,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;IAEtC,MAAM,aAAa,GAAG,IAAA,6BAAoB,EAAC,UAAU,CAAC,CAAC;IAEvD,6BAA6B;IAC7B,KAAK,IAAI,EACP,KAAK,EAAE,YAAY,EACnB,IAAI,EAAE,WAAW,EACjB,MAAM,EACN,QAAQ,EACR,QAAQ,EACR,UAAU,GAAG,EAAE,GAChB,IAAI,QAAQ,EAAE;QACb,KAAK,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,IAAI,MAAM,IAAI,EAAE,EAAE;YAC1D,KAAK,IAAI,SAAS,IAAI,UAAU,IAAI,EAAE,EAAE;gBACtC,4BAA4B;gBAC5B,MAAM,YAAY,GAAqB;oBACrC,YAAY;oBACZ,WAAW;oBACX,UAAU;oBACV,cAAc,EAAE,SAAS,CAAC,KAAK;oBAC/B,UAAU;oBACV,QAAQ;oBACR,QAAQ;iBACT,CAAC;gBAEF,MAAM,KAAK,GAAG,IAAA,eAAM,EAAC,QAAQ,EAAE,YAAY,EAAE,aAAa,CAAC,CAAC;gBAC5D,MAAM,QAAQ,GAAG,IAAA,mBAAW,EAAC,GAAG,KAAK,CAAC,CAAC;gBAEvC,MAAM,WAAW,GAAG,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;gBACxC,IAAI,WAAW,EAAE;oBACf,SAAS,CAAC,WAAW,GAAG,IAAI,CAAC;oBAC7B,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;iBACxB;gBACD,MAAM,YAAY,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;gBACvE,IAAG,YAAY,EAAE;oBACf,SAAS,CAAC,WAAW,GAAG,IAAI,CAAC;oBAC7B,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;iBAC5B;aACF;SACF;KACF;IACD,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACxC,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC9B,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CACtB,iBAAiB,CAAC,uBAAuB,CAAC,IAAI,EAAE,IAAI,CAAC,CACtD,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AA9DW,QAAA,eAAe,mBA8D1B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/lib/test-matcher/junit/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAmB,UAAU,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/lib/test-matcher/junit/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAmB,UAAU,EAAE,MAAM,WAAW,CAAC;AAmDxD,eAAO,MAAM,eAAe,SACpB,MAAM,aACD,MAAM,KAChB,QAAQ,UAAU,CASpB,CAAC"}
|
|
@@ -4,10 +4,17 @@ exports.loadJUnitReport = void 0;
|
|
|
4
4
|
const xml2js_1 = require("xml2js");
|
|
5
5
|
const utils_1 = require("../../utils");
|
|
6
6
|
const models_1 = require("./models");
|
|
7
|
-
const mapTestResults = (testResult) => {
|
|
7
|
+
const mapTestResults = (testResult, suitesName = '') => {
|
|
8
8
|
const results = new Array();
|
|
9
|
-
for (let { testcase: testCases } of testResult) {
|
|
10
|
-
for (let { name, status } of testCases) {
|
|
9
|
+
for (let { testcase: testCases, name: suiteName = '' } of testResult) {
|
|
10
|
+
for (let { name: caseName, status } of testCases) {
|
|
11
|
+
let name = caseName;
|
|
12
|
+
if (suiteName) {
|
|
13
|
+
name = suiteName + ' ' + name;
|
|
14
|
+
}
|
|
15
|
+
if (suitesName) {
|
|
16
|
+
name = suitesName + ' ' + name;
|
|
17
|
+
}
|
|
11
18
|
results.push({
|
|
12
19
|
name,
|
|
13
20
|
filePath: 'unknown',
|
|
@@ -19,7 +26,7 @@ const mapTestResults = (testResult) => {
|
|
|
19
26
|
};
|
|
20
27
|
const mapTestReport = (junitReport) => {
|
|
21
28
|
const { testsuites } = junitReport;
|
|
22
|
-
const total = testsuites
|
|
29
|
+
const { tests: total, name } = testsuites;
|
|
23
30
|
const startTime = testsuites.testsuite.reduce((acc, item) => Math.min(acc, item.timestamp.getTime()), Number.MAX_VALUE);
|
|
24
31
|
// Сумма затраченного времени на все тест сьюты
|
|
25
32
|
const duration = testsuites.testsuite.reduce((sum, item) => sum + item.time, 0) * 1000;
|
|
@@ -27,7 +34,7 @@ const mapTestReport = (junitReport) => {
|
|
|
27
34
|
startTime,
|
|
28
35
|
total,
|
|
29
36
|
duration,
|
|
30
|
-
testResults: mapTestResults(testsuites.testsuite),
|
|
37
|
+
testResults: mapTestResults(testsuites.testsuite, name),
|
|
31
38
|
};
|
|
32
39
|
};
|
|
33
40
|
const loadJUnitReport = async (path, basePath) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/lib/test-matcher/junit/index.ts"],"names":[],"mappings":";;;AAAA,mCAA4C;AAC5C,uCAAwD;AAExD,qCAA2E;AAE3E,MAAM,cAAc,GAAG,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/lib/test-matcher/junit/index.ts"],"names":[],"mappings":";;;AAAA,mCAA4C;AAC5C,uCAAwD;AAExD,qCAA2E;AAE3E,MAAM,cAAc,GAAG,CACrB,UAA4B,EAC5B,UAAU,GAAG,EAAE,EACI,EAAE;IACrB,MAAM,OAAO,GAAG,IAAI,KAAK,EAAmB,CAAC;IAE7C,KAAK,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,GAAG,EAAE,EAAE,IAAI,UAAU,EAAE;QACpE,KAAK,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,SAAS,EAAE;YAChD,IAAI,IAAI,GAAG,QAAQ,CAAC;YACpB,IAAI,SAAS,EAAE;gBACb,IAAI,GAAG,SAAS,GAAG,GAAG,GAAG,IAAI,CAAC;aAC/B;YACD,IAAI,UAAU,EAAE;gBACd,IAAI,GAAG,UAAU,GAAG,GAAG,GAAG,IAAI,CAAC;aAChC;YAED,OAAO,CAAC,IAAI,CAAC;gBACX,IAAI;gBACJ,QAAQ,EAAE,SAAS;gBACnB,MAAM;aACP,CAAC,CAAC;SACJ;KACF;IAED,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAEF,MAAM,aAAa,GAAG,CAAC,WAAwB,EAAc,EAAE;IAC7D,MAAM,EAAE,UAAU,EAAE,GAAG,WAAW,CAAC;IACnC,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,UAAU,CAAC;IAE1C,MAAM,SAAS,GAAG,UAAU,CAAC,SAAS,CAAC,MAAM,CAC3C,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,EACtD,MAAM,CAAC,SAAS,CACjB,CAAC;IAEF,+CAA+C;IAC/C,MAAM,QAAQ,GACZ,UAAU,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC;IAExE,OAAO;QACL,SAAS;QACT,KAAK;QACL,QAAQ;QACR,WAAW,EAAE,cAAc,CAAC,UAAU,CAAC,SAAS,EAAE,IAAI,CAAC;KACxD,CAAC;AACJ,CAAC,CAAC;AAEK,MAAM,eAAe,GAAG,KAAK,EAClC,IAAY,EACZ,QAAiB,EACI,EAAE;IACvB,MAAM,GAAG,GAAG,MAAM,IAAA,oBAAY,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC/C,MAAM,IAAI,GAAY,MAAM,IAAA,2BAAkB,EAAC,GAAG,EAAE;QAClD,aAAa,EAAE,KAAK;QACpB,UAAU,EAAE,IAAI;KACjB,CAAC,CAAC;IACH,MAAM,MAAM,GAAG,IAAA,mBAAW,EAAC,IAAI,EAAE,2BAAkB,CAAC,CAAC;IAErD,OAAO,aAAa,CAAC,MAAM,CAAC,CAAC;AAC/B,CAAC,CAAC;AAZW,QAAA,eAAe,mBAY1B"}
|
|
@@ -11,6 +11,7 @@ declare const junitTestCaseDecoder: d.Decoder<unknown, {
|
|
|
11
11
|
name: string;
|
|
12
12
|
}>;
|
|
13
13
|
declare const junitTestSuiteDecoder: d.Decoder<unknown, {
|
|
14
|
+
name: string;
|
|
14
15
|
timestamp: Date;
|
|
15
16
|
time: number;
|
|
16
17
|
testcase: ({
|
|
@@ -21,8 +22,10 @@ declare const junitTestSuiteDecoder: d.Decoder<unknown, {
|
|
|
21
22
|
}>;
|
|
22
23
|
export declare const junitReportDecoder: d.Decoder<unknown, {
|
|
23
24
|
testsuites: {
|
|
25
|
+
name: string;
|
|
24
26
|
tests: number;
|
|
25
27
|
testsuite: {
|
|
28
|
+
name: string;
|
|
26
29
|
timestamp: Date;
|
|
27
30
|
time: number;
|
|
28
31
|
testcase: ({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../../../src/lib/test-matcher/junit/models.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,CAAC,MAAM,eAAe,CAAC;AAanC,MAAM,MAAM,aAAa,GAAG,SAAS,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAE5D,QAAA,MAAM,0BAA0B;;;GAG9B,CAAC;AAEH,MAAM,MAAM,mBAAmB,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,0BAA0B,CAAC,CAAC;AAa9E,QAAA,MAAM,oBAAoB;;;;EASzB,CAAC;AAEF,QAAA,MAAM,qBAAqB
|
|
1
|
+
{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../../../src/lib/test-matcher/junit/models.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,CAAC,MAAM,eAAe,CAAC;AAanC,MAAM,MAAM,aAAa,GAAG,SAAS,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAE5D,QAAA,MAAM,0BAA0B;;;GAG9B,CAAC;AAEH,MAAM,MAAM,mBAAmB,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,0BAA0B,CAAC,CAAC;AAa9E,QAAA,MAAM,oBAAoB;;;;EASzB,CAAC;AAEF,QAAA,MAAM,qBAAqB;;;;;;;;;EAWzB,CAAC;AAWH,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;EAE7B,CAAC;AAEH,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAC9D,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,qBAAqB,CAAC,CAAC;AACpE,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,oBAAoB,CAAC,CAAC"}
|
|
@@ -28,11 +28,13 @@ const junitTestCaseDecoder = d.intersect(d.struct({
|
|
|
28
28
|
name: d.string,
|
|
29
29
|
}))((0, function_1.pipe)(junitTestCaseStatusDecoder, d.parse((s) => d.success({ status: mapStatus(s) }))));
|
|
30
30
|
const junitTestSuiteDecoder = d.struct({
|
|
31
|
+
name: d.string,
|
|
31
32
|
timestamp: (0, function_1.pipe)(d.string, d.parse((s) => d.success(new Date(s)))),
|
|
32
33
|
time: (0, function_1.pipe)(d.string, d.parse((v) => d.success(Number(v)))),
|
|
33
34
|
testcase: singleItemOrArray(junitTestCaseDecoder),
|
|
34
35
|
});
|
|
35
36
|
const junitTestSuitesDecoder = d.struct({
|
|
37
|
+
name: d.string,
|
|
36
38
|
tests: (0, function_1.pipe)(d.string, d.parse((v) => d.success(Number(v)))),
|
|
37
39
|
testsuite: singleItemOrArray(junitTestSuiteDecoder),
|
|
38
40
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"models.js","sourceRoot":"","sources":["../../../../src/lib/test-matcher/junit/models.ts"],"names":[],"mappings":";;;;AAAA,iDAA0C;AAC1C,yDAAmC;AAEnC,MAAM,iBAAiB,GAAG,CAAI,OAA8B,EAAE,EAAE,CAC9D,IAAA,eAAI,EACF,CAAC,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,EAClC,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;IAChB,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QACxB,OAAO,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;KACzB;IACD,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;AAC5B,CAAC,CAAC,CACH,CAAC;AAIJ,MAAM,0BAA0B,GAAG,CAAC,CAAC,OAAO,CAAC;IAC3C,OAAO,EAAE,CAAC,CAAC,MAAM;IACjB,MAAM,EAAE,CAAC,CAAC,MAAM;CACjB,CAAC,CAAC;AAIH,MAAM,SAAS,GAAG,CAAC,QAA6B,EAAiB,EAAE;IACjE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,QAAQ,CAAC;IACrC,IAAI,OAAO,KAAK,SAAS,EAAE;QACzB,OAAO,SAAS,CAAC;KAClB;IACD,IAAI,MAAM,KAAK,SAAS,EAAE;QACxB,OAAO,QAAQ,CAAC;KACjB;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG,CAAC,CAAC,SAAS,CACtC,CAAC,CAAC,MAAM,CAAC;IACP,IAAI,EAAE,CAAC,CAAC,MAAM;CACf,CAAC,CACH,CACC,IAAA,eAAI,EACF,0BAA0B,EAC1B,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CACpD,CACF,CAAC;AAEF,MAAM,qBAAqB,GAAG,CAAC,CAAC,MAAM,CAAC;IACrC,SAAS,EAAE,IAAA,eAAI,EACb,CAAC,CAAC,MAAM,EACR,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CACvC;IACD,IAAI,EAAE,IAAA,eAAI,EACR,CAAC,CAAC,MAAM,EACR,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CACrC;IACD,QAAQ,EAAE,iBAAiB,CAAC,oBAAoB,CAAC;CAClD,CAAC,CAAC;AAEH,MAAM,sBAAsB,GAAG,CAAC,CAAC,MAAM,CAAC;IACtC,KAAK,EAAE,IAAA,eAAI,EACT,CAAC,CAAC,MAAM,EACR,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CACrC;IACD,SAAS,EAAE,iBAAiB,CAAC,qBAAqB,CAAC;CACpD,CAAC,CAAC;AAEU,QAAA,kBAAkB,GAAG,CAAC,CAAC,MAAM,CAAC;IACzC,UAAU,EAAE,sBAAsB;CACnC,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"models.js","sourceRoot":"","sources":["../../../../src/lib/test-matcher/junit/models.ts"],"names":[],"mappings":";;;;AAAA,iDAA0C;AAC1C,yDAAmC;AAEnC,MAAM,iBAAiB,GAAG,CAAI,OAA8B,EAAE,EAAE,CAC9D,IAAA,eAAI,EACF,CAAC,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,EAClC,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;IAChB,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QACxB,OAAO,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;KACzB;IACD,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;AAC5B,CAAC,CAAC,CACH,CAAC;AAIJ,MAAM,0BAA0B,GAAG,CAAC,CAAC,OAAO,CAAC;IAC3C,OAAO,EAAE,CAAC,CAAC,MAAM;IACjB,MAAM,EAAE,CAAC,CAAC,MAAM;CACjB,CAAC,CAAC;AAIH,MAAM,SAAS,GAAG,CAAC,QAA6B,EAAiB,EAAE;IACjE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,QAAQ,CAAC;IACrC,IAAI,OAAO,KAAK,SAAS,EAAE;QACzB,OAAO,SAAS,CAAC;KAClB;IACD,IAAI,MAAM,KAAK,SAAS,EAAE;QACxB,OAAO,QAAQ,CAAC;KACjB;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG,CAAC,CAAC,SAAS,CACtC,CAAC,CAAC,MAAM,CAAC;IACP,IAAI,EAAE,CAAC,CAAC,MAAM;CACf,CAAC,CACH,CACC,IAAA,eAAI,EACF,0BAA0B,EAC1B,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CACpD,CACF,CAAC;AAEF,MAAM,qBAAqB,GAAG,CAAC,CAAC,MAAM,CAAC;IACrC,IAAI,EAAE,CAAC,CAAC,MAAM;IACd,SAAS,EAAE,IAAA,eAAI,EACb,CAAC,CAAC,MAAM,EACR,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CACvC;IACD,IAAI,EAAE,IAAA,eAAI,EACR,CAAC,CAAC,MAAM,EACR,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CACrC;IACD,QAAQ,EAAE,iBAAiB,CAAC,oBAAoB,CAAC;CAClD,CAAC,CAAC;AAEH,MAAM,sBAAsB,GAAG,CAAC,CAAC,MAAM,CAAC;IACtC,IAAI,EAAE,CAAC,CAAC,MAAM;IACd,KAAK,EAAE,IAAA,eAAI,EACT,CAAC,CAAC,MAAM,EACR,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CACrC;IACD,SAAS,EAAE,iBAAiB,CAAC,qBAAqB,CAAC;CACpD,CAAC,CAAC;AAEU,QAAA,kBAAkB,GAAG,CAAC,CAAC,MAAM,CAAC;IACzC,UAAU,EAAE,sBAAsB;CACnC,CAAC,CAAC"}
|
|
@@ -85,8 +85,8 @@ export type JestUnusedTestError = {
|
|
|
85
85
|
};
|
|
86
86
|
export type ValidationError = AttributeDuplicateError | AttributeValueDuplicateError | TreeDuplicateError | TreeMissingAttributeError | TreeAttributeDuplicateError | FeatureCodeError | FeatureAttributeValueCodeError | FeatureCodeDuplicateError | FeatureMissingAttributeError | FeatureMissingLinkError | AssertionDuplicateError | CodeError | LoaderError | JestUnusedTestError;
|
|
87
87
|
export type ValidationErrorTypes = ValidationError['type'];
|
|
88
|
-
export type ErrorSeverity = 'info' | 'warning' | 'error';
|
|
89
|
-
export declare const
|
|
88
|
+
export type ErrorSeverity = 'info' | 'warning' | 'error' | 'off';
|
|
89
|
+
export declare const DEFAULT_ERROR_SEVERITY: {
|
|
90
90
|
[key in ValidationErrorTypes]: ErrorSeverity;
|
|
91
91
|
};
|
|
92
92
|
//# sourceMappingURL=models.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../../src/lib/validators/models.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../../src/lib/validators/models.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
4
|
-
exports.
|
|
3
|
+
exports.DEFAULT_ERROR_SEVERITY = void 0;
|
|
4
|
+
exports.DEFAULT_ERROR_SEVERITY = {
|
|
5
5
|
'loader-error': 'error',
|
|
6
6
|
'code-format-error': 'error',
|
|
7
7
|
'attribute-duplicate': 'error',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"models.js","sourceRoot":"","sources":["../../../src/lib/validators/models.ts"],"names":[],"mappings":";;;AAwHa,QAAA,
|
|
1
|
+
{"version":3,"file":"models.js","sourceRoot":"","sources":["../../../src/lib/validators/models.ts"],"names":[],"mappings":";;;AAwHa,QAAA,sBAAsB,GAAqD;IACtF,cAAc,EAAE,OAAO;IACvB,mBAAmB,EAAE,OAAO;IAC5B,qBAAqB,EAAE,OAAO;IAC9B,2BAA2B,EAAE,OAAO;IACpC,gBAAgB,EAAE,OAAO;IACzB,wBAAwB,EAAE,OAAO;IACjC,0BAA0B,EAAE,OAAO;IACnC,qBAAqB,EAAE,OAAO;IAC9B,qBAAqB,EAAE,OAAO;IAC9B,wBAAwB,EAAE,OAAO;IACjC,2BAA2B,EAAE,OAAO;IACpC,qCAAqC,EAAE,OAAO;IAC9C,sBAAsB,EAAE,SAAS;IACjC,aAAa,EAAE,SAAS;CACzB,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ValidationError } from './models';
|
|
2
|
-
export declare const printError: (e: ValidationError) => void;
|
|
3
|
-
export declare const renderStats: (title: string, errors: ValidationError[]) => void;
|
|
1
|
+
import { ErrorSeverity, ValidationError } from './models';
|
|
2
|
+
export declare const printError: (e: ValidationError, severities: Record<string, ErrorSeverity>) => void;
|
|
3
|
+
export declare const renderStats: (title: string, errors: ValidationError[], severities: Record<string, ErrorSeverity>) => void;
|
|
4
4
|
//# sourceMappingURL=renderer.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renderer.d.ts","sourceRoot":"","sources":["../../../src/lib/validators/renderer.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"renderer.d.ts","sourceRoot":"","sources":["../../../src/lib/validators/renderer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAgE1D,eAAO,MAAM,UAAU,MAAO,eAAe,cAAc,OAAO,MAAM,EAAE,aAAa,CAAC,SAQvF,CAAC;AAEF,eAAO,MAAM,WAAW,UAAW,MAAM,UAAU,eAAe,EAAE,cAAc,OAAO,MAAM,EAAE,aAAa,CAAC,SA0B9G,CAAC"}
|
|
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.renderStats = exports.printError = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const chalk_1 = tslib_1.__importDefault(require("chalk"));
|
|
6
|
-
const models_1 = require("./models");
|
|
7
6
|
const renderError = (e) => {
|
|
8
7
|
switch (e.type) {
|
|
9
8
|
case 'loader-error':
|
|
@@ -52,17 +51,21 @@ const formatSeverity = (s) => {
|
|
|
52
51
|
return infoBadge('INFO');
|
|
53
52
|
}
|
|
54
53
|
};
|
|
55
|
-
const printError = (e) => {
|
|
56
|
-
const severity =
|
|
57
|
-
|
|
54
|
+
const printError = (e, severities) => {
|
|
55
|
+
const severity = severities[e.type];
|
|
56
|
+
if (severity === 'off') {
|
|
57
|
+
return;
|
|
58
|
+
}
|
|
59
|
+
const format = formatSeverity(severity);
|
|
60
|
+
console.log(`${format} ${renderError(e)}\n${path(e.filePath)}\n`);
|
|
58
61
|
};
|
|
59
62
|
exports.printError = printError;
|
|
60
|
-
const renderStats = (title, errors) => {
|
|
63
|
+
const renderStats = (title, errors, severities) => {
|
|
61
64
|
if (errors.length === 0) {
|
|
62
65
|
return;
|
|
63
66
|
}
|
|
64
|
-
const errorsCount = errors.filter((e) =>
|
|
65
|
-
const warnsCount = errors.filter((e) =>
|
|
67
|
+
const errorsCount = errors.filter((e) => severities[e.type] === 'error').length;
|
|
68
|
+
const warnsCount = errors.filter((e) => severities[e.type] === 'warning').length;
|
|
66
69
|
if (!errorsCount && !warnsCount) {
|
|
67
70
|
console.log(`${chalk_1.default.green('Ошибки валидации не обнаружены')}`);
|
|
68
71
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../../src/lib/validators/renderer.ts"],"names":[],"mappings":";;;;AAAA,0DAA0B;
|
|
1
|
+
{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../../src/lib/validators/renderer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { ValidationConfig, ValidationSeverity } from '../config/models';
|
|
1
2
|
import { ProjectData } from '../domain';
|
|
2
3
|
import { LoaderError } from './models';
|
|
3
4
|
export declare const LINK_LIKE: RegExp;
|
|
@@ -7,7 +8,9 @@ export declare class Validator {
|
|
|
7
8
|
private readonly featureErrors;
|
|
8
9
|
private readonly jestUnusedTests;
|
|
9
10
|
private metaFilePath;
|
|
11
|
+
readonly severity: Record<string, ValidationSeverity>;
|
|
10
12
|
get hasCriticalErrors(): boolean;
|
|
13
|
+
constructor(config: ValidationConfig);
|
|
11
14
|
printReport(): void;
|
|
12
15
|
registerLoaderError(error: unknown, filePath: string, fileType: LoaderError['fileType']): void;
|
|
13
16
|
registerJestUnusedTests(test: string, filePath: string): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validator.d.ts","sourceRoot":"","sources":["../../../src/lib/validators/validator.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"validator.d.ts","sourceRoot":"","sources":["../../../src/lib/validators/validator.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAW,WAAW,EAAE,MAAM,WAAW,CAAC;AAEjD,OAAO,EAYL,WAAW,EAKZ,MAAM,UAAU,CAAC;AAKlB,eAAO,MAAM,SAAS,QAAuC,CAAC;AAE9D,qBAAa,SAAS;IACpB,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAgC;IAC7D,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAgC;IAC3D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAgC;IAC9D,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAoC;IACpE,OAAO,CAAC,YAAY,CAAM;IAE1B,SAAgB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;IAE7D,IAAI,iBAAiB,IAAI,OAAO,CAO/B;gBAEW,MAAM,EAAE,gBAAgB;IAIpC,WAAW;IAoBX,mBAAmB,CACjB,KAAK,EAAE,OAAO,EACd,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,WAAW,CAAC,UAAU,CAAC;IAKnC,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAQtD,QAAQ,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE,WAAW;IASnE,OAAO,CAAC,sBAAsB;IAqC9B,OAAO,CAAC,2BAA2B;IA4BnC,OAAO,CAAC,iBAAiB;IAoDzB,OAAO,CAAC,gBAAgB;IA0BxB,OAAO,CAAC,eAAe;IA+CvB,OAAO,CAAC,kBAAkB;IAsB1B,OAAO,CAAC,oBAAoB;IAmD5B,OAAO,CAAC,aAAa;IAyBrB,OAAO,CAAC,YAAY;CAKrB;AAED,eAAO,MAAM,cAAc,UAClB,OAAO,YACJ,MAAM,YACN,WAAW,CAAC,UAAU,CAAC,KAChC,WAcF,CAAC"}
|
|
@@ -7,32 +7,35 @@ const CODE_REGEX = /^[A-Za-z][A-Za-z0-9-_]*$/;
|
|
|
7
7
|
// named group <link> is used to capture and validate link key
|
|
8
8
|
exports.LINK_LIKE = /\$(?<link>[A-Za-z][A-Za-z0-9-_]*)/g;
|
|
9
9
|
class Validator {
|
|
10
|
-
constructor() {
|
|
11
|
-
this.loaderErrors = new Array();
|
|
12
|
-
this.metaErrors = new Array();
|
|
13
|
-
this.featureErrors = new Array();
|
|
14
|
-
this.jestUnusedTests = new Array();
|
|
15
|
-
this.metaFilePath = '';
|
|
16
|
-
}
|
|
17
10
|
get hasCriticalErrors() {
|
|
18
11
|
return [
|
|
19
12
|
...this.loaderErrors,
|
|
20
13
|
...this.metaErrors,
|
|
21
14
|
...this.featureErrors,
|
|
22
15
|
...this.jestUnusedTests,
|
|
23
|
-
].some((e) =>
|
|
16
|
+
].some((e) => this.severity[e.type] === 'error');
|
|
17
|
+
}
|
|
18
|
+
constructor(config) {
|
|
19
|
+
this.loaderErrors = new Array();
|
|
20
|
+
this.metaErrors = new Array();
|
|
21
|
+
this.featureErrors = new Array();
|
|
22
|
+
this.jestUnusedTests = new Array();
|
|
23
|
+
this.metaFilePath = '';
|
|
24
|
+
this.severity = Object.assign(Object.assign({}, models_1.DEFAULT_ERROR_SEVERITY), config);
|
|
24
25
|
}
|
|
25
26
|
printReport() {
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
27
|
+
[
|
|
28
|
+
...this.jestUnusedTests,
|
|
29
|
+
...this.featureErrors,
|
|
30
|
+
...this.metaErrors,
|
|
31
|
+
...this.loaderErrors,
|
|
32
|
+
].forEach((error) => (0, renderer_1.printError)(error, this.severity));
|
|
30
33
|
(0, renderer_1.renderStats)('Всего', [
|
|
31
34
|
...this.loaderErrors,
|
|
32
35
|
...this.metaErrors,
|
|
33
36
|
...this.featureErrors,
|
|
34
37
|
...this.jestUnusedTests,
|
|
35
|
-
]);
|
|
38
|
+
], this.severity);
|
|
36
39
|
}
|
|
37
40
|
registerLoaderError(error, filePath, fileType) {
|
|
38
41
|
this.loaderErrors.push((0, exports.getLoaderError)(error, filePath, fileType));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validator.js","sourceRoot":"","sources":["../../../src/lib/validators/validator.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"validator.js","sourceRoot":"","sources":["../../../src/lib/validators/validator.ts"],"names":[],"mappings":"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"}
|