Skip to content

Commit a931d75

Browse files
jakebaileyjakebailey
committed
CONVERSION STEP - inlineImports
1 parent 91e8c22 commit a931d75

File tree

23 files changed

+112
-112
lines changed

23 files changed

+112
-112
lines changed

‎src/compiler/ts.ts

+24-24
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,15 @@ export * from "./corePublic";
1111
export * from "./debug";
1212
export * from "./diagnosticInformationMap.generated";
1313
export * from "./emitter";
14+
export * from "./factory/baseNodeFactory";
15+
export * from "./factory/emitHelpers";
16+
export * from "./factory/emitNode";
17+
export * from "./factory/nodeConverters";
18+
export * from "./factory/nodeFactory";
19+
export * from "./factory/nodeTests";
20+
export * from "./factory/parenthesizerRules";
21+
export * from "./factory/utilities";
22+
export * from "./factory/utilitiesPublic";
1423
export * from "./moduleNameResolver";
1524
export * from "./parser";
1625
export * from "./path";
@@ -25,26 +34,9 @@ export * from "./symbolWalker";
2534
export * from "./sys";
2635
export * from "./tracing";
2736
export * from "./transformer";
28-
export * from "./tsbuild";
29-
export * from "./tsbuildPublic";
30-
export * from "./types";
31-
export * from "./utilities";
32-
export * from "./utilitiesPublic";
33-
export * from "./visitorPublic";
34-
export * from "./watch";
35-
export * from "./watchPublic";
36-
export * from "./watchUtilities";
37-
export * from "./factory/baseNodeFactory";
38-
export * from "./factory/emitHelpers";
39-
export * from "./factory/emitNode";
40-
export * from "./factory/nodeConverters";
41-
export * from "./factory/nodeFactory";
42-
export * from "./factory/nodeTests";
43-
export * from "./factory/parenthesizerRules";
44-
export * from "./factory/utilities";
45-
export * from "./factory/utilitiesPublic";
4637
export * from "./transformers/classFields";
4738
export * from "./transformers/declarations";
39+
export * from "./transformers/declarations/diagnostics";
4840
export * from "./transformers/destructuring";
4941
export * from "./transformers/es2015";
5042
export * from "./transformers/es2016";
@@ -57,15 +49,23 @@ export * from "./transformers/es5";
5749
export * from "./transformers/esnext";
5850
export * from "./transformers/generators";
5951
export * from "./transformers/jsx";
60-
export * from "./transformers/taggedTemplate";
61-
export * from "./transformers/ts";
62-
export * from "./transformers/utilities";
63-
export * from "./transformers/declarations/diagnostics";
6452
export * from "./transformers/module/esnextAnd2015";
6553
export * from "./transformers/module/module";
6654
export * from "./transformers/module/node";
6755
export * from "./transformers/module/system";
68-
import * as moduleSpecifiers from "./ts.moduleSpecifiers";
56+
export * from "./transformers/taggedTemplate";
57+
export * from "./transformers/ts";
58+
export * from "./transformers/utilities";
59+
export * from "./tsbuild";
60+
export * from "./tsbuildPublic";
61+
export * from "./types";
62+
export * from "./utilities";
63+
export * from "./utilitiesPublic";
64+
export * from "./visitorPublic";
65+
export * from "./watch";
66+
export * from "./watchPublic";
67+
export * from "./watchUtilities";
6968
export { moduleSpecifiers };
70-
import * as performance from "./ts.performance";
7169
export { performance };
70+
import * as moduleSpecifiers from "./ts.moduleSpecifiers";
71+
import * as performance from "./ts.performance";

‎src/harness/Harness.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
export * from "./harnessIO";
22
export * from "./runnerbase";
33
export * from "./typeWriter";
4-
import * as LanguageService from "./Harness.LanguageService";
54
export { LanguageService };
6-
import * as SourceMapRecorder from "./Harness.SourceMapRecorder";
75
export { SourceMapRecorder };
6+
import * as LanguageService from "./Harness.LanguageService";
7+
import * as SourceMapRecorder from "./Harness.SourceMapRecorder";

