@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/text/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.
|
|
@@ -27,48 +18,42 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
27
18
|
const rpc_1 = require("../rpc");
|
|
28
19
|
const tree_1 = require("./tree");
|
|
29
20
|
const util_1 = require("../util");
|
|
30
|
-
function receiveSnippet(before, q) {
|
|
31
|
-
return
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
text: yield q.receive(before.text),
|
|
36
|
-
});
|
|
21
|
+
async function receiveSnippet(before, q) {
|
|
22
|
+
return (0, util_1.updateIfChanged)(before, {
|
|
23
|
+
id: await q.receive(before.id),
|
|
24
|
+
markers: await q.receive(before.markers),
|
|
25
|
+
text: await q.receive(before.text),
|
|
37
26
|
});
|
|
38
27
|
}
|
|
39
28
|
// Register codec for all PlainText AST node types
|
|
40
29
|
for (const kind of Object.values(tree_1.PlainText.Kind)) {
|
|
41
30
|
rpc_1.RpcCodecs.registerCodec(kind, {
|
|
42
|
-
rpcReceive(before, q) {
|
|
43
|
-
return
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
snippets: (yield q.receiveList(before.snippets, snippet => receiveSnippet(snippet, q))),
|
|
54
|
-
});
|
|
31
|
+
async rpcReceive(before, q) {
|
|
32
|
+
return (0, util_1.updateIfChanged)(before, {
|
|
33
|
+
id: await q.receive(before.id),
|
|
34
|
+
markers: await q.receive(before.markers),
|
|
35
|
+
sourcePath: await q.receive(before.sourcePath),
|
|
36
|
+
charsetName: await q.receive(before.charsetName),
|
|
37
|
+
charsetBomMarked: await q.receive(before.charsetBomMarked),
|
|
38
|
+
checksum: await q.receive(before.checksum),
|
|
39
|
+
fileAttributes: await q.receive(before.fileAttributes),
|
|
40
|
+
text: await q.receive(before.text),
|
|
41
|
+
snippets: (await q.receiveList(before.snippets, snippet => receiveSnippet(snippet, q))),
|
|
55
42
|
});
|
|
56
43
|
},
|
|
57
|
-
rpcSend(after, q) {
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
yield q.getAndSend(snippet, p => p.text);
|
|
71
|
-
}));
|
|
44
|
+
async rpcSend(after, q) {
|
|
45
|
+
await q.getAndSend(after, p => p.id);
|
|
46
|
+
await q.getAndSend(after, p => p.markers);
|
|
47
|
+
await q.getAndSend(after, p => p.sourcePath);
|
|
48
|
+
await q.getAndSend(after, p => p.charsetName);
|
|
49
|
+
await q.getAndSend(after, p => p.charsetBomMarked);
|
|
50
|
+
await q.getAndSend(after, p => p.checksum);
|
|
51
|
+
await q.getAndSend(after, p => p.fileAttributes);
|
|
52
|
+
await q.getAndSend(after, p => p.text);
|
|
53
|
+
await q.getAndSendList(after, a => a.snippets, s => s.id, async (snippet) => {
|
|
54
|
+
await q.getAndSend(snippet, p => p.id);
|
|
55
|
+
await q.getAndSend(snippet, p => p.markers);
|
|
56
|
+
await q.getAndSend(snippet, p => p.text);
|
|
72
57
|
});
|
|
73
58
|
}
|
|
74
59
|
}, tree_1.PlainText.Kind.PlainText);
|
package/dist/text/rpc.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rpc.js","sourceRoot":"","sources":["../../src/text/rpc.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"rpc.js","sourceRoot":"","sources":["../../src/text/rpc.ts"],"names":[],"mappings":"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"}
|
package/dist/text/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.PlainTextVisitor = void 0;
|
|
13
4
|
/*
|
|
@@ -29,34 +20,26 @@ const visitor_1 = require("../visitor");
|
|
|
29
20
|
const util_1 = require("../util");
|
|
30
21
|
const tree_1 = require("./tree");
|
|
31
22
|
class PlainTextVisitor extends visitor_1.TreeVisitor {
|
|
32
|
-
isAcceptable(sourceFile) {
|
|
33
|
-
return
|
|
34
|
-
return (0, tree_1.isPlainText)(sourceFile);
|
|
35
|
-
});
|
|
23
|
+
async isAcceptable(sourceFile) {
|
|
24
|
+
return (0, tree_1.isPlainText)(sourceFile);
|
|
36
25
|
}
|
|
37
|
-
visitText(text, p) {
|
|
38
|
-
return
|
|
39
|
-
|
|
40
|
-
draft.snippets = yield (0, util_1.mapAsync)(text.snippets, snippet => this.visit(snippet, p));
|
|
41
|
-
}));
|
|
26
|
+
async visitText(text, p) {
|
|
27
|
+
return this.produceTree(text, p, async (draft) => {
|
|
28
|
+
draft.snippets = await (0, util_1.mapAsync)(text.snippets, snippet => this.visit(snippet, p));
|
|
42
29
|
});
|
|
43
30
|
}
|
|
44
|
-
visitSnippet(snippet, p) {
|
|
45
|
-
return
|
|
46
|
-
return this.produceTree(snippet, p);
|
|
47
|
-
});
|
|
31
|
+
async visitSnippet(snippet, p) {
|
|
32
|
+
return this.produceTree(snippet, p);
|
|
48
33
|
}
|
|
49
|
-
accept(t, p) {
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
}
|
|
59
|
-
});
|
|
34
|
+
async accept(t, p) {
|
|
35
|
+
switch (t.kind) {
|
|
36
|
+
case tree_1.PlainText.Kind.PlainText:
|
|
37
|
+
return this.visitText(t, p);
|
|
38
|
+
case tree_1.PlainText.Kind.Snippet:
|
|
39
|
+
return this.visitSnippet(t, p);
|
|
40
|
+
default:
|
|
41
|
+
throw new Error(`Unexpected text kind ${t.kind}`);
|
|
42
|
+
}
|
|
60
43
|
}
|
|
61
44
|
}
|
|
62
45
|
exports.PlainTextVisitor = PlainTextVisitor;
|
package/dist/text/visitor.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"visitor.js","sourceRoot":"","sources":["../../src/text/visitor.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"visitor.js","sourceRoot":"","sources":["../../src/text/visitor.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;GAcG;AACH,wCAAuC;AAEvC,kCAAiC;AACjC,iCAA8C;AAE9C,MAAa,gBAAoB,SAAQ,qBAAoB;IACzD,KAAK,CAAC,YAAY,CAAC,UAAsB;QACrC,OAAO,IAAA,kBAAW,EAAC,UAAU,CAAC,CAAC;IACnC,CAAC;IAES,KAAK,CAAC,SAAS,CAAC,IAAe,EAAE,CAAI;QAC3C,OAAO,IAAI,CAAC,WAAW,CAAY,IAAI,EAAE,CAAC,EAAE,KAAK,EAAC,KAAK,EAAC,EAAE;YACtD,KAAK,CAAC,QAAQ,GAAG,MAAM,IAAA,eAAQ,EAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;QACtF,CAAC,CAAC,CAAA;IACN,CAAC;IAES,KAAK,CAAC,YAAY,CAAC,OAA0B,EAAE,CAAI;QACzD,OAAO,IAAI,CAAC,WAAW,CAAoB,OAAO,EAAE,CAAC,CAAC,CAAA;IAC1D,CAAC;IAES,KAAK,CAAC,MAAM,CAAC,CAAO,EAAE,CAAI;QAChC,QAAQ,CAAC,CAAC,IAAI,EAAE,CAAC;YACb,KAAK,gBAAS,CAAC,IAAI,CAAC,SAAS;gBACzB,OAAO,IAAI,CAAC,SAAS,CAAC,CAAc,EAAE,CAAC,CAAC,CAAC;YAC7C,KAAK,gBAAS,CAAC,IAAI,CAAC,OAAO;gBACvB,OAAO,IAAI,CAAC,YAAY,CAAC,CAAsB,EAAE,CAAC,CAAC,CAAC;YACxD;gBACI,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QAC1D,CAAC;IACL,CAAC;CACJ;AAzBD,4CAyBC"}
|
package/dist/util.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.mapAsync = mapAsync;
|
|
13
4
|
exports.trimIndent = trimIndent;
|
|
@@ -27,25 +18,23 @@ exports.updateIfChanged = updateIfChanged;
|
|
|
27
18
|
* See the License for the specific language governing permissions and
|
|
28
19
|
* limitations under the License.
|
|
29
20
|
*/
|
|
30
|
-
function mapAsync(arr, fn) {
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
if (
|
|
36
|
-
|
|
37
|
-
results = arr.slice(0, i);
|
|
38
|
-
}
|
|
39
|
-
if (result !== undefined) {
|
|
40
|
-
results.push(result);
|
|
41
|
-
}
|
|
21
|
+
async function mapAsync(arr, fn) {
|
|
22
|
+
let results = undefined;
|
|
23
|
+
for (let i = 0; i < arr.length; i++) {
|
|
24
|
+
const result = await fn(arr[i], i);
|
|
25
|
+
if (result !== arr[i]) {
|
|
26
|
+
if (results === undefined) {
|
|
27
|
+
results = arr.slice(0, i);
|
|
42
28
|
}
|
|
43
|
-
|
|
29
|
+
if (result !== undefined) {
|
|
44
30
|
results.push(result);
|
|
45
31
|
}
|
|
46
32
|
}
|
|
47
|
-
|
|
48
|
-
|
|
33
|
+
else if (results !== undefined && result !== undefined) {
|
|
34
|
+
results.push(result);
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
return results === undefined ? arr : results;
|
|
49
38
|
}
|
|
50
39
|
function trimIndent(str) {
|
|
51
40
|
if (!str) {
|
package/dist/util.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":";;AAeA,4BAoBC;AAED,gCAaC;AAOD,0CAOC;AAhED;;;;;;;;;;;;;;GAcG;AACI,KAAK,UAAU,QAAQ,CAAO,GAAQ,EAAE,EAA+C;IAC1F,IAAI,OAAO,GAAoB,SAAS,CAAC;IAEzC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAClC,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAEnC,IAAI,MAAM,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;YACpB,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;gBACxB,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAqB,CAAC;YAClD,CAAC;YAED,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;gBACvB,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACzB,CAAC;QACL,CAAC;aAAM,IAAI,OAAO,KAAK,SAAS,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACvD,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACzB,CAAC;IACL,CAAC;IAED,OAAO,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,GAAuB,CAAC,CAAC,CAAC,OAAO,CAAC;AACrE,CAAC;AAED,SAAgB,UAAU,CAAC,GAA8B;IACrD,IAAI,CAAC,GAAG,EAAE,CAAC;QACP,OAAO,EAAE,CAAC;IACd,CAAC;IACD,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC9B,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACxD,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CACtB,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CACrD,CAAC;IACF,OAAO,KAAK;SACP,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;SAC5B,IAAI,CAAC,IAAI,CAAC;SACV,IAAI,EAAE,CAAC;AAChB,CAAC;AAED;;;;GAIG;AACH,SAAgB,eAAe,CAAmB,QAAW,EAAE,OAAmB;IAC9E,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;QACxB,IAAI,OAAO,CAAC,GAAG,CAAC,KAAK,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACjC,uCAAY,QAAQ,GAAK,OAAO,EAAG;QACvC,CAAC;IACL,CAAC;IACD,OAAO,QAAQ,CAAC;AACpB,CAAC"}
|
package/dist/version.txt
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
8.72.
|
|
1
|
+
8.72.3
|
package/dist/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.RecipeRunError = exports.TreeVisitor = void 0;
|
|
13
4
|
exports.produceAsync = produceAsync;
|
|
@@ -31,12 +22,10 @@ const markers_1 = require("./markers");
|
|
|
31
22
|
const tree_1 = require("./tree");
|
|
32
23
|
const mutative_1 = require("mutative");
|
|
33
24
|
const util_1 = require("./util");
|
|
34
|
-
function produceAsync(before, recipe) {
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
return (0, mutative_1.create)(b, recipe);
|
|
39
|
-
});
|
|
25
|
+
async function produceAsync(before, recipe) {
|
|
26
|
+
const b = await before;
|
|
27
|
+
// Mutative's create(base, recipe) supports async recipes and rawReturn(undefined)
|
|
28
|
+
return (0, mutative_1.create)(b, recipe);
|
|
40
29
|
}
|
|
41
30
|
const stopAfterPreVisit = Symbol.for("STOP_AFTER_PRE_VISIT");
|
|
42
31
|
class TreeVisitor {
|
|
@@ -45,131 +34,111 @@ class TreeVisitor {
|
|
|
45
34
|
this.visitCount = 0;
|
|
46
35
|
this.afterVisit = [];
|
|
47
36
|
}
|
|
48
|
-
visitDefined(tree, p, parent) {
|
|
49
|
-
return
|
|
50
|
-
return (yield this.visit(tree, p, parent));
|
|
51
|
-
});
|
|
37
|
+
async visitDefined(tree, p, parent) {
|
|
38
|
+
return (await this.visit(tree, p, parent));
|
|
52
39
|
}
|
|
53
|
-
visit(tree, p, parent) {
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
if (
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
t = yield this.postVisit(t, p);
|
|
76
|
-
}
|
|
40
|
+
async visit(tree, p, parent) {
|
|
41
|
+
if (parent !== undefined) {
|
|
42
|
+
this.cursor = parent;
|
|
43
|
+
}
|
|
44
|
+
let topLevel = false;
|
|
45
|
+
if (this.visitCount === 0) {
|
|
46
|
+
topLevel = true;
|
|
47
|
+
}
|
|
48
|
+
this.visitCount += 1;
|
|
49
|
+
this.cursor = new tree_1.Cursor(tree, this.cursor);
|
|
50
|
+
let t;
|
|
51
|
+
const isAcceptable = (!((0, tree_1.isSourceFile)(tree)) ||
|
|
52
|
+
await this.isAcceptable(tree, p));
|
|
53
|
+
try {
|
|
54
|
+
if (isAcceptable) {
|
|
55
|
+
t = await this.preVisit(tree, p);
|
|
56
|
+
if (this.cursor.messages.get(stopAfterPreVisit) !== true) {
|
|
57
|
+
if (t !== undefined) {
|
|
58
|
+
t = await this.accept(t, p);
|
|
59
|
+
}
|
|
60
|
+
if (t !== undefined) {
|
|
61
|
+
t = await this.postVisit(t, p);
|
|
77
62
|
}
|
|
78
63
|
}
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
64
|
+
}
|
|
65
|
+
this.cursor = this.cursor.parent;
|
|
66
|
+
if (topLevel) {
|
|
67
|
+
if (this.afterVisit) {
|
|
68
|
+
while (this.afterVisit.length > 0) {
|
|
69
|
+
const v = this.afterVisit.shift();
|
|
70
|
+
v.cursor = this.cursor;
|
|
71
|
+
if (t !== undefined) {
|
|
72
|
+
t = await v.visit(t, p);
|
|
88
73
|
}
|
|
89
74
|
}
|
|
90
|
-
this.visitCount = 0;
|
|
91
75
|
}
|
|
76
|
+
this.visitCount = 0;
|
|
92
77
|
}
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
throw new RecipeRunError(e, this.cursor);
|
|
78
|
+
}
|
|
79
|
+
catch (e) {
|
|
80
|
+
if (e instanceof RecipeRunError) {
|
|
81
|
+
throw e;
|
|
98
82
|
}
|
|
99
|
-
|
|
100
|
-
}
|
|
83
|
+
throw new RecipeRunError(e, this.cursor);
|
|
84
|
+
}
|
|
85
|
+
return (isAcceptable ? t : tree);
|
|
101
86
|
}
|
|
102
|
-
accept(t, p) {
|
|
103
|
-
return
|
|
104
|
-
return t;
|
|
105
|
-
});
|
|
87
|
+
async accept(t, p) {
|
|
88
|
+
return t;
|
|
106
89
|
}
|
|
107
90
|
stopAfterPreVisit() {
|
|
108
91
|
this.cursor.messages.set(stopAfterPreVisit, true);
|
|
109
92
|
}
|
|
110
|
-
isAcceptable(sourceFile, p) {
|
|
111
|
-
return
|
|
112
|
-
return true;
|
|
113
|
-
});
|
|
93
|
+
async isAcceptable(sourceFile, p) {
|
|
94
|
+
return true;
|
|
114
95
|
}
|
|
115
|
-
preVisit(tree, p) {
|
|
116
|
-
return
|
|
117
|
-
return tree;
|
|
118
|
-
});
|
|
96
|
+
async preVisit(tree, p) {
|
|
97
|
+
return tree;
|
|
119
98
|
}
|
|
120
|
-
postVisit(tree, p) {
|
|
121
|
-
return
|
|
122
|
-
return tree;
|
|
123
|
-
});
|
|
99
|
+
async postVisit(tree, p) {
|
|
100
|
+
return tree;
|
|
124
101
|
}
|
|
125
|
-
visitMarkers(markers, p) {
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
markers: yield (0, util_1.mapAsync)(markers.markers, m => this.visitMarker(m, p))
|
|
139
|
-
});
|
|
102
|
+
async visitMarkers(markers, p) {
|
|
103
|
+
var _a;
|
|
104
|
+
if (markers === undefined) {
|
|
105
|
+
return markers_1.emptyMarkers;
|
|
106
|
+
}
|
|
107
|
+
else if (markers === markers_1.emptyMarkers) {
|
|
108
|
+
return markers_1.emptyMarkers;
|
|
109
|
+
}
|
|
110
|
+
else if ((((_a = markers.markers) === null || _a === void 0 ? void 0 : _a.length) || 0) === 0) {
|
|
111
|
+
return markers;
|
|
112
|
+
}
|
|
113
|
+
return (0, util_1.updateIfChanged)(markers, {
|
|
114
|
+
markers: await (0, util_1.mapAsync)(markers.markers, m => this.visitMarker(m, p))
|
|
140
115
|
});
|
|
141
116
|
}
|
|
142
|
-
visitMarker(marker, p) {
|
|
143
|
-
return
|
|
144
|
-
return marker;
|
|
145
|
-
});
|
|
117
|
+
async visitMarker(marker, p) {
|
|
118
|
+
return marker;
|
|
146
119
|
}
|
|
147
|
-
produceTree(before, p, recipe) {
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
return undefined;
|
|
157
|
-
}
|
|
158
|
-
// Restore markers (use newMarkers since we visited them)
|
|
159
|
-
return Object.assign(Object.assign({}, result), { markers: newMarkers });
|
|
120
|
+
async produceTree(before, p, recipe) {
|
|
121
|
+
// Visit markers separately to avoid Mutative drafting cyclic marker structures
|
|
122
|
+
const newMarkers = await this.visitMarkers(before.markers, p);
|
|
123
|
+
if (recipe) {
|
|
124
|
+
// Remove markers before Mutative drafting to avoid cycles, then restore after
|
|
125
|
+
const withoutMarkers = Object.assign(Object.assign({}, before), { markers: markers_1.emptyMarkers });
|
|
126
|
+
const result = await produceAsync(withoutMarkers, recipe);
|
|
127
|
+
if (result === undefined) {
|
|
128
|
+
return undefined;
|
|
160
129
|
}
|
|
161
|
-
//
|
|
162
|
-
return (
|
|
163
|
-
}
|
|
130
|
+
// Restore markers (use newMarkers since we visited them)
|
|
131
|
+
return Object.assign(Object.assign({}, result), { markers: newMarkers });
|
|
132
|
+
}
|
|
133
|
+
// No recipe - just update markers if changed
|
|
134
|
+
return (0, util_1.updateIfChanged)(before, { markers: newMarkers });
|
|
164
135
|
}
|
|
165
136
|
}
|
|
166
137
|
exports.TreeVisitor = TreeVisitor;
|
|
167
138
|
function noopVisitor() {
|
|
168
139
|
return new class extends TreeVisitor {
|
|
169
|
-
visit(tree) {
|
|
170
|
-
return
|
|
171
|
-
return tree;
|
|
172
|
-
});
|
|
140
|
+
async visit(tree) {
|
|
141
|
+
return tree;
|
|
173
142
|
}
|
|
174
143
|
};
|
|
175
144
|
}
|
package/dist/visitor.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"visitor.js","sourceRoot":"","sources":["../src/visitor.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"visitor.js","sourceRoot":"","sources":["../src/visitor.ts"],"names":[],"mappings":"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"}
|
package/dist/yaml/index.d.ts
CHANGED
package/dist/yaml/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/yaml/index.ts"],"names":[],"mappings":"AAeA,cAAc,cAAc,CAAC;AAC7B,cAAc,UAAU,CAAC;AACzB,cAAc,QAAQ,CAAC;AACvB,cAAc,WAAW,CAAC;AAE1B,OAAO,SAAS,CAAC;AACjB,OAAO,OAAO,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/yaml/index.ts"],"names":[],"mappings":"AAeA,cAAc,cAAc,CAAC;AAC7B,cAAc,WAAW,CAAC;AAC1B,cAAc,UAAU,CAAC;AACzB,cAAc,QAAQ,CAAC;AACvB,cAAc,WAAW,CAAC;AAE1B,OAAO,SAAS,CAAC;AACjB,OAAO,OAAO,CAAC;AACf,OAAO,WAAW,CAAC"}
|
package/dist/yaml/index.js
CHANGED
|
@@ -30,9 +30,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
30
30
|
* limitations under the License.
|
|
31
31
|
*/
|
|
32
32
|
__exportStar(require("./assertions"), exports);
|
|
33
|
+
__exportStar(require("./markers"), exports);
|
|
33
34
|
__exportStar(require("./parser"), exports);
|
|
34
35
|
__exportStar(require("./tree"), exports);
|
|
35
36
|
__exportStar(require("./visitor"), exports);
|
|
36
37
|
require("./print");
|
|
37
38
|
require("./rpc");
|
|
39
|
+
require("./markers");
|
|
38
40
|
//# sourceMappingURL=index.js.map
|
package/dist/yaml/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/yaml/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;GAcG;AACH,+CAA6B;AAC7B,2CAAyB;AACzB,yCAAuB;AACvB,4CAA0B;AAE1B,mBAAiB;AACjB,iBAAe"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/yaml/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;GAcG;AACH,+CAA6B;AAC7B,4CAA0B;AAC1B,2CAAyB;AACzB,yCAAuB;AACvB,4CAA0B;AAE1B,mBAAiB;AACjB,iBAAe;AACf,qBAAmB"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import { Marker } from "../markers";
|
|
2
|
+
import { Yaml } from "./tree";
|
|
3
|
+
declare module "./tree" {
|
|
4
|
+
namespace Yaml {
|
|
5
|
+
const Markers: {
|
|
6
|
+
readonly OmitColon: "org.openrewrite.yaml.marker.OmitColon";
|
|
7
|
+
};
|
|
8
|
+
}
|
|
9
|
+
}
|
|
10
|
+
/**
|
|
11
|
+
* Marker indicating that a mapping entry should be printed without a colon.
|
|
12
|
+
* This is used for flow mappings like { "key", "key2" } where entries lack explicit colons.
|
|
13
|
+
*/
|
|
14
|
+
export interface OmitColon extends Marker {
|
|
15
|
+
readonly kind: typeof Yaml.Markers.OmitColon;
|
|
16
|
+
}
|
|
17
|
+
/**
|
|
18
|
+
* Creates an OmitColon marker.
|
|
19
|
+
*/
|
|
20
|
+
export declare function omitColon(): OmitColon;
|
|
21
|
+
//# sourceMappingURL=markers.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"markers.d.ts","sourceRoot":"","sources":["../../src/yaml/markers.ts"],"names":[],"mappings":"AAeA,OAAO,EAAC,MAAM,EAAC,MAAM,YAAY,CAAC;AAElC,OAAO,EAAC,IAAI,EAAC,MAAM,QAAQ,CAAC;AAI5B,OAAO,QAAQ,QAAQ,CAAC;IACpB,UAAU,IAAI,CAAC;QACJ,MAAM,OAAO,EAAE;YAClB,QAAQ,CAAC,SAAS,EAAE,uCAAuC,CAAC;SAC/D,CAAC;KACL;CACJ;AAOD;;;GAGG;AACH,MAAM,WAAW,SAAU,SAAQ,MAAM;IACrC,QAAQ,CAAC,IAAI,EAAE,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC;CAChD;AAED;;GAEG;AACH,wBAAgB,SAAS,IAAI,SAAS,CAKrC"}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.omitColon = omitColon;
|
|
4
|
+
const uuid_1 = require("../uuid");
|
|
5
|
+
const tree_1 = require("./tree");
|
|
6
|
+
const rpc_1 = require("../rpc");
|
|
7
|
+
const util_1 = require("../util");
|
|
8
|
+
// At runtime actually attach it to Yaml
|
|
9
|
+
tree_1.Yaml.Markers = {
|
|
10
|
+
OmitColon: "org.openrewrite.yaml.marker.OmitColon"
|
|
11
|
+
};
|
|
12
|
+
/**
|
|
13
|
+
* Creates an OmitColon marker.
|
|
14
|
+
*/
|
|
15
|
+
function omitColon() {
|
|
16
|
+
return {
|
|
17
|
+
kind: tree_1.Yaml.Markers.OmitColon,
|
|
18
|
+
id: (0, uuid_1.randomId)()
|
|
19
|
+
};
|
|
20
|
+
}
|
|
21
|
+
/**
|
|
22
|
+
* Registers an RPC codec for any marker without additional properties.
|
|
23
|
+
*/
|
|
24
|
+
function registerMarkerCodec(kind) {
|
|
25
|
+
rpc_1.RpcCodecs.registerCodec(kind, {
|
|
26
|
+
async rpcReceive(before, q) {
|
|
27
|
+
return (0, util_1.updateIfChanged)(before, {
|
|
28
|
+
id: await q.receive(before.id),
|
|
29
|
+
});
|
|
30
|
+
},
|
|
31
|
+
async rpcSend(after, q) {
|
|
32
|
+
await q.getAndSend(after, a => a.id);
|
|
33
|
+
}
|
|
34
|
+
});
|
|
35
|
+
}
|
|
36
|
+
registerMarkerCodec(tree_1.Yaml.Markers.OmitColon);
|
|
37
|
+
//# sourceMappingURL=markers.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"markers.js","sourceRoot":"","sources":["../../src/yaml/markers.ts"],"names":[],"mappings":";;AA6CA,8BAKC;AAlCD,kCAAiC;AACjC,iCAA4B;AAC5B,gCAAgE;AAChE,kCAAwC;AAUxC,wCAAwC;AACvC,WAAY,CAAC,OAAO,GAAG;IACpB,SAAS,EAAE,uCAAuC;CAC5C,CAAC;AAUX;;GAEG;AACH,SAAgB,SAAS;IACrB,OAAO;QACH,IAAI,EAAE,WAAI,CAAC,OAAO,CAAC,SAAS;QAC5B,EAAE,EAAE,IAAA,eAAQ,GAAE;KACjB,CAAC;AACN,CAAC;AAED;;GAEG;AACH,SAAS,mBAAmB,CAAmB,IAAe;IAC1D,eAAS,CAAC,aAAa,CAAC,IAAI,EAAE;QAC1B,KAAK,CAAC,UAAU,CAAC,MAAS,EAAE,CAAkB;YAC1C,OAAO,IAAA,sBAAe,EAAC,MAAM,EAAE;gBAC3B,EAAE,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;aACnB,CAAC,CAAC;QACrB,CAAC;QAED,KAAK,CAAC,OAAO,CAAC,KAAQ,EAAE,CAAe;YACnC,MAAM,CAAC,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QACzC,CAAC;KACJ,CAAC,CAAC;AACP,CAAC;AAED,mBAAmB,CAAC,WAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC"}
|