@zzzen/pyright-internal 1.2.0-dev.20231112 → 1.2.0-dev.20231126
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/analysis.d.ts +1 -1
- package/dist/analyzer/analysis.js +5 -1
- package/dist/analyzer/analysis.js.map +1 -1
- package/dist/analyzer/analyzerFileInfo.d.ts +1 -1
- package/dist/analyzer/analyzerNodeInfo.d.ts +1 -1
- package/dist/analyzer/analyzerNodeInfo.js +1 -1
- package/dist/analyzer/analyzerNodeInfo.js.map +1 -1
- package/dist/analyzer/backgroundAnalysisProgram.d.ts +1 -1
- package/dist/analyzer/backgroundAnalysisProgram.js +1 -1
- package/dist/analyzer/backgroundAnalysisProgram.js.map +1 -1
- package/dist/analyzer/binder.js +198 -194
- package/dist/analyzer/binder.js.map +1 -1
- package/dist/analyzer/cacheManager.js +1 -1
- package/dist/analyzer/cacheManager.js.map +1 -1
- package/dist/analyzer/checker.d.ts +1 -0
- package/dist/analyzer/checker.js +286 -256
- package/dist/analyzer/checker.js.map +1 -1
- package/dist/analyzer/codeFlowEngine.d.ts +1 -1
- package/dist/analyzer/codeFlowEngine.js +26 -26
- package/dist/analyzer/codeFlowEngine.js.map +1 -1
- package/dist/analyzer/codeFlowTypes.d.ts +1 -1
- package/dist/analyzer/codeFlowTypes.js +23 -23
- package/dist/analyzer/codeFlowTypes.js.map +1 -1
- package/dist/analyzer/codeFlowUtils.js +39 -37
- package/dist/analyzer/codeFlowUtils.js.map +1 -1
- package/dist/analyzer/constraintSolver.js +48 -45
- package/dist/analyzer/constraintSolver.js.map +1 -1
- package/dist/analyzer/constructorTransform.js +8 -8
- package/dist/analyzer/constructorTransform.js.map +1 -1
- package/dist/analyzer/constructors.js +33 -31
- package/dist/analyzer/constructors.js.map +1 -1
- package/dist/analyzer/dataClasses.js +67 -63
- package/dist/analyzer/dataClasses.js.map +1 -1
- package/dist/analyzer/declaration.d.ts +2 -2
- package/dist/analyzer/declaration.js +10 -10
- package/dist/analyzer/declaration.js.map +1 -1
- package/dist/analyzer/declarationUtils.js +44 -41
- package/dist/analyzer/declarationUtils.js.map +1 -1
- package/dist/analyzer/decorators.js +51 -51
- package/dist/analyzer/decorators.js.map +1 -1
- package/dist/analyzer/docStringConversion.js +1 -1
- package/dist/analyzer/docStringConversion.js.map +1 -1
- package/dist/analyzer/docStringUtils.js +1 -1
- package/dist/analyzer/enums.js +27 -27
- package/dist/analyzer/enums.js.map +1 -1
- package/dist/analyzer/functionTransform.js +4 -4
- package/dist/analyzer/functionTransform.js.map +1 -1
- package/dist/analyzer/importResolver.d.ts +1 -1
- package/dist/analyzer/importResolver.js +27 -18
- package/dist/analyzer/importResolver.js.map +1 -1
- package/dist/analyzer/importResult.js +1 -1
- package/dist/analyzer/importResult.js.map +1 -1
- package/dist/analyzer/importStatementUtils.js +31 -27
- package/dist/analyzer/importStatementUtils.js.map +1 -1
- package/dist/analyzer/namedTuples.js +36 -32
- package/dist/analyzer/namedTuples.js.map +1 -1
- package/dist/analyzer/operations.js +78 -78
- package/dist/analyzer/operations.js.map +1 -1
- package/dist/analyzer/packageTypeReport.d.ts +1 -1
- package/dist/analyzer/packageTypeReport.js +2 -2
- package/dist/analyzer/packageTypeReport.js.map +1 -1
- package/dist/analyzer/packageTypeVerifier.js +90 -90
- package/dist/analyzer/packageTypeVerifier.js.map +1 -1
- package/dist/analyzer/parameterUtils.js +14 -14
- package/dist/analyzer/parameterUtils.js.map +1 -1
- package/dist/analyzer/parentDirectoryCache.d.ts +2 -2
- package/dist/analyzer/parseTreeCleaner.js +5 -1
- package/dist/analyzer/parseTreeCleaner.js.map +1 -1
- package/dist/analyzer/parseTreeUtils.d.ts +1 -1
- package/dist/analyzer/parseTreeUtils.js +383 -379
- package/dist/analyzer/parseTreeUtils.js.map +1 -1
- package/dist/analyzer/parseTreeWalker.js +161 -157
- package/dist/analyzer/parseTreeWalker.js.map +1 -1
- package/dist/analyzer/patternMatching.d.ts +1 -1
- package/dist/analyzer/patternMatching.js +71 -64
- package/dist/analyzer/patternMatching.js.map +1 -1
- package/dist/analyzer/program.d.ts +1 -1
- package/dist/analyzer/program.js +20 -17
- package/dist/analyzer/program.js.map +1 -1
- package/dist/analyzer/properties.js +53 -44
- package/dist/analyzer/properties.js.map +1 -1
- package/dist/analyzer/protocols.js +14 -14
- package/dist/analyzer/protocols.js.map +1 -1
- package/dist/analyzer/pythonPathUtils.js +5 -1
- package/dist/analyzer/pythonPathUtils.js.map +1 -1
- package/dist/analyzer/regions.js +3 -3
- package/dist/analyzer/regions.js.map +1 -1
- package/dist/analyzer/scope.js +8 -8
- package/dist/analyzer/scope.js.map +1 -1
- package/dist/analyzer/scopeUtils.js +1 -1
- package/dist/analyzer/scopeUtils.js.map +1 -1
- package/dist/analyzer/service.js +5 -1
- package/dist/analyzer/service.js.map +1 -1
- package/dist/analyzer/sourceFile.js +25 -21
- package/dist/analyzer/sourceFile.js.map +1 -1
- package/dist/analyzer/sourceMapper.d.ts +2 -2
- package/dist/analyzer/sourceMapper.js +15 -8
- package/dist/analyzer/sourceMapper.js.map +1 -1
- package/dist/analyzer/staticExpressions.js +40 -40
- package/dist/analyzer/staticExpressions.js.map +1 -1
- package/dist/analyzer/symbol.d.ts +1 -1
- package/dist/analyzer/symbol.js +26 -26
- package/dist/analyzer/symbol.js.map +1 -1
- package/dist/analyzer/symbolUtils.js +1 -1
- package/dist/analyzer/symbolUtils.js.map +1 -1
- package/dist/analyzer/testWalker.js +5 -5
- package/dist/analyzer/testWalker.js.map +1 -1
- package/dist/analyzer/tracePrinter.d.ts +1 -1
- package/dist/analyzer/tracePrinter.js +35 -31
- package/dist/analyzer/tracePrinter.js.map +1 -1
- package/dist/analyzer/typeCacheUtils.js +5 -1
- package/dist/analyzer/typeCacheUtils.js.map +1 -1
- package/dist/analyzer/typeDocStringUtils.js +13 -9
- package/dist/analyzer/typeDocStringUtils.js.map +1 -1
- package/dist/analyzer/typeEvaluator.js +1272 -1176
- package/dist/analyzer/typeEvaluator.js.map +1 -1
- package/dist/analyzer/typeEvaluatorTypes.d.ts +3 -1
- package/dist/analyzer/typeEvaluatorTypes.js +3 -1
- package/dist/analyzer/typeEvaluatorTypes.js.map +1 -1
- package/dist/analyzer/typeGuards.d.ts +1 -1
- package/dist/analyzer/typeGuards.js +95 -67
- package/dist/analyzer/typeGuards.js.map +1 -1
- package/dist/analyzer/typePrinter.d.ts +1 -1
- package/dist/analyzer/typePrinter.js +80 -76
- package/dist/analyzer/typePrinter.js.map +1 -1
- package/dist/analyzer/typeStubWriter.js +26 -22
- package/dist/analyzer/typeStubWriter.js.map +1 -1
- package/dist/analyzer/typeUtils.js +163 -123
- package/dist/analyzer/typeUtils.js.map +1 -1
- package/dist/analyzer/typeVarContext.d.ts +1 -0
- package/dist/analyzer/typeVarContext.js +12 -9
- package/dist/analyzer/typeVarContext.js.map +1 -1
- package/dist/analyzer/typeWalker.js +10 -10
- package/dist/analyzer/typedDicts.js +74 -70
- package/dist/analyzer/typedDicts.js.map +1 -1
- package/dist/analyzer/types.d.ts +17 -12
- package/dist/analyzer/types.js +191 -181
- package/dist/analyzer/types.js.map +1 -1
- package/dist/backgroundAnalysisBase.d.ts +2 -2
- package/dist/backgroundAnalysisBase.js +5 -1
- package/dist/backgroundAnalysisBase.js.map +1 -1
- package/dist/backgroundThreadBase.js +5 -1
- package/dist/backgroundThreadBase.js.map +1 -1
- package/dist/commands/commandController.js +7 -7
- package/dist/commands/commandController.js.map +1 -1
- package/dist/commands/commandResult.js +1 -1
- package/dist/commands/commandResult.js.map +1 -1
- package/dist/commands/commands.js +1 -1
- package/dist/commands/commands.js.map +1 -1
- package/dist/commands/dumpFileDebugInfoCommand.js +196 -196
- package/dist/commands/dumpFileDebugInfoCommand.js.map +1 -1
- package/dist/commands/quickActionCommand.js +1 -1
- package/dist/commands/quickActionCommand.js.map +1 -1
- package/dist/common/charCodes.js +1 -1
- package/dist/common/charCodes.js.map +1 -1
- package/dist/common/chokidarFileWatcherProvider.js +5 -1
- package/dist/common/chokidarFileWatcherProvider.js.map +1 -1
- package/dist/common/collectionUtils.d.ts +3 -3
- package/dist/common/collectionUtils.js +3 -3
- package/dist/common/collectionUtils.js.map +1 -1
- package/dist/common/commandLineOptions.d.ts +1 -1
- package/dist/common/commandLineOptions.js +5 -5
- package/dist/common/commandLineOptions.js.map +1 -1
- package/dist/common/configOptions.d.ts +1 -1
- package/dist/common/configOptions.js +11 -7
- package/dist/common/configOptions.js.map +1 -1
- package/dist/common/console.js +7 -3
- package/dist/common/console.js.map +1 -1
- package/dist/common/core.d.ts +2 -2
- package/dist/common/core.js +6 -6
- package/dist/common/core.js.map +1 -1
- package/dist/common/diagnostic.js +6 -6
- package/dist/common/diagnostic.js.map +1 -1
- package/dist/common/diagnosticRules.js +1 -1
- package/dist/common/diagnosticRules.js.map +1 -1
- package/dist/common/diagnosticSink.js +12 -12
- package/dist/common/diagnosticSink.js.map +1 -1
- package/dist/common/editAction.d.ts +1 -1
- package/dist/common/editAction.js +2 -2
- package/dist/common/editAction.js.map +1 -1
- package/dist/common/envVarUtils.js +5 -1
- package/dist/common/envVarUtils.js.map +1 -1
- package/dist/common/extensibility.js +1 -1
- package/dist/common/extensibility.js.map +1 -1
- package/dist/common/fileBasedCancellationUtils.js +5 -1
- package/dist/common/fileBasedCancellationUtils.js.map +1 -1
- package/dist/common/fileSystem.d.ts +1 -0
- package/dist/common/fileSystem.js +2 -2
- package/dist/common/fileSystem.js.map +1 -1
- package/dist/common/fileWatcher.d.ts +2 -2
- package/dist/common/fullAccessHost.js +10 -6
- package/dist/common/fullAccessHost.js.map +1 -1
- package/dist/common/host.d.ts +1 -1
- package/dist/common/host.js +2 -2
- package/dist/common/host.js.map +1 -1
- package/dist/common/lspUtils.js +7 -7
- package/dist/common/lspUtils.js.map +1 -1
- package/dist/common/memUtils.d.ts +1 -1
- package/dist/common/pathUtils.js +12 -8
- package/dist/common/pathUtils.js.map +1 -1
- package/dist/common/pythonVersion.js +1 -1
- package/dist/common/pythonVersion.js.map +1 -1
- package/dist/common/realFileSystem.js +5 -1
- package/dist/common/realFileSystem.js.map +1 -1
- package/dist/common/serviceProvider.d.ts +1 -1
- package/dist/common/serviceProvider.js +5 -1
- package/dist/common/serviceProvider.js.map +1 -1
- package/dist/common/serviceProviderExtensions.js +1 -1
- package/dist/common/serviceProviderExtensions.js.map +1 -1
- package/dist/common/stringUtils.js +5 -5
- package/dist/common/stringUtils.js.map +1 -1
- package/dist/common/textEditTracker.js +11 -7
- package/dist/common/textEditTracker.js.map +1 -1
- package/dist/common/textRange.js +3 -3
- package/dist/common/textRange.js.map +1 -1
- package/dist/languageServerBase.d.ts +3 -3
- package/dist/languageServerBase.js +19 -19
- package/dist/languageServerBase.js.map +1 -1
- package/dist/languageService/autoImporter.d.ts +3 -3
- package/dist/languageService/autoImporter.js +12 -8
- package/dist/languageService/autoImporter.js.map +1 -1
- package/dist/languageService/callHierarchyProvider.js +27 -23
- package/dist/languageService/callHierarchyProvider.js.map +1 -1
- package/dist/languageService/codeActionProvider.js +8 -8
- package/dist/languageService/codeActionProvider.js.map +1 -1
- package/dist/languageService/completionProvider.js +171 -173
- package/dist/languageService/completionProvider.js.map +1 -1
- package/dist/languageService/completionProviderUtils.js +9 -9
- package/dist/languageService/completionProviderUtils.js.map +1 -1
- package/dist/languageService/definitionProvider.js +14 -10
- package/dist/languageService/definitionProvider.js.map +1 -1
- package/dist/languageService/documentHighlightProvider.js +7 -3
- package/dist/languageService/documentHighlightProvider.js.map +1 -1
- package/dist/languageService/documentSymbolCollector.d.ts +1 -1
- package/dist/languageService/documentSymbolCollector.js +21 -17
- package/dist/languageService/documentSymbolCollector.js.map +1 -1
- package/dist/languageService/hoverProvider.js +30 -26
- package/dist/languageService/hoverProvider.js.map +1 -1
- package/dist/languageService/importSorter.js +1 -1
- package/dist/languageService/importSorter.js.map +1 -1
- package/dist/languageService/quickActions.js +10 -6
- package/dist/languageService/quickActions.js.map +1 -1
- package/dist/languageService/referencesProvider.d.ts +1 -1
- package/dist/languageService/referencesProvider.js +24 -20
- package/dist/languageService/referencesProvider.js.map +1 -1
- package/dist/languageService/signatureHelpProvider.js +8 -4
- package/dist/languageService/signatureHelpProvider.js.map +1 -1
- package/dist/languageService/symbolIndexer.js +8 -4
- package/dist/languageService/symbolIndexer.js.map +1 -1
- package/dist/languageService/tooltipUtils.js +20 -16
- package/dist/languageService/tooltipUtils.js.map +1 -1
- package/dist/languageService/workspaceSymbolProvider.js +5 -1
- package/dist/languageService/workspaceSymbolProvider.js.map +1 -1
- package/dist/localization/localize.d.ts +10 -12
- package/dist/localization/localize.js +8 -5
- package/dist/localization/localize.js.map +1 -1
- package/dist/localization/package.nls.cs.json +5 -8
- package/dist/localization/package.nls.de.json +5 -8
- package/dist/localization/package.nls.en-us.json +12 -9
- package/dist/localization/package.nls.es.json +5 -8
- package/dist/localization/package.nls.fr.json +5 -8
- package/dist/localization/package.nls.it.json +5 -8
- package/dist/localization/package.nls.ja.json +5 -8
- package/dist/localization/package.nls.ko.json +5 -8
- package/dist/localization/package.nls.pl.json +5 -8
- package/dist/localization/package.nls.pt-br.json +5 -8
- package/dist/localization/package.nls.qps-ploc.json +2 -5
- package/dist/localization/package.nls.ru.json +5 -8
- package/dist/localization/package.nls.tr.json +5 -8
- package/dist/localization/package.nls.zh-cn.json +5 -8
- package/dist/localization/package.nls.zh-tw.json +5 -8
- package/dist/parser/characterStream.js +3 -3
- package/dist/parser/characterStream.js.map +1 -1
- package/dist/parser/characters.js +13 -9
- package/dist/parser/characters.js.map +1 -1
- package/dist/parser/parseNodes.d.ts +12 -12
- package/dist/parser/parseNodes.js +193 -193
- package/dist/parser/parseNodes.js.map +1 -1
- package/dist/parser/parser.js +563 -559
- package/dist/parser/parser.js.map +1 -1
- package/dist/parser/stringTokenUtils.js +47 -47
- package/dist/parser/stringTokenUtils.js.map +1 -1
- package/dist/parser/tokenizer.js +288 -288
- package/dist/parser/tokenizer.js.map +1 -1
- package/dist/parser/tokenizerTypes.js +35 -35
- package/dist/parser/tokenizerTypes.js.map +1 -1
- package/dist/parser/unicode.d.ts +3 -3
- package/dist/pyright.js +38 -18
- package/dist/pyright.js.map +1 -1
- package/dist/pyrightFileSystem.d.ts +1 -0
- package/dist/pyrightFileSystem.js +1 -1
- package/dist/pyrightFileSystem.js.map +1 -1
- package/dist/readonlyAugmentedFileSystem.d.ts +1 -0
- package/dist/tests/chainedSourceFiles.test.js +5 -1
- package/dist/tests/chainedSourceFiles.test.js.map +1 -1
- package/dist/tests/checker.test.js +5 -1
- package/dist/tests/checker.test.js.map +1 -1
- package/dist/tests/collectionUtils.test.js +5 -1
- package/dist/tests/collectionUtils.test.js.map +1 -1
- package/dist/tests/common.test.js +5 -1
- package/dist/tests/common.test.js.map +1 -1
- package/dist/tests/config.test.js +7 -5
- package/dist/tests/config.test.js.map +1 -1
- package/dist/tests/debug.test.js +8 -4
- package/dist/tests/debug.test.js.map +1 -1
- package/dist/tests/deferred.test.js +5 -1
- package/dist/tests/deferred.test.js.map +1 -1
- package/dist/tests/diagnosticOverrides.test.js +5 -1
- package/dist/tests/diagnosticOverrides.test.js.map +1 -1
- package/dist/tests/docStringConversion.test.js +0 -22
- package/dist/tests/docStringConversion.test.js.map +1 -1
- package/dist/tests/docStringUtils.test.js +5 -1
- package/dist/tests/docStringUtils.test.js.map +1 -1
- package/dist/tests/filesystem.test.js +5 -1
- package/dist/tests/filesystem.test.js.map +1 -1
- package/dist/tests/fourSlashParser.test.js +5 -1
- package/dist/tests/fourSlashParser.test.js.map +1 -1
- package/dist/tests/fourSlashRunner.test.js +5 -1
- package/dist/tests/fourSlashRunner.test.js.map +1 -1
- package/dist/tests/fourslash/completions.params.fourslash.js +11 -0
- package/dist/tests/fourslash/completions.params.fourslash.js.map +1 -1
- package/dist/tests/fourslash/hover.docstring.split.fourslash.js +10 -0
- package/dist/tests/fourslash/hover.docstring.split.fourslash.js.map +1 -1
- package/dist/tests/harness/fourslash/fourSlashParser.js +13 -13
- package/dist/tests/harness/fourslash/fourSlashParser.js.map +1 -1
- package/dist/tests/harness/fourslash/fourSlashTypes.js +11 -7
- package/dist/tests/harness/fourslash/fourSlashTypes.js.map +1 -1
- package/dist/tests/harness/fourslash/runner.d.ts +1 -1
- package/dist/tests/harness/fourslash/runner.js +5 -1
- package/dist/tests/harness/fourslash/runner.js.map +1 -1
- package/dist/tests/harness/fourslash/testLanguageService.js +5 -1
- package/dist/tests/harness/fourslash/testLanguageService.js.map +1 -1
- package/dist/tests/harness/fourslash/testState.Consts.js +6 -2
- package/dist/tests/harness/fourslash/testState.Consts.js.map +1 -1
- package/dist/tests/harness/fourslash/testState.js +17 -13
- package/dist/tests/harness/fourslash/testState.js.map +1 -1
- package/dist/tests/harness/fourslash/testStateUtils.js +9 -5
- package/dist/tests/harness/fourslash/testStateUtils.js.map +1 -1
- package/dist/tests/harness/fourslash/workspaceEditTestUtils.js +5 -1
- package/dist/tests/harness/fourslash/workspaceEditTestUtils.js.map +1 -1
- package/dist/tests/harness/testHost.js +5 -1
- package/dist/tests/harness/testHost.js.map +1 -1
- package/dist/tests/harness/utils.d.ts +13 -12
- package/dist/tests/harness/utils.js.map +1 -1
- package/dist/tests/harness/vfs/factory.js +6 -2
- package/dist/tests/harness/vfs/factory.js.map +1 -1
- package/dist/tests/harness/vfs/filesystem.d.ts +4 -3
- package/dist/tests/harness/vfs/filesystem.js +11 -7
- package/dist/tests/harness/vfs/filesystem.js.map +1 -1
- package/dist/tests/harness/vfs/pathValidation.js +30 -26
- package/dist/tests/harness/vfs/pathValidation.js.map +1 -1
- package/dist/tests/importStatementUtils.test.js +25 -25
- package/dist/tests/importStatementUtils.test.js.map +1 -1
- package/dist/tests/ipythonMode.test.js +6 -6
- package/dist/tests/ipythonMode.test.js.map +1 -1
- package/dist/tests/localizer.test.js +5 -1
- package/dist/tests/localizer.test.js.map +1 -1
- package/dist/tests/logger.test.js +5 -1
- package/dist/tests/logger.test.js.map +1 -1
- package/dist/tests/parseTreeUtils.test.js +10 -10
- package/dist/tests/parseTreeUtils.test.js.map +1 -1
- package/dist/tests/parser.test.js +13 -9
- package/dist/tests/parser.test.js.map +1 -1
- package/dist/tests/pathUtils.test.js +5 -1
- package/dist/tests/pathUtils.test.js.map +1 -1
- package/dist/tests/sourceFile.test.js +5 -1
- package/dist/tests/sourceFile.test.js.map +1 -1
- package/dist/tests/sourceMapperUtils.test.js +5 -1
- package/dist/tests/sourceMapperUtils.test.js.map +1 -1
- package/dist/tests/stringUtils.test.js +10 -6
- package/dist/tests/stringUtils.test.js.map +1 -1
- package/dist/tests/symbolNameUtils.test.js +5 -1
- package/dist/tests/symbolNameUtils.test.js.map +1 -1
- package/dist/tests/testState.test.js +5 -1
- package/dist/tests/testState.test.js.map +1 -1
- package/dist/tests/testUtils.js +11 -7
- package/dist/tests/testUtils.js.map +1 -1
- package/dist/tests/textRange.test.js +5 -1
- package/dist/tests/textRange.test.js.map +1 -1
- package/dist/tests/tokenizer.test.js +463 -459
- package/dist/tests/tokenizer.test.js.map +1 -1
- package/dist/tests/typeEvaluator1.test.js +18 -2
- package/dist/tests/typeEvaluator1.test.js.map +1 -1
- package/dist/tests/typeEvaluator2.test.js +19 -3
- package/dist/tests/typeEvaluator2.test.js.map +1 -1
- package/dist/tests/typeEvaluator3.test.js +11 -3
- package/dist/tests/typeEvaluator3.test.js.map +1 -1
- package/dist/tests/typeEvaluator4.test.js +11 -3
- package/dist/tests/typeEvaluator4.test.js.map +1 -1
- package/dist/tests/typeEvaluator5.test.js +5 -1
- package/dist/tests/typeEvaluator5.test.js.map +1 -1
- package/dist/tests/typePrinter.test.js +44 -40
- package/dist/tests/typePrinter.test.js.map +1 -1
- package/dist/tests/workspaceEditUtils.test.js +5 -1
- package/dist/tests/workspaceEditUtils.test.js.map +1 -1
- package/dist/tests/zipfs.test.js +5 -1
- package/dist/tests/zipfs.test.js.map +1 -1
- package/dist/workspaceFactory.js +2 -2
- package/dist/workspaceFactory.js.map +1 -1
- package/package.json +2 -2
@@ -9,7 +9,11 @@
|
|
9
9
|
*/
|
10
10
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
11
11
|
if (k2 === undefined) k2 = k;
|
12
|
-
Object.
|
12
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
13
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
14
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
15
|
+
}
|
16
|
+
Object.defineProperty(o, k2, desc);
|
13
17
|
}) : (function(o, m, k, k2) {
|
14
18
|
if (k2 === undefined) k2 = k;
|
15
19
|
o[k2] = m[k];
|
@@ -68,7 +72,7 @@ var PrintTypeFlags;
|
|
68
72
|
// Use the fully-qualified name of classes, type aliases, modules,
|
69
73
|
// and functions rather than short names.
|
70
74
|
PrintTypeFlags[PrintTypeFlags["UseFullyQualifiedNames"] = 4096] = "UseFullyQualifiedNames";
|
71
|
-
})(PrintTypeFlags
|
75
|
+
})(PrintTypeFlags || (exports.PrintTypeFlags = PrintTypeFlags = {}));
|
72
76
|
function printType(type, printTypeFlags, returnTypeCallback) {
|
73
77
|
const uniqueNameMap = new UniqueNameMap(printTypeFlags, returnTypeCallback);
|
74
78
|
uniqueNameMap.build(type);
|
@@ -154,10 +158,10 @@ function printLiteralValue(type, quotation = "'") {
|
|
154
158
|
exports.printLiteralValue = printLiteralValue;
|
155
159
|
function printTypeInternal(type, printTypeFlags, returnTypeCallback, uniqueNameMap, recursionTypes, recursionCount) {
|
156
160
|
const originalPrintTypeFlags = printTypeFlags;
|
157
|
-
const parenthesizeUnion = (printTypeFlags & 16 /* ParenthesizeUnion */) !== 0;
|
158
|
-
printTypeFlags &= ~(16 /* ParenthesizeUnion */ | 128 /* ParenthesizeCallable */);
|
161
|
+
const parenthesizeUnion = (printTypeFlags & 16 /* PrintTypeFlags.ParenthesizeUnion */) !== 0;
|
162
|
+
printTypeFlags &= ~(16 /* PrintTypeFlags.ParenthesizeUnion */ | 128 /* PrintTypeFlags.ParenthesizeCallable */);
|
159
163
|
if (recursionCount > types_1.maxTypeRecursionCount) {
|
160
|
-
if (printTypeFlags & 256 /* PythonSyntax */) {
|
164
|
+
if (printTypeFlags & 256 /* PrintTypeFlags.PythonSyntax */) {
|
161
165
|
return 'Any';
|
162
166
|
}
|
163
167
|
return '<Recursive>';
|
@@ -167,7 +171,7 @@ function printTypeInternal(type, printTypeFlags, returnTypeCallback, uniqueNameM
|
|
167
171
|
// the type it represents.
|
168
172
|
if (type.typeAliasInfo) {
|
169
173
|
let expandTypeAlias = true;
|
170
|
-
if ((printTypeFlags & 32 /* ExpandTypeAlias */) === 0) {
|
174
|
+
if ((printTypeFlags & 32 /* PrintTypeFlags.ExpandTypeAlias */) === 0) {
|
171
175
|
expandTypeAlias = false;
|
172
176
|
}
|
173
177
|
else {
|
@@ -178,7 +182,7 @@ function printTypeInternal(type, printTypeFlags, returnTypeCallback, uniqueNameM
|
|
178
182
|
if (!expandTypeAlias) {
|
179
183
|
try {
|
180
184
|
recursionTypes.push(type);
|
181
|
-
let aliasName = (printTypeFlags & 4096 /* UseFullyQualifiedNames */) !== 0
|
185
|
+
let aliasName = (printTypeFlags & 4096 /* PrintTypeFlags.UseFullyQualifiedNames */) !== 0
|
182
186
|
? type.typeAliasInfo.fullName
|
183
187
|
: type.typeAliasInfo.name;
|
184
188
|
// Use the fully-qualified name if the name isn't unique.
|
@@ -190,7 +194,7 @@ function printTypeInternal(type, printTypeFlags, returnTypeCallback, uniqueNameM
|
|
190
194
|
let argumentStrings;
|
191
195
|
// If there is a type arguments array, it's a specialized type alias.
|
192
196
|
if (type.typeAliasInfo.typeArguments) {
|
193
|
-
if ((printTypeFlags & 2 /* OmitTypeArgumentsIfUnknown */) === 0 ||
|
197
|
+
if ((printTypeFlags & 2 /* PrintTypeFlags.OmitTypeArgumentsIfUnknown */) === 0 ||
|
194
198
|
type.typeAliasInfo.typeArguments.some((typeArg) => !(0, types_1.isUnknown)(typeArg))) {
|
195
199
|
argumentStrings = [];
|
196
200
|
type.typeAliasInfo.typeArguments.forEach((typeArg, index) => {
|
@@ -212,7 +216,7 @@ function printTypeInternal(type, printTypeFlags, returnTypeCallback, uniqueNameM
|
|
212
216
|
}
|
213
217
|
}
|
214
218
|
else {
|
215
|
-
if ((printTypeFlags & 2 /* OmitTypeArgumentsIfUnknown */) === 0 ||
|
219
|
+
if ((printTypeFlags & 2 /* PrintTypeFlags.OmitTypeArgumentsIfUnknown */) === 0 ||
|
216
220
|
typeParams.some((typeParam) => !(0, types_1.isUnknown)(typeParam))) {
|
217
221
|
argumentStrings = [];
|
218
222
|
typeParams.forEach((typeParam) => {
|
@@ -231,7 +235,7 @@ function printTypeInternal(type, printTypeFlags, returnTypeCallback, uniqueNameM
|
|
231
235
|
}
|
232
236
|
// If it's a TypeVar, don't use the alias name. Instead, use the full
|
233
237
|
// name, which may have a scope associated with it.
|
234
|
-
if (type.category !== 9 /* TypeVar */) {
|
238
|
+
if (type.category !== 9 /* TypeCategory.TypeVar */) {
|
235
239
|
return aliasName;
|
236
240
|
}
|
237
241
|
}
|
@@ -253,7 +257,7 @@ function printTypeInternal(type, printTypeFlags, returnTypeCallback, uniqueNameM
|
|
253
257
|
}
|
254
258
|
if (type.typeAliasInfo) {
|
255
259
|
if (!type.typeAliasInfo.typeParameters) {
|
256
|
-
let name = (printTypeFlags & 4096 /* UseFullyQualifiedNames */) !== 0
|
260
|
+
let name = (printTypeFlags & 4096 /* PrintTypeFlags.UseFullyQualifiedNames */) !== 0
|
257
261
|
? type.typeAliasInfo.fullName
|
258
262
|
: type.typeAliasInfo.name;
|
259
263
|
if (!uniqueNameMap.isUnique(name)) {
|
@@ -263,7 +267,7 @@ function printTypeInternal(type, printTypeFlags, returnTypeCallback, uniqueNameM
|
|
263
267
|
}
|
264
268
|
try {
|
265
269
|
recursionTypes.push(type);
|
266
|
-
return printTypeInternal(type, printTypeFlags & ~32 /* ExpandTypeAlias */, returnTypeCallback, uniqueNameMap, recursionTypes, recursionCount);
|
270
|
+
return printTypeInternal(type, printTypeFlags & ~32 /* PrintTypeFlags.ExpandTypeAlias */, returnTypeCallback, uniqueNameMap, recursionTypes, recursionCount);
|
267
271
|
}
|
268
272
|
finally {
|
269
273
|
recursionTypes.pop();
|
@@ -273,30 +277,30 @@ function printTypeInternal(type, printTypeFlags, returnTypeCallback, uniqueNameM
|
|
273
277
|
}
|
274
278
|
try {
|
275
279
|
recursionTypes.push(type);
|
276
|
-
const includeConditionalIndicator = (printTypeFlags & (64 /* OmitConditionalConstraint */ | 256 /* PythonSyntax */)) === 0;
|
280
|
+
const includeConditionalIndicator = (printTypeFlags & (64 /* PrintTypeFlags.OmitConditionalConstraint */ | 256 /* PrintTypeFlags.PythonSyntax */)) === 0;
|
277
281
|
const getConditionalIndicator = (subtype) => {
|
278
282
|
return subtype.condition !== undefined && includeConditionalIndicator ? '*' : '';
|
279
283
|
};
|
280
284
|
switch (type.category) {
|
281
|
-
case 0 /* Unbound */: {
|
282
|
-
if (printTypeFlags & 256 /* PythonSyntax */) {
|
285
|
+
case 0 /* TypeCategory.Unbound */: {
|
286
|
+
if (printTypeFlags & 256 /* PrintTypeFlags.PythonSyntax */) {
|
283
287
|
return 'Any';
|
284
288
|
}
|
285
289
|
return 'Unbound';
|
286
290
|
}
|
287
|
-
case 1 /* Unknown */: {
|
288
|
-
if (printTypeFlags & (256 /* PythonSyntax */ | 1 /* PrintUnknownWithAny */)) {
|
291
|
+
case 1 /* TypeCategory.Unknown */: {
|
292
|
+
if (printTypeFlags & (256 /* PrintTypeFlags.PythonSyntax */ | 1 /* PrintTypeFlags.PrintUnknownWithAny */)) {
|
289
293
|
return 'Any';
|
290
294
|
}
|
291
295
|
return 'Unknown';
|
292
296
|
}
|
293
|
-
case 7 /* Module */: {
|
294
|
-
if (printTypeFlags & 256 /* PythonSyntax */) {
|
297
|
+
case 7 /* TypeCategory.Module */: {
|
298
|
+
if (printTypeFlags & 256 /* PrintTypeFlags.PythonSyntax */) {
|
295
299
|
return 'Any';
|
296
300
|
}
|
297
301
|
return `Module("${type.moduleName}")`;
|
298
302
|
}
|
299
|
-
case 6 /* Class */: {
|
303
|
+
case 6 /* TypeCategory.Class */: {
|
300
304
|
if (types_1.TypeBase.isInstance(type)) {
|
301
305
|
if (type.literalValue !== undefined) {
|
302
306
|
return `Literal[${printLiteralValue(type)}]`;
|
@@ -314,22 +318,22 @@ function printTypeInternal(type, printTypeFlags, returnTypeCallback, uniqueNameM
|
|
314
318
|
return `${_printNestedInstantiable(type, typeToWrap)}${getConditionalIndicator(type)}`;
|
315
319
|
}
|
316
320
|
}
|
317
|
-
case 4 /* Function */: {
|
321
|
+
case 4 /* TypeCategory.Function */: {
|
318
322
|
if (types_1.TypeBase.isInstantiable(type)) {
|
319
323
|
const typeString = printFunctionType(types_1.FunctionType.cloneAsInstance(type), printTypeFlags, returnTypeCallback, uniqueNameMap, recursionTypes, recursionCount);
|
320
324
|
return `type[${typeString}]`;
|
321
325
|
}
|
322
326
|
return printFunctionType(type, originalPrintTypeFlags, returnTypeCallback, uniqueNameMap, recursionTypes, recursionCount);
|
323
327
|
}
|
324
|
-
case 5 /* OverloadedFunction */: {
|
328
|
+
case 5 /* TypeCategory.OverloadedFunction */: {
|
325
329
|
const overloadedType = type;
|
326
330
|
const overloads = overloadedType.overloads.map((overload) => printTypeInternal(overload, printTypeFlags, returnTypeCallback, uniqueNameMap, recursionTypes, recursionCount));
|
327
|
-
if (printTypeFlags & 256 /* PythonSyntax */) {
|
331
|
+
if (printTypeFlags & 256 /* PrintTypeFlags.PythonSyntax */) {
|
328
332
|
return 'Callable[..., Any]';
|
329
333
|
}
|
330
334
|
return `Overload[${overloads.join(', ')}]`;
|
331
335
|
}
|
332
|
-
case 8 /* Union */: {
|
336
|
+
case 8 /* TypeCategory.Union */: {
|
333
337
|
// Allocate a set that refers to subtypes in the union by
|
334
338
|
// their indices. If the index is within the set, it is already
|
335
339
|
// accounted for in the output.
|
@@ -338,11 +342,11 @@ function printTypeInternal(type, printTypeFlags, returnTypeCallback, uniqueNameM
|
|
338
342
|
// of the subtypes in the union.
|
339
343
|
const subtypeStrings = new Set();
|
340
344
|
// If we're using "|" notation, enclose callable subtypes in parens.
|
341
|
-
const updatedPrintTypeFlags = printTypeFlags & 8 /* PEP604 */
|
342
|
-
? printTypeFlags | 128 /* ParenthesizeCallable */
|
345
|
+
const updatedPrintTypeFlags = printTypeFlags & 8 /* PrintTypeFlags.PEP604 */
|
346
|
+
? printTypeFlags | 128 /* PrintTypeFlags.ParenthesizeCallable */
|
343
347
|
: printTypeFlags;
|
344
348
|
// Start by matching possible type aliases to the subtypes.
|
345
|
-
if ((printTypeFlags & 32 /* ExpandTypeAlias */) === 0 && type.typeAliasSources) {
|
349
|
+
if ((printTypeFlags & 32 /* PrintTypeFlags.ExpandTypeAlias */) === 0 && type.typeAliasSources) {
|
346
350
|
for (const typeAliasSource of type.typeAliasSources) {
|
347
351
|
let matchedAllSubtypes = true;
|
348
352
|
let allSubtypesPreviouslyHandled = true;
|
@@ -353,7 +357,7 @@ function printTypeInternal(type, printTypeFlags, returnTypeCallback, uniqueNameM
|
|
353
357
|
const sourceSubtypeInstance = (0, typeUtils_1.convertToInstance)(sourceSubtype);
|
354
358
|
for (const unionSubtype of type.subtypes) {
|
355
359
|
if ((0, types_1.isTypeSame)(sourceSubtypeInstance, unionSubtype, {
|
356
|
-
typeFlagsToHonor: 2 /* Instance */ | 1 /* Instantiable */,
|
360
|
+
typeFlagsToHonor: 2 /* TypeFlags.Instance */ | 1 /* TypeFlags.Instantiable */,
|
357
361
|
})) {
|
358
362
|
if (!subtypeHandledSet.has(unionSubtypeIndex)) {
|
359
363
|
allSubtypesPreviouslyHandled = false;
|
@@ -382,7 +386,7 @@ function printTypeInternal(type, printTypeFlags, returnTypeCallback, uniqueNameM
|
|
382
386
|
return 'None';
|
383
387
|
}
|
384
388
|
const optionalType = printTypeInternal(typeWithoutNone, updatedPrintTypeFlags, returnTypeCallback, uniqueNameMap, recursionTypes, recursionCount);
|
385
|
-
if (printTypeFlags & 8 /* PEP604 */) {
|
389
|
+
if (printTypeFlags & 8 /* PrintTypeFlags.PEP604 */) {
|
386
390
|
const unionString = optionalType + ' | None';
|
387
391
|
if (parenthesizeUnion) {
|
388
392
|
return `(${unionString})`;
|
@@ -421,7 +425,7 @@ function printTypeInternal(type, printTypeFlags, returnTypeCallback, uniqueNameM
|
|
421
425
|
if (dedupedSubtypeStrings.length === 1) {
|
422
426
|
return dedupedSubtypeStrings[0];
|
423
427
|
}
|
424
|
-
if (printTypeFlags & 8 /* PEP604 */) {
|
428
|
+
if (printTypeFlags & 8 /* PrintTypeFlags.PEP604 */) {
|
425
429
|
const unionString = dedupedSubtypeStrings.join(' | ');
|
426
430
|
if (parenthesizeUnion) {
|
427
431
|
return `(${unionString})`;
|
@@ -430,7 +434,7 @@ function printTypeInternal(type, printTypeFlags, returnTypeCallback, uniqueNameM
|
|
430
434
|
}
|
431
435
|
return `Union[${dedupedSubtypeStrings.join(', ')}]`;
|
432
436
|
}
|
433
|
-
case 9 /* TypeVar */: {
|
437
|
+
case 9 /* TypeCategory.TypeVar */: {
|
434
438
|
// If it's synthesized, don't expose the internal name we generated.
|
435
439
|
// This will confuse users. The exception is if it's a bound synthesized
|
436
440
|
// type, in which case we'll print the bound type. This is used for
|
@@ -439,7 +443,7 @@ function printTypeInternal(type, printTypeFlags, returnTypeCallback, uniqueNameM
|
|
439
443
|
// If it's a synthesized type var used to implement recursive type
|
440
444
|
// aliases, return the type alias name.
|
441
445
|
if (type.details.recursiveTypeAliasName) {
|
442
|
-
if ((printTypeFlags & 32 /* ExpandTypeAlias */) !== 0 && type.details.boundType) {
|
446
|
+
if ((printTypeFlags & 32 /* PrintTypeFlags.ExpandTypeAlias */) !== 0 && type.details.boundType) {
|
443
447
|
return printTypeInternal(types_1.TypeBase.isInstance(type)
|
444
448
|
? (0, typeUtils_1.convertToInstance)(type.details.boundType)
|
445
449
|
: type.details.boundType, printTypeFlags, returnTypeCallback, uniqueNameMap, recursionTypes, recursionCount);
|
@@ -450,9 +454,9 @@ function printTypeInternal(type, printTypeFlags, returnTypeCallback, uniqueNameM
|
|
450
454
|
// print the type with a special character that indicates that the type
|
451
455
|
// is internally represented as a TypeVar.
|
452
456
|
if (type.details.isSynthesizedSelf && type.details.boundType) {
|
453
|
-
let boundTypeString = printTypeInternal(type.details.boundType, printTypeFlags & ~32 /* ExpandTypeAlias */, returnTypeCallback, uniqueNameMap, recursionTypes, recursionCount);
|
457
|
+
let boundTypeString = printTypeInternal(type.details.boundType, printTypeFlags & ~32 /* PrintTypeFlags.ExpandTypeAlias */, returnTypeCallback, uniqueNameMap, recursionTypes, recursionCount);
|
454
458
|
if (!(0, types_1.isAnyOrUnknown)(type.details.boundType)) {
|
455
|
-
if (printTypeFlags & 256 /* PythonSyntax */) {
|
459
|
+
if (printTypeFlags & 256 /* PrintTypeFlags.PythonSyntax */) {
|
456
460
|
boundTypeString = `Self`;
|
457
461
|
}
|
458
462
|
else {
|
@@ -464,18 +468,18 @@ function printTypeInternal(type, printTypeFlags, returnTypeCallback, uniqueNameM
|
|
464
468
|
}
|
465
469
|
return boundTypeString;
|
466
470
|
}
|
467
|
-
return (printTypeFlags & (1 /* PrintUnknownWithAny */ | 256 /* PythonSyntax */)) !== 0
|
471
|
+
return (printTypeFlags & (1 /* PrintTypeFlags.PrintUnknownWithAny */ | 256 /* PrintTypeFlags.PythonSyntax */)) !== 0
|
468
472
|
? 'Any'
|
469
473
|
: 'Unknown';
|
470
474
|
}
|
471
475
|
if (type.details.isParamSpec) {
|
472
|
-
const paramSpecText = _getReadableTypeVarName(type, (printTypeFlags & 256 /* PythonSyntax */) !== 0);
|
476
|
+
const paramSpecText = _getReadableTypeVarName(type, (printTypeFlags & 256 /* PrintTypeFlags.PythonSyntax */) !== 0);
|
473
477
|
if (type.paramSpecAccess) {
|
474
478
|
return `${paramSpecText}.${type.paramSpecAccess}`;
|
475
479
|
}
|
476
480
|
return paramSpecText;
|
477
481
|
}
|
478
|
-
let typeVarName = _getReadableTypeVarName(type, (printTypeFlags & 256 /* PythonSyntax */) !== 0);
|
482
|
+
let typeVarName = _getReadableTypeVarName(type, (printTypeFlags & 256 /* PrintTypeFlags.PythonSyntax */) !== 0);
|
479
483
|
if (type.isVariadicUnpacked) {
|
480
484
|
typeVarName = _printUnpack(typeVarName, printTypeFlags);
|
481
485
|
}
|
@@ -485,7 +489,7 @@ function printTypeInternal(type, printTypeFlags, returnTypeCallback, uniqueNameM
|
|
485
489
|
if (types_1.TypeBase.isInstantiable(type)) {
|
486
490
|
typeVarName = `${_printNestedInstantiable(type, typeVarName)}`;
|
487
491
|
}
|
488
|
-
if (!type.details.isVariadic && (printTypeFlags & 2048 /* PrintTypeVarVariance */) !== 0) {
|
492
|
+
if (!type.details.isVariadic && (printTypeFlags & 2048 /* PrintTypeFlags.PrintTypeVarVariance */) !== 0) {
|
489
493
|
const varianceText = _getTypeVarVarianceText(type);
|
490
494
|
if (varianceText) {
|
491
495
|
typeVarName = `${typeVarName} (${varianceText})`;
|
@@ -493,10 +497,10 @@ function printTypeInternal(type, printTypeFlags, returnTypeCallback, uniqueNameM
|
|
493
497
|
}
|
494
498
|
return typeVarName;
|
495
499
|
}
|
496
|
-
case 3 /* Never */: {
|
500
|
+
case 3 /* TypeCategory.Never */: {
|
497
501
|
return type.isNoReturn ? 'NoReturn' : 'Never';
|
498
502
|
}
|
499
|
-
case 2 /* Any */: {
|
503
|
+
case 2 /* TypeCategory.Any */: {
|
500
504
|
const anyType = type;
|
501
505
|
return anyType.isEllipsis ? '...' : 'Any';
|
502
506
|
}
|
@@ -508,14 +512,14 @@ function printTypeInternal(type, printTypeFlags, returnTypeCallback, uniqueNameM
|
|
508
512
|
}
|
509
513
|
}
|
510
514
|
function printFunctionType(type, printTypeFlags, returnTypeCallback, uniqueNameMap, recursionTypes, recursionCount) {
|
511
|
-
if (printTypeFlags & 256 /* PythonSyntax */) {
|
515
|
+
if (printTypeFlags & 256 /* PrintTypeFlags.PythonSyntax */) {
|
512
516
|
// Callable works only in cases where all parameters are positional-only.
|
513
517
|
let isPositionalParamsOnly = false;
|
514
518
|
if (type.details.parameters.length === 0) {
|
515
519
|
isPositionalParamsOnly = true;
|
516
520
|
}
|
517
521
|
else {
|
518
|
-
if (type.details.parameters.every((param) => param.category === 0 /* Simple */)) {
|
522
|
+
if (type.details.parameters.every((param) => param.category === 0 /* ParameterCategory.Simple */)) {
|
519
523
|
const lastParam = type.details.parameters[type.details.parameters.length - 1];
|
520
524
|
if (!lastParam.name) {
|
521
525
|
isPositionalParamsOnly = true;
|
@@ -564,7 +568,7 @@ function printFunctionType(type, printTypeFlags, returnTypeCallback, uniqueNameM
|
|
564
568
|
return paramSignature;
|
565
569
|
}
|
566
570
|
const fullSignature = `${paramSignature} -> ${parts[1]}`;
|
567
|
-
const parenthesizeCallable = (printTypeFlags & 128 /* ParenthesizeCallable */) !== 0;
|
571
|
+
const parenthesizeCallable = (printTypeFlags & 128 /* PrintTypeFlags.ParenthesizeCallable */) !== 0;
|
568
572
|
if (parenthesizeCallable) {
|
569
573
|
return `(${fullSignature})`;
|
570
574
|
}
|
@@ -576,7 +580,7 @@ function printObjectTypeForClassInternal(type, printTypeFlags, returnTypeCallbac
|
|
576
580
|
let objName = type.aliasName;
|
577
581
|
if (!objName) {
|
578
582
|
objName =
|
579
|
-
(printTypeFlags & 4096 /* UseFullyQualifiedNames */) !== 0 ? type.details.fullName : type.details.name;
|
583
|
+
(printTypeFlags & 4096 /* PrintTypeFlags.UseFullyQualifiedNames */) !== 0 ? type.details.fullName : type.details.name;
|
580
584
|
}
|
581
585
|
// Special-case NoneType to convert it to None.
|
582
586
|
if (types_1.ClassType.isBuiltIn(type, 'NoneType')) {
|
@@ -651,7 +655,7 @@ function printObjectTypeForClassInternal(type, printTypeFlags, returnTypeCallbac
|
|
651
655
|
if (type.isUnpacked) {
|
652
656
|
objName = _printUnpack(objName, printTypeFlags);
|
653
657
|
}
|
654
|
-
if ((printTypeFlags & 2 /* OmitTypeArgumentsIfUnknown */) === 0 || !isAllUnknown) {
|
658
|
+
if ((printTypeFlags & 2 /* PrintTypeFlags.OmitTypeArgumentsIfUnknown */) === 0 || !isAllUnknown) {
|
655
659
|
objName += '[' + typeArgStrings.join(', ') + ']';
|
656
660
|
}
|
657
661
|
}
|
@@ -669,7 +673,7 @@ function printObjectTypeForClassInternal(type, printTypeFlags, returnTypeCallbac
|
|
669
673
|
objName = _printUnpack(objName, printTypeFlags);
|
670
674
|
}
|
671
675
|
if (typeParams.length > 0) {
|
672
|
-
if ((printTypeFlags & 2 /* OmitTypeArgumentsIfUnknown */) === 0 ||
|
676
|
+
if ((printTypeFlags & 2 /* PrintTypeFlags.OmitTypeArgumentsIfUnknown */) === 0 ||
|
673
677
|
typeParams.some((typeParam) => !(0, types_1.isUnknown)(typeParam))) {
|
674
678
|
objName +=
|
675
679
|
'[' +
|
@@ -685,7 +689,7 @@ function printObjectTypeForClassInternal(type, printTypeFlags, returnTypeCallbac
|
|
685
689
|
}
|
686
690
|
// Wrap in a "Partial" for TypedDict that has been synthesized as partial.
|
687
691
|
if (type.isTypedDictPartial) {
|
688
|
-
if ((printTypeFlags & 256 /* PythonSyntax */) === 0) {
|
692
|
+
if ((printTypeFlags & 256 /* PrintTypeFlags.PythonSyntax */) === 0) {
|
689
693
|
objName = `Partial[${objName}]`;
|
690
694
|
}
|
691
695
|
}
|
@@ -697,7 +701,7 @@ function printFunctionPartsInternal(type, printTypeFlags, returnTypeCallback, un
|
|
697
701
|
type.details.parameters.forEach((param, index) => {
|
698
702
|
// Handle specialized variadic type parameters specially.
|
699
703
|
if (index === type.details.parameters.length - 1 &&
|
700
|
-
param.category === 1 /* ArgsList */ &&
|
704
|
+
param.category === 1 /* ParameterCategory.ArgsList */ &&
|
701
705
|
(0, types_1.isVariadicTypeVar)(param.type)) {
|
702
706
|
const specializedParamType = types_1.FunctionType.getEffectiveParameterType(type, index);
|
703
707
|
if ((0, types_1.isClassInstance)(specializedParamType) &&
|
@@ -712,8 +716,8 @@ function printFunctionPartsInternal(type, printTypeFlags, returnTypeCallback, un
|
|
712
716
|
}
|
713
717
|
// Handle expanding TypedDict kwargs specially.
|
714
718
|
if ((0, parameterUtils_1.isTypedKwargs)(param) &&
|
715
|
-
printTypeFlags & 1024 /* ExpandTypedDictArgs */ &&
|
716
|
-
param.type.category === 6 /* Class */) {
|
719
|
+
printTypeFlags & 1024 /* PrintTypeFlags.ExpandTypedDictArgs */ &&
|
720
|
+
param.type.category === 6 /* TypeCategory.Class */) {
|
717
721
|
param.type.details.typedDictEntries.forEach((v, k) => {
|
718
722
|
const valueTypeString = printTypeInternal(v.valueType, printTypeFlags, returnTypeCallback, uniqueNameMap, recursionTypes, recursionCount);
|
719
723
|
paramTypeStrings.push(`${k}: ${valueTypeString}`);
|
@@ -721,12 +725,12 @@ function printFunctionPartsInternal(type, printTypeFlags, returnTypeCallback, un
|
|
721
725
|
return;
|
722
726
|
}
|
723
727
|
let paramString = '';
|
724
|
-
if (param.category === 1 /* ArgsList */) {
|
728
|
+
if (param.category === 1 /* ParameterCategory.ArgsList */) {
|
725
729
|
if (!param.name || !param.isNameSynthesized) {
|
726
730
|
paramString += '*';
|
727
731
|
}
|
728
732
|
}
|
729
|
-
else if (param.category === 2 /* KwargsDict */) {
|
733
|
+
else if (param.category === 2 /* ParameterCategory.KwargsDict */) {
|
730
734
|
paramString += '**';
|
731
735
|
}
|
732
736
|
let emittedParamName = false;
|
@@ -735,7 +739,7 @@ function printFunctionPartsInternal(type, printTypeFlags, returnTypeCallback, un
|
|
735
739
|
sawDefinedName = true;
|
736
740
|
emittedParamName = true;
|
737
741
|
}
|
738
|
-
else if (printTypeFlags & 256 /* PythonSyntax */) {
|
742
|
+
else if (printTypeFlags & 256 /* PrintTypeFlags.PythonSyntax */) {
|
739
743
|
paramString += `__p${index}`;
|
740
744
|
sawDefinedName = true;
|
741
745
|
emittedParamName = true;
|
@@ -752,11 +756,11 @@ function printFunctionPartsInternal(type, printTypeFlags, returnTypeCallback, un
|
|
752
756
|
if (emittedParamName) {
|
753
757
|
paramString += ': ';
|
754
758
|
}
|
755
|
-
else if (param.category === 1 /* ArgsList */ && !(0, types_1.isUnpacked)(paramType)) {
|
759
|
+
else if (param.category === 1 /* ParameterCategory.ArgsList */ && !(0, types_1.isUnpacked)(paramType)) {
|
756
760
|
paramString += '*';
|
757
761
|
}
|
758
|
-
if (param.category === 2 /* KwargsDict */ && (0, types_1.isUnpacked)(paramType)) {
|
759
|
-
if (printTypeFlags & 256 /* PythonSyntax */) {
|
762
|
+
if (param.category === 2 /* ParameterCategory.KwargsDict */ && (0, types_1.isUnpacked)(paramType)) {
|
763
|
+
if (printTypeFlags & 256 /* PrintTypeFlags.PythonSyntax */) {
|
760
764
|
// Use "Unpack" because ** isn't legal syntax prior to Python 3.12.
|
761
765
|
paramTypeString = `Unpack[${paramTypeString.substring(1)}]`;
|
762
766
|
}
|
@@ -767,8 +771,8 @@ function printFunctionPartsInternal(type, printTypeFlags, returnTypeCallback, un
|
|
767
771
|
}
|
768
772
|
paramString += paramTypeString;
|
769
773
|
if ((0, types_1.isParamSpec)(paramType)) {
|
770
|
-
if (param.category === 1 /* ArgsList */ ||
|
771
|
-
param.category === 2 /* KwargsDict */) {
|
774
|
+
if (param.category === 1 /* ParameterCategory.ArgsList */ ||
|
775
|
+
param.category === 2 /* ParameterCategory.KwargsDict */) {
|
772
776
|
isParamSpecArgsKwargsParam = true;
|
773
777
|
}
|
774
778
|
}
|
@@ -776,11 +780,11 @@ function printFunctionPartsInternal(type, printTypeFlags, returnTypeCallback, un
|
|
776
780
|
// spaces when used with a type annotation.
|
777
781
|
defaultValueAssignment = ' = ';
|
778
782
|
}
|
779
|
-
else if ((printTypeFlags & 2 /* OmitTypeArgumentsIfUnknown */) === 0) {
|
783
|
+
else if ((printTypeFlags & 2 /* PrintTypeFlags.OmitTypeArgumentsIfUnknown */) === 0) {
|
780
784
|
if (!param.isNameSynthesized) {
|
781
785
|
paramString += ': ';
|
782
786
|
}
|
783
|
-
if (printTypeFlags & (1 /* PrintUnknownWithAny */ | 256 /* PythonSyntax */)) {
|
787
|
+
if (printTypeFlags & (1 /* PrintTypeFlags.PrintUnknownWithAny */ | 256 /* PrintTypeFlags.PythonSyntax */)) {
|
784
788
|
paramString += 'Any';
|
785
789
|
}
|
786
790
|
else {
|
@@ -789,7 +793,7 @@ function printFunctionPartsInternal(type, printTypeFlags, returnTypeCallback, un
|
|
789
793
|
defaultValueAssignment = ' = ';
|
790
794
|
}
|
791
795
|
}
|
792
|
-
else if (param.category === 0 /* Simple */) {
|
796
|
+
else if (param.category === 0 /* ParameterCategory.Simple */) {
|
793
797
|
if (sawDefinedName) {
|
794
798
|
paramString += '/';
|
795
799
|
}
|
@@ -810,17 +814,17 @@ function printFunctionPartsInternal(type, printTypeFlags, returnTypeCallback, un
|
|
810
814
|
}
|
811
815
|
// If this is a (...) signature, replace the *args, **kwargs with "...".
|
812
816
|
if (types_1.FunctionType.shouldSkipArgsKwargsCompatibilityCheck(type) && !isParamSpecArgsKwargsParam) {
|
813
|
-
if (param.category === 1 /* ArgsList */) {
|
817
|
+
if (param.category === 1 /* ParameterCategory.ArgsList */) {
|
814
818
|
paramString = '...';
|
815
819
|
}
|
816
|
-
else if (param.category === 2 /* KwargsDict */) {
|
820
|
+
else if (param.category === 2 /* ParameterCategory.KwargsDict */) {
|
817
821
|
return;
|
818
822
|
}
|
819
823
|
}
|
820
824
|
paramTypeStrings.push(paramString);
|
821
825
|
});
|
822
826
|
if (type.details.paramSpec) {
|
823
|
-
if (printTypeFlags & 256 /* PythonSyntax */) {
|
827
|
+
if (printTypeFlags & 256 /* PrintTypeFlags.PythonSyntax */) {
|
824
828
|
paramTypeStrings.push(`*args: ${type.details.paramSpec}.args`);
|
825
829
|
paramTypeStrings.push(`**kwargs: ${type.details.paramSpec}.kwargs`);
|
826
830
|
}
|
@@ -830,12 +834,12 @@ function printFunctionPartsInternal(type, printTypeFlags, returnTypeCallback, un
|
|
830
834
|
}
|
831
835
|
const returnType = returnTypeCallback(type);
|
832
836
|
const returnTypeString = recursionTypes.length < types_1.maxTypeRecursionCount
|
833
|
-
? printTypeInternal(returnType, printTypeFlags | 16 /* ParenthesizeUnion */ | 128 /* ParenthesizeCallable */, returnTypeCallback, uniqueNameMap, recursionTypes, recursionCount)
|
837
|
+
? printTypeInternal(returnType, printTypeFlags | 16 /* PrintTypeFlags.ParenthesizeUnion */ | 128 /* PrintTypeFlags.ParenthesizeCallable */, returnTypeCallback, uniqueNameMap, recursionTypes, recursionCount)
|
834
838
|
: '';
|
835
839
|
return [paramTypeStrings, returnTypeString];
|
836
840
|
}
|
837
841
|
function _printUnpack(textToWrap, flags) {
|
838
|
-
return flags & 512 /* UseTypingUnpack */ ? `Unpack[${textToWrap}]` : `*${textToWrap}`;
|
842
|
+
return flags & 512 /* PrintTypeFlags.UseTypingUnpack */ ? `Unpack[${textToWrap}]` : `*${textToWrap}`;
|
839
843
|
}
|
840
844
|
// Surrounds a printed type with Type[...] as many times as needed
|
841
845
|
// for the nested instantiable count.
|
@@ -856,13 +860,13 @@ function _getReadableTypeVarName(type, usePythonSyntax) {
|
|
856
860
|
function _getTypeVarVarianceText(type) {
|
857
861
|
var _a;
|
858
862
|
const computedVariance = (_a = type.computedVariance) !== null && _a !== void 0 ? _a : type.details.declaredVariance;
|
859
|
-
if (computedVariance === 2 /* Invariant */) {
|
863
|
+
if (computedVariance === 2 /* Variance.Invariant */) {
|
860
864
|
return 'invariant';
|
861
865
|
}
|
862
|
-
if (computedVariance === 3 /* Covariant */) {
|
866
|
+
if (computedVariance === 3 /* Variance.Covariant */) {
|
863
867
|
return 'covariant';
|
864
868
|
}
|
865
|
-
if (computedVariance === 4 /* Contravariant */) {
|
869
|
+
if (computedVariance === 4 /* Variance.Contravariant */) {
|
866
870
|
return 'contravariant';
|
867
871
|
}
|
868
872
|
return '';
|
@@ -884,7 +888,7 @@ class UniqueNameMap {
|
|
884
888
|
recursionCount++;
|
885
889
|
if (type.typeAliasInfo) {
|
886
890
|
let expandTypeAlias = true;
|
887
|
-
if ((this._printTypeFlags & 32 /* ExpandTypeAlias */) === 0) {
|
891
|
+
if ((this._printTypeFlags & 32 /* PrintTypeFlags.ExpandTypeAlias */) === 0) {
|
888
892
|
expandTypeAlias = false;
|
889
893
|
}
|
890
894
|
else {
|
@@ -893,7 +897,7 @@ class UniqueNameMap {
|
|
893
897
|
}
|
894
898
|
}
|
895
899
|
if (!expandTypeAlias) {
|
896
|
-
const typeAliasName = (this._printTypeFlags & 4096 /* UseFullyQualifiedNames */) !== 0
|
900
|
+
const typeAliasName = (this._printTypeFlags & 4096 /* PrintTypeFlags.UseFullyQualifiedNames */) !== 0
|
897
901
|
? type.typeAliasInfo.fullName
|
898
902
|
: type.typeAliasInfo.name;
|
899
903
|
this._addIfUnique(typeAliasName, type, /* useTypeAliasName */ true);
|
@@ -915,7 +919,7 @@ class UniqueNameMap {
|
|
915
919
|
try {
|
916
920
|
recursionTypes.push(type);
|
917
921
|
switch (type.category) {
|
918
|
-
case 4 /* Function */: {
|
922
|
+
case 4 /* TypeCategory.Function */: {
|
919
923
|
type.details.parameters.forEach((_, index) => {
|
920
924
|
const paramType = types_1.FunctionType.getEffectiveParameterType(type, index);
|
921
925
|
this.build(paramType, recursionTypes, recursionCount);
|
@@ -924,20 +928,20 @@ class UniqueNameMap {
|
|
924
928
|
this.build(returnType, recursionTypes, recursionCount);
|
925
929
|
break;
|
926
930
|
}
|
927
|
-
case 5 /* OverloadedFunction */: {
|
931
|
+
case 5 /* TypeCategory.OverloadedFunction */: {
|
928
932
|
type.overloads.forEach((overload) => {
|
929
933
|
this.build(overload, recursionTypes, recursionCount);
|
930
934
|
});
|
931
935
|
break;
|
932
936
|
}
|
933
|
-
case 6 /* Class */: {
|
937
|
+
case 6 /* TypeCategory.Class */: {
|
934
938
|
if (type.literalValue !== undefined) {
|
935
939
|
break;
|
936
940
|
}
|
937
941
|
let className = type.aliasName;
|
938
942
|
if (!className) {
|
939
943
|
className =
|
940
|
-
(this._printTypeFlags & 4096 /* UseFullyQualifiedNames */) !== 0
|
944
|
+
(this._printTypeFlags & 4096 /* PrintTypeFlags.UseFullyQualifiedNames */) !== 0
|
941
945
|
? type.details.fullName
|
942
946
|
: type.details.name;
|
943
947
|
}
|
@@ -956,7 +960,7 @@ class UniqueNameMap {
|
|
956
960
|
}
|
957
961
|
break;
|
958
962
|
}
|
959
|
-
case 8 /* Union */: {
|
963
|
+
case 8 /* TypeCategory.Union */: {
|
960
964
|
(0, typeUtils_1.doForEachSubtype)(type, (subtype) => {
|
961
965
|
this.build(subtype, recursionTypes, recursionCount);
|
962
966
|
});
|