@skmtc/core 0.0.310 → 0.0.312
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/esm/context/CoreContext.d.ts +0 -8
- package/esm/context/CoreContext.d.ts.map +1 -1
- package/esm/context/CoreContext.js +9 -22
- package/esm/context/GenerateContext.d.ts +4 -1
- package/esm/context/GenerateContext.d.ts.map +1 -1
- package/esm/context/GenerateContext.js +12 -11
- package/esm/context/ParseContext.js +9 -5
- package/esm/context/ResultsHandler.d.ts.map +1 -1
- package/esm/context/ResultsHandler.js +7 -10
- package/package.json +1 -1
- package/script/context/CoreContext.d.ts +0 -8
- package/script/context/CoreContext.d.ts.map +1 -1
- package/script/context/CoreContext.js +9 -23
- package/script/context/GenerateContext.d.ts +4 -1
- package/script/context/GenerateContext.d.ts.map +1 -1
- package/script/context/GenerateContext.js +12 -11
- package/script/context/ParseContext.js +9 -5
- package/script/context/ResultsHandler.d.ts.map +1 -1
- package/script/context/ResultsHandler.js +7 -10
|
@@ -10,10 +10,6 @@ type CoreContextArgs = {
|
|
|
10
10
|
spanId: string;
|
|
11
11
|
schema: string;
|
|
12
12
|
};
|
|
13
|
-
type CaptureResultArgs = {
|
|
14
|
-
stackTrail: string;
|
|
15
|
-
result: SuccessWarningError;
|
|
16
|
-
};
|
|
17
13
|
type TransformArgs = {
|
|
18
14
|
settings: ClientSettings | undefined;
|
|
19
15
|
generatorsMap: Record<string, OperationGenerator | ModelGenerator>;
|
|
@@ -30,17 +26,13 @@ export declare class CoreContext {
|
|
|
30
26
|
pinnable: Partial<Record<GeneratorKey, string>>;
|
|
31
27
|
artifacts: Record<string, string>;
|
|
32
28
|
};
|
|
33
|
-
captureResult({ stackTrail, result }: CaptureResultArgs): void;
|
|
34
29
|
captureCurrentResult(result: SuccessWarningError): void;
|
|
35
30
|
get phaseType(): 'parse' | 'generate' | 'render';
|
|
36
|
-
appendStackTrailChunk(chunk: string | string[]): void;
|
|
37
|
-
removeStackTrailChunk(chunk: string | string[]): void;
|
|
38
31
|
}
|
|
39
32
|
export type JsonFormatterArgs = {
|
|
40
33
|
logRecord: log.LogRecord;
|
|
41
34
|
stackTrail: string;
|
|
42
35
|
};
|
|
43
36
|
export declare function skmtcFormatter({ logRecord, stackTrail }: JsonFormatterArgs): string;
|
|
44
|
-
export declare function resultFormatter({ logRecord, stackTrail }: JsonFormatterArgs): string;
|
|
45
37
|
export {};
|
|
46
38
|
//# sourceMappingURL=CoreContext.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CoreContext.d.ts","sourceRoot":"","sources":["../../src/context/CoreContext.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAA;AACpE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAA;AAC9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAA;AACvE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAC/D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAC/D,OAAO,KAAK,GAAG,MAAM,wCAAwC,CAAA;AAG7D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AA0B7D,KAAK,eAAe,GAAG;IACrB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AASD,KAAK,
|
|
1
|
+
{"version":3,"file":"CoreContext.d.ts","sourceRoot":"","sources":["../../src/context/CoreContext.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAA;AACpE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAA;AAC9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAA;AACvE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAC/D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAC/D,OAAO,KAAK,GAAG,MAAM,wCAAwC,CAAA;AAG7D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AA0B7D,KAAK,eAAe,GAAG;IACrB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AASD,KAAK,aAAa,GAAG;IACnB,QAAQ,EAAE,cAAc,GAAG,SAAS,CAAA;IACpC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,GAAG,cAAc,CAAC,CAAA;IAClE,QAAQ,CAAC,EAAE,kBAAkB,CAAA;CAC9B,CAAA;AAED,qBAAa,WAAW;;IACtB,MAAM,EAAE,GAAG,CAAC,MAAM,CAAA;gBAKN,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,eAAe;IA+C/C,KAAK,IAAI,WAAW;IAQpB,SAAS,CAAC,EAAE,QAAQ,EAAE,aAAa,EAAE,QAAQ,EAAE,EAAE,aAAa;;;;;;IAuE9D,oBAAoB,CAAC,MAAM,EAAE,mBAAmB,GAAG,IAAI;IAgCvD,IAAI,SAAS,IAAI,OAAO,GAAG,UAAU,GAAG,QAAQ,CAE/C;CACF;AAkBD,MAAM,MAAM,iBAAiB,GAAG;IAC9B,SAAS,EAAE,GAAG,CAAC,SAAS,CAAA;IACxB,UAAU,EAAE,MAAM,CAAA;CACnB,CAAA;AAED,wBAAgB,cAAc,CAAC,EAC7B,SAAS,EACT,UAAU,EACX,EAAE,iBAAiB,GAAG,MAAM,CAQ5B"}
|
|
@@ -73,26 +73,18 @@ export class CoreContext {
|
|
|
73
73
|
results: __classPrivateFieldGet(this, _CoreContext_results, "f")
|
|
74
74
|
};
|
|
75
75
|
}
|
|
76
|
-
captureResult({ stackTrail, result }) {
|
|
77
|
-
if (applyResult({ current: __classPrivateFieldGet(this, _CoreContext_results, "f")[stackTrail], incoming: result })) {
|
|
78
|
-
__classPrivateFieldGet(this, _CoreContext_results, "f")[stackTrail] = result;
|
|
79
|
-
}
|
|
80
|
-
}
|
|
81
76
|
captureCurrentResult(result) {
|
|
82
|
-
const stackTrail = __classPrivateFieldGet(this,
|
|
83
|
-
if (
|
|
77
|
+
const stackTrail = __classPrivateFieldGet(this, _CoreContext_instances, "m", _CoreContext_getStackTrailString).call(this);
|
|
78
|
+
if (incomingResultIsWorse({
|
|
79
|
+
current: __classPrivateFieldGet(this, _CoreContext_results, "f")[stackTrail],
|
|
80
|
+
incoming: result
|
|
81
|
+
})) {
|
|
84
82
|
__classPrivateFieldGet(this, _CoreContext_results, "f")[stackTrail] = result;
|
|
85
83
|
}
|
|
86
84
|
}
|
|
87
85
|
get phaseType() {
|
|
88
86
|
return __classPrivateFieldGet(this, _CoreContext_phase, "f").type;
|
|
89
87
|
}
|
|
90
|
-
appendStackTrailChunk(chunk) {
|
|
91
|
-
__classPrivateFieldGet(this, _CoreContext_stackTrail, "f").append(chunk);
|
|
92
|
-
}
|
|
93
|
-
removeStackTrailChunk(chunk) {
|
|
94
|
-
__classPrivateFieldGet(this, _CoreContext_stackTrail, "f").remove(chunk);
|
|
95
|
-
}
|
|
96
88
|
}
|
|
97
89
|
_CoreContext_phase = new WeakMap(), _CoreContext_results = new WeakMap(), _CoreContext_stackTrail = new WeakMap(), _CoreContext_instances = new WeakSet(), _CoreContext_setupLogger = function _CoreContext_setupLogger(spanId) {
|
|
98
90
|
log.setup({
|
|
@@ -105,10 +97,7 @@ _CoreContext_phase = new WeakMap(), _CoreContext_results = new WeakMap(), _CoreC
|
|
|
105
97
|
useColors: false
|
|
106
98
|
}),
|
|
107
99
|
[`${spanId}-results`]: new ResultsHandler('WARN', {
|
|
108
|
-
formatter:
|
|
109
|
-
logRecord,
|
|
110
|
-
stackTrail: __classPrivateFieldGet(this, _CoreContext_instances, "m", _CoreContext_getStackTrailString).call(this)
|
|
111
|
-
}),
|
|
100
|
+
formatter: ({ levelName }) => levelName,
|
|
112
101
|
context: this
|
|
113
102
|
})
|
|
114
103
|
},
|
|
@@ -139,7 +128,8 @@ _CoreContext_phase = new WeakMap(), _CoreContext_results = new WeakMap(), _CoreC
|
|
|
139
128
|
settings,
|
|
140
129
|
generatorsMap,
|
|
141
130
|
logger: this.logger,
|
|
142
|
-
callback
|
|
131
|
+
callback,
|
|
132
|
+
captureCurrentResult: this.captureCurrentResult.bind(this)
|
|
143
133
|
});
|
|
144
134
|
return { type: 'generate', context: generateContext };
|
|
145
135
|
}, _CoreContext_setupRenderPhase = function _CoreContext_setupRenderPhase({ files, prettier, basePath, pinnableGenerators }) {
|
|
@@ -153,7 +143,7 @@ _CoreContext_phase = new WeakMap(), _CoreContext_results = new WeakMap(), _CoreC
|
|
|
153
143
|
});
|
|
154
144
|
return { type: 'render', context: renderContext };
|
|
155
145
|
};
|
|
156
|
-
const
|
|
146
|
+
const incomingResultIsWorse = ({ current, incoming }) => {
|
|
157
147
|
return (current === undefined ||
|
|
158
148
|
(current === 'success' && incoming !== 'success') ||
|
|
159
149
|
(current === 'warning' && incoming === 'error'));
|
|
@@ -175,6 +165,3 @@ function flattenArgs(args) {
|
|
|
175
165
|
return args;
|
|
176
166
|
}
|
|
177
167
|
}
|
|
178
|
-
export function resultFormatter({ logRecord, stackTrail }) {
|
|
179
|
-
return JSON.stringify({ level: logRecord.levelName, stackTrail });
|
|
180
|
-
}
|
|
@@ -14,12 +14,14 @@ import type { ContentSettings } from '../dsl/ContentSettings.js';
|
|
|
14
14
|
import type { RefName } from '../types/RefName.js';
|
|
15
15
|
import type * as log from '../deps/jsr.io/@std/log/0.224.6/mod.js';
|
|
16
16
|
import type { GeneratorKey } from '../types/GeneratorKeys.js';
|
|
17
|
+
import type { SuccessWarningError } from '../types/Manifest.js';
|
|
17
18
|
type ConstructorArgs = {
|
|
18
19
|
schemaModel: OasDocument;
|
|
19
20
|
settings: ClientSettings | undefined;
|
|
20
21
|
generatorsMap: Record<string, OperationGenerator | ModelGenerator>;
|
|
21
22
|
logger: log.Logger;
|
|
22
23
|
callback: (generatorKey: GeneratorKey) => void;
|
|
24
|
+
captureCurrentResult: (result: SuccessWarningError) => void;
|
|
23
25
|
};
|
|
24
26
|
export type PickArgs = {
|
|
25
27
|
name: string;
|
|
@@ -65,7 +67,8 @@ export declare class GenerateContext {
|
|
|
65
67
|
settings: ClientSettings | undefined;
|
|
66
68
|
logger: log.Logger;
|
|
67
69
|
callback: (generatorKey: GeneratorKey) => void;
|
|
68
|
-
|
|
70
|
+
captureCurrentResult: (result: SuccessWarningError) => void;
|
|
71
|
+
constructor({ schemaModel, settings, logger, callback, captureCurrentResult }: ConstructorArgs);
|
|
69
72
|
generate(generatorsMap: Record<string, OperationGenerator | ModelGenerator>): Map<string, FileContents>;
|
|
70
73
|
appendStackTrailChunk(chunk: string | string[]): void;
|
|
71
74
|
removeStackTrailChunk(chunk: string | string[]): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GenerateContext.d.ts","sourceRoot":"","sources":["../../src/context/GenerateContext.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAErD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAA;AAC9D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAC9D,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACxE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAChD,OAAO,KAAK,EACV,mBAAmB,EACnB,kBAAkB,EAEnB,MAAM,+BAA+B,CAAA;AACtC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AACjE,OAAO,KAAK,EACV,eAAe,EACf,cAAc,EAEf,MAAM,2BAA2B,CAAA;AAGlC,OAAO,KAAK,EACV,cAAc,EACd,kBAAkB,EAClB,cAAc,EACf,MAAM,4BAA4B,CAAA;AACnC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAChE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAGlD,OAAO,KAAK,KAAK,GAAG,MAAM,wCAAwC,CAAA;AAClE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;
|
|
1
|
+
{"version":3,"file":"GenerateContext.d.ts","sourceRoot":"","sources":["../../src/context/GenerateContext.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,7 +17,7 @@ import { ModelDriver } from '../dsl/ModelDriver.js';
|
|
|
17
17
|
import { StackTrail } from './StackTrail.js';
|
|
18
18
|
import * as Sentry from '@sentry/deno';
|
|
19
19
|
export class GenerateContext {
|
|
20
|
-
constructor({ schemaModel, settings, logger, callback }) {
|
|
20
|
+
constructor({ schemaModel, settings, logger, callback, captureCurrentResult }) {
|
|
21
21
|
_GenerateContext_instances.add(this);
|
|
22
22
|
_GenerateContext_files.set(this, void 0);
|
|
23
23
|
Object.defineProperty(this, "schemaModel", {
|
|
@@ -45,12 +45,19 @@ export class GenerateContext {
|
|
|
45
45
|
writable: true,
|
|
46
46
|
value: void 0
|
|
47
47
|
});
|
|
48
|
+
Object.defineProperty(this, "captureCurrentResult", {
|
|
49
|
+
enumerable: true,
|
|
50
|
+
configurable: true,
|
|
51
|
+
writable: true,
|
|
52
|
+
value: void 0
|
|
53
|
+
});
|
|
48
54
|
this.logger = logger;
|
|
49
55
|
__classPrivateFieldSet(this, _GenerateContext_stackTrail, new StackTrail(), "f");
|
|
50
56
|
__classPrivateFieldSet(this, _GenerateContext_files, new Map(), "f");
|
|
51
57
|
this.schemaModel = schemaModel;
|
|
52
58
|
this.settings = settings;
|
|
53
59
|
this.callback = callback;
|
|
60
|
+
this.captureCurrentResult = captureCurrentResult;
|
|
54
61
|
}
|
|
55
62
|
generate(generatorsMap) {
|
|
56
63
|
Sentry.startSpan({ name: 'Generate operations' }, () => Object.values(generatorsMap)
|
|
@@ -80,12 +87,6 @@ export class GenerateContext {
|
|
|
80
87
|
removeStackTrailChunk(chunk) {
|
|
81
88
|
__classPrivateFieldGet(this, _GenerateContext_stackTrail, "f").remove(chunk);
|
|
82
89
|
}
|
|
83
|
-
// captureCurrentResult(result: SuccessWarningError): void {
|
|
84
|
-
// const stackTrail = this.#stackTrail.toString()
|
|
85
|
-
// if (applyResult({ current: this.#results[stackTrail], incoming: result })) {
|
|
86
|
-
// this.#results[stackTrail] = result
|
|
87
|
-
// }
|
|
88
|
-
// }
|
|
89
90
|
get stackTrail() {
|
|
90
91
|
return __classPrivateFieldGet(this, _GenerateContext_stackTrail, "f").toString();
|
|
91
92
|
}
|
|
@@ -231,21 +232,21 @@ _GenerateContext_files = new WeakMap(), _GenerateContext_stackTrail = new WeakMa
|
|
|
231
232
|
}, _GenerateContext_generateModel = function _GenerateContext_generateModel({ refName, generatorInstance }) {
|
|
232
233
|
try {
|
|
233
234
|
generatorInstance.transformModel(refName);
|
|
234
|
-
|
|
235
|
+
this.captureCurrentResult('success');
|
|
235
236
|
}
|
|
236
237
|
catch (error) {
|
|
237
238
|
this.logger.error(error);
|
|
238
|
-
|
|
239
|
+
this.captureCurrentResult('error');
|
|
239
240
|
Sentry.captureException(error);
|
|
240
241
|
}
|
|
241
242
|
}, _GenerateContext_generateOperation = function _GenerateContext_generateOperation({ operation, generatorInstance }) {
|
|
242
243
|
try {
|
|
243
244
|
generatorInstance.transformOperation(operation);
|
|
244
|
-
|
|
245
|
+
this.captureCurrentResult('success');
|
|
245
246
|
}
|
|
246
247
|
catch (error) {
|
|
247
248
|
this.logger.error(error);
|
|
248
|
-
|
|
249
|
+
this.captureCurrentResult('error');
|
|
249
250
|
Sentry.captureException(error);
|
|
250
251
|
}
|
|
251
252
|
};
|
|
@@ -47,11 +47,15 @@ export class ParseContext {
|
|
|
47
47
|
return __classPrivateFieldGet(this, _ParseContext_instances, "m", _ParseContext_parseDocument).call(this, parsedDocument);
|
|
48
48
|
}
|
|
49
49
|
logSkippedFields(skipped) {
|
|
50
|
-
Object.entries(skipped).forEach(([key, value]) => {
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
50
|
+
// Object.entries(skipped).forEach(([key, value]) => {
|
|
51
|
+
// this.logger.warn(
|
|
52
|
+
// `Property not yet implemented. Please request from support if needed - ${JSON.stringify(
|
|
53
|
+
// {
|
|
54
|
+
// [key]: value
|
|
55
|
+
// }
|
|
56
|
+
// ).slice(0, 45)}`
|
|
57
|
+
// )
|
|
58
|
+
// })
|
|
55
59
|
}
|
|
56
60
|
get stackTrail() {
|
|
57
61
|
return __classPrivateFieldGet(this, _ParseContext_stackTrail, "f").toString();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ResultsHandler.d.ts","sourceRoot":"","sources":["../../src/context/ResultsHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAa,MAAM,2CAA2C,CAAA;AACrF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2CAA2C,CAAA;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,iDAAiD,CAAA;AAC7E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iDAAiD,CAAA;AACzF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAGnD,MAAM,WAAW,qBAAsB,SAAQ,kBAAkB;IAC/D,OAAO,EAAE,WAAW,CAAA;CACrB;AAED,qBAAa,cAAe,SAAQ,WAAW;;IAC7C,OAAO,EAAE,WAAW,CAAA;gBAMR,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,qBAAqB;IAMvD,KAAK;IAML,MAAM,CAAC,SAAS,EAAE,SAAS;IASpC,GAAG,CAAC,GAAG,EAAE,MAAM;
|
|
1
|
+
{"version":3,"file":"ResultsHandler.d.ts","sourceRoot":"","sources":["../../src/context/ResultsHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAa,MAAM,2CAA2C,CAAA;AACrF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2CAA2C,CAAA;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,iDAAiD,CAAA;AAC7E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iDAAiD,CAAA;AACzF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAGnD,MAAM,WAAW,qBAAsB,SAAQ,kBAAkB;IAC/D,OAAO,EAAE,WAAW,CAAA;CACrB;AAED,qBAAa,cAAe,SAAQ,WAAW;;IAC7C,OAAO,EAAE,WAAW,CAAA;gBAMR,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,qBAAqB;IAMvD,KAAK;IAML,MAAM,CAAC,SAAS,EAAE,SAAS;IASpC,GAAG,CAAC,GAAG,EAAE,MAAM;IAaf,KAAK;IAMI,OAAO;CAKjB"}
|
|
@@ -34,16 +34,13 @@ export class ResultsHandler extends BaseHandler {
|
|
|
34
34
|
}
|
|
35
35
|
}
|
|
36
36
|
log(msg) {
|
|
37
|
-
const { level
|
|
38
|
-
this.context.
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
throw new Error(`Unexpected result: ${level}`);
|
|
45
|
-
})
|
|
46
|
-
});
|
|
37
|
+
const { level } = JSON.parse(msg);
|
|
38
|
+
this.context.captureCurrentResult(match(level)
|
|
39
|
+
.with('WARN', () => 'warning')
|
|
40
|
+
.with('ERROR', () => 'error')
|
|
41
|
+
.otherwise(() => {
|
|
42
|
+
throw new Error(`Unexpected result: ${level}`);
|
|
43
|
+
}));
|
|
47
44
|
}
|
|
48
45
|
flush() {
|
|
49
46
|
__classPrivateFieldGet(this, _ResultsHandler_instances, "m", _ResultsHandler_resetBuffer).call(this);
|
package/package.json
CHANGED
|
@@ -10,10 +10,6 @@ type CoreContextArgs = {
|
|
|
10
10
|
spanId: string;
|
|
11
11
|
schema: string;
|
|
12
12
|
};
|
|
13
|
-
type CaptureResultArgs = {
|
|
14
|
-
stackTrail: string;
|
|
15
|
-
result: SuccessWarningError;
|
|
16
|
-
};
|
|
17
13
|
type TransformArgs = {
|
|
18
14
|
settings: ClientSettings | undefined;
|
|
19
15
|
generatorsMap: Record<string, OperationGenerator | ModelGenerator>;
|
|
@@ -30,17 +26,13 @@ export declare class CoreContext {
|
|
|
30
26
|
pinnable: Partial<Record<GeneratorKey, string>>;
|
|
31
27
|
artifacts: Record<string, string>;
|
|
32
28
|
};
|
|
33
|
-
captureResult({ stackTrail, result }: CaptureResultArgs): void;
|
|
34
29
|
captureCurrentResult(result: SuccessWarningError): void;
|
|
35
30
|
get phaseType(): 'parse' | 'generate' | 'render';
|
|
36
|
-
appendStackTrailChunk(chunk: string | string[]): void;
|
|
37
|
-
removeStackTrailChunk(chunk: string | string[]): void;
|
|
38
31
|
}
|
|
39
32
|
export type JsonFormatterArgs = {
|
|
40
33
|
logRecord: log.LogRecord;
|
|
41
34
|
stackTrail: string;
|
|
42
35
|
};
|
|
43
36
|
export declare function skmtcFormatter({ logRecord, stackTrail }: JsonFormatterArgs): string;
|
|
44
|
-
export declare function resultFormatter({ logRecord, stackTrail }: JsonFormatterArgs): string;
|
|
45
37
|
export {};
|
|
46
38
|
//# sourceMappingURL=CoreContext.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CoreContext.d.ts","sourceRoot":"","sources":["../../src/context/CoreContext.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAA;AACpE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAA;AAC9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAA;AACvE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAC/D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAC/D,OAAO,KAAK,GAAG,MAAM,wCAAwC,CAAA;AAG7D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AA0B7D,KAAK,eAAe,GAAG;IACrB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AASD,KAAK,
|
|
1
|
+
{"version":3,"file":"CoreContext.d.ts","sourceRoot":"","sources":["../../src/context/CoreContext.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAA;AACpE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAA;AAC9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAA;AACvE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAC/D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAC/D,OAAO,KAAK,GAAG,MAAM,wCAAwC,CAAA;AAG7D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AA0B7D,KAAK,eAAe,GAAG;IACrB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AASD,KAAK,aAAa,GAAG;IACnB,QAAQ,EAAE,cAAc,GAAG,SAAS,CAAA;IACpC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,GAAG,cAAc,CAAC,CAAA;IAClE,QAAQ,CAAC,EAAE,kBAAkB,CAAA;CAC9B,CAAA;AAED,qBAAa,WAAW;;IACtB,MAAM,EAAE,GAAG,CAAC,MAAM,CAAA;gBAKN,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,eAAe;IA+C/C,KAAK,IAAI,WAAW;IAQpB,SAAS,CAAC,EAAE,QAAQ,EAAE,aAAa,EAAE,QAAQ,EAAE,EAAE,aAAa;;;;;;IAuE9D,oBAAoB,CAAC,MAAM,EAAE,mBAAmB,GAAG,IAAI;IAgCvD,IAAI,SAAS,IAAI,OAAO,GAAG,UAAU,GAAG,QAAQ,CAE/C;CACF;AAkBD,MAAM,MAAM,iBAAiB,GAAG;IAC9B,SAAS,EAAE,GAAG,CAAC,SAAS,CAAA;IACxB,UAAU,EAAE,MAAM,CAAA;CACnB,CAAA;AAED,wBAAgB,cAAc,CAAC,EAC7B,SAAS,EACT,UAAU,EACX,EAAE,iBAAiB,GAAG,MAAM,CAQ5B"}
|
|
@@ -37,7 +37,6 @@ var _CoreContext_instances, _CoreContext_phase, _CoreContext_results, _CoreConte
|
|
|
37
37
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
38
38
|
exports.CoreContext = void 0;
|
|
39
39
|
exports.skmtcFormatter = skmtcFormatter;
|
|
40
|
-
exports.resultFormatter = resultFormatter;
|
|
41
40
|
const GenerateContext_js_1 = require("./GenerateContext.js");
|
|
42
41
|
const ts_pattern_1 = require("ts-pattern");
|
|
43
42
|
const RenderContext_js_1 = require("./RenderContext.js");
|
|
@@ -101,26 +100,18 @@ class CoreContext {
|
|
|
101
100
|
results: __classPrivateFieldGet(this, _CoreContext_results, "f")
|
|
102
101
|
};
|
|
103
102
|
}
|
|
104
|
-
captureResult({ stackTrail, result }) {
|
|
105
|
-
if (applyResult({ current: __classPrivateFieldGet(this, _CoreContext_results, "f")[stackTrail], incoming: result })) {
|
|
106
|
-
__classPrivateFieldGet(this, _CoreContext_results, "f")[stackTrail] = result;
|
|
107
|
-
}
|
|
108
|
-
}
|
|
109
103
|
captureCurrentResult(result) {
|
|
110
|
-
const stackTrail = __classPrivateFieldGet(this,
|
|
111
|
-
if (
|
|
104
|
+
const stackTrail = __classPrivateFieldGet(this, _CoreContext_instances, "m", _CoreContext_getStackTrailString).call(this);
|
|
105
|
+
if (incomingResultIsWorse({
|
|
106
|
+
current: __classPrivateFieldGet(this, _CoreContext_results, "f")[stackTrail],
|
|
107
|
+
incoming: result
|
|
108
|
+
})) {
|
|
112
109
|
__classPrivateFieldGet(this, _CoreContext_results, "f")[stackTrail] = result;
|
|
113
110
|
}
|
|
114
111
|
}
|
|
115
112
|
get phaseType() {
|
|
116
113
|
return __classPrivateFieldGet(this, _CoreContext_phase, "f").type;
|
|
117
114
|
}
|
|
118
|
-
appendStackTrailChunk(chunk) {
|
|
119
|
-
__classPrivateFieldGet(this, _CoreContext_stackTrail, "f").append(chunk);
|
|
120
|
-
}
|
|
121
|
-
removeStackTrailChunk(chunk) {
|
|
122
|
-
__classPrivateFieldGet(this, _CoreContext_stackTrail, "f").remove(chunk);
|
|
123
|
-
}
|
|
124
115
|
}
|
|
125
116
|
exports.CoreContext = CoreContext;
|
|
126
117
|
_CoreContext_phase = new WeakMap(), _CoreContext_results = new WeakMap(), _CoreContext_stackTrail = new WeakMap(), _CoreContext_instances = new WeakSet(), _CoreContext_setupLogger = function _CoreContext_setupLogger(spanId) {
|
|
@@ -134,10 +125,7 @@ _CoreContext_phase = new WeakMap(), _CoreContext_results = new WeakMap(), _CoreC
|
|
|
134
125
|
useColors: false
|
|
135
126
|
}),
|
|
136
127
|
[`${spanId}-results`]: new ResultsHandler_js_1.ResultsHandler('WARN', {
|
|
137
|
-
formatter:
|
|
138
|
-
logRecord,
|
|
139
|
-
stackTrail: __classPrivateFieldGet(this, _CoreContext_instances, "m", _CoreContext_getStackTrailString).call(this)
|
|
140
|
-
}),
|
|
128
|
+
formatter: ({ levelName }) => levelName,
|
|
141
129
|
context: this
|
|
142
130
|
})
|
|
143
131
|
},
|
|
@@ -168,7 +156,8 @@ _CoreContext_phase = new WeakMap(), _CoreContext_results = new WeakMap(), _CoreC
|
|
|
168
156
|
settings,
|
|
169
157
|
generatorsMap,
|
|
170
158
|
logger: this.logger,
|
|
171
|
-
callback
|
|
159
|
+
callback,
|
|
160
|
+
captureCurrentResult: this.captureCurrentResult.bind(this)
|
|
172
161
|
});
|
|
173
162
|
return { type: 'generate', context: generateContext };
|
|
174
163
|
}, _CoreContext_setupRenderPhase = function _CoreContext_setupRenderPhase({ files, prettier, basePath, pinnableGenerators }) {
|
|
@@ -182,7 +171,7 @@ _CoreContext_phase = new WeakMap(), _CoreContext_results = new WeakMap(), _CoreC
|
|
|
182
171
|
});
|
|
183
172
|
return { type: 'render', context: renderContext };
|
|
184
173
|
};
|
|
185
|
-
const
|
|
174
|
+
const incomingResultIsWorse = ({ current, incoming }) => {
|
|
186
175
|
return (current === undefined ||
|
|
187
176
|
(current === 'success' && incoming !== 'success') ||
|
|
188
177
|
(current === 'warning' && incoming === 'error'));
|
|
@@ -204,6 +193,3 @@ function flattenArgs(args) {
|
|
|
204
193
|
return args;
|
|
205
194
|
}
|
|
206
195
|
}
|
|
207
|
-
function resultFormatter({ logRecord, stackTrail }) {
|
|
208
|
-
return JSON.stringify({ level: logRecord.levelName, stackTrail });
|
|
209
|
-
}
|
|
@@ -14,12 +14,14 @@ import type { ContentSettings } from '../dsl/ContentSettings.js';
|
|
|
14
14
|
import type { RefName } from '../types/RefName.js';
|
|
15
15
|
import type * as log from '../deps/jsr.io/@std/log/0.224.6/mod.js';
|
|
16
16
|
import type { GeneratorKey } from '../types/GeneratorKeys.js';
|
|
17
|
+
import type { SuccessWarningError } from '../types/Manifest.js';
|
|
17
18
|
type ConstructorArgs = {
|
|
18
19
|
schemaModel: OasDocument;
|
|
19
20
|
settings: ClientSettings | undefined;
|
|
20
21
|
generatorsMap: Record<string, OperationGenerator | ModelGenerator>;
|
|
21
22
|
logger: log.Logger;
|
|
22
23
|
callback: (generatorKey: GeneratorKey) => void;
|
|
24
|
+
captureCurrentResult: (result: SuccessWarningError) => void;
|
|
23
25
|
};
|
|
24
26
|
export type PickArgs = {
|
|
25
27
|
name: string;
|
|
@@ -65,7 +67,8 @@ export declare class GenerateContext {
|
|
|
65
67
|
settings: ClientSettings | undefined;
|
|
66
68
|
logger: log.Logger;
|
|
67
69
|
callback: (generatorKey: GeneratorKey) => void;
|
|
68
|
-
|
|
70
|
+
captureCurrentResult: (result: SuccessWarningError) => void;
|
|
71
|
+
constructor({ schemaModel, settings, logger, callback, captureCurrentResult }: ConstructorArgs);
|
|
69
72
|
generate(generatorsMap: Record<string, OperationGenerator | ModelGenerator>): Map<string, FileContents>;
|
|
70
73
|
appendStackTrailChunk(chunk: string | string[]): void;
|
|
71
74
|
removeStackTrailChunk(chunk: string | string[]): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GenerateContext.d.ts","sourceRoot":"","sources":["../../src/context/GenerateContext.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAErD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAA;AAC9D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAC9D,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACxE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAChD,OAAO,KAAK,EACV,mBAAmB,EACnB,kBAAkB,EAEnB,MAAM,+BAA+B,CAAA;AACtC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AACjE,OAAO,KAAK,EACV,eAAe,EACf,cAAc,EAEf,MAAM,2BAA2B,CAAA;AAGlC,OAAO,KAAK,EACV,cAAc,EACd,kBAAkB,EAClB,cAAc,EACf,MAAM,4BAA4B,CAAA;AACnC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAChE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAGlD,OAAO,KAAK,KAAK,GAAG,MAAM,wCAAwC,CAAA;AAClE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;
|
|
1
|
+
{"version":3,"file":"GenerateContext.d.ts","sourceRoot":"","sources":["../../src/context/GenerateContext.ts"],"names":[],"mappings":"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"}
|
|
@@ -43,7 +43,7 @@ const ModelDriver_js_1 = require("../dsl/ModelDriver.js");
|
|
|
43
43
|
const StackTrail_js_1 = require("./StackTrail.js");
|
|
44
44
|
const Sentry = __importStar(require("@sentry/deno"));
|
|
45
45
|
class GenerateContext {
|
|
46
|
-
constructor({ schemaModel, settings, logger, callback }) {
|
|
46
|
+
constructor({ schemaModel, settings, logger, callback, captureCurrentResult }) {
|
|
47
47
|
_GenerateContext_instances.add(this);
|
|
48
48
|
_GenerateContext_files.set(this, void 0);
|
|
49
49
|
Object.defineProperty(this, "schemaModel", {
|
|
@@ -71,12 +71,19 @@ class GenerateContext {
|
|
|
71
71
|
writable: true,
|
|
72
72
|
value: void 0
|
|
73
73
|
});
|
|
74
|
+
Object.defineProperty(this, "captureCurrentResult", {
|
|
75
|
+
enumerable: true,
|
|
76
|
+
configurable: true,
|
|
77
|
+
writable: true,
|
|
78
|
+
value: void 0
|
|
79
|
+
});
|
|
74
80
|
this.logger = logger;
|
|
75
81
|
__classPrivateFieldSet(this, _GenerateContext_stackTrail, new StackTrail_js_1.StackTrail(), "f");
|
|
76
82
|
__classPrivateFieldSet(this, _GenerateContext_files, new Map(), "f");
|
|
77
83
|
this.schemaModel = schemaModel;
|
|
78
84
|
this.settings = settings;
|
|
79
85
|
this.callback = callback;
|
|
86
|
+
this.captureCurrentResult = captureCurrentResult;
|
|
80
87
|
}
|
|
81
88
|
generate(generatorsMap) {
|
|
82
89
|
Sentry.startSpan({ name: 'Generate operations' }, () => Object.values(generatorsMap)
|
|
@@ -106,12 +113,6 @@ class GenerateContext {
|
|
|
106
113
|
removeStackTrailChunk(chunk) {
|
|
107
114
|
__classPrivateFieldGet(this, _GenerateContext_stackTrail, "f").remove(chunk);
|
|
108
115
|
}
|
|
109
|
-
// captureCurrentResult(result: SuccessWarningError): void {
|
|
110
|
-
// const stackTrail = this.#stackTrail.toString()
|
|
111
|
-
// if (applyResult({ current: this.#results[stackTrail], incoming: result })) {
|
|
112
|
-
// this.#results[stackTrail] = result
|
|
113
|
-
// }
|
|
114
|
-
// }
|
|
115
116
|
get stackTrail() {
|
|
116
117
|
return __classPrivateFieldGet(this, _GenerateContext_stackTrail, "f").toString();
|
|
117
118
|
}
|
|
@@ -258,21 +259,21 @@ _GenerateContext_files = new WeakMap(), _GenerateContext_stackTrail = new WeakMa
|
|
|
258
259
|
}, _GenerateContext_generateModel = function _GenerateContext_generateModel({ refName, generatorInstance }) {
|
|
259
260
|
try {
|
|
260
261
|
generatorInstance.transformModel(refName);
|
|
261
|
-
|
|
262
|
+
this.captureCurrentResult('success');
|
|
262
263
|
}
|
|
263
264
|
catch (error) {
|
|
264
265
|
this.logger.error(error);
|
|
265
|
-
|
|
266
|
+
this.captureCurrentResult('error');
|
|
266
267
|
Sentry.captureException(error);
|
|
267
268
|
}
|
|
268
269
|
}, _GenerateContext_generateOperation = function _GenerateContext_generateOperation({ operation, generatorInstance }) {
|
|
269
270
|
try {
|
|
270
271
|
generatorInstance.transformOperation(operation);
|
|
271
|
-
|
|
272
|
+
this.captureCurrentResult('success');
|
|
272
273
|
}
|
|
273
274
|
catch (error) {
|
|
274
275
|
this.logger.error(error);
|
|
275
|
-
|
|
276
|
+
this.captureCurrentResult('error');
|
|
276
277
|
Sentry.captureException(error);
|
|
277
278
|
}
|
|
278
279
|
};
|
|
@@ -73,11 +73,15 @@ class ParseContext {
|
|
|
73
73
|
return __classPrivateFieldGet(this, _ParseContext_instances, "m", _ParseContext_parseDocument).call(this, parsedDocument);
|
|
74
74
|
}
|
|
75
75
|
logSkippedFields(skipped) {
|
|
76
|
-
Object.entries(skipped).forEach(([key, value]) => {
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
76
|
+
// Object.entries(skipped).forEach(([key, value]) => {
|
|
77
|
+
// this.logger.warn(
|
|
78
|
+
// `Property not yet implemented. Please request from support if needed - ${JSON.stringify(
|
|
79
|
+
// {
|
|
80
|
+
// [key]: value
|
|
81
|
+
// }
|
|
82
|
+
// ).slice(0, 45)}`
|
|
83
|
+
// )
|
|
84
|
+
// })
|
|
81
85
|
}
|
|
82
86
|
get stackTrail() {
|
|
83
87
|
return __classPrivateFieldGet(this, _ParseContext_stackTrail, "f").toString();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ResultsHandler.d.ts","sourceRoot":"","sources":["../../src/context/ResultsHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAa,MAAM,2CAA2C,CAAA;AACrF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2CAA2C,CAAA;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,iDAAiD,CAAA;AAC7E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iDAAiD,CAAA;AACzF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAGnD,MAAM,WAAW,qBAAsB,SAAQ,kBAAkB;IAC/D,OAAO,EAAE,WAAW,CAAA;CACrB;AAED,qBAAa,cAAe,SAAQ,WAAW;;IAC7C,OAAO,EAAE,WAAW,CAAA;gBAMR,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,qBAAqB;IAMvD,KAAK;IAML,MAAM,CAAC,SAAS,EAAE,SAAS;IASpC,GAAG,CAAC,GAAG,EAAE,MAAM;
|
|
1
|
+
{"version":3,"file":"ResultsHandler.d.ts","sourceRoot":"","sources":["../../src/context/ResultsHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAa,MAAM,2CAA2C,CAAA;AACrF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2CAA2C,CAAA;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,iDAAiD,CAAA;AAC7E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iDAAiD,CAAA;AACzF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAGnD,MAAM,WAAW,qBAAsB,SAAQ,kBAAkB;IAC/D,OAAO,EAAE,WAAW,CAAA;CACrB;AAED,qBAAa,cAAe,SAAQ,WAAW;;IAC7C,OAAO,EAAE,WAAW,CAAA;gBAMR,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,qBAAqB;IAMvD,KAAK;IAML,MAAM,CAAC,SAAS,EAAE,SAAS;IASpC,GAAG,CAAC,GAAG,EAAE,MAAM;IAaf,KAAK;IAMI,OAAO;CAKjB"}
|
|
@@ -37,16 +37,13 @@ class ResultsHandler extends base_handler_js_1.BaseHandler {
|
|
|
37
37
|
}
|
|
38
38
|
}
|
|
39
39
|
log(msg) {
|
|
40
|
-
const { level
|
|
41
|
-
this.context.
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
throw new Error(`Unexpected result: ${level}`);
|
|
48
|
-
})
|
|
49
|
-
});
|
|
40
|
+
const { level } = JSON.parse(msg);
|
|
41
|
+
this.context.captureCurrentResult((0, ts_pattern_1.match)(level)
|
|
42
|
+
.with('WARN', () => 'warning')
|
|
43
|
+
.with('ERROR', () => 'error')
|
|
44
|
+
.otherwise(() => {
|
|
45
|
+
throw new Error(`Unexpected result: ${level}`);
|
|
46
|
+
}));
|
|
50
47
|
}
|
|
51
48
|
flush() {
|
|
52
49
|
__classPrivateFieldGet(this, _ResultsHandler_instances, "m", _ResultsHandler_resetBuffer).call(this);
|