feat: fix tests

Signed-off-by: Ruben Romero Montes <[email protected]>

Author: ruromero

.eslintrc.json

@@ -1,28 +1,28 @@
 {
-    "root": true,
-	"extends": [
-		"eslint:recommended",
-		"plugin:editorconfig/all"
-	],
-	"parserOptions": {
-		"ecmaVersion": 2022,
-		"sourceType": "module"
-	},
-	"env": {
-		"node": true,
-		"mocha": true,
-		"es6": true
-	},
-	"plugins": [
-		"editorconfig"
-    ],
-    "rules": {
-        "curly": "warn",
-        "eqeqeq": "warn",
-        "no-throw-literal": "warn",
-		"sort-imports":"warn"
-    },
-	"ignorePatterns": [
-		"integration"
-	]
-}
+  "root": true,
+  "extends": [
+    "eslint:recommended",
+    "plugin:editorconfig/all"
+  ],
+  "parserOptions": {
+    "ecmaVersion": 2022,
+    "sourceType": "module"
+  },
+  "env": {
+    "node": true,
+    "mocha": true,
+    "es6": true
+  },
+  "plugins": [
+    "editorconfig"
+  ],
+  "rules": {
+    "curly": "warn",
+    "eqeqeq": "warn",
+    "no-throw-literal": "warn",
+    "sort-imports": "warn"
+  },
+  "ignorePatterns": [
+    "integration"
+  ]
+}

package-lock.json

@@ -53,9 +53,9 @@
 		"fast-toml": "^0.5.4",
 		"fast-xml-parser": "^4.2.4",
 		"help": "^3.0.2",
+		"node-fetch": "^2.6.7",
 		"packageurl-js": "^1.0.2",
-		"yargs": "^17.7.2",
-		"node-fetch": "^2.6.7"
+		"yargs": "^17.7.2"
 	},
 	"devDependencies": {
 		"@babel/core": "^7.23.2",
@@ -104,6 +104,5 @@
 	},
 	"eslintIgnore": [
 		"index.js"
-	],
-	"packageManager": "[email protected]+sha512.0e82714d1b5b43c74610193cb20734897c1d00de89d0e18420aebc5977fa13d780a9cb05734624e81ebd81cc876cd464794850641c48b9544326b5622ca29971"
+	]
 }

package.json

@@ -1,8 +1,9 @@
+import path from 'node:path'
+
 import golangGomodulesProvider from './providers/golang_gomodules.js'
 import Java_gradle_groovy from "./providers/java_gradle_groovy.js";
 import Java_gradle_kotlin from "./providers/java_gradle_kotlin.js";
 import Java_maven from "./providers/java_maven.js";
-import path from 'node:path'
 import pythonPipProvider from './providers/python_pip.js'
 import Javascript_npm from './providers/javascript_npm.js';
 import Javascript_pnpm from './providers/javascript_pnpm.js';
