@openrewrite/rewrite 8.62.2 → 8.62.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.
Files changed (95) hide show
  1. package/dist/execution.d.ts.map +1 -1
  2. package/dist/execution.js.map +1 -1
  3. package/dist/java/rpc.d.ts +1 -0
  4. package/dist/java/rpc.d.ts.map +1 -1
  5. package/dist/java/rpc.js +81 -0
  6. package/dist/java/rpc.js.map +1 -1
  7. package/dist/java/tree.d.ts.map +1 -1
  8. package/dist/java/tree.js +0 -87
  9. package/dist/java/tree.js.map +1 -1
  10. package/dist/java/visitor.d.ts +4 -4
  11. package/dist/java/visitor.d.ts.map +1 -1
  12. package/dist/java/visitor.js.map +1 -1
  13. package/dist/javascript/format.d.ts +2 -2
  14. package/dist/javascript/format.d.ts.map +1 -1
  15. package/dist/javascript/format.js.map +1 -1
  16. package/dist/javascript/parser.d.ts +1 -1
  17. package/dist/javascript/parser.d.ts.map +1 -1
  18. package/dist/javascript/parser.js +26 -4
  19. package/dist/javascript/parser.js.map +1 -1
  20. package/dist/javascript/print.d.ts +2 -2
  21. package/dist/javascript/print.d.ts.map +1 -1
  22. package/dist/javascript/print.js.map +1 -1
  23. package/dist/javascript/rpc.js +1 -16
  24. package/dist/javascript/rpc.js.map +1 -1
  25. package/dist/javascript/type-mapping.d.ts +4 -19
  26. package/dist/javascript/type-mapping.d.ts.map +1 -1
  27. package/dist/javascript/type-mapping.js +228 -163
  28. package/dist/javascript/type-mapping.js.map +1 -1
  29. package/dist/javascript/visitor.d.ts +1 -1
  30. package/dist/javascript/visitor.d.ts.map +1 -1
  31. package/dist/javascript/visitor.js.map +1 -1
  32. package/dist/json/print.js.map +1 -1
  33. package/dist/json/rpc.js +46 -17
  34. package/dist/json/rpc.js.map +1 -1
  35. package/dist/json/visitor.d.ts +2 -2
  36. package/dist/json/visitor.d.ts.map +1 -1
  37. package/dist/json/visitor.js.map +1 -1
  38. package/dist/print.d.ts +2 -2
  39. package/dist/print.d.ts.map +1 -1
  40. package/dist/print.js +4 -2
  41. package/dist/print.js.map +1 -1
  42. package/dist/rpc/queue.d.ts +15 -6
  43. package/dist/rpc/queue.d.ts.map +1 -1
  44. package/dist/rpc/queue.js +37 -13
  45. package/dist/rpc/queue.js.map +1 -1
  46. package/dist/rpc/request/generate.d.ts +4 -0
  47. package/dist/rpc/request/generate.d.ts.map +1 -1
  48. package/dist/rpc/request/generate.js +9 -4
  49. package/dist/rpc/request/generate.js.map +1 -1
  50. package/dist/rpc/request/get-object.d.ts +2 -2
  51. package/dist/rpc/request/get-object.d.ts.map +1 -1
  52. package/dist/rpc/request/get-object.js +4 -12
  53. package/dist/rpc/request/get-object.js.map +1 -1
  54. package/dist/rpc/request/parse.d.ts.map +1 -1
  55. package/dist/rpc/request/parse.js.map +1 -1
  56. package/dist/rpc/request/print.d.ts +3 -4
  57. package/dist/rpc/request/print.d.ts.map +1 -1
  58. package/dist/rpc/request/print.js +5 -6
  59. package/dist/rpc/request/print.js.map +1 -1
  60. package/dist/rpc/request/visit.d.ts +3 -2
  61. package/dist/rpc/request/visit.d.ts.map +1 -1
  62. package/dist/rpc/request/visit.js +5 -4
  63. package/dist/rpc/request/visit.js.map +1 -1
  64. package/dist/rpc/rewrite-rpc.d.ts +3 -3
  65. package/dist/rpc/rewrite-rpc.d.ts.map +1 -1
  66. package/dist/rpc/rewrite-rpc.js +19 -16
  67. package/dist/rpc/rewrite-rpc.js.map +1 -1
  68. package/dist/test/rewrite-test.js.map +1 -1
  69. package/dist/text/rpc.js +37 -40
  70. package/dist/text/rpc.js.map +1 -1
  71. package/dist/version.txt +1 -1
  72. package/package.json +1 -1
  73. package/src/execution.ts +0 -2
  74. package/src/java/rpc.ts +68 -0
  75. package/src/java/tree.ts +1 -65
  76. package/src/java/visitor.ts +4 -4
  77. package/src/javascript/format.ts +2 -2
  78. package/src/javascript/parser.ts +19 -5
  79. package/src/javascript/print.ts +3 -3
  80. package/src/javascript/rpc.ts +4 -17
  81. package/src/javascript/type-mapping.ts +235 -170
  82. package/src/javascript/visitor.ts +1 -1
  83. package/src/json/print.ts +1 -1
  84. package/src/json/rpc.ts +40 -19
  85. package/src/json/visitor.ts +2 -2
  86. package/src/print.ts +6 -4
  87. package/src/rpc/queue.ts +36 -12
  88. package/src/rpc/request/generate.ts +18 -6
  89. package/src/rpc/request/get-object.ts +6 -13
  90. package/src/rpc/request/parse.ts +1 -1
  91. package/src/rpc/request/print.ts +5 -7
  92. package/src/rpc/request/visit.ts +6 -5
  93. package/src/rpc/rewrite-rpc.ts +24 -19
  94. package/src/test/rewrite-test.ts +1 -1
  95. package/src/text/rpc.ts +33 -37