‎src/harness/ts.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
export * from "../compiler/ts";
2-
export * from "../services/ts";
32
export * from "../jsTyping/ts";
43
export * from "../server/ts";
4+
export * from "../services/ts";
55
export * from "../typingsInstallerCore/ts";
66
export * from "./harnessGlobals";
7-
import * as server from "./ts.server";
87
export { server };
9-
import * as TestFSWithWatch from "./ts.TestFSWithWatch";
108
export { TestFSWithWatch };
9+
import * as server from "./ts.server";
10+
import * as TestFSWithWatch from "./ts.TestFSWithWatch";

‎src/jsTyping/ts.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
export * from "../compiler/ts";
2-
import * as JsTyping from "./ts.JsTyping";
32
export { JsTyping };
4-
import * as server from "./ts.server";
53
export { server };
4+
import * as JsTyping from "./ts.JsTyping";
5+
import * as server from "./ts.server";

‎src/loggedIO/ts.server.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
export * from "../harness/ts.server";
12
export * from "../jsTyping/ts.server";
23
export * from "../server/ts.server";
34
export * from "../typingsInstallerCore/ts.server";
4-
export * from "../harness/ts.server";
55
export * from "./loggedIO";

‎src/loggedIO/ts.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
export * from "../compiler/ts";
2-
export * from "../services/ts";
2+
export * from "../harness/ts";
33
export * from "../jsTyping/ts";
44
export * from "../server/ts";
5+
export * from "../services/ts";
56
export * from "../typingsInstallerCore/ts";
6-
export * from "../harness/ts";
7-
import * as server from "./ts.server";
87
export { server };
8+
import * as server from "./ts.server";

‎src/server/ts.server.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ export * from "./types";
1010
export * from "./typingsCache";
1111
export * from "./utilities";
1212
export * from "./utilitiesPublic";
13-
import * as protocol from "./ts.server.protocol";
1413
export { protocol };
14+
import * as protocol from "./ts.server.protocol";

‎src/server/ts.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
export * from "../compiler/ts";
22
export * from "../jsTyping/ts";
33
export * from "../services/ts";
4-
import * as server from "./ts.server";
54
export { server };
5+
import * as server from "./ts.server";

‎src/services/ts.Completions.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
export * from "./completions";
2-
import * as StringCompletions from "./ts.Completions.StringCompletions";
32
export { StringCompletions };
3+
import * as StringCompletions from "./ts.Completions.StringCompletions";

‎src/services/ts.codefix.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
export * from "./codeFixProvider";
21
export * from "./codefixes/addConvertToUnknownForNonOverlappingTypes";
32
export * from "./codefixes/addEmptyExportDeclaration";
43
export * from "./codefixes/addMissingAsync";
@@ -65,3 +64,4 @@ export * from "./codefixes/splitTypeOnlyImport";
6564
export * from "./codefixes/useBigintLiteral";
6665
export * from "./codefixes/useDefaultImport";
6766
export * from "./codefixes/wrapJsxInFragment";
67+
export * from "./codeFixProvider";

‎src/services/ts.refactor.ts

