@atlaspack/transformer-typescript-types 2.14.21 → 2.14.22-typescript-5ad950d33.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/LICENSE +201 -0
- package/lib/TSModule.d.ts +25 -0
- package/lib/TSModuleGraph.d.ts +33 -0
- package/lib/TSModuleGraph.js +13 -0
- package/lib/TSTypesTransformer.d.ts +3 -0
- package/lib/TSTypesTransformer.js +6 -4
- package/lib/collect.d.ts +2 -0
- package/lib/collect.js +28 -4
- package/lib/shake.d.ts +2 -0
- package/lib/shake.js +24 -6
- package/lib/utils.d.ts +2 -0
- package/lib/utils.js +4 -0
- package/lib/wrappers.d.ts +8 -0
- package/lib/wrappers.js +1 -0
- package/package.json +14 -9
- package/src/{TSModule.js → TSModule.ts} +13 -6
- package/src/{TSModuleGraph.js → TSModuleGraph.ts} +48 -9
- package/src/{TSTypesTransformer.js → TSTypesTransformer.ts} +10 -10
- package/src/{collect.js → collect.ts} +22 -5
- package/src/{shake.js → shake.ts} +19 -6
- package/src/{utils.js → utils.ts} +3 -2
- package/src/{wrappers.js → wrappers.ts} +95 -58
- package/tsconfig.json +4 -0
package/LICENSE
ADDED
|
@@ -0,0 +1,201 @@
|
|
|
1
|
+
Apache License
|
|
2
|
+
Version 2.0, January 2004
|
|
3
|
+
http://www.apache.org/licenses/
|
|
4
|
+
|
|
5
|
+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
|
6
|
+
|
|
7
|
+
1. Definitions.
|
|
8
|
+
|
|
9
|
+
"License" shall mean the terms and conditions for use, reproduction,
|
|
10
|
+
and distribution as defined by Sections 1 through 9 of this document.
|
|
11
|
+
|
|
12
|
+
"Licensor" shall mean the copyright owner or entity authorized by
|
|
13
|
+
the copyright owner that is granting the License.
|
|
14
|
+
|
|
15
|
+
"Legal Entity" shall mean the union of the acting entity and all
|
|
16
|
+
other entities that control, are controlled by, or are under common
|
|
17
|
+
control with that entity. For the purposes of this definition,
|
|
18
|
+
"control" means (i) the power, direct or indirect, to cause the
|
|
19
|
+
direction or management of such entity, whether by contract or
|
|
20
|
+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
|
21
|
+
outstanding shares, or (iii) beneficial ownership of such entity.
|
|
22
|
+
|
|
23
|
+
"You" (or "Your") shall mean an individual or Legal Entity
|
|
24
|
+
exercising permissions granted by this License.
|
|
25
|
+
|
|
26
|
+
"Source" form shall mean the preferred form for making modifications,
|
|
27
|
+
including but not limited to software source code, documentation
|
|
28
|
+
source, and configuration files.
|
|
29
|
+
|
|
30
|
+
"Object" form shall mean any form resulting from mechanical
|
|
31
|
+
transformation or translation of a Source form, including but
|
|
32
|
+
not limited to compiled object code, generated documentation,
|
|
33
|
+
and conversions to other media types.
|
|
34
|
+
|
|
35
|
+
"Work" shall mean the work of authorship, whether in Source or
|
|
36
|
+
Object form, made available under the License, as indicated by a
|
|
37
|
+
copyright notice that is included in or attached to the work
|
|
38
|
+
(an example is provided in the Appendix below).
|
|
39
|
+
|
|
40
|
+
"Derivative Works" shall mean any work, whether in Source or Object
|
|
41
|
+
form, that is based on (or derived from) the Work and for which the
|
|
42
|
+
editorial revisions, annotations, elaborations, or other modifications
|
|
43
|
+
represent, as a whole, an original work of authorship. For the purposes
|
|
44
|
+
of this License, Derivative Works shall not include works that remain
|
|
45
|
+
separable from, or merely link (or bind by name) to the interfaces of,
|
|
46
|
+
the Work and Derivative Works thereof.
|
|
47
|
+
|
|
48
|
+
"Contribution" shall mean any work of authorship, including
|
|
49
|
+
the original version of the Work and any modifications or additions
|
|
50
|
+
to that Work or Derivative Works thereof, that is intentionally
|
|
51
|
+
submitted to Licensor for inclusion in the Work by the copyright owner
|
|
52
|
+
or by an individual or Legal Entity authorized to submit on behalf of
|
|
53
|
+
the copyright owner. For the purposes of this definition, "submitted"
|
|
54
|
+
means any form of electronic, verbal, or written communication sent
|
|
55
|
+
to the Licensor or its representatives, including but not limited to
|
|
56
|
+
communication on electronic mailing lists, source code control systems,
|
|
57
|
+
and issue tracking systems that are managed by, or on behalf of, the
|
|
58
|
+
Licensor for the purpose of discussing and improving the Work, but
|
|
59
|
+
excluding communication that is conspicuously marked or otherwise
|
|
60
|
+
designated in writing by the copyright owner as "Not a Contribution."
|
|
61
|
+
|
|
62
|
+
"Contributor" shall mean Licensor and any individual or Legal Entity
|
|
63
|
+
on behalf of whom a Contribution has been received by Licensor and
|
|
64
|
+
subsequently incorporated within the Work.
|
|
65
|
+
|
|
66
|
+
2. Grant of Copyright License. Subject to the terms and conditions of
|
|
67
|
+
this License, each Contributor hereby grants to You a perpetual,
|
|
68
|
+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
|
69
|
+
copyright license to reproduce, prepare Derivative Works of,
|
|
70
|
+
publicly display, publicly perform, sublicense, and distribute the
|
|
71
|
+
Work and such Derivative Works in Source or Object form.
|
|
72
|
+
|
|
73
|
+
3. Grant of Patent License. Subject to the terms and conditions of
|
|
74
|
+
this License, each Contributor hereby grants to You a perpetual,
|
|
75
|
+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
|
76
|
+
(except as stated in this section) patent license to make, have made,
|
|
77
|
+
use, offer to sell, sell, import, and otherwise transfer the Work,
|
|
78
|
+
where such license applies only to those patent claims licensable
|
|
79
|
+
by such Contributor that are necessarily infringed by their
|
|
80
|
+
Contribution(s) alone or by combination of their Contribution(s)
|
|
81
|
+
with the Work to which such Contribution(s) was submitted. If You
|
|
82
|
+
institute patent litigation against any entity (including a
|
|
83
|
+
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
|
84
|
+
or a Contribution incorporated within the Work constitutes direct
|
|
85
|
+
or contributory patent infringement, then any patent licenses
|
|
86
|
+
granted to You under this License for that Work shall terminate
|
|
87
|
+
as of the date such litigation is filed.
|
|
88
|
+
|
|
89
|
+
4. Redistribution. You may reproduce and distribute copies of the
|
|
90
|
+
Work or Derivative Works thereof in any medium, with or without
|
|
91
|
+
modifications, and in Source or Object form, provided that You
|
|
92
|
+
meet the following conditions:
|
|
93
|
+
|
|
94
|
+
(a) You must give any other recipients of the Work or
|
|
95
|
+
Derivative Works a copy of this License; and
|
|
96
|
+
|
|
97
|
+
(b) You must cause any modified files to carry prominent notices
|
|
98
|
+
stating that You changed the files; and
|
|
99
|
+
|
|
100
|
+
(c) You must retain, in the Source form of any Derivative Works
|
|
101
|
+
that You distribute, all copyright, patent, trademark, and
|
|
102
|
+
attribution notices from the Source form of the Work,
|
|
103
|
+
excluding those notices that do not pertain to any part of
|
|
104
|
+
the Derivative Works; and
|
|
105
|
+
|
|
106
|
+
(d) If the Work includes a "NOTICE" text file as part of its
|
|
107
|
+
distribution, then any Derivative Works that You distribute must
|
|
108
|
+
include a readable copy of the attribution notices contained
|
|
109
|
+
within such NOTICE file, excluding those notices that do not
|
|
110
|
+
pertain to any part of the Derivative Works, in at least one
|
|
111
|
+
of the following places: within a NOTICE text file distributed
|
|
112
|
+
as part of the Derivative Works; within the Source form or
|
|
113
|
+
documentation, if provided along with the Derivative Works; or,
|
|
114
|
+
within a display generated by the Derivative Works, if and
|
|
115
|
+
wherever such third-party notices normally appear. The contents
|
|
116
|
+
of the NOTICE file are for informational purposes only and
|
|
117
|
+
do not modify the License. You may add Your own attribution
|
|
118
|
+
notices within Derivative Works that You distribute, alongside
|
|
119
|
+
or as an addendum to the NOTICE text from the Work, provided
|
|
120
|
+
that such additional attribution notices cannot be construed
|
|
121
|
+
as modifying the License.
|
|
122
|
+
|
|
123
|
+
You may add Your own copyright statement to Your modifications and
|
|
124
|
+
may provide additional or different license terms and conditions
|
|
125
|
+
for use, reproduction, or distribution of Your modifications, or
|
|
126
|
+
for any such Derivative Works as a whole, provided Your use,
|
|
127
|
+
reproduction, and distribution of the Work otherwise complies with
|
|
128
|
+
the conditions stated in this License.
|
|
129
|
+
|
|
130
|
+
5. Submission of Contributions. Unless You explicitly state otherwise,
|
|
131
|
+
any Contribution intentionally submitted for inclusion in the Work
|
|
132
|
+
by You to the Licensor shall be under the terms and conditions of
|
|
133
|
+
this License, without any additional terms or conditions.
|
|
134
|
+
Notwithstanding the above, nothing herein shall supersede or modify
|
|
135
|
+
the terms of any separate license agreement you may have executed
|
|
136
|
+
with Licensor regarding such Contributions.
|
|
137
|
+
|
|
138
|
+
6. Trademarks. This License does not grant permission to use the trade
|
|
139
|
+
names, trademarks, service marks, or product names of the Licensor,
|
|
140
|
+
except as required for reasonable and customary use in describing the
|
|
141
|
+
origin of the Work and reproducing the content of the NOTICE file.
|
|
142
|
+
|
|
143
|
+
7. Disclaimer of Warranty. Unless required by applicable law or
|
|
144
|
+
agreed to in writing, Licensor provides the Work (and each
|
|
145
|
+
Contributor provides its Contributions) on an "AS IS" BASIS,
|
|
146
|
+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
|
147
|
+
implied, including, without limitation, any warranties or conditions
|
|
148
|
+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
|
149
|
+
PARTICULAR PURPOSE. You are solely responsible for determining the
|
|
150
|
+
appropriateness of using or redistributing the Work and assume any
|
|
151
|
+
risks associated with Your exercise of permissions under this License.
|
|
152
|
+
|
|
153
|
+
8. Limitation of Liability. In no event and under no legal theory,
|
|
154
|
+
whether in tort (including negligence), contract, or otherwise,
|
|
155
|
+
unless required by applicable law (such as deliberate and grossly
|
|
156
|
+
negligent acts) or agreed to in writing, shall any Contributor be
|
|
157
|
+
liable to You for damages, including any direct, indirect, special,
|
|
158
|
+
incidental, or consequential damages of any character arising as a
|
|
159
|
+
result of this License or out of the use or inability to use the
|
|
160
|
+
Work (including but not limited to damages for loss of goodwill,
|
|
161
|
+
work stoppage, computer failure or malfunction, or any and all
|
|
162
|
+
other commercial damages or losses), even if such Contributor
|
|
163
|
+
has been advised of the possibility of such damages.
|
|
164
|
+
|
|
165
|
+
9. Accepting Warranty or Additional Liability. While redistributing
|
|
166
|
+
the Work or Derivative Works thereof, You may choose to offer,
|
|
167
|
+
and charge a fee for, acceptance of support, warranty, indemnity,
|
|
168
|
+
or other liability obligations and/or rights consistent with this
|
|
169
|
+
License. However, in accepting such obligations, You may act only
|
|
170
|
+
on Your own behalf and on Your sole responsibility, not on behalf
|
|
171
|
+
of any other Contributor, and only if You agree to indemnify,
|
|
172
|
+
defend, and hold each Contributor harmless for any liability
|
|
173
|
+
incurred by, or claims asserted against, such Contributor by reason
|
|
174
|
+
of your accepting any such warranty or additional liability.
|
|
175
|
+
|
|
176
|
+
END OF TERMS AND CONDITIONS
|
|
177
|
+
|
|
178
|
+
APPENDIX: How to apply the Apache License to your work.
|
|
179
|
+
|
|
180
|
+
To apply the Apache License to your work, attach the following
|
|
181
|
+
boilerplate notice, with the fields enclosed by brackets "[]"
|
|
182
|
+
replaced with your own identifying information. (Don't include
|
|
183
|
+
the brackets!) The text should be enclosed in the appropriate
|
|
184
|
+
comment syntax for the file format. We also recommend that a
|
|
185
|
+
file or class name and description of purpose be included on the
|
|
186
|
+
same "printed page" as the copyright notice for easier
|
|
187
|
+
identification within third-party archives.
|
|
188
|
+
|
|
189
|
+
Copyright (c) 2024 Atlassian US., Inc.
|
|
190
|
+
|
|
191
|
+
Licensed under the Apache License, Version 2.0 (the "License");
|
|
192
|
+
you may not use this file except in compliance with the License.
|
|
193
|
+
You may obtain a copy of the License at
|
|
194
|
+
|
|
195
|
+
http://www.apache.org/licenses/LICENSE-2.0
|
|
196
|
+
|
|
197
|
+
Unless required by applicable law or agreed to in writing, software
|
|
198
|
+
distributed under the License is distributed on an "AS IS" BASIS,
|
|
199
|
+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
200
|
+
See the License for the specific language governing permissions and
|
|
201
|
+
limitations under the License.
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
export type Import = {
|
|
2
|
+
specifier: string;
|
|
3
|
+
imported: string;
|
|
4
|
+
};
|
|
5
|
+
export type Export = {
|
|
6
|
+
name: string;
|
|
7
|
+
imported: string;
|
|
8
|
+
specifier?: string | null | undefined;
|
|
9
|
+
} | {
|
|
10
|
+
specifier: string;
|
|
11
|
+
};
|
|
12
|
+
export declare class TSModule {
|
|
13
|
+
imports: Map<string, Import>;
|
|
14
|
+
exports: Array<Export>;
|
|
15
|
+
bindings: Map<string, Set<any>>;
|
|
16
|
+
names: Map<string, string>;
|
|
17
|
+
used: Set<string>;
|
|
18
|
+
constructor();
|
|
19
|
+
addImport(local: string, specifier: string, imported: string): void;
|
|
20
|
+
addExport(name: string, imported: string, specifier?: string | null): void;
|
|
21
|
+
addWildcardExport(specifier: string): void;
|
|
22
|
+
addLocal(name: string, node: any): void;
|
|
23
|
+
getName(name: string): string;
|
|
24
|
+
hasBinding(name: string): boolean;
|
|
25
|
+
}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
import type { TSModule, Export } from './TSModule';
|
|
2
|
+
export declare class TSModuleGraph {
|
|
3
|
+
modules: Map<string, TSModule>;
|
|
4
|
+
mainModuleName: string;
|
|
5
|
+
mainModule: TSModule | null | undefined;
|
|
6
|
+
syntheticImportCount: number;
|
|
7
|
+
constructor(mainModuleName: string);
|
|
8
|
+
addModule(name: string, module: TSModule): void;
|
|
9
|
+
getModule(name: string): TSModule | null | undefined;
|
|
10
|
+
markUsed(module: TSModule, name: string, context: any): void;
|
|
11
|
+
getExport(m: TSModule, e: Export): {
|
|
12
|
+
imported: string;
|
|
13
|
+
module: TSModule;
|
|
14
|
+
name: string;
|
|
15
|
+
} | null | undefined;
|
|
16
|
+
resolveImport(module: TSModule, local: string, imported?: string): {
|
|
17
|
+
imported: string;
|
|
18
|
+
module: TSModule;
|
|
19
|
+
name: string;
|
|
20
|
+
} | null | undefined;
|
|
21
|
+
resolveExport(module: TSModule, name: string): {
|
|
22
|
+
imported: string;
|
|
23
|
+
module: TSModule;
|
|
24
|
+
name: string;
|
|
25
|
+
} | null | undefined;
|
|
26
|
+
getAllExports(module?: TSModule, excludeDefault?: boolean): Array<{
|
|
27
|
+
imported: string;
|
|
28
|
+
module: TSModule;
|
|
29
|
+
name: string;
|
|
30
|
+
}>;
|
|
31
|
+
getAllImports(): Map<string, Map<string, string>>;
|
|
32
|
+
propagate(context: any): Map<string, TSModule>;
|
|
33
|
+
}
|
package/lib/TSModuleGraph.js
CHANGED
|
@@ -78,15 +78,20 @@ class TSModuleGraph {
|
|
|
78
78
|
}
|
|
79
79
|
}
|
|
80
80
|
getExport(m, e) {
|
|
81
|
+
// @ts-expect-error TS2339
|
|
81
82
|
(0, _assert().default)(e.name != null);
|
|
83
|
+
// @ts-expect-error TS2339
|
|
82
84
|
let exportName = e.name;
|
|
83
85
|
|
|
84
86
|
// Re-export
|
|
87
|
+
// @ts-expect-error TS2339
|
|
85
88
|
if (e.specifier && e.imported) {
|
|
86
89
|
let m = this.getModule(e.specifier);
|
|
87
90
|
if (!m) {
|
|
88
91
|
return null;
|
|
89
92
|
}
|
|
93
|
+
|
|
94
|
+
// @ts-expect-error TS2339
|
|
90
95
|
let exp = this.resolveExport(m, e.imported);
|
|
91
96
|
if (!exp) {
|
|
92
97
|
return null;
|
|
@@ -115,6 +120,7 @@ class TSModuleGraph {
|
|
|
115
120
|
return {
|
|
116
121
|
module: m,
|
|
117
122
|
name: exportName,
|
|
123
|
+
// @ts-expect-error TS2339
|
|
118
124
|
imported: e.imported != null ? m.getName(e.imported) : exportName
|
|
119
125
|
};
|
|
120
126
|
}
|
|
@@ -136,6 +142,7 @@ class TSModuleGraph {
|
|
|
136
142
|
}
|
|
137
143
|
resolveExport(module, name) {
|
|
138
144
|
for (let e of module.exports) {
|
|
145
|
+
// @ts-expect-error TS2339
|
|
139
146
|
if (e.name === name) {
|
|
140
147
|
return this.getExport(module, e);
|
|
141
148
|
} else if (e.specifier) {
|
|
@@ -149,6 +156,7 @@ class TSModuleGraph {
|
|
|
149
156
|
getAllExports(module = (0, _nullthrows().default)(this.mainModule), excludeDefault = false) {
|
|
150
157
|
let res = [];
|
|
151
158
|
for (let e of module.exports) {
|
|
159
|
+
// @ts-expect-error TS2339
|
|
152
160
|
if (e.name && (!excludeDefault || e.name !== 'default')) {
|
|
153
161
|
let exp = this.getExport(module, e);
|
|
154
162
|
if (exp) {
|
|
@@ -218,11 +226,14 @@ class TSModuleGraph {
|
|
|
218
226
|
// Map of imported specifiers -> map of imported names to local names
|
|
219
227
|
let imports = new Map();
|
|
220
228
|
for (let [m, orig] of importedSymbolsToUpdate) {
|
|
229
|
+
// @ts-expect-error TS2339
|
|
221
230
|
let imp = (0, _nullthrows().default)(m.imports.get(orig));
|
|
231
|
+
// @ts-expect-error TS2345
|
|
222
232
|
let imported = (0, _nullthrows().default)(this.resolveImport(m, orig));
|
|
223
233
|
|
|
224
234
|
// If the module is bundled, map the local name to the original exported name.
|
|
225
235
|
if (this.modules.has(imp.specifier)) {
|
|
236
|
+
// @ts-expect-error TS2339
|
|
226
237
|
m.names.set(orig, imported.imported);
|
|
227
238
|
continue;
|
|
228
239
|
}
|
|
@@ -244,6 +255,8 @@ class TSModuleGraph {
|
|
|
244
255
|
}
|
|
245
256
|
importedNames.set(imported.imported, name);
|
|
246
257
|
}
|
|
258
|
+
|
|
259
|
+
// @ts-expect-error TS2339
|
|
247
260
|
m.names.set(orig, name);
|
|
248
261
|
}
|
|
249
262
|
return exportedNames;
|
|
@@ -98,14 +98,16 @@ var _default = exports.default = new (_plugin().Transformer)({
|
|
|
98
98
|
incremental: false
|
|
99
99
|
};
|
|
100
100
|
let host = new (_tsUtils().CompilerHost)(options.inputFS, _typescript().default, logger);
|
|
101
|
-
//
|
|
101
|
+
// @ts-expect-error TS2345
|
|
102
102
|
let program = _typescript().default.createProgram([asset.filePath], opts, host);
|
|
103
103
|
for (let file of program.getSourceFiles()) {
|
|
104
104
|
if (_path().default.normalize(file.fileName) !== asset.filePath) {
|
|
105
105
|
asset.invalidateOnFileChange(host.redirectTypes.get(file.fileName) ?? file.fileName);
|
|
106
106
|
}
|
|
107
107
|
}
|
|
108
|
-
let mainModuleName = (0, _utils().normalizeSeparators)(_path().default
|
|
108
|
+
let mainModuleName = (0, _utils().normalizeSeparators)(_path().default
|
|
109
|
+
// @ts-expect-error TS2339
|
|
110
|
+
.relative(program.getCommonSourceDirectory(), asset.filePath).slice(0, -_path().default.extname(asset.filePath).length));
|
|
109
111
|
let moduleGraph = new _TSModuleGraph.TSModuleGraph(mainModuleName);
|
|
110
112
|
let emitResult = program.emit(undefined, undefined, undefined, true, {
|
|
111
113
|
afterDeclarations: [
|
|
@@ -120,6 +122,7 @@ var _default = exports.default = new (_plugin().Transformer)({
|
|
|
120
122
|
});
|
|
121
123
|
let diagnostics = _typescript().default.getPreEmitDiagnostics(program).concat(emitResult.diagnostics);
|
|
122
124
|
let diagnosticIds = new Set();
|
|
125
|
+
// @ts-expect-error TS2304
|
|
123
126
|
let deduplicatedDiagnostics = [];
|
|
124
127
|
for (let d of diagnostics) {
|
|
125
128
|
if (d.start != null && d.length != null && d.messageText != null) {
|
|
@@ -144,8 +147,6 @@ var _default = exports.default = new (_plugin().Transformer)({
|
|
|
144
147
|
if (file.fileName) {
|
|
145
148
|
filename = file.fileName;
|
|
146
149
|
}
|
|
147
|
-
|
|
148
|
-
// $FlowFixMe
|
|
149
150
|
if (source) {
|
|
150
151
|
let lineChar = file.getLineAndCharacterOfPosition(diagnostic.start);
|
|
151
152
|
let start = {
|
|
@@ -191,6 +192,7 @@ var _default = exports.default = new (_plugin().Transformer)({
|
|
|
191
192
|
let code = (0, _nullthrows().default)(host.outputCode);
|
|
192
193
|
code = code.substring(0, code.lastIndexOf('//# sourceMappingURL'));
|
|
193
194
|
let map = JSON.parse((0, _nullthrows().default)(host.outputMap));
|
|
195
|
+
// @ts-expect-error TS7006
|
|
194
196
|
map.sources = map.sources.map(source => _path().default.join(_path().default.dirname(asset.filePath), source));
|
|
195
197
|
let sourceMap = null;
|
|
196
198
|
if (map.mappings) {
|
package/lib/collect.d.ts
ADDED
package/lib/collect.js
CHANGED
|
@@ -33,6 +33,7 @@ function collect(moduleGraph, context, sourceFile) {
|
|
|
33
33
|
let _currentModule;
|
|
34
34
|
let visit = node => {
|
|
35
35
|
if (_typescript().default.isBundle(node)) {
|
|
36
|
+
// @ts-expect-error TS2345
|
|
36
37
|
return factory.updateBundle(node, _typescript().default.visitNodes(node.sourceFiles, visit));
|
|
37
38
|
}
|
|
38
39
|
if (_typescript().default.isModuleDeclaration(node)) {
|
|
@@ -46,28 +47,43 @@ function collect(moduleGraph, context, sourceFile) {
|
|
|
46
47
|
let currentModule = (0, _nullthrows().default)(_currentModule);
|
|
47
48
|
if (_typescript().default.isImportDeclaration(node) && node.importClause) {
|
|
48
49
|
if (node.importClause.namedBindings) {
|
|
50
|
+
// @ts-expect-error TS2339
|
|
49
51
|
if (node.importClause.namedBindings.elements) {
|
|
52
|
+
// @ts-expect-error TS2339
|
|
50
53
|
for (let element of node.importClause.namedBindings.elements) {
|
|
51
|
-
currentModule.addImport(element.name.text,
|
|
54
|
+
currentModule.addImport(element.name.text,
|
|
55
|
+
// @ts-expect-error TS2339
|
|
56
|
+
node.moduleSpecifier.text, (element.propertyName ?? element.name).text);
|
|
52
57
|
}
|
|
58
|
+
// @ts-expect-error TS2339
|
|
53
59
|
} else if (node.importClause.namedBindings.name) {
|
|
54
|
-
currentModule.addImport(
|
|
60
|
+
currentModule.addImport(
|
|
61
|
+
// @ts-expect-error TS2339
|
|
62
|
+
node.importClause.namedBindings.name.text,
|
|
63
|
+
// @ts-expect-error TS2339
|
|
64
|
+
node.moduleSpecifier.text, '*');
|
|
55
65
|
}
|
|
56
66
|
}
|
|
57
67
|
if (node.importClause.name) {
|
|
58
|
-
currentModule.addImport(node.importClause.name.text,
|
|
68
|
+
currentModule.addImport(node.importClause.name.text,
|
|
69
|
+
// @ts-expect-error TS2339
|
|
70
|
+
node.moduleSpecifier.text, 'default');
|
|
59
71
|
}
|
|
60
72
|
}
|
|
61
73
|
if (_typescript().default.isExportDeclaration(node)) {
|
|
62
74
|
if (node.exportClause) {
|
|
75
|
+
// @ts-expect-error TS2339
|
|
63
76
|
for (let element of node.exportClause.elements) {
|
|
64
77
|
if (node.moduleSpecifier) {
|
|
65
|
-
currentModule.addExport(element.name.text, (element.propertyName ?? element.name).text,
|
|
78
|
+
currentModule.addExport(element.name.text, (element.propertyName ?? element.name).text,
|
|
79
|
+
// @ts-expect-error TS2339
|
|
80
|
+
node.moduleSpecifier.text);
|
|
66
81
|
} else {
|
|
67
82
|
currentModule.addExport(element.name.text, (element.propertyName ?? element.name).text);
|
|
68
83
|
}
|
|
69
84
|
}
|
|
70
85
|
} else {
|
|
86
|
+
// @ts-expect-error TS18048
|
|
71
87
|
currentModule.addWildcardExport(node.moduleSpecifier.text);
|
|
72
88
|
}
|
|
73
89
|
}
|
|
@@ -96,8 +112,10 @@ function collect(moduleGraph, context, sourceFile) {
|
|
|
96
112
|
if (_typescript().default.isVariableStatement(node) && node.modifiers) {
|
|
97
113
|
let isExported = node.modifiers.some(m => m.kind === _typescript().default.SyntaxKind.ExportKeyword);
|
|
98
114
|
for (let v of node.declarationList.declarations) {
|
|
115
|
+
// @ts-expect-error TS2339
|
|
99
116
|
currentModule.addLocal(v.name.text, v);
|
|
100
117
|
if (isExported) {
|
|
118
|
+
// @ts-expect-error TS2339
|
|
101
119
|
currentModule.addExport(v.name.text, v.name.text);
|
|
102
120
|
}
|
|
103
121
|
}
|
|
@@ -116,13 +134,19 @@ function collect(moduleGraph, context, sourceFile) {
|
|
|
116
134
|
// Traverse down an EntityName to the root identifier. Return that to use as the named import specifier,
|
|
117
135
|
// and collect the remaining parts into a new QualifiedName with the local replacement at the root.
|
|
118
136
|
// import('react').JSX.Element => import {JSX} from 'react'; JSX.Element
|
|
137
|
+
// @ts-expect-error TS7023
|
|
119
138
|
function getImportName(qualifier, local, factory) {
|
|
120
139
|
if (!qualifier) {
|
|
140
|
+
// @ts-expect-error TS2339
|
|
121
141
|
return ['*', factory.createIdentifier(local)];
|
|
122
142
|
}
|
|
123
143
|
if (qualifier.kind === _typescript().default.SyntaxKind.Identifier) {
|
|
144
|
+
// @ts-expect-error TS2339
|
|
124
145
|
return [qualifier.text, factory.createIdentifier(local)];
|
|
125
146
|
}
|
|
147
|
+
|
|
148
|
+
// @ts-expect-error TS7022
|
|
126
149
|
let [name, entity] = getImportName(qualifier.left, local, factory);
|
|
150
|
+
// @ts-expect-error TS2339
|
|
127
151
|
return [name, factory.createQualifiedName(entity, qualifier.right)];
|
|
128
152
|
}
|
package/lib/shake.d.ts
ADDED
package/lib/shake.js
CHANGED
|
@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.shake = shake;
|
|
7
|
-
var _TSModule = require("./TSModule");
|
|
8
7
|
function _typescript() {
|
|
9
8
|
const data = _interopRequireDefault(require("typescript"));
|
|
10
9
|
_typescript = function () {
|
|
@@ -43,6 +42,7 @@ function shake(moduleGraph, context, sourceFile) {
|
|
|
43
42
|
let _currentModule;
|
|
44
43
|
let visit = node => {
|
|
45
44
|
if (_typescript().default.isBundle(node)) {
|
|
45
|
+
// @ts-expect-error TS2345
|
|
46
46
|
return factory.updateBundle(node, _typescript().default.visitNodes(node.sourceFiles, visit));
|
|
47
47
|
}
|
|
48
48
|
|
|
@@ -53,14 +53,19 @@ function shake(moduleGraph, context, sourceFile) {
|
|
|
53
53
|
var _node$modifiers$;
|
|
54
54
|
// Since we are hoisting them to the top-level scope, we need to add a "declare" keyword to make them ambient.
|
|
55
55
|
// we also want the declare keyword to come after the export keyword to guarantee a valid typings file.
|
|
56
|
+
// @ts-expect-error TS2540
|
|
56
57
|
node.modifiers ??= [];
|
|
57
|
-
const index =
|
|
58
|
+
const index =
|
|
59
|
+
// @ts-expect-error TS18048
|
|
60
|
+
((_node$modifiers$ = node.modifiers[0]) === null || _node$modifiers$ === void 0 ? void 0 : _node$modifiers$.kind) === _typescript().default.SyntaxKind.ExportKeyword ? 1 : 0;
|
|
61
|
+
// @ts-expect-error TS18048
|
|
58
62
|
node.modifiers.splice(index, 0, factory.createModifier(_typescript().default.SyntaxKind.DeclareKeyword));
|
|
59
63
|
return node;
|
|
60
64
|
}
|
|
61
65
|
moduleStack.push(_currentModule);
|
|
62
66
|
let isFirstModule = !_currentModule;
|
|
63
67
|
_currentModule = moduleGraph.getModule(node.name.text);
|
|
68
|
+
// @ts-expect-error TS2532
|
|
64
69
|
let statements = _typescript().default.visitEachChild(node, visit, context).body.statements;
|
|
65
70
|
_currentModule = moduleStack.pop();
|
|
66
71
|
if (isFirstModule && !addedGeneratedImports) {
|
|
@@ -80,10 +85,13 @@ function shake(moduleGraph, context, sourceFile) {
|
|
|
80
85
|
let currentModule = (0, _nullthrows().default)(_currentModule);
|
|
81
86
|
// Remove exports from flattened modules
|
|
82
87
|
if (_typescript().default.isExportDeclaration(node)) {
|
|
83
|
-
if (!node.moduleSpecifier ||
|
|
88
|
+
if (!node.moduleSpecifier ||
|
|
89
|
+
// @ts-expect-error TS2339
|
|
90
|
+
moduleGraph.getModule(node.moduleSpecifier.text)) {
|
|
84
91
|
if (!node.moduleSpecifier && node.exportClause) {
|
|
85
92
|
// Filter exported elements to only external re-exports
|
|
86
93
|
let exported = [];
|
|
94
|
+
// @ts-expect-error TS2339
|
|
87
95
|
for (let element of node.exportClause.elements) {
|
|
88
96
|
let name = (element.propertyName ?? element.name).text;
|
|
89
97
|
if (exportedNames.get(name) === currentModule && !currentModule.hasBinding(name)) {
|
|
@@ -122,7 +130,9 @@ function shake(moduleGraph, context, sourceFile) {
|
|
|
122
130
|
}
|
|
123
131
|
|
|
124
132
|
// Remove original export modifiers
|
|
125
|
-
node.modifiers = (node.modifiers || []).filter(
|
|
133
|
+
node.modifiers = (node.modifiers || []).filter(
|
|
134
|
+
// @ts-expect-error TS7006
|
|
135
|
+
m => m.kind !== _typescript().default.SyntaxKind.ExportKeyword && m.kind !== _typescript().default.SyntaxKind.DefaultKeyword);
|
|
126
136
|
|
|
127
137
|
// Rename declarations
|
|
128
138
|
let newName = currentModule.getName(name);
|
|
@@ -137,6 +147,7 @@ function shake(moduleGraph, context, sourceFile) {
|
|
|
137
147
|
}
|
|
138
148
|
node.modifiers.unshift(factory.createModifier(_typescript().default.SyntaxKind.ExportKeyword));
|
|
139
149
|
} else if (_typescript().default.isFunctionDeclaration(node) || _typescript().default.isClassDeclaration(node)) {
|
|
150
|
+
// @ts-expect-error TS18048
|
|
140
151
|
node.modifiers.unshift(factory.createModifier(_typescript().default.SyntaxKind.DeclareKeyword));
|
|
141
152
|
}
|
|
142
153
|
}
|
|
@@ -149,10 +160,14 @@ function shake(moduleGraph, context, sourceFile) {
|
|
|
149
160
|
}
|
|
150
161
|
|
|
151
162
|
// Remove original export modifiers
|
|
152
|
-
node.modifiers = (node.modifiers || []).filter(
|
|
163
|
+
node.modifiers = (node.modifiers || []).filter(
|
|
164
|
+
// @ts-expect-error TS7006
|
|
165
|
+
m => m.kind !== _typescript().default.SyntaxKind.ExportKeyword && m.kind !== _typescript().default.SyntaxKind.DeclareKeyword);
|
|
153
166
|
|
|
154
167
|
// Add export modifier if all declarations are exported.
|
|
155
|
-
let isExported = node.declarationList.declarations.every(
|
|
168
|
+
let isExported = node.declarationList.declarations.every(
|
|
169
|
+
// @ts-expect-error TS7006
|
|
170
|
+
d => exportedNames.get(d.name.text) === currentModule);
|
|
156
171
|
if (isExported) {
|
|
157
172
|
node.modifiers.unshift(factory.createModifier(_typescript().default.SyntaxKind.ExportKeyword));
|
|
158
173
|
} else {
|
|
@@ -163,6 +178,7 @@ function shake(moduleGraph, context, sourceFile) {
|
|
|
163
178
|
}
|
|
164
179
|
if (_typescript().default.isVariableDeclaration(node)) {
|
|
165
180
|
// Remove unused variables
|
|
181
|
+
// @ts-expect-error TS2339
|
|
166
182
|
if (!currentModule.used.has(node.name.text)) {
|
|
167
183
|
return null;
|
|
168
184
|
}
|
|
@@ -198,10 +214,12 @@ function shake(moduleGraph, context, sourceFile) {
|
|
|
198
214
|
return _typescript().default.visitNode(sourceFile, visit);
|
|
199
215
|
}
|
|
200
216
|
function generateImports(factory, moduleGraph) {
|
|
217
|
+
// @ts-expect-error TS2304
|
|
201
218
|
let importStatements = [];
|
|
202
219
|
for (let [specifier, names] of moduleGraph.getAllImports()) {
|
|
203
220
|
let defaultSpecifier;
|
|
204
221
|
let namespaceSpecifier;
|
|
222
|
+
// @ts-expect-error TS2304
|
|
205
223
|
let namedSpecifiers = [];
|
|
206
224
|
for (let [name, imported] of names) {
|
|
207
225
|
if (imported === 'default') {
|
package/lib/utils.d.ts
ADDED
package/lib/utils.js
CHANGED
|
@@ -17,9 +17,13 @@ function getExportedName(node) {
|
|
|
17
17
|
if (!node.modifiers) {
|
|
18
18
|
return null;
|
|
19
19
|
}
|
|
20
|
+
|
|
21
|
+
// @ts-expect-error TS7006
|
|
20
22
|
if (!node.modifiers.some(m => m.kind === _typescript().default.SyntaxKind.ExportKeyword)) {
|
|
21
23
|
return null;
|
|
22
24
|
}
|
|
25
|
+
|
|
26
|
+
// @ts-expect-error TS7006
|
|
23
27
|
if (node.modifiers.some(m => m.kind === _typescript().default.SyntaxKind.DefaultKeyword)) {
|
|
24
28
|
return 'default';
|
|
25
29
|
}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import type { ExportDeclaration, Expression, Identifier, ImportClause, ImportDeclaration, ImportSpecifier, Modifier, NamedImportBindings } from 'typescript';
|
|
2
|
+
type AssertClause = any;
|
|
3
|
+
type NamedExportBindings = any;
|
|
4
|
+
export declare const createImportClause: (factory: any, isTypeOnly: boolean, name: Identifier | undefined, namedBindings: NamedImportBindings | undefined) => ImportClause;
|
|
5
|
+
export declare const createImportDeclaration: (factory: any, modifiers: Modifier[] | undefined, importClause: ImportClause | undefined, moduleSpecifier: Expression, assertClause: AssertClause) => ImportDeclaration;
|
|
6
|
+
export declare const createImportSpecifier: (factory: any, isTypeOnly: boolean, propertyName: Identifier | undefined, name: Identifier) => ImportSpecifier;
|
|
7
|
+
export declare const updateExportDeclaration: (factory: any, node: ExportDeclaration, modifiers: Modifier[] | undefined, isTypeOnly: boolean, exportClause: NamedExportBindings | undefined, moduleSpecifier: Expression | undefined, assertClause: AssertClause | undefined) => ExportDeclaration;
|
|
8
|
+
export {};
|
package/lib/wrappers.js
CHANGED
|
@@ -20,6 +20,7 @@ function _assert() {
|
|
|
20
20
|
}
|
|
21
21
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
22
22
|
/* eslint-disable no-unused-vars */
|
|
23
|
+
|
|
23
24
|
const [majorVersion, minorVersion] = _typescript().default.versionMajorMinor.split('.').map(num => parseInt(num, 10));
|
|
24
25
|
|
|
25
26
|
// Everything below was generated using https://github.com/mischnic/tsc-version-wrapper
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaspack/transformer-typescript-types",
|
|
3
|
-
"version": "2.14.
|
|
3
|
+
"version": "2.14.22-typescript-5ad950d33.0",
|
|
4
4
|
"license": "(MIT OR Apache-2.0)",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public"
|
|
@@ -9,17 +9,18 @@
|
|
|
9
9
|
"type": "git",
|
|
10
10
|
"url": "https://github.com/atlassian-labs/atlaspack.git"
|
|
11
11
|
},
|
|
12
|
-
"main": "lib/TSTypesTransformer.js",
|
|
13
|
-
"source": "src/TSTypesTransformer.
|
|
12
|
+
"main": "./lib/TSTypesTransformer.js",
|
|
13
|
+
"source": "./src/TSTypesTransformer.ts",
|
|
14
|
+
"types": "./lib/TSTypesTransformer.d.ts",
|
|
14
15
|
"engines": {
|
|
15
16
|
"node": ">= 16.0.0"
|
|
16
17
|
},
|
|
17
18
|
"dependencies": {
|
|
18
|
-
"@atlaspack/diagnostic": "2.14.
|
|
19
|
-
"@atlaspack/plugin": "2.14.
|
|
19
|
+
"@atlaspack/diagnostic": "2.14.2-typescript-5ad950d33.0",
|
|
20
|
+
"@atlaspack/plugin": "2.14.22-typescript-5ad950d33.0",
|
|
21
|
+
"@atlaspack/ts-utils": "2.14.2-typescript-5ad950d33.0",
|
|
22
|
+
"@atlaspack/utils": "2.17.4-typescript-5ad950d33.0",
|
|
20
23
|
"@parcel/source-map": "^2.1.1",
|
|
21
|
-
"@atlaspack/ts-utils": "2.14.1",
|
|
22
|
-
"@atlaspack/utils": "2.17.3",
|
|
23
24
|
"nullthrows": "^1.1.1"
|
|
24
25
|
},
|
|
25
26
|
"devDependencies": {
|
|
@@ -28,5 +29,9 @@
|
|
|
28
29
|
"peerDependencies": {
|
|
29
30
|
"typescript": ">=3.0.0"
|
|
30
31
|
},
|
|
31
|
-
"type": "commonjs"
|
|
32
|
-
|
|
32
|
+
"type": "commonjs",
|
|
33
|
+
"scripts": {
|
|
34
|
+
"check-ts": "tsc --emitDeclarationOnly --rootDir src"
|
|
35
|
+
},
|
|
36
|
+
"gitHead": "5ad950d33a5f2255ebeb10c04a2e84c346e2de85"
|
|
37
|
+
}
|