@openrewrite/rewrite 8.70.0-20251222-160244 → 8.70.0-20251222-213047
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/index.js +8 -8
- package/dist/index.js.map +1 -1
- package/dist/java/formatting-utils.d.ts +1 -1
- package/dist/java/formatting-utils.js +4 -4
- package/dist/java/formatting-utils.js.map +1 -1
- package/dist/java/markers.js +8 -8
- package/dist/java/markers.js.map +1 -1
- package/dist/java/type-visitor.d.ts +0 -3
- package/dist/java/type-visitor.d.ts.map +1 -1
- package/dist/java/type-visitor.js +67 -68
- package/dist/java/type-visitor.js.map +1 -1
- package/dist/java/visitor.d.ts +3 -3
- package/dist/java/visitor.d.ts.map +1 -1
- package/dist/java/visitor.js +5 -5
- package/dist/java/visitor.js.map +1 -1
- package/dist/javascript/assertions.js +4 -3
- package/dist/javascript/assertions.js.map +1 -1
- package/dist/javascript/cleanup/use-object-property-shorthand.js +3 -3
- package/dist/javascript/cleanup/use-object-property-shorthand.js.map +1 -1
- package/dist/javascript/format/format.d.ts +28 -7
- package/dist/javascript/format/format.d.ts.map +1 -1
- package/dist/javascript/format/format.js +149 -158
- package/dist/javascript/format/format.js.map +1 -1
- package/dist/javascript/format/minimum-viable-spacing-visitor.js +23 -23
- package/dist/javascript/format/minimum-viable-spacing-visitor.js.map +1 -1
- package/dist/javascript/format/prettier-format.d.ts.map +1 -1
- package/dist/javascript/format/prettier-format.js +8 -11
- package/dist/javascript/format/prettier-format.js.map +1 -1
- package/dist/javascript/format/tabs-and-indents-visitor.js +7 -7
- package/dist/javascript/format/tabs-and-indents-visitor.js.map +1 -1
- package/dist/javascript/format/whitespace-reconciler.d.ts.map +1 -1
- package/dist/javascript/format/whitespace-reconciler.js +12 -11
- package/dist/javascript/format/whitespace-reconciler.js.map +1 -1
- package/dist/javascript/markers.d.ts.map +1 -1
- package/dist/javascript/markers.js +6 -5
- package/dist/javascript/markers.js.map +1 -1
- package/dist/javascript/migrate/es6/modernize-octal-escape-sequences.js +2 -2
- package/dist/javascript/migrate/es6/modernize-octal-escape-sequences.js.map +1 -1
- package/dist/javascript/migrate/es6/modernize-octal-literals.js +2 -2
- package/dist/javascript/migrate/es6/modernize-octal-literals.js.map +1 -1
- package/dist/javascript/migrate/es6/remove-duplicate-object-keys.js +2 -2
- package/dist/javascript/migrate/es6/remove-duplicate-object-keys.js.map +1 -1
- package/dist/javascript/migrate/typescript/export-assignment-to-export-default.js +2 -2
- package/dist/javascript/migrate/typescript/export-assignment-to-export-default.js.map +1 -1
- package/dist/javascript/node-resolution-result.js +3 -9
- package/dist/javascript/node-resolution-result.js.map +1 -1
- package/dist/javascript/parser.d.ts.map +1 -1
- package/dist/javascript/parser.js +35 -35
- package/dist/javascript/parser.js.map +1 -1
- package/dist/javascript/project-parser.d.ts.map +1 -1
- package/dist/javascript/project-parser.js +6 -5
- package/dist/javascript/project-parser.js.map +1 -1
- package/dist/javascript/recipes/auto-format.d.ts +7 -23
- package/dist/javascript/recipes/auto-format.d.ts.map +1 -1
- package/dist/javascript/recipes/auto-format.js +8 -54
- package/dist/javascript/recipes/auto-format.js.map +1 -1
- package/dist/javascript/recipes/change-import.js +8 -8
- package/dist/javascript/recipes/change-import.js.map +1 -1
- package/dist/javascript/recipes/order-imports.js +4 -4
- package/dist/javascript/recipes/order-imports.js.map +1 -1
- package/dist/javascript/templating/engine.js +2 -2
- package/dist/javascript/templating/engine.js.map +1 -1
- package/dist/javascript/templating/index.d.ts +1 -0
- package/dist/javascript/templating/index.d.ts.map +1 -1
- package/dist/javascript/templating/index.js +4 -1
- package/dist/javascript/templating/index.js.map +1 -1
- package/dist/javascript/templating/placeholder-replacement.js +16 -16
- package/dist/javascript/templating/placeholder-replacement.js.map +1 -1
- package/dist/javascript/type-mapping.d.ts.map +1 -1
- package/dist/javascript/type-mapping.js +49 -58
- package/dist/javascript/type-mapping.js.map +1 -1
- package/dist/javascript/visitor.d.ts +3 -3
- package/dist/javascript/visitor.d.ts.map +1 -1
- package/dist/javascript/visitor.js +3 -3
- package/dist/javascript/visitor.js.map +1 -1
- package/dist/json/rpc.js +48 -49
- package/dist/json/rpc.js.map +1 -1
- package/dist/json/visitor.d.ts +3 -3
- package/dist/json/visitor.d.ts.map +1 -1
- package/dist/json/visitor.js +3 -3
- package/dist/json/visitor.js.map +1 -1
- package/dist/parse-error.js +11 -11
- package/dist/parse-error.js.map +1 -1
- package/dist/reference.d.ts.map +1 -1
- package/dist/reference.js +0 -3
- package/dist/reference.js.map +1 -1
- package/dist/rpc/index.js +42 -42
- package/dist/rpc/index.js.map +1 -1
- package/dist/rpc/queue.d.ts.map +1 -1
- package/dist/rpc/queue.js +6 -8
- package/dist/rpc/queue.js.map +1 -1
- package/dist/rpc/request/install-recipes.js +1 -1
- package/dist/rpc/request/install-recipes.js.map +1 -1
- package/dist/rpc/request/parse-project.d.ts.map +1 -1
- package/dist/rpc/request/parse-project.js +12 -32
- package/dist/rpc/request/parse-project.js.map +1 -1
- package/dist/rpc/request/parse.d.ts.map +1 -1
- package/dist/rpc/request/parse.js +1 -4
- package/dist/rpc/request/parse.js.map +1 -1
- package/dist/text/rpc.js +18 -18
- package/dist/text/rpc.js.map +1 -1
- package/dist/version.txt +1 -1
- package/dist/visitor.d.ts +6 -4
- package/dist/visitor.d.ts.map +1 -1
- package/dist/visitor.js +19 -17
- package/dist/visitor.js.map +1 -1
- package/dist/yaml/rpc.js +65 -65
- package/dist/yaml/rpc.js.map +1 -1
- package/package.json +2 -2
- package/src/index.ts +8 -8
- package/src/java/formatting-utils.ts +2 -2
- package/src/java/markers.ts +8 -8
- package/src/java/type-visitor.ts +59 -68
- package/src/java/visitor.ts +8 -8
- package/src/javascript/assertions.ts +3 -3
- package/src/javascript/cleanup/use-object-property-shorthand.ts +1 -1
- package/src/javascript/format/format.ts +109 -107
- package/src/javascript/format/minimum-viable-spacing-visitor.ts +1 -1
- package/src/javascript/format/prettier-format.ts +9 -12
- package/src/javascript/format/tabs-and-indents-visitor.ts +1 -1
- package/src/javascript/format/whitespace-reconciler.ts +12 -11
- package/src/javascript/markers.ts +6 -6
- package/src/javascript/migrate/es6/modernize-octal-escape-sequences.ts +1 -1
- package/src/javascript/migrate/es6/modernize-octal-literals.ts +1 -1
- package/src/javascript/migrate/es6/remove-duplicate-object-keys.ts +1 -1
- package/src/javascript/migrate/typescript/export-assignment-to-export-default.ts +1 -1
- package/src/javascript/node-resolution-result.ts +8 -14
- package/src/javascript/parser.ts +5 -4
- package/src/javascript/project-parser.ts +4 -4
- package/src/javascript/recipes/auto-format.ts +9 -71
- package/src/javascript/recipes/change-import.ts +4 -4
- package/src/javascript/recipes/order-imports.ts +1 -1
- package/src/javascript/templating/engine.ts +1 -1
- package/src/javascript/templating/index.ts +5 -0
- package/src/javascript/templating/placeholder-replacement.ts +2 -2
- package/src/javascript/type-mapping.ts +28 -34
- package/src/javascript/visitor.ts +6 -6
- package/src/json/rpc.ts +51 -52
- package/src/json/visitor.ts +6 -6
- package/src/parse-error.ts +11 -11
- package/src/reference.ts +0 -5
- package/src/rpc/index.ts +43 -43
- package/src/rpc/queue.ts +6 -8
- package/src/rpc/request/install-recipes.ts +1 -1
- package/src/rpc/request/parse-project.ts +20 -32
- package/src/rpc/request/parse.ts +1 -4
- package/src/text/rpc.ts +18 -18
- package/src/visitor.ts +29 -30
- package/src/yaml/rpc.ts +80 -81
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/javascript/templating/index.ts"],"names":[],"mappings":"AAiBA,YAAY,EACR,eAAe,EACf,cAAc,EACd,OAAO,EACP,GAAG,EACH,aAAa,EACb,cAAc,EACd,YAAY,EACZ,iBAAiB,EACjB,eAAe,EACf,WAAW,EACX,aAAa,EACb,YAAY,EACZ,aAAa,EACb,gBAAgB,EAChB,kBAAkB,EACrB,MAAM,SAAS,CAAC;AAGjB,OAAO,EACH,GAAG,EACH,EAAE,EACF,GAAG,EACH,OAAO,EACP,GAAG,EACH,KAAK,EACL,GAAG,EACH,CAAC,EACJ,MAAM,WAAW,CAAC;AAGnB,OAAO,EACH,OAAO,EACP,cAAc,EACd,WAAW,EACX,OAAO,EACV,MAAM,WAAW,CAAC;AAGnB,OAAO,EACH,OAAO,EACP,UAAU,EACV,YAAY,EACf,MAAM,WAAW,CAAC;AAGnB,OAAO,EACH,QAAQ,EACR,eAAe,EACf,QAAQ,EACX,MAAM,YAAY,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/javascript/templating/index.ts"],"names":[],"mappings":"AAiBA,YAAY,EACR,eAAe,EACf,cAAc,EACd,OAAO,EACP,GAAG,EACH,aAAa,EACb,cAAc,EACd,YAAY,EACZ,iBAAiB,EACjB,eAAe,EACf,WAAW,EACX,aAAa,EACb,YAAY,EACZ,aAAa,EACb,gBAAgB,EAChB,kBAAkB,EACrB,MAAM,SAAS,CAAC;AAGjB,OAAO,EACH,GAAG,EACH,EAAE,EACF,GAAG,EACH,OAAO,EACP,GAAG,EACH,KAAK,EACL,GAAG,EACH,CAAC,EACJ,MAAM,WAAW,CAAC;AAGnB,OAAO,EACH,OAAO,EACP,cAAc,EACd,WAAW,EACX,OAAO,EACV,MAAM,WAAW,CAAC;AAGnB,OAAO,EACH,OAAO,EACP,UAAU,EACV,YAAY,EACf,MAAM,WAAW,CAAC;AAGnB,OAAO,EACH,QAAQ,EACR,eAAe,EACf,QAAQ,EACX,MAAM,YAAY,CAAC;AAGpB,OAAO,EACH,kBAAkB,EACrB,MAAM,UAAU,CAAC"}
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
* limitations under the License.
|
|
16
16
|
*/
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
-
exports.template = exports.TemplateBuilder = exports.Template = exports.flattenBlock = exports.fromRecipe = exports.rewrite = exports.pattern = exports.MatchResult = exports.PatternBuilder = exports.Pattern = exports._ = exports.raw = exports.param = exports.any = exports.capture = exports.not = exports.or = exports.and = void 0;
|
|
18
|
+
exports.clearTemplateCache = exports.template = exports.TemplateBuilder = exports.Template = exports.flattenBlock = exports.fromRecipe = exports.rewrite = exports.pattern = exports.MatchResult = exports.PatternBuilder = exports.Pattern = exports._ = exports.raw = exports.param = exports.any = exports.capture = exports.not = exports.or = exports.and = void 0;
|
|
19
19
|
// Export capture functionality
|
|
20
20
|
var capture_1 = require("./capture");
|
|
21
21
|
Object.defineProperty(exports, "and", { enumerable: true, get: function () { return capture_1.and; } });
|
|
@@ -42,4 +42,7 @@ var template_1 = require("./template");
|
|
|
42
42
|
Object.defineProperty(exports, "Template", { enumerable: true, get: function () { return template_1.Template; } });
|
|
43
43
|
Object.defineProperty(exports, "TemplateBuilder", { enumerable: true, get: function () { return template_1.TemplateBuilder; } });
|
|
44
44
|
Object.defineProperty(exports, "template", { enumerable: true, get: function () { return template_1.template; } });
|
|
45
|
+
// Export engine utilities (for testing)
|
|
46
|
+
var engine_1 = require("./engine");
|
|
47
|
+
Object.defineProperty(exports, "clearTemplateCache", { enumerable: true, get: function () { return engine_1.clearTemplateCache; } });
|
|
45
48
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/javascript/templating/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAqBH,+BAA+B;AAC/B,qCASmB;AARf,8FAAA,GAAG,OAAA;AACH,6FAAA,EAAE,OAAA;AACF,8FAAA,GAAG,OAAA;AACH,kGAAA,OAAO,OAAA;AACP,8FAAA,GAAG,OAAA;AACH,gGAAA,KAAK,OAAA;AACL,8FAAA,GAAG,OAAA;AACH,4FAAA,CAAC,OAAA;AAGL,+BAA+B;AAC/B,qCAKmB;AAJf,kGAAA,OAAO,OAAA;AACP,yGAAA,cAAc,OAAA;AACd,sGAAA,WAAW,OAAA;AACX,kGAAA,OAAO,OAAA;AAGX,+BAA+B;AAC/B,qCAImB;AAHf,kGAAA,OAAO,OAAA;AACP,qGAAA,UAAU,OAAA;AACV,uGAAA,YAAY,OAAA;AAGhB,gCAAgC;AAChC,uCAIoB;AAHhB,oGAAA,QAAQ,OAAA;AACR,2GAAA,eAAe,OAAA;AACf,oGAAA,QAAQ,OAAA"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/javascript/templating/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAqBH,+BAA+B;AAC/B,qCASmB;AARf,8FAAA,GAAG,OAAA;AACH,6FAAA,EAAE,OAAA;AACF,8FAAA,GAAG,OAAA;AACH,kGAAA,OAAO,OAAA;AACP,8FAAA,GAAG,OAAA;AACH,gGAAA,KAAK,OAAA;AACL,8FAAA,GAAG,OAAA;AACH,4FAAA,CAAC,OAAA;AAGL,+BAA+B;AAC/B,qCAKmB;AAJf,kGAAA,OAAO,OAAA;AACP,yGAAA,cAAc,OAAA;AACd,sGAAA,WAAW,OAAA;AACX,kGAAA,OAAO,OAAA;AAGX,+BAA+B;AAC/B,qCAImB;AAHf,kGAAA,OAAO,OAAA;AACP,qGAAA,UAAU,OAAA;AACV,uGAAA,YAAY,OAAA;AAGhB,gCAAgC;AAChC,uCAIoB;AAHhB,oGAAA,QAAQ,OAAA;AACR,2GAAA,eAAe,OAAA;AACf,oGAAA,QAAQ,OAAA;AAGZ,wCAAwC;AACxC,mCAEkB;AADd,4GAAA,kBAAkB,OAAA"}
|
|
@@ -29,7 +29,7 @@ const __1 = require("../..");
|
|
|
29
29
|
const java_1 = require("../../java");
|
|
30
30
|
const __2 = require("..");
|
|
31
31
|
const visitor_1 = require("../visitor");
|
|
32
|
-
const
|
|
32
|
+
const mutative_1 = require("mutative");
|
|
33
33
|
const utils_1 = require("./utils");
|
|
34
34
|
const capture_1 = require("./capture");
|
|
35
35
|
/**
|
|
@@ -70,7 +70,7 @@ class PlaceholderReplacementVisitor extends visitor_1.JavaScriptVisitor {
|
|
|
70
70
|
// If the name changed (placeholder was replaced), preserve the BindingElement structure
|
|
71
71
|
// including the propertyName from the template
|
|
72
72
|
if (visitedName !== bindingElement.name) {
|
|
73
|
-
return (0,
|
|
73
|
+
return (0, mutative_1.create)(bindingElement, draft => {
|
|
74
74
|
draft.name = visitedName;
|
|
75
75
|
// propertyName is already set from the template and will be preserved by produce
|
|
76
76
|
});
|
|
@@ -94,7 +94,7 @@ class PlaceholderReplacementVisitor extends visitor_1.JavaScriptVisitor {
|
|
|
94
94
|
}
|
|
95
95
|
// Expand variadic placeholders in the container's elements
|
|
96
96
|
const newElements = yield this.expandVariadicElements(container.elements, undefined, p);
|
|
97
|
-
return (0,
|
|
97
|
+
return (0, mutative_1.create)(container, draft => {
|
|
98
98
|
draft.elements = newElements;
|
|
99
99
|
});
|
|
100
100
|
});
|
|
@@ -142,7 +142,7 @@ class PlaceholderReplacementVisitor extends visitor_1.JavaScriptVisitor {
|
|
|
142
142
|
return element;
|
|
143
143
|
};
|
|
144
144
|
const newStatements = yield this.expandVariadicElements(block.statements, unwrapStatement, p);
|
|
145
|
-
return (0,
|
|
145
|
+
return (0, mutative_1.create)(block, draft => {
|
|
146
146
|
draft.statements = newStatements;
|
|
147
147
|
});
|
|
148
148
|
});
|
|
@@ -162,7 +162,7 @@ class PlaceholderReplacementVisitor extends visitor_1.JavaScriptVisitor {
|
|
|
162
162
|
return _super.visitJsCompilationUnit.call(this, compilationUnit, p);
|
|
163
163
|
}
|
|
164
164
|
const newStatements = yield this.expandVariadicElements(compilationUnit.statements, undefined, p);
|
|
165
|
-
return (0,
|
|
165
|
+
return (0, mutative_1.create)(compilationUnit, draft => {
|
|
166
166
|
draft.statements = newStatements;
|
|
167
167
|
});
|
|
168
168
|
});
|
|
@@ -262,10 +262,10 @@ class PlaceholderReplacementVisitor extends visitor_1.JavaScriptVisitor {
|
|
|
262
262
|
const isWrapper = item && typeof item === 'object' && 'element' in item && 'after' in item && item.element != null;
|
|
263
263
|
if (isWrapper) {
|
|
264
264
|
// Item is a JRightPadded wrapper - use it directly to preserve markers
|
|
265
|
-
newElements.push((0,
|
|
265
|
+
newElements.push((0, mutative_1.create)(item, draft => {
|
|
266
266
|
if (i === 0 && draft.element) {
|
|
267
267
|
// Merge the placeholder's prefix with the first item's prefix
|
|
268
|
-
// Modify prefix directly
|
|
268
|
+
// Modify prefix directly within the draft
|
|
269
269
|
draft.element.prefix = this.mergePrefix(draft.element.prefix, element.prefix);
|
|
270
270
|
}
|
|
271
271
|
// Keep all other wrapper properties (including markers with Semicolon)
|
|
@@ -274,8 +274,8 @@ class PlaceholderReplacementVisitor extends visitor_1.JavaScriptVisitor {
|
|
|
274
274
|
else if (item) {
|
|
275
275
|
// Item is just an element (not a wrapper) - wrap it (backward compatibility)
|
|
276
276
|
const elem = item;
|
|
277
|
-
newElements.push((0,
|
|
278
|
-
draft.element = (0,
|
|
277
|
+
newElements.push((0, mutative_1.create)(wrapped, draft => {
|
|
278
|
+
draft.element = (0, mutative_1.create)(elem, itemDraft => {
|
|
279
279
|
if (i === 0) {
|
|
280
280
|
itemDraft.prefix = this.mergePrefix(elem.prefix, element.prefix);
|
|
281
281
|
}
|
|
@@ -316,7 +316,7 @@ class PlaceholderReplacementVisitor extends visitor_1.JavaScriptVisitor {
|
|
|
316
316
|
}
|
|
317
317
|
}
|
|
318
318
|
}
|
|
319
|
-
newElements.push((0,
|
|
319
|
+
newElements.push((0, mutative_1.create)(wrapperToUse, draft => {
|
|
320
320
|
draft.element = replacedElement;
|
|
321
321
|
}));
|
|
322
322
|
}
|
|
@@ -372,20 +372,20 @@ class PlaceholderReplacementVisitor extends visitor_1.JavaScriptVisitor {
|
|
|
372
372
|
// If the property value is already a J node, use it
|
|
373
373
|
if ((0, __1.isTree)(propertyValue)) {
|
|
374
374
|
const propValueAsJ = propertyValue;
|
|
375
|
-
return (0,
|
|
375
|
+
return (0, mutative_1.create)(propValueAsJ, draft => {
|
|
376
376
|
draft.markers = placeholder.markers;
|
|
377
377
|
draft.prefix = this.mergePrefix(propValueAsJ.prefix, placeholder.prefix);
|
|
378
378
|
});
|
|
379
379
|
}
|
|
380
380
|
// If it's a primitive value and placeholder is an identifier, update the simpleName
|
|
381
381
|
if (typeof propertyValue === 'string' && placeholder.kind === java_1.J.Kind.Identifier) {
|
|
382
|
-
return (0,
|
|
382
|
+
return (0, mutative_1.create)(placeholder, draft => {
|
|
383
383
|
draft.simpleName = propertyValue;
|
|
384
384
|
});
|
|
385
385
|
}
|
|
386
386
|
// If it's a primitive value and placeholder is a literal, update the value
|
|
387
387
|
if (typeof propertyValue === 'string' && placeholder.kind === java_1.J.Kind.Literal) {
|
|
388
|
-
return (0,
|
|
388
|
+
return (0, mutative_1.create)(placeholder, draft => {
|
|
389
389
|
draft.value = propertyValue;
|
|
390
390
|
draft.valueSource = `"${propertyValue}"`;
|
|
391
391
|
});
|
|
@@ -404,7 +404,7 @@ class PlaceholderReplacementVisitor extends visitor_1.JavaScriptVisitor {
|
|
|
404
404
|
(param.value[capture_1.CAPTURE_NAME_SYMBOL] || param.value.name);
|
|
405
405
|
const matchedNode = this.values.get(name);
|
|
406
406
|
if (matchedNode && !Array.isArray(matchedNode)) {
|
|
407
|
-
return (0,
|
|
407
|
+
return (0, mutative_1.create)(matchedNode, draft => {
|
|
408
408
|
draft.markers = placeholder.markers;
|
|
409
409
|
draft.prefix = this.mergePrefix(matchedNode.prefix, placeholder.prefix);
|
|
410
410
|
});
|
|
@@ -418,7 +418,7 @@ class PlaceholderReplacementVisitor extends visitor_1.JavaScriptVisitor {
|
|
|
418
418
|
if (isRightPadded) {
|
|
419
419
|
// Extract the element from the J.RightPadded wrapper
|
|
420
420
|
const element = param.value.element;
|
|
421
|
-
return (0,
|
|
421
|
+
return (0, mutative_1.create)(element, draft => {
|
|
422
422
|
draft.markers = placeholder.markers;
|
|
423
423
|
draft.prefix = this.mergePrefix(element.prefix, placeholder.prefix);
|
|
424
424
|
});
|
|
@@ -435,7 +435,7 @@ class PlaceholderReplacementVisitor extends visitor_1.JavaScriptVisitor {
|
|
|
435
435
|
// If the parameter value is an AST node, use it directly
|
|
436
436
|
if ((0, __1.isTree)(param.value)) {
|
|
437
437
|
// Return the AST node, preserving comments from the source
|
|
438
|
-
return (0,
|
|
438
|
+
return (0, mutative_1.create)(param.value, draft => {
|
|
439
439
|
draft.markers = placeholder.markers;
|
|
440
440
|
draft.prefix = this.mergePrefix(param.value.prefix, placeholder.prefix);
|
|
441
441
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"placeholder-replacement.js","sourceRoot":"","sources":["../../../src/javascript/templating/placeholder-replacement.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"placeholder-replacement.js","sourceRoot":"","sources":["../../../src/javascript/templating/placeholder-replacement.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"type-mapping.d.ts","sourceRoot":"","sources":["../../src/javascript/type-mapping.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,EAAC,IAAI,EAAC,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"type-mapping.d.ts","sourceRoot":"","sources":["../../src/javascript/type-mapping.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,EAAC,IAAI,EAAC,MAAM,SAAS,CAAC;AAG7B,qBAAa,qBAAqB;IAa1B,OAAO,CAAC,QAAQ,CAAC,OAAO;IAV5B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAyC;IACnE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAuC;IAEnE,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAwB;IACrD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAsB;IACxD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAsB;IACxD,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAsB;gBAIpC,OAAO,EAAE,EAAE,CAAC,WAAW;IA4B5C,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,GAAG,IAAI,GAAG,SAAS;IAoBrC,OAAO,CAAC,OAAO;IAuNf,OAAO,CAAC,YAAY;IA4BpB,aAAa,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,GAAG,IAAI,CAAC,SAAS;IAQ5C,YAAY,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,GAAG,IAAI,CAAC,QAAQ,GAAG,SAAS;IAoKtD;;;;;;;;;;OAUG;IACH,OAAO,CAAC,yBAAyB;IAkDjC;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAmDxB,OAAO,CAAC,WAAW;IAanB,UAAU,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,GAAG,IAAI,CAAC,MAAM,GAAG,SAAS;IA0TlD;;;;;OAKG;IACH,OAAO,CAAC,qBAAqB;IA6F7B;;;OAGG;IACH,OAAO,CAAC,oBAAoB;IAkC5B;;;OAGG;IACH,OAAO,CAAC,iBAAiB;IA6HzB;;;OAGG;IACH,OAAO,CAAC,4BAA4B;IA4CpC;;;OAGG;IACH,OAAO,CAAC,eAAe;IAqBvB;;;OAGG;IACH,OAAO,CAAC,sBAAsB;IAqB9B;;;;OAIG;IACH,OAAO,CAAC,yBAAyB;IAmCjC;;;OAGG;IACH,OAAO,CAAC,uBAAuB;IAiB/B;;;;;OAKG;IACH,OAAO,CAAC,oBAAoB;CA8D/B"}
|
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
|
-
var _a;
|
|
6
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
6
|
exports.JavaScriptTypeMapping = void 0;
|
|
8
7
|
/*
|
|
@@ -22,15 +21,7 @@ exports.JavaScriptTypeMapping = void 0;
|
|
|
22
21
|
*/
|
|
23
22
|
const typescript_1 = __importDefault(require("typescript"));
|
|
24
23
|
const java_1 = require("../java");
|
|
25
|
-
const immer_1 = require("immer");
|
|
26
24
|
var FUNCTION_TYPE_NAME = java_1.Type.FUNCTION_TYPE_NAME;
|
|
27
|
-
// Helper class to create Type objects that immer won't traverse
|
|
28
|
-
class NonDraftableType {
|
|
29
|
-
constructor() {
|
|
30
|
-
this[_a] = false;
|
|
31
|
-
}
|
|
32
|
-
}
|
|
33
|
-
_a = immer_1.immerable;
|
|
34
25
|
class JavaScriptTypeMapping {
|
|
35
26
|
constructor(checker) {
|
|
36
27
|
this.checker = checker;
|
|
@@ -74,7 +65,7 @@ class JavaScriptTypeMapping {
|
|
|
74
65
|
return type && this.getType(type);
|
|
75
66
|
}
|
|
76
67
|
getType(type) {
|
|
77
|
-
var
|
|
68
|
+
var _a;
|
|
78
69
|
// Check for error types first - these indicate type-checking failures
|
|
79
70
|
// and should not be processed further
|
|
80
71
|
if (type.flags & typescript_1.default.TypeFlags.Any) {
|
|
@@ -120,7 +111,7 @@ class JavaScriptTypeMapping {
|
|
|
120
111
|
return java_1.Type.Primitive.Boolean;
|
|
121
112
|
}
|
|
122
113
|
// Get symbol for later use in type detection
|
|
123
|
-
const symbol = (
|
|
114
|
+
const symbol = (_a = type.getSymbol) === null || _a === void 0 ? void 0 : _a.call(type);
|
|
124
115
|
// IMPORTANT: Check if this is a type reference to a parameterized type FIRST
|
|
125
116
|
if (type.flags & typescript_1.default.TypeFlags.Object) {
|
|
126
117
|
const objectType = type;
|
|
@@ -155,7 +146,7 @@ class JavaScriptTypeMapping {
|
|
|
155
146
|
typeParameters.push(resolvedArg);
|
|
156
147
|
}
|
|
157
148
|
// Create the parameterized type wrapper
|
|
158
|
-
const parameterized =
|
|
149
|
+
const parameterized = {
|
|
159
150
|
kind: java_1.Type.Kind.Parameterized,
|
|
160
151
|
type: classType,
|
|
161
152
|
typeParameters: typeParameters,
|
|
@@ -163,7 +154,7 @@ class JavaScriptTypeMapping {
|
|
|
163
154
|
toJSON: function () {
|
|
164
155
|
return java_1.Type.signature(this);
|
|
165
156
|
}
|
|
166
|
-
}
|
|
157
|
+
};
|
|
167
158
|
// Cache the parameterized type
|
|
168
159
|
this.typeCache.set(signature, parameterized);
|
|
169
160
|
return parameterized;
|
|
@@ -260,7 +251,7 @@ class JavaScriptTypeMapping {
|
|
|
260
251
|
return result;
|
|
261
252
|
}
|
|
262
253
|
getSignature(type) {
|
|
263
|
-
var
|
|
254
|
+
var _a, _b;
|
|
264
255
|
// Try to use TypeScript's internal id if available
|
|
265
256
|
// TypeScript assigns stable IDs to all types, including parameterized, union, and intersection types
|
|
266
257
|
if ("id" in type && type.id !== undefined) {
|
|
@@ -268,9 +259,9 @@ class JavaScriptTypeMapping {
|
|
|
268
259
|
}
|
|
269
260
|
// Fallback: Generate a string signature based on type characteristics
|
|
270
261
|
const typeString = this.checker.typeToString(type);
|
|
271
|
-
const symbol = (
|
|
262
|
+
const symbol = (_a = type.getSymbol) === null || _a === void 0 ? void 0 : _a.call(type);
|
|
272
263
|
if (symbol) {
|
|
273
|
-
const declaration = symbol.valueDeclaration || ((
|
|
264
|
+
const declaration = symbol.valueDeclaration || ((_b = symbol.declarations) === null || _b === void 0 ? void 0 : _b[0]);
|
|
274
265
|
if (declaration) {
|
|
275
266
|
const sourceFile = declaration.getSourceFile();
|
|
276
267
|
const fileName = sourceFile.fileName;
|
|
@@ -362,7 +353,7 @@ class JavaScriptTypeMapping {
|
|
|
362
353
|
if (typescript_1.default.isStringLiteral(importDecl.moduleSpecifier)) {
|
|
363
354
|
const moduleSpecifier = importDecl.moduleSpecifier.text;
|
|
364
355
|
// Create a Type.Class representing the module
|
|
365
|
-
ownerType =
|
|
356
|
+
ownerType = {
|
|
366
357
|
kind: java_1.Type.Kind.Class,
|
|
367
358
|
flags: 0,
|
|
368
359
|
classKind: java_1.Type.Class.Kind.Interface,
|
|
@@ -375,7 +366,7 @@ class JavaScriptTypeMapping {
|
|
|
375
366
|
toJSON: function () {
|
|
376
367
|
return java_1.Type.signature(this);
|
|
377
368
|
}
|
|
378
|
-
}
|
|
369
|
+
};
|
|
379
370
|
}
|
|
380
371
|
}
|
|
381
372
|
}
|
|
@@ -405,7 +396,7 @@ class JavaScriptTypeMapping {
|
|
|
405
396
|
// Store the module as the owningClass for now
|
|
406
397
|
// (This is a bit of a hack, but works with the current type system)
|
|
407
398
|
if (java_1.Type.isClass(ownerType)) {
|
|
408
|
-
ownerType.owningClass =
|
|
399
|
+
ownerType.owningClass = {
|
|
409
400
|
kind: java_1.Type.Kind.Class,
|
|
410
401
|
flags: 0,
|
|
411
402
|
classKind: java_1.Type.Class.Kind.Interface,
|
|
@@ -418,7 +409,7 @@ class JavaScriptTypeMapping {
|
|
|
418
409
|
toJSON: function () {
|
|
419
410
|
return java_1.Type.signature(this);
|
|
420
411
|
}
|
|
421
|
-
}
|
|
412
|
+
};
|
|
422
413
|
}
|
|
423
414
|
}
|
|
424
415
|
}
|
|
@@ -428,7 +419,7 @@ class JavaScriptTypeMapping {
|
|
|
428
419
|
}
|
|
429
420
|
}
|
|
430
421
|
// Create the Type.Variable
|
|
431
|
-
const variable =
|
|
422
|
+
const variable = {
|
|
432
423
|
kind: java_1.Type.Kind.Variable,
|
|
433
424
|
name: actualSymbol.getName(),
|
|
434
425
|
owner: ownerType,
|
|
@@ -437,7 +428,7 @@ class JavaScriptTypeMapping {
|
|
|
437
428
|
toJSON: function () {
|
|
438
429
|
return java_1.Type.signature(this);
|
|
439
430
|
}
|
|
440
|
-
}
|
|
431
|
+
};
|
|
441
432
|
return variable;
|
|
442
433
|
}
|
|
443
434
|
/**
|
|
@@ -518,7 +509,7 @@ class JavaScriptTypeMapping {
|
|
|
518
509
|
parameterTypes.push(this.getType(paramType));
|
|
519
510
|
}
|
|
520
511
|
// Create the Type.Method object
|
|
521
|
-
const method =
|
|
512
|
+
const method = {
|
|
522
513
|
kind: java_1.Type.Kind.Method,
|
|
523
514
|
flags: 0, // FIXME - determine flags
|
|
524
515
|
declaringType: declaringType,
|
|
@@ -533,7 +524,7 @@ class JavaScriptTypeMapping {
|
|
|
533
524
|
toJSON: function () {
|
|
534
525
|
return java_1.Type.signature(this);
|
|
535
526
|
}
|
|
536
|
-
}
|
|
527
|
+
};
|
|
537
528
|
this.methodCache.set(cacheKey, method);
|
|
538
529
|
return method;
|
|
539
530
|
}
|
|
@@ -553,7 +544,7 @@ class JavaScriptTypeMapping {
|
|
|
553
544
|
}
|
|
554
545
|
}
|
|
555
546
|
methodType(node) {
|
|
556
|
-
var
|
|
547
|
+
var _a;
|
|
557
548
|
let signature;
|
|
558
549
|
let methodName;
|
|
559
550
|
let declaringType;
|
|
@@ -704,7 +695,7 @@ class JavaScriptTypeMapping {
|
|
|
704
695
|
if (aliasedSymbol && aliasedSymbol !== exprSymbol) {
|
|
705
696
|
// This is definitely an imported symbol
|
|
706
697
|
const aliasedParentSymbol = aliasedSymbol.parent;
|
|
707
|
-
if (aliasedParentSymbol && ((
|
|
698
|
+
if (aliasedParentSymbol && ((_a = aliasedParentSymbol.declarations) === null || _a === void 0 ? void 0 : _a[0]) &&
|
|
708
699
|
typescript_1.default.isModuleDeclaration(aliasedParentSymbol.declarations[0]) &&
|
|
709
700
|
typescript_1.default.isIdentifier(aliasedParentSymbol.declarations[0].name)) {
|
|
710
701
|
// For namespace imports, use the namespace symbol's `name` as the module specifier (e.g. `React` instead of `react`)
|
|
@@ -856,8 +847,8 @@ class JavaScriptTypeMapping {
|
|
|
856
847
|
* - _.LoDashStatic (not @types/lodash.LoDashStatic)
|
|
857
848
|
*/
|
|
858
849
|
getFullyQualifiedName(type) {
|
|
859
|
-
var
|
|
860
|
-
const symbol = (
|
|
850
|
+
var _a;
|
|
851
|
+
const symbol = (_a = type.getSymbol) === null || _a === void 0 ? void 0 : _a.call(type);
|
|
861
852
|
if (!symbol) {
|
|
862
853
|
return "unknown";
|
|
863
854
|
}
|
|
@@ -942,12 +933,12 @@ class JavaScriptTypeMapping {
|
|
|
942
933
|
* The shell will be populated later to handle circular references.
|
|
943
934
|
*/
|
|
944
935
|
createEmptyClassType(type) {
|
|
945
|
-
var
|
|
936
|
+
var _a;
|
|
946
937
|
// Use our getFullyQualifiedName method which uses TypeScript's built-in resolution
|
|
947
938
|
const fullyQualifiedName = this.getFullyQualifiedName(type);
|
|
948
939
|
// Determine the class kind based on symbol flags
|
|
949
940
|
let classKind = java_1.Type.Class.Kind.Interface; // Default to interface
|
|
950
|
-
const symbol = (
|
|
941
|
+
const symbol = (_a = type.getSymbol) === null || _a === void 0 ? void 0 : _a.call(type);
|
|
951
942
|
if (symbol) {
|
|
952
943
|
if (symbol.flags & typescript_1.default.SymbolFlags.Class) {
|
|
953
944
|
classKind = java_1.Type.Class.Kind.Class;
|
|
@@ -960,7 +951,7 @@ class JavaScriptTypeMapping {
|
|
|
960
951
|
}
|
|
961
952
|
}
|
|
962
953
|
// Create empty class type shell (no members yet to avoid recursion)
|
|
963
|
-
return
|
|
954
|
+
return {
|
|
964
955
|
kind: java_1.Type.Kind.Class,
|
|
965
956
|
flags: 0, // TODO - determine flags
|
|
966
957
|
classKind: classKind,
|
|
@@ -973,15 +964,15 @@ class JavaScriptTypeMapping {
|
|
|
973
964
|
toJSON: function () {
|
|
974
965
|
return java_1.Type.signature(this);
|
|
975
966
|
}
|
|
976
|
-
}
|
|
967
|
+
};
|
|
977
968
|
}
|
|
978
969
|
/**
|
|
979
970
|
* Populates the class type with members, methods, heritage, and type parameters
|
|
980
971
|
* Since the shell is already in the cache, any recursive references will find it
|
|
981
972
|
*/
|
|
982
973
|
populateClassType(classType, type) {
|
|
983
|
-
var _b, _c, _d, _e, _f, _g, _h
|
|
984
|
-
const symbol = (
|
|
974
|
+
var _a, _b, _c, _d, _e, _f, _g, _h;
|
|
975
|
+
const symbol = (_a = type.getSymbol) === null || _a === void 0 ? void 0 : _a.call(type);
|
|
985
976
|
// Try to get base types using TypeScript's getBaseTypes API
|
|
986
977
|
// This works for both local and external types (from node_modules)
|
|
987
978
|
if (type.flags & typescript_1.default.TypeFlags.Object) {
|
|
@@ -990,7 +981,7 @@ class JavaScriptTypeMapping {
|
|
|
990
981
|
const objectType = type;
|
|
991
982
|
if (objectType.objectFlags & (typescript_1.default.ObjectFlags.Class | typescript_1.default.ObjectFlags.Interface)) {
|
|
992
983
|
try {
|
|
993
|
-
baseTypes = (
|
|
984
|
+
baseTypes = (_c = (_b = this.checker).getBaseTypes) === null || _c === void 0 ? void 0 : _c.call(_b, type);
|
|
994
985
|
}
|
|
995
986
|
catch (e) {
|
|
996
987
|
// getBaseTypes might fail for some types, fall back to declaration-based extraction
|
|
@@ -1006,7 +997,7 @@ class JavaScriptTypeMapping {
|
|
|
1006
997
|
const declaredType = this.checker.getDeclaredTypeOfSymbol(classSymbol);
|
|
1007
998
|
if (declaredType && declaredType !== type) {
|
|
1008
999
|
try {
|
|
1009
|
-
baseTypes = (
|
|
1000
|
+
baseTypes = (_e = (_d = this.checker).getBaseTypes) === null || _e === void 0 ? void 0 : _e.call(_d, declaredType);
|
|
1010
1001
|
}
|
|
1011
1002
|
catch (e) {
|
|
1012
1003
|
// getBaseTypes might fail, fall back to declaration-based extraction
|
|
@@ -1019,7 +1010,7 @@ class JavaScriptTypeMapping {
|
|
|
1019
1010
|
const instanceType = this.checker.getDeclaredTypeOfSymbol(classSymbol);
|
|
1020
1011
|
if (instanceType && instanceType !== type) {
|
|
1021
1012
|
try {
|
|
1022
|
-
baseTypes = (
|
|
1013
|
+
baseTypes = (_g = (_f = this.checker).getBaseTypes) === null || _g === void 0 ? void 0 : _g.call(_f, instanceType);
|
|
1023
1014
|
}
|
|
1024
1015
|
catch (e) {
|
|
1025
1016
|
// getBaseTypes might fail, fall back to declaration-based extraction
|
|
@@ -1077,7 +1068,7 @@ class JavaScriptTypeMapping {
|
|
|
1077
1068
|
// Get properties and methods
|
|
1078
1069
|
const properties = this.checker.getPropertiesOfType(type);
|
|
1079
1070
|
for (const prop of properties) {
|
|
1080
|
-
const declaration = prop.valueDeclaration || ((
|
|
1071
|
+
const declaration = prop.valueDeclaration || ((_h = prop.declarations) === null || _h === void 0 ? void 0 : _h[0]);
|
|
1081
1072
|
if (!declaration) {
|
|
1082
1073
|
// Skip properties without declarations (synthetic/built-in properties)
|
|
1083
1074
|
continue;
|
|
@@ -1090,7 +1081,7 @@ class JavaScriptTypeMapping {
|
|
|
1090
1081
|
else {
|
|
1091
1082
|
// Create Type.Variable for fields/properties
|
|
1092
1083
|
const propType = this.checker.getTypeOfSymbolAtLocation(prop, declaration);
|
|
1093
|
-
const variable =
|
|
1084
|
+
const variable = {
|
|
1094
1085
|
kind: java_1.Type.Kind.Variable,
|
|
1095
1086
|
name: prop.getName(),
|
|
1096
1087
|
owner: classType, // Cyclic reference to the containing class (already in cache)
|
|
@@ -1099,7 +1090,7 @@ class JavaScriptTypeMapping {
|
|
|
1099
1090
|
toJSON: function () {
|
|
1100
1091
|
return java_1.Type.signature(this);
|
|
1101
1092
|
}
|
|
1102
|
-
}
|
|
1093
|
+
};
|
|
1103
1094
|
classType.members.push(variable);
|
|
1104
1095
|
}
|
|
1105
1096
|
}
|
|
@@ -1109,7 +1100,7 @@ class JavaScriptTypeMapping {
|
|
|
1109
1100
|
* This method should only be called for primitive and unknown types
|
|
1110
1101
|
*/
|
|
1111
1102
|
createPrimitiveOrUnknownType(type) {
|
|
1112
|
-
var
|
|
1103
|
+
var _a;
|
|
1113
1104
|
// Check for literals first
|
|
1114
1105
|
if (type.isLiteral()) {
|
|
1115
1106
|
if (type.isNumberLiteral()) {
|
|
@@ -1147,7 +1138,7 @@ class JavaScriptTypeMapping {
|
|
|
1147
1138
|
return java_1.Type.Primitive.Boolean;
|
|
1148
1139
|
}
|
|
1149
1140
|
// Check for type aliases that may resolve to primitives
|
|
1150
|
-
const symbol = (
|
|
1141
|
+
const symbol = (_a = type.getSymbol) === null || _a === void 0 ? void 0 : _a.call(type);
|
|
1151
1142
|
if (symbol && symbol.flags & typescript_1.default.SymbolFlags.TypeAlias) {
|
|
1152
1143
|
// Type aliases may resolve to primitive types
|
|
1153
1144
|
const aliasedType = this.checker.getDeclaredTypeOfSymbol(symbol);
|
|
@@ -1163,10 +1154,10 @@ class JavaScriptTypeMapping {
|
|
|
1163
1154
|
*/
|
|
1164
1155
|
createUnionType(unionType, cacheKey) {
|
|
1165
1156
|
// Shell-cache FIRST to prevent infinite recursion (before resolving constituent types)
|
|
1166
|
-
const union =
|
|
1157
|
+
const union = {
|
|
1167
1158
|
kind: java_1.Type.Kind.Union,
|
|
1168
1159
|
bounds: []
|
|
1169
|
-
}
|
|
1160
|
+
};
|
|
1170
1161
|
this.typeCache.set(cacheKey, union);
|
|
1171
1162
|
// Now map all constituent types (may recursively reference this union)
|
|
1172
1163
|
const bounds = [];
|
|
@@ -1183,10 +1174,10 @@ class JavaScriptTypeMapping {
|
|
|
1183
1174
|
*/
|
|
1184
1175
|
createIntersectionType(intersectionType, cacheKey) {
|
|
1185
1176
|
// Shell-cache FIRST to prevent infinite recursion (before resolving constituent types)
|
|
1186
|
-
const intersection =
|
|
1177
|
+
const intersection = {
|
|
1187
1178
|
kind: java_1.Type.Kind.Intersection,
|
|
1188
1179
|
bounds: []
|
|
1189
|
-
}
|
|
1180
|
+
};
|
|
1190
1181
|
this.typeCache.set(cacheKey, intersection);
|
|
1191
1182
|
// Now map all constituent types (may recursively reference this intersection)
|
|
1192
1183
|
const bounds = [];
|
|
@@ -1206,12 +1197,12 @@ class JavaScriptTypeMapping {
|
|
|
1206
1197
|
const symbol = typeParam.getSymbol();
|
|
1207
1198
|
const name = symbol ? symbol.getName() : '?';
|
|
1208
1199
|
// Shell-cache: Create stub, cache it, then populate (prevents cycles)
|
|
1209
|
-
const gtv =
|
|
1200
|
+
const gtv = {
|
|
1210
1201
|
kind: java_1.Type.Kind.GenericTypeVariable,
|
|
1211
1202
|
name: name,
|
|
1212
1203
|
variance: java_1.Type.GenericTypeVariable.Variance.Invariant,
|
|
1213
1204
|
bounds: []
|
|
1214
|
-
}
|
|
1205
|
+
};
|
|
1215
1206
|
this.typeCache.set(cacheKey, gtv);
|
|
1216
1207
|
// Get the constraint (upper bound) if it exists
|
|
1217
1208
|
const constraint = typeParam.getConstraint();
|
|
@@ -1235,7 +1226,7 @@ class JavaScriptTypeMapping {
|
|
|
1235
1226
|
* The shell will be populated later to handle circular references.
|
|
1236
1227
|
*/
|
|
1237
1228
|
createEmptyFunctionType() {
|
|
1238
|
-
return
|
|
1229
|
+
return {
|
|
1239
1230
|
kind: java_1.Type.Kind.Class,
|
|
1240
1231
|
flags: 0,
|
|
1241
1232
|
classKind: java_1.Type.Class.Kind.Interface,
|
|
@@ -1248,7 +1239,7 @@ class JavaScriptTypeMapping {
|
|
|
1248
1239
|
toJSON: function () {
|
|
1249
1240
|
return java_1.Type.signature(this);
|
|
1250
1241
|
}
|
|
1251
|
-
}
|
|
1242
|
+
};
|
|
1252
1243
|
}
|
|
1253
1244
|
/**
|
|
1254
1245
|
* Populate a function type with signature information.
|
|
@@ -1257,14 +1248,14 @@ class JavaScriptTypeMapping {
|
|
|
1257
1248
|
* Since the shell is already in the cache, any recursive references will find it.
|
|
1258
1249
|
*/
|
|
1259
1250
|
populateFunctionType(functionClass, signature) {
|
|
1260
|
-
var
|
|
1251
|
+
var _a;
|
|
1261
1252
|
const returnType = this.getType(signature.getReturnType());
|
|
1262
1253
|
const parameters = signature.getParameters();
|
|
1263
1254
|
const parameterTypes = [];
|
|
1264
1255
|
const parameterNames = [];
|
|
1265
1256
|
// Get parameter types
|
|
1266
1257
|
for (const param of parameters) {
|
|
1267
|
-
const declaration = param.valueDeclaration || ((
|
|
1258
|
+
const declaration = param.valueDeclaration || ((_a = param.declarations) === null || _a === void 0 ? void 0 : _a[0]);
|
|
1268
1259
|
if (declaration) {
|
|
1269
1260
|
const paramType = this.checker.getTypeOfSymbolAtLocation(param, declaration);
|
|
1270
1261
|
parameterTypes.push(this.getType(paramType));
|
|
@@ -1276,24 +1267,24 @@ class JavaScriptTypeMapping {
|
|
|
1276
1267
|
// - Parameter types are contravariant (P1, P2, ...)
|
|
1277
1268
|
const typeParameters = [];
|
|
1278
1269
|
// Return type parameter (covariant)
|
|
1279
|
-
typeParameters.push(
|
|
1270
|
+
typeParameters.push({
|
|
1280
1271
|
kind: java_1.Type.Kind.GenericTypeVariable,
|
|
1281
1272
|
name: 'R',
|
|
1282
1273
|
variance: java_1.Type.GenericTypeVariable.Variance.Covariant,
|
|
1283
1274
|
bounds: [returnType]
|
|
1284
|
-
})
|
|
1275
|
+
});
|
|
1285
1276
|
// Parameter type variables (contravariant)
|
|
1286
1277
|
parameterTypes.forEach((paramType, index) => {
|
|
1287
|
-
typeParameters.push(
|
|
1278
|
+
typeParameters.push({
|
|
1288
1279
|
kind: java_1.Type.Kind.GenericTypeVariable,
|
|
1289
1280
|
name: `P${index + 1}`,
|
|
1290
1281
|
variance: java_1.Type.GenericTypeVariable.Variance.Contravariant,
|
|
1291
1282
|
bounds: [paramType]
|
|
1292
|
-
})
|
|
1283
|
+
});
|
|
1293
1284
|
});
|
|
1294
1285
|
functionClass.typeParameters = typeParameters;
|
|
1295
1286
|
// Create the apply() method
|
|
1296
|
-
const applyMethod =
|
|
1287
|
+
const applyMethod = {
|
|
1297
1288
|
kind: java_1.Type.Kind.Method,
|
|
1298
1289
|
flags: 0,
|
|
1299
1290
|
declaringType: functionClass,
|
|
@@ -1308,7 +1299,7 @@ class JavaScriptTypeMapping {
|
|
|
1308
1299
|
toJSON: function () {
|
|
1309
1300
|
return java_1.Type.signature(this);
|
|
1310
1301
|
}
|
|
1311
|
-
}
|
|
1302
|
+
};
|
|
1312
1303
|
// Add the apply method to the function class
|
|
1313
1304
|
functionClass.methods.push(applyMethod);
|
|
1314
1305
|
}
|