+8-8
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@ export * from "./refactors/convertImport";
44
export * from "./refactors/extractType";
55
export * from "./refactors/helpers";
66
export * from "./refactors/moveToNewFile";
7-
import * as addOrRemoveBracesToArrowFunction from "./ts.refactor.addOrRemoveBracesToArrowFunction";
87
export { addOrRemoveBracesToArrowFunction };
9-
import * as convertArrowFunctionOrFunctionExpression from "./ts.refactor.convertArrowFunctionOrFunctionExpression";
108
export { convertArrowFunctionOrFunctionExpression };
11-
import * as convertParamsToDestructuredObject from "./ts.refactor.convertParamsToDestructuredObject";
129
export { convertParamsToDestructuredObject };
13-
import * as convertStringOrTemplateLiteral from "./ts.refactor.convertStringOrTemplateLiteral";
1410
export { convertStringOrTemplateLiteral };
15-
import * as convertToOptionalChainExpression from "./ts.refactor.convertToOptionalChainExpression";
1611
export { convertToOptionalChainExpression };
17-
import * as extractSymbol from "./ts.refactor.extractSymbol";
1812
export { extractSymbol };
19-
import * as generateGetAccessorAndSetAccessor from "./ts.refactor.generateGetAccessorAndSetAccessor";
2013
export { generateGetAccessorAndSetAccessor };
21-
import * as inferFunctionReturnType from "./ts.refactor.inferFunctionReturnType";
2214
export { inferFunctionReturnType };
15+
import * as addOrRemoveBracesToArrowFunction from "./ts.refactor.addOrRemoveBracesToArrowFunction";
16+
import * as convertArrowFunctionOrFunctionExpression from "./ts.refactor.convertArrowFunctionOrFunctionExpression";
17+
import * as convertParamsToDestructuredObject from "./ts.refactor.convertParamsToDestructuredObject";
18+
import * as convertStringOrTemplateLiteral from "./ts.refactor.convertStringOrTemplateLiteral";
19+
import * as convertToOptionalChainExpression from "./ts.refactor.convertToOptionalChainExpression";
20+
import * as extractSymbol from "./ts.refactor.extractSymbol";
21+
import * as generateGetAccessorAndSetAccessor from "./ts.refactor.generateGetAccessorAndSetAccessor";
22+
import * as inferFunctionReturnType from "./ts.refactor.inferFunctionReturnType";

‎src/services/ts.ts

+21-21
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
export * from "../shims/ts";
21
export * from "../compiler/ts";
32
export * from "../jsTyping/ts";
3+
export * from "../shims/ts";
44
export * from "./classifier";
55
export * from "./documentHighlights";
66
export * from "./documentRegistry";
@@ -16,43 +16,43 @@ export * from "./transform";
1616
export * from "./transpile";
1717
export * from "./types";
1818
export * from "./utilities";
19-
import * as BreakpointResolver from "./ts.BreakpointResolver";
2019
export { BreakpointResolver };
21-
import * as CallHierarchy from "./ts.CallHierarchy";
2220
export { CallHierarchy };
23-
import * as classifier from "./ts.classifier";
2421
export { classifier };
25-
import * as codefix from "./ts.codefix";
2622
export { codefix };
27-
import * as Completions from "./ts.Completions";
2823
export { Completions };
29-
import * as FindAllReferences from "./ts.FindAllReferences";
3024
export { FindAllReferences };
31-
import * as GoToDefinition from "./ts.GoToDefinition";
3225
export { GoToDefinition };
33-
import * as InlayHints from "./ts.InlayHints";
3426
export { InlayHints };
35-
import * as JsDoc from "./ts.JsDoc";
3627
export { JsDoc };
37-
import * as NavigateTo from "./ts.NavigateTo";
3828
export { NavigateTo };
39-
import * as NavigationBar from "./ts.NavigationBar";
4029
export { NavigationBar };
41-
import * as OrganizeImports from "./ts.OrganizeImports";
4230
export { OrganizeImports };
43-
import * as OutliningElementsCollector from "./ts.OutliningElementsCollector";
4431
export { OutliningElementsCollector };
45-
import * as refactor from "./ts.refactor";
4632
export { refactor };
47-
import * as Rename from "./ts.Rename";
4833
export { Rename };
49-
import * as SignatureHelp from "./ts.SignatureHelp";
5034
export { SignatureHelp };
51-
import * as SmartSelectionRange from "./ts.SmartSelectionRange";
5235
export { SmartSelectionRange };
53-
import * as SymbolDisplay from "./ts.SymbolDisplay";
5436
export { SymbolDisplay };
55-
import * as textChanges from "./ts.textChanges";
5637
export { textChanges };
57-
import * as formatting from "./ts.formatting";
5838
export { formatting };
39+
import * as BreakpointResolver from "./ts.BreakpointResolver";
40+
import * as CallHierarchy from "./ts.CallHierarchy";
41+
import * as classifier from "./ts.classifier";
42+
import * as codefix from "./ts.codefix";
43+
import * as Completions from "./ts.Completions";
44+
import * as FindAllReferences from "./ts.FindAllReferences";
45+
import * as formatting from "./ts.formatting";
46+
import * as GoToDefinition from "./ts.GoToDefinition";
47+
import * as InlayHints from "./ts.InlayHints";
48+
import * as JsDoc from "./ts.JsDoc";
49+
import * as NavigateTo from "./ts.NavigateTo";
50+
import * as NavigationBar from "./ts.NavigationBar";
51+
import * as OrganizeImports from "./ts.OrganizeImports";
52+
import * as OutliningElementsCollector from "./ts.OutliningElementsCollector";
53+
import * as refactor from "./ts.refactor";
54+
import * as Rename from "./ts.Rename";
55+
import * as SignatureHelp from "./ts.SignatureHelp";
56+
import * as SmartSelectionRange from "./ts.SmartSelectionRange";
57+
import * as SymbolDisplay from "./ts.SymbolDisplay";
58+
import * as textChanges from "./ts.textChanges";