package/dist/test/rewrite-test.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"rewrite-test.js","sourceRoot":"","sources":["../../src/test/rewrite-test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"rewrite-test.js","sourceRoot":"","sources":["../../src/test/rewrite-test.ts"],"names":[],"mappings":"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"}
package/dist/text/rpc.js CHANGED
@@ -27,7 +27,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
27
27
  const rpc_1 = require("../rpc");
28
28
  const tree_1 = require("./tree");
29
29
  const immer_1 = require("immer");
30
- const tree_2 = require("../tree");
31
30
  function receiveSnippet(before, q) {
32
31
  return __awaiter(this, void 0, void 0, function* () {
33
32
  const draft = (0, immer_1.createDraft)(before);
@@ -37,43 +36,41 @@ function receiveSnippet(before, q) {
37
36
  return (0, immer_1.finishDraft)(draft);
38
37
  });
39
38
  }
40
- const textCodec = {
41
- rpcReceive(before, q) {
42
- return __awaiter(this, void 0, void 0, function* () {
43
- const draft = (0, immer_1.createDraft)(before);
44
- draft.id = yield q.receive(before.id);
45
- draft.markers = yield q.receive(before.markers);
46
- draft.sourcePath = yield q.receive(before.sourcePath);
47
- draft.charsetName = yield q.receive(before.charsetName);
48
- draft.charsetBomMarked = yield q.receive(before.charsetBomMarked);
49
- draft.checksum = yield q.receive(before.checksum);
50
- draft.fileAttributes = yield q.receive(before.fileAttributes);
51
- draft.text = yield q.receive(before.text);
52
- draft.snippets = (yield q.receiveList(before.snippets, snippet => receiveSnippet(snippet, q)));
53
- return (0, immer_1.finishDraft)(draft);
54
- });
55
- },
56
- rpcSend(after, q) {
57
- return __awaiter(this, void 0, void 0, function* () {
58
- yield q.getAndSend(after, p => p.id);
59
- yield q.getAndSend(after, p => p.markers);
60
- yield q.getAndSend(after, p => p.sourcePath);
61
- yield q.getAndSend(after, p => p.charsetName);
62
- yield q.getAndSend(after, p => p.charsetBomMarked);
63
- yield q.getAndSend(after, p => p.checksum);
64
- yield q.getAndSend(after, p => p.fileAttributes);
65
- yield q.getAndSend(after, p => p.text);
66
- yield q.getAndSendList(after, a => a.snippets, s => s.id, (snippet) => __awaiter(this, void 0, void 0, function* () {
67
- yield q.getAndSend(snippet, p => p.id);
68
- yield q.getAndSend(snippet, p => p.markers);
69
- yield q.getAndSend(snippet, p => p.text);
70
- }));
71
- });
72
- }
73
- };
74
- Object.values(tree_1.PlainText.Kind).forEach(kind => {
75
- if (!Object.values(tree_2.TreeKind).includes(kind)) {
76
- rpc_1.RpcCodecs.registerCodec(kind, textCodec);
77
- }
78
- });
39
+ // Register codec for all Java AST node types
40
+ for (const kind of Object.values(tree_1.PlainText.Kind)) {
41
+ rpc_1.RpcCodecs.registerCodec(kind, {
42
+ rpcReceive(before, q) {
43
+ return __awaiter(this, void 0, void 0, function* () {
44
+ const draft = (0, immer_1.createDraft)(before);
45
+ draft.id = yield q.receive(before.id);
46
+ draft.markers = yield q.receive(before.markers);
47
+ draft.sourcePath = yield q.receive(before.sourcePath);
48
+ draft.charsetName = yield q.receive(before.charsetName);
49
+ draft.charsetBomMarked = yield q.receive(before.charsetBomMarked);
50
+ draft.checksum = yield q.receive(before.checksum);
51
+ draft.fileAttributes = yield q.receive(before.fileAttributes);
52
+ draft.text = yield q.receive(before.text);
53
+ draft.snippets = (yield q.receiveList(before.snippets, snippet => receiveSnippet(snippet, q)));
54
+ return (0, immer_1.finishDraft)(draft);
55
+ });
56
+ },
57
+ rpcSend(after, q) {
58
+ return __awaiter(this, void 0, void 0, function* () {
59
+ yield q.getAndSend(after, p => p.id);
60
+ yield q.getAndSend(after, p => p.markers);
61
+ yield q.getAndSend(after, p => p.sourcePath);
62
+ yield q.getAndSend(after, p => p.charsetName);
63
+ yield q.getAndSend(after, p => p.charsetBomMarked);
64
+ yield q.getAndSend(after, p => p.checksum);
65
+ yield q.getAndSend(after, p => p.fileAttributes);
66
+ yield q.getAndSend(after, p => p.text);
67
+ yield q.getAndSendList(after, a => a.snippets, s => s.id, (snippet) => __awaiter(this, void 0, void 0, function* () {
68
+ yield q.getAndSend(snippet, p => p.id);
69
+ yield q.getAndSend(snippet, p => p.markers);
70
+ yield q.getAndSend(snippet, p => p.text);
71
+ }));
72
+ });
73
+ }
74
+ }, tree_1.PlainText.Kind.PlainText);
75
+ }
79
76
  //# sourceMappingURL=rpc.js.map
package/dist/text/rpc.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"rpc.js","sourceRoot":"","sources":["../../src/text/rpc.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"rpc.js","sourceRoot":"","sources":["../../src/text/rpc.ts"],"names":[],"mappings":"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"}
package/dist/version.txt CHANGED
@@ -1 +1 @@
1
- 8.62.2
1
+ 8.62.4
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@openrewrite/rewrite",
3
- "version": "8.62.2",
3
+ "version": "8.62.4",
4
4
  "license": "Moderne Source Available License",
5
5
  "description": "OpenRewrite JavaScript.",
6
6
  "homepage": "https://github.com/openrewrite/rewrite",
package/src/execution.ts CHANGED
@@ -14,8 +14,6 @@
14
14
  * limitations under the License.
15
15
  */
16
16
  import {RpcCodec, RpcCodecs, RpcReceiveQueue, RpcSendQueue} from "./rpc";
17
- import {ParseError, ParseErrorKind} from "./parse-error";
18
- import {createDraft, Draft, finishDraft} from "immer";
19
17
 
20
18
  export class ExecutionContext {
21
19
  readonly kind: string = "org.openrewrite.ExecutionContext"
package/src/java/rpc.ts CHANGED
@@ -20,6 +20,7 @@ import {produceAsync} from "../visitor";
20
20
  import {createDraft, Draft, finishDraft, WritableDraft} from "immer";
21
21
  import {isTree} from "../tree";
22
22
  import {Type} from "./type";
23
+ import Space = J.Space;
23
24
 
24
25
  export class JavaSender extends JavaVisitor<RpcSendQueue> {
25
26
 
@@ -1382,3 +1383,70 @@ export class JavaReceiver extends JavaVisitor<RpcReceiveQueue> {
1382
1383
  return undefined;
1383
1384
  }
1384
1385
  }
1386
+
1387
+ export function registerJLanguageCodecs(sourceFileType: string,
1388
+ receiver: JavaVisitor<RpcReceiveQueue>,
1389
+ sender: JavaVisitor<RpcSendQueue>,
1390
+ extendedKinds?: any) {
1391
+ const kinds = new Set([
1392
+ ...Object.values(J.Kind),
1393
+ ...(extendedKinds ? Object.values(extendedKinds) : [])
1394
+ ]);
1395
+
1396
+ // Register codec for all Java AST node types
1397
+ for (const kind of kinds) {
1398
+ if (kind === J.Kind.Space) {
1399
+ RpcCodecs.registerCodec(kind, {
1400
+ async rpcReceive(before: J.Space, q: RpcReceiveQueue): Promise<J.Space> {
1401
+ return (await receiver.visitSpace(before, q))!;
1402
+ },
1403
+
1404
+ async rpcSend(after: J.Space, q: RpcSendQueue): Promise<void> {
1405
+ await sender.visitSpace(after, q);
1406
+ }
1407
+ }, sourceFileType);
1408
+ } else if (kind === J.Kind.RightPadded) {
1409
+ RpcCodecs.registerCodec(kind, {
1410
+ async rpcReceive<T extends J | boolean>(before: J.RightPadded<T>, q: RpcReceiveQueue): Promise<J.RightPadded<T>> {
1411
+ return (await receiver.visitRightPadded(before, q))!;
1412
+ },
1413
+
1414
+ async rpcSend<T extends J | boolean>(after: J.RightPadded<T>, q: RpcSendQueue): Promise<void> {
1415
+ await sender.visitRightPadded(after, q);
1416
+ }
1417
+ }, sourceFileType);
1418
+ } else if (kind === J.Kind.LeftPadded) {
1419
+ RpcCodecs.registerCodec(kind, {
1420
+ async rpcReceive<T extends J | Space | number | string | boolean>(before: J.LeftPadded<T>, q: RpcReceiveQueue): Promise<J.LeftPadded<T>> {
1421
+ return (await receiver.visitLeftPadded(before, q))!;
1422
+ },
1423
+
1424
+ async rpcSend<T extends J | Space | number | string | boolean>(after: J.LeftPadded<T>, q: RpcSendQueue): Promise<void> {
1425
+ await sender.visitLeftPadded(after, q);
1426
+ }
1427
+ }, sourceFileType);
1428
+ } else if (kind === J.Kind.Container) {
1429
+ RpcCodecs.registerCodec(kind, {
1430
+ async rpcReceive<T extends J>(before: J.Container<T>, q: RpcReceiveQueue): Promise<J.Container<T>> {
1431
+ return (await receiver.visitContainer(before, q))!;
1432
+ },
1433
+
1434
+ async rpcSend<T extends J>(after: J.Container<T>, q: RpcSendQueue): Promise<void> {
1435
+ await sender.visitContainer(after, q);
1436
+ }
1437
+ }, sourceFileType);
1438
+ } else {
1439
+ RpcCodecs.registerCodec(kind as string, {
1440
+ async rpcReceive(before: J, q: RpcReceiveQueue): Promise<J> {
1441
+ return (await receiver.visit(before, q))!;
1442
+ },
1443
+
1444
+ async rpcSend(after: J, q: RpcSendQueue): Promise<void> {
1445
+ await sender.visit(after, q);
1446
+ }
1447
+ }, sourceFileType);
1448
+ }
1449
+ }
1450
+ }
1451
+
1452
+ registerJLanguageCodecs(J.Kind.CompilationUnit, new JavaReceiver(), new JavaSender());
package/src/java/tree.ts CHANGED
@@ -17,11 +17,8 @@
17
17
  */
18
18
 
19
19
  import {emptyMarkers, Markers} from "../markers";
20
- import {SourceFile, Tree, TreeKind} from "../tree";
20
+ import {SourceFile, Tree} from "../tree";
21
21
  import {Type} from "./type";
22
- import {RpcCodec, RpcCodecs, RpcReceiveQueue, RpcSendQueue} from "../rpc";
23
- import {JavaReceiver, JavaSender} from "./rpc";
24
- import Space = J.Space;
25
22
 
26
23
  export interface J extends Tree {
27
24
  readonly prefix: J.Space;
@@ -874,64 +871,3 @@ export namespace TypedTree {
874
871
  registerTypeGetter(J.Kind.Wildcard, () => Type.unknownType);
875
872
  registerTypeGetter(J.Kind.Unknown, () => Type.unknownType);
876
873
  }
877
-
878
- const javaReceiver = new JavaReceiver();
879
- const javaSender = new JavaSender();
880
-
881
- const javaCodec: RpcCodec<J> = {
882
- async rpcReceive(before: J, q: RpcReceiveQueue): Promise<J> {
883
- return (await javaReceiver.visit(before, q))!;
884
- },
885
-
886
- async rpcSend(after: J, q: RpcSendQueue): Promise<void> {
887
- await javaSender.visit(after, q);
888
- }
889
- }
890
-
891
- // Register codec for all Java AST node types
892
- Object.values(J.Kind).forEach(kind => {
893
- if (kind === J.Kind.Space) {
894
- RpcCodecs.registerCodec(kind, {
895
- async rpcReceive(before: J.Space, q: RpcReceiveQueue): Promise<J.Space> {
896
- return (await javaReceiver.visitSpace(before, q))!;
897
- },
898
-
899
- async rpcSend(after: J.Space, q: RpcSendQueue): Promise<void> {
900
- await javaSender.visitSpace(after, q);
901
- }
902
- }
903
- );
904
- } else if (kind === J.Kind.RightPadded) {
905
- RpcCodecs.registerCodec(kind, {
906
- async rpcReceive<T extends J | boolean>(before: J.RightPadded<T>, q: RpcReceiveQueue): Promise<J.RightPadded<T>> {
907
- return (await javaReceiver.visitRightPadded(before, q))!;
908
- },
909
-
910
- async rpcSend<T extends J | boolean>(after: J.RightPadded<T>, q: RpcSendQueue): Promise<void> {
911
- await javaSender.visitRightPadded(after, q);
912
- }
913
- })
914
- } else if (kind === J.Kind.LeftPadded) {
915
- RpcCodecs.registerCodec(kind, {
916
- async rpcReceive<T extends J | Space | number | string | boolean>(before: J.LeftPadded<T>, q: RpcReceiveQueue): Promise<J.LeftPadded<T>> {
917
- return (await javaReceiver.visitLeftPadded(before, q))!;
918
- },
919
-
920
- async rpcSend<T extends J | Space | number | string | boolean>(after: J.LeftPadded<T>, q: RpcSendQueue): Promise<void> {
921
- await javaSender.visitLeftPadded(after, q);
922
- }
923
- })
924
- } else if (kind === J.Kind.Container) {
925
- RpcCodecs.registerCodec(kind, {
926
- async rpcReceive<T extends J>(before: J.Container<T>, q: RpcReceiveQueue): Promise<J.Container<T>> {
927
- return (await javaReceiver.visitContainer(before, q))!;
928
- },
929
-
930
- async rpcSend<T extends J>(after: J.Container<T>, q: RpcSendQueue): Promise<void> {
931
- await javaSender.visitContainer(after, q);
932
- }
933
- })
934
- } else {
935
- RpcCodecs.registerCodec(kind, javaCodec);
936
- }
937
- });
package/src/java/visitor.ts CHANGED
@@ -45,7 +45,7 @@ export class JavaVisitor<P> extends TreeVisitor<J, P> {
45
45
  }
46
46
 
47
47
  // noinspection JSUnusedLocalSymbols
48
- protected async visitSpace(space: J.Space, p: P): Promise<J.Space> {
48
+ public async visitSpace(space: J.Space, p: P): Promise<J.Space> {
49
49
  return space;
50
50
  }
51
51
 
@@ -995,7 +995,7 @@ export class JavaVisitor<P> extends TreeVisitor<J, P> {
995
995
  return right ? this.visitRightPadded(right, p) : undefined;
996
996
  }
997
997
 
998
- protected async visitRightPadded<T extends J | boolean>(right: J.RightPadded<T>, p: P): Promise<J.RightPadded<T>> {
998
+ public async visitRightPadded<T extends J | boolean>(right: J.RightPadded<T>, p: P): Promise<J.RightPadded<T>> {
999
999
  return produceAsync<J.RightPadded<T>>(right, async draft => {
1000
1000
  this.cursor = new Cursor(right, this.cursor);
1001
1001
  if (isTree(right.element)) {
@@ -1011,7 +1011,7 @@ export class JavaVisitor<P> extends TreeVisitor<J, P> {
1011
1011
  return left ? this.visitLeftPadded(left, p) : undefined;
1012
1012
  }
1013
1013
 
1014
- protected async visitLeftPadded<T extends J | J.Space | number | string | boolean>(left: J.LeftPadded<T>, p: P): Promise<J.LeftPadded<T>> {
1014
+ public async visitLeftPadded<T extends J | J.Space | number | string | boolean>(left: J.LeftPadded<T>, p: P): Promise<J.LeftPadded<T>> {
1015
1015
  return produceAsync<J.LeftPadded<T>>(left, async draft => {
1016
1016
  this.cursor = new Cursor(left, this.cursor);
1017
1017
  draft.before = await this.visitSpace(left.before, p);
@@ -1029,7 +1029,7 @@ export class JavaVisitor<P> extends TreeVisitor<J, P> {
1029
1029
  return container ? this.visitContainer(container, p) : undefined;
1030
1030
  }
1031
1031
 
1032
- protected async visitContainer<T extends J>(container: J.Container<T>, p: P): Promise<J.Container<T>> {
1032
+ public async visitContainer<T extends J>(container: J.Container<T>, p: P): Promise<J.Container<T>> {
1033
1033
  return produceAsync<J.Container<T>>(container, async draft => {
1034
1034
  this.cursor = new Cursor(container, this.cursor);
1035
1035
  draft.before = await this.visitSpace(container.before, p);
package/src/javascript/format.ts CHANGED
@@ -159,7 +159,7 @@ export class SpacesVisitor<P> extends JavaScriptVisitor<P> {
159
159
  }) as J.ClassDeclaration;
160
160
  }
161
161
 
162
- protected async visitContainer<T extends J>(container: J.Container<T>, p: P): Promise<J.Container<T>> {
162
+ public async visitContainer<T extends J>(container: J.Container<T>, p: P): Promise<J.Container<T>> {
163
163
  const ret = await super.visitContainer(container, p) as J.Container<T>;
164
164
  return produce(ret, draft => {
165
165
  if (draft.elements.length > 1) {
@@ -1088,7 +1088,7 @@ export class TabsAndIndentsVisitor<P> extends JavaScriptVisitor<P> {
1088
1088
  });
1089
1089
  }
1090
1090
 
1091
- protected async visitLeftPadded<T extends J | J.Space | number | string | boolean>(left: J.LeftPadded<T>, p: P): Promise<J.LeftPadded<T>> {
1091
+ public async visitLeftPadded<T extends J | J.Space | number | string | boolean>(left: J.LeftPadded<T>, p: P): Promise<J.LeftPadded<T>> {
1092
1092
  const ret = await super.visitLeftPadded(left, p);
1093
1093
  if (ret == undefined) {
1094
1094
  return ret;
package/src/javascript/parser.ts CHANGED
@@ -57,6 +57,19 @@ export interface JavaScriptParserOptions extends ParserOptions {
57
57
  sourceFileCache?: Map<string, ts.SourceFile>
58
58
  }
59
59
 
60
+ function getScriptKindFromFileName(fileName: string): ts.ScriptKind {
61
+ const ext = fileName.toLowerCase();
62
+ if (ext.endsWith('.tsx')) return ts.ScriptKind.TSX;
63
+ if (ext.endsWith('.jsx')) return ts.ScriptKind.JSX;
64
+ if (ext.endsWith('.ts')) return ts.ScriptKind.TS;
65
+ if (ext.endsWith('.js')) return ts.ScriptKind.JS;
66
+ if (ext.endsWith('.mjs')) return ts.ScriptKind.JS;
67
+ if (ext.endsWith('.cjs')) return ts.ScriptKind.JS;
68
+ if (ext.endsWith('.mts')) return ts.ScriptKind.TS;
69
+ if (ext.endsWith('.cts')) return ts.ScriptKind.TS;
70
+ return ts.ScriptKind.TS;
71
+ }
72
+
60
73
  export class JavaScriptParser extends Parser {
61
74
 
62
75
  private readonly compilerOptions: ts.CompilerOptions;
@@ -138,7 +151,9 @@ export class JavaScriptParser extends Parser {
138
151
  }
139
152
 
140
153
  if (sourceText !== undefined) {
141
- sourceFile = ts.createSourceFile(fileName, sourceText, languageVersion, true);
154
+ // Determine script kind based on file extension
155
+ const scriptKind = getScriptKindFromFileName(fileName);
156
+ sourceFile = ts.createSourceFile(fileName, sourceText, languageVersion, true, scriptKind);
142
157
  // Cache the SourceFile if it's a dependency
143
158
  if (!input && this.sourceFileCache) {
144
159
  this.sourceFileCache.set(fileName, sourceFile);
@@ -192,7 +207,7 @@ export class JavaScriptParser extends Parser {
192
207
 
193
208
  try {
194
209
  yield produce(
195
- new JavaScriptParserVisitor(sourceFile, this.relativePath(input), typeChecker, this.relativeTo || process.cwd())
210
+ new JavaScriptParserVisitor(sourceFile, this.relativePath(input), typeChecker)
196
211
  .visit(sourceFile) as SourceFile,
197
212
  draft => {
198
213
  if (this.styles) {
@@ -222,9 +237,8 @@ export class JavaScriptParserVisitor {
222
237
  constructor(
223
238
  private readonly sourceFile: ts.SourceFile,
224
239
  private readonly sourcePath: string,
225
- typeChecker: ts.TypeChecker,
226
- projectRoot?: string) {
227
- this.typeMapping = new JavaScriptTypeMapping(typeChecker, projectRoot);
240
+ typeChecker: ts.TypeChecker) {
241
+ this.typeMapping = new JavaScriptTypeMapping(typeChecker);
228
242
  }
229
243
 
230
244
  visit = (node: ts.Node): any => {
package/src/javascript/print.ts CHANGED
@@ -21,7 +21,7 @@ import {PrintOutputCapture, TreePrinters} from "../print";
21
21
  import {Cursor, isTree, Tree} from "../tree";
22
22
  import {Comment, emptySpace, J, Statement, TextComment, TrailingComma, TypedTree} from "../java";
23
23
  import {findMarker, Marker, Markers} from "../markers";
24
- import {Generator, DelegatedYield, FunctionDeclaration, NonNullAssertion, Optional, Spread} from "./markers";
24
+ import {DelegatedYield, FunctionDeclaration, Generator, NonNullAssertion, Optional, Spread} from "./markers";
25
25
 
26
26
  export class JavaScriptPrinter extends JavaScriptVisitor<PrintOutputCapture> {
27
27
 
@@ -81,7 +81,7 @@ export class JavaScriptPrinter extends JavaScriptVisitor<PrintOutputCapture> {
81
81
  return statement;
82
82
  }
83
83
 
84
- override async visitStatementExpression(statementExpression: JS.StatementExpression, p: PrintOutputCapture): Promise<J | J | undefined> {
84
+ override async visitStatementExpression(statementExpression: JS.StatementExpression, p: PrintOutputCapture): Promise<J | undefined> {
85
85
  await this.visitSpace(statementExpression.prefix, p);
86
86
  await this.visitMarkers(statementExpression.markers, p);
87
87
  await this.visit(statementExpression.statement, p);
@@ -1823,7 +1823,7 @@ export class JavaScriptPrinter extends JavaScriptVisitor<PrintOutputCapture> {
1823
1823
  }
1824
1824
  }
1825
1825
 
1826
- protected async visitRightPadded<T extends J | boolean>(right: J.RightPadded<T>, p: PrintOutputCapture): Promise<J.RightPadded<T>> {
1826
+ public async visitRightPadded<T extends J | boolean>(right: J.RightPadded<T>, p: PrintOutputCapture): Promise<J.RightPadded<T>> {
1827
1827
  if (isTree(right.element)) {
1828
1828
  await this.visit(right.element, p);
1829
1829
  }
package/src/javascript/rpc.ts CHANGED
@@ -18,7 +18,7 @@ import {asRef, RpcCodec, RpcCodecs, RpcReceiveQueue, RpcSendQueue} from "../rpc"
18
18
  import {isJavaScript, JS, JSX} from "./tree";
19
19
  import {Expression, J, Statement, Type, TypedTree, TypeTree} from "../java";
20
20
  import {createDraft, finishDraft} from "immer";
21
- import {JavaReceiver, JavaSender} from "../java/rpc";
21
+ import {JavaReceiver, JavaSender, registerJLanguageCodecs} from "../java/rpc";
22
22
  import {Cursor, Tree} from "../tree";
23
23
  import ComputedPropertyName = JS.ComputedPropertyName;
24
24
 
@@ -1106,11 +1106,11 @@ class JavaScriptReceiver extends JavaScriptVisitor<RpcReceiveQueue> {
1106
1106
  return this.javaReceiverDelegate.visitRightPadded(right, q)
1107
1107
  }
1108
1108
 
1109
- protected async visitLeftPadded<T extends J | J.Space | number | string | boolean>(left: J.LeftPadded<T>, q: RpcReceiveQueue): Promise<J.LeftPadded<T>> {
1109
+ async visitLeftPadded<T extends J | J.Space | number | string | boolean>(left: J.LeftPadded<T>, q: RpcReceiveQueue): Promise<J.LeftPadded<T>> {
1110
1110
  return this.javaReceiverDelegate.visitLeftPadded(left, q);
1111
1111
  }
1112
1112
 
1113
- protected async visitContainer<T extends J>(container: J.Container<T>, q: RpcReceiveQueue): Promise<J.Container<T>> {
1113
+ async visitContainer<T extends J>(container: J.Container<T>, q: RpcReceiveQueue): Promise<J.Container<T>> {
1114
1114
  return this.javaReceiverDelegate.visitContainer(container, q);
1115
1115
  }
1116
1116
 
@@ -1139,17 +1139,4 @@ class JavaScriptReceiverDelegate extends JavaReceiver {
1139
1139
  }
1140
1140
  }
1141
1141
 
1142
- const javaScriptCodec: RpcCodec<JS> = {
1143
- async rpcReceive(before: JS, q: RpcReceiveQueue): Promise<JS> {
1144
- return (await new JavaScriptReceiver().visit(before, q))! as JS;
1145
- },
1146
-
1147
- async rpcSend(after: JS, q: RpcSendQueue): Promise<void> {
1148
- await new JavaScriptSender().visit(after, q);
1149
- }
1150
- }
1151
-
1152
- // Register codec for all JavaScript AST node types
1153
- Object.values(JS.Kind).forEach(kind => {
1154
- RpcCodecs.registerCodec(kind, javaScriptCodec);
1155
- });
1142
+ registerJLanguageCodecs(JS.Kind.CompilationUnit, new JavaScriptReceiver(), new JavaScriptSender(), JS.Kind);