@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.
Files changed (149) hide show
  1. package/dist/index.js +8 -8
  2. package/dist/index.js.map +1 -1
  3. package/dist/java/formatting-utils.d.ts +1 -1
  4. package/dist/java/formatting-utils.js +4 -4
  5. package/dist/java/formatting-utils.js.map +1 -1
  6. package/dist/java/markers.js +8 -8
  7. package/dist/java/markers.js.map +1 -1
  8. package/dist/java/type-visitor.d.ts +0 -3
  9. package/dist/java/type-visitor.d.ts.map +1 -1
  10. package/dist/java/type-visitor.js +67 -68
  11. package/dist/java/type-visitor.js.map +1 -1
  12. package/dist/java/visitor.d.ts +3 -3
  13. package/dist/java/visitor.d.ts.map +1 -1
  14. package/dist/java/visitor.js +5 -5
  15. package/dist/java/visitor.js.map +1 -1
  16. package/dist/javascript/assertions.js +4 -3
  17. package/dist/javascript/assertions.js.map +1 -1
  18. package/dist/javascript/cleanup/use-object-property-shorthand.js +3 -3
  19. package/dist/javascript/cleanup/use-object-property-shorthand.js.map +1 -1
  20. package/dist/javascript/format/format.d.ts +28 -7
  21. package/dist/javascript/format/format.d.ts.map +1 -1
  22. package/dist/javascript/format/format.js +149 -158
  23. package/dist/javascript/format/format.js.map +1 -1
  24. package/dist/javascript/format/minimum-viable-spacing-visitor.js +23 -23
  25. package/dist/javascript/format/minimum-viable-spacing-visitor.js.map +1 -1
  26. package/dist/javascript/format/prettier-format.d.ts.map +1 -1
  27. package/dist/javascript/format/prettier-format.js +8 -11
  28. package/dist/javascript/format/prettier-format.js.map +1 -1
  29. package/dist/javascript/format/tabs-and-indents-visitor.js +7 -7
  30. package/dist/javascript/format/tabs-and-indents-visitor.js.map +1 -1
  31. package/dist/javascript/format/whitespace-reconciler.d.ts.map +1 -1
  32. package/dist/javascript/format/whitespace-reconciler.js +12 -11
  33. package/dist/javascript/format/whitespace-reconciler.js.map +1 -1
  34. package/dist/javascript/markers.d.ts.map +1 -1
  35. package/dist/javascript/markers.js +6 -5
  36. package/dist/javascript/markers.js.map +1 -1
  37. package/dist/javascript/migrate/es6/modernize-octal-escape-sequences.js +2 -2
  38. package/dist/javascript/migrate/es6/modernize-octal-escape-sequences.js.map +1 -1
  39. package/dist/javascript/migrate/es6/modernize-octal-literals.js +2 -2
  40. package/dist/javascript/migrate/es6/modernize-octal-literals.js.map +1 -1
  41. package/dist/javascript/migrate/es6/remove-duplicate-object-keys.js +2 -2
  42. package/dist/javascript/migrate/es6/remove-duplicate-object-keys.js.map +1 -1
  43. package/dist/javascript/migrate/typescript/export-assignment-to-export-default.js +2 -2
  44. package/dist/javascript/migrate/typescript/export-assignment-to-export-default.js.map +1 -1
  45. package/dist/javascript/node-resolution-result.js +3 -9
  46. package/dist/javascript/node-resolution-result.js.map +1 -1
  47. package/dist/javascript/parser.d.ts.map +1 -1
  48. package/dist/javascript/parser.js +35 -35
  49. package/dist/javascript/parser.js.map +1 -1
  50. package/dist/javascript/project-parser.d.ts.map +1 -1
  51. package/dist/javascript/project-parser.js +6 -5
  52. package/dist/javascript/project-parser.js.map +1 -1
  53. package/dist/javascript/recipes/auto-format.d.ts +7 -23
  54. package/dist/javascript/recipes/auto-format.d.ts.map +1 -1
  55. package/dist/javascript/recipes/auto-format.js +8 -54
  56. package/dist/javascript/recipes/auto-format.js.map +1 -1
  57. package/dist/javascript/recipes/change-import.js +8 -8
  58. package/dist/javascript/recipes/change-import.js.map +1 -1
  59. package/dist/javascript/recipes/order-imports.js +4 -4
  60. package/dist/javascript/recipes/order-imports.js.map +1 -1
  61. package/dist/javascript/templating/engine.js +2 -2
  62. package/dist/javascript/templating/engine.js.map +1 -1
  63. package/dist/javascript/templating/index.d.ts +1 -0
  64. package/dist/javascript/templating/index.d.ts.map +1 -1
  65. package/dist/javascript/templating/index.js +4 -1
  66. package/dist/javascript/templating/index.js.map +1 -1
  67. package/dist/javascript/templating/placeholder-replacement.js +16 -16
  68. package/dist/javascript/templating/placeholder-replacement.js.map +1 -1
  69. package/dist/javascript/type-mapping.d.ts.map +1 -1
  70. package/dist/javascript/type-mapping.js +49 -58
  71. package/dist/javascript/type-mapping.js.map +1 -1
  72. package/dist/javascript/visitor.d.ts +3 -3
  73. package/dist/javascript/visitor.d.ts.map +1 -1
  74. package/dist/javascript/visitor.js +3 -3
  75. package/dist/javascript/visitor.js.map +1 -1
  76. package/dist/json/rpc.js +48 -49
  77. package/dist/json/rpc.js.map +1 -1
  78. package/dist/json/visitor.d.ts +3 -3
  79. package/dist/json/visitor.d.ts.map +1 -1
  80. package/dist/json/visitor.js +3 -3
  81. package/dist/json/visitor.js.map +1 -1
  82. package/dist/parse-error.js +11 -11
  83. package/dist/parse-error.js.map +1 -1
  84. package/dist/reference.d.ts.map +1 -1
  85. package/dist/reference.js +0 -3
  86. package/dist/reference.js.map +1 -1
  87. package/dist/rpc/index.js +42 -42
  88. package/dist/rpc/index.js.map +1 -1
  89. package/dist/rpc/queue.d.ts.map +1 -1
  90. package/dist/rpc/queue.js +6 -8
  91. package/dist/rpc/queue.js.map +1 -1
  92. package/dist/rpc/request/install-recipes.js +1 -1
  93. package/dist/rpc/request/install-recipes.js.map +1 -1
  94. package/dist/rpc/request/parse-project.d.ts.map +1 -1
  95. package/dist/rpc/request/parse-project.js +12 -32
  96. package/dist/rpc/request/parse-project.js.map +1 -1
  97. package/dist/rpc/request/parse.d.ts.map +1 -1
  98. package/dist/rpc/request/parse.js +1 -4
  99. package/dist/rpc/request/parse.js.map +1 -1
  100. package/dist/text/rpc.js +18 -18
  101. package/dist/text/rpc.js.map +1 -1
  102. package/dist/version.txt +1 -1
  103. package/dist/visitor.d.ts +6 -4
  104. package/dist/visitor.d.ts.map +1 -1
  105. package/dist/visitor.js +19 -17
  106. package/dist/visitor.js.map +1 -1
  107. package/dist/yaml/rpc.js +65 -65
  108. package/dist/yaml/rpc.js.map +1 -1
  109. package/package.json +2 -2
  110. package/src/index.ts +8 -8
  111. package/src/java/formatting-utils.ts +2 -2
  112. package/src/java/markers.ts +8 -8
  113. package/src/java/type-visitor.ts +59 -68
  114. package/src/java/visitor.ts +8 -8
  115. package/src/javascript/assertions.ts +3 -3
  116. package/src/javascript/cleanup/use-object-property-shorthand.ts +1 -1
  117. package/src/javascript/format/format.ts +109 -107
  118. package/src/javascript/format/minimum-viable-spacing-visitor.ts +1 -1
  119. package/src/javascript/format/prettier-format.ts +9 -12
  120. package/src/javascript/format/tabs-and-indents-visitor.ts +1 -1
  121. package/src/javascript/format/whitespace-reconciler.ts +12 -11
  122. package/src/javascript/markers.ts +6 -6
  123. package/src/javascript/migrate/es6/modernize-octal-escape-sequences.ts +1 -1
  124. package/src/javascript/migrate/es6/modernize-octal-literals.ts +1 -1
  125. package/src/javascript/migrate/es6/remove-duplicate-object-keys.ts +1 -1
  126. package/src/javascript/migrate/typescript/export-assignment-to-export-default.ts +1 -1
  127. package/src/javascript/node-resolution-result.ts +8 -14
  128. package/src/javascript/parser.ts +5 -4
  129. package/src/javascript/project-parser.ts +4 -4
  130. package/src/javascript/recipes/auto-format.ts +9 -71
  131. package/src/javascript/recipes/change-import.ts +4 -4
  132. package/src/javascript/recipes/order-imports.ts +1 -1
  133. package/src/javascript/templating/engine.ts +1 -1
  134. package/src/javascript/templating/index.ts +5 -0
  135. package/src/javascript/templating/placeholder-replacement.ts +2 -2
  136. package/src/javascript/type-mapping.ts +28 -34
  137. package/src/javascript/visitor.ts +6 -6
  138. package/src/json/rpc.ts +51 -52
  139. package/src/json/visitor.ts +6 -6
  140. package/src/parse-error.ts +11 -11
  141. package/src/reference.ts +0 -5
  142. package/src/rpc/index.ts +43 -43
  143. package/src/rpc/queue.ts +6 -8
  144. package/src/rpc/request/install-recipes.ts +1 -1
  145. package/src/rpc/request/parse-project.ts +20 -32
  146. package/src/rpc/request/parse.ts +1 -4
  147. package/src/text/rpc.ts +18 -18
  148. package/src/visitor.ts +29 -30
  149. package/src/yaml/rpc.ts +80 -81
