FUSETOOLS2-1010 - migrate to url-parse (#432)

Signed-off-by: Brian Fitzpatrick <[email protected]>

Author: bfitzpat

package-lock.json

@@ -229,6 +229,7 @@
 		"markdown-it-task-lists": "^2.1.1",
 		"node-fetch": "^2.6.1",
 		"node-html-parser": "^2.1.0",
-		"tmp": "^0.2.1"
+		"tmp": "^0.2.1",
+		"url-parse": "^1.5.1"
 	}
 }

package.json

@@ -19,15 +19,15 @@ import * as vscode from 'vscode';
 import * as path from 'path';
 import {getValue} from './utils';
 import * as extensionFunctions from './extensionFunctions';
-import * as url from 'url';
 import {isDefaultNotificationDisabled} from './utils';
+const url = require('url-parse');
 
 // take the incoming didact link and allow a mix of a uri and text/user inputs
 export async function processInputs(incoming : string, extensionPath? : string) : Promise<void | undefined>  {
 	const output : any[] = [];
 	if (incoming) {
 		extensionFunctions.sendTextToOutputChannel(`Processing command inputs ${incoming} ${extensionPath}`);
-		const parsedUrl = url.parse(incoming, true);
+		const parsedUrl = new url(incoming, true);
 		const query = parsedUrl.query;
 
 		let commandId: string | undefined = undefined;

src/commandHandler.ts

@@ -17,9 +17,9 @@
 
 'use strict';
 
-import * as url from 'url';
 import {getValue} from './utils';
 import * as vscode from 'vscode';
+const url = require('url-parse');
 
 export class DidactUri {
 	private commandId: string | undefined;
@@ -76,7 +76,7 @@ export class DidactUri {
 	}
 
 	private parseDidactUrl(incoming: string) : void {
-		const parsedUrl = url.parse(incoming, true);
+		const parsedUrl = new url(incoming, true);
 		const query = parsedUrl.query;
 
 		if (query.commandId) {

src/didactUri.ts

@@ -26,15 +26,14 @@ import {parseADtoHTML} from './asciidocUtils';
 import * as scaffoldUtils from './scaffoldUtils';
 import { TreeNode } from './nodeProvider';
 import { handleExtFilePath, handleProjectFilePath } from './commandHandler';
-import * as url from 'url';
 import * as download from 'download';
 import { didactManager } from './didactManager';
 import { parse } from 'node-html-parser';
 import { DIDACT_DEFAULT_URL } from './utils';
 
 const tmp = require('tmp');
 const fetch = require('node-fetch');
-
+const url = require('url-parse');
 const EDITOR_OPENED_TIMEOUT = 3000;
 
 // command IDs
@@ -653,7 +652,7 @@ export async function validateDidactCommands(commands : any[], sendToConsole = f
 		const vsCommands : string[] = await vscode.commands.getCommands(true);
 		for(const command of commands) {
 			// validate all commands we found
-			const parsedUrl = url.parse(command, true);
+			const parsedUrl = new url(command, true);
 			const query = parsedUrl.query;
 			if (query.commandId) {
 				const commandId = utils.getValue(query.commandId);
@@ -720,7 +719,7 @@ export async function placeTextOnClipboard(clipText: string): Promise<void>{
 export async function downloadAndUnzipFile(httpFileUrl : string, installFolder : string, dlFilename? : string, extractFlag = false, ignoreOverwrite = false): Promise<any> {
 	let filename = '';
 	if (!dlFilename) {
-		const fileUrl = url.parse(httpFileUrl);
+		const fileUrl = new url(httpFileUrl);
 		const pathname = fileUrl.pathname;
 		if (pathname) {
 			filename = pathname.substring(pathname.lastIndexOf('/')+1);

src/extensionFunctions.ts

@@ -21,10 +21,11 @@ import * as vscode from 'vscode';
 import * as extensionFunctions from '../../extensionFunctions';
 import { didactManager } from '../../didactManager';
 import { expect } from 'chai';
-import * as url from 'url';
 import * as utils from '../../utils';
 import { waitUntil } from 'async-wait-until';
 
+const url = require('url-parse');
+
 const extensionId = 'redhat.vscode-didact';
 export const ACTIVATION_TIMEOUT = 45000;
 
@@ -71,7 +72,7 @@ export async function getFailedCommands(commands : any[]) : Promise<String[]> {
 	if (commands && commands.length > 0) {
 		const vsCommands : string[] = await vscode.commands.getCommands(true);
 		for(const command of commands) {
-			const parsedUrl = url.parse(command, true);
+			const parsedUrl = new url(command, true);
 			const query = parsedUrl.query;
 			if (query.commandId) {
 				const commandId = utils.getValue(query.commandId);

src/test/suite/Utils.ts

@@ -22,14 +22,15 @@ import * as fs from 'fs';
 import * as vscode from 'vscode';
 import * as path from 'path';
 import * as extensionFunctions from '../../extensionFunctions';
-import * as url from 'url';
 import {getValue} from '../../utils';
 import * as commandHandler from '../../commandHandler';
 import { removeFilesAndFolders } from '../../utils';
 
 import { waitUntil } from 'async-wait-until';
 import { didactManager } from '../../didactManager';
 
+const url = require('url-parse');
+
 const EDITOR_OPENED_TIMEOUT = 5000;
 
 const testMD = vscode.Uri.parse('vscode://redhat.vscode-didact?extension=demos/markdown/didact-demo.didact.md');
@@ -132,7 +133,7 @@ suite('Didact test suite', () => {
 
 	test('Test the extension checking', async () => {
 		const href = testExt;
-		const parsedUrl = url.parse(href, true);
+		const parsedUrl = new url(href, true);
 		const query = parsedUrl.query;
 		assert.notStrictEqual(query.commandId, undefined);
 		if (query.commandId) {
@@ -153,7 +154,7 @@ suite('Didact test suite', () => {
 
 	test('test the command line requirements checking', async () => {
 		const href = testReqCli;
-		const parsedUrl = url.parse(href, true);
+		const parsedUrl = new url(href, true);
 		const query = parsedUrl.query;
 		assert.notStrictEqual(query.commandId, undefined);
 		if (query.commandId) {
@@ -181,7 +182,7 @@ suite('Didact test suite', () => {
 		} else if (osName.startsWith(OS_MACOS)) {
 			href = testReqMac;
 		}
-		const parsedUrl = url.parse(href, true);
+		const parsedUrl = new url(href, true);
 		const query = parsedUrl.query;
 		assert.notStrictEqual(query.commandId, undefined);
 		if (query.commandId) {
@@ -202,7 +203,7 @@ suite('Didact test suite', () => {
 
 	test('test the workspace checking', async () => {
 		const href = testWS.toString();
-		const parsedUrl = url.parse(href, true);
+		const parsedUrl = new url(href, true);
 		const query = parsedUrl.query;
 		assert.notStrictEqual(query.commandId, undefined);
 		if (query.commandId) {