@@ -29,7 +30,7 @@ export const availableProviders = [new Java_maven(), new Java_gradle_groovy(), n
 export function match(manifest, providers) {
 	const manifestPath = path.parse(manifest)
 	const supported = providers.filter(prov => prov.isSupported(manifestPath.base))
-	if (supported.length == 0) {
+	if (supported.length === 0) {
 		throw new Error(`${manifestPath.base} is not supported`)
 	}
 	const provider = supported.find(prov => prov.validateLockFile(manifestPath.dir))

src/provider.js

@@ -1,4 +1,5 @@
 import { PackageURL } from 'packageurl-js'
+
 import { invokeCommand } from "../tools.js"
 
 
@@ -44,7 +45,7 @@ export default class Base_Java {
 				let matchedScope = target.match(/:compile|:provided|:runtime|:test|:system|:import/g)
 				let matchedScopeSrc = src.match(/:compile|:provided|:runtime|:test|:system|:import/g)
 				// only add dependency to sbom if it's not with test scope or if it's root
-				if ((matchedScope && matchedScope[0] !== ":test" && (matchedScopeSrc && matchedScopeSrc[0] !== ":test")) || (srcDepth == 0 && matchedScope && matchedScope[0] !== ":test")) {
+				if ((matchedScope && matchedScope[0] !== ":test" && (matchedScopeSrc && matchedScopeSrc[0] !== ":test")) || (srcDepth === 0 && matchedScope && matchedScope[0] !== ":test")) {
 					sbom.addDependency(sbom.purlToComponent(from), to)
 				}
 			} else {

src/providers/base_java.js

@@ -1,10 +1,11 @@
 import fs from 'node:fs'
 import os from "node:os";
-import { handleSpacesInPath, invokeCommand } from "../tools.js";
 import path from 'node:path'
-import Sbom from '../sbom.js'
 import { PackageURL } from 'packageurl-js'
 
+import { invokeCommand } from "../tools.js";
+import Sbom from '../sbom.js'
+
 /** @typedef {import('../provider.js').Provider} */
 
 /** @typedef {import('../provider.js').Provided} Provided */
@@ -171,7 +172,7 @@ export default class Base_javascript {
 	#executeListCmd(includeTransitive, manifestDir) {
 		const listArgs = this._listCmdArgs(includeTransitive, manifestDir);
 		try {
-			invokeCommand(this._cmdName(), listArgs)
+			return invokeCommand(this._cmdName(), listArgs)
 		} catch (error) {
 			throw new Error(`failed to list dependencies via "${this._cmdName()} ${listArgs.join(' ')}" - Error: ${error}`, {cause: error});
 		}
@@ -195,9 +196,8 @@ export default class Base_javascript {
 		if (os.platform() === 'win32') {
 			process.chdir(manifestDir)
 		}
-
+		const args = this._updateLockFileCmdArgs(manifestDir);
 		try {
-			const args = this._updateLockFileCmdArgs(manifestDir);
 			invokeCommand(this._cmdName(), args)
 		} catch (error) {
 			throw new Error(`failed to create lockfile "${args}" - Error: ${error}`, {cause: error});

src/providers/base_javascript.js

@@ -11,17 +11,17 @@ export default class Javascript_pnpm extends Base_javascript {
 	}
 
 	_listCmdArgs(includeTransitive, manifestDir) {
-		const args = ['ls', includeTransitive ? '--all' : '--depth=0', '--prod', '--json'];
+		const args = ['ls', includeTransitive ? '--depth=Infinity' : '--depth=0', '--prod', '--json'];
 		if (manifestDir) {
-			args.push('--prefix', manifestDir);
+			args.push('--dir', manifestDir);
 		}
 		return args;
 	}
 
 	_updateLockFileCmdArgs(manifestDir) {
 		const args = ['install', '--frozen-lockfile'];
 		if (manifestDir) {
-			args.push('--prefix', manifestDir)
+			args.push('--dir', manifestDir)
 		}
 		args.push(...[])
 		return args;

src/providers/javascript_pnpm.js

@@ -9,15 +9,15 @@ let clock
 
 async function mockProvider(providerName, listingOutput) {
 
-	const mockExecSync = (cmd) => {
-		if (cmd.includes('--version')) { return ''; }
+	const mockInvokeCommand = (_cmd, args) => {
+		if (args.includes('--version')) {return '';}
 		return listingOutput;
-	}
+	};
 
-	return esmock(`../../src/providers/Javascript_${providerName}.js`, {
-		'../../src/providers/Base_javascript.js': await esmock('../../src/providers/base_javascript.js', {
-			'node:child_process': {
-				execSync: mockExecSync
+	return esmock(`../../src/providers/javascript_${providerName}.js`, {
+		'../../src/providers/base_javascript.js': await esmock('../../src/providers/base_javascript.js', {
+			'../../src/tools.js': {
+				invokeCommand: mockInvokeCommand
 			}
 		})
 	});