package/dist/index.js CHANGED
@@ -40,8 +40,8 @@ exports.activate = activate;
40
40
  * limitations under the License.
41
41
  */
42
42
  const rpc_1 = require("./rpc");
43
- const immer_1 = require("immer");
44
43
  const markers_1 = require("./markers");
44
+ const util_1 = require("./util");
45
45
  __exportStar(require("./data-table"), exports);
46
46
  __exportStar(require("./execution"), exports);
47
47
  __exportStar(require("./markers"), exports);
@@ -93,13 +93,13 @@ rpc_1.RpcCodecs.registerCodec(markers_1.MarkersKind.ParseExceptionResult, {
93
93
  },
94
94
  rpcReceive(before, q) {
95
95
  return __awaiter(this, void 0, void 0, function* () {
96
- const draft = (0, immer_1.createDraft)(before);
97
- draft.id = yield q.receive(before.id);
98
- draft.parserType = yield q.receive(before.parserType);
99
- draft.exceptionType = yield q.receive(before.exceptionType);
100
- draft.message = yield q.receive(before.message);
101
- draft.treeType = yield q.receive(before.treeType);
102
- return (0, immer_1.finishDraft)(draft);
96
+ return (0, util_1.updateIfChanged)(before, {
97
+ id: yield q.receive(before.id),
98
+ parserType: yield q.receive(before.parserType),
99
+ exceptionType: yield q.receive(before.exceptionType),
100
+ message: yield q.receive(before.message),
101
+ treeType: yield q.receive(before.treeType),
102
+ });
103
103
  });
104
104
  }
105
105
  });
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
@@ -10,7 +10,7 @@ export declare function lastWhitespace(space: J.Space): string;
10
10
  * When there are comments, updates the suffix of the last comment.
11
11
  * When there are no comments, updates the whitespace property.
12
12
  *
13
- * @param space The Space to modify (Immer draft)
13
+ * @param space The Space to modify (Mutative draft)
14
14
  * @param transform Function that receives the current last whitespace and returns the new value
