@openrewrite/rewrite 8.66.3 → 8.66.4
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/java/type.d.ts +6 -3
- package/dist/java/type.d.ts.map +1 -1
- package/dist/java/type.js +51 -5
- package/dist/java/type.js.map +1 -1
- package/dist/javascript/add-import.d.ts +18 -2
- package/dist/javascript/add-import.d.ts.map +1 -1
- package/dist/javascript/add-import.js +49 -15
- package/dist/javascript/add-import.js.map +1 -1
- package/dist/javascript/format.d.ts +1 -0
- package/dist/javascript/format.d.ts.map +1 -1
- package/dist/javascript/format.js +45 -2
- package/dist/javascript/format.js.map +1 -1
- package/dist/javascript/parser.d.ts +2 -1
- package/dist/javascript/parser.d.ts.map +1 -1
- package/dist/javascript/parser.js +7 -3
- package/dist/javascript/parser.js.map +1 -1
- package/dist/javascript/remove-import.d.ts +20 -2
- package/dist/javascript/remove-import.d.ts.map +1 -1
- package/dist/javascript/remove-import.js +121 -11
- package/dist/javascript/remove-import.js.map +1 -1
- package/dist/javascript/type-mapping.d.ts +17 -0
- package/dist/javascript/type-mapping.d.ts.map +1 -1
- package/dist/javascript/type-mapping.js +241 -44
- package/dist/javascript/type-mapping.js.map +1 -1
- package/dist/rpc/rewrite-rpc.js +1 -1
- package/dist/rpc/rewrite-rpc.js.map +1 -1
- package/dist/rpc/server.js +1 -1
- package/dist/rpc/server.js.map +1 -1
- package/dist/version.txt +1 -1
- package/package.json +1 -1
- package/src/java/type.ts +57 -5
- package/src/javascript/add-import.ts +55 -15
- package/src/javascript/format.ts +44 -3
- package/src/javascript/parser.ts +7 -3
- package/src/javascript/remove-import.ts +114 -11
- package/src/javascript/type-mapping.ts +282 -56
- package/src/rpc/rewrite-rpc.ts +1 -1
- package/src/rpc/server.ts +1 -1
package/dist/java/type.d.ts
CHANGED
|
@@ -98,9 +98,9 @@ export declare namespace Type {
|
|
|
98
98
|
}
|
|
99
99
|
namespace GenericTypeVariable {
|
|
100
100
|
const enum Variance {
|
|
101
|
-
Covariant =
|
|
102
|
-
Contravariant =
|
|
103
|
-
Invariant =
|
|
101
|
+
Covariant = "Covariant",
|
|
102
|
+
Contravariant = "Contravariant",
|
|
103
|
+
Invariant = "Invariant"
|
|
104
104
|
}
|
|
105
105
|
}
|
|
106
106
|
interface Array extends Type, FullyQualified {
|
|
@@ -146,6 +146,9 @@ export declare namespace Type {
|
|
|
146
146
|
function isMethod(type?: Type): type is Type.Method;
|
|
147
147
|
function isArray(type?: Type): type is Type.Array;
|
|
148
148
|
function isParameterized(type?: Type): type is Type.Parameterized;
|
|
149
|
+
function isGenericTypeVariable(type?: Type): type is Type.GenericTypeVariable;
|
|
150
|
+
function isUnion(type?: Type): type is Type.Union;
|
|
151
|
+
function isIntersection(type?: Type): type is Type.Intersection;
|
|
149
152
|
function isFullyQualified(type?: Type): type is Type.FullyQualified;
|
|
150
153
|
interface FullyQualified extends Type {
|
|
151
154
|
}
|
package/dist/java/type.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../src/java/type.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../src/java/type.ts"],"names":[],"mappings":"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"}
|
package/dist/java/type.js
CHANGED
|
@@ -53,9 +53,9 @@ var Type;
|
|
|
53
53
|
(function (GenericTypeVariable) {
|
|
54
54
|
let Variance;
|
|
55
55
|
(function (Variance) {
|
|
56
|
-
Variance[
|
|
57
|
-
Variance[
|
|
58
|
-
Variance[
|
|
56
|
+
Variance["Covariant"] = "Covariant";
|
|
57
|
+
Variance["Contravariant"] = "Contravariant";
|
|
58
|
+
Variance["Invariant"] = "Invariant";
|
|
59
59
|
})(Variance = GenericTypeVariable.Variance || (GenericTypeVariable.Variance = {}));
|
|
60
60
|
})(GenericTypeVariable = Type.GenericTypeVariable || (Type.GenericTypeVariable = {}));
|
|
61
61
|
class Primitive {
|
|
@@ -151,6 +151,18 @@ var Type;
|
|
|
151
151
|
return (type === null || type === void 0 ? void 0 : type.kind) === Type.Kind.Parameterized;
|
|
152
152
|
}
|
|
153
153
|
Type.isParameterized = isParameterized;
|
|
154
|
+
function isGenericTypeVariable(type) {
|
|
155
|
+
return (type === null || type === void 0 ? void 0 : type.kind) === Type.Kind.GenericTypeVariable;
|
|
156
|
+
}
|
|
157
|
+
Type.isGenericTypeVariable = isGenericTypeVariable;
|
|
158
|
+
function isUnion(type) {
|
|
159
|
+
return (type === null || type === void 0 ? void 0 : type.kind) === Type.Kind.Union;
|
|
160
|
+
}
|
|
161
|
+
Type.isUnion = isUnion;
|
|
162
|
+
function isIntersection(type) {
|
|
163
|
+
return (type === null || type === void 0 ? void 0 : type.kind) === Type.Kind.Intersection;
|
|
164
|
+
}
|
|
165
|
+
Type.isIntersection = isIntersection;
|
|
154
166
|
function isFullyQualified(type) {
|
|
155
167
|
return type != null && (type.kind === Type.Kind.Class ||
|
|
156
168
|
type.kind === Type.Kind.Annotation ||
|
|
@@ -181,6 +193,8 @@ var Type;
|
|
|
181
193
|
// Track type variable names and parameterized types to prevent infinite recursion
|
|
182
194
|
let typeVariableNameStack = null;
|
|
183
195
|
let parameterizedStack = null;
|
|
196
|
+
let unionStack = null;
|
|
197
|
+
let intersectionStack = null;
|
|
184
198
|
function signature(type) {
|
|
185
199
|
if (!type) {
|
|
186
200
|
return "<null>";
|
|
@@ -233,7 +247,23 @@ var Type;
|
|
|
233
247
|
}
|
|
234
248
|
case Type.Kind.Intersection: {
|
|
235
249
|
const intersection = type;
|
|
236
|
-
|
|
250
|
+
// Initialize stack if needed
|
|
251
|
+
if (intersectionStack === null) {
|
|
252
|
+
intersectionStack = new Set();
|
|
253
|
+
}
|
|
254
|
+
// Check for recursion
|
|
255
|
+
if (intersectionStack.has(intersection)) {
|
|
256
|
+
return "<cyclic intersection>";
|
|
257
|
+
}
|
|
258
|
+
// Add to stack to track cycles
|
|
259
|
+
intersectionStack.add(intersection);
|
|
260
|
+
try {
|
|
261
|
+
return (intersection.bounds || []).map(b => signature(b)).join(" & ");
|
|
262
|
+
}
|
|
263
|
+
finally {
|
|
264
|
+
// Remove from stack when done
|
|
265
|
+
intersectionStack.delete(intersection);
|
|
266
|
+
}
|
|
237
267
|
}
|
|
238
268
|
case Type.Kind.Method: {
|
|
239
269
|
const method = type;
|
|
@@ -268,7 +298,23 @@ var Type;
|
|
|
268
298
|
}
|
|
269
299
|
case Type.Kind.Union: {
|
|
270
300
|
const union = type;
|
|
271
|
-
|
|
301
|
+
// Initialize stack if needed
|
|
302
|
+
if (unionStack === null) {
|
|
303
|
+
unionStack = new Set();
|
|
304
|
+
}
|
|
305
|
+
// Check for recursion
|
|
306
|
+
if (unionStack.has(union)) {
|
|
307
|
+
return "<cyclic union>";
|
|
308
|
+
}
|
|
309
|
+
// Add to stack to track cycles
|
|
310
|
+
unionStack.add(union);
|
|
311
|
+
try {
|
|
312
|
+
return (union.bounds || []).map(b => signature(b)).join(" | ");
|
|
313
|
+
}
|
|
314
|
+
finally {
|
|
315
|
+
// Remove from stack when done
|
|
316
|
+
unionStack.delete(union);
|
|
317
|
+
}
|
|
272
318
|
}
|
|
273
319
|
case Type.Kind.Unknown: {
|
|
274
320
|
return "<unknown>";
|
package/dist/java/type.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"type.js","sourceRoot":"","sources":["../../src/java/type.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"type.js","sourceRoot":"","sources":["../../src/java/type.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,9 +11,13 @@ export interface AddImportOptions {
|
|
|
11
11
|
/** The module name (e.g., 'fs') to import from */
|
|
12
12
|
target: string;
|
|
13
13
|
/** Optionally, the specific member to import from the module.
|
|
14
|
-
* If not specified, adds a default import or namespace import
|
|
14
|
+
* If not specified, adds a default import or namespace import.
|
|
15
|
+
* Special values:
|
|
16
|
+
* - 'default': Adds a default import from the target module.
|
|
17
|
+
* When using 'default', the `alias` parameter is required. */
|
|
15
18
|
member?: string;
|
|
16
|
-
/** Optional alias for the imported member
|
|
19
|
+
/** Optional alias for the imported member.
|
|
20
|
+
* Required when member is 'default'. */
|
|
17
21
|
alias?: string;
|
|
18
22
|
/** If true, only add the import if the member is actually used in the file. Default: true */
|
|
19
23
|
onlyIfReferenced?: boolean;
|
|
@@ -24,6 +28,18 @@ export interface AddImportOptions {
|
|
|
24
28
|
* Register an AddImport visitor to add an import statement to a JavaScript/TypeScript file
|
|
25
29
|
* @param visitor The visitor to add the import addition to
|
|
26
30
|
* @param options Configuration options for the import to add
|
|
31
|
+
*
|
|
32
|
+
* @example
|
|
33
|
+
* // Add a named import
|
|
34
|
+
* maybeAddImport(visitor, { target: 'fs', member: 'readFile' });
|
|
35
|
+
*
|
|
36
|
+
* @example
|
|
37
|
+
* // Add a default import using the 'default' member specifier
|
|
38
|
+
* maybeAddImport(visitor, { target: 'react', member: 'default', alias: 'React' });
|
|
39
|
+
*
|
|
40
|
+
* @example
|
|
41
|
+
* // Add a default import (legacy way, without specifying member)
|
|
42
|
+
* maybeAddImport(visitor, { target: 'react', alias: 'React' });
|
|
27
43
|
*/
|
|
28
44
|
export declare function maybeAddImport(visitor: JavaScriptVisitor<any>, options: AddImportOptions): void;
|
|
29
45
|
export declare class AddImport<P> extends JavaScriptVisitor<P> {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-import.d.ts","sourceRoot":"","sources":["../../src/javascript/add-import.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,iBAAiB,EAAC,MAAM,WAAW,CAAC;AAC5C,OAAO,EAAC,CAAC,EAA+D,MAAM,SAAS,CAAC;AACxF,OAAO,EAAC,EAAE,EAAC,MAAM,QAAQ,CAAC;AAK1B,oBAAY,WAAW;IACnB,QAAQ,IAAA,CAAO,6BAA6B;IAC5C,YAAY,IAAA,CAAG,8BAA8B;IAC7C,UAAU,IAAA,CAAK,yBAAyB;IACxC,QAAQ,IAAA;CACX;AAED,MAAM,WAAW,gBAAgB;IAC7B,kDAAkD;IAClD,MAAM,EAAE,MAAM,CAAC;IAEf;
|
|
1
|
+
{"version":3,"file":"add-import.d.ts","sourceRoot":"","sources":["../../src/javascript/add-import.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,iBAAiB,EAAC,MAAM,WAAW,CAAC;AAC5C,OAAO,EAAC,CAAC,EAA+D,MAAM,SAAS,CAAC;AACxF,OAAO,EAAC,EAAE,EAAC,MAAM,QAAQ,CAAC;AAK1B,oBAAY,WAAW;IACnB,QAAQ,IAAA,CAAO,6BAA6B;IAC5C,YAAY,IAAA,CAAG,8BAA8B;IAC7C,UAAU,IAAA,CAAK,yBAAyB;IACxC,QAAQ,IAAA;CACX;AAED,MAAM,WAAW,gBAAgB;IAC7B,kDAAkD;IAClD,MAAM,EAAE,MAAM,CAAC;IAEf;;;;oEAIgE;IAChE,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;4CACwC;IACxC,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,6FAA6F;IAC7F,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAE3B,kGAAkG;IAClG,KAAK,CAAC,EAAE,WAAW,CAAC;CACvB;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,cAAc,CAC1B,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAC/B,OAAO,EAAE,gBAAgB,QAW5B;AAED,qBAAa,SAAS,CAAC,CAAC,CAAE,SAAQ,iBAAiB,CAAC,CAAC,CAAC;IAClD,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,gBAAgB,EAAE,OAAO,CAAC;IACnC,QAAQ,CAAC,KAAK,CAAC,EAAE,WAAW,CAAC;gBAEjB,OAAO,EAAE,gBAAgB;IAerC;;OAEG;IACH,OAAO,CAAC,aAAa;IAOrB;;OAEG;IACH,OAAO,CAAC,aAAa;IAKrB;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAkH5B;;OAEG;IACH,OAAO,CAAC,gCAAgC;IAiDzB,sBAAsB,CAAC,eAAe,EAAE,EAAE,CAAC,eAAe,EAAE,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAmGxG;;OAEG;YACW,0BAA0B;IAyExC;;OAEG;YACW,iBAAiB;IAuB/B;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAwDxB;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAoDzB;;OAEG;YACW,yBAAyB;IA6DvC;;OAEG;YACW,qBAAqB;IAwFnC;;OAEG;IACH,OAAO,CAAC,qBAAqB;IAgE7B;;OAEG;IACH,OAAO,CAAC,qBAAqB;IAqB7B;;OAEG;IACH,OAAO,CAAC,wBAAwB;IAsBhC;;OAEG;IACH,OAAO,CAAC,wBAAwB;IAchC;;OAEG;IACH,OAAO,CAAC,aAAa;IAcrB;;OAEG;IACH,OAAO,CAAC,cAAc;CAUzB"}
|
|
@@ -28,6 +28,18 @@ var ImportStyle;
|
|
|
28
28
|
* Register an AddImport visitor to add an import statement to a JavaScript/TypeScript file
|
|
29
29
|
* @param visitor The visitor to add the import addition to
|
|
30
30
|
* @param options Configuration options for the import to add
|
|
31
|
+
*
|
|
32
|
+
* @example
|
|
33
|
+
* // Add a named import
|
|
34
|
+
* maybeAddImport(visitor, { target: 'fs', member: 'readFile' });
|
|
35
|
+
*
|
|
36
|
+
* @example
|
|
37
|
+
* // Add a default import using the 'default' member specifier
|
|
38
|
+
* maybeAddImport(visitor, { target: 'react', member: 'default', alias: 'React' });
|
|
39
|
+
*
|
|
40
|
+
* @example
|
|
41
|
+
* // Add a default import (legacy way, without specifying member)
|
|
42
|
+
* maybeAddImport(visitor, { target: 'react', alias: 'React' });
|
|
31
43
|
*/
|
|
32
44
|
function maybeAddImport(visitor, options) {
|
|
33
45
|
for (const v of visitor.afterVisit || []) {
|
|
@@ -44,6 +56,10 @@ class AddImport extends visitor_1.JavaScriptVisitor {
|
|
|
44
56
|
constructor(options) {
|
|
45
57
|
var _a;
|
|
46
58
|
super();
|
|
59
|
+
// Validate that alias is provided when member is 'default'
|
|
60
|
+
if (options.member === 'default' && !options.alias) {
|
|
61
|
+
throw new Error("When member is 'default', the alias parameter is required");
|
|
62
|
+
}
|
|
47
63
|
this.target = options.target;
|
|
48
64
|
this.member = options.member;
|
|
49
65
|
this.alias = options.alias;
|
|
@@ -95,8 +111,8 @@ class AddImport extends visitor_1.JavaScriptVisitor {
|
|
|
95
111
|
}
|
|
96
112
|
// For .mjs or TypeScript, prefer ES6
|
|
97
113
|
if (sourcePath.endsWith('.mjs') || isTypeScript) {
|
|
98
|
-
// If we're importing a member, use named imports
|
|
99
|
-
if (this.member !== undefined) {
|
|
114
|
+
// If we're importing a member (but not 'default'), use named imports
|
|
115
|
+
if (this.member !== undefined && this.member !== 'default') {
|
|
100
116
|
return ImportStyle.ES6Named;
|
|
101
117
|
}
|
|
102
118
|
// Otherwise default import
|
|
@@ -149,8 +165,8 @@ class AddImport extends visitor_1.JavaScriptVisitor {
|
|
|
149
165
|
if (hasCommonJSRequires && !hasNamedImports && !hasNamespaceImports && !hasDefaultImports) {
|
|
150
166
|
return ImportStyle.CommonJS;
|
|
151
167
|
}
|
|
152
|
-
// If importing a member, prefer named imports if they exist in the file
|
|
153
|
-
if (this.member !== undefined) {
|
|
168
|
+
// If importing a member (but not 'default'), prefer named imports if they exist in the file
|
|
169
|
+
if (this.member !== undefined && this.member !== 'default') {
|
|
154
170
|
if (hasNamedImports) {
|
|
155
171
|
return ImportStyle.ES6Named;
|
|
156
172
|
}
|
|
@@ -159,7 +175,7 @@ class AddImport extends visitor_1.JavaScriptVisitor {
|
|
|
159
175
|
}
|
|
160
176
|
}
|
|
161
177
|
// For default/whole module imports
|
|
162
|
-
if (this.member === undefined) {
|
|
178
|
+
if (this.member === undefined || this.member === 'default') {
|
|
163
179
|
if (hasNamespaceImports) {
|
|
164
180
|
return ImportStyle.ES6Namespace;
|
|
165
181
|
}
|
|
@@ -167,8 +183,10 @@ class AddImport extends visitor_1.JavaScriptVisitor {
|
|
|
167
183
|
return ImportStyle.ES6Default;
|
|
168
184
|
}
|
|
169
185
|
}
|
|
170
|
-
// Default to named imports for members, default imports for modules
|
|
171
|
-
return this.member !== undefined
|
|
186
|
+
// Default to named imports for members (except 'default'), default imports for modules
|
|
187
|
+
return (this.member !== undefined && this.member !== 'default')
|
|
188
|
+
? ImportStyle.ES6Named
|
|
189
|
+
: ImportStyle.ES6Default;
|
|
172
190
|
}
|
|
173
191
|
/**
|
|
174
192
|
* Find the import style used for an existing import from the same module
|
|
@@ -234,7 +252,8 @@ class AddImport extends visitor_1.JavaScriptVisitor {
|
|
|
234
252
|
// Determine the appropriate import style
|
|
235
253
|
const importStyle = this.determineImportStyle(compilationUnit);
|
|
236
254
|
// For ES6 named imports, check if we can merge into an existing import from the same module
|
|
237
|
-
|
|
255
|
+
// Don't try to merge default imports (member === 'default')
|
|
256
|
+
if (importStyle === ImportStyle.ES6Named && this.member !== undefined && this.member !== 'default') {
|
|
238
257
|
const mergedCu = yield this.tryMergeIntoExistingImport(compilationUnit, p);
|
|
239
258
|
if (mergedCu !== compilationUnit) {
|
|
240
259
|
return mergedCu;
|
|
@@ -383,7 +402,7 @@ class AddImport extends visitor_1.JavaScriptVisitor {
|
|
|
383
402
|
* Check if the import matches what we're trying to add
|
|
384
403
|
*/
|
|
385
404
|
isMatchingImport(jsImport) {
|
|
386
|
-
var _a, _b;
|
|
405
|
+
var _a, _b, _c;
|
|
387
406
|
// Check module specifier
|
|
388
407
|
const moduleSpecifier = (_a = jsImport.moduleSpecifier) === null || _a === void 0 ? void 0 : _a.element;
|
|
389
408
|
if (!moduleSpecifier) {
|
|
@@ -398,9 +417,18 @@ class AddImport extends visitor_1.JavaScriptVisitor {
|
|
|
398
417
|
return false;
|
|
399
418
|
}
|
|
400
419
|
// Check if the specific member or default import already exists
|
|
401
|
-
if (this.member === undefined) {
|
|
420
|
+
if (this.member === undefined || this.member === 'default') {
|
|
402
421
|
// We're adding a default import, check if one exists
|
|
403
|
-
|
|
422
|
+
// For member === 'default', also verify the alias matches if specified
|
|
423
|
+
if (importClause.name === undefined) {
|
|
424
|
+
return false;
|
|
425
|
+
}
|
|
426
|
+
// If we have an alias, check that it matches
|
|
427
|
+
if (this.alias && ((_b = importClause.name.element) === null || _b === void 0 ? void 0 : _b.kind) === java_1.J.Kind.Identifier) {
|
|
428
|
+
const existingName = importClause.name.element.simpleName;
|
|
429
|
+
return existingName === this.alias;
|
|
430
|
+
}
|
|
431
|
+
return true;
|
|
404
432
|
}
|
|
405
433
|
else {
|
|
406
434
|
// We're adding a named import, check if it exists
|
|
@@ -411,7 +439,7 @@ class AddImport extends visitor_1.JavaScriptVisitor {
|
|
|
411
439
|
if (namedBindings.kind === tree_1.JS.Kind.NamedImports) {
|
|
412
440
|
const namedImports = namedBindings;
|
|
413
441
|
for (const elem of namedImports.elements.elements) {
|
|
414
|
-
if (((
|
|
442
|
+
if (((_c = elem.element) === null || _c === void 0 ? void 0 : _c.kind) === tree_1.JS.Kind.ImportSpecifier) {
|
|
415
443
|
const specifier = elem.element;
|
|
416
444
|
const importName = this.getImportName(specifier);
|
|
417
445
|
const aliasName = this.getImportAlias(specifier);
|
|
@@ -450,11 +478,16 @@ class AddImport extends visitor_1.JavaScriptVisitor {
|
|
|
450
478
|
}
|
|
451
479
|
// Check if the variable name matches what we're trying to add
|
|
452
480
|
const pattern = namedVar.name;
|
|
453
|
-
if (this.member === undefined && (pattern === null || pattern === void 0 ? void 0 : pattern.kind) === java_1.J.Kind.Identifier) {
|
|
481
|
+
if ((this.member === undefined || this.member === 'default') && (pattern === null || pattern === void 0 ? void 0 : pattern.kind) === java_1.J.Kind.Identifier) {
|
|
454
482
|
// Default import style: const fs = require('fs')
|
|
483
|
+
// For member === 'default', also check the alias matches if specified
|
|
484
|
+
if (this.alias) {
|
|
485
|
+
const varName = pattern.simpleName;
|
|
486
|
+
return varName === this.alias;
|
|
487
|
+
}
|
|
455
488
|
return true;
|
|
456
489
|
}
|
|
457
|
-
else if (this.member !== undefined && (pattern === null || pattern === void 0 ? void 0 : pattern.kind) === tree_1.JS.Kind.ObjectBindingPattern) {
|
|
490
|
+
else if (this.member !== undefined && this.member !== 'default' && (pattern === null || pattern === void 0 ? void 0 : pattern.kind) === tree_1.JS.Kind.ObjectBindingPattern) {
|
|
458
491
|
// Destructured import: const { member } = require('module')
|
|
459
492
|
const objectPattern = pattern;
|
|
460
493
|
for (const elem of objectPattern.bindings.elements) {
|
|
@@ -565,8 +598,9 @@ class AddImport extends visitor_1.JavaScriptVisitor {
|
|
|
565
598
|
type: undefined
|
|
566
599
|
};
|
|
567
600
|
let importClause;
|
|
568
|
-
if (this.member === undefined) {
|
|
601
|
+
if (this.member === undefined || this.member === 'default') {
|
|
569
602
|
// Default import: import target from 'module'
|
|
603
|
+
// or: import alias from 'module' (when member === 'default')
|
|
570
604
|
const defaultName = {
|
|
571
605
|
id: (0, uuid_1.randomId)(),
|
|
572
606
|
kind: java_1.J.Kind.Identifier,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-import.js","sourceRoot":"","sources":["../../src/javascript/add-import.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"add-import.js","sourceRoot":"","sources":["../../src/javascript/add-import.ts"],"names":[],"mappings":";;;;;;;;;;;;AAqDA,wCAaC;AAlED,uCAA4C;AAC5C,kCAAwF;AACxF,iCAA0B;AAC1B,kCAAiC;AACjC,wCAAiD;AACjD,4CAA8C;AAE9C,IAAY,WAKX;AALD,WAAY,WAAW;IACnB,qDAAQ,CAAA;IACR,6DAAY,CAAA;IACZ,yDAAU,CAAA;IACV,qDAAQ,CAAA,CAAO,8BAA8B;AACjD,CAAC,EALW,WAAW,2BAAX,WAAW,QAKtB;AAwBD;;;;;;;;;;;;;;;;GAgBG;AACH,SAAgB,cAAc,CAC1B,OAA+B,EAC/B,OAAyB;IAEzB,KAAK,MAAM,CAAC,IAAI,OAAO,CAAC,UAAU,IAAI,EAAE,EAAE,CAAC;QACvC,IAAI,CAAC,YAAY,SAAS;YACtB,CAAC,CAAC,MAAM,KAAK,OAAO,CAAC,MAAM;YAC3B,CAAC,CAAC,MAAM,KAAK,OAAO,CAAC,MAAM;YAC3B,CAAC,CAAC,KAAK,KAAK,OAAO,CAAC,KAAK,EAAE,CAAC;YAC5B,OAAO;QACX,CAAC;IACL,CAAC;IACD,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;AACpD,CAAC;AAED,MAAa,SAAa,SAAQ,2BAAoB;IAOlD,YAAY,OAAyB;;QACjC,KAAK,EAAE,CAAC;QAER,2DAA2D;QAC3D,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;YACjD,MAAM,IAAI,KAAK,CAAC,2DAA2D,CAAC,CAAC;QACjF,CAAC;QAED,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAC7B,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAC7B,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;QAC3B,IAAI,CAAC,gBAAgB,GAAG,MAAA,OAAO,CAAC,gBAAgB,mCAAI,IAAI,CAAC;QACzD,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IAC/B,CAAC;IAED;;OAEG;IACK,aAAa,CAAC,eAAkB;;QACpC,IAAI,eAAe,CAAC,IAAI,KAAK,QAAC,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAC1C,OAAO,SAAS,CAAC;QACrB,CAAC;QACD,OAAO,MAAC,eAA6B,CAAC,KAAK,0CAAE,QAAQ,EAAE,CAAC;IAC5D,CAAC;IAED;;OAEG;IACK,aAAa,CAAC,SAA6B;;QAC/C,OAAO,CAAA,MAAA,SAAS,CAAC,IAAI,0CAAE,IAAI,MAAK,QAAC,CAAC,IAAI,CAAC,UAAU;YACzC,SAAS,CAAC,IAAqB,CAAC,UAAU,KAAK,SAAS,CAAC;IACrE,CAAC;IAED;;OAEG;IACK,oBAAoB,CAAC,eAAmC;;QAC5D,2CAA2C;QAC3C,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;YAC3B,OAAO,IAAI,CAAC,KAAK,CAAC;QACtB,CAAC;QAED,2CAA2C;QAC3C,MAAM,UAAU,GAAG,eAAe,CAAC,UAAU,CAAC;QAC9C,MAAM,YAAY,GAAG,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC;YAC3B,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC;YAC3B,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC;YAC3B,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAEhD,+CAA+C;QAC/C,IAAI,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YAC9B,OAAO,WAAW,CAAC,QAAQ,CAAC;QAChC,CAAC;QAED,iEAAiE;QACjE,uBAAuB;QACvB,MAAM,sBAAsB,GAAG,IAAI,CAAC,gCAAgC,CAAC,eAAe,CAAC,CAAC;QACtF,IAAI,sBAAsB,KAAK,IAAI,EAAE,CAAC;YAClC,OAAO,sBAAsB,CAAC;QAClC,CAAC;QAED,qCAAqC;QACrC,IAAI,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,YAAY,EAAE,CAAC;YAC9C,qEAAqE;YACrE,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;gBACzD,OAAO,WAAW,CAAC,QAAQ,CAAC;YAChC,CAAC;YACD,2BAA2B;YAC3B,OAAO,WAAW,CAAC,UAAU,CAAC;QAClC,CAAC;QAED,8DAA8D;QAC9D,IAAI,eAAe,GAAG,KAAK,CAAC;QAC5B,IAAI,mBAAmB,GAAG,KAAK,CAAC;QAChC,IAAI,iBAAiB,GAAG,KAAK,CAAC;QAC9B,IAAI,mBAAmB,GAAG,KAAK,CAAC;QAEhC,KAAK,MAAM,IAAI,IAAI,eAAe,CAAC,UAAU,EAAE,CAAC;YAC5C,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC;YAE/B,wBAAwB;YACxB,IAAI,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,IAAI,MAAK,SAAE,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;gBACrC,MAAM,QAAQ,GAAG,SAAsB,CAAC;gBACxC,MAAM,YAAY,GAAG,QAAQ,CAAC,YAAY,CAAC;gBAE3C,IAAI,YAAY,EAAE,CAAC;oBACf,2BAA2B;oBAC3B,IAAI,YAAY,CAAC,aAAa,EAAE,CAAC;wBAC7B,IAAI,YAAY,CAAC,aAAa,CAAC,IAAI,KAAK,SAAE,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;4BAC3D,eAAe,GAAG,IAAI,CAAC;wBAC3B,CAAC;6BAAM,IAAI,YAAY,CAAC,aAAa,CAAC,IAAI,KAAK,QAAC,CAAC,IAAI,CAAC,UAAU;4BACrD,YAAY,CAAC,aAAa,CAAC,IAAI,KAAK,SAAE,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;4BAC3D,8BAA8B;4BAC9B,mBAAmB,GAAG,IAAI,CAAC;wBAC/B,CAAC;oBACL,CAAC;oBAED,2BAA2B;oBAC3B,IAAI,YAAY,CAAC,IAAI,EAAE,CAAC;wBACpB,iBAAiB,GAAG,IAAI,CAAC;oBAC7B,CAAC;gBACL,CAAC;YACL,CAAC;YAED,8BAA8B;YAC9B,IAAI,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,IAAI,MAAK,QAAC,CAAC,IAAI,CAAC,oBAAoB,EAAE,CAAC;gBAClD,MAAM,OAAO,GAAG,SAAmC,CAAC;gBACpD,IAAI,OAAO,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBACjC,MAAM,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;oBAC9C,MAAM,WAAW,GAAG,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,WAAW,0CAAE,OAAO,CAAC;oBACnD,IAAI,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,IAAI,MAAK,QAAC,CAAC,IAAI,CAAC,gBAAgB;wBAC7C,IAAI,CAAC,aAAa,CAAC,WAAiC,CAAC,EAAE,CAAC;wBACxD,mBAAmB,GAAG,IAAI,CAAC;oBAC/B,CAAC;gBACL,CAAC;YACL,CAAC;QACL,CAAC;QAED,wCAAwC;QACxC,uCAAuC;QACvC,IAAI,mBAAmB,IAAI,CAAC,eAAe,IAAI,CAAC,mBAAmB,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACxF,OAAO,WAAW,CAAC,QAAQ,CAAC;QAChC,CAAC;QAED,4FAA4F;QAC5F,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YACzD,IAAI,eAAe,EAAE,CAAC;gBAClB,OAAO,WAAW,CAAC,QAAQ,CAAC;YAChC,CAAC;YACD,IAAI,mBAAmB,EAAE,CAAC;gBACtB,OAAO,WAAW,CAAC,YAAY,CAAC;YACpC,CAAC;QACL,CAAC;QAED,mCAAmC;QACnC,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YACzD,IAAI,mBAAmB,EAAE,CAAC;gBACtB,OAAO,WAAW,CAAC,YAAY,CAAC;YACpC,CAAC;YACD,IAAI,iBAAiB,EAAE,CAAC;gBACpB,OAAO,WAAW,CAAC,UAAU,CAAC;YAClC,CAAC;QACL,CAAC;QAED,uFAAuF;QACvF,OAAO,CAAC,IAAI,CAAC,MAAM,KAAK,SAAS,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,CAAC;YAC3D,CAAC,CAAC,WAAW,CAAC,QAAQ;YACtB,CAAC,CAAC,WAAW,CAAC,UAAU,CAAC;IACjC,CAAC;IAED;;OAEG;IACK,gCAAgC,CAAC,eAAmC;;QACxE,KAAK,MAAM,IAAI,IAAI,eAAe,CAAC,UAAU,EAAE,CAAC;YAC5C,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC;YAE/B,oBAAoB;YACpB,IAAI,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,IAAI,MAAK,SAAE,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;gBACrC,MAAM,QAAQ,GAAG,SAAsB,CAAC;gBACxC,MAAM,eAAe,GAAG,MAAA,QAAQ,CAAC,eAAe,0CAAE,OAAO,CAAC;gBAE1D,IAAI,eAAe,EAAE,CAAC;oBAClB,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC;oBAEvD,IAAI,UAAU,KAAK,IAAI,CAAC,MAAM,EAAE,CAAC;wBAC7B,MAAM,YAAY,GAAG,QAAQ,CAAC,YAAY,CAAC;wBAC3C,IAAI,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,aAAa,EAAE,CAAC;4BAC9B,IAAI,YAAY,CAAC,aAAa,CAAC,IAAI,KAAK,SAAE,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;gCAC3D,OAAO,WAAW,CAAC,QAAQ,CAAC;4BAChC,CAAC;iCAAM,CAAC;gCACJ,OAAO,WAAW,CAAC,YAAY,CAAC;4BACpC,CAAC;wBACL,CAAC;wBACD,IAAI,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,IAAI,EAAE,CAAC;4BACrB,OAAO,WAAW,CAAC,UAAU,CAAC;wBAClC,CAAC;oBACL,CAAC;gBACL,CAAC;YACL,CAAC;YAED,0BAA0B;YAC1B,IAAI,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,IAAI,MAAK,QAAC,CAAC,IAAI,CAAC,oBAAoB,EAAE,CAAC;gBAClD,MAAM,OAAO,GAAG,SAAmC,CAAC;gBACpD,IAAI,OAAO,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBACjC,MAAM,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;oBAC9C,MAAM,WAAW,GAAG,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,WAAW,0CAAE,OAAO,CAAC;oBAEnD,IAAI,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,IAAI,MAAK,QAAC,CAAC,IAAI,CAAC,gBAAgB;wBAC7C,IAAI,CAAC,aAAa,CAAC,WAAiC,CAAC,EAAE,CAAC;wBACxD,MAAM,UAAU,GAAG,IAAI,CAAC,wBAAwB,CAAC,WAAiC,CAAC,CAAC;wBACpF,IAAI,UAAU,KAAK,IAAI,CAAC,MAAM,EAAE,CAAC;4BAC7B,OAAO,WAAW,CAAC,QAAQ,CAAC;wBAChC,CAAC;oBACL,CAAC;gBACL,CAAC;YACL,CAAC;QACL,CAAC;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;IAEc,sBAAsB,CAAC,eAAmC,EAAE,CAAI;;YAC3E,4CAA4C;YAC5C,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC;YAChE,IAAI,SAAS,EAAE,CAAC;gBACZ,OAAO,eAAe,CAAC;YAC3B,CAAC;YAED,wEAAwE;YACxE,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBACxB,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,eAAe,CAAC,CAAC;gBAC3E,IAAI,CAAC,YAAY,EAAE,CAAC;oBAChB,OAAO,eAAe,CAAC;gBAC3B,CAAC;YACL,CAAC;YAED,yCAAyC;YACzC,MAAM,WAAW,GAAG,IAAI,CAAC,oBAAoB,CAAC,eAAe,CAAC,CAAC;YAE/D,4FAA4F;YAC5F,4DAA4D;YAC5D,IAAI,WAAW,KAAK,WAAW,CAAC,QAAQ,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;gBACjG,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,0BAA0B,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC;gBAC3E,IAAI,QAAQ,KAAK,eAAe,EAAE,CAAC;oBAC/B,OAAO,QAAQ,CAAC;gBACpB,CAAC;YACL,CAAC;YAED,6CAA6C;YAC7C,IAAI,WAAW,KAAK,WAAW,CAAC,QAAQ,EAAE,CAAC;gBACvC,4CAA4C;gBAC5C,oCAAoC;gBACpC,sDAAsD;YAC1D,CAAC;YAED,8DAA8D;YAC9D,OAAO,IAAI,CAAC,iBAAiB,CAAqB,eAAe,EAAE,CAAC,EAAE,CAAM,KAAK,EAAC,EAAE;gBAChF,yCAAyC;gBACzC,MAAM,cAAc,GAAG,IAAI,CAAC,wBAAwB,CAAC,eAAe,CAAC,CAAC;gBAEtE,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,eAAe,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC;gBAEvF,gDAAgD;gBAChD,mDAAmD;gBACnD,MAAM,gBAAgB,GAAG,IAAA,iBAAO,EAAC;oBAC7B,IAAI,EAAE,QAAC,CAAC,OAAO,CAAC,SAAS;oBACzB,EAAE,EAAE,IAAA,eAAQ,GAAE;iBACjB,CAAC,CAAC;gBAEH,IAAI,cAAc,KAAK,CAAC,EAAE,CAAC;oBACvB,0BAA0B;oBAC1B,wEAAwE;oBACxE,8DAA8D;oBAC9D,MAAM,iBAAiB,GAAG,eAAe,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC;wBAC3D,CAAC,CAAC;4BACE,IAAA,kBAAW,EAAC,SAAS,EAAE,iBAAU,EAAE,gBAAgB,CAAC;4BACpD,gCACO,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC,KAChC,OAAO,EAAE,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,OAAO;oCAC1C,CAAC,iCAAK,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,OAAO,KAAE,MAAM,EAAE,IAAA,YAAK,EAAC,MAAM,CAAC,IAClE,CAAC,CAAC,SAAS,GACU;4BAC7B,GAAG,eAAe,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;yBACzC;wBACD,CAAC,CAAC,CAAC,IAAA,kBAAW,EAAC,SAAS,EAAE,iBAAU,EAAE,gBAAgB,CAAC,CAAC,CAAC;oBAE7D,KAAK,CAAC,UAAU,GAAG,iBAAiB,CAAC;gBACzC,CAAC;qBAAM,CAAC;oBACJ,gCAAgC;oBAChC,MAAM,MAAM,GAAG,eAAe,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC;oBACnE,MAAM,KAAK,GAAG,eAAe,CAAC,UAAU,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;oBAE/D,wEAAwE;oBACxE,mEAAmE;oBACnE,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;wBACvC,MAAM,aAAa,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC;wBAC9C,MAAM,YAAY,GAAG,CAAC,aAAa,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;wBAE9D,MAAM,oBAAoB,GAAG,YAAY,CAAC,CAAC,iCACpC,KAAK,CAAC,CAAC,CAAC,KACX,OAAO,kCAAM,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,KAAE,MAAM,EAAE,IAAA,YAAK,EAAC,IAAI,GAAG,aAAa,CAAC,UAAU,CAAC,OAC/E,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;wBAEb,KAAK,CAAC,UAAU,GAAG;4BACf,GAAG,MAAM;4BACT,IAAA,kBAAW,EAAC,SAAS,EAAE,iBAAU,EAAE,gBAAgB,CAAC;4BACpD,oBAAoB;4BACpB,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;yBACpB,CAAC;oBACN,CAAC;yBAAM,CAAC;wBACJ,KAAK,CAAC,UAAU,GAAG;4BACf,GAAG,MAAM;4BACT,IAAA,kBAAW,EAAC,SAAS,EAAE,iBAAU,EAAE,gBAAgB,CAAC;4BACpD,GAAG,KAAK;yBACX,CAAC;oBACN,CAAC;gBACL,CAAC;YACL,CAAC,CAAA,CAAC,CAAC;QACP,CAAC;KAAA;IAED;;OAEG;IACW,0BAA0B,CAAC,eAAmC,EAAE,CAAI;;;YAC9E,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,eAAe,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBACzD,MAAM,IAAI,GAAG,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;gBAC3C,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC;gBAE/B,IAAI,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,IAAI,MAAK,SAAE,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;oBACrC,MAAM,QAAQ,GAAG,SAAsB,CAAC;oBACxC,MAAM,eAAe,GAAG,MAAA,QAAQ,CAAC,eAAe,0CAAE,OAAO,CAAC;oBAE1D,IAAI,CAAC,eAAe,EAAE,CAAC;wBACnB,SAAS;oBACb,CAAC;oBAED,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC;oBAEvD,oDAAoD;oBACpD,IAAI,UAAU,KAAK,IAAI,CAAC,MAAM,EAAE,CAAC;wBAC7B,SAAS;oBACb,CAAC;oBAED,MAAM,YAAY,GAAG,QAAQ,CAAC,YAAY,CAAC;oBAC3C,IAAI,CAAC,YAAY,IAAI,CAAC,YAAY,CAAC,aAAa,EAAE,CAAC;wBAC/C,SAAS;oBACb,CAAC;oBAED,sDAAsD;oBACtD,IAAI,YAAY,CAAC,aAAa,CAAC,IAAI,KAAK,SAAE,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;wBAC3D,SAAS;oBACb,CAAC;oBAED,iEAAiE;oBACjE,OAAO,IAAI,CAAC,iBAAiB,CAAqB,eAAe,EAAE,CAAC,EAAE,CAAM,KAAK,EAAC,EAAE;wBAChF,MAAM,YAAY,GAAG,YAAY,CAAC,aAAgC,CAAC;wBAEnE,kFAAkF;wBAClF,MAAM,gBAAgB,GAAG,IAAI,CAAC,qBAAqB,EAAE,CAAC;wBACtD,MAAM,YAAY,mCAAO,gBAAgB,KAAE,MAAM,EAAE,kBAAW,GAAC,CAAC;wBAEhE,wCAAwC;wBACxC,MAAM,mBAAmB,GAAoB,MAAM,IAAI,CAAC,iBAAiB,CACrE,YAAY,EAAE,CAAC,EAAE,CAAM,UAAU,EAAC,EAAE;4BAChC,UAAU,CAAC,QAAQ,mCACZ,YAAY,CAAC,QAAQ,KACxB,QAAQ,EAAE;oCACN,GAAG,YAAY,CAAC,QAAQ,CAAC,QAAQ;oCACjC,IAAA,kBAAW,EAAC,YAAY,EAAE,iBAAU,CAAC;iCACxC,GACJ,CAAC;wBACN,CAAC,CAAA,CACJ,CAAC;wBAEF,+CAA+C;wBAC/C,MAAM,aAAa,GAAc,MAAM,IAAI,CAAC,iBAAiB,CACzD,QAAQ,EAAE,CAAC,EAAE,CAAM,WAAW,EAAC,EAAE;4BAC7B,WAAW,CAAC,YAAY,GAAG,MAAM,IAAI,CAAC,iBAAiB,CACnD,YAAY,EAAE,CAAC,EAAE,CAAM,WAAW,EAAC,EAAE;gCACjC,WAAW,CAAC,aAAa,GAAG,mBAAmB,CAAC;4BACpD,CAAC,CAAA,CACJ,CAAC;wBACN,CAAC,CAAA,CACJ,CAAC;wBAEF,gDAAgD;wBAChD,KAAK,CAAC,UAAU,GAAG,eAAe,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,CACzD,GAAG,KAAK,CAAC,CAAC,CAAC,iCAAK,CAAC,KAAE,OAAO,EAAE,aAAa,IAAE,CAAC,CAAC,CAAC,CACjD,CAAC;oBACN,CAAC,CAAA,CAAC,CAAC;gBACP,CAAC;YACL,CAAC;YAED,OAAO,eAAe,CAAC;QAC3B,CAAC;KAAA;IAED;;OAEG;IACW,iBAAiB,CAAC,eAAmC;;YAC/D,KAAK,MAAM,IAAI,IAAI,eAAe,CAAC,UAAU,EAAE,CAAC;gBAC5C,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC;gBAE/B,oBAAoB;gBACpB,IAAI,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,IAAI,MAAK,SAAE,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;oBACrC,MAAM,QAAQ,GAAG,SAAsB,CAAC;oBACxC,IAAI,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE,CAAC;wBAClC,OAAO,IAAI,CAAC;oBAChB,CAAC;gBACL,CAAC;gBAED,oCAAoC;gBACpC,IAAI,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,IAAI,MAAK,QAAC,CAAC,IAAI,CAAC,oBAAoB,EAAE,CAAC;oBAClD,MAAM,OAAO,GAAG,SAAmC,CAAC;oBACpD,IAAI,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,EAAE,CAAC;wBAClC,OAAO,IAAI,CAAC;oBAChB,CAAC;gBACL,CAAC;YACL,CAAC;YACD,OAAO,KAAK,CAAC;QACjB,CAAC;KAAA;IAED;;OAEG;IACK,gBAAgB,CAAC,QAAmB;;QACxC,yBAAyB;QACzB,MAAM,eAAe,GAAG,MAAA,QAAQ,CAAC,eAAe,0CAAE,OAAO,CAAC;QAC1D,IAAI,CAAC,eAAe,EAAE,CAAC;YACnB,OAAO,KAAK,CAAC;QACjB,CAAC;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC;QACvD,IAAI,UAAU,KAAK,IAAI,CAAC,MAAM,EAAE,CAAC;YAC7B,OAAO,KAAK,CAAC;QACjB,CAAC;QAED,MAAM,YAAY,GAAG,QAAQ,CAAC,YAAY,CAAC;QAC3C,IAAI,CAAC,YAAY,EAAE,CAAC;YAChB,OAAO,KAAK,CAAC;QACjB,CAAC;QAED,gEAAgE;QAChE,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YACzD,qDAAqD;YACrD,uEAAuE;YACvE,IAAI,YAAY,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;gBAClC,OAAO,KAAK,CAAC;YACjB,CAAC;YACD,6CAA6C;YAC7C,IAAI,IAAI,CAAC,KAAK,IAAI,CAAA,MAAA,YAAY,CAAC,IAAI,CAAC,OAAO,0CAAE,IAAI,MAAK,QAAC,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;gBACtE,MAAM,YAAY,GAAI,YAAY,CAAC,IAAI,CAAC,OAAwB,CAAC,UAAU,CAAC;gBAC5E,OAAO,YAAY,KAAK,IAAI,CAAC,KAAK,CAAC;YACvC,CAAC;YACD,OAAO,IAAI,CAAC;QAChB,CAAC;aAAM,CAAC;YACJ,kDAAkD;YAClD,MAAM,aAAa,GAAG,YAAY,CAAC,aAAa,CAAC;YACjD,IAAI,CAAC,aAAa,EAAE,CAAC;gBACjB,OAAO,KAAK,CAAC;YACjB,CAAC;YAED,IAAI,aAAa,CAAC,IAAI,KAAK,SAAE,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;gBAC9C,MAAM,YAAY,GAAG,aAAgC,CAAC;gBACtD,KAAK,MAAM,IAAI,IAAI,YAAY,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;oBAChD,IAAI,CAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,IAAI,MAAK,SAAE,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC;wBACjD,MAAM,SAAS,GAAG,IAAI,CAAC,OAA6B,CAAC;wBACrD,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;wBACjD,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;wBAEjD,IAAI,UAAU,KAAK,IAAI,CAAC,MAAM,IAAI,SAAS,KAAK,IAAI,CAAC,KAAK,EAAE,CAAC;4BACzD,OAAO,IAAI,CAAC;wBAChB,CAAC;oBACL,CAAC;gBACL,CAAC;YACL,CAAC;QACL,CAAC;QAED,OAAO,KAAK,CAAC;IACjB,CAAC;IAED;;OAEG;IACK,iBAAiB,CAAC,OAA+B;;QACrD,IAAI,OAAO,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACjC,OAAO,KAAK,CAAC;QACjB,CAAC;QAED,MAAM,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;QAC9C,IAAI,CAAC,QAAQ,EAAE,CAAC;YACZ,OAAO,KAAK,CAAC;QACjB,CAAC;QAED,MAAM,WAAW,GAAG,MAAA,QAAQ,CAAC,WAAW,0CAAE,OAAO,CAAC;QAClD,IAAI,CAAC,WAAW,IAAI,WAAW,CAAC,IAAI,KAAK,QAAC,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC/D,OAAO,KAAK,CAAC;QACjB,CAAC;QAED,MAAM,SAAS,GAAG,WAAiC,CAAC;QACpD,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,EAAE,CAAC;YACjC,OAAO,KAAK,CAAC;QACjB,CAAC;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,wBAAwB,CAAC,SAAS,CAAC,CAAC;QAC5D,IAAI,UAAU,KAAK,IAAI,CAAC,MAAM,EAAE,CAAC;YAC7B,OAAO,KAAK,CAAC;QACjB,CAAC;QAED,8DAA8D;QAC9D,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC;QAC9B,IAAI,CAAC,IAAI,CAAC,MAAM,KAAK,SAAS,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,CAAC,IAAI,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,MAAK,QAAC,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YAClG,iDAAiD;YACjD,sEAAsE;YACtE,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;gBACb,MAAM,OAAO,GAAI,OAAwB,CAAC,UAAU,CAAC;gBACrD,OAAO,OAAO,KAAK,IAAI,CAAC,KAAK,CAAC;YAClC,CAAC;YACD,OAAO,IAAI,CAAC;QAChB,CAAC;aAAM,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,IAAI,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,MAAK,SAAE,CAAC,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAClH,4DAA4D;YAC5D,MAAM,aAAa,GAAG,OAAkC,CAAC;YACzD,KAAK,MAAM,IAAI,IAAI,aAAa,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;gBACjD,IAAI,CAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,IAAI,MAAK,SAAE,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;oBAChD,MAAM,WAAW,GAAG,IAAI,CAAC,OAA4B,CAAC;oBACtD,MAAM,IAAI,GAAG,MAAC,WAAW,CAAC,IAAqB,0CAAE,UAAU,CAAC;oBAC5D,IAAI,IAAI,KAAK,CAAC,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;wBACvC,OAAO,IAAI,CAAC;oBAChB,CAAC;gBACL,CAAC;YACL,CAAC;QACL,CAAC;QAED,OAAO,KAAK,CAAC;IACjB,CAAC;IAED;;OAEG;IACW,yBAAyB,CAAC,eAAmC;;YACvE,iEAAiE;YACjE,kEAAkE;YAClE,MAAM,WAAW,GAAG,IAAI,GAAG,EAAuB,CAAC;YAEnD,mDAAmD;YACnD,MAAM,iBAAiB,GAAG,CAAC,UAAuB,EAAE,EAAE;gBAClD,MAAM,UAAU,GAAG,WAAI,CAAC,cAAc,CAAC,qBAAqB,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;gBACvF,IAAI,UAAU,EAAE,CAAC;oBACb,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;wBAC/B,WAAW,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;oBAC3C,CAAC;oBACD,WAAW,CAAC,GAAG,CAAC,UAAU,CAAE,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;gBACtD,CAAC;YACL,CAAC,CAAC;YAEF,2EAA2E;YAC3E,MAAM,SAAS,GAAG,IAAI,KAAM,SAAQ,2BAAmC;gBACpD,eAAe,CAAC,UAAwB,EAAE,CAAmB;;;;;wBACxE,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC;wBAC7B,IAAI,IAAI,IAAI,WAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;4BAC9B,iBAAiB,CAAC,IAAmB,CAAC,CAAC;wBAC3C,CAAC;wBACD,OAAO,OAAM,eAAe,YAAC,UAAU,EAAE,CAAC,EAAE;oBAChD,CAAC;iBAAA;gBAEc,qBAAqB,CAAC,gBAAoC,EAAE,CAAmB;;;;;wBAC1F,IAAI,gBAAgB,CAAC,UAAU,EAAE,CAAC;4BAC9B,iBAAiB,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;wBACnD,CAAC;wBACD,OAAO,OAAM,qBAAqB,YAAC,gBAAgB,EAAE,CAAC,EAAE;oBAC5D,CAAC;iBAAA;gBAEc,iBAAiB,CAAC,YAA6B,EAAE,CAAmB;;;;;wBAC/E,IAAI,YAAY,CAAC,UAAU,EAAE,CAAC;4BAC1B,iBAAiB,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;wBAC/C,CAAC;wBACD,OAAO,OAAM,iBAAiB,YAAC,YAAY,EAAE,CAAC,EAAE;oBACpD,CAAC;iBAAA;gBAEc,gBAAgB,CAAC,WAA0B,EAAE,CAAmB;;;;;wBAC3E,MAAM,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC;wBAC9B,IAAI,IAAI,IAAI,WAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;4BAC9B,iBAAiB,CAAC,IAAmB,CAAC,CAAC;wBAC3C,CAAC;wBACD,OAAO,OAAM,gBAAgB,YAAC,WAAW,EAAE,CAAC,EAAE;oBAClD,CAAC;iBAAA;aACJ,CAAC;YAEF,MAAM,SAAS,CAAC,KAAK,CAAC,eAAe,EAAE,IAAI,4BAAgB,EAAE,CAAC,CAAC;YAE/D,+DAA+D;YAC/D,MAAM,aAAa,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACnD,IAAI,CAAC,aAAa,EAAE,CAAC;gBACjB,OAAO,KAAK,CAAC;YACjB,CAAC;YAED,4FAA4F;YAC5F,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,IAAI,GAAG,CAAC,CAAC;QACjF,CAAC;KAAA;IAED;;OAEG;IACW,qBAAqB,CAAC,eAAmC,EAAE,cAAsB,EAAE,CAAI;;YACjG,+DAA+D;YAC/D,MAAM,MAAM,GAAG,IAAI,CAAC,qBAAqB,CAAC,eAAe,EAAE,cAAc,CAAC,CAAC;YAE3E,8BAA8B;YAC9B,MAAM,eAAe,GAAc;gBAC/B,EAAE,EAAE,IAAA,eAAQ,GAAE;gBACd,IAAI,EAAE,QAAC,CAAC,IAAI,CAAC,OAAO;gBACpB,MAAM,EAAE,kBAAW;gBACnB,OAAO,EAAE,sBAAY;gBACrB,KAAK,EAAE,IAAI,IAAI,CAAC,MAAM,GAAG;gBACzB,WAAW,EAAE,IAAI,IAAI,CAAC,MAAM,GAAG;gBAC/B,cAAc,EAAE,EAAE;gBAClB,IAAI,EAAE,SAAS;aAClB,CAAC;YAEF,IAAI,YAAyC,CAAC;YAE9C,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;gBACzD,8CAA8C;gBAC9C,6DAA6D;gBAC7D,MAAM,WAAW,GAAiB;oBAC9B,EAAE,EAAE,IAAA,eAAQ,GAAE;oBACd,IAAI,EAAE,QAAC,CAAC,IAAI,CAAC,UAAU;oBACvB,MAAM,EAAE,kBAAW;oBACnB,OAAO,EAAE,sBAAY;oBACrB,WAAW,EAAE,EAAE;oBACf,UAAU,EAAE,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,MAAM;oBACrC,IAAI,EAAE,SAAS;oBACf,SAAS,EAAE,SAAS;iBACvB,CAAC;gBAEF,YAAY,GAAG;oBACX,EAAE,EAAE,IAAA,eAAQ,GAAE;oBACd,IAAI,EAAE,SAAE,CAAC,IAAI,CAAC,YAAY;oBAC1B,MAAM,EAAE,iBAAU;oBAClB,OAAO,EAAE,sBAAY;oBACrB,QAAQ,EAAE,KAAK;oBACf,IAAI,EAAE,IAAA,kBAAW,EAAC,WAAW,EAAE,iBAAU,CAAC;oBAC1C,aAAa,EAAE,SAAS;iBAC3B,CAAC;YACN,CAAC;iBAAM,CAAC;gBACJ,gDAAgD;gBAChD,MAAM,UAAU,GAAG,IAAI,CAAC,qBAAqB,EAAE,CAAC;gBAEhD,MAAM,YAAY,GAAoB;oBAClC,EAAE,EAAE,IAAA,eAAQ,GAAE;oBACd,IAAI,EAAE,SAAE,CAAC,IAAI,CAAC,YAAY;oBAC1B,MAAM,EAAE,kBAAW;oBACnB,OAAO,EAAE,sBAAY;oBACrB,QAAQ,EAAE;wBACN,IAAI,EAAE,QAAC,CAAC,IAAI,CAAC,SAAS;wBACtB,MAAM,EAAE,iBAAU;wBAClB,QAAQ,EAAE,CAAC,IAAA,kBAAW,EAAC,UAAU,EAAE,iBAAU,CAAC,CAAC;wBAC/C,OAAO,EAAE,sBAAY;qBACxB;iBACJ,CAAC;gBAEF,YAAY,GAAG;oBACX,EAAE,EAAE,IAAA,eAAQ,GAAE;oBACd,IAAI,EAAE,SAAE,CAAC,IAAI,CAAC,YAAY;oBAC1B,MAAM,EAAE,iBAAU;oBAClB,OAAO,EAAE,sBAAY;oBACrB,QAAQ,EAAE,KAAK;oBACf,IAAI,EAAE,SAAS;oBACf,aAAa,EAAE,YAAY;iBAC9B,CAAC;YACN,CAAC;YAED,MAAM,QAAQ,GAAc;gBACxB,EAAE,EAAE,IAAA,eAAQ,GAAE;gBACd,IAAI,EAAE,SAAE,CAAC,IAAI,CAAC,MAAM;gBACpB,MAAM;gBACN,OAAO,EAAE,sBAAY;gBACrB,SAAS,EAAE,EAAE;gBACb,YAAY;gBACZ,eAAe,EAAE;oBACb,IAAI,EAAE,QAAC,CAAC,IAAI,CAAC,UAAU;oBACvB,MAAM,EAAE,kBAAW;oBACnB,OAAO,EAAE,eAAe;oBACxB,OAAO,EAAE,sBAAY;iBACxB;gBACD,WAAW,EAAE,SAAS;aACzB,CAAC;YAEF,OAAO,QAAQ,CAAC;QACpB,CAAC;KAAA;IAED;;OAEG;IACK,qBAAqB;QACzB,IAAI,SAAkC,CAAC;QAEvC,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACb,2DAA2D;YAC3D,MAAM,YAAY,GAAiB;gBAC/B,EAAE,EAAE,IAAA,eAAQ,GAAE;gBACd,IAAI,EAAE,QAAC,CAAC,IAAI,CAAC,UAAU;gBACvB,MAAM,EAAE,iBAAU;gBAClB,OAAO,EAAE,sBAAY;gBACrB,WAAW,EAAE,EAAE;gBACf,UAAU,EAAE,IAAI,CAAC,MAAO;gBACxB,IAAI,EAAE,SAAS;gBACf,SAAS,EAAE,SAAS;aACvB,CAAC;YAEF,MAAM,SAAS,GAAiB;gBAC5B,EAAE,EAAE,IAAA,eAAQ,GAAE;gBACd,IAAI,EAAE,QAAC,CAAC,IAAI,CAAC,UAAU;gBACvB,MAAM,EAAE,kBAAW;gBACnB,OAAO,EAAE,sBAAY;gBACrB,WAAW,EAAE,EAAE;gBACf,UAAU,EAAE,IAAI,CAAC,KAAK;gBACtB,IAAI,EAAE,SAAS;gBACf,SAAS,EAAE,SAAS;aACvB,CAAC;YAEF,SAAS,GAAG;gBACR,EAAE,EAAE,IAAA,eAAQ,GAAE;gBACd,IAAI,EAAE,SAAE,CAAC,IAAI,CAAC,KAAK;gBACnB,MAAM,EAAE,iBAAU;gBAClB,OAAO,EAAE,sBAAY;gBACrB,YAAY,EAAE,IAAA,kBAAW,EAAC,YAAY,EAAE,kBAAW,CAAC;gBACpD,KAAK,EAAE,SAAS;aACnB,CAAC;QACN,CAAC;aAAM,CAAC;YACJ,kDAAkD;YAClD,SAAS,GAAG;gBACR,EAAE,EAAE,IAAA,eAAQ,GAAE;gBACd,IAAI,EAAE,QAAC,CAAC,IAAI,CAAC,UAAU;gBACvB,MAAM,EAAE,iBAAU;gBAClB,OAAO,EAAE,sBAAY;gBACrB,WAAW,EAAE,EAAE;gBACf,UAAU,EAAE,IAAI,CAAC,MAAO;gBACxB,IAAI,EAAE,SAAS;gBACf,SAAS,EAAE,SAAS;aACvB,CAAC;QACN,CAAC;QAED,OAAO;YACH,EAAE,EAAE,IAAA,eAAQ,GAAE;YACd,IAAI,EAAE,SAAE,CAAC,IAAI,CAAC,eAAe;YAC7B,MAAM,EAAE,iBAAU;YAClB,OAAO,EAAE,sBAAY;YACrB,UAAU,EAAE;gBACR,IAAI,EAAE,QAAC,CAAC,IAAI,CAAC,UAAU;gBACvB,MAAM,EAAE,iBAAU;gBAClB,OAAO,EAAE,KAAK;gBACd,OAAO,EAAE,sBAAY;aACxB;YACD,SAAS;SACZ,CAAC;IACN,CAAC;IAED;;OAEG;IACK,qBAAqB,CAAC,eAAmC,EAAE,cAAsB;;QACrF,iFAAiF;QACjF,mFAAmF;QACnF,IAAI,cAAc,KAAK,CAAC,IAAI,eAAe,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAChE,MAAM,WAAW,GAAG,MAAA,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,OAAO,0CAAE,MAAM,CAAC;YAClE,IAAI,WAAW,EAAE,CAAC;gBACd,qCAAqC;gBACrC,OAAO;oBACH,IAAI,EAAE,QAAC,CAAC,IAAI,CAAC,KAAK;oBAClB,QAAQ,EAAE,EAAE;oBACZ,UAAU,EAAE,WAAW,CAAC,UAAU;iBACrC,CAAC;YACN,CAAC;YACD,OAAO,iBAAU,CAAC;QACtB,CAAC;QAED,2EAA2E;QAC3E,0CAA0C;QAC1C,OAAO,IAAA,YAAK,EAAC,IAAI,CAAC,CAAC;IACvB,CAAC;IAED;;OAEG;IACK,wBAAwB,CAAC,eAAmC;QAChE,IAAI,eAAe,GAAG,CAAC,CAAC,CAAC;QAEzB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,eAAe,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACzD,MAAM,SAAS,GAAG,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;YACxD,IAAI,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,IAAI,MAAK,SAAE,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;gBACrC,eAAe,GAAG,CAAC,CAAC;YACxB,CAAC;iBAAM,IAAI,eAAe,IAAI,CAAC,EAAE,CAAC;gBAC9B,uEAAuE;gBACvE,OAAO,eAAe,GAAG,CAAC,CAAC;YAC/B,CAAC;QACL,CAAC;QAED,yCAAyC;QACzC,IAAI,eAAe,IAAI,CAAC,EAAE,CAAC;YACvB,OAAO,eAAe,GAAG,CAAC,CAAC;QAC/B,CAAC;QAED,4CAA4C;QAC5C,OAAO,CAAC,CAAC;IACb,CAAC;IAED;;OAEG;IACK,wBAAwB,CAAC,SAA6B;;QAC1D,MAAM,IAAI,GAAG,MAAA,SAAS,CAAC,SAAS,0CAAE,QAAQ,CAAC;QAC3C,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC7B,OAAO,SAAS,CAAC;QACrB,CAAC;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;QACjC,IAAI,CAAC,QAAQ,IAAI,QAAQ,CAAC,IAAI,KAAK,QAAC,CAAC,IAAI,CAAC,OAAO,IAAI,OAAQ,QAAsB,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;YACrG,OAAO,SAAS,CAAC;QACrB,CAAC;QAED,OAAO,MAAC,QAAsB,CAAC,KAAK,0CAAE,QAAQ,EAAE,CAAC;IACrD,CAAC;IAED;;OAEG;IACK,aAAa,CAAC,SAA6B;QAC/C,MAAM,IAAI,GAAG,SAAS,CAAC,SAAS,CAAC;QACjC,IAAI,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,MAAK,SAAE,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YAC/B,MAAM,KAAK,GAAG,IAAgB,CAAC;YAC/B,MAAM,YAAY,GAAG,KAAK,CAAC,YAAY,CAAC,OAAO,CAAC;YAChD,IAAI,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,IAAI,MAAK,QAAC,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;gBAC3C,OAAQ,YAA6B,CAAC,UAAU,CAAC;YACrD,CAAC;QACL,CAAC;aAAM,IAAI,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,MAAK,QAAC,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YAC1C,OAAQ,IAAqB,CAAC,UAAU,CAAC;QAC7C,CAAC;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IAED;;OAEG;IACK,cAAc,CAAC,SAA6B;;QAChD,MAAM,IAAI,GAAG,SAAS,CAAC,SAAS,CAAC;QACjC,IAAI,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,MAAK,SAAE,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YAC/B,MAAM,KAAK,GAAG,IAAgB,CAAC;YAC/B,IAAI,CAAA,MAAA,KAAK,CAAC,KAAK,0CAAE,IAAI,MAAK,QAAC,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;gBAC1C,OAAQ,KAAK,CAAC,KAAsB,CAAC,UAAU,CAAC;YACpD,CAAC;QACL,CAAC;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;CACJ;AA10BD,8BA00BC"}
|
|
@@ -113,6 +113,7 @@ export declare class TabsAndIndentsVisitor<P> extends JavaScriptVisitor<P> {
|
|
|
113
113
|
private readonly singleIndent;
|
|
114
114
|
constructor(tabsAndIndentsStyle: TabsAndIndentsStyle, stopAfter?: Tree | undefined);
|
|
115
115
|
protected preVisit(tree: J, p: P): Promise<J | undefined>;
|
|
116
|
+
visitSpace(space: J.Space, p: P): Promise<J.Space>;
|
|
116
117
|
visit<R extends J>(tree: Tree, p: P, parent?: Cursor): Promise<R | undefined>;
|
|
117
118
|
visitLeftPadded<T extends J | J.Space | number | string | boolean>(left: J.LeftPadded<T>, p: P): Promise<J.LeftPadded<T> | undefined>;
|
|
118
119
|
private get currentIndent();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"format.d.ts","sourceRoot":"","sources":["../../src/javascript/format.ts"],"names":[],"mappings":"AAeA,OAAO,EAAe,EAAE,
|
|
1
|
+
{"version":3,"file":"format.d.ts","sourceRoot":"","sources":["../../src/javascript/format.ts"],"names":[],"mappings":"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"}
|
|
@@ -1350,7 +1350,8 @@ class TabsAndIndentsVisitor extends visitor_1.JavaScriptVisitor {
|
|
|
1350
1350
|
let ret = yield _super.preVisit.call(this, tree, p);
|
|
1351
1351
|
let indentShouldIncrease = tree.kind === java_1.J.Kind.Block
|
|
1352
1352
|
|| ((_c = (_b = (_a = this.cursor.parent) === null || _a === void 0 ? void 0 : _a.parent) === null || _b === void 0 ? void 0 : _b.parent) === null || _c === void 0 ? void 0 : _c.value.kind) == java_1.J.Kind.Case
|
|
1353
|
-
|| (tree.kind === tree_1.JS.Kind.StatementExpression && tree.statement.kind == java_1.J.Kind.MethodDeclaration && tree.prefix.whitespace.includes("\n"))
|
|
1353
|
+
|| (tree.kind === tree_1.JS.Kind.StatementExpression && tree.statement.kind == java_1.J.Kind.MethodDeclaration && tree.prefix.whitespace.includes("\n"))
|
|
1354
|
+
|| tree.kind === tree_1.JS.Kind.JsxTag;
|
|
1354
1355
|
const previousIndent = this.currentIndent;
|
|
1355
1356
|
if (tree.kind === java_1.J.Kind.IfElse && this.cursor.getNearestMessage("else-indent") !== undefined) {
|
|
1356
1357
|
this.cursor.messages.set("indentToUse", this.cursor.getNearestMessage("else-indent"));
|
|
@@ -1358,6 +1359,9 @@ class TabsAndIndentsVisitor extends visitor_1.JavaScriptVisitor {
|
|
|
1358
1359
|
else if (indentShouldIncrease) {
|
|
1359
1360
|
this.cursor.messages.set("indentToUse", this.currentIndent + this.singleIndent);
|
|
1360
1361
|
}
|
|
1362
|
+
if (tree.kind === tree_1.JS.Kind.JsxTag) {
|
|
1363
|
+
this.cursor.messages.set("jsxTagIndent", this.currentIndent);
|
|
1364
|
+
}
|
|
1361
1365
|
if (tree.kind === java_1.J.Kind.IfElse && this.cursor.messages.get("else-indent") !== undefined) {
|
|
1362
1366
|
this.cursor.messages.set("indentToUse", this.cursor.messages.get("else-indent"));
|
|
1363
1367
|
this.cursor.messages.delete("else-indent");
|
|
@@ -1397,12 +1401,33 @@ class TabsAndIndentsVisitor extends visitor_1.JavaScriptVisitor {
|
|
|
1397
1401
|
indentShouldIncrease = true;
|
|
1398
1402
|
}
|
|
1399
1403
|
}
|
|
1404
|
+
else if (tree.kind === tree_1.JS.Kind.JsxTag) {
|
|
1405
|
+
indentShouldIncrease = true;
|
|
1406
|
+
}
|
|
1400
1407
|
if (indentShouldIncrease) {
|
|
1401
1408
|
this.cursor.messages.set("indentToUse", this.currentIndent + this.singleIndent);
|
|
1402
1409
|
}
|
|
1403
1410
|
return ret;
|
|
1404
1411
|
});
|
|
1405
1412
|
}
|
|
1413
|
+
visitSpace(space, p) {
|
|
1414
|
+
const _super = Object.create(null, {
|
|
1415
|
+
visitSpace: { get: () => super.visitSpace }
|
|
1416
|
+
});
|
|
1417
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
1418
|
+
const ret = yield _super.visitSpace.call(this, space, p);
|
|
1419
|
+
if (space.whitespace.includes("\n")) {
|
|
1420
|
+
let parentCursor = this.cursor.parent;
|
|
1421
|
+
while (parentCursor != null && parentCursor.value.kind !== tree_1.JS.Kind.JsxTag) {
|
|
1422
|
+
parentCursor = parentCursor.parent;
|
|
1423
|
+
}
|
|
1424
|
+
if (parentCursor && parentCursor.value.kind === tree_1.JS.Kind.JsxTag) {
|
|
1425
|
+
parentCursor.messages.set("jsxTagWithNewline", true);
|
|
1426
|
+
}
|
|
1427
|
+
}
|
|
1428
|
+
return ret;
|
|
1429
|
+
});
|
|
1430
|
+
}
|
|
1406
1431
|
visit(tree, p, parent) {
|
|
1407
1432
|
const _super = Object.create(null, {
|
|
1408
1433
|
visit: { get: () => super.visit }
|
|
@@ -1472,7 +1497,25 @@ class TabsAndIndentsVisitor extends visitor_1.JavaScriptVisitor {
|
|
|
1472
1497
|
if (this.stopAfter != null && (0, tree_2.isScope)(this.stopAfter, tree)) {
|
|
1473
1498
|
(_a = this.cursor) === null || _a === void 0 ? void 0 : _a.root.messages.set("stop", true);
|
|
1474
1499
|
}
|
|
1475
|
-
|
|
1500
|
+
let treeChanged = tree;
|
|
1501
|
+
if (tree.kind == tree_1.JS.Kind.JsxTag) {
|
|
1502
|
+
const tag = tree;
|
|
1503
|
+
if (this.cursor.messages.get("jsxTagWithNewline")) {
|
|
1504
|
+
const jsxTagIndent = this.cursor.messages.get("jsxTagIndent");
|
|
1505
|
+
if (jsxTagIndent) {
|
|
1506
|
+
this.cursor.messages.delete("jsxTagWithNewline");
|
|
1507
|
+
treeChanged = (0, immer_1.produce)(tag, draft => {
|
|
1508
|
+
if (draft.children) {
|
|
1509
|
+
const lastChild = draft.children[draft.children.length - 1];
|
|
1510
|
+
if (lastChild.kind === java_1.J.Kind.Literal) {
|
|
1511
|
+
lastChild.prefix.whitespace = this.combineIndent(lastChild.prefix.whitespace, jsxTagIndent);
|
|
1512
|
+
}
|
|
1513
|
+
}
|
|
1514
|
+
});
|
|
1515
|
+
}
|
|
1516
|
+
}
|
|
1517
|
+
}
|
|
1518
|
+
return _super.postVisit.call(this, treeChanged, p);
|
|
1476
1519
|
});
|
|
1477
1520
|
}
|
|
1478
1521
|
}
|