@openrewrite/rewrite 8.72.2 → 8.72.3
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/execution.js +3 -16
- package/dist/execution.js.map +1 -1
- package/dist/index.js +34 -49
- package/dist/index.js.map +1 -1
- package/dist/java/markers.js +12 -29
- package/dist/java/markers.js.map +1 -1
- package/dist/java/print.js +2 -13
- package/dist/java/print.js.map +1 -1
- package/dist/java/rpc.js +1344 -1725
- package/dist/java/rpc.js.map +1 -1
- package/dist/java/type-visitor.js +143 -184
- package/dist/java/type-visitor.js.map +1 -1
- package/dist/java/visitor.js +1072 -1249
- package/dist/java/visitor.js.map +1 -1
- package/dist/javascript/add-import.js +495 -534
- package/dist/javascript/add-import.js.map +1 -1
- package/dist/javascript/autodetect.js +116 -159
- package/dist/javascript/autodetect.js.map +1 -1
- package/dist/javascript/cleanup/add-parse-int-radix.js +41 -57
- package/dist/javascript/cleanup/add-parse-int-radix.js.map +1 -1
- package/dist/javascript/cleanup/prefer-optional-chain.js +89 -105
- package/dist/javascript/cleanup/prefer-optional-chain.js.map +1 -1
- package/dist/javascript/cleanup/use-object-property-shorthand.js +74 -95
- package/dist/javascript/cleanup/use-object-property-shorthand.js.map +1 -1
- package/dist/javascript/comparator.js +815 -1167
- package/dist/javascript/comparator.js.map +1 -1
- package/dist/javascript/dependency-workspace.js +206 -219
- package/dist/javascript/dependency-workspace.js.map +1 -1
- package/dist/javascript/format/format.js +682 -908
- package/dist/javascript/format/format.js.map +1 -1
- package/dist/javascript/format/minimum-viable-spacing-visitor.js +152 -231
- package/dist/javascript/format/minimum-viable-spacing-visitor.js.map +1 -1
- package/dist/javascript/format/normalize-whitespace-visitor.js +12 -31
- package/dist/javascript/format/normalize-whitespace-visitor.js.map +1 -1
- package/dist/javascript/format/prettier-config-loader.js +134 -153
- package/dist/javascript/format/prettier-config-loader.js.map +1 -1
- package/dist/javascript/format/prettier-format.js +112 -129
- package/dist/javascript/format/prettier-format.js.map +1 -1
- package/dist/javascript/format/tabs-and-indents-visitor.js +112 -136
- package/dist/javascript/format/tabs-and-indents-visitor.js.map +1 -1
- package/dist/javascript/markers.js +59 -92
- package/dist/javascript/markers.js.map +1 -1
- package/dist/javascript/migrate/es6/modernize-octal-escape-sequences.js +39 -52
- package/dist/javascript/migrate/es6/modernize-octal-escape-sequences.js.map +1 -1
- package/dist/javascript/migrate/es6/modernize-octal-literals.js +25 -38
- package/dist/javascript/migrate/es6/modernize-octal-literals.js.map +1 -1
- package/dist/javascript/migrate/es6/remove-duplicate-object-keys.js +66 -82
- package/dist/javascript/migrate/es6/remove-duplicate-object-keys.js.map +1 -1
- package/dist/javascript/migrate/typescript/export-assignment-to-export-default.js +10 -23
- package/dist/javascript/migrate/typescript/export-assignment-to-export-default.js.map +1 -1
- package/dist/javascript/node-resolution-result.js +137 -166
- package/dist/javascript/node-resolution-result.js.map +1 -1
- package/dist/javascript/package-json-parser.js +312 -343
- package/dist/javascript/package-json-parser.js.map +1 -1
- package/dist/javascript/package-manager.js +145 -170
- package/dist/javascript/package-manager.js.map +1 -1
- package/dist/javascript/parser.d.ts.map +1 -1
- package/dist/javascript/parser.js +94 -68
- package/dist/javascript/parser.js.map +1 -1
- package/dist/javascript/print.js +1572 -1835
- package/dist/javascript/print.js.map +1 -1
- package/dist/javascript/project-parser.js +151 -172
- package/dist/javascript/project-parser.js.map +1 -1
- package/dist/javascript/recipes/add-dependency.js +140 -175
- package/dist/javascript/recipes/add-dependency.js.map +1 -1
- package/dist/javascript/recipes/async-callback-in-sync-array-method.js +20 -36
- package/dist/javascript/recipes/async-callback-in-sync-array-method.js.map +1 -1
- package/dist/javascript/recipes/auto-format.js +3 -14
- package/dist/javascript/recipes/auto-format.js.map +1 -1
- package/dist/javascript/recipes/change-import.js +447 -495
- package/dist/javascript/recipes/change-import.js.map +1 -1
- package/dist/javascript/recipes/order-imports.js +162 -175
- package/dist/javascript/recipes/order-imports.js.map +1 -1
- package/dist/javascript/recipes/upgrade-dependency-version.js +167 -197
- package/dist/javascript/recipes/upgrade-dependency-version.js.map +1 -1
- package/dist/javascript/recipes/upgrade-transitive-dependency-version.js +166 -193
- package/dist/javascript/recipes/upgrade-transitive-dependency-version.js.map +1 -1
- package/dist/javascript/remove-import.js +689 -724
- package/dist/javascript/remove-import.js.map +1 -1
- package/dist/javascript/rpc.js +1007 -1332
- package/dist/javascript/rpc.js.map +1 -1
- package/dist/javascript/search/find-dependency.js +84 -110
- package/dist/javascript/search/find-dependency.js.map +1 -1
- package/dist/javascript/search/uses-method.js +5 -19
- package/dist/javascript/search/uses-method.js.map +1 -1
- package/dist/javascript/search/uses-type.js +9 -20
- package/dist/javascript/search/uses-type.js.map +1 -1
- package/dist/javascript/templating/comparator.js +737 -822
- package/dist/javascript/templating/comparator.js.map +1 -1
- package/dist/javascript/templating/engine.js +211 -245
- package/dist/javascript/templating/engine.js.map +1 -1
- package/dist/javascript/templating/pattern.js +169 -190
- package/dist/javascript/templating/pattern.js.map +1 -1
- package/dist/javascript/templating/placeholder-replacement.js +172 -210
- package/dist/javascript/templating/placeholder-replacement.js.map +1 -1
- package/dist/javascript/templating/rewrite.js +75 -97
- package/dist/javascript/templating/rewrite.js.map +1 -1
- package/dist/javascript/templating/template.js +69 -82
- package/dist/javascript/templating/template.js.map +1 -1
- package/dist/javascript/tree-debug.js +109 -137
- package/dist/javascript/tree-debug.js.map +1 -1
- package/dist/javascript/visitor.js +1090 -1254
- package/dist/javascript/visitor.js.map +1 -1
- package/dist/json/print.js +72 -103
- package/dist/json/print.js.map +1 -1
- package/dist/json/rpc.js +120 -181
- package/dist/json/rpc.js.map +1 -1
- package/dist/json/visitor.js +69 -100
- package/dist/json/visitor.js.map +1 -1
- package/dist/marketplace.js +20 -33
- package/dist/marketplace.js.map +1 -1
- package/dist/parse-error.js +41 -62
- package/dist/parse-error.js.map +1 -1
- package/dist/parser.js +7 -18
- package/dist/parser.js.map +1 -1
- package/dist/path-utils.js +46 -59
- package/dist/path-utils.js.map +1 -1
- package/dist/preconditions.js +30 -47
- package/dist/preconditions.js.map +1 -1
- package/dist/print.js +6 -19
- package/dist/print.js.map +1 -1
- package/dist/recipe.js +42 -73
- package/dist/recipe.js.map +1 -1
- package/dist/rpc/index.js +74 -115
- package/dist/rpc/index.js.map +1 -1
- package/dist/rpc/queue.js +71 -90
- package/dist/rpc/queue.js.map +1 -1
- package/dist/rpc/recipe.js +32 -57
- package/dist/rpc/recipe.js.map +1 -1
- package/dist/rpc/request/generate.js +4 -13
- package/dist/rpc/request/generate.js.map +1 -1
- package/dist/rpc/request/get-languages.js +2 -11
- package/dist/rpc/request/get-languages.js.map +1 -1
- package/dist/rpc/request/get-marketplace.js +9 -20
- package/dist/rpc/request/get-marketplace.js.map +1 -1
- package/dist/rpc/request/get-object.js +4 -13
- package/dist/rpc/request/get-object.js.map +1 -1
- package/dist/rpc/request/install-recipes.js +25 -36
- package/dist/rpc/request/install-recipes.js.map +1 -1
- package/dist/rpc/request/metrics.js +8 -17
- package/dist/rpc/request/metrics.js.map +1 -1
- package/dist/rpc/request/parse-project.js +36 -45
- package/dist/rpc/request/parse-project.js.map +1 -1
- package/dist/rpc/request/parse.js +5 -14
- package/dist/rpc/request/parse.js.map +1 -1
- package/dist/rpc/request/prepare-recipe.js +37 -52
- package/dist/rpc/request/prepare-recipe.js.map +1 -1
- package/dist/rpc/request/print.js +5 -14
- package/dist/rpc/request/print.js.map +1 -1
- package/dist/rpc/request/visit.js +56 -71
- package/dist/rpc/request/visit.js.map +1 -1
- package/dist/rpc/rewrite-rpc.js +70 -97
- package/dist/rpc/rewrite-rpc.js.map +1 -1
- package/dist/rpc/server.js +76 -89
- package/dist/rpc/server.js.map +1 -1
- package/dist/run.js +47 -66
- package/dist/run.js.map +1 -1
- package/dist/search/is-source-file.js +8 -19
- package/dist/search/is-source-file.js.map +1 -1
- package/dist/test/rewrite-test.js +154 -188
- package/dist/test/rewrite-test.js.map +1 -1
- package/dist/text/print.js +23 -38
- package/dist/text/print.js.map +1 -1
- package/dist/text/rpc.js +29 -44
- package/dist/text/rpc.js.map +1 -1
- package/dist/text/visitor.js +16 -33
- package/dist/text/visitor.js.map +1 -1
- package/dist/util.js +13 -24
- package/dist/util.js.map +1 -1
- package/dist/version.txt +1 -1
- package/dist/visitor.js +84 -115
- package/dist/visitor.js.map +1 -1
- package/dist/yaml/index.d.ts +2 -0
- package/dist/yaml/index.d.ts.map +1 -1
- package/dist/yaml/index.js +2 -0
- package/dist/yaml/index.js.map +1 -1
- package/dist/yaml/markers.d.ts +21 -0
- package/dist/yaml/markers.d.ts.map +1 -0
- package/dist/yaml/markers.js +37 -0
- package/dist/yaml/markers.js.map +1 -0
- package/dist/yaml/parser.d.ts.map +1 -1
- package/dist/yaml/parser.js +4 -1
- package/dist/yaml/parser.js.map +1 -1
- package/dist/yaml/print.d.ts +1 -1
- package/dist/yaml/print.d.ts.map +1 -1
- package/dist/yaml/print.js +175 -208
- package/dist/yaml/print.js.map +1 -1
- package/dist/yaml/rpc.js +154 -219
- package/dist/yaml/rpc.js.map +1 -1
- package/dist/yaml/visitor.js +78 -113
- package/dist/yaml/visitor.js.map +1 -1
- package/package.json +1 -1
- package/src/javascript/parser.ts +56 -14
- package/src/yaml/index.ts +2 -0
- package/src/yaml/markers.ts +70 -0
- package/src/yaml/parser.ts +5 -1
- package/src/yaml/print.ts +5 -2
package/dist/json/rpc.js
CHANGED
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
3
|
/*
|
|
13
4
|
* Copyright 2025 the original author or authors.
|
|
@@ -29,175 +20,135 @@ const rpc_1 = require("../rpc");
|
|
|
29
20
|
const tree_1 = require("./tree");
|
|
30
21
|
const util_1 = require("../util");
|
|
31
22
|
class JsonSender extends visitor_1.JsonVisitor {
|
|
32
|
-
preVisit(j, q) {
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
}
|
|
52
|
-
|
|
53
|
-
return
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
}
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
}
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
}
|
|
89
|
-
visitSpace(space, q) {
|
|
90
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
91
|
-
yield q.getAndSendList(space, s => s.comments, c => c.text + c.suffix, (c) => __awaiter(this, void 0, void 0, function* () {
|
|
92
|
-
yield q.getAndSend(c, c2 => c2.multiline);
|
|
93
|
-
yield q.getAndSend(c, c2 => c2.text);
|
|
94
|
-
yield q.getAndSend(c, c2 => c2.suffix);
|
|
95
|
-
yield q.getAndSend(c, c2 => c2.markers);
|
|
96
|
-
}));
|
|
97
|
-
yield q.getAndSend(space, s => s.whitespace);
|
|
98
|
-
return space;
|
|
99
|
-
});
|
|
100
|
-
}
|
|
101
|
-
visitRightPadded(right, q) {
|
|
102
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
103
|
-
yield q.getAndSend(right, r => r.element, j => this.visit(j, q));
|
|
104
|
-
yield q.getAndSend(right, r => (0, rpc_1.asRef)(r.after), (space) => __awaiter(this, void 0, void 0, function* () { return yield this.visitSpace(space, q); }));
|
|
105
|
-
yield q.getAndSend(right, r => r.markers);
|
|
106
|
-
return right;
|
|
107
|
-
});
|
|
23
|
+
async preVisit(j, q) {
|
|
24
|
+
await q.getAndSend(j, j2 => j2.id);
|
|
25
|
+
await q.getAndSend(j, j2 => (0, rpc_1.asRef)(j2.prefix), async (space) => await this.visitSpace(space, q));
|
|
26
|
+
await q.getAndSend(j, j2 => j2.markers);
|
|
27
|
+
return j;
|
|
28
|
+
}
|
|
29
|
+
async visitDocument(document, q) {
|
|
30
|
+
await q.getAndSend(document, d => d.sourcePath);
|
|
31
|
+
await q.getAndSend(document, d => d.charsetName);
|
|
32
|
+
await q.getAndSend(document, d => d.charsetBomMarked);
|
|
33
|
+
await q.getAndSend(document, d => d.checksum);
|
|
34
|
+
await q.getAndSend(document, d => d.fileAttributes);
|
|
35
|
+
await q.getAndSend(document, d => d.value, async (j) => await this.visit(j, q));
|
|
36
|
+
await q.getAndSend(document, d => (0, rpc_1.asRef)(d.eof), async (space) => await this.visitSpace(space, q));
|
|
37
|
+
return document;
|
|
38
|
+
}
|
|
39
|
+
async visitArray(array, q) {
|
|
40
|
+
await q.getAndSendList(array, a => a.values, j => j.element.id, async (j) => await this.visitRightPadded(j, q));
|
|
41
|
+
return array;
|
|
42
|
+
}
|
|
43
|
+
async visitEmpty(empty) {
|
|
44
|
+
return empty;
|
|
45
|
+
}
|
|
46
|
+
async visitIdentifier(identifier, q) {
|
|
47
|
+
await q.getAndSend(identifier, id => id.name);
|
|
48
|
+
return identifier;
|
|
49
|
+
}
|
|
50
|
+
async visitLiteral(literal, q) {
|
|
51
|
+
await q.getAndSend(literal, lit => lit.source);
|
|
52
|
+
await q.getAndSend(literal, lit => lit.value);
|
|
53
|
+
return literal;
|
|
54
|
+
}
|
|
55
|
+
async visitMember(member, q) {
|
|
56
|
+
await q.getAndSend(member, m => m.key, async (j) => await this.visitRightPadded(j, q));
|
|
57
|
+
await q.getAndSend(member, m => m.value, async (j) => await this.visit(j, q));
|
|
58
|
+
return member;
|
|
59
|
+
}
|
|
60
|
+
async visitObject(obj, q) {
|
|
61
|
+
await q.getAndSendList(obj, o => o.members, j => j.element.id, async (j) => await this.visitRightPadded(j, q));
|
|
62
|
+
return obj;
|
|
63
|
+
}
|
|
64
|
+
async visitSpace(space, q) {
|
|
65
|
+
await q.getAndSendList(space, s => s.comments, c => c.text + c.suffix, async (c) => {
|
|
66
|
+
await q.getAndSend(c, c2 => c2.multiline);
|
|
67
|
+
await q.getAndSend(c, c2 => c2.text);
|
|
68
|
+
await q.getAndSend(c, c2 => c2.suffix);
|
|
69
|
+
await q.getAndSend(c, c2 => c2.markers);
|
|
70
|
+
});
|
|
71
|
+
await q.getAndSend(space, s => s.whitespace);
|
|
72
|
+
return space;
|
|
73
|
+
}
|
|
74
|
+
async visitRightPadded(right, q) {
|
|
75
|
+
await q.getAndSend(right, r => r.element, j => this.visit(j, q));
|
|
76
|
+
await q.getAndSend(right, r => (0, rpc_1.asRef)(r.after), async (space) => await this.visitSpace(space, q));
|
|
77
|
+
await q.getAndSend(right, r => r.markers);
|
|
78
|
+
return right;
|
|
108
79
|
}
|
|
109
80
|
}
|
|
110
81
|
// noinspection ES6MissingAwait
|
|
111
82
|
class JsonReceiver extends visitor_1.JsonVisitor {
|
|
112
|
-
preVisit(j, q) {
|
|
113
|
-
return
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
markers: yield q.receive(j.markers),
|
|
118
|
-
});
|
|
83
|
+
async preVisit(j, q) {
|
|
84
|
+
return (0, util_1.updateIfChanged)(j, {
|
|
85
|
+
id: await q.receive(j.id),
|
|
86
|
+
prefix: await q.receive(j.prefix, async (space) => await this.visitSpace(space, q)),
|
|
87
|
+
markers: await q.receive(j.markers),
|
|
119
88
|
});
|
|
120
89
|
}
|
|
121
|
-
visitDocument(document, q) {
|
|
122
|
-
return
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
eof: yield q.receive(document.eof, (space) => __awaiter(this, void 0, void 0, function* () { return yield this.visitSpace(space, q); })),
|
|
131
|
-
});
|
|
90
|
+
async visitDocument(document, q) {
|
|
91
|
+
return (0, util_1.updateIfChanged)(document, {
|
|
92
|
+
sourcePath: await q.receive(document.sourcePath),
|
|
93
|
+
charsetName: await q.receive(document.charsetName),
|
|
94
|
+
charsetBomMarked: await q.receive(document.charsetBomMarked),
|
|
95
|
+
checksum: await q.receive(document.checksum),
|
|
96
|
+
fileAttributes: await q.receive(document.fileAttributes),
|
|
97
|
+
value: await q.receive(document.value, async (j) => await this.visit(j, q)),
|
|
98
|
+
eof: await q.receive(document.eof, async (space) => await this.visitSpace(space, q)),
|
|
132
99
|
});
|
|
133
100
|
}
|
|
134
|
-
visitArray(array, q) {
|
|
135
|
-
return
|
|
136
|
-
|
|
137
|
-
values: yield q.receiveListDefined(array.values, (j) => __awaiter(this, void 0, void 0, function* () { return yield this.visitRightPadded(j, q); })),
|
|
138
|
-
});
|
|
101
|
+
async visitArray(array, q) {
|
|
102
|
+
return (0, util_1.updateIfChanged)(array, {
|
|
103
|
+
values: await q.receiveListDefined(array.values, async (j) => await this.visitRightPadded(j, q)),
|
|
139
104
|
});
|
|
140
105
|
}
|
|
141
|
-
visitEmpty(empty) {
|
|
142
|
-
return
|
|
143
|
-
return empty;
|
|
144
|
-
});
|
|
106
|
+
async visitEmpty(empty) {
|
|
107
|
+
return empty;
|
|
145
108
|
}
|
|
146
|
-
visitIdentifier(identifier, q) {
|
|
147
|
-
return
|
|
148
|
-
|
|
149
|
-
name: yield q.receive(identifier.name),
|
|
150
|
-
});
|
|
109
|
+
async visitIdentifier(identifier, q) {
|
|
110
|
+
return (0, util_1.updateIfChanged)(identifier, {
|
|
111
|
+
name: await q.receive(identifier.name),
|
|
151
112
|
});
|
|
152
113
|
}
|
|
153
|
-
visitLiteral(literal, q) {
|
|
154
|
-
return
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
value: yield q.receive(literal.value),
|
|
158
|
-
});
|
|
114
|
+
async visitLiteral(literal, q) {
|
|
115
|
+
return (0, util_1.updateIfChanged)(literal, {
|
|
116
|
+
source: await q.receive(literal.source),
|
|
117
|
+
value: await q.receive(literal.value),
|
|
159
118
|
});
|
|
160
119
|
}
|
|
161
|
-
visitMember(member, q) {
|
|
162
|
-
return
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
value: yield q.receive(member.value, (j) => __awaiter(this, void 0, void 0, function* () { return yield this.visit(j, q); })),
|
|
166
|
-
});
|
|
120
|
+
async visitMember(member, q) {
|
|
121
|
+
return (0, util_1.updateIfChanged)(member, {
|
|
122
|
+
key: await q.receive(member.key, async (j) => await this.visitRightPadded(j, q)),
|
|
123
|
+
value: await q.receive(member.value, async (j) => await this.visit(j, q)),
|
|
167
124
|
});
|
|
168
125
|
}
|
|
169
|
-
visitObject(obj, q) {
|
|
170
|
-
return
|
|
171
|
-
|
|
172
|
-
members: yield q.receiveListDefined(obj.members, (j) => __awaiter(this, void 0, void 0, function* () { return yield this.visitRightPadded(j, q); })),
|
|
173
|
-
});
|
|
126
|
+
async visitObject(obj, q) {
|
|
127
|
+
return (0, util_1.updateIfChanged)(obj, {
|
|
128
|
+
members: await q.receiveListDefined(obj.members, async (j) => await this.visitRightPadded(j, q)),
|
|
174
129
|
});
|
|
175
130
|
}
|
|
176
|
-
visitSpace(space, q) {
|
|
177
|
-
return
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
whitespace: yield q.receive(space.whitespace),
|
|
188
|
-
});
|
|
131
|
+
async visitSpace(space, q) {
|
|
132
|
+
return (0, util_1.updateIfChanged)(space, {
|
|
133
|
+
comments: await q.receiveListDefined(space.comments, async (c) => {
|
|
134
|
+
return (0, util_1.updateIfChanged)(c, {
|
|
135
|
+
multiline: await q.receive(c.multiline),
|
|
136
|
+
text: await q.receive(c.text),
|
|
137
|
+
suffix: await q.receive(c.suffix),
|
|
138
|
+
markers: await q.receive(c.markers),
|
|
139
|
+
});
|
|
140
|
+
}),
|
|
141
|
+
whitespace: await q.receive(space.whitespace),
|
|
189
142
|
});
|
|
190
143
|
}
|
|
191
|
-
visitRightPadded(right, p) {
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
markers: yield p.receiveMarkers(right.markers),
|
|
200
|
-
});
|
|
144
|
+
async visitRightPadded(right, p) {
|
|
145
|
+
if (!right) {
|
|
146
|
+
throw new Error("TreeDataReceiveQueue should have instantiated an empty padding");
|
|
147
|
+
}
|
|
148
|
+
return (0, util_1.updateIfChanged)(right, {
|
|
149
|
+
element: await p.receive(right.element, async (j) => await this.visit(j, p)),
|
|
150
|
+
after: await p.receive(right.after, async (space) => await this.visitSpace(space, p)),
|
|
151
|
+
markers: await p.receiveMarkers(right.markers),
|
|
201
152
|
});
|
|
202
153
|
}
|
|
203
154
|
}
|
|
@@ -207,43 +158,31 @@ const sender = new JsonSender();
|
|
|
207
158
|
for (const kind of Object.values(tree_1.Json.Kind)) {
|
|
208
159
|
if (kind === tree_1.Json.Kind.Space) {
|
|
209
160
|
rpc_1.RpcCodecs.registerCodec(kind, {
|
|
210
|
-
rpcReceive(before, q) {
|
|
211
|
-
return
|
|
212
|
-
return (yield receiver.visitSpace(before, q));
|
|
213
|
-
});
|
|
161
|
+
async rpcReceive(before, q) {
|
|
162
|
+
return (await receiver.visitSpace(before, q));
|
|
214
163
|
},
|
|
215
|
-
rpcSend(after, q) {
|
|
216
|
-
|
|
217
|
-
yield sender.visitSpace(after, q);
|
|
218
|
-
});
|
|
164
|
+
async rpcSend(after, q) {
|
|
165
|
+
await sender.visitSpace(after, q);
|
|
219
166
|
}
|
|
220
167
|
}, tree_1.Json.Kind.Document);
|
|
221
168
|
}
|
|
222
169
|
else if (kind === tree_1.Json.Kind.RightPadded) {
|
|
223
170
|
rpc_1.RpcCodecs.registerCodec(kind, {
|
|
224
|
-
rpcReceive(before, q) {
|
|
225
|
-
return
|
|
226
|
-
return (yield receiver.visitRightPadded(before, q));
|
|
227
|
-
});
|
|
171
|
+
async rpcReceive(before, q) {
|
|
172
|
+
return (await receiver.visitRightPadded(before, q));
|
|
228
173
|
},
|
|
229
|
-
rpcSend(after, q) {
|
|
230
|
-
|
|
231
|
-
yield sender.visitRightPadded(after, q);
|
|
232
|
-
});
|
|
174
|
+
async rpcSend(after, q) {
|
|
175
|
+
await sender.visitRightPadded(after, q);
|
|
233
176
|
}
|
|
234
177
|
}, tree_1.Json.Kind.Document);
|
|
235
178
|
}
|
|
236
179
|
else {
|
|
237
180
|
rpc_1.RpcCodecs.registerCodec(kind, {
|
|
238
|
-
rpcReceive(before, q) {
|
|
239
|
-
return
|
|
240
|
-
return (yield receiver.visit(before, q));
|
|
241
|
-
});
|
|
181
|
+
async rpcReceive(before, q) {
|
|
182
|
+
return (await receiver.visit(before, q));
|
|
242
183
|
},
|
|
243
|
-
rpcSend(after, q) {
|
|
244
|
-
|
|
245
|
-
yield sender.visit(after, q);
|
|
246
|
-
});
|
|
184
|
+
async rpcSend(after, q) {
|
|
185
|
+
await sender.visit(after, q);
|
|
247
186
|
}
|
|
248
187
|
}, tree_1.Json.Kind.Document);
|
|
249
188
|
}
|
package/dist/json/rpc.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rpc.js","sourceRoot":"","sources":["../../src/json/rpc.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"rpc.js","sourceRoot":"","sources":["../../src/json/rpc.ts"],"names":[],"mappings":"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"}
|
package/dist/json/visitor.js
CHANGED
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
3
|
exports.JsonVisitor = void 0;
|
|
13
4
|
/*
|
|
@@ -30,107 +21,85 @@ const visitor_1 = require("../visitor");
|
|
|
30
21
|
const tree_1 = require("./tree");
|
|
31
22
|
const mutative_1 = require("mutative");
|
|
32
23
|
class JsonVisitor extends visitor_1.TreeVisitor {
|
|
33
|
-
isAcceptable(sourceFile) {
|
|
34
|
-
return
|
|
35
|
-
return (0, tree_1.isJson)(sourceFile);
|
|
36
|
-
});
|
|
24
|
+
async isAcceptable(sourceFile) {
|
|
25
|
+
return (0, tree_1.isJson)(sourceFile);
|
|
37
26
|
}
|
|
38
|
-
visitArray(array, p) {
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
return (0, util_1.updateIfChanged)(array, updates);
|
|
46
|
-
});
|
|
27
|
+
async visitArray(array, p) {
|
|
28
|
+
const updates = {
|
|
29
|
+
prefix: await this.visitSpace(array.prefix, p),
|
|
30
|
+
markers: await this.visitMarkers(array.markers, p),
|
|
31
|
+
values: await (0, util_1.mapAsync)(array.values, value => this.visitRightPadded(value, p))
|
|
32
|
+
};
|
|
33
|
+
return (0, util_1.updateIfChanged)(array, updates);
|
|
47
34
|
}
|
|
48
|
-
visitDocument(document, p) {
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
return (0, util_1.updateIfChanged)(document, updates);
|
|
57
|
-
});
|
|
35
|
+
async visitDocument(document, p) {
|
|
36
|
+
const updates = {
|
|
37
|
+
prefix: await this.visitSpace(document.prefix, p),
|
|
38
|
+
markers: await this.visitMarkers(document.markers, p),
|
|
39
|
+
value: await this.visitDefined(document.value, p),
|
|
40
|
+
eof: await this.visitSpace(document.eof, p)
|
|
41
|
+
};
|
|
42
|
+
return (0, util_1.updateIfChanged)(document, updates);
|
|
58
43
|
}
|
|
59
|
-
visitEmpty(empty, p) {
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
return (0, util_1.updateIfChanged)(empty, updates);
|
|
66
|
-
});
|
|
44
|
+
async visitEmpty(empty, p) {
|
|
45
|
+
const updates = {
|
|
46
|
+
prefix: await this.visitSpace(empty.prefix, p),
|
|
47
|
+
markers: await this.visitMarkers(empty.markers, p)
|
|
48
|
+
};
|
|
49
|
+
return (0, util_1.updateIfChanged)(empty, updates);
|
|
67
50
|
}
|
|
68
|
-
visitIdentifier(identifier, p) {
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
return (0, util_1.updateIfChanged)(identifier, updates);
|
|
75
|
-
});
|
|
51
|
+
async visitIdentifier(identifier, p) {
|
|
52
|
+
const updates = {
|
|
53
|
+
prefix: await this.visitSpace(identifier.prefix, p),
|
|
54
|
+
markers: await this.visitMarkers(identifier.markers, p)
|
|
55
|
+
};
|
|
56
|
+
return (0, util_1.updateIfChanged)(identifier, updates);
|
|
76
57
|
}
|
|
77
|
-
visitLiteral(literal, p) {
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
return (0, util_1.updateIfChanged)(literal, updates);
|
|
84
|
-
});
|
|
58
|
+
async visitLiteral(literal, p) {
|
|
59
|
+
const updates = {
|
|
60
|
+
prefix: await this.visitSpace(literal.prefix, p),
|
|
61
|
+
markers: await this.visitMarkers(literal.markers, p)
|
|
62
|
+
};
|
|
63
|
+
return (0, util_1.updateIfChanged)(literal, updates);
|
|
85
64
|
}
|
|
86
|
-
visitMember(member, p) {
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
return (0, util_1.updateIfChanged)(member, updates);
|
|
95
|
-
});
|
|
65
|
+
async visitMember(member, p) {
|
|
66
|
+
const updates = {
|
|
67
|
+
prefix: await this.visitSpace(member.prefix, p),
|
|
68
|
+
markers: await this.visitMarkers(member.markers, p),
|
|
69
|
+
key: (await this.visitRightPadded(member.key, p)),
|
|
70
|
+
value: await this.visitDefined(member.value, p)
|
|
71
|
+
};
|
|
72
|
+
return (0, util_1.updateIfChanged)(member, updates);
|
|
96
73
|
}
|
|
97
|
-
visitObject(jsonObject, p) {
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
return (0, util_1.updateIfChanged)(jsonObject, updates);
|
|
105
|
-
});
|
|
74
|
+
async visitObject(jsonObject, p) {
|
|
75
|
+
const updates = {
|
|
76
|
+
prefix: await this.visitSpace(jsonObject.prefix, p),
|
|
77
|
+
markers: await this.visitMarkers(jsonObject.markers, p),
|
|
78
|
+
members: await (0, util_1.mapAsync)(jsonObject.members, member => this.visitRightPadded(member, p))
|
|
79
|
+
};
|
|
80
|
+
return (0, util_1.updateIfChanged)(jsonObject, updates);
|
|
106
81
|
}
|
|
107
|
-
visitRightPadded(right, p) {
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
return (0, util_1.updateIfChanged)(right, updates);
|
|
114
|
-
});
|
|
82
|
+
async visitRightPadded(right, p) {
|
|
83
|
+
const updates = {
|
|
84
|
+
element: await this.visitDefined(right.element, p),
|
|
85
|
+
after: await this.visitSpace(right.after, p)
|
|
86
|
+
};
|
|
87
|
+
return (0, util_1.updateIfChanged)(right, updates);
|
|
115
88
|
}
|
|
116
|
-
visitSpace(space, p) {
|
|
117
|
-
return
|
|
118
|
-
return space;
|
|
119
|
-
});
|
|
89
|
+
async visitSpace(space, p) {
|
|
90
|
+
return space;
|
|
120
91
|
}
|
|
121
|
-
produceJson(before, p, recipe) {
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
return finishDraft();
|
|
133
|
-
});
|
|
92
|
+
async produceJson(before, p, recipe) {
|
|
93
|
+
if (before === undefined) {
|
|
94
|
+
return undefined;
|
|
95
|
+
}
|
|
96
|
+
const [draft, finishDraft] = (0, mutative_1.create)(before);
|
|
97
|
+
draft.prefix = await this.visitSpace(before.prefix, p);
|
|
98
|
+
draft.markers = await this.visitMarkers(before.markers, p);
|
|
99
|
+
if (recipe) {
|
|
100
|
+
await recipe(draft);
|
|
101
|
+
}
|
|
102
|
+
return finishDraft();
|
|
134
103
|
}
|
|
135
104
|
accept(t, p) {
|
|
136
105
|
switch (t.kind) {
|