Skip to content

Commit 79f30d2

Browse files
authored
Merge pull request #23 from faissaloux/append-version-from-lock-class
Append version from lock class
2 parents b454587 + beaf564 commit 79f30d2

File tree

2 files changed

+11
-14
lines changed

2 files changed

+11
-14
lines changed

src/package_manager/package_managers/javascript.ts

-14
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@ export class Javascript extends LanguagePackageManager implements PackageManager
2828
return null;
2929
}
3030

31-
if (this.packageManager === 'pnpm') {
32-
this.appendVersion(installedPackages);
33-
}
34-
3531
return Object.entries(installedPackages).find(([title, details]) => title.startsWith(this.lockPackageStartsWith(packageName)))?.[1];
3632
}
3733

@@ -56,14 +52,4 @@ export class Javascript extends LanguagePackageManager implements PackageManager
5652
lockPackageStartsWith(packageName: string): string {
5753
return this.startsWith[this.packageManager].replace('packageName', packageName);
5854
}
59-
60-
appendVersion(packages: {[key: string]: any}) {
61-
for ( const pkg in packages) {
62-
let version = pkg.match(/\d+(\.\d+)+/);
63-
64-
if (version) {
65-
packages[pkg]['version'] = version[0];
66-
}
67-
}
68-
}
6955
}

src/parser/pnpmLock.ts

+11
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,22 @@ export class PnpmLock implements LockParser {
77
constructor(content: string) {
88
// @ts-ignore
99
this.content = jsYaml.load(content);
10+
this.appendVersions();
1011

1112
return this;
1213
}
1314

1415
dependencies(): {[key: string]: any} {
1516
return this.content.packages;
1617
}
18+
19+
appendVersions(): void {
20+
Object.keys(this.content.packages).map(pkg => {
21+
let version = pkg.match(/\d+(\.\d+)+/);
22+
23+
if (version) {
24+
this.content.packages[pkg]['version'] = version[0];
25+
}
26+
});
27+
}
1728
}

0 commit comments

Comments
 (0)