@typespec/compiler 0.66.0-dev.9 → 0.67.0-dev.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/dist/generated-defs/TypeSpec.d.ts +68 -9
- package/dist/generated-defs/TypeSpec.d.ts.map +1 -1
- package/dist/manifest.js +2 -2
- package/dist/src/core/checker.d.ts +1 -1
- package/dist/src/core/checker.d.ts.map +1 -1
- package/dist/src/core/checker.js +134 -57
- package/dist/src/core/checker.js.map +1 -1
- package/dist/src/core/cli/actions/compile/args.d.ts +1 -0
- package/dist/src/core/cli/actions/compile/args.d.ts.map +1 -1
- package/dist/src/core/cli/actions/compile/args.js +3 -0
- package/dist/src/core/cli/actions/compile/args.js.map +1 -1
- package/dist/src/core/cli/actions/compile/compile.d.ts.map +1 -1
- package/dist/src/core/cli/actions/compile/compile.js +4 -1
- package/dist/src/core/cli/actions/compile/compile.js.map +1 -1
- package/dist/src/core/cli/actions/info.js +2 -2
- package/dist/src/core/cli/actions/info.js.map +1 -1
- package/dist/src/core/cli/cli.js +5 -2
- package/dist/src/core/cli/cli.js.map +1 -1
- package/dist/src/core/compiler-code-fixes/remove-unused-template-parameter.codefix.d.ts +6 -0
- package/dist/src/core/compiler-code-fixes/remove-unused-template-parameter.codefix.d.ts.map +1 -0
- package/dist/src/core/compiler-code-fixes/remove-unused-template-parameter.codefix.js +45 -0
- package/dist/src/core/compiler-code-fixes/remove-unused-template-parameter.codefix.js.map +1 -0
- package/dist/src/core/emitter-utils.d.ts +1 -0
- package/dist/src/core/emitter-utils.d.ts.map +1 -1
- package/dist/src/core/emitter-utils.js +6 -1
- package/dist/src/core/emitter-utils.js.map +1 -1
- package/dist/src/core/helpers/discriminator-utils.d.ts +16 -2
- package/dist/src/core/helpers/discriminator-utils.d.ts.map +1 -1
- package/dist/src/core/helpers/discriminator-utils.js +80 -10
- package/dist/src/core/helpers/discriminator-utils.js.map +1 -1
- package/dist/src/core/helpers/index.d.ts +1 -1
- package/dist/src/core/helpers/index.d.ts.map +1 -1
- package/dist/src/core/helpers/index.js +1 -1
- package/dist/src/core/helpers/index.js.map +1 -1
- package/dist/src/core/install.d.ts +1 -1
- package/dist/src/core/install.d.ts.map +1 -1
- package/dist/src/core/install.js +22 -6
- package/dist/src/core/install.js.map +1 -1
- package/dist/src/core/intrinsic-type-state.d.ts +2 -0
- package/dist/src/core/intrinsic-type-state.d.ts.map +1 -1
- package/dist/src/core/intrinsic-type-state.js +2 -0
- package/dist/src/core/intrinsic-type-state.js.map +1 -1
- package/dist/src/core/linter-rules/unused-template-parameter.rule.d.ts +2 -0
- package/dist/src/core/linter-rules/unused-template-parameter.rule.d.ts.map +1 -0
- package/dist/src/core/linter-rules/unused-template-parameter.rule.js +36 -0
- package/dist/src/core/linter-rules/unused-template-parameter.rule.js.map +1 -0
- package/dist/src/core/linter-rules/unused-using.rule.d.ts +2 -0
- package/dist/src/core/linter-rules/unused-using.rule.d.ts.map +1 -0
- package/dist/src/core/linter-rules/unused-using.rule.js +38 -0
- package/dist/src/core/linter-rules/unused-using.rule.js.map +1 -0
- package/dist/src/core/linter.d.ts +0 -1
- package/dist/src/core/linter.d.ts.map +1 -1
- package/dist/src/core/linter.js +7 -39
- package/dist/src/core/linter.js.map +1 -1
- package/dist/src/core/logger/console-sink.browser.d.ts.map +1 -1
- package/dist/src/core/logger/console-sink.browser.js +16 -0
- package/dist/src/core/logger/console-sink.browser.js.map +1 -1
- package/dist/src/core/logger/console-sink.d.ts +2 -0
- package/dist/src/core/logger/console-sink.d.ts.map +1 -1
- package/dist/src/core/logger/console-sink.js +55 -0
- package/dist/src/core/logger/console-sink.js.map +1 -1
- package/dist/src/core/logger/logger.d.ts.map +1 -1
- package/dist/src/core/logger/logger.js +1 -0
- package/dist/src/core/logger/logger.js.map +1 -1
- package/dist/src/core/messages.d.ts +88 -7
- package/dist/src/core/messages.d.ts.map +1 -1
- package/dist/src/core/messages.js +22 -1
- package/dist/src/core/messages.js.map +1 -1
- package/dist/src/core/options.d.ts +4 -0
- package/dist/src/core/options.d.ts.map +1 -1
- package/dist/src/core/program.d.ts.map +1 -1
- package/dist/src/core/program.js +55 -29
- package/dist/src/core/program.js.map +1 -1
- package/dist/src/core/types.d.ts +1 -0
- package/dist/src/core/types.d.ts.map +1 -1
- package/dist/src/core/visibility/core.d.ts +2 -2
- package/dist/src/core/visibility/core.d.ts.map +1 -1
- package/dist/src/core/visibility/core.js +4 -3
- package/dist/src/core/visibility/core.js.map +1 -1
- package/dist/src/experimental/mutators.js +9 -2
- package/dist/src/experimental/mutators.js.map +1 -1
- package/dist/src/experimental/realm.d.ts +0 -1
- package/dist/src/experimental/realm.d.ts.map +1 -1
- package/dist/src/experimental/realm.js +0 -5
- package/dist/src/experimental/realm.js.map +1 -1
- package/dist/src/experimental/typekit/kits/model.js +0 -1
- package/dist/src/experimental/typekit/kits/model.js.map +1 -1
- package/dist/src/experimental/typekit/kits/type.d.ts +2 -1
- package/dist/src/experimental/typekit/kits/type.d.ts.map +1 -1
- package/dist/src/experimental/typekit/kits/type.js +4 -11
- package/dist/src/experimental/typekit/kits/type.js.map +1 -1
- package/dist/src/init/file-templating.d.ts +2 -0
- package/dist/src/init/file-templating.d.ts.map +1 -1
- package/dist/src/init/file-templating.js +3 -0
- package/dist/src/init/file-templating.js.map +1 -1
- package/dist/src/init/init-template.d.ts +2 -0
- package/dist/src/init/init-template.d.ts.map +1 -1
- package/dist/src/init/init-template.js +1 -0
- package/dist/src/init/init-template.js.map +1 -1
- package/dist/src/init/init.d.ts +5 -2
- package/dist/src/init/init.d.ts.map +1 -1
- package/dist/src/init/init.js +158 -89
- package/dist/src/init/init.js.map +1 -1
- package/dist/src/init/prompts.d.ts +5 -0
- package/dist/src/init/prompts.d.ts.map +1 -0
- package/dist/src/init/prompts.js +16 -0
- package/dist/src/init/prompts.js.map +1 -0
- package/dist/src/init/scaffold.d.ts +1 -5
- package/dist/src/init/scaffold.d.ts.map +1 -1
- package/dist/src/init/scaffold.js +0 -1
- package/dist/src/init/scaffold.js.map +1 -1
- package/dist/src/lib/decorators.d.ts +2 -1
- package/dist/src/lib/decorators.d.ts.map +1 -1
- package/dist/src/lib/decorators.js +12 -1
- package/dist/src/lib/decorators.js.map +1 -1
- package/dist/src/lib/service.d.ts +1 -1
- package/dist/src/lib/service.d.ts.map +1 -1
- package/dist/src/lib/service.js +4 -40
- package/dist/src/lib/service.js.map +1 -1
- package/dist/src/lib/tsp-index.d.ts.map +1 -1
- package/dist/src/lib/tsp-index.js +2 -1
- package/dist/src/lib/tsp-index.js.map +1 -1
- package/dist/src/lib/visibility.d.ts +2 -2
- package/dist/src/lib/visibility.d.ts.map +1 -1
- package/dist/src/lib/visibility.js +109 -7
- package/dist/src/lib/visibility.js.map +1 -1
- package/dist/src/server/compile-service.d.ts.map +1 -1
- package/dist/src/server/compile-service.js +11 -1
- package/dist/src/server/compile-service.js.map +1 -1
- package/dist/src/server/serverlib.d.ts.map +1 -1
- package/dist/src/server/serverlib.js +37 -17
- package/dist/src/server/serverlib.js.map +1 -1
- package/dist/src/server/tmlanguage.js +1 -1
- package/dist/src/server/tmlanguage.js.map +1 -1
- package/dist/src/testing/test-host.js +1 -1
- package/dist/src/testing/test-host.js.map +1 -1
- package/dist/typespec.tmLanguage +3 -3
- package/lib/std/decorators.tsp +78 -9
- package/lib/std/types.tsp +1 -1
- package/package.json +5 -4
- package/templates/__snapshots__/rest/main.tsp +1 -3
- package/templates/rest/main.tsp +1 -3
- package/templates/scaffolding.json +20 -22
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"intrinsic-type-state.d.ts","sourceRoot":"","sources":["../../../src/core/intrinsic-type-state.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"intrinsic-type-state.d.ts","sourceRoot":"","sources":["../../../src/core/intrinsic-type-state.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
// Contains all intrinsic data setter or getter
|
|
2
2
|
// Anything that the TypeSpec check might should be here.
|
|
3
3
|
import { createStateSymbol } from "../lib/utils.js";
|
|
4
|
+
import { useStateMap } from "../utils/state-accessor.js";
|
|
4
5
|
const stateKeys = {
|
|
5
6
|
minValues: createStateSymbol("minValues"),
|
|
6
7
|
maxValues: createStateSymbol("maxValues"),
|
|
@@ -154,5 +155,6 @@ export function getDiscriminator(program, entity) {
|
|
|
154
155
|
export function getDiscriminatedTypes(program) {
|
|
155
156
|
return [...program.stateMap(stateKeys.discriminator).entries()];
|
|
156
157
|
}
|
|
158
|
+
export const [getDiscriminatedOptions, setDiscriminatedOptions] = useStateMap(createStateSymbol("discriminated"));
|
|
157
159
|
// #endregion
|
|
158
160
|
//# sourceMappingURL=intrinsic-type-state.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"intrinsic-type-state.js","sourceRoot":"","sources":["../../../src/core/intrinsic-type-state.ts"],"names":[],"mappings":"AAAA,+CAA+C;AAC/C,yDAAyD;
|
|
1
|
+
{"version":3,"file":"intrinsic-type-state.js","sourceRoot":"","sources":["../../../src/core/intrinsic-type-state.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"unused-template-parameter.rule.d.ts","sourceRoot":"","sources":["../../../../src/core/linter-rules/unused-template-parameter.rule.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,yCAAyC,8BAA8B,CAAC"}
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
import { removeUnusedTemplateParameterCodeFix } from "../compiler-code-fixes/remove-unused-template-parameter.codefix.js";
|
|
2
|
+
import { createLinterRule, paramMessage } from "../library.js";
|
|
3
|
+
export const builtInLinterRule_UnusedTemplateParameter = `unused-template-parameter`;
|
|
4
|
+
/** @internal */
|
|
5
|
+
export function createUnusedTemplateParameterLinterRule() {
|
|
6
|
+
return createLinterRule({
|
|
7
|
+
name: builtInLinterRule_UnusedTemplateParameter,
|
|
8
|
+
severity: "warning",
|
|
9
|
+
description: "Linter rules for unused template parameter.",
|
|
10
|
+
messages: {
|
|
11
|
+
default: paramMessage `Templates should use all specified parameters, and parameter '${"parameterName"}' does not exist in type '${"type"}'. Consider removing this parameter.`,
|
|
12
|
+
},
|
|
13
|
+
create(context) {
|
|
14
|
+
return {
|
|
15
|
+
root: (_root) => {
|
|
16
|
+
const templateParameters = context.program.checker
|
|
17
|
+
.getTemplateParameterUsageMap()
|
|
18
|
+
.entries();
|
|
19
|
+
for (const [templateParameter, used] of templateParameters) {
|
|
20
|
+
if (!used) {
|
|
21
|
+
context.reportDiagnostic({
|
|
22
|
+
format: {
|
|
23
|
+
parameterName: templateParameter.id.sv,
|
|
24
|
+
type: templateParameter.parent?.symbol.name ?? "",
|
|
25
|
+
},
|
|
26
|
+
target: templateParameter,
|
|
27
|
+
codefixes: [removeUnusedTemplateParameterCodeFix(templateParameter)],
|
|
28
|
+
});
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
},
|
|
32
|
+
};
|
|
33
|
+
},
|
|
34
|
+
});
|
|
35
|
+
}
|
|
36
|
+
//# sourceMappingURL=unused-template-parameter.rule.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"unused-template-parameter.rule.js","sourceRoot":"","sources":["../../../../src/core/linter-rules/unused-template-parameter.rule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oCAAoC,EAAE,MAAM,oEAAoE,CAAC;AAC1H,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE/D,MAAM,CAAC,MAAM,yCAAyC,GAAG,2BAA2B,CAAC;AAErF,gBAAgB;AAChB,MAAM,UAAU,uCAAuC;IACrD,OAAO,gBAAgB,CAAC;QACtB,IAAI,EAAE,yCAAyC;QAC/C,QAAQ,EAAE,SAAS;QACnB,WAAW,EAAE,6CAA6C;QAC1D,QAAQ,EAAE;YACR,OAAO,EAAE,YAAY,CAAA,iEAAiE,eAAe,6BAA6B,MAAM,sCAAsC;SAC/K;QACD,MAAM,CAAC,OAAO;YACZ,OAAO;gBACL,IAAI,EAAE,CAAC,KAAK,EAAE,EAAE;oBACd,MAAM,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO;yBAC/C,4BAA4B,EAAE;yBAC9B,OAAO,EAAE,CAAC;oBACb,KAAK,MAAM,CAAC,iBAAiB,EAAE,IAAI,CAAC,IAAI,kBAAkB,EAAE,CAAC;wBAC3D,IAAI,CAAC,IAAI,EAAE,CAAC;4BACV,OAAO,CAAC,gBAAgB,CAAC;gCACvB,MAAM,EAAE;oCACN,aAAa,EAAE,iBAAiB,CAAC,EAAE,CAAC,EAAE;oCACtC,IAAI,EAAE,iBAAiB,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,IAAI,EAAE;iCAClD;gCACD,MAAM,EAAE,iBAAiB;gCACzB,SAAS,EAAE,CAAC,oCAAoC,CAAC,iBAAiB,CAAC,CAAC;6BACrE,CAAC,CAAC;wBACL,CAAC;oBACH,CAAC;gBACH,CAAC;aACF,CAAC;QACJ,CAAC;KACF,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"unused-using.rule.d.ts","sourceRoot":"","sources":["../../../../src/core/linter-rules/unused-using.rule.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,6BAA6B,iBAAiB,CAAC"}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import { removeUnusedCodeCodeFix } from "../compiler-code-fixes/remove-unused-code.codefix.js";
|
|
2
|
+
import { createLinterRule, paramMessage } from "../library.js";
|
|
3
|
+
import { SyntaxKind } from "../types.js";
|
|
4
|
+
export const builtInLinterRule_UnusedUsing = `unused-using`;
|
|
5
|
+
/** @internal */
|
|
6
|
+
export function createUnusedUsingLinterRule(nameResolver) {
|
|
7
|
+
return createLinterRule({
|
|
8
|
+
name: builtInLinterRule_UnusedUsing,
|
|
9
|
+
severity: "warning",
|
|
10
|
+
description: "Linter rules for unused using statement.",
|
|
11
|
+
messages: {
|
|
12
|
+
default: paramMessage `'using ${"code"}' is declared but never be used.`,
|
|
13
|
+
},
|
|
14
|
+
create(context) {
|
|
15
|
+
return {
|
|
16
|
+
root: (_root) => {
|
|
17
|
+
const getUsingName = (node) => {
|
|
18
|
+
if (node.kind === SyntaxKind.MemberExpression) {
|
|
19
|
+
return `${getUsingName(node.base)}${node.selector}${node.id.sv}`;
|
|
20
|
+
}
|
|
21
|
+
else {
|
|
22
|
+
// identifier node
|
|
23
|
+
return node.sv;
|
|
24
|
+
}
|
|
25
|
+
};
|
|
26
|
+
nameResolver.getUnusedUsings().forEach((target) => {
|
|
27
|
+
context.reportDiagnostic({
|
|
28
|
+
format: { code: getUsingName(target.name) },
|
|
29
|
+
target,
|
|
30
|
+
codefixes: [removeUnusedCodeCodeFix(target)],
|
|
31
|
+
});
|
|
32
|
+
});
|
|
33
|
+
},
|
|
34
|
+
};
|
|
35
|
+
},
|
|
36
|
+
});
|
|
37
|
+
}
|
|
38
|
+
//# sourceMappingURL=unused-using.rule.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"unused-using.rule.js","sourceRoot":"","sources":["../../../../src/core/linter-rules/unused-using.rule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,sDAAsD,CAAC;AAC/F,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE/D,OAAO,EAAwC,UAAU,EAAE,MAAM,aAAa,CAAC;AAE/E,MAAM,CAAC,MAAM,6BAA6B,GAAG,cAAc,CAAC;AAE5D,gBAAgB;AAChB,MAAM,UAAU,2BAA2B,CAAC,YAA0B;IACpE,OAAO,gBAAgB,CAAC;QACtB,IAAI,EAAE,6BAA6B;QACnC,QAAQ,EAAE,SAAS;QACnB,WAAW,EAAE,0CAA0C;QACvD,QAAQ,EAAE;YACR,OAAO,EAAE,YAAY,CAAA,UAAU,MAAM,kCAAkC;SACxE;QACD,MAAM,CAAC,OAAO;YACZ,OAAO;gBACL,IAAI,EAAE,CAAC,KAAK,EAAE,EAAE;oBACd,MAAM,YAAY,GAAG,CAAC,IAA2C,EAAU,EAAE;wBAC3E,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,gBAAgB,EAAE,CAAC;4BAC9C,OAAO,GAAG,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;wBACnE,CAAC;6BAAM,CAAC;4BACN,kBAAkB;4BAClB,OAAO,IAAI,CAAC,EAAE,CAAC;wBACjB,CAAC;oBACH,CAAC,CAAC;oBACF,YAAY,CAAC,eAAe,EAAE,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;wBAChD,OAAO,CAAC,gBAAgB,CAAC;4BACvB,MAAM,EAAE,EAAE,IAAI,EAAE,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;4BAC3C,MAAM;4BACN,SAAS,EAAE,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;yBAC7C,CAAC,CAAC;oBACL,CAAC,CAAC,CAAC;gBACL,CAAC;aACF,CAAC;QACJ,CAAC;KACF,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -17,7 +17,6 @@ export declare function resolveLinterDefinition(libName: string, linter: LinterD
|
|
|
17
17
|
export declare function createLinter(program: Program, loadLibrary: (name: string) => Promise<LinterLibraryInstance | undefined>): Linter;
|
|
18
18
|
export declare function createLinterRuleContext<N extends string, DM extends DiagnosticMessages>(program: Program, rule: LinterRule<N, DM>, diagnosticCollector: DiagnosticCollector): LinterRuleContext<DM>;
|
|
19
19
|
export declare const builtInLinterLibraryName = "@typespec/compiler";
|
|
20
|
-
export declare const builtInLinterRule_UnusedUsing = "unused-using";
|
|
21
20
|
export declare function createBuiltInLinterLibrary(nameResolver: NameResolver): LinterLibraryInstance;
|
|
22
21
|
export {};
|
|
23
22
|
//# sourceMappingURL=linter.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"linter.d.ts","sourceRoot":"","sources":["../../../src/core/linter.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"linter.d.ts","sourceRoot":"","sources":["../../../src/core/linter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAA6C,MAAM,kBAAkB,CAAC;AAMlG,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAE5C,OAAO,EACL,UAAU,EACV,kBAAkB,EAClB,gBAAgB,EAChB,wBAAwB,EACxB,UAAU,EACV,iBAAiB,EAEjB,aAAa,EAId,MAAM,YAAY,CAAC;AAEpB,KAAK,qBAAqB,GAAG;IAAE,MAAM,EAAE,wBAAwB,CAAA;CAAE,CAAC;AAElE,MAAM,WAAW,MAAM;IACrB,aAAa,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,SAAS,UAAU,EAAE,CAAC,CAAC;IACtE,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,qBAAqB,GAAG,IAAI,CAAC;IACvE,IAAI,IAAI,SAAS,UAAU,EAAE,CAAC;CAC/B;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,gBAAgB,GACvB,wBAAwB,CAoB1B;AAED,wBAAgB,YAAY,CAC1B,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,GACxE,MAAM,CAyJR;AAED,wBAAgB,uBAAuB,CAAC,CAAC,SAAS,MAAM,EAAE,EAAE,SAAS,kBAAkB,EACrF,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,UAAU,CAAC,CAAC,EAAE,EAAE,CAAC,EACvB,mBAAmB,EAAE,mBAAmB,GACvC,iBAAiB,CAAC,EAAE,CAAC,CA2CvB;AAED,eAAO,MAAM,wBAAwB,uBAAuB,CAAC;AAC7D,wBAAgB,0BAA0B,CAAC,YAAY,EAAE,YAAY,GAAG,qBAAqB,CAM5F"}
|
package/dist/src/core/linter.js
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
|
-
import { removeUnusedCodeCodeFix } from "./compiler-code-fixes/remove-unused-code.codefix.js";
|
|
2
1
|
import { compilerAssert, createDiagnosticCollector } from "./diagnostics.js";
|
|
3
2
|
import { getLocationContext } from "./helpers/location-context.js";
|
|
4
|
-
import {
|
|
3
|
+
import { defineLinter } from "./library.js";
|
|
4
|
+
import { createUnusedTemplateParameterLinterRule } from "./linter-rules/unused-template-parameter.rule.js";
|
|
5
|
+
import { createUnusedUsingLinterRule } from "./linter-rules/unused-using.rule.js";
|
|
5
6
|
import { createDiagnostic } from "./messages.js";
|
|
6
7
|
import { EventEmitter, mapEventEmitterToNodeListener, navigateProgram } from "./semantic-walker.js";
|
|
7
|
-
import { NoTarget,
|
|
8
|
+
import { NoTarget, } from "./types.js";
|
|
8
9
|
/**
|
|
9
10
|
* Resolve the linter definition
|
|
10
11
|
*/
|
|
@@ -191,48 +192,15 @@ export function createLinterRuleContext(program, rule, diagnosticCollector) {
|
|
|
191
192
|
}
|
|
192
193
|
}
|
|
193
194
|
export const builtInLinterLibraryName = `@typespec/compiler`;
|
|
194
|
-
export const builtInLinterRule_UnusedUsing = `unused-using`;
|
|
195
195
|
export function createBuiltInLinterLibrary(nameResolver) {
|
|
196
196
|
const builtInLinter = resolveLinterDefinition(builtInLinterLibraryName, createBuiltInLinter(nameResolver));
|
|
197
197
|
return { linter: builtInLinter };
|
|
198
198
|
}
|
|
199
199
|
function createBuiltInLinter(nameResolver) {
|
|
200
|
-
const unusedUsingLinterRule = createUnusedUsingLinterRule();
|
|
200
|
+
const unusedUsingLinterRule = createUnusedUsingLinterRule(nameResolver);
|
|
201
|
+
const unusedTemplateParameterLinterRule = createUnusedTemplateParameterLinterRule();
|
|
201
202
|
return defineLinter({
|
|
202
|
-
rules: [unusedUsingLinterRule],
|
|
203
|
+
rules: [unusedUsingLinterRule, unusedTemplateParameterLinterRule],
|
|
203
204
|
});
|
|
204
|
-
function createUnusedUsingLinterRule() {
|
|
205
|
-
return createLinterRule({
|
|
206
|
-
name: builtInLinterRule_UnusedUsing,
|
|
207
|
-
severity: "warning",
|
|
208
|
-
description: "Linter rules for unused using statement.",
|
|
209
|
-
messages: {
|
|
210
|
-
default: paramMessage `'using ${"code"}' is declared but never be used.`,
|
|
211
|
-
},
|
|
212
|
-
create(context) {
|
|
213
|
-
return {
|
|
214
|
-
root: (_root) => {
|
|
215
|
-
const getUsingName = (node) => {
|
|
216
|
-
if (node.kind === SyntaxKind.MemberExpression) {
|
|
217
|
-
return `${getUsingName(node.base)}${node.selector}${node.id.sv}`;
|
|
218
|
-
}
|
|
219
|
-
else {
|
|
220
|
-
// identifier node
|
|
221
|
-
return node.sv;
|
|
222
|
-
}
|
|
223
|
-
};
|
|
224
|
-
nameResolver.getUnusedUsings().forEach((target) => {
|
|
225
|
-
context.reportDiagnostic({
|
|
226
|
-
messageId: "default",
|
|
227
|
-
format: { code: getUsingName(target.name) },
|
|
228
|
-
target,
|
|
229
|
-
codefixes: [removeUnusedCodeCodeFix(target)],
|
|
230
|
-
});
|
|
231
|
-
});
|
|
232
|
-
},
|
|
233
|
-
};
|
|
234
|
-
},
|
|
235
|
-
});
|
|
236
|
-
}
|
|
237
205
|
}
|
|
238
206
|
//# sourceMappingURL=linter.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"linter.js","sourceRoot":"","sources":["../../../src/core/linter.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"linter.js","sourceRoot":"","sources":["../../../src/core/linter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"console-sink.browser.d.ts","sourceRoot":"","sources":["../../../../src/core/logger/console-sink.browser.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEpD,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,GAAG,GAAG,OAAO,
|
|
1
|
+
{"version":3,"file":"console-sink.browser.d.ts","sourceRoot":"","sources":["../../../../src/core/logger/console-sink.browser.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEpD,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,GAAG,GAAG,OAAO,CAUvD;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,YAAY,GAAG,MAAM,CAEnD"}
|
|
@@ -6,9 +6,25 @@ export function createConsoleSink(options) {
|
|
|
6
6
|
}
|
|
7
7
|
return {
|
|
8
8
|
log,
|
|
9
|
+
trackAction: (message, finalMessage, action) => trackAction(message, finalMessage, action),
|
|
9
10
|
};
|
|
10
11
|
}
|
|
11
12
|
export function formatLog(log) {
|
|
12
13
|
return JSON.stringify(log);
|
|
13
14
|
}
|
|
15
|
+
async function trackAction(message, finalMessage, asyncAction) {
|
|
16
|
+
// eslint-disable-next-line no-console
|
|
17
|
+
console.log(message);
|
|
18
|
+
try {
|
|
19
|
+
const result = await asyncAction();
|
|
20
|
+
// eslint-disable-next-line no-console
|
|
21
|
+
console.log(`✓ ${finalMessage}`);
|
|
22
|
+
return result;
|
|
23
|
+
}
|
|
24
|
+
catch (error) {
|
|
25
|
+
// eslint-disable-next-line no-console
|
|
26
|
+
console.log(`x ${message}`);
|
|
27
|
+
throw error;
|
|
28
|
+
}
|
|
29
|
+
}
|
|
14
30
|
//# sourceMappingURL=console-sink.browser.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"console-sink.browser.js","sourceRoot":"","sources":["../../../../src/core/logger/console-sink.browser.ts"],"names":[],"mappings":"AAAA,2CAA2C;AAI3C,MAAM,UAAU,iBAAiB,CAAC,OAAY;IAC5C,SAAS,GAAG,CAAC,IAAkB;QAC7B,sCAAsC;QACtC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;IAC/B,CAAC;IAED,OAAO;QACL,GAAG;
|
|
1
|
+
{"version":3,"file":"console-sink.browser.js","sourceRoot":"","sources":["../../../../src/core/logger/console-sink.browser.ts"],"names":[],"mappings":"AAAA,2CAA2C;AAI3C,MAAM,UAAU,iBAAiB,CAAC,OAAY;IAC5C,SAAS,GAAG,CAAC,IAAkB;QAC7B,sCAAsC;QACtC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;IAC/B,CAAC;IAED,OAAO;QACL,GAAG;QACH,WAAW,EAAE,CAAC,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,EAAE,CAAC,WAAW,CAAC,OAAO,EAAE,YAAY,EAAE,MAAM,CAAC;KAC3F,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,GAAiB;IACzC,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;AAC7B,CAAC;AAED,KAAK,UAAU,WAAW,CACxB,OAAe,EACf,YAAoB,EACpB,WAA6B;IAE7B,sCAAsC;IACtC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAErB,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,WAAW,EAAE,CAAC;QACnC,sCAAsC;QACtC,OAAO,CAAC,GAAG,CAAC,KAAK,YAAY,EAAE,CAAC,CAAC;QACjC,OAAO,MAAM,CAAC;IAChB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,sCAAsC;QACtC,OAAO,CAAC,GAAG,CAAC,KAAK,OAAO,EAAE,CAAC,CAAC;QAC5B,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC"}
|
|
@@ -8,4 +8,6 @@ export interface ConsoleSinkOptions extends FormatLogOptions {
|
|
|
8
8
|
}
|
|
9
9
|
export declare function createConsoleSink(options?: ConsoleSinkOptions): LogSink;
|
|
10
10
|
export declare function formatLog(log: ProcessedLog, options: FormatLogOptions): string;
|
|
11
|
+
export declare function trackAction<T>(message: string, finalMessage: string, asyncAction: () => Promise<T>, options: FormatLogOptions): Promise<T>;
|
|
12
|
+
export declare const spinnerFrames: string[];
|
|
11
13
|
//# sourceMappingURL=console-sink.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"console-sink.d.ts","sourceRoot":"","sources":["../../../../src/core/logger/console-sink.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"console-sink.d.ts","sourceRoot":"","sources":["../../../../src/core/logger/console-sink.ts"],"names":[],"mappings":"AAKA,OAAO,EAAY,OAAO,EAAE,YAAY,EAAkB,MAAM,aAAa,CAAC;AAG9E,MAAM,WAAW,gBAAgB;IAC/B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED,MAAM,WAAW,kBAAmB,SAAQ,gBAAgB;CAAG;AAE/D,wBAAgB,iBAAiB,CAAC,OAAO,GAAE,kBAAuB,GAAG,OAAO,CAgB3E;AAUD,wBAAgB,SAAS,CAAC,GAAG,EAAE,YAAY,EAAE,OAAO,EAAE,gBAAgB,GAAG,MAAM,CAoB9E;AA8ED,wBAAsB,WAAW,CAAC,CAAC,EACjC,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EAC7B,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,CAAC,CAAC,CAmCZ;AAeD,eAAO,MAAM,aAAa,UAED,CAAC"}
|
|
@@ -1,14 +1,21 @@
|
|
|
1
1
|
import { codeFrameColumns } from "@babel/code-frame";
|
|
2
|
+
import isUnicodeSupported from "is-unicode-supported";
|
|
2
3
|
import { relative } from "path/posix";
|
|
3
4
|
import pc from "picocolors";
|
|
4
5
|
import { supportsHyperlink } from "./support-hyperlinks.js";
|
|
5
6
|
export function createConsoleSink(options = {}) {
|
|
6
7
|
function log(data) {
|
|
8
|
+
const isTTY = process.stdout?.isTTY && !process.env.CI;
|
|
9
|
+
if (isTTY) {
|
|
10
|
+
process.stdout.clearLine(0);
|
|
11
|
+
process.stdout.cursorTo(0);
|
|
12
|
+
}
|
|
7
13
|
// eslint-disable-next-line no-console
|
|
8
14
|
console.log(formatLog(data, options));
|
|
9
15
|
}
|
|
10
16
|
return {
|
|
11
17
|
log,
|
|
18
|
+
trackAction: (message, finalMessage, action) => trackAction(message, finalMessage, action, options),
|
|
12
19
|
};
|
|
13
20
|
}
|
|
14
21
|
const supportHyperLinks = supportsHyperlink(process.stdout);
|
|
@@ -101,4 +108,52 @@ function getLineAndColumn(location) {
|
|
|
101
108
|
}
|
|
102
109
|
return result;
|
|
103
110
|
}
|
|
111
|
+
export async function trackAction(message, finalMessage, asyncAction, options) {
|
|
112
|
+
const isTTY = process.stdout?.isTTY && !process.env.CI;
|
|
113
|
+
let interval;
|
|
114
|
+
if (isTTY) {
|
|
115
|
+
const spinner = createSpinner();
|
|
116
|
+
interval = setInterval(() => {
|
|
117
|
+
process.stdout.clearLine(0);
|
|
118
|
+
process.stdout.cursorTo(0);
|
|
119
|
+
process.stdout.write(`\r${color(options, spinner(), pc.yellow)} ${message}`);
|
|
120
|
+
}, 200);
|
|
121
|
+
}
|
|
122
|
+
else {
|
|
123
|
+
// eslint-disable-next-line no-console
|
|
124
|
+
console.log(message);
|
|
125
|
+
}
|
|
126
|
+
try {
|
|
127
|
+
const result = await asyncAction();
|
|
128
|
+
if (interval) {
|
|
129
|
+
clearInterval(interval);
|
|
130
|
+
clearLastLine();
|
|
131
|
+
}
|
|
132
|
+
// eslint-disable-next-line no-console
|
|
133
|
+
console.log(`${color(options, "✔", pc.green)} ${finalMessage}`);
|
|
134
|
+
return result;
|
|
135
|
+
}
|
|
136
|
+
catch (error) {
|
|
137
|
+
if (interval) {
|
|
138
|
+
clearInterval(interval);
|
|
139
|
+
clearLastLine();
|
|
140
|
+
}
|
|
141
|
+
// eslint-disable-next-line no-console
|
|
142
|
+
console.log(`${color(options, "x", pc.red)} ${message}`);
|
|
143
|
+
throw error;
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
function clearLastLine() {
|
|
147
|
+
process.stdout.write("\r\x1b[K");
|
|
148
|
+
}
|
|
149
|
+
function createSpinner() {
|
|
150
|
+
let index = 0;
|
|
151
|
+
return () => {
|
|
152
|
+
index = ++index % spinnerFrames.length;
|
|
153
|
+
return spinnerFrames[index];
|
|
154
|
+
};
|
|
155
|
+
}
|
|
156
|
+
export const spinnerFrames = isUnicodeSupported()
|
|
157
|
+
? ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"]
|
|
158
|
+
: ["-", "\\", "|", "/"];
|
|
104
159
|
//# sourceMappingURL=console-sink.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"console-sink.js","sourceRoot":"","sources":["../../../../src/core/logger/console-sink.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,MAAM,YAAY,CAAC;AAG5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAU5D,MAAM,UAAU,iBAAiB,CAAC,UAA8B,EAAE;IAChE,SAAS,GAAG,CAAC,IAAkB;QAC7B,sCAAsC;QACtC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;IACxC,CAAC;IAED,OAAO;QACL,GAAG;
|
|
1
|
+
{"version":3,"file":"console-sink.js","sourceRoot":"","sources":["../../../../src/core/logger/console-sink.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,kBAAkB,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,MAAM,YAAY,CAAC;AAG5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAU5D,MAAM,UAAU,iBAAiB,CAAC,UAA8B,EAAE;IAChE,SAAS,GAAG,CAAC,IAAkB;QAC7B,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,EAAE,KAAK,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QACvD,IAAI,KAAK,EAAE,CAAC;YACV,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;YAC5B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC7B,CAAC;QACD,sCAAsC;QACtC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;IACxC,CAAC;IAED,OAAO;QACL,GAAG;QACH,WAAW,EAAE,CAAC,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,EAAE,CAC7C,WAAW,CAAC,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,OAAO,CAAC;KACtD,CAAC;AACJ,CAAC;AAED,MAAM,iBAAiB,GAAG,iBAAiB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;AAC5D,SAAS,SAAS,CAAC,IAAY,EAAE,GAAuB,EAAE,OAAyB;IACjF,IAAI,iBAAiB,IAAI,GAAG,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QAC/C,OAAO,aAAa,GAAG,SAAS,IAAI,kBAAkB,CAAC;IACzD,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,GAAiB,EAAE,OAAyB;IACpE,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAClG,MAAM,KAAK,GAAW,OAAO,CAAC,eAAe,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;IAC9F,MAAM,OAAO,GAAG,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,GAAG,KAAK,GAAG,IAAI,KAAK,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC;IAChF,MAAM,IAAI,GAAG,GAAG,CAAC,cAAc,CAAC;IAChC,IAAI,IAAI,EAAE,IAAI,EAAE,CAAC;QACf,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAC9D,MAAM,aAAa,GAAG,mBAAmB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACzD,MAAM,OAAO,GAAG,CAAC,GAAG,iBAAiB,MAAM,OAAO,GAAG,aAAa,EAAE,CAAC,CAAC;QAEtE,KAAK,MAAM,OAAO,IAAI,GAAG,CAAC,OAAO,IAAI,EAAE,EAAE,CAAC;YACxC,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,OAAO,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;YAC1E,MAAM,aAAa,GAAG,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;YACrE,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,iBAAiB,MAAM,OAAO,CAAC,OAAO,GAAG,aAAa,EAAE,CAAC,CAAC,CAAC;QACpF,CAAC;QAED,OAAO,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC;SAAM,CAAC;QACN,OAAO,OAAO,CAAC;IACjB,CAAC;AACH,CAAC;AAED,SAAS,KAAK,CAAC,OAAyB,EAAE,IAAY,EAAE,KAAgB;IACtE,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AAC7C,CAAC;AAED,SAAS,WAAW,CAAC,OAAyB,EAAE,KAAe;IAC7D,QAAQ,KAAK,EAAE,CAAC;QACd,KAAK,OAAO;YACV,OAAO,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC;QACzC,KAAK,SAAS;YACZ,OAAO,KAAK,CAAC,OAAO,EAAE,SAAS,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC;QAC9C,KAAK,OAAO;YACV,OAAO,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC;IAC7C,CAAC;AACH,CAAC;AAED,SAAS,oBAAoB,CAAC,OAAyB,EAAE,QAAwB;IAC/E,MAAM,SAAS,GAAG,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IAC7C,MAAM,OAAO,GAAG,OAAO,CAAC,cAAc;QACpC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC;QAC7C,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC;IAEvB,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;IAC9C,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,EAAE,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC;IACxE,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,EAAE,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC;IAC5E,OAAO,GAAG,IAAI,IAAI,IAAI,IAAI,MAAM,EAAE,CAAC;AACrC,CAAC;AAED;;;;;;;;;;;GAWG;AACH,SAAS,mBAAmB,CAAC,OAAyB,EAAE,QAAwB;IAC9E,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,QAAQ,CAAC,WAAW,EAAE,CAAC;QAC5C,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,MAAM,OAAO,GAAG,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IAE3C,MAAM,MAAM,GAAG,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE;QAC3D,UAAU,EAAE,CAAC;QACb,UAAU,EAAE,CAAC;KACd,CAAC,CAAC;IACH,OAAO,KAAK,MAAM,EAAE,CAAC;AACvB,CAAC;AAED,SAAS,MAAM,CAAC,IAAY;IAC1B,OAAO,IAAI;SACR,KAAK,CAAC,IAAI,CAAC;SACX,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC;SACpB,IAAI,CAAC,IAAI,CAAC,CAAC;AAChB,CAAC;AAOD,SAAS,gBAAgB,CAAC,QAAwB;IAChD,MAAM,GAAG,GAAG,QAAQ,CAAC,IAAI,CAAC,6BAA6B,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;IAC3E,MAAM,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,6BAA6B,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACjG,MAAM,MAAM,GAAiB;QAC3B,KAAK,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,GAAG,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,SAAS,GAAG,CAAC,EAAE;KACzD,CAAC;IACF,IAAI,GAAG,EAAE,CAAC;QACR,MAAM,CAAC,GAAG,GAAG,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,GAAG,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,SAAS,GAAG,CAAC,EAAE,CAAC;IACjE,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,OAAe,EACf,YAAoB,EACpB,WAA6B,EAC7B,OAAyB;IAEzB,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,EAAE,KAAK,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;IACvD,IAAI,QAAQ,CAAC;IACb,IAAI,KAAK,EAAE,CAAC;QACV,MAAM,OAAO,GAAG,aAAa,EAAE,CAAC;QAEhC,QAAQ,GAAG,WAAW,CAAC,GAAG,EAAE;YAC1B,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;YAC5B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;YAC3B,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC,CAAC;QAC/E,CAAC,EAAE,GAAG,CAAC,CAAC;IACV,CAAC;SAAM,CAAC;QACN,sCAAsC;QACtC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACvB,CAAC;IAED,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,WAAW,EAAE,CAAC;QACnC,IAAI,QAAQ,EAAE,CAAC;YACb,aAAa,CAAC,QAAQ,CAAC,CAAC;YACxB,aAAa,EAAE,CAAC;QAClB,CAAC;QACD,sCAAsC;QACtC,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,YAAY,EAAE,CAAC,CAAC;QAChE,OAAO,MAAM,CAAC;IAChB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,QAAQ,EAAE,CAAC;YACb,aAAa,CAAC,QAAQ,CAAC,CAAC;YACxB,aAAa,EAAE,CAAC;QAClB,CAAC;QAED,sCAAsC;QACtC,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,OAAO,EAAE,CAAC,CAAC;QACzD,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAED,SAAS,aAAa;IACpB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;AACnC,CAAC;AAED,SAAS,aAAa;IACpB,IAAI,KAAK,GAAG,CAAC,CAAC;IAEd,OAAO,GAAG,EAAE;QACV,KAAK,GAAG,EAAE,KAAK,GAAG,aAAa,CAAC,MAAM,CAAC;QACvC,OAAO,aAAa,CAAC,KAAK,CAAC,CAAC;IAC9B,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,kBAAkB,EAAE;IAC/C,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;IACpD,CAAC,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../../../src/core/logger/logger.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAW,QAAQ,EAAE,OAAO,EAAgB,MAAM,aAAa,CAAC;AAQpF,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,CAAC,EAAE,QAAQ,CAAC;CAClB;AAMD,wBAAgB,YAAY,CAAC,OAAO,EAAE,aAAa,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../../../src/core/logger/logger.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAW,QAAQ,EAAE,OAAO,EAAgB,MAAM,aAAa,CAAC;AAQpF,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,CAAC,EAAE,QAAQ,CAAC;CAClB;AAMD,wBAAgB,YAAY,CAAC,OAAO,EAAE,aAAa,GAAG,MAAM,CAiB3D"}
|
|
@@ -19,6 +19,7 @@ export function createLogger(options) {
|
|
|
19
19
|
trace: (message) => log({ level: "trace", message }),
|
|
20
20
|
warn: (message) => log({ level: "warning", message }),
|
|
21
21
|
error: (message) => log({ level: "error", message }),
|
|
22
|
+
trackAction: async (message, finalMessage, action) => config.sink.trackAction ? config.sink.trackAction(message, finalMessage, action) : action(),
|
|
22
23
|
};
|
|
23
24
|
}
|
|
24
25
|
function processLog(log) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../../src/core/logger/logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAGtD,MAAM,SAAS,GAAG;IAChB,KAAK,EAAE,EAAE;IACT,OAAO,EAAE,EAAE;IACX,KAAK,EAAE,EAAE;CACD,CAAC;AAOX,MAAM,cAAc,GAAG;IACrB,KAAK,EAAE,OAAO;CACN,CAAC;AAEX,MAAM,UAAU,YAAY,CAAC,OAAsB;IACjD,MAAM,MAAM,GAAG,EAAE,GAAG,cAAc,EAAE,GAAG,OAAO,EAAE,CAAC;IAEjD,SAAS,GAAG,CAAC,GAAY;QACvB,IAAI,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YACpD,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;QACnC,CAAC;IACH,CAAC;IAED,OAAO;QACL,GAAG;QACH,KAAK,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;QACpD,IAAI,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC;QACrD,KAAK,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../../src/core/logger/logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAGtD,MAAM,SAAS,GAAG;IAChB,KAAK,EAAE,EAAE;IACT,OAAO,EAAE,EAAE;IACX,KAAK,EAAE,EAAE;CACD,CAAC;AAOX,MAAM,cAAc,GAAG;IACrB,KAAK,EAAE,OAAO;CACN,CAAC;AAEX,MAAM,UAAU,YAAY,CAAC,OAAsB;IACjD,MAAM,MAAM,GAAG,EAAE,GAAG,cAAc,EAAE,GAAG,OAAO,EAAE,CAAC;IAEjD,SAAS,GAAG,CAAC,GAAY;QACvB,IAAI,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YACpD,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;QACnC,CAAC;IACH,CAAC;IAED,OAAO;QACL,GAAG;QACH,KAAK,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;QACpD,IAAI,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC;QACrD,KAAK,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;QACpD,WAAW,EAAE,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,EAAE,CACnD,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE;KAC9F,CAAC;AACJ,CAAC;AAED,SAAS,UAAU,CAAC,GAAY;IAC9B,OAAO;QACL,KAAK,EAAE,GAAG,CAAC,KAAK;QAChB,IAAI,EAAE,GAAG,CAAC,IAAI;QACd,OAAO,EAAE,GAAG,CAAC,OAAO;QACpB,cAAc,EAAE,iBAAiB,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;KAClE,CAAC;AACJ,CAAC"}
|