@openrewrite/rewrite 8.72.2 → 8.72.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/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
|
@@ -53,15 +53,6 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
53
53
|
return result;
|
|
54
54
|
};
|
|
55
55
|
})();
|
|
56
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
57
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
58
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
59
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
60
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
61
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
62
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
63
|
-
});
|
|
64
|
-
};
|
|
65
56
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
66
57
|
exports.UpgradeTransitiveDependencyVersion = void 0;
|
|
67
58
|
const recipe_1 = require("../../recipe");
|
|
@@ -100,206 +91,188 @@ class UpgradeTransitiveDependencyVersion extends recipe_1.ScanningRecipe {
|
|
|
100
91
|
initialValue(_ctx) {
|
|
101
92
|
return Object.assign(Object.assign({}, (0, package_manager_1.createDependencyRecipeAccumulator)()), { originalLockFiles: new Map() });
|
|
102
93
|
}
|
|
103
|
-
scanner(acc) {
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
94
|
+
async scanner(acc) {
|
|
95
|
+
const recipe = this;
|
|
96
|
+
const LOCK_FILE_NAMES = (0, package_manager_1.getAllLockFileNames)();
|
|
97
|
+
return new class extends visitor_1.TreeVisitor {
|
|
98
|
+
async accept(tree, ctx) {
|
|
99
|
+
// Handle JSON documents (package.json and JSON lock files)
|
|
100
|
+
if ((0, json_1.isJson)(tree) && tree.kind === json_1.Json.Kind.Document) {
|
|
101
|
+
return this.handleJsonDocument(tree, ctx);
|
|
102
|
+
}
|
|
103
|
+
// Handle YAML documents (pnpm-lock.yaml)
|
|
104
|
+
if ((0, yaml_1.isYaml)(tree) && (0, yaml_1.isDocuments)(tree)) {
|
|
105
|
+
return this.handleYamlDocument(tree, ctx);
|
|
106
|
+
}
|
|
107
|
+
// Handle PlainText files (yarn.lock for Yarn Classic)
|
|
108
|
+
if ((0, text_1.isPlainText)(tree)) {
|
|
109
|
+
return this.handlePlainTextDocument(tree, ctx);
|
|
110
|
+
}
|
|
111
|
+
return tree;
|
|
112
|
+
}
|
|
113
|
+
async handleJsonDocument(doc, _ctx) {
|
|
114
|
+
var _a, _b;
|
|
115
|
+
const basename = path.basename(doc.sourcePath);
|
|
116
|
+
// Capture JSON lock file content (package-lock.json, bun.lock)
|
|
117
|
+
if (LOCK_FILE_NAMES.includes(basename)) {
|
|
118
|
+
acc.originalLockFiles.set(doc.sourcePath, await print_1.TreePrinters.print(doc));
|
|
119
|
+
return doc;
|
|
124
120
|
}
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
if (!marker) {
|
|
140
|
-
return doc;
|
|
141
|
-
}
|
|
142
|
-
const pm = (_a = marker.packageManager) !== null && _a !== void 0 ? _a : node_resolution_result_1.PackageManager.Npm;
|
|
143
|
-
// Check if package is a direct dependency - if so, skip (use UpgradeDependencyVersion instead)
|
|
144
|
-
for (const scope of node_resolution_result_1.allDependencyScopes) {
|
|
145
|
-
const deps = marker[scope];
|
|
146
|
-
if (deps === null || deps === void 0 ? void 0 : deps.find(d => d.name === recipe.packageName)) {
|
|
147
|
-
// Package is a direct dependency, don't add override
|
|
148
|
-
return doc;
|
|
149
|
-
}
|
|
150
|
-
}
|
|
151
|
-
// Check if package exists as a transitive dependency (in resolvedDependencies)
|
|
152
|
-
// Note: There may be multiple versions of the same package installed
|
|
153
|
-
const resolvedVersions = node_resolution_result_1.NodeResolutionResultQueries.getAllResolvedVersions(marker, recipe.packageName);
|
|
154
|
-
if (resolvedVersions.length === 0) {
|
|
155
|
-
// Package not found in resolved dependencies at all
|
|
156
|
-
return doc;
|
|
157
|
-
}
|
|
158
|
-
// Check if ANY resolved version needs upgrading
|
|
159
|
-
// We need an override if at least one installed version doesn't satisfy the constraint
|
|
160
|
-
const anyVersionNeedsUpgrade = resolvedVersions.some(rd => !semver.satisfies(rd.version, recipe.newVersion));
|
|
161
|
-
if (!anyVersionNeedsUpgrade) {
|
|
162
|
-
// All installed versions already satisfy the constraint
|
|
163
|
-
return doc;
|
|
164
|
-
}
|
|
165
|
-
// Parse dependency path if specified
|
|
166
|
-
const dependencyPathSegments = recipe.dependencyPath
|
|
167
|
-
? (0, dependency_manager_1.parseDependencyPath)(recipe.dependencyPath)
|
|
168
|
-
: undefined;
|
|
169
|
-
// Extract project-level .npmrc config from marker
|
|
170
|
-
const configFiles = {};
|
|
171
|
-
const projectNpmrc = (_b = marker.npmrcConfigs) === null || _b === void 0 ? void 0 : _b.find(c => c.scope === node_resolution_result_1.NpmrcScope.Project);
|
|
172
|
-
if (projectNpmrc) {
|
|
173
|
-
const lines = Object.entries(projectNpmrc.properties)
|
|
174
|
-
.map(([key, value]) => `${key}=${value}`);
|
|
175
|
-
configFiles['.npmrc'] = lines.join('\n');
|
|
176
|
-
}
|
|
177
|
-
acc.projectsToUpdate.set(doc.sourcePath, {
|
|
178
|
-
packageJsonPath: doc.sourcePath,
|
|
179
|
-
originalPackageJson: yield print_1.TreePrinters.print(doc),
|
|
180
|
-
newVersion: recipe.newVersion,
|
|
181
|
-
packageManager: pm,
|
|
182
|
-
skipInstall: false, // Always need to run install for overrides
|
|
183
|
-
dependencyPathSegments,
|
|
184
|
-
configFiles: Object.keys(configFiles).length > 0 ? configFiles : undefined
|
|
185
|
-
});
|
|
121
|
+
// Only process package.json files for dependency analysis
|
|
122
|
+
if (!doc.sourcePath.endsWith('package.json')) {
|
|
123
|
+
return doc;
|
|
124
|
+
}
|
|
125
|
+
const marker = (0, node_resolution_result_1.findNodeResolutionResult)(doc);
|
|
126
|
+
if (!marker) {
|
|
127
|
+
return doc;
|
|
128
|
+
}
|
|
129
|
+
const pm = (_a = marker.packageManager) !== null && _a !== void 0 ? _a : node_resolution_result_1.PackageManager.Npm;
|
|
130
|
+
// Check if package is a direct dependency - if so, skip (use UpgradeDependencyVersion instead)
|
|
131
|
+
for (const scope of node_resolution_result_1.allDependencyScopes) {
|
|
132
|
+
const deps = marker[scope];
|
|
133
|
+
if (deps === null || deps === void 0 ? void 0 : deps.find(d => d.name === recipe.packageName)) {
|
|
134
|
+
// Package is a direct dependency, don't add override
|
|
186
135
|
return doc;
|
|
187
|
-
}
|
|
136
|
+
}
|
|
188
137
|
}
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
return docs;
|
|
196
|
-
});
|
|
138
|
+
// Check if package exists as a transitive dependency (in resolvedDependencies)
|
|
139
|
+
// Note: There may be multiple versions of the same package installed
|
|
140
|
+
const resolvedVersions = node_resolution_result_1.NodeResolutionResultQueries.getAllResolvedVersions(marker, recipe.packageName);
|
|
141
|
+
if (resolvedVersions.length === 0) {
|
|
142
|
+
// Package not found in resolved dependencies at all
|
|
143
|
+
return doc;
|
|
197
144
|
}
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
return text;
|
|
205
|
-
});
|
|
145
|
+
// Check if ANY resolved version needs upgrading
|
|
146
|
+
// We need an override if at least one installed version doesn't satisfy the constraint
|
|
147
|
+
const anyVersionNeedsUpgrade = resolvedVersions.some(rd => !semver.satisfies(rd.version, recipe.newVersion));
|
|
148
|
+
if (!anyVersionNeedsUpgrade) {
|
|
149
|
+
// All installed versions already satisfy the constraint
|
|
150
|
+
return doc;
|
|
206
151
|
}
|
|
207
|
-
|
|
208
|
-
|
|
152
|
+
// Parse dependency path if specified
|
|
153
|
+
const dependencyPathSegments = recipe.dependencyPath
|
|
154
|
+
? (0, dependency_manager_1.parseDependencyPath)(recipe.dependencyPath)
|
|
155
|
+
: undefined;
|
|
156
|
+
// Extract project-level .npmrc config from marker
|
|
157
|
+
const configFiles = {};
|
|
158
|
+
const projectNpmrc = (_b = marker.npmrcConfigs) === null || _b === void 0 ? void 0 : _b.find(c => c.scope === node_resolution_result_1.NpmrcScope.Project);
|
|
159
|
+
if (projectNpmrc) {
|
|
160
|
+
const lines = Object.entries(projectNpmrc.properties)
|
|
161
|
+
.map(([key, value]) => `${key}=${value}`);
|
|
162
|
+
configFiles['.npmrc'] = lines.join('\n');
|
|
163
|
+
}
|
|
164
|
+
acc.projectsToUpdate.set(doc.sourcePath, {
|
|
165
|
+
packageJsonPath: doc.sourcePath,
|
|
166
|
+
originalPackageJson: await print_1.TreePrinters.print(doc),
|
|
167
|
+
newVersion: recipe.newVersion,
|
|
168
|
+
packageManager: pm,
|
|
169
|
+
skipInstall: false, // Always need to run install for overrides
|
|
170
|
+
dependencyPathSegments,
|
|
171
|
+
configFiles: Object.keys(configFiles).length > 0 ? configFiles : undefined
|
|
172
|
+
});
|
|
173
|
+
return doc;
|
|
174
|
+
}
|
|
175
|
+
async handleYamlDocument(docs, _ctx) {
|
|
176
|
+
const basename = path.basename(docs.sourcePath);
|
|
177
|
+
if (LOCK_FILE_NAMES.includes(basename)) {
|
|
178
|
+
acc.originalLockFiles.set(docs.sourcePath, await print_1.TreePrinters.print(docs));
|
|
179
|
+
}
|
|
180
|
+
return docs;
|
|
181
|
+
}
|
|
182
|
+
async handlePlainTextDocument(text, _ctx) {
|
|
183
|
+
const basename = path.basename(text.sourcePath);
|
|
184
|
+
if (LOCK_FILE_NAMES.includes(basename)) {
|
|
185
|
+
acc.originalLockFiles.set(text.sourcePath, await print_1.TreePrinters.print(text));
|
|
186
|
+
}
|
|
187
|
+
return text;
|
|
188
|
+
}
|
|
189
|
+
};
|
|
209
190
|
}
|
|
210
|
-
editorWithData(acc) {
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
// Update the NodeResolutionResult marker
|
|
232
|
-
return (0, package_manager_1.updateNodeResolutionMarker)(modifiedDoc, updateInfo, acc);
|
|
233
|
-
}
|
|
234
|
-
// Handle JSON lock files (package-lock.json, bun.lock)
|
|
235
|
-
const lockFileName = path.basename(sourcePath);
|
|
236
|
-
if ((0, package_manager_1.getAllLockFileNames)().includes(lockFileName)) {
|
|
237
|
-
const updatedLockContent = acc.updatedLockFiles.get(sourcePath);
|
|
238
|
-
if (updatedLockContent) {
|
|
239
|
-
const parsed = yield (0, package_manager_1.parseLockFileContent)(updatedLockContent, sourcePath, lockFileName);
|
|
240
|
-
// Preserve original ID for RPC compatibility
|
|
241
|
-
return Object.assign(Object.assign({}, doc), { value: parsed.value, eof: parsed.eof });
|
|
242
|
-
}
|
|
243
|
-
}
|
|
244
|
-
return doc;
|
|
245
|
-
});
|
|
191
|
+
async editorWithData(acc) {
|
|
192
|
+
const recipe = this;
|
|
193
|
+
// Create JSON visitor that handles both package.json and JSON lock files
|
|
194
|
+
const jsonEditor = new class extends json_1.JsonVisitor {
|
|
195
|
+
async visitDocument(doc, ctx) {
|
|
196
|
+
const sourcePath = doc.sourcePath;
|
|
197
|
+
// Handle package.json files
|
|
198
|
+
if (sourcePath.endsWith('package.json')) {
|
|
199
|
+
const updateInfo = acc.projectsToUpdate.get(sourcePath);
|
|
200
|
+
if (!updateInfo) {
|
|
201
|
+
return doc; // This package.json doesn't need updating
|
|
202
|
+
}
|
|
203
|
+
// Run package manager install if needed, check for failure
|
|
204
|
+
const failureMessage = await (0, package_manager_1.runInstallIfNeeded)(sourcePath, acc, () => recipe.runPackageManagerInstall(acc, updateInfo, ctx));
|
|
205
|
+
if (failureMessage) {
|
|
206
|
+
return (0, markers_1.markupWarn)(doc, `Failed to add override for ${recipe.packageName} to ${recipe.newVersion}`, failureMessage);
|
|
207
|
+
}
|
|
208
|
+
// Add override entries
|
|
209
|
+
const modifiedDoc = await this.addOverrideEntry(doc, updateInfo);
|
|
210
|
+
// Update the NodeResolutionResult marker
|
|
211
|
+
return (0, package_manager_1.updateNodeResolutionMarker)(modifiedDoc, updateInfo, acc);
|
|
246
212
|
}
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
const currentContent = yield print_1.TreePrinters.print(doc);
|
|
254
|
-
let packageJson;
|
|
255
|
-
try {
|
|
256
|
-
packageJson = JSON.parse(currentContent);
|
|
257
|
-
}
|
|
258
|
-
catch (_a) {
|
|
259
|
-
return doc; // Can't parse, return unchanged
|
|
260
|
-
}
|
|
261
|
-
// Apply override
|
|
262
|
-
const modifiedPackageJson = (0, dependency_manager_1.applyOverrideToPackageJson)(packageJson, updateInfo.packageManager, recipe.packageName, updateInfo.newVersion, updateInfo.dependencyPathSegments);
|
|
263
|
-
// Serialize back to JSON, preserving indentation
|
|
264
|
-
const indentMatch = currentContent.match(/^(\s+)"/m);
|
|
265
|
-
const indent = indentMatch ? indentMatch[1].length : 2;
|
|
266
|
-
const newContent = JSON.stringify(modifiedPackageJson, null, indent);
|
|
267
|
-
// Re-parse with JsonParser to get proper AST
|
|
268
|
-
const parsed = yield new json_1.JsonParser({}).parseOne({
|
|
269
|
-
text: newContent,
|
|
270
|
-
sourcePath: doc.sourcePath
|
|
271
|
-
});
|
|
213
|
+
// Handle JSON lock files (package-lock.json, bun.lock)
|
|
214
|
+
const lockFileName = path.basename(sourcePath);
|
|
215
|
+
if ((0, package_manager_1.getAllLockFileNames)().includes(lockFileName)) {
|
|
216
|
+
const updatedLockContent = acc.updatedLockFiles.get(sourcePath);
|
|
217
|
+
if (updatedLockContent) {
|
|
218
|
+
const parsed = await (0, package_manager_1.parseLockFileContent)(updatedLockContent, sourcePath, lockFileName);
|
|
272
219
|
// Preserve original ID for RPC compatibility
|
|
273
220
|
return Object.assign(Object.assign({}, doc), { value: parsed.value, eof: parsed.eof });
|
|
274
|
-
}
|
|
221
|
+
}
|
|
275
222
|
}
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
223
|
+
return doc;
|
|
224
|
+
}
|
|
225
|
+
/**
|
|
226
|
+
* Adds override entry to package.json for transitive dependency upgrade.
|
|
227
|
+
*/
|
|
228
|
+
async addOverrideEntry(doc, updateInfo) {
|
|
229
|
+
// Parse current package.json content
|
|
230
|
+
const currentContent = await print_1.TreePrinters.print(doc);
|
|
231
|
+
let packageJson;
|
|
232
|
+
try {
|
|
233
|
+
packageJson = JSON.parse(currentContent);
|
|
234
|
+
}
|
|
235
|
+
catch (_a) {
|
|
236
|
+
return doc; // Can't parse, return unchanged
|
|
237
|
+
}
|
|
238
|
+
// Apply override
|
|
239
|
+
const modifiedPackageJson = (0, dependency_manager_1.applyOverrideToPackageJson)(packageJson, updateInfo.packageManager, recipe.packageName, updateInfo.newVersion, updateInfo.dependencyPathSegments);
|
|
240
|
+
// Serialize back to JSON, preserving indentation
|
|
241
|
+
const indentMatch = currentContent.match(/^(\s+)"/m);
|
|
242
|
+
const indent = indentMatch ? indentMatch[1].length : 2;
|
|
243
|
+
const newContent = JSON.stringify(modifiedPackageJson, null, indent);
|
|
244
|
+
// Re-parse with JsonParser to get proper AST
|
|
245
|
+
const parsed = await new json_1.JsonParser({}).parseOne({
|
|
246
|
+
text: newContent,
|
|
247
|
+
sourcePath: doc.sourcePath
|
|
248
|
+
});
|
|
249
|
+
// Preserve original ID for RPC compatibility
|
|
250
|
+
return Object.assign(Object.assign({}, doc), { value: parsed.value, eof: parsed.eof });
|
|
251
|
+
}
|
|
252
|
+
};
|
|
253
|
+
// Return composite visitor that handles both JSON and YAML lock files
|
|
254
|
+
return (0, package_manager_1.createLockFileEditor)(jsonEditor, acc);
|
|
280
255
|
}
|
|
281
256
|
/**
|
|
282
257
|
* Runs the package manager in a temporary directory to update the lock file.
|
|
283
258
|
* All file contents are provided from in-memory sources (SourceFiles), not read from disk.
|
|
284
259
|
*/
|
|
285
|
-
runPackageManagerInstall(acc, updateInfo, _ctx) {
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
configFiles: updateInfo.configFiles
|
|
300
|
-
});
|
|
301
|
-
(0, package_manager_1.storeInstallResult)(result, acc, updateInfo, modifiedPackageJson);
|
|
260
|
+
async runPackageManagerInstall(acc, updateInfo, _ctx) {
|
|
261
|
+
// Create modified package.json with the override
|
|
262
|
+
const modifiedPackageJson = this.createModifiedPackageJson(updateInfo.originalPackageJson, updateInfo);
|
|
263
|
+
// Get the lock file path based on package manager
|
|
264
|
+
const lockFileName = (0, package_manager_1.getLockFileName)(updateInfo.packageManager);
|
|
265
|
+
const packageJsonDir = path.dirname(updateInfo.packageJsonPath);
|
|
266
|
+
const lockFilePath = packageJsonDir === '.'
|
|
267
|
+
? lockFileName
|
|
268
|
+
: path.join(packageJsonDir, lockFileName);
|
|
269
|
+
// Look up the original lock file content from captured SourceFiles
|
|
270
|
+
const originalLockFileContent = acc.originalLockFiles.get(lockFilePath);
|
|
271
|
+
const result = await (0, package_manager_1.runInstallInTempDir)(updateInfo.packageManager, modifiedPackageJson, {
|
|
272
|
+
originalLockFileContent,
|
|
273
|
+
configFiles: updateInfo.configFiles
|
|
302
274
|
});
|
|
275
|
+
(0, package_manager_1.storeInstallResult)(result, acc, updateInfo, modifiedPackageJson);
|
|
303
276
|
}
|
|
304
277
|
/**
|
|
305
278
|
* Creates a modified package.json with the override.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgrade-transitive-dependency-version.js","sourceRoot":"","sources":["../../../src/javascript/recipes/upgrade-transitive-dependency-version.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG
|
|
1
|
+
{"version":3,"file":"upgrade-transitive-dependency-version.js","sourceRoot":"","sources":["../../../src/javascript/recipes/upgrade-transitive-dependency-version.ts"],"names":[],"mappings":"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"}
|