15
15
  */
16
16
  export declare function replaceLastWhitespace(space: J.Space, transform: (ws: string) => string): J.Space;
@@ -22,7 +22,7 @@ exports.stripLeadingIndent = stripLeadingIndent;
22
22
  exports.replaceIndentAfterLastNewline = replaceIndentAfterLastNewline;
23
23
  exports.spaceContainsNewline = spaceContainsNewline;
24
24
  exports.normalizeSpaceIndent = normalizeSpaceIndent;
25
- const immer_1 = require("immer");
25
+ const mutative_1 = require("mutative");
26
26
  /**
27
27
  * Gets the effective last whitespace from a Space.
28
28
  * When there are comments, the last whitespace is the suffix of the last comment.
@@ -39,11 +39,11 @@ function lastWhitespace(space) {
39
39
  * When there are comments, updates the suffix of the last comment.
40
40
  * When there are no comments, updates the whitespace property.
41
41
  *
42
- * @param space The Space to modify (Immer draft)
42
+ * @param space The Space to modify (Mutative draft)
43
43
  * @param transform Function that receives the current last whitespace and returns the new value
44
44
  */
45
45
  function replaceLastWhitespace(space, transform) {
46
- return (0, immer_1.produce)(space, draft => {
46
+ return (0, mutative_1.create)(space, draft => {
47
47
  if (draft.comments.length > 0) {
48
48
  const lastComment = draft.comments[draft.comments.length - 1];
49
49
  lastComment.suffix = transform(lastComment.suffix);
@@ -223,7 +223,7 @@ function applyRemovedElementPrefix(removedElement, nextElement, preserveRemovedC
223
223
  // Determine which whitespace to use: preserve current if it has more blank lines
224
224
  const shouldPreserveCurrentWhitespace = !preserveRemovedComments &&
225
225
  countNewlines(currentWs) > countNewlines(removedWs);
226
- return (0, immer_1.produce)(nextElement, draft => {
226
+ return (0, mutative_1.create)(nextElement, draft => {
227
227
  draft.prefix = {
228
228
  kind: shouldPreserveCurrentWhitespace ? currentPrefix.kind : removedPrefix.kind,
229
229
  whitespace: shouldPreserveCurrentWhitespace ? currentWs : removedWs,
@@ -1 +1 @@
1
- {"version":3,"file":"formatting-utils.js","sourceRoot":"","sources":["../../src/java/formatting-utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"formatting-utils.js","sourceRoot":"","sources":["../../src/java/formatting-utils.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAUH,wCAKC;AAUD,sDASC;AAKD,gDAEC;AAMD,sEAGC;AAKD,oDAIC;AAUD,oDA+BC;AAjGD,uCAA2C;AAE3C;;;;GAIG;AACH,SAAgB,cAAc,CAAC,KAAc;IACzC,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC5B,OAAO,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC;IAC5D,CAAC;IACD,OAAO,KAAK,CAAC,UAAU,CAAC;AAC5B,CAAC;AAED;;;;;;;GAOG;AACH,SAAgB,qBAAqB,CAAC,KAAc,EAAE,SAAiC;IACnF,OAAO,IAAA,iBAAO,EAAC,KAAK,EAAE,KAAK,CAAC,EAAE;QAC1B,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC5B,MAAM,WAAW,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YAC9D,WAAW,CAAC,MAAM,GAAG,SAAS,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QACvD,CAAC;aAAM,CAAC;YACJ,KAAK,CAAC,UAAU,GAAG,SAAS,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QACnD,CAAC;IACL,CAAC,CAAC,CAAC;AACP,CAAC;AAED;;GAEG;AACH,SAAgB,kBAAkB,CAAC,CAAS;IACxC,OAAO,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;AACpC,CAAC;AAED;;;GAGG;AACH,SAAgB,6BAA6B,CAAC,EAAU,EAAE,SAAiB;IACvE,MAAM,WAAW,GAAG,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IACzC,OAAO,EAAE,CAAC,SAAS,CAAC,CAAC,EAAE,WAAW,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC;AACxD,CAAC;AAED;;GAEG;AACH,SAAgB,oBAAoB,CAAC,KAA0B;IAC3D,IAAI,CAAC,KAAK;QAAE,OAAO,KAAK,CAAC;IACzB,IAAI,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IACjD,OAAO,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;AAC7D,CAAC;AAED;;;;;;;GAOG;AACH,SAAgB,oBAAoB,CAAC,KAAc,EAAE,YAAoB;IACrE,IAAI,OAAO,GAAG,KAAK,CAAC;IAEpB,uBAAuB;IACvB,IAAI,aAAa,GAAG,KAAK,CAAC,UAAU,CAAC;IACrC,IAAI,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QAClC,aAAa,GAAG,6BAA6B,CAAC,KAAK,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;QAC9E,OAAO,GAAG,OAAO,IAAI,aAAa,KAAK,KAAK,CAAC,UAAU,CAAC;IAC5D,CAAC;IAED,6BAA6B;IAC7B,MAAM,WAAW,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;QAC7C,IAAI,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YAChC,MAAM,SAAS,GAAG,6BAA6B,CAAC,OAAO,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;YAC9E,IAAI,SAAS,KAAK,OAAO,CAAC,MAAM,EAAE,CAAC;gBAC/B,OAAO,GAAG,IAAI,CAAC;gBACf,uCAAW,OAAO,KAAE,MAAM,EAAE,SAAS,IAAE;YAC3C,CAAC;QACL,CAAC;QACD,OAAO,OAAO,CAAC;IACnB,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,OAAO,EAAE,CAAC;QACX,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,uCACO,KAAK,KACR,UAAU,EAAE,aAAa,EACzB,QAAQ,EAAE,WAAW,IACvB;AACN,CAAC;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAa,uBAAuB;IAKhC;;;OAGG;IACH,YAA6B,+BAAwC,KAAK;QAA7C,iCAA4B,GAA5B,4BAA4B,CAAiB;QAPlE,cAAS,GAAG,CAAC,CAAC;QACd,iBAAY,GAAG,CAAC,CAAC;IAMoD,CAAC;IAE9E;;OAEG;IACH,IAAI,WAAW;QACX,OAAO,IAAI,CAAC,YAAY,GAAG,CAAC,CAAC;IACjC,CAAC;IAED;;OAEG;IACH,WAAW,CAAC,IAAO;;QACf,MAAA,IAAI,CAAC,WAAW,oCAAhB,IAAI,CAAC,WAAW,GAAK,IAAI,EAAC;QAC1B,IAAI,CAAC,YAAY,EAAE,CAAC;IACxB,CAAC;IAED;;OAEG;IACH,WAAW,CAAC,IAAO;QACf,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACpB,IAAI,CAAC,SAAS,EAAE,CAAC;YACjB,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,MAAM,gBAAgB,GAAG,IAAI,CAAC,4BAA4B,IAAI,IAAI,CAAC,SAAS,KAAK,CAAC,CAAC;QACnF,MAAM,QAAQ,GAAG,yBAAyB,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,EAAE,gBAAgB,CAAC,CAAC;QACrF,IAAI,CAAC,WAAW,GAAG,SAAS,CAAC;QAC7B,IAAI,CAAC,SAAS,EAAE,CAAC;QACjB,OAAO,QAAQ,CAAC;IACpB,CAAC;CACJ;AAzCD,0DAyCC;AAED;;;;;;;;;;;;;GAaG;AACH,SAAS,yBAAyB,CAAc,cAAiB,EAAE,WAAc,EAAE,0BAAmC,KAAK;IACvH,IAAI,CAAC,cAAc,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC;QAChD,OAAO,WAAW,CAAC;IACvB,CAAC;IAED,MAAM,aAAa,GAAG,cAAc,CAAC,MAAM,CAAC;IAC5C,MAAM,aAAa,GAAG,WAAW,CAAC,MAAM,CAAC;IAEzC,IAAI,aAAa,KAAK,aAAa,EAAE,CAAC;QAClC,OAAO,WAAW,CAAC;IACvB,CAAC;IAED,yCAAyC;IACzC,MAAM,aAAa,GAAG,CAAC,EAAsB,EAAE,EAAE,CAAC,CAAC,CAAA,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,KAAK,CAAC,QAAQ,CAAC,KAAI,EAAE,CAAC,CAAC,MAAM,CAAC;IAErF,iGAAiG;IACjG,MAAM,iBAAiB,GAAG,CAAC,EAAsB,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;IAE9E,MAAM,SAAS,GAAG,aAAa,CAAC,UAAU,IAAI,EAAE,CAAC;IACjD,MAAM,SAAS,GAAG,aAAa,CAAC,UAAU,IAAI,EAAE,CAAC;IACjD,MAAM,eAAe,GAAG,aAAa,CAAC,QAAQ,IAAI,EAAE,CAAC;IACrD,MAAM,eAAe,GAAG,aAAa,CAAC,QAAQ,IAAI,EAAE,CAAC;IAErD,gEAAgE;IAChE,IAAI,cAAc,GAAG,eAAe,CAAC;IACrC,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAE,CAAC;QAC9D,MAAM,YAAY,GAAQ,eAAe,CAAC,CAAC,CAAC,CAAC;QAC7C,MAAM,WAAW,GAAG,YAAY,CAAC,IAAI,IAAI,YAAY,CAAC,OAAO,IAAI,EAAE,CAAC;QACpE,MAAM,aAAa,GAAG,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,YAAY,CAAC,SAAS,KAAK,KAAK,CAAC;QACrF,IAAI,aAAa,EAAE,CAAC;YAChB,cAAc,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC9C,CAAC;IACL,CAAC;IAED,sDAAsD;IACtD,IAAI,aAAoB,CAAC;IACzB,IAAI,uBAAuB,IAAI,iBAAiB,CAAC,SAAS,CAAC,EAAE,CAAC;QAC1D,iDAAiD;QACjD,aAAa,GAAG,CAAC,GAAG,eAAe,EAAE,GAAG,cAAc,CAAC,CAAC;IAC5D,CAAC;SAAM,CAAC;QACJ,aAAa,GAAG,cAAc,CAAC;IACnC,CAAC;IAED,iFAAiF;IACjF,MAAM,+BAA+B,GACjC,CAAC,uBAAuB;QACxB,aAAa,CAAC,SAAS,CAAC,GAAG,aAAa,CAAC,SAAS,CAAC,CAAC;IAExD,OAAO,IAAA,iBAAO,EAAC,WAAW,EAAE,KAAK,CAAC,EAAE;QAChC,KAAK,CAAC,MAAM,GAAG;YACX,IAAI,EAAE,+BAA+B,CAAC,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,aAAa,CAAC,IAAI;YAC/E,UAAU,EAAE,+BAA+B,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;YACnE,QAAQ,EAAE,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE;SAC1D,CAAC;IACN,CAAC,CAAC,CAAC;AACP,CAAC"}
@@ -12,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
12
12
  exports.registerMarkerCodec = registerMarkerCodec;
13
13
  const tree_1 = require("./tree");
14
14
  const rpc_1 = require("../rpc");
15
- const immer_1 = require("immer");
15
+ const util_1 = require("../util");
16
16
  // The `RpcCodec` for `J.Space` is registered in the `rpc` module.
17
17
  require("./rpc");
18
18
  // At runtime actually attach it to J
@@ -25,10 +25,10 @@ tree_1.J.Markers = {
25
25
  rpc_1.RpcCodecs.registerCodec(tree_1.J.Markers.TrailingComma, {
26
26
  rpcReceive(before, q) {
27
27
  return __awaiter(this, void 0, void 0, function* () {
28
- const draft = (0, immer_1.createDraft)(before);
29
- draft.id = yield q.receive(before.id);
30
- draft.suffix = yield q.receive(before.suffix);
31
- return (0, immer_1.finishDraft)(draft);
28
+ return (0, util_1.updateIfChanged)(before, {
29
+ id: yield q.receive(before.id),
30
+ suffix: yield q.receive(before.suffix),
31
+ });
32
32
  });
33
33
  },
34
34
  rpcSend(after, q) {
@@ -45,9 +45,9 @@ function registerMarkerCodec(kind) {
45
45
  rpc_1.RpcCodecs.registerCodec(kind, {
46
46
  rpcReceive(before, q) {
47
47
  return __awaiter(this, void 0, void 0, function* () {
48
- const draft = (0, immer_1.createDraft)(before);
49
- draft.id = yield q.receive(before.id);
50
- return (0, immer_1.finishDraft)(draft);
48
+ return (0, util_1.updateIfChanged)(before, {
49
+ id: yield q.receive(before.id),
50
+ });
51
51
  });
52
52
  },
53
53
  rpcSend(after, q) {
@@ -1 +1 @@
1
- {"version":3,"file":"markers.js","sourceRoot":"","sources":["../../src/java/markers.ts"],"names":[],"mappings":";;;;;;;;;;;AAsEA,kDAcC;AApED,iCAAyB;AACzB,gCAAgE;AAChE,iCAA+C;AAC/C,kEAAkE;AAClE,iBAAe;AAYf,qCAAqC;AACpC,QAAS,CAAC,OAAO,GAAG;IACjB,SAAS,EAAE,uCAAuC;IAClD,aAAa,EAAE,2CAA2C;IAC1D,eAAe,EAAE,6CAA6C;CACxD,CAAC;AAeX,kEAAkE;AAClE,eAAS,CAAC,aAAa,CAAC,QAAC,CAAC,OAAO,CAAC,aAAa,EAAE;IACvC,UAAU,CAAC,MAAqB,EAAE,CAAkB;;YACtD,MAAM,KAAK,GAAG,IAAA,mBAAW,EAAC,MAAM,CAAC,CAAC;YAClC,KAAK,CAAC,EAAE,GAAG,MAAM,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YACtC,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;YAC7C,OAAO,IAAA,mBAAW,EAAC,KAAK,CAAC,CAAC;QAC9B,CAAC;KAAA;IAEK,OAAO,CAAC,KAAoB,EAAE,CAAe;;YAC/C,MAAM,CAAC,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YACrC,MAAM,CAAC,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;QAC7C,CAAC;KAAA;CACJ,CAAC,CAAC;AAEH;;GAEG;AACH,SAAgB,mBAAmB,CAC/B,IAAe;IAEf,eAAS,CAAC,aAAa,CAAC,IAAI,EAAE;QACpB,UAAU,CAAC,MAAS,EAAE,CAAkB;;gBAC1C,MAAM,KAAK,GAAG,IAAA,mBAAW,EAAC,MAAM,CAAC,CAAC;gBAClC,KAAK,CAAC,EAAE,GAAG,MAAM,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBACtC,OAAO,IAAA,mBAAW,EAAC,KAAK,CAAM,CAAC;YACnC,CAAC;SAAA;QAEK,OAAO,CAAC,KAAQ,EAAE,CAAe;;gBACnC,MAAM,CAAC,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YACzC,CAAC;SAAA;KACJ,CAAC,CAAC;AACP,CAAC;AAED,mBAAmB,CAAC,QAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;AACzC,mBAAmB,CAAC,QAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC"}
1
+ {"version":3,"file":"markers.js","sourceRoot":"","sources":["../../src/java/markers.ts"],"names":[],"mappings":";;;;;;;;;;;AAsEA,kDAcC;AApED,iCAAyB;AACzB,gCAAgE;AAChE,kCAAwC;AACxC,kEAAkE;AAClE,iBAAe;AAYf,qCAAqC;AACpC,QAAS,CAAC,OAAO,GAAG;IACjB,SAAS,EAAE,uCAAuC;IAClD,aAAa,EAAE,2CAA2C;IAC1D,eAAe,EAAE,6CAA6C;CACxD,CAAC;AAeX,kEAAkE;AAClE,eAAS,CAAC,aAAa,CAAC,QAAC,CAAC,OAAO,CAAC,aAAa,EAAE;IACvC,UAAU,CAAC,MAAqB,EAAE,CAAkB;;YACtD,OAAO,IAAA,sBAAe,EAAC,MAAM,EAAE;gBAC3B,EAAE,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC9B,MAAM,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC;aACzC,CAAC,CAAC;QACP,CAAC;KAAA;IAEK,OAAO,CAAC,KAAoB,EAAE,CAAe;;YAC/C,MAAM,CAAC,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YACrC,MAAM,CAAC,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;QAC7C,CAAC;KAAA;CACJ,CAAC,CAAC;AAEH;;GAEG;AACH,SAAgB,mBAAmB,CAC/B,IAAe;IAEf,eAAS,CAAC,aAAa,CAAC,IAAI,EAAE;QACpB,UAAU,CAAC,MAAS,EAAE,CAAkB;;gBAC1C,OAAO,IAAA,sBAAe,EAAC,MAAM,EAAE;oBAC3B,EAAE,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;iBACnB,CAAC,CAAC;YACrB,CAAC;SAAA;QAEK,OAAO,CAAC,KAAQ,EAAE,CAAe;;gBACnC,MAAM,CAAC,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YACzC,CAAC;SAAA;KACJ,CAAC,CAAC;AACP,CAAC;AAED,mBAAmB,CAAC,QAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;AACzC,mBAAmB,CAAC,QAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC"}
@@ -1,7 +1,5 @@
1
1
  import { Cursor } from "../tree";
2
2
  import { Type } from "./type";
3
- import { Draft } from "immer";
4
- import { ValidImmerRecipeReturnType } from "../visitor";
5
3
  export declare class TypeVisitor<P> {
6
4
  protected cursor: Cursor;
7
5
  visitList<T extends Type>(types: T[] | undefined, p: P): Promise<T[] | undefined>;
@@ -43,6 +41,5 @@ export declare class TypeVisitor<P> {
43
41
  */
44
42
  protected visitVariable(variable: Type.Variable, p: P): Promise<Type | undefined>;
45
43
  protected visitUnknown(unknown: Type, p: P): Promise<Type | undefined>;
46
- protected produceType<T extends Type>(before: T, p: P, recipe?: (draft: Draft<T>) => ValidImmerRecipeReturnType<Draft<T>> | PromiseLike<ValidImmerRecipeReturnType<Draft<T>>>): Promise<T | undefined>;
47
44
  }
48
45
  //# sourceMappingURL=type-visitor.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"type-visitor.d.ts","sourceRoot":"","sources":["../../src/java/type-visitor.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"type-visitor.d.ts","sourceRoot":"","sources":["../../src/java/type-visitor.ts"],"names":[],"mappings":"AAeA,OAAO,EAAC,MAAM,EAAa,MAAM,SAAS,CAAC;AAE3C,OAAO,EAAC,IAAI,EAAC,MAAM,QAAQ,CAAC;AAE5B,qBAAa,WAAW,CAAC,CAAC;IACtB,SAAS,CAAC,MAAM,EAAE,MAAM,CAAgB;IAElC,SAAS,CAAC,CAAC,SAAS,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,SAAS,EAAE,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,EAAE,GAAG,SAAS,CAAC;IAOjF,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;IAIrD,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;IAI5D;;;;;;;;OAQG;IACG,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ7C,KAAK,CAAC,CAAC,SAAS,IAAI,EAAE,IAAI,EAAE,CAAC,GAAG,SAAS,EAAE,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;cA4D9D,UAAU,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;cAM9D,eAAe,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;cAgC7E,UAAU,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;cAO9D,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;cAY/D,wBAAwB,CAAC,OAAO,EAAE,IAAI,CAAC,mBAAmB,EAAE,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;cAM5F,iBAAiB,CAAC,YAAY,EAAE,IAAI,CAAC,YAAY,EAAE,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;IAMnG;;;;;;OAMG;cACa,WAAW,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;cAUjE,kBAAkB,CAAC,aAAa,EAAE,IAAI,CAAC,aAAa,EAAE,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;cAOtF,cAAc,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;IAK1F;;;;;;OAMG;cACa,aAAa,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;cAQvE,YAAY,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;CAI/E"}
@@ -28,8 +28,6 @@ exports.TypeVisitor = void 0;
28
28
  const tree_1 = require("../tree");
29
29
  const util_1 = require("../util");
30
30
  const type_1 = require("./type");
31
- const immer_1 = require("immer");
32
- const visitor_1 = require("../visitor");
33
31
  class TypeVisitor {
34
32
  constructor() {
35
33
  this.cursor = (0, tree_1.rootCursor)();
@@ -128,69 +126,78 @@ class TypeVisitor {
128
126
  }
129
127
  visitUnion(union, p) {
130
128
  return __awaiter(this, void 0, void 0, function* () {
131
- return this.produceType(union, p, (draft) => __awaiter(this, void 0, void 0, function* () {
132
- draft.bounds = (yield (0, util_1.mapAsync)(union.bounds || [], b => this.visit(b, p)));
133
- }));
129
+ return (0, util_1.updateIfChanged)(union, {
130
+ bounds: yield (0, util_1.mapAsync)(union.bounds || [], b => this.visit(b, p)),
131
+ });
134
132
  });
135
133
  }
136
134
  visitAnnotation(annotation, p) {
137
135
  return __awaiter(this, void 0, void 0, function* () {
138
- return this.produceType(annotation, p, (draft) => __awaiter(this, void 0, void 0, function* () {
139
- draft.type = (yield this.visit(annotation.type, p));
140
- // Note: values contain element values which themselves contain Type references
141
- draft.values = yield (0, util_1.mapAsync)(annotation.values || [], (v) => __awaiter(this, void 0, void 0, function* () {
142
- const draftValue = (0, immer_1.createDraft)(v);
143
- draftValue.element = (yield this.visit(v.element, p));
144
- if (v.kind === type_1.Type.Kind.SingleElementValue) {
145
- const single = v;
146
- if (single.referenceValue) {
147
- draftValue.referenceValue = yield this.visit(single.referenceValue, p);
148
- }
149
- }
150
- else if (v.kind === type_1.Type.Kind.ArrayElementValue) {
151
- const array = v;
152
- if (array.referenceValues) {
153
- draftValue.referenceValues = (yield (0, util_1.mapAsync)(array.referenceValues, rv => this.visit(rv, p)));
154
- }
155
- }
156
- return (0, immer_1.finishDraft)(draftValue);
157
- }));
136
+ const newType = yield this.visit(annotation.type, p);
137
+ // Note: values contain element values which themselves contain Type references
138
+ const newValues = yield (0, util_1.mapAsync)(annotation.values || [], (v) => __awaiter(this, void 0, void 0, function* () {
139
+ const newElement = yield this.visit(v.element, p);
140
+ if (v.kind === type_1.Type.Kind.SingleElementValue) {
141
+ const single = v;
142
+ const newReferenceValue = single.referenceValue
143
+ ? yield this.visit(single.referenceValue, p)
144
+ : undefined;
145
+ return (0, util_1.updateIfChanged)(v, {
146
+ element: newElement,
147
+ referenceValue: newReferenceValue,
148
+ });
149
+ }
150
+ else if (v.kind === type_1.Type.Kind.ArrayElementValue) {
151
+ const array = v;
152
+ const newReferenceValues = array.referenceValues
153
+ ? yield (0, util_1.mapAsync)(array.referenceValues, rv => this.visit(rv, p))
154
+ : undefined;
155
+ return (0, util_1.updateIfChanged)(v, {
156
+ element: newElement,
157
+ referenceValues: newReferenceValues,
158
+ });
159
+ }
160
+ return (0, util_1.updateIfChanged)(v, { element: newElement });
158
161
  }));
162
+ return (0, util_1.updateIfChanged)(annotation, {
163
+ type: newType,
164
+ values: newValues,
165
+ });
159
166
  });
160
167
  }
161
168
  visitArray(array, p) {
162
169
  return __awaiter(this, void 0, void 0, function* () {
163
- return this.produceType(array, p, (draft) => __awaiter(this, void 0, void 0, function* () {
164
- draft.elemType = (yield this.visit(array.elemType, p));
165
- draft.annotations = (yield this.visitList(array.annotations, p)) || [];
166
- }));
170
+ return (0, util_1.updateIfChanged)(array, {
171
+ elemType: yield this.visit(array.elemType, p),
172
+ annotations: (yield this.visitList(array.annotations, p)) || [],
173
+ });
167
174
  });
168
175
  }
169
176
  visitClass(aClass, p) {
170
177
  return __awaiter(this, void 0, void 0, function* () {
171
- return this.produceType(aClass, p, (draft) => __awaiter(this, void 0, void 0, function* () {
172
- draft.supertype = (yield this.visit(aClass.supertype, p));
173
- draft.owningClass = (yield this.visit(aClass.owningClass, p));
174
- draft.annotations = yield (0, util_1.mapAsync)(aClass.annotations || [], a => this.visit(a, p));
175
- draft.interfaces = yield (0, util_1.mapAsync)(aClass.interfaces || [], i => this.visit(i, p));
176
- draft.members = yield (0, util_1.mapAsync)(aClass.members || [], m => this.visit(m, p));
177
- draft.methods = yield (0, util_1.mapAsync)(aClass.methods || [], m => this.visit(m, p));
178
- draft.typeParameters = (yield this.visitList(aClass.typeParameters, p)) || [];
179
- }));
178
+ return (0, util_1.updateIfChanged)(aClass, {
179
+ supertype: yield this.visit(aClass.supertype, p),
180
+ owningClass: yield this.visit(aClass.owningClass, p),
181
+ annotations: yield (0, util_1.mapAsync)(aClass.annotations || [], a => this.visit(a, p)),
182
+ interfaces: yield (0, util_1.mapAsync)(aClass.interfaces || [], i => this.visit(i, p)),
183
+ members: yield (0, util_1.mapAsync)(aClass.members || [], m => this.visit(m, p)),
184
+ methods: yield (0, util_1.mapAsync)(aClass.methods || [], m => this.visit(m, p)),
185
+ typeParameters: (yield this.visitList(aClass.typeParameters, p)) || [],
186
+ });
180
187
  });
181
188
  }
182
189
  visitGenericTypeVariable(generic, p) {
183
190
  return __awaiter(this, void 0, void 0, function* () {
184
- return this.produceType(generic, p, (draft) => __awaiter(this, void 0, void 0, function* () {
185
- draft.bounds = (yield (0, util_1.mapAsync)(generic.bounds || [], b => this.visit(b, p)));
186
- }));
191
+ return (0, util_1.updateIfChanged)(generic, {
192
+ bounds: yield (0, util_1.mapAsync)(generic.bounds || [], b => this.visit(b, p)),
193
+ });
187
194
  });
188
195
  }
189
196
  visitIntersection(intersection, p) {
190
197
  return __awaiter(this, void 0, void 0, function* () {
191
- return this.produceType(intersection, p, (draft) => __awaiter(this, void 0, void 0, function* () {
192
- draft.bounds = (yield (0, util_1.mapAsync)(intersection.bounds || [], b => this.visit(b, p)));
193
- }));
198
+ return (0, util_1.updateIfChanged)(intersection, {
199
+ bounds: yield (0, util_1.mapAsync)(intersection.bounds || [], b => this.visit(b, p)),
200
+ });
194
201
  });
195
202
  }
196
203
  /**
@@ -202,21 +209,21 @@ class TypeVisitor {
202
209
  */
203
210
  visitMethod(method, p) {
204
211
  return __awaiter(this, void 0, void 0, function* () {
205
- return this.produceType(method, p, (draft) => __awaiter(this, void 0, void 0, function* () {
206
- draft.declaringType = (yield this.visit(method.declaringType, p));
207
- draft.returnType = (yield this.visit(method.returnType, p));
208
- draft.parameterTypes = (yield (0, util_1.mapAsync)(method.parameterTypes || [], pt => this.visit(pt, p)));
209
- draft.thrownExceptions = (yield (0, util_1.mapAsync)(method.thrownExceptions || [], t => this.visit(t, p)));
210
- draft.annotations = yield (0, util_1.mapAsync)(method.annotations || [], a => this.visit(a, p));
211
- }));
212
+ return (0, util_1.updateIfChanged)(method, {
213
+ declaringType: yield this.visit(method.declaringType, p),
214
+ returnType: yield this.visit(method.returnType, p),
215
+ parameterTypes: yield (0, util_1.mapAsync)(method.parameterTypes || [], pt => this.visit(pt, p)),
216
+ thrownExceptions: yield (0, util_1.mapAsync)(method.thrownExceptions || [], t => this.visit(t, p)),
217
+ annotations: yield (0, util_1.mapAsync)(method.annotations || [], a => this.visit(a, p)),
218
+ });
212
219
  });
213
220
  }
214
221
  visitParameterized(parameterized, p) {
215
222
  return __awaiter(this, void 0, void 0, function* () {
216
- return this.produceType(parameterized, p, (draft) => __awaiter(this, void 0, void 0, function* () {
217
- draft.type = (yield this.visit(parameterized.type, p));
218
- draft.typeParameters = (yield (0, util_1.mapAsync)(parameterized.typeParameters || [], t => this.visit(t, p)));
219
- }));
223
+ return (0, util_1.updateIfChanged)(parameterized, {
224
+ type: yield this.visit(parameterized.type, p),
225
+ typeParameters: yield (0, util_1.mapAsync)(parameterized.typeParameters || [], t => this.visit(t, p)),
226
+ });
220
227
  });
221
228
  }
222
229
  visitPrimitive(primitive, p) {
@@ -234,11 +241,11 @@ class TypeVisitor {
234
241
  */
235
242
  visitVariable(variable, p) {
236
243
  return __awaiter(this, void 0, void 0, function* () {
237
- return this.produceType(variable, p, (draft) => __awaiter(this, void 0, void 0, function* () {
238
- draft.owner = yield this.visit(variable.owner, p);
239
- draft.type = (yield this.visit(variable.type, p));
240
- draft.annotations = yield (0, util_1.mapAsync)(variable.annotations || [], a => this.visit(a, p));
241
- }));
244
+ return (0, util_1.updateIfChanged)(variable, {
245
+ owner: yield this.visit(variable.owner, p),
246
+ type: yield this.visit(variable.type, p),
247
+ annotations: yield (0, util_1.mapAsync)(variable.annotations || [], a => this.visit(a, p)),
248
+ });
242
249
  });
243
250
  }
244
251
  visitUnknown(unknown, p) {
@@ -247,14 +254,6 @@ class TypeVisitor {
247
254
  return unknown;
248
255
  });
249
256
  }
250
- produceType(before, p, recipe) {
251
- return __awaiter(this, void 0, void 0, function* () {
252
- if (recipe) {
253
- return (0, visitor_1.produceAsync)(before, recipe);
254
- }
255
- return before;
256
- });
257
- }
258
257
  }
259
258
  exports.TypeVisitor = TypeVisitor;
260
259
  //# sourceMappingURL=type-visitor.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"type-visitor.js","sourceRoot":"","sources":["../../src/java/type-visitor.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"type-visitor.js","sourceRoot":"","sources":["../../src/java/type-visitor.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,7 @@
1
1
  import { SourceFile } from "../tree";
2
- import { TreeVisitor, ValidImmerRecipeReturnType } from "../visitor";
2
+ import { TreeVisitor, ValidRecipeReturnType } from "../visitor";
3
3
  import { Expression, J, NameTree, Statement } from "./tree";
4
- import { Draft } from "immer";
4
+ import { Draft } from "mutative";
5
5
  import { Type } from "./type";
6
6
  /**
7
7
  * Register additional kind values for interfaces that extend J.
@@ -95,7 +95,7 @@ export declare class JavaVisitor<P> extends TreeVisitor<J, P> {
95
95
  visitLeftPadded<T extends J | J.Space | number | string | boolean>(left: J.LeftPadded<T>, p: P): Promise<J.LeftPadded<T> | undefined>;
96
96
  protected visitOptionalContainer<T extends J>(container: J.Container<T> | undefined, p: P): Promise<J.Container<T> | undefined>;
97
97
  visitContainer<T extends J>(container: J.Container<T>, p: P): Promise<J.Container<T>>;
98
- protected produceJava<J2 extends J>(before: J2, p: P, recipe?: (draft: Draft<J2>) => ValidImmerRecipeReturnType<Draft<J2>> | PromiseLike<ValidImmerRecipeReturnType<Draft<J2>>>): Promise<J2>;
98
+ protected produceJava<J2 extends J>(before: J2, p: P, recipe?: (draft: Draft<J2>) => ValidRecipeReturnType<Draft<J2>> | PromiseLike<ValidRecipeReturnType<Draft<J2>>>): Promise<J2>;
99
99
  protected accept(t: J, p: P): Promise<J | undefined>;
100
100
  }
101
101
  //# sourceMappingURL=visitor.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"visitor.d.ts","sourceRoot":"","sources":["../../src/java/visitor.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"visitor.d.ts","sourceRoot":"","sources":["../../src/java/visitor.ts"],"names":[],"mappings":"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"}
@@ -31,7 +31,7 @@ const tree_1 = require("../tree");
31
31
  const util_1 = require("../util");
32
32
  const visitor_1 = require("../visitor");
33
33
  const tree_2 = require("./tree");
34
- const immer_1 = require("immer");
34
+ const mutative_1 = require("mutative");
35
35
  const javaKindValues = new Set(Object.values(tree_2.J.Kind));
36
36
  const extendedJavaKinds = new Map();
37
37
  /**
@@ -1249,7 +1249,7 @@ class JavaVisitor extends visitor_1.TreeVisitor {
1249
1249
  draft.markers = yield this.visitMarkers(right.markers, p);
1250
1250
  this.cursor = this.cursor.parent;
1251
1251
  if (draft.element === undefined) {
1252
- return immer_1.nothing;
1252
+ return (0, mutative_1.rawReturn)(undefined);
1253
1253
  }
1254
1254
  }));
1255
1255
  });
@@ -1273,7 +1273,7 @@ class JavaVisitor extends visitor_1.TreeVisitor {
1273
1273
  draft.markers = yield this.visitMarkers(left.markers, p);
1274
1274
  this.cursor = this.cursor.parent;
1275
1275
  if (draft.element === undefined) {
1276
- return immer_1.nothing;
1276
+ return (0, mutative_1.rawReturn)(undefined);
1277
1277
  }
1278
1278
  }));
1279
1279
  });
@@ -1296,13 +1296,13 @@ class JavaVisitor extends visitor_1.TreeVisitor {
1296
1296
  }
1297
1297
  produceJava(before, p, recipe) {
1298
1298
  return __awaiter(this, void 0, void 0, function* () {
1299
- const draft = (0, immer_1.createDraft)(before);
1299
+ const [draft, finishDraft] = (0, mutative_1.create)(before);
1300
1300
  draft.prefix = yield this.visitSpace(before.prefix, p);
1301
1301
  draft.markers = yield this.visitMarkers(before.markers, p);
1302
1302
  if (recipe) {
1303
1303
  yield recipe(draft);
1304
1304
  }
1305
- return (0, immer_1.finishDraft)(draft);
1305
+ return finishDraft();
1306
1306
  });
1307
1307
  }
1308
1308
  accept(t, p) {