@zzzen/pyright-internal 1.2.0-dev.20240721 → 1.2.0-dev.20240804
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/analyzer/analyzerNodeInfo.js +2 -2
- package/dist/analyzer/analyzerNodeInfo.js.map +1 -1
- package/dist/analyzer/binder.js +15 -12
- package/dist/analyzer/binder.js.map +1 -1
- package/dist/analyzer/cacheManager.js +3 -0
- package/dist/analyzer/cacheManager.js.map +1 -1
- package/dist/analyzer/checker.d.ts +5 -3
- package/dist/analyzer/checker.js +238 -193
- package/dist/analyzer/checker.js.map +1 -1
- package/dist/analyzer/codeFlowEngine.d.ts +2 -2
- package/dist/analyzer/codeFlowEngine.js +53 -46
- package/dist/analyzer/codeFlowEngine.js.map +1 -1
- package/dist/analyzer/codeFlowTypes.js +1 -1
- package/dist/analyzer/codeFlowTypes.js.map +1 -1
- package/dist/analyzer/constraintSolution.d.ts +21 -0
- package/dist/analyzer/constraintSolution.js +71 -0
- package/dist/analyzer/constraintSolution.js.map +1 -0
- package/dist/analyzer/constraintSolver.d.ts +10 -6
- package/dist/analyzer/constraintSolver.js +520 -462
- package/dist/analyzer/constraintSolver.js.map +1 -1
- package/dist/analyzer/constraintTracker.d.ts +44 -0
- package/dist/analyzer/constraintTracker.js +230 -0
- package/dist/analyzer/constraintTracker.js.map +1 -0
- package/dist/analyzer/constructorTransform.d.ts +2 -2
- package/dist/analyzer/constructorTransform.js +25 -25
- package/dist/analyzer/constructorTransform.js.map +1 -1
- package/dist/analyzer/constructors.d.ts +3 -3
- package/dist/analyzer/constructors.js +80 -64
- package/dist/analyzer/constructors.js.map +1 -1
- package/dist/analyzer/dataClasses.d.ts +2 -2
- package/dist/analyzer/dataClasses.js +87 -61
- package/dist/analyzer/dataClasses.js.map +1 -1
- package/dist/analyzer/declaration.d.ts +9 -9
- package/dist/analyzer/declaration.js +9 -9
- package/dist/analyzer/declaration.js.map +1 -1
- package/dist/analyzer/declarationUtils.d.ts +1 -1
- package/dist/analyzer/declarationUtils.js +6 -6
- package/dist/analyzer/declarationUtils.js.map +1 -1
- package/dist/analyzer/decorators.js +5 -5
- package/dist/analyzer/decorators.js.map +1 -1
- package/dist/analyzer/docStringConversion.js +2 -2
- package/dist/analyzer/docStringConversion.js.map +1 -1
- package/dist/analyzer/enums.d.ts +2 -2
- package/dist/analyzer/enums.js +6 -6
- package/dist/analyzer/enums.js.map +1 -1
- package/dist/analyzer/functionTransform.d.ts +2 -2
- package/dist/analyzer/functionTransform.js +5 -5
- package/dist/analyzer/functionTransform.js.map +1 -1
- package/dist/analyzer/importResolver.js +5 -3
- package/dist/analyzer/importResolver.js.map +1 -1
- package/dist/analyzer/namedTuples.d.ts +3 -3
- package/dist/analyzer/namedTuples.js +21 -22
- package/dist/analyzer/namedTuples.js.map +1 -1
- package/dist/analyzer/operations.d.ts +1 -2
- package/dist/analyzer/operations.js +105 -82
- package/dist/analyzer/operations.js.map +1 -1
- package/dist/analyzer/packageTypeVerifier.js +16 -12
- package/dist/analyzer/packageTypeVerifier.js.map +1 -1
- package/dist/analyzer/parameterUtils.d.ts +12 -12
- package/dist/analyzer/parameterUtils.js +67 -69
- package/dist/analyzer/parameterUtils.js.map +1 -1
- package/dist/analyzer/parseTreeUtils.d.ts +6 -6
- package/dist/analyzer/parseTreeUtils.js +22 -22
- package/dist/analyzer/parseTreeUtils.js.map +1 -1
- package/dist/analyzer/patternMatching.js +122 -101
- package/dist/analyzer/patternMatching.js.map +1 -1
- package/dist/analyzer/program.js +11 -4
- package/dist/analyzer/program.js.map +1 -1
- package/dist/analyzer/properties.d.ts +3 -2
- package/dist/analyzer/properties.js +27 -27
- package/dist/analyzer/properties.js.map +1 -1
- package/dist/analyzer/protocols.d.ts +3 -3
- package/dist/analyzer/protocols.js +58 -57
- package/dist/analyzer/protocols.js.map +1 -1
- package/dist/analyzer/pythonPathUtils.js +1 -1
- package/dist/analyzer/pythonPathUtils.js.map +1 -1
- package/dist/analyzer/service.d.ts +3 -7
- package/dist/analyzer/service.js +28 -30
- package/dist/analyzer/service.js.map +1 -1
- package/dist/analyzer/serviceUtils.d.ts +8 -0
- package/dist/analyzer/serviceUtils.js +31 -0
- package/dist/analyzer/serviceUtils.js.map +1 -0
- package/dist/analyzer/sourceFile.js +5 -19
- package/dist/analyzer/sourceFile.js.map +1 -1
- package/dist/analyzer/sourceMapper.d.ts +1 -1
- package/dist/analyzer/sourceMapper.js +4 -4
- package/dist/analyzer/sourceMapper.js.map +1 -1
- package/dist/analyzer/staticExpressions.js +1 -1
- package/dist/analyzer/staticExpressions.js.map +1 -1
- package/dist/analyzer/tracePrinter.js +4 -4
- package/dist/analyzer/tracePrinter.js.map +1 -1
- package/dist/analyzer/tuples.d.ts +9 -0
- package/dist/analyzer/tuples.js +253 -0
- package/dist/analyzer/tuples.js.map +1 -0
- package/dist/analyzer/typeComplexity.d.ts +2 -0
- package/dist/analyzer/typeComplexity.js +94 -0
- package/dist/analyzer/typeComplexity.js.map +1 -0
- package/dist/analyzer/typeEvaluator.js +1758 -1979
- package/dist/analyzer/typeEvaluator.js.map +1 -1
- package/dist/analyzer/typeEvaluatorTypes.d.ts +69 -45
- package/dist/analyzer/typeEvaluatorTypes.js +7 -1
- package/dist/analyzer/typeEvaluatorTypes.js.map +1 -1
- package/dist/analyzer/typeGuards.js +157 -121
- package/dist/analyzer/typeGuards.js.map +1 -1
- package/dist/analyzer/typePrinter.d.ts +1 -1
- package/dist/analyzer/typePrinter.js +64 -61
- package/dist/analyzer/typePrinter.js.map +1 -1
- package/dist/analyzer/typeStubWriter.d.ts +3 -3
- package/dist/analyzer/typeStubWriter.js +15 -15
- package/dist/analyzer/typeStubWriter.js.map +1 -1
- package/dist/analyzer/typeUtils.d.ts +45 -41
- package/dist/analyzer/typeUtils.js +511 -748
- package/dist/analyzer/typeUtils.js.map +1 -1
- package/dist/analyzer/typeWalker.js +4 -4
- package/dist/analyzer/typeWalker.js.map +1 -1
- package/dist/analyzer/typedDicts.d.ts +4 -4
- package/dist/analyzer/typedDicts.js +73 -77
- package/dist/analyzer/typedDicts.js.map +1 -1
- package/dist/analyzer/types.d.ts +97 -72
- package/dist/analyzer/types.js +217 -208
- package/dist/analyzer/types.js.map +1 -1
- package/dist/commands/dumpFileDebugInfoCommand.js +11 -11
- package/dist/commands/dumpFileDebugInfoCommand.js.map +1 -1
- package/dist/common/configOptions.d.ts +1 -0
- package/dist/common/configOptions.js +5 -0
- package/dist/common/configOptions.js.map +1 -1
- package/dist/common/diagnosticRules.d.ts +1 -0
- package/dist/common/diagnosticRules.js +1 -0
- package/dist/common/diagnosticRules.js.map +1 -1
- package/dist/common/fileSystem.d.ts +0 -1
- package/dist/common/fileSystem.js.map +1 -1
- package/dist/common/languageServerInterface.d.ts +13 -0
- package/dist/common/languageServerInterface.js +15 -1
- package/dist/common/languageServerInterface.js.map +1 -1
- package/dist/common/lspUtils.js +2 -2
- package/dist/common/memUtils.d.ts +4 -0
- package/dist/common/memUtils.js +33 -2
- package/dist/common/memUtils.js.map +1 -1
- package/dist/common/serviceKeys.d.ts +3 -0
- package/dist/common/serviceKeys.js +2 -0
- package/dist/common/serviceKeys.js.map +1 -1
- package/dist/common/serviceProviderExtensions.js +7 -0
- package/dist/common/serviceProviderExtensions.js.map +1 -1
- package/dist/languageServerBase.d.ts +5 -4
- package/dist/languageServerBase.js +19 -12
- package/dist/languageServerBase.js.map +1 -1
- package/dist/languageService/autoImporter.d.ts +3 -2
- package/dist/languageService/autoImporter.js +5 -1
- package/dist/languageService/autoImporter.js.map +1 -1
- package/dist/languageService/completionProvider.d.ts +5 -3
- package/dist/languageService/completionProvider.js +39 -38
- package/dist/languageService/completionProvider.js.map +1 -1
- package/dist/languageService/completionProviderUtils.d.ts +1 -1
- package/dist/languageService/completionProviderUtils.js +3 -3
- package/dist/languageService/completionProviderUtils.js.map +1 -1
- package/dist/languageService/fileWatcherDynamicFeature.js +2 -2
- package/dist/languageService/fileWatcherDynamicFeature.js.map +1 -1
- package/dist/languageService/hoverProvider.js +3 -3
- package/dist/languageService/hoverProvider.js.map +1 -1
- package/dist/languageService/referencesProvider.js +2 -2
- package/dist/languageService/signatureHelpProvider.js +1 -1
- package/dist/languageService/signatureHelpProvider.js.map +1 -1
- package/dist/languageService/tooltipUtils.js +3 -3
- package/dist/languageService/tooltipUtils.js.map +1 -1
- package/dist/localization/localize.d.ts +5 -0
- package/dist/localization/localize.js +6 -0
- package/dist/localization/localize.js.map +1 -1
- package/dist/localization/package.nls.cs.json +5 -1
- package/dist/localization/package.nls.de.json +5 -1
- package/dist/localization/package.nls.en-us.json +5 -0
- package/dist/localization/package.nls.es.json +5 -1
- package/dist/localization/package.nls.fr.json +5 -1
- package/dist/localization/package.nls.it.json +5 -1
- package/dist/localization/package.nls.ja.json +5 -1
- package/dist/localization/package.nls.ko.json +5 -1
- package/dist/localization/package.nls.pl.json +5 -1
- package/dist/localization/package.nls.pt-br.json +5 -1
- package/dist/localization/package.nls.qps-ploc.json +5 -1
- package/dist/localization/package.nls.ru.json +5 -1
- package/dist/localization/package.nls.tr.json +5 -1
- package/dist/localization/package.nls.zh-cn.json +5 -1
- package/dist/localization/package.nls.zh-tw.json +5 -1
- package/dist/parser/parseNodes.d.ts +9 -9
- package/dist/parser/parseNodes.js +20 -20
- package/dist/parser/parseNodes.js.map +1 -1
- package/dist/parser/parser.js +30 -30
- package/dist/parser/parser.js.map +1 -1
- package/dist/tests/checker.test.js +12 -4
- package/dist/tests/checker.test.js.map +1 -1
- package/dist/tests/fourslash/signature.builtinDocstrings.fourslash.js +4 -21
- package/dist/tests/fourslash/signature.builtinDocstrings.fourslash.js.map +1 -1
- package/dist/tests/fourslash/signature.complicated.fourslash.js +1 -1
- package/dist/tests/fourslash/signature.complicated.fourslash.js.map +1 -1
- package/dist/tests/harness/fourslash/fourSlashParser.js +1 -1
- package/dist/tests/harness/fourslash/fourSlashParser.js.map +1 -1
- package/dist/tests/harness/fourslash/testStateUtils.js +2 -2
- package/dist/tests/harness/fourslash/testStateUtils.js.map +1 -1
- package/dist/tests/harness/vfs/filesystem.d.ts +0 -1
- package/dist/tests/harness/vfs/filesystem.js +0 -4
- package/dist/tests/harness/vfs/filesystem.js.map +1 -1
- package/dist/tests/importResolver.test.js +62 -15
- package/dist/tests/importResolver.test.js.map +1 -1
- package/dist/tests/lsp/languageServerTestUtils.js +1 -1
- package/dist/tests/lsp/languageServerTestUtils.js.map +1 -1
- package/dist/tests/typeEvaluator1.test.js +1 -1
- package/dist/tests/typeEvaluator2.test.js +12 -0
- package/dist/tests/typeEvaluator2.test.js.map +1 -1
- package/dist/tests/typeEvaluator3.test.js +5 -1
- package/dist/tests/typeEvaluator3.test.js.map +1 -1
- package/dist/tests/typeEvaluator4.test.js +10 -2
- package/dist/tests/typeEvaluator4.test.js.map +1 -1
- package/dist/tests/typeEvaluator5.test.js +9 -3
- package/dist/tests/typeEvaluator5.test.js.map +1 -1
- package/dist/tests/typeEvaluator6.test.js +72 -60
- package/dist/tests/typeEvaluator6.test.js.map +1 -1
- package/dist/tests/typeEvaluator7.test.js +6 -2
- package/dist/tests/typeEvaluator7.test.js.map +1 -1
- package/dist/tests/typeEvaluator8.test.js +4 -0
- package/dist/tests/typeEvaluator8.test.js.map +1 -1
- package/dist/tests/typePrinter.test.js +13 -18
- package/dist/tests/typePrinter.test.js.map +1 -1
- package/dist/workspaceFactory.d.ts +3 -2
- package/dist/workspaceFactory.js +15 -2
- package/dist/workspaceFactory.js.map +1 -1
- package/package.json +1 -1
- package/dist/analyzer/typeVarContext.d.ts +0 -60
- package/dist/analyzer/typeVarContext.js +0 -392
- package/dist/analyzer/typeVarContext.js.map +0 -1
@@ -0,0 +1,253 @@
|
|
1
|
+
"use strict";
|
2
|
+
/*
|
3
|
+
* tuples.ts
|
4
|
+
* Copyright (c) Microsoft Corporation.
|
5
|
+
* Licensed under the MIT license.
|
6
|
+
* Author: Eric Traut
|
7
|
+
*
|
8
|
+
* Provides special-case logic for type analysis of tuples.
|
9
|
+
*/
|
10
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
11
|
+
exports.getSlicedTupleType = exports.adjustTupleTypeArgs = exports.assignTupleTypeArgs = void 0;
|
12
|
+
const localize_1 = require("../localization/localize");
|
13
|
+
const types_1 = require("./types");
|
14
|
+
const typeUtils_1 = require("./typeUtils");
|
15
|
+
// Assigns the source type arguments to the dest type arguments. It assumed
|
16
|
+
// the the caller has already verified that both the dest and source are
|
17
|
+
// tuple classes.
|
18
|
+
function assignTupleTypeArgs(evaluator, destType, srcType, diag, destConstraints, srcConstraints, flags, recursionCount) {
|
19
|
+
var _a, _b;
|
20
|
+
const destTypeArgs = [...((_a = destType.priv.tupleTypeArgs) !== null && _a !== void 0 ? _a : [])];
|
21
|
+
const srcTypeArgs = [...((_b = srcType.priv.tupleTypeArgs) !== null && _b !== void 0 ? _b : [])];
|
22
|
+
if (adjustTupleTypeArgs(evaluator, destTypeArgs, srcTypeArgs, flags)) {
|
23
|
+
for (let argIndex = 0; argIndex < srcTypeArgs.length; argIndex++) {
|
24
|
+
const entryDiag = diag === null || diag === void 0 ? void 0 : diag.createAddendum();
|
25
|
+
const destArgType = destTypeArgs[argIndex].type;
|
26
|
+
const srcArgType = srcTypeArgs[argIndex].type;
|
27
|
+
// Handle the special case where the dest is a TypeVarTuple
|
28
|
+
// and the source is a `*tuple[Any, ...]`. This is allowed.
|
29
|
+
if ((0, types_1.isTypeVarTuple)(destArgType) &&
|
30
|
+
destArgType.priv.isUnpacked &&
|
31
|
+
!destArgType.priv.isInUnion &&
|
32
|
+
(0, typeUtils_1.isTupleGradualForm)(srcArgType)) {
|
33
|
+
return true;
|
34
|
+
}
|
35
|
+
if (!evaluator.assignType(destArgType, srcArgType, entryDiag === null || entryDiag === void 0 ? void 0 : entryDiag.createAddendum(), destConstraints, srcConstraints, flags, recursionCount)) {
|
36
|
+
if (entryDiag) {
|
37
|
+
entryDiag.addMessage(localize_1.LocAddendum.tupleEntryTypeMismatch().format({
|
38
|
+
entry: argIndex + 1,
|
39
|
+
}));
|
40
|
+
}
|
41
|
+
return false;
|
42
|
+
}
|
43
|
+
}
|
44
|
+
}
|
45
|
+
else {
|
46
|
+
const isDestIndeterminate = destTypeArgs.some((t) => t.isUnbounded || (0, types_1.isTypeVarTuple)(t.type));
|
47
|
+
if (srcTypeArgs.some((t) => t.isUnbounded || (0, types_1.isTypeVarTuple)(t.type))) {
|
48
|
+
if (isDestIndeterminate) {
|
49
|
+
diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.LocAddendum.tupleSizeIndeterminateSrcDest().format({
|
50
|
+
expected: destTypeArgs.length - 1,
|
51
|
+
}));
|
52
|
+
}
|
53
|
+
else {
|
54
|
+
diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.LocAddendum.tupleSizeIndeterminateSrc().format({
|
55
|
+
expected: destTypeArgs.length,
|
56
|
+
}));
|
57
|
+
}
|
58
|
+
}
|
59
|
+
else {
|
60
|
+
if (isDestIndeterminate) {
|
61
|
+
diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.LocAddendum.tupleSizeMismatchIndeterminateDest().format({
|
62
|
+
expected: destTypeArgs.length - 1,
|
63
|
+
received: srcTypeArgs.length,
|
64
|
+
}));
|
65
|
+
}
|
66
|
+
else {
|
67
|
+
diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.LocAddendum.tupleSizeMismatch().format({
|
68
|
+
expected: destTypeArgs.length,
|
69
|
+
received: srcTypeArgs.length,
|
70
|
+
}));
|
71
|
+
}
|
72
|
+
}
|
73
|
+
return false;
|
74
|
+
}
|
75
|
+
return true;
|
76
|
+
}
|
77
|
+
exports.assignTupleTypeArgs = assignTupleTypeArgs;
|
78
|
+
// Adjusts the source and/or dest type arguments list to attempt to match
|
79
|
+
// the length of the src type arguments list if the dest or source contain
|
80
|
+
// entries with indeterminate length or unpacked TypeVarTuple entries.
|
81
|
+
// It returns true if the source is potentially compatible with the dest
|
82
|
+
// type, false otherwise.
|
83
|
+
function adjustTupleTypeArgs(evaluator, destTypeArgs, srcTypeArgs, flags) {
|
84
|
+
const destUnboundedOrVariadicIndex = destTypeArgs.findIndex((t) => t.isUnbounded || (0, types_1.isTypeVarTuple)(t.type));
|
85
|
+
const srcUnboundedIndex = srcTypeArgs.findIndex((t) => t.isUnbounded);
|
86
|
+
const srcVariadicIndex = srcTypeArgs.findIndex((t) => (0, types_1.isTypeVarTuple)(t.type));
|
87
|
+
if (srcUnboundedIndex >= 0) {
|
88
|
+
if ((0, types_1.isAnyOrUnknown)(srcTypeArgs[srcUnboundedIndex].type)) {
|
89
|
+
// If the source contains an unbounded Any, expand it to match the dest length.
|
90
|
+
const typeToReplicate = srcTypeArgs.length > 0 ? srcTypeArgs[srcUnboundedIndex].type : types_1.AnyType.create();
|
91
|
+
while (srcTypeArgs.length < destTypeArgs.length) {
|
92
|
+
srcTypeArgs.splice(srcUnboundedIndex, 0, { type: typeToReplicate, isUnbounded: true });
|
93
|
+
}
|
94
|
+
if (srcTypeArgs.length > destTypeArgs.length) {
|
95
|
+
srcTypeArgs.splice(srcUnboundedIndex, 1);
|
96
|
+
}
|
97
|
+
}
|
98
|
+
else if (destUnboundedOrVariadicIndex < 0) {
|
99
|
+
// If the source contains an unbounded type but the dest does not, it's incompatible.
|
100
|
+
return false;
|
101
|
+
}
|
102
|
+
}
|
103
|
+
// If the dest contains an unbounded Any, expand it to match the source length.
|
104
|
+
if (destUnboundedOrVariadicIndex >= 0 &&
|
105
|
+
destTypeArgs[destUnboundedOrVariadicIndex].isUnbounded &&
|
106
|
+
(0, types_1.isAnyOrUnknown)(destTypeArgs[destUnboundedOrVariadicIndex].type)) {
|
107
|
+
while (destTypeArgs.length < srcTypeArgs.length) {
|
108
|
+
destTypeArgs.splice(destUnboundedOrVariadicIndex, 0, destTypeArgs[destUnboundedOrVariadicIndex]);
|
109
|
+
}
|
110
|
+
}
|
111
|
+
// Remove any optional parameters from the end of the two lists until the lengths match.
|
112
|
+
while (srcTypeArgs.length > destTypeArgs.length && srcTypeArgs[srcTypeArgs.length - 1].isOptional) {
|
113
|
+
srcTypeArgs.splice(srcTypeArgs.length - 1, 1);
|
114
|
+
}
|
115
|
+
while (destTypeArgs.length > srcTypeArgs.length && destTypeArgs[destTypeArgs.length - 1].isOptional) {
|
116
|
+
destTypeArgs.splice(destTypeArgs.length - 1, 1);
|
117
|
+
}
|
118
|
+
const srcArgsToCapture = srcTypeArgs.length - destTypeArgs.length + 1;
|
119
|
+
let skipAdjustSrc = false;
|
120
|
+
// If we're doing reverse type mappings and the source contains a TypeVarTuple,
|
121
|
+
// we need to adjust the dest so the reverse type mapping assignment
|
122
|
+
// can be performed.
|
123
|
+
if ((flags & 2 /* AssignTypeFlags.ReverseTypeVarMatching */) !== 0) {
|
124
|
+
const destArgsToCapture = destTypeArgs.length - srcTypeArgs.length + 1;
|
125
|
+
if (srcVariadicIndex >= 0 && destArgsToCapture >= 0) {
|
126
|
+
// If the only removed arg from the dest type args is itself a variadic,
|
127
|
+
// don't bother adjusting it.
|
128
|
+
const skipAdjustment = destArgsToCapture === 1 && (0, types_1.isTypeVarTuple)(destTypeArgs[srcVariadicIndex].type);
|
129
|
+
const tupleClass = evaluator.getTupleClassType();
|
130
|
+
if (!skipAdjustment && tupleClass && (0, types_1.isInstantiableClass)(tupleClass)) {
|
131
|
+
const removedArgs = destTypeArgs.splice(srcVariadicIndex, destArgsToCapture);
|
132
|
+
// Package up the remaining type arguments into a tuple object.
|
133
|
+
const variadicTuple = types_1.ClassType.cloneAsInstance((0, typeUtils_1.specializeTupleClass)(tupleClass, removedArgs.map((typeArg) => {
|
134
|
+
return {
|
135
|
+
type: typeArg.type,
|
136
|
+
isUnbounded: typeArg.isUnbounded,
|
137
|
+
isOptional: typeArg.isOptional,
|
138
|
+
};
|
139
|
+
}),
|
140
|
+
/* isTypeArgExplicit */ true,
|
141
|
+
/* isUnpackedTuple */ true));
|
142
|
+
destTypeArgs.splice(srcVariadicIndex, 0, {
|
143
|
+
type: variadicTuple,
|
144
|
+
isUnbounded: false,
|
145
|
+
});
|
146
|
+
}
|
147
|
+
skipAdjustSrc = true;
|
148
|
+
}
|
149
|
+
}
|
150
|
+
else {
|
151
|
+
if (destUnboundedOrVariadicIndex >= 0 && srcArgsToCapture >= 0) {
|
152
|
+
// If the dest contains a variadic element, determine which source
|
153
|
+
// args map to this element and package them up into an unpacked tuple.
|
154
|
+
if ((0, types_1.isTypeVarTuple)(destTypeArgs[destUnboundedOrVariadicIndex].type)) {
|
155
|
+
const tupleClass = evaluator.getTupleClassType();
|
156
|
+
if (tupleClass && (0, types_1.isInstantiableClass)(tupleClass)) {
|
157
|
+
const removedArgs = srcTypeArgs.splice(destUnboundedOrVariadicIndex, srcArgsToCapture);
|
158
|
+
let variadicTuple;
|
159
|
+
// If we're left with a single unpacked variadic type var, there's no
|
160
|
+
// need to wrap it in a nested tuple.
|
161
|
+
if (removedArgs.length === 1 && (0, types_1.isUnpackedTypeVarTuple)(removedArgs[0].type)) {
|
162
|
+
variadicTuple = removedArgs[0].type;
|
163
|
+
}
|
164
|
+
else {
|
165
|
+
// Package up the remaining type arguments into a tuple object.
|
166
|
+
variadicTuple = types_1.ClassType.cloneAsInstance((0, typeUtils_1.specializeTupleClass)(tupleClass, removedArgs.map((typeArg) => {
|
167
|
+
return {
|
168
|
+
type: typeArg.type,
|
169
|
+
isUnbounded: typeArg.isUnbounded,
|
170
|
+
isOptional: typeArg.isOptional,
|
171
|
+
};
|
172
|
+
}),
|
173
|
+
/* isTypeArgExplicit */ true,
|
174
|
+
/* isUnpackedTuple */ true));
|
175
|
+
}
|
176
|
+
srcTypeArgs.splice(destUnboundedOrVariadicIndex, 0, {
|
177
|
+
type: variadicTuple,
|
178
|
+
isUnbounded: false,
|
179
|
+
});
|
180
|
+
}
|
181
|
+
skipAdjustSrc = true;
|
182
|
+
}
|
183
|
+
}
|
184
|
+
}
|
185
|
+
if (!skipAdjustSrc && destUnboundedOrVariadicIndex >= 0 && srcArgsToCapture >= 0) {
|
186
|
+
// If possible, package up the source entries that correspond to
|
187
|
+
// the dest unbounded tuple. This isn't possible if the source contains
|
188
|
+
// an unbounded tuple outside of this range.
|
189
|
+
if (srcUnboundedIndex < 0 ||
|
190
|
+
(srcUnboundedIndex >= destUnboundedOrVariadicIndex &&
|
191
|
+
srcUnboundedIndex < destUnboundedOrVariadicIndex + srcArgsToCapture)) {
|
192
|
+
const removedArgTypes = srcTypeArgs.splice(destUnboundedOrVariadicIndex, srcArgsToCapture).map((t) => {
|
193
|
+
if ((0, types_1.isTypeVar)(t.type) && (0, types_1.isUnpackedTypeVarTuple)(t.type) && !t.type.priv.isInUnion) {
|
194
|
+
return types_1.TypeVarType.cloneForUnpacked(t.type, /* isInUnion */ true);
|
195
|
+
}
|
196
|
+
return t.type;
|
197
|
+
});
|
198
|
+
srcTypeArgs.splice(destUnboundedOrVariadicIndex, 0, {
|
199
|
+
type: removedArgTypes.length > 0 ? (0, types_1.combineTypes)(removedArgTypes) : types_1.AnyType.create(),
|
200
|
+
isUnbounded: false,
|
201
|
+
});
|
202
|
+
}
|
203
|
+
}
|
204
|
+
return destTypeArgs.length === srcTypeArgs.length;
|
205
|
+
}
|
206
|
+
exports.adjustTupleTypeArgs = adjustTupleTypeArgs;
|
207
|
+
// Given a tuple type and a slice expression, determines the resulting
|
208
|
+
// type if it can be determined. If not, it returns undefined.
|
209
|
+
function getSlicedTupleType(evaluator, tupleType, sliceNode) {
|
210
|
+
// We don't handle step values.
|
211
|
+
if (sliceNode.d.stepValue || !tupleType.priv.tupleTypeArgs) {
|
212
|
+
return undefined;
|
213
|
+
}
|
214
|
+
const tupleTypeArgs = tupleType.priv.tupleTypeArgs;
|
215
|
+
const startValue = getTupleSliceParam(evaluator, sliceNode.d.startValue, 0, tupleTypeArgs);
|
216
|
+
const endValue = getTupleSliceParam(evaluator, sliceNode.d.endValue, tupleTypeArgs.length, tupleTypeArgs);
|
217
|
+
if (startValue === undefined || endValue === undefined || endValue < startValue) {
|
218
|
+
return undefined;
|
219
|
+
}
|
220
|
+
const slicedTypeArgs = tupleTypeArgs.slice(startValue, endValue);
|
221
|
+
return types_1.ClassType.cloneAsInstance((0, typeUtils_1.specializeTupleClass)(tupleType, slicedTypeArgs));
|
222
|
+
}
|
223
|
+
exports.getSlicedTupleType = getSlicedTupleType;
|
224
|
+
function getTupleSliceParam(evaluator, expression, defaultValue, tupleTypeArgs) {
|
225
|
+
let value = defaultValue;
|
226
|
+
if (expression) {
|
227
|
+
const valType = evaluator.getTypeOfExpression(expression).type;
|
228
|
+
if (!(0, types_1.isClassInstance)(valType) || !types_1.ClassType.isBuiltIn(valType, 'int') || !(0, typeUtils_1.isLiteralType)(valType)) {
|
229
|
+
return undefined;
|
230
|
+
}
|
231
|
+
value = valType.priv.literalValue;
|
232
|
+
const unboundedIndex = tupleTypeArgs.findIndex((typeArg) => typeArg.isUnbounded || (0, types_1.isTypeVarTuple)(typeArg.type));
|
233
|
+
if (value < 0) {
|
234
|
+
value = tupleTypeArgs.length + value;
|
235
|
+
if (unboundedIndex >= 0 && value <= unboundedIndex) {
|
236
|
+
return undefined;
|
237
|
+
}
|
238
|
+
else if (value < 0) {
|
239
|
+
return 0;
|
240
|
+
}
|
241
|
+
}
|
242
|
+
else {
|
243
|
+
if (unboundedIndex >= 0 && value > unboundedIndex) {
|
244
|
+
return undefined;
|
245
|
+
}
|
246
|
+
else if (value > tupleTypeArgs.length) {
|
247
|
+
return tupleTypeArgs.length;
|
248
|
+
}
|
249
|
+
}
|
250
|
+
}
|
251
|
+
return value;
|
252
|
+
}
|
253
|
+
//# sourceMappingURL=tuples.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"tuples.js","sourceRoot":"","sources":["../../../../../src/analyzer/tuples.ts"],"names":[],"mappings":"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"}
|
@@ -0,0 +1,94 @@
|
|
1
|
+
"use strict";
|
2
|
+
/*
|
3
|
+
* typeComplexity.ts
|
4
|
+
* Copyright (c) Microsoft Corporation.
|
5
|
+
* Licensed under the MIT license.
|
6
|
+
* Author: Eric Traut
|
7
|
+
*
|
8
|
+
* Routines that compute a "complexity score" for a type. This is used
|
9
|
+
* during constraint solving to pick a "best" type when multiple types
|
10
|
+
* meet the constraints.
|
11
|
+
*/
|
12
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
13
|
+
exports.getComplexityScoreForType = void 0;
|
14
|
+
const types_1 = require("./types");
|
15
|
+
// Returns a "score" for a type that captures the relative complexity
|
16
|
+
// of the type. Scores should all be between 0 and 1 where 0 means
|
17
|
+
// very simple and 1 means complex. This is a heuristic, so there's
|
18
|
+
// often no objectively correct answer.
|
19
|
+
function getComplexityScoreForType(type, recursionCount = 0) {
|
20
|
+
if (recursionCount > types_1.maxTypeRecursionCount) {
|
21
|
+
return 1;
|
22
|
+
}
|
23
|
+
recursionCount++;
|
24
|
+
switch (type.category) {
|
25
|
+
case 1 /* TypeCategory.Unknown */:
|
26
|
+
case 2 /* TypeCategory.Any */: {
|
27
|
+
return 0.5;
|
28
|
+
}
|
29
|
+
case 9 /* TypeCategory.TypeVar */: {
|
30
|
+
// Assume type[T] is more complex than T.
|
31
|
+
return types_1.TypeBase.isInstantiable(type) ? 0.55 : 0.5;
|
32
|
+
}
|
33
|
+
case 4 /* TypeCategory.Function */:
|
34
|
+
case 5 /* TypeCategory.OverloadedFunction */: {
|
35
|
+
// Classes and unions should be preferred over functions,
|
36
|
+
// so make this relatively high (more than 0.75).
|
37
|
+
return types_1.TypeBase.isInstantiable(type) ? 0.85 : 0.8;
|
38
|
+
}
|
39
|
+
case 0 /* TypeCategory.Unbound */:
|
40
|
+
case 3 /* TypeCategory.Never */:
|
41
|
+
return 1.0;
|
42
|
+
case 8 /* TypeCategory.Union */: {
|
43
|
+
let maxScore = 0;
|
44
|
+
// If this union has a very large number of subtypes, don't bother
|
45
|
+
// accurately computing the score. Assume a fixed value.
|
46
|
+
if (type.priv.subtypes.length < 16) {
|
47
|
+
type.priv.subtypes.forEach((subtype) => {
|
48
|
+
const subtypeScore = getComplexityScoreForType(subtype, recursionCount);
|
49
|
+
maxScore = Math.max(maxScore, subtypeScore);
|
50
|
+
});
|
51
|
+
}
|
52
|
+
else {
|
53
|
+
maxScore = 0.5;
|
54
|
+
}
|
55
|
+
return maxScore;
|
56
|
+
}
|
57
|
+
case 6 /* TypeCategory.Class */: {
|
58
|
+
return getComplexityScoreForClass(type, recursionCount);
|
59
|
+
}
|
60
|
+
}
|
61
|
+
// For all other types, return a score of 0.
|
62
|
+
return 0;
|
63
|
+
}
|
64
|
+
exports.getComplexityScoreForType = getComplexityScoreForType;
|
65
|
+
function getComplexityScoreForClass(classType, recursionCount) {
|
66
|
+
let typeArgScoreSum = 0;
|
67
|
+
let typeArgCount = 0;
|
68
|
+
if (classType.priv.tupleTypeArgs) {
|
69
|
+
classType.priv.tupleTypeArgs.forEach((typeArg) => {
|
70
|
+
typeArgScoreSum += getComplexityScoreForType(typeArg.type, recursionCount);
|
71
|
+
typeArgCount++;
|
72
|
+
});
|
73
|
+
}
|
74
|
+
else if (classType.priv.typeArgs) {
|
75
|
+
classType.priv.typeArgs.forEach((type) => {
|
76
|
+
typeArgScoreSum += getComplexityScoreForType(type, recursionCount);
|
77
|
+
typeArgCount++;
|
78
|
+
});
|
79
|
+
}
|
80
|
+
else if (classType.shared.typeParams) {
|
81
|
+
classType.shared.typeParams.forEach((type) => {
|
82
|
+
typeArgScoreSum += getComplexityScoreForType(types_1.AnyType.create(), recursionCount);
|
83
|
+
typeArgCount++;
|
84
|
+
});
|
85
|
+
}
|
86
|
+
const averageTypeArgComplexity = typeArgCount > 0 ? typeArgScoreSum / typeArgCount : 0;
|
87
|
+
let result = 0.5 + averageTypeArgComplexity * 0.25;
|
88
|
+
// Assume type[T] is more complex than T.
|
89
|
+
if ((0, types_1.isInstantiableClass)(classType)) {
|
90
|
+
result += 0.05;
|
91
|
+
}
|
92
|
+
return result;
|
93
|
+
}
|
94
|
+
//# sourceMappingURL=typeComplexity.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"typeComplexity.js","sourceRoot":"","sources":["../../../../../src/analyzer/typeComplexity.ts"],"names":[],"mappings":"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"}
|