@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
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-marketplace.js","sourceRoot":"","sources":["../../../src/rpc/request/get-marketplace.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"get-marketplace.js","sourceRoot":"","sources":["../../../src/rpc/request/get-marketplace.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA6BA,sCAQC;AArCD;;;;;;;;;;;;;;GAcG;AACH,yDAA2C;AAC3C,uCAAuC;AACvC,mDAAwE;AAQxE;;;GAGG;AACI,KAAK,UAAU,aAAa,CAAC,IAAiC;IACjE,MAAM,WAAW,GAAG,IAAI,+BAAiB,EAAE,CAAC;IAC5C,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACrB,KAAK,MAAM,YAAY,IAAI,GAAG,CAAC,aAAa,EAAE,CAAC;YAC3C,MAAM,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;QACjE,CAAC;IACL,CAAC;IACD,OAAO,WAAW,CAAC;AACvB,CAAC;AAED,MAAa,cAAc;IACvB,MAAM,CAAC,MAAM,CAAC,UAAiC,EAAE,WAA8B,EAAE,UAAmB;QAChG,UAAU,CAAC,SAAS,CAChB,IAAI,GAAG,CAAC,YAAY,CAAqC,gBAAgB,CAAC,EAC1E,IAAA,sBAAY,EACR,gBAAgB,EAChB,UAAU,EACV,CAAC,OAAO,EAAE,EAAE,CAAC,KAAK,IAAI,EAAE;YACpB,gEAAgE;YAChE,MAAM,aAAa,GAAG,IAAI,GAAG,EAAmF,CAAC;YAEjH,SAAS,cAAc,CAAC,QAAoC,EAAE,YAAkC;gBAC5F,MAAM,WAAW,GAAG,CAAC,GAAG,YAAY,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC;gBAE3D,mCAAmC;gBACnC,KAAK,MAAM,MAAM,IAAI,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC;oBAC3C,MAAM,QAAQ,GAAG,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;oBAChD,IAAI,QAAQ,EAAE,CAAC;wBACX,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;oBAC7C,CAAC;yBAAM,CAAC;wBACJ,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE;4BAC3B,UAAU,EAAE,MAAM;4BAClB,aAAa,EAAE,CAAC,WAAW,CAAC;yBAC/B,CAAC,CAAC;oBACP,CAAC;gBACL,CAAC;gBAED,oCAAoC;gBACpC,KAAK,MAAM,WAAW,IAAI,QAAQ,CAAC,UAAU,EAAE,CAAC;oBAC5C,cAAc,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;gBAC7C,CAAC;YACL,CAAC;YAED,yDAAyD;YACzD,KAAK,MAAM,QAAQ,IAAI,WAAW,CAAC,UAAU,EAAE,EAAE,CAAC;gBAC9C,cAAc,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YACjC,CAAC;YAED,OAAO,CAAC,MAAM,GAAG,EAAE,CAAC;YACpB,OAAO,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC,CAAC;QAC9C,CAAC,CACJ,CACJ,CAAC;IACN,CAAC;CACJ;AA5CD,wCA4CC"}
|
|
@@ -32,15 +32,6 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
32
32
|
return result;
|
|
33
33
|
};
|
|
34
34
|
})();
|
|
35
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
36
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
37
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
38
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
39
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
40
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
41
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
42
|
-
});
|
|
43
|
-
};
|
|
44
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
45
36
|
exports.GetObject = void 0;
|
|
46
37
|
/*
|
|
@@ -68,7 +59,7 @@ class GetObject {
|
|
|
68
59
|
}
|
|
69
60
|
static handle(connection, remoteObjects, localObjects, localRefs, batchSize, trace, metricsCsv) {
|
|
70
61
|
const pendingData = new Map();
|
|
71
|
-
connection.onRequest(new rpc.RequestType("GetObject"), (0, metrics_1.withMetrics)("GetObject", metricsCsv, (context) => (request) =>
|
|
62
|
+
connection.onRequest(new rpc.RequestType("GetObject"), (0, metrics_1.withMetrics)("GetObject", metricsCsv, (context) => async (request) => {
|
|
72
63
|
const objId = request.id;
|
|
73
64
|
if (!localObjects.has(objId)) {
|
|
74
65
|
context.target = '';
|
|
@@ -79,7 +70,7 @@ class GetObject {
|
|
|
79
70
|
}
|
|
80
71
|
const objectOrGenerator = localObjects.get(objId);
|
|
81
72
|
if (typeof objectOrGenerator === 'function') {
|
|
82
|
-
const obj =
|
|
73
|
+
const obj = await objectOrGenerator(objId);
|
|
83
74
|
localObjects.set(objId, obj);
|
|
84
75
|
}
|
|
85
76
|
const obj = localObjects.get(objId);
|
|
@@ -88,7 +79,7 @@ class GetObject {
|
|
|
88
79
|
if (!allData) {
|
|
89
80
|
const after = obj;
|
|
90
81
|
const before = remoteObjects.get(objId);
|
|
91
|
-
allData =
|
|
82
|
+
allData = await new queue_1.RpcSendQueue(localRefs, request.sourceFileType, trace())
|
|
92
83
|
.generate(after, before);
|
|
93
84
|
pendingData.set(objId, allData);
|
|
94
85
|
remoteObjects.set(objId, after);
|
|
@@ -99,7 +90,7 @@ class GetObject {
|
|
|
99
90
|
pendingData.delete(objId);
|
|
100
91
|
}
|
|
101
92
|
return batch;
|
|
102
|
-
}))
|
|
93
|
+
}));
|
|
103
94
|
}
|
|
104
95
|
}
|
|
105
96
|
exports.GetObject = GetObject;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-object.js","sourceRoot":"","sources":["../../../src/rpc/request/get-object.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"get-object.js","sourceRoot":"","sources":["../../../src/rpc/request/get-object.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;GAcG;AACH,yDAA2C;AAC3C,oCAAqE;AAErE,uCAAyD;AAEzD,MAAa,SAAS;IAClB,YAA6B,EAAU,EACV,cAAuB;QADvB,OAAE,GAAF,EAAE,CAAQ;QACV,mBAAc,GAAd,cAAc,CAAS;IACpD,CAAC;IAED,MAAM,CAAC,MAAM,CACT,UAAiC,EACjC,aAA+B,EAC/B,YAAyD,EACzD,SAAuB,EACvB,SAAiB,EACjB,KAAoB,EACpB,UAAmB;QAEnB,MAAM,WAAW,GAAG,IAAI,GAAG,EAA2B,CAAC;QAEvD,UAAU,CAAC,SAAS,CAChB,IAAI,GAAG,CAAC,WAAW,CAAwB,WAAW,CAAC,EACvD,IAAA,qBAAW,EACP,WAAW,EACX,UAAU,EACV,CAAC,OAAO,EAAE,EAAE,CAAC,KAAK,EAAC,OAAO,EAAC,EAAE;YACzB,MAAM,KAAK,GAAG,OAAO,CAAC,EAAE,CAAC;YACzB,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC3B,OAAO,CAAC,MAAM,GAAG,EAAE,CAAC;gBACpB,OAAO;oBACH,EAAC,KAAK,EAAE,sBAAc,CAAC,MAAM,EAAC;oBAC9B,EAAC,KAAK,EAAE,sBAAc,CAAC,aAAa,EAAC;iBACxC,CAAC;YACN,CAAC;YAED,MAAM,iBAAiB,GAAG,YAAY,CAAC,GAAG,CAAC,KAAK,CAAE,CAAC;YACnD,IAAI,OAAO,iBAAiB,KAAK,UAAU,EAAE,CAAC;gBAC1C,MAAM,GAAG,GAAG,MAAM,iBAAiB,CAAC,KAAK,CAAC,CAAC;gBAC3C,YAAY,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;YACjC,CAAC;YAED,MAAM,GAAG,GAAG,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YACpC,OAAO,CAAC,MAAM,GAAG,IAAA,2BAAiB,EAAC,GAAG,CAAC,CAAC;YAExC,IAAI,OAAO,GAAG,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YACrC,IAAI,CAAC,OAAO,EAAE,CAAC;gBACX,MAAM,KAAK,GAAG,GAAG,CAAC;gBAClB,MAAM,MAAM,GAAG,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;gBAExC,OAAO,GAAG,MAAM,IAAI,oBAAY,CAAC,SAAS,EAAE,OAAO,CAAC,cAAc,EAAE,KAAK,EAAE,CAAC;qBACvE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;gBAC7B,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;gBAEhC,aAAa,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YACpC,CAAC;YAED,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;YAE3C,8CAA8C;YAC9C,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACvB,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC9B,CAAC;YAED,OAAO,KAAK,CAAC;QACjB,CAAC,CACJ,CACJ,CAAC;IACN,CAAC;CACJ;AAhED,8BAgEC"}
|
|
@@ -32,15 +32,6 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
32
32
|
return result;
|
|
33
33
|
};
|
|
34
34
|
})();
|
|
35
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
36
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
37
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
38
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
39
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
40
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
41
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
42
|
-
});
|
|
43
|
-
};
|
|
44
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
45
36
|
exports.InstallRecipes = void 0;
|
|
46
37
|
/*
|
|
@@ -67,29 +58,27 @@ const shell_utils_1 = require("../../shell-utils");
|
|
|
67
58
|
/**
|
|
68
59
|
* Helper function to spawn npm/npx commands with logging and promise handling
|
|
69
60
|
*/
|
|
70
|
-
function spawnNpmCommand(command, args, cwd, logger, logPrefix) {
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
}
|
|
92
|
-
});
|
|
61
|
+
async function spawnNpmCommand(command, args, cwd, logger, logPrefix) {
|
|
62
|
+
const child = (0, child_process_1.spawn)((0, shell_utils_1.getPlatformCommand)(command), args, { cwd });
|
|
63
|
+
if (logger) {
|
|
64
|
+
const prefix = logPrefix ? `${logPrefix}: ` : '';
|
|
65
|
+
child.stdout.on("data", (data) => {
|
|
66
|
+
logger.info(`${prefix}${data.toString().trim()}`);
|
|
67
|
+
});
|
|
68
|
+
child.stderr.on("data", (data) => {
|
|
69
|
+
logger.error(`${prefix}${data.toString().trim()}`);
|
|
70
|
+
});
|
|
71
|
+
}
|
|
72
|
+
return new Promise((resolve, reject) => {
|
|
73
|
+
child.on("error", reject);
|
|
74
|
+
child.on("close", (exitCode) => {
|
|
75
|
+
if (exitCode === 0) {
|
|
76
|
+
resolve();
|
|
77
|
+
}
|
|
78
|
+
else {
|
|
79
|
+
const commandStr = `${command} ${args.join(' ')}`;
|
|
80
|
+
reject(new Error(`${commandStr} exited with code ${exitCode}`));
|
|
81
|
+
}
|
|
93
82
|
});
|
|
94
83
|
});
|
|
95
84
|
}
|
|
@@ -103,7 +92,7 @@ class InstallRecipes {
|
|
|
103
92
|
this.recipes = recipes;
|
|
104
93
|
}
|
|
105
94
|
static handle(connection, installDir, marketplace, logger, metricsCsv) {
|
|
106
|
-
connection.onRequest(new rpc.RequestType("InstallRecipes"), (0, metrics_1.withMetrics)("InstallRecipes", metricsCsv, (context) => (request) =>
|
|
95
|
+
connection.onRequest(new rpc.RequestType("InstallRecipes"), (0, metrics_1.withMetrics)("InstallRecipes", metricsCsv, (context) => async (request) => {
|
|
107
96
|
context.target = typeof request.recipes === "object" ? request.recipes.packageName : request.recipes;
|
|
108
97
|
const beforeInstall = marketplace.allRecipes().length;
|
|
109
98
|
let resolvedPath;
|
|
@@ -134,7 +123,7 @@ class InstallRecipes {
|
|
|
134
123
|
// Rather than using npm on PATH, use `node_cli.js`.
|
|
135
124
|
// https://stackoverflow.com/questions/15957529/can-i-install-a-npm-package-from-javascript-running-in-node-js
|
|
136
125
|
const packageSpec = recipePackage.packageName + (recipePackage.version ? `@${recipePackage.version}` : "");
|
|
137
|
-
|
|
126
|
+
await spawnNpmCommand("npm", ["install", packageSpec, "--no-fund"], absoluteInstallDir, logger);
|
|
138
127
|
resolvedPath = require.resolve(path.join(absoluteInstallDir, "node_modules", recipePackage.packageName));
|
|
139
128
|
recipesName = request.recipes.packageName;
|
|
140
129
|
// Read the installed package's version from its package.json
|
|
@@ -163,7 +152,7 @@ class InstallRecipes {
|
|
|
163
152
|
const activatePromise = recipeModule.activate(marketplace);
|
|
164
153
|
// noinspection SuspiciousTypeOfGuard
|
|
165
154
|
if (activatePromise instanceof Promise) {
|
|
166
|
-
|
|
155
|
+
await activatePromise;
|
|
167
156
|
}
|
|
168
157
|
}
|
|
169
158
|
else {
|
|
@@ -173,7 +162,7 @@ class InstallRecipes {
|
|
|
173
162
|
recipesInstalled: marketplace.allRecipes().length - beforeInstall,
|
|
174
163
|
version: installedVersion
|
|
175
164
|
};
|
|
176
|
-
}))
|
|
165
|
+
}));
|
|
177
166
|
}
|
|
178
167
|
}
|
|
179
168
|
exports.InstallRecipes = InstallRecipes;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install-recipes.js","sourceRoot":"","sources":["../../../src/rpc/request/install-recipes.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"install-recipes.js","sourceRoot":"","sources":["../../../src/rpc/request/install-recipes.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,15 +32,6 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
32
32
|
return result;
|
|
33
33
|
};
|
|
34
34
|
})();
|
|
35
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
36
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
37
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
38
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
39
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
40
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
41
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
42
|
-
});
|
|
43
|
-
};
|
|
44
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
45
36
|
exports.extractSourcePath = extractSourcePath;
|
|
46
37
|
exports.initializeMetricsCsv = initializeMetricsCsv;
|
|
@@ -125,16 +116,16 @@ function initializeMetricsCsv(metricsCsv, logger) {
|
|
|
125
116
|
* @returns A request handler compatible with rpc.MessageConnection#onRequest
|
|
126
117
|
*/
|
|
127
118
|
function withMetrics(requestType, metricsCsv, handlerFactory) {
|
|
128
|
-
return (request) =>
|
|
119
|
+
return async (request) => {
|
|
129
120
|
const context = { target: '' };
|
|
130
121
|
const handler = handlerFactory(context);
|
|
131
122
|
if (!metricsCsv) {
|
|
132
123
|
// No metrics recording requested, just execute the handler
|
|
133
|
-
return
|
|
124
|
+
return await handler(request);
|
|
134
125
|
}
|
|
135
126
|
const startTime = Date.now();
|
|
136
127
|
try {
|
|
137
|
-
const result =
|
|
128
|
+
const result = await handler(request);
|
|
138
129
|
recordMetrics(metricsCsv, context.target, requestType, startTime);
|
|
139
130
|
return result;
|
|
140
131
|
}
|
|
@@ -143,7 +134,7 @@ function withMetrics(requestType, metricsCsv, handlerFactory) {
|
|
|
143
134
|
recordMetrics(metricsCsv, context.target, requestType, startTime);
|
|
144
135
|
throw error;
|
|
145
136
|
}
|
|
146
|
-
}
|
|
137
|
+
};
|
|
147
138
|
}
|
|
148
139
|
/**
|
|
149
140
|
* Wraps an RPC request handler without parameters (RequestType0) to record performance metrics.
|
|
@@ -154,16 +145,16 @@ function withMetrics(requestType, metricsCsv, handlerFactory) {
|
|
|
154
145
|
* @returns A request handler compatible with rpc.MessageConnection#onRequest
|
|
155
146
|
*/
|
|
156
147
|
function withMetrics0(requestType, metricsCsv, handlerFactory) {
|
|
157
|
-
return (_) =>
|
|
148
|
+
return async (_) => {
|
|
158
149
|
const context = { target: '' };
|
|
159
150
|
const handler = handlerFactory(context);
|
|
160
151
|
if (!metricsCsv) {
|
|
161
152
|
// No metrics recording requested, just execute the handler
|
|
162
|
-
return
|
|
153
|
+
return await handler();
|
|
163
154
|
}
|
|
164
155
|
const startTime = Date.now();
|
|
165
156
|
try {
|
|
166
|
-
const result =
|
|
157
|
+
const result = await handler();
|
|
167
158
|
recordMetrics(metricsCsv, context.target, requestType, startTime);
|
|
168
159
|
return result;
|
|
169
160
|
}
|
|
@@ -172,7 +163,7 @@ function withMetrics0(requestType, metricsCsv, handlerFactory) {
|
|
|
172
163
|
recordMetrics(metricsCsv, context.target, requestType, startTime);
|
|
173
164
|
throw error;
|
|
174
165
|
}
|
|
175
|
-
}
|
|
166
|
+
};
|
|
176
167
|
}
|
|
177
168
|
function recordMetrics(metricsCsv, target, request, startTime) {
|
|
178
169
|
const endTime = Date.now();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metrics.js","sourceRoot":"","sources":["../../../src/rpc/request/metrics.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"metrics.js","sourceRoot":"","sources":["../../../src/rpc/request/metrics.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,15 +32,6 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
32
32
|
return result;
|
|
33
33
|
};
|
|
34
34
|
})();
|
|
35
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
36
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
37
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
38
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
39
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
40
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
41
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
42
|
-
});
|
|
43
|
-
};
|
|
44
35
|
var __asyncValues = (this && this.__asyncValues) || function (o) {
|
|
45
36
|
if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
|
|
46
37
|
var m = o[Symbol.asyncIterator], i;
|
|
@@ -94,20 +85,20 @@ class ParseProject {
|
|
|
94
85
|
this.relativeTo = relativeTo;
|
|
95
86
|
}
|
|
96
87
|
static handle(connection, localObjects, metricsCsv) {
|
|
97
|
-
connection.onRequest(new rpc.RequestType("ParseProject"), (0, metrics_1.withMetrics)("ParseProject", metricsCsv, (context) => (request) =>
|
|
88
|
+
connection.onRequest(new rpc.RequestType("ParseProject"), (0, metrics_1.withMetrics)("ParseProject", metricsCsv, (context) => async (request) => {
|
|
98
89
|
var _a, e_1, _b, _c;
|
|
99
90
|
var _d;
|
|
100
91
|
context.target = request.projectPath;
|
|
101
92
|
// Dynamic import to break circular dependency
|
|
102
|
-
const { DEFAULT_EXCLUSIONS, ProjectParser } =
|
|
93
|
+
const { DEFAULT_EXCLUSIONS, ProjectParser } = await import("../../javascript/index.js");
|
|
103
94
|
const projectPath = path.resolve(request.projectPath);
|
|
104
95
|
const exclusions = (_d = request.exclusions) !== null && _d !== void 0 ? _d : DEFAULT_EXCLUSIONS;
|
|
105
96
|
// Use relativeTo if specified, otherwise default to projectPath
|
|
106
97
|
const relativeTo = request.relativeTo ? path.resolve(request.relativeTo) : projectPath;
|
|
107
98
|
// Use ProjectParser for file discovery and Prettier detection
|
|
108
99
|
const projectParser = new ProjectParser(projectPath, { exclusions });
|
|
109
|
-
const discovered =
|
|
110
|
-
const prettierLoader =
|
|
100
|
+
const discovered = await projectParser.discoverFiles();
|
|
101
|
+
const prettierLoader = await projectParser.createPrettierLoader();
|
|
111
102
|
const resultItems = [];
|
|
112
103
|
const ctx = new execution_1.ExecutionContext();
|
|
113
104
|
// Parse package.json files (these get NodeResolutionResult markers)
|
|
@@ -119,10 +110,10 @@ class ParseProject {
|
|
|
119
110
|
const generator = parser.parse(...discovered.packageJsonFiles);
|
|
120
111
|
for (const _ of discovered.packageJsonFiles) {
|
|
121
112
|
const id = (0, uuid_1.randomId)();
|
|
122
|
-
localObjects.set(id, (id) =>
|
|
123
|
-
const sourceFile = (
|
|
113
|
+
localObjects.set(id, async (id) => {
|
|
114
|
+
const sourceFile = (await generator.next()).value;
|
|
124
115
|
return Object.assign(Object.assign({}, sourceFile), { id });
|
|
125
|
-
})
|
|
116
|
+
});
|
|
126
117
|
resultItems.push({
|
|
127
118
|
id,
|
|
128
119
|
sourceFileType: "org.openrewrite.json.tree.Json$Document" // break cycle
|
|
@@ -135,10 +126,10 @@ class ParseProject {
|
|
|
135
126
|
const generator = parser.parse(...discovered.lockFiles.json);
|
|
136
127
|
for (const _ of discovered.lockFiles.json) {
|
|
137
128
|
const id = (0, uuid_1.randomId)();
|
|
138
|
-
localObjects.set(id, (id) =>
|
|
139
|
-
const sourceFile = (
|
|
129
|
+
localObjects.set(id, async (id) => {
|
|
130
|
+
const sourceFile = (await generator.next()).value;
|
|
140
131
|
return Object.assign(Object.assign({}, sourceFile), { id });
|
|
141
|
-
})
|
|
132
|
+
});
|
|
142
133
|
resultItems.push({
|
|
143
134
|
id,
|
|
144
135
|
sourceFileType: "org.openrewrite.json.tree.Json$Document" // break cycle
|
|
@@ -151,10 +142,10 @@ class ParseProject {
|
|
|
151
142
|
const generator = parser.parse(...discovered.lockFiles.yaml);
|
|
152
143
|
for (const _ of discovered.lockFiles.yaml) {
|
|
153
144
|
const id = (0, uuid_1.randomId)();
|
|
154
|
-
localObjects.set(id, (id) =>
|
|
155
|
-
const sourceFile = (
|
|
145
|
+
localObjects.set(id, async (id) => {
|
|
146
|
+
const sourceFile = (await generator.next()).value;
|
|
156
147
|
return Object.assign(Object.assign({}, sourceFile), { id });
|
|
157
|
-
})
|
|
148
|
+
});
|
|
158
149
|
resultItems.push({
|
|
159
150
|
id,
|
|
160
151
|
sourceFileType: "org.openrewrite.yaml.tree.Yaml$Documents" // break cycle
|
|
@@ -167,10 +158,10 @@ class ParseProject {
|
|
|
167
158
|
const generator = parser.parse(...discovered.lockFiles.text);
|
|
168
159
|
for (const _ of discovered.lockFiles.text) {
|
|
169
160
|
const id = (0, uuid_1.randomId)();
|
|
170
|
-
localObjects.set(id, (id) =>
|
|
171
|
-
const sourceFile = (
|
|
161
|
+
localObjects.set(id, async (id) => {
|
|
162
|
+
const sourceFile = (await generator.next()).value;
|
|
172
163
|
return Object.assign(Object.assign({}, sourceFile), { id });
|
|
173
|
-
})
|
|
164
|
+
});
|
|
174
165
|
resultItems.push({
|
|
175
166
|
id,
|
|
176
167
|
sourceFileType: "org.openrewrite.text.PlainText" // break cycle
|
|
@@ -184,20 +175,20 @@ class ParseProject {
|
|
|
184
175
|
relativeTo
|
|
185
176
|
});
|
|
186
177
|
// Check if Prettier is available
|
|
187
|
-
const detection =
|
|
178
|
+
const detection = await prettierLoader.detectPrettier();
|
|
188
179
|
if (detection.available) {
|
|
189
180
|
// Prettier is available: add per-file PrettierStyle markers
|
|
190
181
|
const generator = parser.parse(...discovered.jsFiles);
|
|
191
182
|
for (const filePath of discovered.jsFiles) {
|
|
192
183
|
const id = (0, uuid_1.randomId)();
|
|
193
|
-
localObjects.set(id, (id) =>
|
|
194
|
-
const sourceFile = (
|
|
184
|
+
localObjects.set(id, async (id) => {
|
|
185
|
+
const sourceFile = (await generator.next()).value;
|
|
195
186
|
// Add PrettierStyle marker if Prettier is available
|
|
196
|
-
const prettierMarker =
|
|
187
|
+
const prettierMarker = await prettierLoader.getConfigMarker(filePath);
|
|
197
188
|
return Object.assign(Object.assign({}, sourceFile), { id, markers: prettierMarker
|
|
198
189
|
? (0, markers_1.replaceMarkerByKind)(sourceFile.markers, prettierMarker)
|
|
199
190
|
: sourceFile.markers });
|
|
200
|
-
})
|
|
191
|
+
});
|
|
201
192
|
resultItems.push({
|
|
202
193
|
id,
|
|
203
194
|
sourceFileType: "org.openrewrite.javascript.tree.JS$CompilationUnit" // break cycle
|
|
@@ -209,7 +200,7 @@ class ParseProject {
|
|
|
209
200
|
// Parse all files first to sample them
|
|
210
201
|
const parsedFiles = [];
|
|
211
202
|
try {
|
|
212
|
-
for (var _e = true, _f = __asyncValues(parser.parse(...discovered.jsFiles)), _g; _g =
|
|
203
|
+
for (var _e = true, _f = __asyncValues(parser.parse(...discovered.jsFiles)), _g; _g = await _f.next(), _a = _g.done, !_a; _e = true) {
|
|
213
204
|
_c = _g.value;
|
|
214
205
|
_e = false;
|
|
215
206
|
const sourceFile = _c;
|
|
@@ -220,17 +211,17 @@ class ParseProject {
|
|
|
220
211
|
catch (e_1_1) { e_1 = { error: e_1_1 }; }
|
|
221
212
|
finally {
|
|
222
213
|
try {
|
|
223
|
-
if (!_e && !_a && (_b = _f.return))
|
|
214
|
+
if (!_e && !_a && (_b = _f.return)) await _b.call(_f);
|
|
224
215
|
}
|
|
225
216
|
finally { if (e_1) throw e_1.error; }
|
|
226
217
|
}
|
|
227
218
|
// Sample all parsed files and build Autodetect marker using ProjectParser helper
|
|
228
|
-
const autodetectMarker =
|
|
219
|
+
const autodetectMarker = await projectParser.buildAutodetectMarker(parsedFiles.map(p => p.sourceFile));
|
|
229
220
|
// Store thunks that add the Autodetect marker
|
|
230
221
|
for (const { id, sourceFile } of parsedFiles) {
|
|
231
|
-
localObjects.set(id, (newId) =>
|
|
222
|
+
localObjects.set(id, async (newId) => {
|
|
232
223
|
return Object.assign(Object.assign({}, sourceFile), { id: newId, markers: (0, markers_1.replaceMarkerByKind)(sourceFile.markers, autodetectMarker) });
|
|
233
|
-
})
|
|
224
|
+
});
|
|
234
225
|
resultItems.push({
|
|
235
226
|
id,
|
|
236
227
|
sourceFileType: "org.openrewrite.javascript.tree.JS$CompilationUnit" // break cycle
|
|
@@ -244,10 +235,10 @@ class ParseProject {
|
|
|
244
235
|
const generator = parser.parse(...discovered.yamlFiles);
|
|
245
236
|
for (const _ of discovered.yamlFiles) {
|
|
246
237
|
const id = (0, uuid_1.randomId)();
|
|
247
|
-
localObjects.set(id, (id) =>
|
|
248
|
-
const sourceFile = (
|
|
238
|
+
localObjects.set(id, async (id) => {
|
|
239
|
+
const sourceFile = (await generator.next()).value;
|
|
249
240
|
return Object.assign(Object.assign({}, sourceFile), { id });
|
|
250
|
-
})
|
|
241
|
+
});
|
|
251
242
|
resultItems.push({
|
|
252
243
|
id,
|
|
253
244
|
sourceFileType: "org.openrewrite.yaml.tree.Yaml$Documents" // break cycle
|
|
@@ -260,10 +251,10 @@ class ParseProject {
|
|
|
260
251
|
const generator = parser.parse(...discovered.jsonFiles);
|
|
261
252
|
for (const _ of discovered.jsonFiles) {
|
|
262
253
|
const id = (0, uuid_1.randomId)();
|
|
263
|
-
localObjects.set(id, (id) =>
|
|
264
|
-
const sourceFile = (
|
|
254
|
+
localObjects.set(id, async (id) => {
|
|
255
|
+
const sourceFile = (await generator.next()).value;
|
|
265
256
|
return Object.assign(Object.assign({}, sourceFile), { id });
|
|
266
|
-
})
|
|
257
|
+
});
|
|
267
258
|
resultItems.push({
|
|
268
259
|
id,
|
|
269
260
|
sourceFileType: "org.openrewrite.json.tree.Json$Document" // break cycle
|
|
@@ -276,10 +267,10 @@ class ParseProject {
|
|
|
276
267
|
const generator = parser.parse(...discovered.textFiles);
|
|
277
268
|
for (const _ of discovered.textFiles) {
|
|
278
269
|
const id = (0, uuid_1.randomId)();
|
|
279
|
-
localObjects.set(id, (id) =>
|
|
280
|
-
const sourceFile = (
|
|
270
|
+
localObjects.set(id, async (id) => {
|
|
271
|
+
const sourceFile = (await generator.next()).value;
|
|
281
272
|
return Object.assign(Object.assign({}, sourceFile), { id });
|
|
282
|
-
})
|
|
273
|
+
});
|
|
283
274
|
resultItems.push({
|
|
284
275
|
id,
|
|
285
276
|
sourceFileType: "org.openrewrite.text.PlainText" // break cycle
|
|
@@ -287,7 +278,7 @@ class ParseProject {
|
|
|
287
278
|
}
|
|
288
279
|
}
|
|
289
280
|
return resultItems;
|
|
290
|
-
}))
|
|
281
|
+
}));
|
|
291
282
|
}
|
|
292
283
|
}
|
|
293
284
|
exports.ParseProject = ParseProject;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-project.js","sourceRoot":"","sources":["../../../src/rpc/request/parse-project.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"parse-project.js","sourceRoot":"","sources":["../../../src/rpc/request/parse-project.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,15 +32,6 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
32
32
|
return result;
|
|
33
33
|
};
|
|
34
34
|
})();
|
|
35
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
36
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
37
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
38
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
39
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
40
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
41
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
42
|
-
});
|
|
43
|
-
};
|
|
44
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
45
36
|
exports.Parse = void 0;
|
|
46
37
|
/*
|
|
@@ -81,7 +72,7 @@ class Parse {
|
|
|
81
72
|
return "javascript";
|
|
82
73
|
}
|
|
83
74
|
static handle(connection, localObjects, metricsCsv) {
|
|
84
|
-
connection.onRequest(new rpc.RequestType("Parse"), (0, metrics_1.withMetrics)("Parse", metricsCsv, (context) => (request) =>
|
|
75
|
+
connection.onRequest(new rpc.RequestType("Parse"), (0, metrics_1.withMetrics)("Parse", metricsCsv, (context) => async (request) => {
|
|
85
76
|
// Set target to comma-separated list of file paths
|
|
86
77
|
context.target = request.inputs.map(input => typeof input === 'string' ? input : input.sourcePath).join(',');
|
|
87
78
|
// Derive parser type from the first input's file path
|
|
@@ -96,14 +87,14 @@ class Parse {
|
|
|
96
87
|
const resultIds = [];
|
|
97
88
|
for (let i = 0; i < request.inputs.length; i++) {
|
|
98
89
|
const id = (0, uuid_1.randomId)();
|
|
99
|
-
localObjects.set(id, (id) =>
|
|
100
|
-
const sourceFile = (
|
|
90
|
+
localObjects.set(id, async (id) => {
|
|
91
|
+
const sourceFile = (await generator.next()).value;
|
|
101
92
|
return Object.assign(Object.assign({}, sourceFile), { id });
|
|
102
|
-
})
|
|
93
|
+
});
|
|
103
94
|
resultIds.push(id);
|
|
104
95
|
}
|
|
105
96
|
return resultIds;
|
|
106
|
-
}))
|
|
97
|
+
}));
|
|
107
98
|
}
|
|
108
99
|
}
|
|
109
100
|
exports.Parse = Parse;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse.js","sourceRoot":"","sources":["../../../src/rpc/request/parse.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"parse.js","sourceRoot":"","sources":["../../../src/rpc/request/parse.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;GAcG;AACH,yDAA2C;AAC3C,+CAAiD;AACjD,yCAA+E;AAC/E,qCAA0C;AAE1C,uCAAsC;AACtC,2CAA6B;AAE7B,MAAa,KAAK;IACd,YAA6B,MAAqB,EACrB,UAAmB;QADnB,WAAM,GAAN,MAAM,CAAe;QACrB,eAAU,GAAV,UAAU,CAAS;IAChD,CAAC;IAED;;OAEG;IACK,MAAM,CAAC,aAAa,CAAC,KAAkB;QAC3C,MAAM,QAAQ,GAAG,IAAA,wBAAe,EAAC,KAAK,CAAC,CAAC;QACxC,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACzC,IAAI,QAAQ,KAAK,cAAc,EAAE,CAAC;YAC9B,OAAO,aAAa,CAAC;QACzB,CAAC;QACD,OAAO,YAAY,CAAC;IACxB,CAAC;IAED,MAAM,CAAC,MAAM,CAAC,UAAiC,EACjC,YAAyD,EACzD,UAAmB;QAC7B,UAAU,CAAC,SAAS,CAChB,IAAI,GAAG,CAAC,WAAW,CAAuB,OAAO,CAAC,EAClD,IAAA,qBAAW,EACP,OAAO,EACP,UAAU,EACV,CAAC,OAAO,EAAE,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;YAC3B,mDAAmD;YACnD,OAAO,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CACxC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,CACvD,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAEZ,sDAAsD;YACtD,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC;gBACxC,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;gBACxC,CAAC,CAAC,YAAY,CAAC;YAEnB,MAAM,MAAM,GAAG,gBAAO,CAAC,YAAY,CAAC,UAAU,EAAE;gBAC5C,GAAG,EAAE,IAAI,4BAAgB,EAAE;gBAC3B,UAAU,EAAE,OAAO,CAAC,UAAU;aACjC,CAAE,CAAC;YAEJ,MAAM,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;YAClD,MAAM,SAAS,GAAW,EAAE,CAAC;YAE7B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC7C,MAAM,EAAE,GAAG,IAAA,eAAQ,GAAE,CAAC;gBACtB,YAAY,CAAC,GAAG,CAAC,EAAE,EAAE,KAAK,EAAE,EAAU,EAAE,EAAE;oBACtC,MAAM,UAAU,GAAe,CAAC,MAAM,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC;oBAC9D,uCAAY,UAAU,KAAE,EAAE,IAAG;gBACjC,CAAC,CAAC,CAAC;gBACH,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACvB,CAAC;YAED,OAAO,SAAS,CAAC;QACrB,CAAC,CACJ,CACJ,CAAC;IACN,CAAC;CACJ;AA1DD,sBA0DC"}
|