@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.UpgradeDependencyVersion = void 0;
|
|
67
58
|
const recipe_1 = require("../../recipe");
|
|
@@ -128,186 +119,170 @@ class UpgradeDependencyVersion extends recipe_1.ScanningRecipe {
|
|
|
128
119
|
// Only upgrade if new minimum version is strictly greater than current
|
|
129
120
|
return semver.gt(newMin, currentMin);
|
|
130
121
|
}
|
|
131
|
-
scanner(acc) {
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
if ((0, yaml_1.isYaml)(tree) && (0, yaml_1.isDocuments)(tree)) {
|
|
144
|
-
return this.handleYamlDocument(tree, ctx);
|
|
145
|
-
}
|
|
146
|
-
// Handle PlainText files (yarn.lock for Yarn Classic)
|
|
147
|
-
if ((0, text_1.isPlainText)(tree)) {
|
|
148
|
-
return this.handlePlainTextDocument(tree, ctx);
|
|
149
|
-
}
|
|
150
|
-
return tree;
|
|
151
|
-
});
|
|
122
|
+
async scanner(acc) {
|
|
123
|
+
const recipe = this;
|
|
124
|
+
const LOCK_FILE_NAMES = (0, package_manager_1.getAllLockFileNames)();
|
|
125
|
+
return new class extends visitor_1.TreeVisitor {
|
|
126
|
+
async accept(tree, ctx) {
|
|
127
|
+
// Handle JSON documents (package.json and JSON lock files)
|
|
128
|
+
if ((0, json_1.isJson)(tree) && tree.kind === json_1.Json.Kind.Document) {
|
|
129
|
+
return this.handleJsonDocument(tree, ctx);
|
|
130
|
+
}
|
|
131
|
+
// Handle YAML documents (pnpm-lock.yaml)
|
|
132
|
+
if ((0, yaml_1.isYaml)(tree) && (0, yaml_1.isDocuments)(tree)) {
|
|
133
|
+
return this.handleYamlDocument(tree, ctx);
|
|
152
134
|
}
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
const basename = path.basename(doc.sourcePath);
|
|
157
|
-
// Capture JSON lock file content (package-lock.json, bun.lock)
|
|
158
|
-
if (LOCK_FILE_NAMES.includes(basename)) {
|
|
159
|
-
acc.originalLockFiles.set(doc.sourcePath, yield print_1.TreePrinters.print(doc));
|
|
160
|
-
return doc;
|
|
161
|
-
}
|
|
162
|
-
// Only process package.json files for dependency analysis
|
|
163
|
-
if (!doc.sourcePath.endsWith('package.json')) {
|
|
164
|
-
return doc;
|
|
165
|
-
}
|
|
166
|
-
const marker = (0, node_resolution_result_1.findNodeResolutionResult)(doc);
|
|
167
|
-
if (!marker) {
|
|
168
|
-
return doc;
|
|
169
|
-
}
|
|
170
|
-
const pm = (_a = marker.packageManager) !== null && _a !== void 0 ? _a : node_resolution_result_1.PackageManager.Npm;
|
|
171
|
-
// Check each dependency scope for the target package
|
|
172
|
-
const scopes = node_resolution_result_1.allDependencyScopes;
|
|
173
|
-
let foundScope;
|
|
174
|
-
let currentVersion;
|
|
175
|
-
for (const scope of scopes) {
|
|
176
|
-
const deps = marker[scope];
|
|
177
|
-
const dep = deps === null || deps === void 0 ? void 0 : deps.find(d => d.name === recipe.packageName);
|
|
178
|
-
if (dep) {
|
|
179
|
-
foundScope = scope;
|
|
180
|
-
currentVersion = dep.versionConstraint;
|
|
181
|
-
break;
|
|
182
|
-
}
|
|
183
|
-
}
|
|
184
|
-
if (!foundScope || !currentVersion) {
|
|
185
|
-
return doc; // Dependency not found in any scope
|
|
186
|
-
}
|
|
187
|
-
// Check if upgrade is needed
|
|
188
|
-
if (!recipe.shouldUpgrade(currentVersion, recipe.newVersion)) {
|
|
189
|
-
return doc; // Already at target version or newer
|
|
190
|
-
}
|
|
191
|
-
// Check if we can skip running the package manager
|
|
192
|
-
// (resolved version already satisfies the new constraint)
|
|
193
|
-
const resolvedDep = (_b = marker.resolvedDependencies) === null || _b === void 0 ? void 0 : _b.find(rd => rd.name === recipe.packageName);
|
|
194
|
-
const skipInstall = resolvedDep !== undefined &&
|
|
195
|
-
semver.satisfies(resolvedDep.version, recipe.newVersion);
|
|
196
|
-
// Extract project-level .npmrc config from marker
|
|
197
|
-
const configFiles = {};
|
|
198
|
-
const projectNpmrc = (_c = marker.npmrcConfigs) === null || _c === void 0 ? void 0 : _c.find(c => c.scope === node_resolution_result_1.NpmrcScope.Project);
|
|
199
|
-
if (projectNpmrc) {
|
|
200
|
-
const lines = Object.entries(projectNpmrc.properties)
|
|
201
|
-
.map(([key, value]) => `${key}=${value}`);
|
|
202
|
-
configFiles['.npmrc'] = lines.join('\n');
|
|
203
|
-
}
|
|
204
|
-
acc.projectsToUpdate.set(doc.sourcePath, {
|
|
205
|
-
packageJsonPath: doc.sourcePath,
|
|
206
|
-
originalPackageJson: yield print_1.TreePrinters.print(doc),
|
|
207
|
-
dependencyScope: foundScope,
|
|
208
|
-
currentVersion,
|
|
209
|
-
newVersion: recipe.newVersion,
|
|
210
|
-
packageManager: pm,
|
|
211
|
-
skipInstall,
|
|
212
|
-
configFiles: Object.keys(configFiles).length > 0 ? configFiles : undefined
|
|
213
|
-
});
|
|
214
|
-
return doc;
|
|
215
|
-
});
|
|
135
|
+
// Handle PlainText files (yarn.lock for Yarn Classic)
|
|
136
|
+
if ((0, text_1.isPlainText)(tree)) {
|
|
137
|
+
return this.handlePlainTextDocument(tree, ctx);
|
|
216
138
|
}
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
139
|
+
return tree;
|
|
140
|
+
}
|
|
141
|
+
async handleJsonDocument(doc, _ctx) {
|
|
142
|
+
var _a, _b, _c;
|
|
143
|
+
const basename = path.basename(doc.sourcePath);
|
|
144
|
+
// Capture JSON lock file content (package-lock.json, bun.lock)
|
|
145
|
+
if (LOCK_FILE_NAMES.includes(basename)) {
|
|
146
|
+
acc.originalLockFiles.set(doc.sourcePath, await print_1.TreePrinters.print(doc));
|
|
147
|
+
return doc;
|
|
225
148
|
}
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
if (LOCK_FILE_NAMES.includes(basename)) {
|
|
230
|
-
acc.originalLockFiles.set(text.sourcePath, yield print_1.TreePrinters.print(text));
|
|
231
|
-
}
|
|
232
|
-
return text;
|
|
233
|
-
});
|
|
149
|
+
// Only process package.json files for dependency analysis
|
|
150
|
+
if (!doc.sourcePath.endsWith('package.json')) {
|
|
151
|
+
return doc;
|
|
234
152
|
}
|
|
235
|
-
|
|
236
|
-
|
|
153
|
+
const marker = (0, node_resolution_result_1.findNodeResolutionResult)(doc);
|
|
154
|
+
if (!marker) {
|
|
155
|
+
return doc;
|
|
156
|
+
}
|
|
157
|
+
const pm = (_a = marker.packageManager) !== null && _a !== void 0 ? _a : node_resolution_result_1.PackageManager.Npm;
|
|
158
|
+
// Check each dependency scope for the target package
|
|
159
|
+
const scopes = node_resolution_result_1.allDependencyScopes;
|
|
160
|
+
let foundScope;
|
|
161
|
+
let currentVersion;
|
|
162
|
+
for (const scope of scopes) {
|
|
163
|
+
const deps = marker[scope];
|
|
164
|
+
const dep = deps === null || deps === void 0 ? void 0 : deps.find(d => d.name === recipe.packageName);
|
|
165
|
+
if (dep) {
|
|
166
|
+
foundScope = scope;
|
|
167
|
+
currentVersion = dep.versionConstraint;
|
|
168
|
+
break;
|
|
169
|
+
}
|
|
170
|
+
}
|
|
171
|
+
if (!foundScope || !currentVersion) {
|
|
172
|
+
return doc; // Dependency not found in any scope
|
|
173
|
+
}
|
|
174
|
+
// Check if upgrade is needed
|
|
175
|
+
if (!recipe.shouldUpgrade(currentVersion, recipe.newVersion)) {
|
|
176
|
+
return doc; // Already at target version or newer
|
|
177
|
+
}
|
|
178
|
+
// Check if we can skip running the package manager
|
|
179
|
+
// (resolved version already satisfies the new constraint)
|
|
180
|
+
const resolvedDep = (_b = marker.resolvedDependencies) === null || _b === void 0 ? void 0 : _b.find(rd => rd.name === recipe.packageName);
|
|
181
|
+
const skipInstall = resolvedDep !== undefined &&
|
|
182
|
+
semver.satisfies(resolvedDep.version, recipe.newVersion);
|
|
183
|
+
// Extract project-level .npmrc config from marker
|
|
184
|
+
const configFiles = {};
|
|
185
|
+
const projectNpmrc = (_c = marker.npmrcConfigs) === null || _c === void 0 ? void 0 : _c.find(c => c.scope === node_resolution_result_1.NpmrcScope.Project);
|
|
186
|
+
if (projectNpmrc) {
|
|
187
|
+
const lines = Object.entries(projectNpmrc.properties)
|
|
188
|
+
.map(([key, value]) => `${key}=${value}`);
|
|
189
|
+
configFiles['.npmrc'] = lines.join('\n');
|
|
190
|
+
}
|
|
191
|
+
acc.projectsToUpdate.set(doc.sourcePath, {
|
|
192
|
+
packageJsonPath: doc.sourcePath,
|
|
193
|
+
originalPackageJson: await print_1.TreePrinters.print(doc),
|
|
194
|
+
dependencyScope: foundScope,
|
|
195
|
+
currentVersion,
|
|
196
|
+
newVersion: recipe.newVersion,
|
|
197
|
+
packageManager: pm,
|
|
198
|
+
skipInstall,
|
|
199
|
+
configFiles: Object.keys(configFiles).length > 0 ? configFiles : undefined
|
|
200
|
+
});
|
|
201
|
+
return doc;
|
|
202
|
+
}
|
|
203
|
+
async handleYamlDocument(docs, _ctx) {
|
|
204
|
+
const basename = path.basename(docs.sourcePath);
|
|
205
|
+
if (LOCK_FILE_NAMES.includes(basename)) {
|
|
206
|
+
acc.originalLockFiles.set(docs.sourcePath, await print_1.TreePrinters.print(docs));
|
|
207
|
+
}
|
|
208
|
+
return docs;
|
|
209
|
+
}
|
|
210
|
+
async handlePlainTextDocument(text, _ctx) {
|
|
211
|
+
const basename = path.basename(text.sourcePath);
|
|
212
|
+
if (LOCK_FILE_NAMES.includes(basename)) {
|
|
213
|
+
acc.originalLockFiles.set(text.sourcePath, await print_1.TreePrinters.print(text));
|
|
214
|
+
}
|
|
215
|
+
return text;
|
|
216
|
+
}
|
|
217
|
+
};
|
|
237
218
|
}
|
|
238
|
-
editorWithData(acc) {
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
}
|
|
268
|
-
return (0, package_manager_1.updateNodeResolutionMarker)(modifiedDoc, updateInfo, acc);
|
|
269
|
-
}
|
|
270
|
-
// Handle JSON lock files (package-lock.json, bun.lock)
|
|
271
|
-
const lockFileName = path.basename(sourcePath);
|
|
272
|
-
if ((0, package_manager_1.getAllLockFileNames)().includes(lockFileName)) {
|
|
273
|
-
const updatedLockContent = acc.updatedLockFiles.get(sourcePath);
|
|
274
|
-
if (updatedLockContent) {
|
|
275
|
-
const parsed = yield (0, package_manager_1.parseLockFileContent)(updatedLockContent, sourcePath, lockFileName);
|
|
276
|
-
// Preserve original ID for RPC compatibility
|
|
277
|
-
return Object.assign(Object.assign({}, doc), { value: parsed.value, eof: parsed.eof });
|
|
278
|
-
}
|
|
279
|
-
}
|
|
280
|
-
return doc;
|
|
281
|
-
});
|
|
219
|
+
async editorWithData(acc) {
|
|
220
|
+
const recipe = this;
|
|
221
|
+
// Create JSON visitor that handles both package.json and JSON lock files
|
|
222
|
+
const jsonEditor = new class extends json_1.JsonVisitor {
|
|
223
|
+
async visitDocument(doc, ctx) {
|
|
224
|
+
const sourcePath = doc.sourcePath;
|
|
225
|
+
// Handle package.json files
|
|
226
|
+
if (sourcePath.endsWith('package.json')) {
|
|
227
|
+
const updateInfo = acc.projectsToUpdate.get(sourcePath);
|
|
228
|
+
if (!updateInfo) {
|
|
229
|
+
return doc; // This package.json doesn't need updating
|
|
230
|
+
}
|
|
231
|
+
// Run package manager install if needed, check for failure
|
|
232
|
+
// Skip if the resolved version already satisfies the new constraint
|
|
233
|
+
const failureMessage = updateInfo.skipInstall
|
|
234
|
+
? undefined
|
|
235
|
+
: await (0, package_manager_1.runInstallIfNeeded)(sourcePath, acc, () => recipe.runPackageManagerInstall(acc, updateInfo, ctx));
|
|
236
|
+
if (failureMessage) {
|
|
237
|
+
return (0, markers_1.markupWarn)(doc, `Failed to upgrade ${recipe.packageName} to ${recipe.newVersion}`, failureMessage);
|
|
238
|
+
}
|
|
239
|
+
// Update the dependency version in the JSON AST (preserves formatting)
|
|
240
|
+
const visitor = new UpdateVersionVisitor(recipe.packageName, updateInfo.newVersion, updateInfo.dependencyScope);
|
|
241
|
+
const modifiedDoc = await visitor.visit(doc, undefined);
|
|
242
|
+
// Update the NodeResolutionResult marker
|
|
243
|
+
if (updateInfo.skipInstall) {
|
|
244
|
+
// Just update the versionConstraint in the marker - resolved version is unchanged
|
|
245
|
+
return recipe.updateMarkerVersionConstraint(modifiedDoc, updateInfo);
|
|
246
|
+
}
|
|
247
|
+
return (0, package_manager_1.updateNodeResolutionMarker)(modifiedDoc, updateInfo, acc);
|
|
282
248
|
}
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
249
|
+
// Handle JSON lock files (package-lock.json, bun.lock)
|
|
250
|
+
const lockFileName = path.basename(sourcePath);
|
|
251
|
+
if ((0, package_manager_1.getAllLockFileNames)().includes(lockFileName)) {
|
|
252
|
+
const updatedLockContent = acc.updatedLockFiles.get(sourcePath);
|
|
253
|
+
if (updatedLockContent) {
|
|
254
|
+
const parsed = await (0, package_manager_1.parseLockFileContent)(updatedLockContent, sourcePath, lockFileName);
|
|
255
|
+
// Preserve original ID for RPC compatibility
|
|
256
|
+
return Object.assign(Object.assign({}, doc), { value: parsed.value, eof: parsed.eof });
|
|
257
|
+
}
|
|
258
|
+
}
|
|
259
|
+
return doc;
|
|
260
|
+
}
|
|
261
|
+
};
|
|
262
|
+
// Return composite visitor that handles both JSON and YAML lock files
|
|
263
|
+
return (0, package_manager_1.createLockFileEditor)(jsonEditor, acc);
|
|
287
264
|
}
|
|
288
265
|
/**
|
|
289
266
|
* Runs the package manager in a temporary directory to update the lock file.
|
|
290
267
|
* Writes a modified package.json with the new version, then runs install to update the lock file.
|
|
291
268
|
* All file contents are provided from in-memory sources (SourceFiles), not read from disk.
|
|
292
269
|
*/
|
|
293
|
-
runPackageManagerInstall(acc, updateInfo, _ctx) {
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
configFiles: updateInfo.configFiles
|
|
308
|
-
});
|
|
309
|
-
(0, package_manager_1.storeInstallResult)(result, acc, updateInfo, modifiedPackageJson);
|
|
270
|
+
async runPackageManagerInstall(acc, updateInfo, _ctx) {
|
|
271
|
+
// Create modified package.json with the new version constraint
|
|
272
|
+
const modifiedPackageJson = this.createModifiedPackageJson(updateInfo.originalPackageJson, updateInfo.dependencyScope, updateInfo.newVersion);
|
|
273
|
+
// Get the lock file path based on package manager
|
|
274
|
+
const lockFileName = (0, package_manager_1.getLockFileName)(updateInfo.packageManager);
|
|
275
|
+
const packageJsonDir = path.dirname(updateInfo.packageJsonPath);
|
|
276
|
+
const lockFilePath = packageJsonDir === '.'
|
|
277
|
+
? lockFileName
|
|
278
|
+
: path.join(packageJsonDir, lockFileName);
|
|
279
|
+
// Look up the original lock file content from captured SourceFiles
|
|
280
|
+
const originalLockFileContent = acc.originalLockFiles.get(lockFilePath);
|
|
281
|
+
const result = await (0, package_manager_1.runInstallInTempDir)(updateInfo.packageManager, modifiedPackageJson, {
|
|
282
|
+
originalLockFileContent,
|
|
283
|
+
configFiles: updateInfo.configFiles
|
|
310
284
|
});
|
|
285
|
+
(0, package_manager_1.storeInstallResult)(result, acc, updateInfo, modifiedPackageJson);
|
|
311
286
|
}
|
|
312
287
|
/**
|
|
313
288
|
* Creates a modified package.json with the updated dependency version.
|
|
@@ -363,27 +338,22 @@ class UpdateVersionVisitor extends json_1.JsonVisitor {
|
|
|
363
338
|
this.newVersion = newVersion;
|
|
364
339
|
this.targetScope = targetScope;
|
|
365
340
|
}
|
|
366
|
-
visitMember(member, p) {
|
|
367
|
-
|
|
368
|
-
|
|
369
|
-
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
const
|
|
373
|
-
|
|
374
|
-
|
|
375
|
-
|
|
376
|
-
|
|
377
|
-
|
|
378
|
-
|
|
379
|
-
|
|
380
|
-
|
|
381
|
-
|
|
382
|
-
// Update the version value
|
|
383
|
-
return this.updateVersion(member);
|
|
384
|
-
}
|
|
385
|
-
return _super.visitMember.call(this, member, p);
|
|
386
|
-
});
|
|
341
|
+
async visitMember(member, p) {
|
|
342
|
+
// Check if we're entering the target scope
|
|
343
|
+
const keyName = (0, json_1.getMemberKeyName)(member);
|
|
344
|
+
if (keyName === this.targetScope) {
|
|
345
|
+
// We're entering the dependencies scope
|
|
346
|
+
this.inTargetScope = true;
|
|
347
|
+
const result = await super.visitMember(member, p);
|
|
348
|
+
this.inTargetScope = false;
|
|
349
|
+
return result;
|
|
350
|
+
}
|
|
351
|
+
// Check if this is the dependency we're looking for
|
|
352
|
+
if (this.inTargetScope && keyName === this.packageName) {
|
|
353
|
+
// Update the version value
|
|
354
|
+
return this.updateVersion(member);
|
|
355
|
+
}
|
|
356
|
+
return super.visitMember(member, p);
|
|
387
357
|
}
|
|
388
358
|
updateVersion(member) {
|
|
389
359
|
const value = member.value;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgrade-dependency-version.js","sourceRoot":"","sources":["../../../src/javascript/recipes/upgrade-dependency-version.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG
|
|
1
|
+
{"version":3,"file":"upgrade-dependency-version.js","sourceRoot":"","sources":["../../../src/javascript/recipes/upgrade-dependency-version.ts"],"names":[],"mappings":"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"}
|