@openrewrite/rewrite 8.75.2 → 8.75.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/javascript/format/format.d.ts +2 -0
- package/dist/javascript/format/format.d.ts.map +1 -1
- package/dist/javascript/format/format.js +97 -69
- package/dist/javascript/format/format.js.map +1 -1
- package/dist/javascript/format/minimum-viable-spacing-visitor.d.ts.map +1 -1
- package/dist/javascript/format/minimum-viable-spacing-visitor.js +1 -3
- package/dist/javascript/format/minimum-viable-spacing-visitor.js.map +1 -1
- package/dist/javascript/format/whitespace-reconciler.d.ts +6 -0
- package/dist/javascript/format/whitespace-reconciler.d.ts.map +1 -1
- package/dist/javascript/format/whitespace-reconciler.js +31 -1
- package/dist/javascript/format/whitespace-reconciler.js.map +1 -1
- package/dist/javascript/recipes/index.d.ts +1 -0
- package/dist/javascript/recipes/index.d.ts.map +1 -1
- package/dist/javascript/recipes/index.js +1 -0
- package/dist/javascript/recipes/index.js.map +1 -1
- package/dist/javascript/recipes/order-imports.d.ts.map +1 -1
- package/dist/javascript/recipes/order-imports.js +5 -0
- package/dist/javascript/recipes/order-imports.js.map +1 -1
- package/dist/javascript/recipes/remove-dependency.d.ts +29 -0
- package/dist/javascript/recipes/remove-dependency.d.ts.map +1 -0
- package/dist/javascript/recipes/remove-dependency.js +261 -0
- package/dist/javascript/recipes/remove-dependency.js.map +1 -0
- package/dist/javascript/remove-import.d.ts.map +1 -1
- package/dist/javascript/remove-import.js +9 -8
- package/dist/javascript/remove-import.js.map +1 -1
- package/dist/rewrite-javascript-version.txt +1 -1
- package/dist/rpc/request/prepare-recipe.d.ts +1 -0
- package/dist/rpc/request/prepare-recipe.d.ts.map +1 -1
- package/dist/rpc/request/prepare-recipe.js +18 -9
- package/dist/rpc/request/prepare-recipe.js.map +1 -1
- package/dist/test/rewrite-test.d.ts +1 -0
- package/dist/test/rewrite-test.d.ts.map +1 -1
- package/dist/test/rewrite-test.js +18 -7
- package/dist/test/rewrite-test.js.map +1 -1
- package/dist/visitor.d.ts.map +1 -1
- package/dist/visitor.js +7 -2
- package/dist/visitor.js.map +1 -1
- package/package.json +12 -11
- package/src/javascript/format/format.ts +99 -71
- package/src/javascript/format/minimum-viable-spacing-visitor.ts +1 -4
- package/src/javascript/format/whitespace-reconciler.ts +27 -2
- package/src/javascript/recipes/index.ts +1 -0
- package/src/javascript/recipes/order-imports.ts +6 -0
- package/src/javascript/recipes/remove-dependency.ts +345 -0
- package/src/javascript/remove-import.ts +10 -9
- package/src/rpc/request/prepare-recipe.ts +20 -9
- package/src/test/rewrite-test.ts +17 -3
- package/src/visitor.ts +7 -2
|
@@ -133,7 +133,11 @@ class WhitespaceReconciler {
|
|
|
133
133
|
}
|
|
134
134
|
// Space nodes - copy when reconciling, don't recurse
|
|
135
135
|
if ((0, java_1.isSpace)(original)) {
|
|
136
|
-
|
|
136
|
+
if (!this.shouldReconcile())
|
|
137
|
+
return original;
|
|
138
|
+
if ((0, java_1.isSpace)(formatted) && this.spacesEqual(original, formatted))
|
|
139
|
+
return original;
|
|
140
|
+
return formatted;
|
|
137
141
|
}
|
|
138
142
|
// Track entering target subtree (using referential equality)
|
|
139
143
|
const isTargetSubtree = this.targetSubtree !== undefined && original === this.targetSubtree;
|
|
@@ -204,6 +208,10 @@ class WhitespaceReconciler {
|
|
|
204
208
|
// Space values and markers: copy from formatted when reconciling
|
|
205
209
|
if (((0, java_1.isSpace)(originalValue)) || key === 'markers') {
|
|
206
210
|
if (this.shouldReconcile() && formattedValue !== originalValue) {
|
|
211
|
+
// For spaces, check structural equality to avoid unnecessary new objects
|
|
212
|
+
if ((0, java_1.isSpace)(originalValue) && (0, java_1.isSpace)(formattedValue) && this.spacesEqual(originalValue, formattedValue)) {
|
|
213
|
+
continue;
|
|
214
|
+
}
|
|
207
215
|
result = Object.assign(Object.assign({}, result), { [key]: formattedValue });
|
|
208
216
|
}
|
|
209
217
|
continue;
|
|
@@ -250,6 +258,28 @@ class WhitespaceReconciler {
|
|
|
250
258
|
shouldReconcile() {
|
|
251
259
|
return this.reconcileState === 'reconciling';
|
|
252
260
|
}
|
|
261
|
+
/**
|
|
262
|
+
* Structurally compare two Space objects for equality.
|
|
263
|
+
* Currently only TextComment has additional properties (text, multiline);
|
|
264
|
+
* if new comment types are added, extend the comparison here.
|
|
265
|
+
*/
|
|
266
|
+
spacesEqual(a, b) {
|
|
267
|
+
if (a.whitespace !== b.whitespace)
|
|
268
|
+
return false;
|
|
269
|
+
if (a.comments.length !== b.comments.length)
|
|
270
|
+
return false;
|
|
271
|
+
for (let i = 0; i < a.comments.length; i++) {
|
|
272
|
+
const ca = a.comments[i], cb = b.comments[i];
|
|
273
|
+
if (ca.kind !== cb.kind || ca.suffix !== cb.suffix)
|
|
274
|
+
return false;
|
|
275
|
+
if (ca.kind === java_1.J.Kind.TextComment) {
|
|
276
|
+
const ta = ca, tb = cb;
|
|
277
|
+
if (ta.text !== tb.text || ta.multiline !== tb.multiline)
|
|
278
|
+
return false;
|
|
279
|
+
}
|
|
280
|
+
}
|
|
281
|
+
return true;
|
|
282
|
+
}
|
|
253
283
|
/**
|
|
254
284
|
* Checks if two nodes with different kinds are semantically equivalent.
|
|
255
285
|
* This handles cases like Prettier's quoteProps option which can change
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"whitespace-reconciler.js","sourceRoot":"","sources":["../../../src/javascript/format/whitespace-reconciler.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;GAcG;AACH,
|
|
1
|
+
{"version":3,"file":"whitespace-reconciler.js","sourceRoot":"","sources":["../../../src/javascript/format/whitespace-reconciler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
export * from "./add-dependency";
|
|
2
2
|
export * from "./async-callback-in-sync-array-method";
|
|
3
3
|
export * from "./auto-format";
|
|
4
|
+
export * from "./remove-dependency";
|
|
4
5
|
export * from "./upgrade-dependency-version";
|
|
5
6
|
export * from "./upgrade-transitive-dependency-version";
|
|
6
7
|
export * from "./order-imports";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/javascript/recipes/index.ts"],"names":[],"mappings":"AAgBA,cAAc,kBAAkB,CAAC;AACjC,cAAc,uCAAuC,CAAC;AACtD,cAAc,eAAe,CAAC;AAC9B,cAAc,8BAA8B,CAAC;AAC7C,cAAc,yCAAyC,CAAC;AACxD,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/javascript/recipes/index.ts"],"names":[],"mappings":"AAgBA,cAAc,kBAAkB,CAAC;AACjC,cAAc,uCAAuC,CAAC;AACtD,cAAc,eAAe,CAAC;AAC9B,cAAc,qBAAqB,CAAC;AACpC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,yCAAyC,CAAC;AACxD,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC"}
|
|
@@ -32,6 +32,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
32
32
|
__exportStar(require("./add-dependency"), exports);
|
|
33
33
|
__exportStar(require("./async-callback-in-sync-array-method"), exports);
|
|
34
34
|
__exportStar(require("./auto-format"), exports);
|
|
35
|
+
__exportStar(require("./remove-dependency"), exports);
|
|
35
36
|
__exportStar(require("./upgrade-dependency-version"), exports);
|
|
36
37
|
__exportStar(require("./upgrade-transitive-dependency-version"), exports);
|
|
37
38
|
__exportStar(require("./order-imports"), exports);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/javascript/recipes/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;;;;;;;;;;;;;;AAEH,mDAAiC;AACjC,wEAAsD;AACtD,gDAA8B;AAC9B,+DAA6C;AAC7C,0EAAwD;AACxD,kDAAgC;AAChC,kDAAgC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/javascript/recipes/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;;;;;;;;;;;;;;AAEH,mDAAiC;AACjC,wEAAsD;AACtD,gDAA8B;AAC9B,sDAAoC;AACpC,+DAA6C;AAC7C,0EAAwD;AACxD,kDAAgC;AAChC,kDAAgC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"order-imports.d.ts","sourceRoot":"","sources":["../../../src/javascript/recipes/order-imports.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAC,MAAM,EAAC,MAAM,cAAc,CAAC;AACpC,OAAO,EAAe,WAAW,EAAC,MAAM,eAAe,CAAC;AACxD,OAAO,EAAC,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AAsBjD,qBAAa,YAAa,SAAQ,MAAM;IACpC,QAAQ,CAAC,IAAI,sDAAsD;IACnE,QAAQ,CAAC,WAAW,mBAAmB;IACvC,QAAQ,CAAC,WAAW,qPAAqP;IAGnQ,MAAM,IAAI,OAAO,CAAC,WAAW,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"order-imports.d.ts","sourceRoot":"","sources":["../../../src/javascript/recipes/order-imports.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAC,MAAM,EAAC,MAAM,cAAc,CAAC;AACpC,OAAO,EAAe,WAAW,EAAC,MAAM,eAAe,CAAC;AACxD,OAAO,EAAC,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AAsBjD,qBAAa,YAAa,SAAQ,MAAM;IACpC,QAAQ,CAAC,IAAI,sDAAsD;IACnE,QAAQ,CAAC,WAAW,mBAAmB;IACvC,QAAQ,CAAC,WAAW,qPAAqP;IAGnQ,MAAM,IAAI,OAAO,CAAC,WAAW,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;CAyM9D"}
|
|
@@ -81,6 +81,11 @@ class OrderImports extends recipe_1.Recipe {
|
|
|
81
81
|
// Tiebreaker: keep original order for stability
|
|
82
82
|
return originalImportPosition[aPadded.element.id] - originalImportPosition[bPadded.element.id];
|
|
83
83
|
});
|
|
84
|
+
// Check if anything actually changed
|
|
85
|
+
const alreadySorted = sortedSpecifiers.every((s, i) => s === imports[i]);
|
|
86
|
+
if (alreadySorted) {
|
|
87
|
+
return cu;
|
|
88
|
+
}
|
|
84
89
|
const cuWithImportsSorted = await (0, visitor_1.produceAsync)(cu, async (draft) => {
|
|
85
90
|
draft.statements = [...sortedSpecifiers, ...restStatements];
|
|
86
91
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"order-imports.js","sourceRoot":"","sources":["../../../src/javascript/recipes/order-imports.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAEH,yCAAoC;AACpC,2CAAwD;AAExD,oCAA+C;AAC/C,qCAA6B;AAC7B,uCAAkD;AAClD,oCAAqE;AAErE;;;;;;;GAOG;AACH,IAAK,cAMJ;AAND,WAAK,cAAc;IACf,+DAAc,CAAA;IACd,6DAAa,CAAA;IACb,yDAAW,CAAA;IACX,qDAAS,CAAA;IACT,mDAAQ,CAAA;AACZ,CAAC,EANI,cAAc,KAAd,cAAc,QAMlB;AAED,MAAa,YAAa,SAAQ,eAAM;IAAxC;;QACa,SAAI,GAAG,kDAAkD,CAAC;QAC1D,gBAAW,GAAG,eAAe,CAAC;QAC9B,gBAAW,GAAG,iPAAiP,CAAC;
|
|
1
|
+
{"version":3,"file":"order-imports.js","sourceRoot":"","sources":["../../../src/javascript/recipes/order-imports.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
import { ScanningRecipe } from "../../recipe";
|
|
2
|
+
import { ExecutionContext } from "../../execution";
|
|
3
|
+
import { TreeVisitor } from "../../visitor";
|
|
4
|
+
import { DependencyScope, PackageManager } from "../node-resolution-result";
|
|
5
|
+
import { DependencyRecipeAccumulator } from "../package-manager";
|
|
6
|
+
interface ProjectUpdateInfo {
|
|
7
|
+
packageJsonPath: string;
|
|
8
|
+
originalPackageJson: string;
|
|
9
|
+
dependencyScopes: DependencyScope[];
|
|
10
|
+
packageManager: PackageManager;
|
|
11
|
+
configFiles?: Record<string, string>;
|
|
12
|
+
}
|
|
13
|
+
interface Accumulator extends DependencyRecipeAccumulator<ProjectUpdateInfo> {
|
|
14
|
+
originalLockFiles: Map<string, string>;
|
|
15
|
+
}
|
|
16
|
+
export declare class RemoveDependency extends ScanningRecipe<Accumulator> {
|
|
17
|
+
readonly name = "org.openrewrite.javascript.dependencies.remove-dependency";
|
|
18
|
+
readonly displayName = "Remove npm dependency";
|
|
19
|
+
readonly description = "Removes a dependency from `package.json` and updates the lock file by running the package manager.";
|
|
20
|
+
packageName: string;
|
|
21
|
+
scope?: DependencyScope;
|
|
22
|
+
initialValue(_ctx: ExecutionContext): Accumulator;
|
|
23
|
+
scanner(acc: Accumulator): Promise<TreeVisitor<any, ExecutionContext>>;
|
|
24
|
+
editorWithData(acc: Accumulator): Promise<TreeVisitor<any, ExecutionContext>>;
|
|
25
|
+
private runPackageManagerInstall;
|
|
26
|
+
private createModifiedPackageJson;
|
|
27
|
+
}
|
|
28
|
+
export {};
|
|
29
|
+
//# sourceMappingURL=remove-dependency.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"remove-dependency.d.ts","sourceRoot":"","sources":["../../../src/javascript/recipes/remove-dependency.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAS,cAAc,EAAC,MAAM,cAAc,CAAC;AACpD,OAAO,EAAC,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAK1C,OAAO,EAEH,eAAe,EAEf,cAAc,EAEjB,MAAM,2BAA2B,CAAC;AAGnC,OAAO,EAGH,2BAA2B,EAQ9B,MAAM,oBAAoB,CAAC;AAG5B,UAAU,iBAAiB;IACvB,eAAe,EAAE,MAAM,CAAC;IACxB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,gBAAgB,EAAE,eAAe,EAAE,CAAC;IACpC,cAAc,EAAE,cAAc,CAAC;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACxC;AAED,UAAU,WAAY,SAAQ,2BAA2B,CAAC,iBAAiB,CAAC;IACxE,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC1C;AAED,qBAAa,gBAAiB,SAAQ,cAAc,CAAC,WAAW,CAAC;IAC7D,QAAQ,CAAC,IAAI,+DAA+D;IAC5E,QAAQ,CAAC,WAAW,2BAA2B;IAC/C,QAAQ,CAAC,WAAW,wGAAwG;IAO5H,WAAW,EAAG,MAAM,CAAC;IAQrB,KAAK,CAAC,EAAE,eAAe,CAAC;IAExB,YAAY,CAAC,IAAI,EAAE,gBAAgB,GAAG,WAAW;IAO3C,OAAO,CAAC,GAAG,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;IAsFtE,cAAc,CAAC,GAAG,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;YAqDrE,wBAAwB;IA8BtC,OAAO,CAAC,yBAAyB;CAkBpC"}
|
|
@@ -0,0 +1,261 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/*
|
|
3
|
+
* Copyright 2026 the original author or authors.
|
|
4
|
+
* <p>
|
|
5
|
+
* Licensed under the Moderne Source Available License (the "License");
|
|
6
|
+
* you may not use this file except in compliance with the License.
|
|
7
|
+
* You may obtain a copy of the License at
|
|
8
|
+
* <p>
|
|
9
|
+
* https://docs.moderne.io/licensing/moderne-source-available-license
|
|
10
|
+
* <p>
|
|
11
|
+
* Unless required by applicable law or agreed to in writing, software
|
|
12
|
+
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
13
|
+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
14
|
+
* See the License for the specific language governing permissions and
|
|
15
|
+
* limitations under the License.
|
|
16
|
+
*/
|
|
17
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
18
|
+
if (k2 === undefined) k2 = k;
|
|
19
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
20
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
21
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
22
|
+
}
|
|
23
|
+
Object.defineProperty(o, k2, desc);
|
|
24
|
+
}) : (function(o, m, k, k2) {
|
|
25
|
+
if (k2 === undefined) k2 = k;
|
|
26
|
+
o[k2] = m[k];
|
|
27
|
+
}));
|
|
28
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
29
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
30
|
+
}) : function(o, v) {
|
|
31
|
+
o["default"] = v;
|
|
32
|
+
});
|
|
33
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
34
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
35
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
36
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
37
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
38
|
+
};
|
|
39
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
40
|
+
var ownKeys = function(o) {
|
|
41
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
42
|
+
var ar = [];
|
|
43
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
44
|
+
return ar;
|
|
45
|
+
};
|
|
46
|
+
return ownKeys(o);
|
|
47
|
+
};
|
|
48
|
+
return function (mod) {
|
|
49
|
+
if (mod && mod.__esModule) return mod;
|
|
50
|
+
var result = {};
|
|
51
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
52
|
+
__setModuleDefault(result, mod);
|
|
53
|
+
return result;
|
|
54
|
+
};
|
|
55
|
+
})();
|
|
56
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
57
|
+
exports.RemoveDependency = void 0;
|
|
58
|
+
const recipe_1 = require("../../recipe");
|
|
59
|
+
const visitor_1 = require("../../visitor");
|
|
60
|
+
const json_1 = require("../../json");
|
|
61
|
+
const yaml_1 = require("../../yaml");
|
|
62
|
+
const text_1 = require("../../text");
|
|
63
|
+
const node_resolution_result_1 = require("../node-resolution-result");
|
|
64
|
+
const markers_1 = require("../../markers");
|
|
65
|
+
const print_1 = require("../../print");
|
|
66
|
+
const package_manager_1 = require("../package-manager");
|
|
67
|
+
const path = __importStar(require("path"));
|
|
68
|
+
class RemoveDependency extends recipe_1.ScanningRecipe {
|
|
69
|
+
constructor() {
|
|
70
|
+
super(...arguments);
|
|
71
|
+
this.name = "org.openrewrite.javascript.dependencies.remove-dependency";
|
|
72
|
+
this.displayName = "Remove npm dependency";
|
|
73
|
+
this.description = "Removes a dependency from `package.json` and updates the lock file by running the package manager.";
|
|
74
|
+
}
|
|
75
|
+
initialValue(_ctx) {
|
|
76
|
+
return Object.assign(Object.assign({}, (0, package_manager_1.createDependencyRecipeAccumulator)()), { originalLockFiles: new Map() });
|
|
77
|
+
}
|
|
78
|
+
async scanner(acc) {
|
|
79
|
+
const recipe = this;
|
|
80
|
+
const LOCK_FILE_NAMES = (0, package_manager_1.getAllLockFileNames)();
|
|
81
|
+
return new class extends visitor_1.TreeVisitor {
|
|
82
|
+
async accept(tree, ctx) {
|
|
83
|
+
if ((0, json_1.isJson)(tree) && tree.kind === json_1.Json.Kind.Document) {
|
|
84
|
+
return this.handleJsonDocument(tree, ctx);
|
|
85
|
+
}
|
|
86
|
+
if ((0, yaml_1.isYaml)(tree) && (0, yaml_1.isDocuments)(tree)) {
|
|
87
|
+
return this.handleYamlDocument(tree, ctx);
|
|
88
|
+
}
|
|
89
|
+
if ((0, text_1.isPlainText)(tree)) {
|
|
90
|
+
return this.handlePlainTextDocument(tree, ctx);
|
|
91
|
+
}
|
|
92
|
+
return tree;
|
|
93
|
+
}
|
|
94
|
+
async handleJsonDocument(doc, _ctx) {
|
|
95
|
+
var _a;
|
|
96
|
+
const basename = path.basename(doc.sourcePath);
|
|
97
|
+
if (LOCK_FILE_NAMES.includes(basename)) {
|
|
98
|
+
acc.originalLockFiles.set(doc.sourcePath, await print_1.TreePrinters.print(doc));
|
|
99
|
+
return doc;
|
|
100
|
+
}
|
|
101
|
+
if (!doc.sourcePath.endsWith('package.json')) {
|
|
102
|
+
return doc;
|
|
103
|
+
}
|
|
104
|
+
const marker = (0, node_resolution_result_1.findNodeResolutionResult)(doc);
|
|
105
|
+
if (!marker) {
|
|
106
|
+
return doc;
|
|
107
|
+
}
|
|
108
|
+
const scopesToCheck = recipe.scope ? [recipe.scope] : node_resolution_result_1.allDependencyScopes;
|
|
109
|
+
const foundScopes = [];
|
|
110
|
+
for (const scope of scopesToCheck) {
|
|
111
|
+
const deps = marker[scope];
|
|
112
|
+
if (deps === null || deps === void 0 ? void 0 : deps.some(d => d.name === recipe.packageName)) {
|
|
113
|
+
foundScopes.push(scope);
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
if (foundScopes.length === 0) {
|
|
117
|
+
return doc;
|
|
118
|
+
}
|
|
119
|
+
const pm = (_a = marker.packageManager) !== null && _a !== void 0 ? _a : node_resolution_result_1.PackageManager.Npm;
|
|
120
|
+
const configFiles = {};
|
|
121
|
+
const npmrcContent = (0, node_resolution_result_1.serializeNpmrcConfigs)(marker.npmrcConfigs);
|
|
122
|
+
if (npmrcContent) {
|
|
123
|
+
configFiles['.npmrc'] = npmrcContent;
|
|
124
|
+
}
|
|
125
|
+
acc.projectsToUpdate.set(doc.sourcePath, {
|
|
126
|
+
packageJsonPath: doc.sourcePath,
|
|
127
|
+
originalPackageJson: await print_1.TreePrinters.print(doc),
|
|
128
|
+
dependencyScopes: foundScopes,
|
|
129
|
+
packageManager: pm,
|
|
130
|
+
configFiles: Object.keys(configFiles).length > 0 ? configFiles : undefined
|
|
131
|
+
});
|
|
132
|
+
return doc;
|
|
133
|
+
}
|
|
134
|
+
async handleYamlDocument(docs, _ctx) {
|
|
135
|
+
const basename = path.basename(docs.sourcePath);
|
|
136
|
+
if (LOCK_FILE_NAMES.includes(basename)) {
|
|
137
|
+
acc.originalLockFiles.set(docs.sourcePath, await print_1.TreePrinters.print(docs));
|
|
138
|
+
}
|
|
139
|
+
return docs;
|
|
140
|
+
}
|
|
141
|
+
async handlePlainTextDocument(text, _ctx) {
|
|
142
|
+
const basename = path.basename(text.sourcePath);
|
|
143
|
+
if (LOCK_FILE_NAMES.includes(basename)) {
|
|
144
|
+
acc.originalLockFiles.set(text.sourcePath, await print_1.TreePrinters.print(text));
|
|
145
|
+
}
|
|
146
|
+
return text;
|
|
147
|
+
}
|
|
148
|
+
};
|
|
149
|
+
}
|
|
150
|
+
async editorWithData(acc) {
|
|
151
|
+
const recipe = this;
|
|
152
|
+
const jsonEditor = new class extends json_1.JsonVisitor {
|
|
153
|
+
async visitDocument(doc, ctx) {
|
|
154
|
+
const sourcePath = doc.sourcePath;
|
|
155
|
+
if (sourcePath.endsWith('package.json')) {
|
|
156
|
+
const updateInfo = acc.projectsToUpdate.get(sourcePath);
|
|
157
|
+
if (!updateInfo) {
|
|
158
|
+
return doc;
|
|
159
|
+
}
|
|
160
|
+
const failureMessage = await (0, package_manager_1.runInstallIfNeeded)(sourcePath, acc, () => recipe.runPackageManagerInstall(acc, updateInfo, ctx));
|
|
161
|
+
if (failureMessage) {
|
|
162
|
+
return (0, markers_1.markupWarn)(doc, `Failed to remove ${recipe.packageName}`, failureMessage);
|
|
163
|
+
}
|
|
164
|
+
const modifiedDoc = removeDependencyFromJson(doc, recipe.packageName, updateInfo.dependencyScopes);
|
|
165
|
+
return (0, package_manager_1.updateNodeResolutionMarker)(modifiedDoc, updateInfo, acc);
|
|
166
|
+
}
|
|
167
|
+
const lockFileName = path.basename(sourcePath);
|
|
168
|
+
if ((0, package_manager_1.getAllLockFileNames)().includes(lockFileName)) {
|
|
169
|
+
const updatedLockContent = acc.updatedLockFiles.get(sourcePath);
|
|
170
|
+
if (updatedLockContent) {
|
|
171
|
+
const parsed = await (0, package_manager_1.parseLockFileContent)(updatedLockContent, sourcePath, lockFileName);
|
|
172
|
+
return Object.assign(Object.assign({}, doc), { value: parsed.value, eof: parsed.eof });
|
|
173
|
+
}
|
|
174
|
+
}
|
|
175
|
+
return doc;
|
|
176
|
+
}
|
|
177
|
+
};
|
|
178
|
+
return (0, package_manager_1.createLockFileEditor)(jsonEditor, acc);
|
|
179
|
+
}
|
|
180
|
+
async runPackageManagerInstall(acc, updateInfo, _ctx) {
|
|
181
|
+
const modifiedPackageJson = this.createModifiedPackageJson(updateInfo.originalPackageJson, updateInfo.dependencyScopes);
|
|
182
|
+
const lockFileName = (0, package_manager_1.getLockFileName)(updateInfo.packageManager);
|
|
183
|
+
const packageJsonDir = path.dirname(updateInfo.packageJsonPath);
|
|
184
|
+
const lockFilePath = packageJsonDir === '.'
|
|
185
|
+
? lockFileName
|
|
186
|
+
: path.join(packageJsonDir, lockFileName);
|
|
187
|
+
const originalLockFileContent = acc.originalLockFiles.get(lockFilePath);
|
|
188
|
+
const result = await (0, package_manager_1.runInstallInTempDir)(updateInfo.packageManager, modifiedPackageJson, {
|
|
189
|
+
originalLockFileContent,
|
|
190
|
+
configFiles: updateInfo.configFiles
|
|
191
|
+
});
|
|
192
|
+
(0, package_manager_1.storeInstallResult)(result, acc, updateInfo, modifiedPackageJson);
|
|
193
|
+
}
|
|
194
|
+
createModifiedPackageJson(originalContent, scopes) {
|
|
195
|
+
const packageJson = JSON.parse(originalContent);
|
|
196
|
+
for (const scope of scopes) {
|
|
197
|
+
if (packageJson[scope] && packageJson[scope][this.packageName]) {
|
|
198
|
+
delete packageJson[scope][this.packageName];
|
|
199
|
+
if (Object.keys(packageJson[scope]).length === 0) {
|
|
200
|
+
delete packageJson[scope];
|
|
201
|
+
}
|
|
202
|
+
}
|
|
203
|
+
}
|
|
204
|
+
return JSON.stringify(packageJson, null, 2);
|
|
205
|
+
}
|
|
206
|
+
}
|
|
207
|
+
exports.RemoveDependency = RemoveDependency;
|
|
208
|
+
__decorate([
|
|
209
|
+
(0, recipe_1.Option)({
|
|
210
|
+
displayName: "Package name",
|
|
211
|
+
description: "The name of the npm package to remove (e.g., `lodash`, `@types/node`)",
|
|
212
|
+
example: "lodash"
|
|
213
|
+
})
|
|
214
|
+
], RemoveDependency.prototype, "packageName", void 0);
|
|
215
|
+
__decorate([
|
|
216
|
+
(0, recipe_1.Option)({
|
|
217
|
+
displayName: "Scope",
|
|
218
|
+
description: "The dependency scope to remove from. If not specified, the dependency is removed from all scopes where it is found.",
|
|
219
|
+
example: "dependencies",
|
|
220
|
+
required: false
|
|
221
|
+
})
|
|
222
|
+
], RemoveDependency.prototype, "scope", void 0);
|
|
223
|
+
function removeDependencyFromJson(doc, packageName, scopes) {
|
|
224
|
+
if (!(0, json_1.isObject)(doc.value)) {
|
|
225
|
+
return doc;
|
|
226
|
+
}
|
|
227
|
+
const targetScopes = new Set(scopes);
|
|
228
|
+
const rootObj = doc.value;
|
|
229
|
+
let changed = false;
|
|
230
|
+
const result = [];
|
|
231
|
+
for (const rp of rootObj.members) {
|
|
232
|
+
const member = rp.element;
|
|
233
|
+
const keyName = (0, json_1.getMemberKeyName)(member);
|
|
234
|
+
if (!keyName || !targetScopes.has(keyName) || !(0, json_1.isObject)(member.value)) {
|
|
235
|
+
result.push(rp);
|
|
236
|
+
continue;
|
|
237
|
+
}
|
|
238
|
+
const scopeObj = member.value;
|
|
239
|
+
const filtered = scopeObj.members.filter(depRp => (0, json_1.getMemberKeyName)(depRp.element) !== packageName);
|
|
240
|
+
if (filtered.length === scopeObj.members.length) {
|
|
241
|
+
result.push(rp);
|
|
242
|
+
continue;
|
|
243
|
+
}
|
|
244
|
+
changed = true;
|
|
245
|
+
if (filtered.length === 0) {
|
|
246
|
+
continue;
|
|
247
|
+
}
|
|
248
|
+
const lastOriginalAfter = scopeObj.members[scopeObj.members.length - 1].after;
|
|
249
|
+
filtered[filtered.length - 1] = Object.assign(Object.assign({}, filtered[filtered.length - 1]), { after: lastOriginalAfter });
|
|
250
|
+
result.push(Object.assign(Object.assign({}, rp), { element: Object.assign(Object.assign({}, member), { value: Object.assign(Object.assign({}, scopeObj), { members: filtered }) }) }));
|
|
251
|
+
}
|
|
252
|
+
if (!changed) {
|
|
253
|
+
return doc;
|
|
254
|
+
}
|
|
255
|
+
if (result.length > 0 && result.length < rootObj.members.length) {
|
|
256
|
+
const originalLastAfter = rootObj.members[rootObj.members.length - 1].after;
|
|
257
|
+
result[result.length - 1] = Object.assign(Object.assign({}, result[result.length - 1]), { after: originalLastAfter });
|
|
258
|
+
}
|
|
259
|
+
return Object.assign(Object.assign({}, doc), { value: Object.assign(Object.assign({}, rootObj), { members: result }) });
|
|
260
|
+
}
|
|
261
|
+
//# sourceMappingURL=remove-dependency.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"remove-dependency.js","sourceRoot":"","sources":["../../../src/javascript/recipes/remove-dependency.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remove-import.d.ts","sourceRoot":"","sources":["../../src/javascript/remove-import.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,iBAAiB,EAAC,MAAM,WAAW,CAAC;AAC5C,OAAO,EAAC,CAAC,EAAC,MAAM,SAAS,CAAC;AAC1B,OAAO,EAAC,EAAE,EAAM,MAAM,QAAQ,CAAC;AAI/B;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,QAOjG;AAUD,qBAAa,YAAY,CAAC,CAAC,CAAE,SAAQ,iBAAiB,CAAC,CAAC,CAAC;IAUzC,QAAQ,CAAC,MAAM,EAAE,MAAM;IACvB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM;IAVpC;;;;;;;;OAQG;gBACkB,MAAM,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,MAAM,YAAA;IAIpC;;;;;OAKG;YACW,oCAAoC;IAgDlD;;OAEG;YACW,kBAAkB;IAejB,sBAAsB,CAAC,eAAe,EAAE,EAAE,CAAC,eAAe,EAAE,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"remove-import.d.ts","sourceRoot":"","sources":["../../src/javascript/remove-import.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,iBAAiB,EAAC,MAAM,WAAW,CAAC;AAC5C,OAAO,EAAC,CAAC,EAAC,MAAM,SAAS,CAAC;AAC1B,OAAO,EAAC,EAAE,EAAM,MAAM,QAAQ,CAAC;AAI/B;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,QAOjG;AAUD,qBAAa,YAAY,CAAC,CAAC,CAAE,SAAQ,iBAAiB,CAAC,CAAC,CAAC;IAUzC,QAAQ,CAAC,MAAM,EAAE,MAAM;IACvB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM;IAVpC;;;;;;;;OAQG;gBACkB,MAAM,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,MAAM,YAAA;IAIpC;;;;;OAKG;YACW,oCAAoC;IAgDlD;;OAEG;YACW,kBAAkB;IAejB,sBAAsB,CAAC,eAAe,EAAE,EAAE,CAAC,eAAe,EAAE,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;YA+F1F,aAAa;IAqK3B;;;OAGG;YACW,0BAA0B;IAmCxC;;OAEG;IACH,OAAO,CAAC,aAAa;IASrB;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAI3B;;OAEG;IACH,OAAO,CAAC,sBAAsB;YAOhB,mBAAmB;YA+DnB,0BAA0B;IA8DxC;;OAEG;IACH,OAAO,CAAC,wBAAwB;YAclB,2BAA2B;IAoDzC,OAAO,CAAC,aAAa;IAiBrB,OAAO,CAAC,cAAc;IActB,OAAO,CAAC,qBAAqB;IAQ7B,OAAO,CAAC,kBAAkB;IAmB1B,OAAO,CAAC,cAAc;IActB;;OAEG;YACW,kBAAkB;IA2BhC;;OAEG;YACW,kBAAkB;IAiBhC;;OAEG;YACW,mBAAmB;YASnB,sBAAsB;YAsOtB,gBAAgB;CAmFjC"}
|
|
@@ -122,7 +122,7 @@ class RemoveImport extends visitor_1.JavaScriptVisitor {
|
|
|
122
122
|
// Now process imports with knowledge of what's used
|
|
123
123
|
return this.produceJavaScript(compilationUnit, p, async (draft) => {
|
|
124
124
|
const formatter = new java_2.ElementRemovalFormatter(true); // Preserve file headers from first import
|
|
125
|
-
|
|
125
|
+
const newStatements = await (0, util_1.mapAsync)(compilationUnit.statements, async (stmt) => {
|
|
126
126
|
const statement = stmt.element;
|
|
127
127
|
// Handle ES6 imports
|
|
128
128
|
if ((statement === null || statement === void 0 ? void 0 : statement.kind) === tree_1.JS.Kind.Import) {
|
|
@@ -133,7 +133,7 @@ class RemoveImport extends visitor_1.JavaScriptVisitor {
|
|
|
133
133
|
return undefined;
|
|
134
134
|
}
|
|
135
135
|
const finalResult = formatter.processKept(result);
|
|
136
|
-
return
|
|
136
|
+
return (0, util_1.updateIfChanged)(stmt, { element: finalResult });
|
|
137
137
|
}
|
|
138
138
|
// Handle CommonJS require statements
|
|
139
139
|
// Note: const fs = require() comes as J.VariableDeclarations
|
|
@@ -146,7 +146,7 @@ class RemoveImport extends visitor_1.JavaScriptVisitor {
|
|
|
146
146
|
return undefined;
|
|
147
147
|
}
|
|
148
148
|
const finalResult = formatter.processKept(result);
|
|
149
|
-
return
|
|
149
|
+
return (0, util_1.updateIfChanged)(stmt, { element: finalResult });
|
|
150
150
|
}
|
|
151
151
|
// Handle JS.ScopedVariableDeclarations (multi-variable var/let/const)
|
|
152
152
|
if ((statement === null || statement === void 0 ? void 0 : statement.kind) === tree_1.JS.Kind.ScopedVariableDeclarations) {
|
|
@@ -165,7 +165,7 @@ class RemoveImport extends visitor_1.JavaScriptVisitor {
|
|
|
165
165
|
}
|
|
166
166
|
else {
|
|
167
167
|
const formattedVarDecl = varFormatter.processKept(result);
|
|
168
|
-
filteredVariables.push(
|
|
168
|
+
filteredVariables.push((0, util_1.updateIfChanged)(v, { element: formattedVarDecl }));
|
|
169
169
|
}
|
|
170
170
|
}
|
|
171
171
|
else {
|
|
@@ -179,17 +179,18 @@ class RemoveImport extends visitor_1.JavaScriptVisitor {
|
|
|
179
179
|
const finalElement = hasChanges
|
|
180
180
|
? formatter.processKept(Object.assign(Object.assign({}, scopedVarDecl), { variables: filteredVariables }))
|
|
181
181
|
: formatter.processKept(statement);
|
|
182
|
-
return
|
|
182
|
+
return (0, util_1.updateIfChanged)(stmt, { element: finalElement });
|
|
183
183
|
}
|
|
184
184
|
// For any other statement type, apply prefix from removed elements
|
|
185
185
|
if (statement) {
|
|
186
186
|
const finalStatement = formatter.processKept(statement);
|
|
187
|
-
return
|
|
187
|
+
return (0, util_1.updateIfChanged)(stmt, { element: finalStatement });
|
|
188
188
|
}
|
|
189
189
|
return stmt;
|
|
190
190
|
});
|
|
191
|
-
|
|
192
|
-
|
|
191
|
+
draft.statements = newStatements.some(s => s === undefined)
|
|
192
|
+
? newStatements.filter(s => s !== undefined)
|
|
193
|
+
: newStatements;
|
|
193
194
|
draft.eof = await this.visitSpace(compilationUnit.eof, p);
|
|
194
195
|
});
|
|
195
196
|
}
|