@openrewrite/recipes-nodejs 0.37.0-20251222-110837 → 0.37.0-20251222-231958
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/migrate/process-exit-code.d.ts.map +1 -1
- package/dist/migrate/process-exit-code.js +7 -0
- package/dist/migrate/process-exit-code.js.map +1 -1
- package/dist/security/dependency-vulnerability-check.d.ts +5 -0
- package/dist/security/dependency-vulnerability-check.d.ts.map +1 -1
- package/dist/security/dependency-vulnerability-check.js +26 -5
- package/dist/security/dependency-vulnerability-check.js.map +1 -1
- package/package.json +1 -1
- package/src/migrate/process-exit-code.ts +10 -0
- package/src/security/dependency-vulnerability-check.ts +52 -7
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-exit-code.d.ts","sourceRoot":"","sources":["../../src/migrate/process-exit-code.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,gBAAgB,EAAgB,MAAM,EAAE,WAAW,EAAC,MAAM,sBAAsB,CAAC;AAQvG,qBAAa,+BAAgC,SAAQ,MAAM;IACvD,QAAQ,CAAC,IAAI,mEAAkE;IAC/E,QAAQ,CAAC,WAAW,EAAE,MAAM,CAA+D;IAC3F,QAAQ,CAAC,WAAW,EAAE,MAAM,CAC2E;IACvG,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,CAAe;IAEhC,MAAM,IAAI,OAAO,CAAC,WAAW,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"process-exit-code.d.ts","sourceRoot":"","sources":["../../src/migrate/process-exit-code.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,gBAAgB,EAAgB,MAAM,EAAE,WAAW,EAAC,MAAM,sBAAsB,CAAC;AAQvG,qBAAa,+BAAgC,SAAQ,MAAM;IACvD,QAAQ,CAAC,IAAI,mEAAkE;IAC/E,QAAQ,CAAC,WAAW,EAAE,MAAM,CAA+D;IAC3F,QAAQ,CAAC,WAAW,EAAE,MAAM,CAC2E;IACvG,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,CAAe;IAEhC,MAAM,IAAI,OAAO,CAAC,WAAW,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;CA6H9D"}
|
|
@@ -44,6 +44,13 @@ class AvoidImplicitCoercionOfExitCode extends rewrite_1.Recipe {
|
|
|
44
44
|
return false;
|
|
45
45
|
}
|
|
46
46
|
needsCoercion(expr) {
|
|
47
|
+
if (expr.kind === java_1.J.Kind.Literal) {
|
|
48
|
+
const literal = expr;
|
|
49
|
+
const valueSource = literal.valueSource;
|
|
50
|
+
if (valueSource && /^-?\d+$/.test(valueSource)) {
|
|
51
|
+
return false;
|
|
52
|
+
}
|
|
53
|
+
}
|
|
47
54
|
const exprType = expr.type;
|
|
48
55
|
if (!exprType || exprType.kind !== java_1.Type.Kind.Primitive) {
|
|
49
56
|
return true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-exit-code.js","sourceRoot":"","sources":["../../src/migrate/process-exit-code.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kDAAuG;AACvG,gEAA2F;AAC3F,oDAA2E;AAM3E,MAAa,+BAAgC,SAAQ,gBAAM;IAA3D;;QACa,SAAI,GAAG,+DAA+D,CAAA;QACtE,gBAAW,GAAW,2DAA2D,CAAC;QAClF,gBAAW,GAAW,wFAAwF;YACnH,kGAAkG,CAAC;QAC9F,SAAI,GAAa,CAAC,SAAS,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"process-exit-code.js","sourceRoot":"","sources":["../../src/migrate/process-exit-code.ts"],"names":[],"mappings":"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"}
|
|
@@ -59,5 +59,10 @@ export declare class DependencyVulnerabilityCheck extends ScanningRecipe<Accumul
|
|
|
59
59
|
private runPackageManagerInstall;
|
|
60
60
|
private createModifiedPackageJson;
|
|
61
61
|
}
|
|
62
|
+
export declare function extractVersionPrefix(versionString: string): {
|
|
63
|
+
prefix: string;
|
|
64
|
+
version: string;
|
|
65
|
+
};
|
|
66
|
+
export declare function applyVersionPrefix(originalVersion: string, newVersion: string): string;
|
|
62
67
|
export {};
|
|
63
68
|
//# sourceMappingURL=dependency-vulnerability-check.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dependency-vulnerability-check.d.ts","sourceRoot":"","sources":["../../src/security/dependency-vulnerability-check.ts"],"names":[],"mappings":"AAMA,OAAO,EAAoB,gBAAgB,EAAU,MAAM,EAAE,cAAc,EAAQ,WAAW,EAAa,MAAM,sBAAsB,CAAC;AAKxI,OAAO,EACH,eAAe,EAEf,kBAAkB,EAClB,cAAc,EAEd,2BAA2B,EAM9B,MAAM,iCAAiC,CAAC;AAGzC,OAAO,EAA2C,aAAa,EAAE,qBAAqB,EAAC,MAAM,iBAAiB,CAAC;AAM/G,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG,OAAO,GAAG,OAAO,GAAG,OAAO,CAAC;AAsHhE,UAAU,WAAW;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACnB;AAKD,UAAU,oBAAoB;IAE1B,QAAQ,EAAE,kBAAkB,CAAC;IAE7B,aAAa,EAAE,aAAa,CAAC;IAE7B,KAAK,EAAE,MAAM,CAAC;IAEd,QAAQ,EAAE,OAAO,CAAC;IAElB,KAAK,CAAC,EAAE,eAAe,CAAC;IAExB,IAAI,EAAE,WAAW,EAAE,CAAC;CACvB;AAKD,UAAU,gBAAgB;IAEtB,WAAW,EAAE,MAAM,CAAC;IAEpB,UAAU,EAAE,MAAM,CAAC;IAEnB,YAAY,EAAE,OAAO,CAAC;IAEtB,IAAI,EAAE,MAAM,EAAE,CAAC;IAEf,KAAK,CAAC,EAAE,eAAe,CAAC;CAC3B;AAKD,UAAU,iBAAiB;IAEvB,UAAU,EAAE,MAAM,CAAC;IAEnB,eAAe,EAAE,MAAM,CAAC;IAExB,mBAAmB,EAAE,MAAM,CAAC;IAE5B,cAAc,EAAE,cAAc,CAAC;CAClC;AAKD,UAAU,WAAY,SAAQ,2BAA2B,CAAC,iBAAiB,CAAC;IAExE,EAAE,EAAE,qBAAqB,CAAC;IAE1B,mBAAmB,EAAE,GAAG,CAAC,MAAM,EAAE,oBAAoB,EAAE,CAAC,CAAC;IAEzD,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB,EAAE,CAAC,CAAC;CACnD;AAgBD,qBAAa,4BAA6B,SAAQ,cAAc,CAAC,WAAW,CAAC;IACzE,QAAQ,CAAC,IAAI,yDAAyD;IACtE,QAAQ,CAAC,WAAW,8CAA8C;IAClE,QAAQ,CAAC,WAAW,SAI8D;IAElF,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAKlC;IAUF,KAAK,CAAC,EAAE,eAAe,CAAC;IAUxB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAa7B,mBAAmB,CAAC,EAAE,YAAY,CAAC;IAWnC,eAAe,CAAC,EAAE,MAAM,CAAC;IAWzB,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,YAAY,CAAC,IAAI,EAAE,gBAAgB,GAAG,WAAW;IAWjD,OAAO,CAAC,kBAAkB;IAI1B,OAAO,CAAC,sBAAsB;IAI9B,OAAO,CAAC,YAAY;IAOpB,OAAO,CAAC,iBAAiB;IAezB,OAAO,CAAC,iBAAiB;IAwCzB,OAAO,CAAC,wBAAwB;IAwDhC,OAAO,CAAC,iBAAiB;IAczB,OAAO,CAAC,UAAU;IAclB,OAAO,CAAC,mBAAmB;IAyE3B,OAAO,CAAC,YAAY;IAyDd,OAAO,CAAC,GAAG,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;IA0EtE,aAAa,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAMlC,cAAc,CAAC,GAAG,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"dependency-vulnerability-check.d.ts","sourceRoot":"","sources":["../../src/security/dependency-vulnerability-check.ts"],"names":[],"mappings":"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"}
|
|
@@ -49,6 +49,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
49
49
|
};
|
|
50
50
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
51
51
|
exports.DependencyVulnerabilityCheck = void 0;
|
|
52
|
+
exports.extractVersionPrefix = extractVersionPrefix;
|
|
53
|
+
exports.applyVersionPrefix = applyVersionPrefix;
|
|
52
54
|
const rewrite_1 = require("@openrewrite/rewrite");
|
|
53
55
|
const json_1 = require("@openrewrite/rewrite/json");
|
|
54
56
|
const rewrite_2 = require("@openrewrite/rewrite");
|
|
@@ -456,10 +458,11 @@ class DependencyVulnerabilityCheck extends rewrite_1.ScanningRecipe {
|
|
|
456
458
|
}
|
|
457
459
|
const updatedLockContent = (0, javascript_1.getUpdatedLockFileContent)(sourcePath, acc);
|
|
458
460
|
if (updatedLockContent) {
|
|
459
|
-
|
|
461
|
+
const updatedLockFile = yield new json_1.JsonParser({}).parseOne({
|
|
460
462
|
text: updatedLockContent,
|
|
461
463
|
sourcePath: doc.sourcePath
|
|
462
464
|
});
|
|
465
|
+
return Object.assign(Object.assign({}, doc), { value: updatedLockFile.value, eof: updatedLockFile.eof });
|
|
463
466
|
}
|
|
464
467
|
return doc;
|
|
465
468
|
});
|
|
@@ -469,10 +472,11 @@ class DependencyVulnerabilityCheck extends rewrite_1.ScanningRecipe {
|
|
|
469
472
|
const sourcePath = docs.sourcePath;
|
|
470
473
|
const updatedLockContent = (0, javascript_1.getUpdatedLockFileContent)(sourcePath, acc);
|
|
471
474
|
if (updatedLockContent) {
|
|
472
|
-
|
|
475
|
+
const updatedLockFile = yield new yaml_1.YamlParser({}).parseOne({
|
|
473
476
|
text: updatedLockContent,
|
|
474
477
|
sourcePath: docs.sourcePath
|
|
475
478
|
});
|
|
479
|
+
return Object.assign(Object.assign({}, docs), { documents: updatedLockFile.documents, suffix: updatedLockFile.suffix });
|
|
476
480
|
}
|
|
477
481
|
return docs;
|
|
478
482
|
});
|
|
@@ -486,7 +490,7 @@ class DependencyVulnerabilityCheck extends rewrite_1.ScanningRecipe {
|
|
|
486
490
|
text: updatedLockContent,
|
|
487
491
|
sourcePath: text.sourcePath
|
|
488
492
|
});
|
|
489
|
-
return parsed;
|
|
493
|
+
return Object.assign(Object.assign({}, text), { text: parsed.text });
|
|
490
494
|
}
|
|
491
495
|
return text;
|
|
492
496
|
});
|
|
@@ -538,7 +542,8 @@ class DependencyVulnerabilityCheck extends rewrite_1.ScanningRecipe {
|
|
|
538
542
|
for (const fix of fixes) {
|
|
539
543
|
if (!fix.isTransitive && fix.scope) {
|
|
540
544
|
if (packageJson[fix.scope] && packageJson[fix.scope][fix.packageName]) {
|
|
541
|
-
packageJson[fix.scope][fix.packageName]
|
|
545
|
+
const originalVersion = packageJson[fix.scope][fix.packageName];
|
|
546
|
+
packageJson[fix.scope][fix.packageName] = applyVersionPrefix(originalVersion, fix.newVersion);
|
|
542
547
|
}
|
|
543
548
|
}
|
|
544
549
|
}
|
|
@@ -601,6 +606,20 @@ __decorate([
|
|
|
601
606
|
example: "CVE-2023-.*"
|
|
602
607
|
})
|
|
603
608
|
], DependencyVulnerabilityCheck.prototype, "cvePattern", void 0);
|
|
609
|
+
function extractVersionPrefix(versionString) {
|
|
610
|
+
const match = versionString.match(/^([~^]|>=?|<=?|=)?(.*)$/);
|
|
611
|
+
if (match) {
|
|
612
|
+
return {
|
|
613
|
+
prefix: match[1] || '',
|
|
614
|
+
version: match[2]
|
|
615
|
+
};
|
|
616
|
+
}
|
|
617
|
+
return { prefix: '', version: versionString };
|
|
618
|
+
}
|
|
619
|
+
function applyVersionPrefix(originalVersion, newVersion) {
|
|
620
|
+
const { prefix } = extractVersionPrefix(originalVersion);
|
|
621
|
+
return prefix + newVersion;
|
|
622
|
+
}
|
|
604
623
|
class UpdateVersionVisitor extends json_1.JsonVisitor {
|
|
605
624
|
constructor(packageName, newVersion, targetScope) {
|
|
606
625
|
super();
|
|
@@ -632,7 +651,9 @@ class UpdateVersionVisitor extends json_1.JsonVisitor {
|
|
|
632
651
|
if (!(0, json_1.isLiteral)(value)) {
|
|
633
652
|
return member;
|
|
634
653
|
}
|
|
635
|
-
const
|
|
654
|
+
const originalVersion = String(value.value);
|
|
655
|
+
const newVersionWithPrefix = applyVersionPrefix(originalVersion, this.newVersion);
|
|
656
|
+
const newLiteral = Object.assign(Object.assign({}, value), { source: `"${newVersionWithPrefix}"`, value: newVersionWithPrefix });
|
|
636
657
|
return Object.assign(Object.assign({}, member), { value: newLiteral });
|
|
637
658
|
}
|
|
638
659
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dependency-vulnerability-check.js","sourceRoot":"","sources":["../../src/security/dependency-vulnerability-check.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"dependency-vulnerability-check.js","sourceRoot":"","sources":["../../src/security/dependency-vulnerability-check.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@openrewrite/recipes-nodejs",
|
|
3
|
-
"version": "0.37.0-20251222-
|
|
3
|
+
"version": "0.37.0-20251222-231958",
|
|
4
4
|
"license": "Moderne Source Available License",
|
|
5
5
|
"description": "OpenRewrite recipes for Node.js library migrations.",
|
|
6
6
|
"homepage": "https://github.com/moderneinc/rewrite-node",
|
|
@@ -36,6 +36,16 @@ export class AvoidImplicitCoercionOfExitCode extends Recipe {
|
|
|
36
36
|
}
|
|
37
37
|
|
|
38
38
|
private needsCoercion(expr: Expression): boolean {
|
|
39
|
+
// For literals, check the valueSource to see if it's already a whole number
|
|
40
|
+
if (expr.kind === J.Kind.Literal) {
|
|
41
|
+
const literal = expr as J.Literal;
|
|
42
|
+
const valueSource = literal.valueSource;
|
|
43
|
+
// Integer literals (e.g., "1", "-3", "42") don't need coercion
|
|
44
|
+
if (valueSource && /^-?\d+$/.test(valueSource)) {
|
|
45
|
+
return false;
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
|
|
39
49
|
const exprType = expr.type;
|
|
40
50
|
if (!exprType || exprType.kind !== Type.Kind.Primitive) {
|
|
41
51
|
return true;
|
|
@@ -717,10 +717,16 @@ export class DependencyVulnerabilityCheck extends ScanningRecipe<Accumulator> {
|
|
|
717
717
|
// Handle JSON lock files (bun.lock, package-lock.json)
|
|
718
718
|
const updatedLockContent = getUpdatedLockFileContent(sourcePath, acc);
|
|
719
719
|
if (updatedLockContent) {
|
|
720
|
-
|
|
720
|
+
const updatedLockFile = await new JsonParser({}).parseOne({
|
|
721
721
|
text: updatedLockContent,
|
|
722
722
|
sourcePath: doc.sourcePath
|
|
723
723
|
}) as Json.Document;
|
|
724
|
+
// Ensure original ID is retained
|
|
725
|
+
return {
|
|
726
|
+
...doc,
|
|
727
|
+
value: updatedLockFile.value,
|
|
728
|
+
eof: updatedLockFile.eof
|
|
729
|
+
} as Json.Document;
|
|
724
730
|
}
|
|
725
731
|
|
|
726
732
|
return doc;
|
|
@@ -732,10 +738,16 @@ export class DependencyVulnerabilityCheck extends ScanningRecipe<Accumulator> {
|
|
|
732
738
|
// Handle YAML lock files (pnpm-lock.yaml, Yarn Berry yarn.lock)
|
|
733
739
|
const updatedLockContent = getUpdatedLockFileContent(sourcePath, acc);
|
|
734
740
|
if (updatedLockContent) {
|
|
735
|
-
|
|
741
|
+
const updatedLockFile = await new YamlParser({}).parseOne({
|
|
736
742
|
text: updatedLockContent,
|
|
737
743
|
sourcePath: docs.sourcePath
|
|
738
744
|
}) as Yaml.Documents;
|
|
745
|
+
// Ensure original ID is retained
|
|
746
|
+
return {
|
|
747
|
+
...docs,
|
|
748
|
+
documents: updatedLockFile.documents,
|
|
749
|
+
suffix: updatedLockFile.suffix
|
|
750
|
+
} as Yaml.Documents;
|
|
739
751
|
}
|
|
740
752
|
|
|
741
753
|
return docs;
|
|
@@ -751,8 +763,12 @@ export class DependencyVulnerabilityCheck extends ScanningRecipe<Accumulator> {
|
|
|
751
763
|
const parsed = await new PlainTextParser({}).parseOne({
|
|
752
764
|
text: updatedLockContent,
|
|
753
765
|
sourcePath: text.sourcePath
|
|
754
|
-
});
|
|
755
|
-
|
|
766
|
+
}) as PlainText;
|
|
767
|
+
// Ensure original ID is retained
|
|
768
|
+
return {
|
|
769
|
+
...text,
|
|
770
|
+
text: parsed.text
|
|
771
|
+
} as PlainText;
|
|
756
772
|
}
|
|
757
773
|
|
|
758
774
|
return text;
|
|
@@ -866,7 +882,8 @@ export class DependencyVulnerabilityCheck extends ScanningRecipe<Accumulator> {
|
|
|
866
882
|
for (const fix of fixes) {
|
|
867
883
|
if (!fix.isTransitive && fix.scope) {
|
|
868
884
|
if (packageJson[fix.scope] && packageJson[fix.scope][fix.packageName]) {
|
|
869
|
-
packageJson[fix.scope][fix.packageName]
|
|
885
|
+
const originalVersion = packageJson[fix.scope][fix.packageName];
|
|
886
|
+
packageJson[fix.scope][fix.packageName] = applyVersionPrefix(originalVersion, fix.newVersion);
|
|
870
887
|
}
|
|
871
888
|
}
|
|
872
889
|
}
|
|
@@ -875,6 +892,30 @@ export class DependencyVulnerabilityCheck extends ScanningRecipe<Accumulator> {
|
|
|
875
892
|
}
|
|
876
893
|
}
|
|
877
894
|
|
|
895
|
+
/**
|
|
896
|
+
* Extracts the version prefix (e.g., ^, ~, >=) from a version string.
|
|
897
|
+
* Returns the prefix and the bare version separately.
|
|
898
|
+
*/
|
|
899
|
+
export function extractVersionPrefix(versionString: string): { prefix: string; version: string } {
|
|
900
|
+
// Match common semver range prefixes: ^, ~, >=, <=, >, <, =
|
|
901
|
+
const match = versionString.match(/^([~^]|>=?|<=?|=)?(.*)$/);
|
|
902
|
+
if (match) {
|
|
903
|
+
return {
|
|
904
|
+
prefix: match[1] || '',
|
|
905
|
+
version: match[2]
|
|
906
|
+
};
|
|
907
|
+
}
|
|
908
|
+
return { prefix: '', version: versionString };
|
|
909
|
+
}
|
|
910
|
+
|
|
911
|
+
/**
|
|
912
|
+
* Applies the original version prefix to a new version.
|
|
913
|
+
*/
|
|
914
|
+
export function applyVersionPrefix(originalVersion: string, newVersion: string): string {
|
|
915
|
+
const { prefix } = extractVersionPrefix(originalVersion);
|
|
916
|
+
return prefix + newVersion;
|
|
917
|
+
}
|
|
918
|
+
|
|
878
919
|
/**
|
|
879
920
|
* Visitor that updates the version of a specific dependency in a specific scope.
|
|
880
921
|
*/
|
|
@@ -919,11 +960,15 @@ class UpdateVersionVisitor extends JsonVisitor<void> {
|
|
|
919
960
|
return member; // Not a literal value, can't update
|
|
920
961
|
}
|
|
921
962
|
|
|
963
|
+
// Preserve the original version prefix (^, ~, etc.)
|
|
964
|
+
const originalVersion = String(value.value);
|
|
965
|
+
const newVersionWithPrefix = applyVersionPrefix(originalVersion, this.newVersion);
|
|
966
|
+
|
|
922
967
|
// Create new literal with updated version
|
|
923
968
|
const newLiteral: Json.Literal = {
|
|
924
969
|
...value,
|
|
925
|
-
source: `"${
|
|
926
|
-
value:
|
|
970
|
+
source: `"${newVersionWithPrefix}"`,
|
|
971
|
+
value: newVersionWithPrefix
|
|
927
972
|
};
|
|
928
973
|
|
|
929
974
|
return {
|