|
1 | 1 | import * as vscode from 'vscode';
|
| 2 | +import * as fs from 'fs'; |
2 | 3 | import { Parser } from '../../parser/parser';
|
3 | 4 | import { PackageManager } from '../../interfaces/package_manager';
|
4 | 5 | import { LanguagePackageManager } from '../language_package_manager';
|
5 | 6 | import { pathJoin } from '../../util/globals';
|
6 | 7 |
|
7 | 8 | type JavascriptPackageManager = 'npm' | 'yarn' | 'pnpm' | 'bun';
|
8 |
| -type JavascriptDependenciesLockFile = 'package-lock.json' | 'yarn.lock' | 'pnpm-lock.yaml' | 'bun.lock'; |
| 9 | +type JavascriptDependenciesLockFile = 'package-lock.json' | 'npm-shrinkwrap.json' | 'yarn.lock' | 'pnpm-lock.yaml' | 'bun.lock'; |
9 | 10 |
|
10 | 11 | export class Javascript extends LanguagePackageManager implements PackageManager {
|
11 | 12 | packageManager: JavascriptPackageManager = 'npm';
|
12 | 13 | lockVersion: number | null = null;
|
13 |
| - locks: {[key in JavascriptPackageManager]: JavascriptDependenciesLockFile} = { |
14 |
| - 'npm': 'package-lock.json', |
| 14 | + locks: {[key in JavascriptPackageManager]: JavascriptDependenciesLockFile|JavascriptDependenciesLockFile[]} = { |
| 15 | + 'npm': [ |
| 16 | + 'package-lock.json', |
| 17 | + 'npm-shrinkwrap.json', |
| 18 | + ], |
15 | 19 | 'yarn': 'yarn.lock',
|
16 | 20 | 'pnpm': 'pnpm-lock.yaml',
|
17 | 21 | 'bun': 'bun.lock',
|
@@ -43,18 +47,35 @@ export class Javascript extends LanguagePackageManager implements PackageManager
|
43 | 47 | }
|
44 | 48 |
|
45 | 49 | override getLockPath(): string {
|
46 |
| - return pathJoin(this.rootPath, this.locks[this.packageManager]); |
| 50 | + let lockFiles: JavascriptDependenciesLockFile|JavascriptDependenciesLockFile[] = this.locks[this.packageManager]; |
| 51 | + |
| 52 | + if (typeof lockFiles === 'string') { |
| 53 | + lockFiles = [lockFiles as JavascriptDependenciesLockFile]; |
| 54 | + } |
| 55 | + |
| 56 | + for (const lockFile of lockFiles as JavascriptDependenciesLockFile[]) { |
| 57 | + const lockPath: string = pathJoin(this.rootPath, lockFile); |
| 58 | + |
| 59 | + if (fs.existsSync(lockPath)) { |
| 60 | + return lockPath; |
| 61 | + } |
| 62 | + }; |
| 63 | + |
| 64 | + return ''; |
47 | 65 | }
|
48 | 66 |
|
49 | 67 | async getPackageManager(): Promise<JavascriptPackageManager> {
|
50 |
| - for (const lock in this.locks) { |
51 |
| - let lockFile = vscode.Uri.file(pathJoin(this.rootPath, this.locks[lock as JavascriptPackageManager])); |
52 |
| - |
53 |
| - try{ |
54 |
| - await vscode.workspace.fs.readFile(lockFile); |
| 68 | + for (let [packageManager, lockFiles] of Object.entries(this.locks)) { |
| 69 | + if (typeof lockFiles === 'string') { |
| 70 | + lockFiles = [lockFiles]; |
| 71 | + } |
55 | 72 |
|
56 |
| - return lock as JavascriptPackageManager; |
57 |
| - } catch (error) {} |
| 73 | + for (const lockFile of lockFiles) { |
| 74 | + const lockPath: string = pathJoin(this.rootPath, lockFile); |
| 75 | + if (fs.existsSync(lockPath)) { |
| 76 | + return packageManager as JavascriptPackageManager; |
| 77 | + } |
| 78 | + }; |
58 | 79 | }
|
59 | 80 |
|
60 | 81 | return (Object.keys(this.locks) as JavascriptPackageManager[])[0];
|
|
0 commit comments