‎src/testRunner/Harness.Parallel.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
export * from "./parallel/shared";
2-
import * as Host from "./Harness.Parallel.Host";
32
export { Host };
4-
import * as Worker from "./Harness.Parallel.Worker";
53
export { Worker };
4+
import * as Host from "./Harness.Parallel.Host";
5+
import * as Worker from "./Harness.Parallel.Worker";

‎src/testRunner/Harness.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ export * from "./externalCompileRunner";
55
export * from "./fourslashRunner";
66
export * from "./runner";
77
export * from "./test262Runner";
8-
import * as Parallel from "./Harness.Parallel";
98
export { Parallel };
9+
import * as Parallel from "./Harness.Parallel";

‎src/testRunner/ts.projectSystem.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ export * from "./unittests/tsserver/declarationFileMaps";
1212
export * from "./unittests/tsserver/documentRegistry";
1313
export * from "./unittests/tsserver/duplicatePackages";
1414
export * from "./unittests/tsserver/dynamicFiles";
15+
export * from "./unittests/tsserver/events/largeFileReferenced";
16+
export * from "./unittests/tsserver/events/projectLanguageServiceState";
17+
export * from "./unittests/tsserver/events/projectLoading";
18+
export * from "./unittests/tsserver/events/projectUpdatedInBackground";
1519
export * from "./unittests/tsserver/exportMapCache";
1620
export * from "./unittests/tsserver/externalProjects";
1721
export * from "./unittests/tsserver/forceConsistentCasingInFileNames";
@@ -60,7 +64,3 @@ export * from "./unittests/tsserver/typeReferenceDirectives";
6064
export * from "./unittests/tsserver/typingsInstaller";
6165
export * from "./unittests/tsserver/watchEnvironment";
6266
export * from "./unittests/tsserver/webServer";
63-
export * from "./unittests/tsserver/events/largeFileReferenced";
64-
export * from "./unittests/tsserver/events/projectLanguageServiceState";
65-
export * from "./unittests/tsserver/events/projectLoading";
66-
export * from "./unittests/tsserver/events/projectUpdatedInBackground";

‎src/testRunner/ts.server.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
export * from "../harness/ts.server";
12
export * from "../jsTyping/ts.server";
3+
export * from "../loggedIO/ts.server";
24
export * from "../server/ts.server";
3-
export * from "../webServer/ts.server";
45
export * from "../typingsInstallerCore/ts.server";
5-
export * from "../harness/ts.server";
6-
export * from "../loggedIO/ts.server";
6+
export * from "../webServer/ts.server";
77
export * from "./unittests/tsserver/session";

‎src/testRunner/ts.ts

