Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor/module info #526

Merged
merged 1 commit into from
May 21, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/cli/commands/monitor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import * as spinner from '../../lib/spinner';

import * as detect from '../../lib/detect';
import * as plugins from '../../lib/plugins';
import ModuleInfo = require('../../lib/module-info'); // TODO(kyegupov): fix import
import {ModuleInfo} from '../../lib/module-info'; // TODO(kyegupov): fix import
import * as docker from '../../lib/docker-promotion';
import {SingleDepRootResult, MultiDepRootsResult, isMultiResult, MonitorError } from '../../lib/types';

Expand Down
2 changes: 1 addition & 1 deletion src/cli/commands/protect/wizard.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const npm = require('../../../lib/npm');
const cwd = process.cwd();
const detect = require('../../../lib/detect');
const plugins = require('../../../lib/plugins');
const moduleInfo = require('../../../lib/module-info');
const moduleInfo = require('../../../lib/module-info').ModuleInfo;
const {MissingTargetFileError} = require('../../../lib/errors/missing-targetfile-error');

const unsupportedPackageManagers = {
Expand Down
12 changes: 6 additions & 6 deletions src/lib/module-info/index.js → src/lib/module-info/index.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
var _ = require('lodash');
const debug = require('debug')('snyk');
import * as _ from 'lodash';
import * as Debug from 'debug';

module.exports = ModuleInfo;
const debug = Debug('snyk-module-info');

function ModuleInfo(plugin, policy) {
export function ModuleInfo(plugin, policy) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use src/lib/plugins/types.ts : Plugin type here?...

return {
inspect: async function (root, targetFile, options) {
var pluginOptions = _.merge({
async inspect(root, targetFile, options) {
const pluginOptions = _.merge({
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just {args: options._doubleDashArgs, ...options} ?

args: options._doubleDashArgs,
}, options);

Expand Down
2 changes: 1 addition & 1 deletion src/lib/snyk-test/run-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import analytics = require('../analytics');
import config = require('../config');
import detect = require('../../lib/detect');
import plugins = require('../plugins');
import ModuleInfo = require('../module-info');
import {ModuleInfo} from '../module-info';
import {isCI} from '../is-ci';
import request = require('../request');
import snyk = require('../');
Expand Down