diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e040867e7e..44410944b1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -145,15 +145,19 @@ importers: src/api/dependency-discovery: specifiers: + '@senecacdot/eslint-config-telescope': workspace:1.0.0 '@senecacdot/satellite': ^1.26.0 env-cmd: 10.1.0 + eslint: 7.32.0 nodemon: 2.0.15 query-registry: 2.2.0 dependencies: '@senecacdot/satellite': link:../../satellite query-registry: 2.2.0 devDependencies: + '@senecacdot/eslint-config-telescope': link:../../../tools/eslint env-cmd: 10.1.0 + eslint: 7.32.0 nodemon: 2.0.15 src/api/feed-discovery: diff --git a/src/api/dependency-discovery/.eslintrc.js b/src/api/dependency-discovery/.eslintrc.js new file mode 100644 index 0000000000..564da880f3 --- /dev/null +++ b/src/api/dependency-discovery/.eslintrc.js @@ -0,0 +1,15 @@ +module.exports = { + extends: '@senecacdot/eslint-config-telescope', + + overrides: [ + { + files: ['./**/*.js'], + env: { + jest: true, + commonjs: true, + es2021: true, + node: true, + }, + }, + ], +}; diff --git a/src/api/dependency-discovery/package.json b/src/api/dependency-discovery/package.json index 45f77a3dd8..10ff2e493e 100644 --- a/src/api/dependency-discovery/package.json +++ b/src/api/dependency-discovery/package.json @@ -5,7 +5,10 @@ "description": "A dependency graph compilation service for Telescope", "scripts": { "start": "node src/server.js", - "dev": "env-cmd -f env.local nodemon src/server.js" + "dev": "env-cmd -f env.local nodemon src/server.js", + "lint": "pnpm eslint", + "eslint": "eslint --config .eslintrc.js \"**/*.js\"", + "eslint-fix": "eslint --config .eslintrc.js \"**/*.js\" --fix" }, "repository": { "type": "git", @@ -22,7 +25,9 @@ "query-registry": "2.2.0" }, "devDependencies": { + "@senecacdot/eslint-config-telescope": "workspace:1.0.0", "env-cmd": "10.1.0", + "eslint": "7.32.0", "nodemon": "2.0.15" } } diff --git a/src/api/dependency-discovery/src/dependency-list.js b/src/api/dependency-discovery/src/dependency-list.js index 69533de551..e3f8485ea9 100644 --- a/src/api/dependency-discovery/src/dependency-list.js +++ b/src/api/dependency-discovery/src/dependency-list.js @@ -31,6 +31,11 @@ async function getDependencyList() { return Object.keys(dependencies); } +async function isPackageDependency(packageName) { + const dependencies = await getDependencies(); + return Object.prototype.hasOwnProperty.call(dependencies, packageName); +} + async function getNpmPackageInfo(packageName) { if (!(await isPackageDependency(packageName))) { return null; @@ -46,11 +51,6 @@ async function getNpmPackageInfo(packageName) { return dependencies[packageName]; } -async function isPackageDependency(packageName) { - const dependencies = await getDependencies(); - return Object.prototype.hasOwnProperty.call(dependencies, packageName); -} - module.exports = { getDependencyList, getNpmPackageInfo, diff --git a/src/api/dependency-discovery/test/dependency.test.js b/src/api/dependency-discovery/test/dependency.test.js index 2ef710fe69..ed740fd81a 100644 --- a/src/api/dependency-discovery/test/dependency.test.js +++ b/src/api/dependency-discovery/test/dependency.test.js @@ -14,10 +14,11 @@ const depsList = [ ]; jest.mock('../src/dependency-list'); +const { __setMockDepList } = require('../src/dependency-list'); describe('GET /projects', () => { beforeEach(() => { - require('../src/dependency-list').__setMockDepList(depsList); + __setMockDepList(depsList); }); test('Should return 200 and an array of dependencies', async () => {