+25-25
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,28 @@
1-
export * from "../shims/ts";
21
export * from "../compiler/ts";
32
export * from "../executeCommandLine/ts";
4-
export * from "../services/ts";
3+
export * from "../harness/ts";
54
export * from "../jsTyping/ts";
5+
export * from "../loggedIO/ts";
66
export * from "../server/ts";
7-
export * from "../webServer/ts";
7+
export * from "../services/ts";
8+
export * from "../shims/ts";
89
export * from "../typingsInstallerCore/ts";
9-
export * from "../harness/ts";
10-
export * from "../loggedIO/ts";
10+
export * from "../webServer/ts";
1111
export * from "./unittests/asserts";
1212
export * from "./unittests/base64";
1313
export * from "./unittests/builder";
1414
export * from "./unittests/comments";
1515
export * from "./unittests/compilerCore";
16+
export * from "./unittests/config/commandLineParsing";
17+
export * from "./unittests/config/configurationExtension";
18+
export * from "./unittests/config/convertCompilerOptionsFromJson";
19+
export * from "./unittests/config/convertTypeAcquisitionFromJson";
20+
export * from "./unittests/config/initializeTSConfig";
21+
export * from "./unittests/config/matchFiles";
22+
export * from "./unittests/config/projectReferences";
23+
export * from "./unittests/config/showConfig";
24+
export * from "./unittests/config/tsconfigParsing";
25+
export * from "./unittests/config/tsconfigParsingWatchOptions";
1626
export * from "./unittests/convertToBase64";
1727
export * from "./unittests/createMapShim";
1828
export * from "./unittests/createSetShim";
@@ -28,24 +38,19 @@ export * from "./unittests/printer";
2838
export * from "./unittests/programApi";
2939
export * from "./unittests/reuseProgramStructure";
3040
export * from "./unittests/semver";
31-
export * from "./unittests/transform";
32-
export * from "./unittests/config/commandLineParsing";
33-
export * from "./unittests/config/configurationExtension";
34-
export * from "./unittests/config/convertCompilerOptionsFromJson";
35-
export * from "./unittests/config/convertTypeAcquisitionFromJson";
36-
export * from "./unittests/config/initializeTSConfig";
37-
export * from "./unittests/config/matchFiles";
38-
export * from "./unittests/config/projectReferences";
39-
export * from "./unittests/config/showConfig";
40-
export * from "./unittests/config/tsconfigParsing";
41-
export * from "./unittests/config/tsconfigParsingWatchOptions";
4241
export * from "./unittests/services/cancellableLanguageServiceOperations";
4342
export * from "./unittests/services/convertToAsyncFunction";
43+
export * from "./unittests/services/extract/constants";
44+
export * from "./unittests/services/extract/functions";
45+
export * from "./unittests/services/extract/helpers";
46+
export * from "./unittests/services/extract/ranges";
47+
export * from "./unittests/services/extract/symbolWalker";
4448
export * from "./unittests/services/hostNewLineSupport";
4549
export * from "./unittests/services/languageService";
4650
export * from "./unittests/services/organizeImports";
4751
export * from "./unittests/services/textChanges";
4852
export * from "./unittests/services/transpile";
53+
export * from "./unittests/transform";
4954
export * from "./unittests/tsbuild/amdModulesWithOut";
5055
export * from "./unittests/tsbuild/clean";
5156
export * from "./unittests/tsbuild/configFileErrors";
@@ -79,16 +84,11 @@ export * from "./unittests/tsc/projectReferences";
7984
export * from "./unittests/tsc/redirect";
8085
export * from "./unittests/tsc/runWithoutArgs";
8186
export * from "./unittests/tsserver/versionCache";
82-
export * from "./unittests/services/extract/constants";
83-
export * from "./unittests/services/extract/functions";
84-
export * from "./unittests/services/extract/helpers";
85-
export * from "./unittests/services/extract/ranges";
86-
export * from "./unittests/services/extract/symbolWalker";
87-
import * as tscWatch from "./ts.tscWatch";
8887
export { tscWatch };
89-
import * as projectSystem from "./ts.projectSystem";
9088
export { projectSystem };
91-
import * as server from "./ts.server";
9289
export { server };
93-
import * as textStorage from "./ts.textStorage";
9490
export { textStorage };
91+
import * as projectSystem from "./ts.projectSystem";
92+
import * as server from "./ts.server";
93+
import * as textStorage from "./ts.textStorage";
94+
import * as tscWatch from "./ts.tscWatch";

‎src/tsserver/ts.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
export * from "../compiler/ts";
2-
export * from "../services/ts";
2+
export * from "../deprecatedCompat/ts";
33
export * from "../jsTyping/ts";
44
export * from "../server/ts";
5+
export * from "../services/ts";
56
export * from "../webServer/ts";
6-
export * from "../deprecatedCompat/ts";
7-
import * as server from "./ts.server";
87
export { server };
8+
import * as server from "./ts.server";

0 commit comments

Comments
 (0)