Skip to content

Commit

Permalink
fix(refactor): refactor method signature
Browse files Browse the repository at this point in the history
  • Loading branch information
@invincibleJai
invincibleJai committed Jan 7, 2019
1 parent 1731687 commit bb437ab
Show file tree
Hide file tree
Showing 13 changed files with 388 additions and 991 deletions.
965 changes: 197 additions & 768 deletions package-lock.json
View file

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,8 @@
"compile": "tsc -watch -p ./",
"postinstall": "node ./node_modules/vscode/bin/install",
"test": "CODE_TESTS_WORKSPACE='./test/resources/sampleNodeApp/' node ./node_modules/vscode/bin/test",
"reinstall": "npm cache verify && npm install"
"reinstall": "npm cache verify && npm install",
"lint": "tslint -c tslint.json src/*.ts"
},
"devDependencies": {
"@types/glob": "^7.1.1",
Expand All @@ -186,7 +187,7 @@
"@types/sinon": "^5.0.2",
"decache": "^4.4.0",
"mocha": "^5.2.0",
"tslint": "^4.3.1",
"tslint": "^5.11.0",
"chai": "^4.1.2",
"sinon": "^6.3.4",
"sinon-chai": "^3.2.0",
Expand Down
29 changes: 10 additions & 19 deletions src/ProjectDataProvider.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,7 @@ import { StatusMessages } from './statusMessages';

export module ProjectDataProvider {

export let effectivef8PomWs: any;
export let effectivef8Pom: any;
export let effectivef8Package: any;
export let getDependencyVersion: any;
export let formPackagedependencyNpmList: any;
export let effectivef8Pypi: any;

let trimTrailingChars: any;

effectivef8PomWs = (workspaceFolder) => {
export const effectivef8PomWs = (workspaceFolder) => {
return new Promise(function(resolve, reject){
let vscodeRootpath = workspaceFolder.uri.fsPath;
if(process && process.platform && process.platform.toLowerCase() === 'win32'){
Expand All @@ -41,7 +32,7 @@ export module ProjectDataProvider {
});
};

effectivef8Pom = (item) => {
export const effectivef8Pom = (item) => {
return new Promise(function(resolve, reject){
let pomXmlFilePath: string = null;
let filepath: string = 'target/pom.xml';
Expand Down Expand Up @@ -73,7 +64,7 @@ export module ProjectDataProvider {
});
};

effectivef8Package = (workspaceFolder) => {
export const effectivef8Package = (workspaceFolder) => {
return new Promise(function(resolve, reject){
let vscodeRootpath = workspaceFolder.uri.fsPath;
if(process && process.platform && process.platform.toLowerCase() === 'win32'){
Expand Down Expand Up @@ -106,7 +97,7 @@ export module ProjectDataProvider {

function clearEmptyObject(myObj) {
for(let key in myObj){
if(!(myObj[key] instanceof Array) && typeof(myObj[key]) == 'object' && isEmptyObject(myObj[key])){
if(!(myObj[key] instanceof Array) && typeof(myObj[key]) === 'object' && isEmptyObject(myObj[key])){
delete myObj[key];
}
}
Expand All @@ -115,18 +106,18 @@ export module ProjectDataProvider {

function formatObj(myObj, keyArrays){
for(let key in myObj){
if(keyArrays.indexOf(key) === -1 && ( myObj[key] instanceof Array || typeof(myObj[key]) != 'object' || isEmptyObject(myObj[key]))){
if(keyArrays.indexOf(key) === -1 && ( myObj[key] instanceof Array || typeof(myObj[key]) !== 'object' || isEmptyObject(myObj[key]))){
delete myObj[key];
} else {
if(typeof(myObj[key]) == 'object') {
if(typeof(myObj[key]) === 'object') {
formatObj(myObj[key],keyArrays);
}
}
}
return myObj = clearEmptyObject(myObj);
}

formPackagedependencyNpmList = (vscodeRootpath) => {
export const formPackagedependencyNpmList = (vscodeRootpath) => {
return new Promise((resolve, reject) => {
fs.readFile(vscodeRootpath+'target/npmlist.json', {encoding: 'utf-8'}, function(err, data) {
if(data){
Expand All @@ -150,7 +141,7 @@ export module ProjectDataProvider {
};


getDependencyVersion = (manifestRootFolderPath) => {
export const getDependencyVersion = (manifestRootFolderPath) => {
return new Promise(function(resolve, reject){
let dir = manifestRootFolderPath+'target';
let prefixPath = trimTrailingChars(manifestRootFolderPath);
Expand Down Expand Up @@ -193,12 +184,12 @@ export module ProjectDataProvider {
};


trimTrailingChars = (s) => {
export const trimTrailingChars = (s) => {
let result = s.replace(/\\+$/, '');
return result;
};

effectivef8Pypi = (workspaceFolder) => {
export const effectivef8Pypi = (workspaceFolder) => {
return new Promise(function(resolve, reject){
let vscodeRootpath = workspaceFolder.uri.fsPath;
if(process && process.platform && process.platform.toLowerCase() === 'win32'){
Expand Down
4 changes: 1 addition & 3 deletions src/authextension.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@

import * as vscode from 'vscode';
import { Apiendpoint } from './apiendpoint';
import * as request from 'request';

export module authextension {

const request = require('request');
export let authorize_f8_analytics: any;
export let get_3scale_routes: any;
let setContextData: any;
Expand Down Expand Up @@ -58,5 +57,4 @@ export module authextension {

});
};

}
29 changes: 10 additions & 19 deletions src/multimanifestmodule.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,35 +12,26 @@ import { StatusMessages } from './statusMessages';

export module multimanifestmodule {

export let find_manifests_workspace: any;
export let form_manifests_payload: any;
export let triggerFullStackAnalyses: any;
export let triggerManifestWs: any;
export let manifestFileRead: any;
export let dependencyAnalyticsReportFlow: any;

find_manifests_workspace = (workspaceFolder, filesRegex) => {
export const find_manifests_workspace = (workspaceFolder, filesRegex) => {
return new Promise(function(resolve, reject) {
const relativePattern = new vscode.RelativePattern(workspaceFolder, `{${filesRegex},LICENSE}`);
vscode.workspace.findFiles(relativePattern,'**/node_modules')
.then((result: vscode.Uri[]) => {
if(result && result.length){
resolve(result);
} else {
vscode.window.showErrorMessage('No manifest file found to be analysed');
reject(null);
reject(`No manifest file found to be analysed`);
}
},
// rejected
(reason: any) => {
vscode.window.showErrorMessage(reason);
reject(null);
reject(reason);
});
});
};


form_manifests_payload = (resultList) : any => {
export const form_manifests_payload = (resultList) : any => {
return new Promise((resolve,reject)=>{
let fileReadPromises: Array<any> = [];
for(let i=0;i<resultList.length;i++){
Expand Down Expand Up @@ -82,7 +73,7 @@ export module multimanifestmodule {
};


manifestFileRead = (fileContent) => {
export const manifestFileRead = (fileContent) => {
let form_data = {
'manifest': '',
'filePath': '',
Expand All @@ -98,7 +89,7 @@ export module multimanifestmodule {
let projRootPath = projRoot.uri.fsPath;
return new Promise((resolve, reject) => {
let fsPath : string = fileContent.fsPath ? fileContent.fsPath : '';
fs.readFile(fsPath, function(err, data) {
fs.readFile(fsPath, function(err, data) {
if(data){
manifestObj = {
value: '',
Expand Down Expand Up @@ -156,7 +147,7 @@ export module multimanifestmodule {
* Needed async function in order to wait for user selection in case of
* multi root projects
*/
dependencyAnalyticsReportFlow = async (context, provider, previewUri) => {
export const dependencyAnalyticsReportFlow = async (context, provider, previewUri) => {
let editor = vscode.window.activeTextEditor;
if(editor && editor.document.fileName && editor.document.fileName.toLowerCase().indexOf('pom.xml')!== -1) {
let workspaceFolder = vscode.workspace.getWorkspaceFolder(editor.document.uri);
Expand Down Expand Up @@ -185,7 +176,7 @@ export module multimanifestmodule {
}
};

triggerFullStackAnalyses = (context, workspaceFolder, provider, previewUri) => {
export const triggerFullStackAnalyses = (context, workspaceFolder, provider, previewUri) => {
provider.signalInit(previewUri,null);
vscode.window.withProgress({ location: vscode.ProgressLocation.Window, title: StatusMessages.EXT_TITLE}, p => {
return new Promise((resolve, reject) => {
Expand Down Expand Up @@ -265,7 +256,7 @@ export module multimanifestmodule {
console.log(error);
vscode.window.showErrorMessage(error);
reject();
});;
});
}, 6000);
})
.catch((err) => {
Expand All @@ -289,7 +280,7 @@ export module multimanifestmodule {
});
};

triggerManifestWs = (context, provider, previewUri) => {
export const triggerManifestWs = (context, provider, previewUri) => {
return new Promise((resolve,reject) => {
authextension.authorize_f8_analytics(context, (data) => {
if(data){
Expand Down
3 changes: 1 addition & 2 deletions src/stackAnalysisService.ts
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
'use strict';

import * as vscode from 'vscode';
import * as request from 'request';

export module stackAnalysisServices {

const request = require('request');

export const clearContextInfo = (context) => {
context.globalState.update('f8_3scale_user_key', '');
context.globalState.update('f8_access_routes', '');
Expand Down
9 changes: 3 additions & 6 deletions src/stackanalysismodule.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,8 @@ import { stackAnalysisServices } from './stackAnalysisService';
import { StatusMessages } from './statusMessages';

export module stackanalysismodule {
export let get_stack_metadata: any;
export let post_stack_analysis: any;
export let processStackAnalyses: any;

get_stack_metadata = (editor, file_uri) => {
export const get_stack_metadata = (editor, file_uri) => {
return new Promise((resolve,reject) => {
let projRoot = vscode.workspace.getWorkspaceFolder(editor.document.uri);
if(projRoot && file_uri){
Expand Down Expand Up @@ -49,7 +46,7 @@ export module stackanalysismodule {
});
};

processStackAnalyses = (context, editor, provider, previewUri) => {
export const processStackAnalyses = (context, editor, provider, previewUri) => {
if(vscode && vscode.window && vscode.window.activeTextEditor) {
let fileUri: string = editor.document.fileName;
let workspaceFolder = vscode.workspace.getWorkspaceFolder(editor.document.uri);
Expand Down Expand Up @@ -111,7 +108,7 @@ export module stackanalysismodule {
console.log(error);
vscode.window.showErrorMessage(error);
reject(error);
});;
});
}, 6000);
})
.catch((err) => {
Expand Down
2 changes: 1 addition & 1 deletion test/extension.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ suite('Fabric8 Analytics Extension', () => {
assert.ok(true);
},(reason: any) => {
assert.equal(reason.name, 'Error');
assert.equal(reason.message, `Running the contributed command:'extension.fabric8AnalyticsWidgetFullStack' failed.`)
assert.equal(reason.message, `Running the contributed command:'extension.fabric8AnalyticsWidgetFullStack' failed.`);
});
});

Expand Down
Loading

0 comments on commit bb437ab

Please sign in to comment.