Commit code with double quotes instead of single quotes
This commit is contained in:
Dmitry Yankowski
@@ -1,6 +1,6 @@
|
||||
import * as cookie from 'cookie'
|
||||
import * as URL from 'url'
|
||||
import * as querystring from 'querystring'
|
||||
import * as cookie from "cookie"
|
||||
import * as URL from "url"
|
||||
import * as querystring from "querystring"
|
||||
|
||||
/**
|
||||
* given this: [ 'msg1=value1', 'msg2=value2' ]
|
||||
@@ -8,7 +8,7 @@ import * as querystring from 'querystring'
|
||||
* @param dataArguments
|
||||
*/
|
||||
const joinDataArguments = dataArguments => {
|
||||
let data = ''
|
||||
let data = ""
|
||||
dataArguments.forEach((argument, i) => {
|
||||
if (i === 0) {
|
||||
data += argument
|
||||
@@ -23,23 +23,23 @@ const parseCurlCommand = curlCommand => {
|
||||
let newlineFound = /\r|\n/.exec(curlCommand)
|
||||
if (newlineFound) {
|
||||
// remove newlines
|
||||
curlCommand = curlCommand.replace(/\r|\n/g, '')
|
||||
curlCommand = curlCommand.replace(/\r|\n/g, "")
|
||||
}
|
||||
// yargs parses -XPOST as separate arguments. just prescreen for it.
|
||||
curlCommand = curlCommand.replace(/ -XPOST/, ' -X POST')
|
||||
curlCommand = curlCommand.replace(/ -XGET/, ' -X GET')
|
||||
curlCommand = curlCommand.replace(/ -XPUT/, ' -X PUT')
|
||||
curlCommand = curlCommand.replace(/ -XPATCH/, ' -X PATCH')
|
||||
curlCommand = curlCommand.replace(/ -XDELETE/, ' -X DELETE')
|
||||
curlCommand = curlCommand.replace(/ -XPOST/, " -X POST")
|
||||
curlCommand = curlCommand.replace(/ -XGET/, " -X GET")
|
||||
curlCommand = curlCommand.replace(/ -XPUT/, " -X PUT")
|
||||
curlCommand = curlCommand.replace(/ -XPATCH/, " -X PATCH")
|
||||
curlCommand = curlCommand.replace(/ -XDELETE/, " -X DELETE")
|
||||
curlCommand = curlCommand.trim()
|
||||
let parsedArguments = require('yargs-parser')(curlCommand)
|
||||
let parsedArguments = require("yargs-parser")(curlCommand)
|
||||
let cookieString
|
||||
let cookies
|
||||
let url = parsedArguments._[1]
|
||||
if (!url) {
|
||||
for (let argName in parsedArguments) {
|
||||
if (typeof parsedArguments[argName] === 'string') {
|
||||
if (['http', 'www.'].includes(parsedArguments[argName])) {
|
||||
if (typeof parsedArguments[argName] === "string") {
|
||||
if (["http", "www."].includes(parsedArguments[argName])) {
|
||||
url = parsedArguments[argName]
|
||||
}
|
||||
}
|
||||
@@ -56,11 +56,11 @@ const parseCurlCommand = curlCommand => {
|
||||
parsedArguments[headerFieldName] = [parsedArguments[headerFieldName]]
|
||||
}
|
||||
parsedArguments[headerFieldName].forEach(header => {
|
||||
if (header.includes('Cookie')) {
|
||||
if (header.includes("Cookie")) {
|
||||
// stupid javascript tricks: closure
|
||||
cookieString = header
|
||||
} else {
|
||||
let colonIndex = header.indexOf(':')
|
||||
let colonIndex = header.indexOf(":")
|
||||
let headerName = header.substring(0, colonIndex)
|
||||
let headerValue = header.substring(colonIndex + 1).trim()
|
||||
headers[headerName] = headerValue
|
||||
@@ -69,18 +69,18 @@ const parseCurlCommand = curlCommand => {
|
||||
}
|
||||
}
|
||||
|
||||
parseHeaders('H')
|
||||
parseHeaders('header')
|
||||
parseHeaders("H")
|
||||
parseHeaders("header")
|
||||
if (parsedArguments.A) {
|
||||
if (!headers) {
|
||||
headers = []
|
||||
}
|
||||
headers['User-Agent'] = parsedArguments.A
|
||||
} else if (parsedArguments['user-agent']) {
|
||||
headers["User-Agent"] = parsedArguments.A
|
||||
} else if (parsedArguments["user-agent"]) {
|
||||
if (!headers) {
|
||||
headers = []
|
||||
}
|
||||
headers['User-Agent'] = parsedArguments['user-agent']
|
||||
headers["User-Agent"] = parsedArguments["user-agent"]
|
||||
}
|
||||
|
||||
if (parsedArguments.b) {
|
||||
@@ -97,7 +97,7 @@ const parseCurlCommand = curlCommand => {
|
||||
}
|
||||
parsedArguments.F.forEach(multipartArgument => {
|
||||
// input looks like key=value. value could be json or a file path prepended with an @
|
||||
const [key, value] = multipartArgument.split('=', 2)
|
||||
const [key, value] = multipartArgument.split("=", 2)
|
||||
multipartUploads[key] = value
|
||||
})
|
||||
}
|
||||
@@ -107,33 +107,33 @@ const parseCurlCommand = curlCommand => {
|
||||
}
|
||||
// separate out cookie headers into separate data structure
|
||||
// note: cookie is case insensitive
|
||||
cookies = cookie.parse(cookieString.replace(/^Cookie: /gi, ''), cookieParseOptions)
|
||||
cookies = cookie.parse(cookieString.replace(/^Cookie: /gi, ""), cookieParseOptions)
|
||||
}
|
||||
let method
|
||||
if (parsedArguments.X === 'POST') {
|
||||
method = 'post'
|
||||
} else if (parsedArguments.X === 'PUT' || parsedArguments['T']) {
|
||||
method = 'put'
|
||||
} else if (parsedArguments.X === 'PATCH') {
|
||||
method = 'patch'
|
||||
} else if (parsedArguments.X === 'DELETE') {
|
||||
method = 'delete'
|
||||
} else if (parsedArguments.X === 'OPTIONS') {
|
||||
method = 'options'
|
||||
if (parsedArguments.X === "POST") {
|
||||
method = "post"
|
||||
} else if (parsedArguments.X === "PUT" || parsedArguments["T"]) {
|
||||
method = "put"
|
||||
} else if (parsedArguments.X === "PATCH") {
|
||||
method = "patch"
|
||||
} else if (parsedArguments.X === "DELETE") {
|
||||
method = "delete"
|
||||
} else if (parsedArguments.X === "OPTIONS") {
|
||||
method = "options"
|
||||
} else if (
|
||||
(parsedArguments['d'] ||
|
||||
parsedArguments['data'] ||
|
||||
parsedArguments['data-ascii'] ||
|
||||
parsedArguments['data-binary'] ||
|
||||
parsedArguments['F'] ||
|
||||
parsedArguments['form']) &&
|
||||
!(parsedArguments['G'] || parsedArguments['get'])
|
||||
(parsedArguments["d"] ||
|
||||
parsedArguments["data"] ||
|
||||
parsedArguments["data-ascii"] ||
|
||||
parsedArguments["data-binary"] ||
|
||||
parsedArguments["F"] ||
|
||||
parsedArguments["form"]) &&
|
||||
!(parsedArguments["G"] || parsedArguments["get"])
|
||||
) {
|
||||
method = 'post'
|
||||
} else if (parsedArguments['I'] || parsedArguments['head']) {
|
||||
method = 'head'
|
||||
method = "post"
|
||||
} else if (parsedArguments["I"] || parsedArguments["head"]) {
|
||||
method = "head"
|
||||
} else {
|
||||
method = 'get'
|
||||
method = "get"
|
||||
}
|
||||
|
||||
let compressed = !!parsedArguments.compressed
|
||||
@@ -141,20 +141,20 @@ const parseCurlCommand = curlCommand => {
|
||||
|
||||
// if GET request with data, convert data to query string
|
||||
// NB: the -G flag does not change the http verb. It just moves the data into the url.
|
||||
if (parsedArguments['G'] || parsedArguments['get']) {
|
||||
urlObject.query = urlObject.query ? urlObject.query : ''
|
||||
let option = 'd' in parsedArguments ? 'd' : 'data' in parsedArguments ? 'data' : null
|
||||
if (parsedArguments["G"] || parsedArguments["get"]) {
|
||||
urlObject.query = urlObject.query ? urlObject.query : ""
|
||||
let option = "d" in parsedArguments ? "d" : "data" in parsedArguments ? "data" : null
|
||||
if (option) {
|
||||
let urlQueryString = ''
|
||||
let urlQueryString = ""
|
||||
|
||||
if (!url.includes('?')) {
|
||||
url += '?'
|
||||
if (!url.includes("?")) {
|
||||
url += "?"
|
||||
} else {
|
||||
urlQueryString += '&'
|
||||
urlQueryString += "&"
|
||||
}
|
||||
|
||||
if (typeof parsedArguments[option] === 'object') {
|
||||
urlQueryString += parsedArguments[option].join('&')
|
||||
if (typeof parsedArguments[option] === "object") {
|
||||
urlQueryString += parsedArguments[option].join("&")
|
||||
} else {
|
||||
urlQueryString += parsedArguments[option]
|
||||
}
|
||||
@@ -173,7 +173,7 @@ const parseCurlCommand = curlCommand => {
|
||||
urlWithoutQuery: URL.format(urlObject),
|
||||
}
|
||||
if (compressed) {
|
||||
request['compressed'] = true
|
||||
request["compressed"] = true
|
||||
}
|
||||
|
||||
if (Object.keys(query).length > 0) {
|
||||
@@ -182,38 +182,38 @@ const parseCurlCommand = curlCommand => {
|
||||
if (headers) {
|
||||
request.headers = headers
|
||||
}
|
||||
request['method'] = method
|
||||
request["method"] = method
|
||||
|
||||
if (cookies) {
|
||||
request.cookies = cookies
|
||||
request.cookieString = cookieString.replace('Cookie: ', '')
|
||||
request.cookieString = cookieString.replace("Cookie: ", "")
|
||||
}
|
||||
if (multipartUploads) {
|
||||
request.multipartUploads = multipartUploads
|
||||
}
|
||||
if (parsedArguments.data) {
|
||||
request.data = parsedArguments.data
|
||||
} else if (parsedArguments['data-binary']) {
|
||||
request.data = parsedArguments['data-binary']
|
||||
} else if (parsedArguments["data-binary"]) {
|
||||
request.data = parsedArguments["data-binary"]
|
||||
request.isDataBinary = true
|
||||
} else if (parsedArguments['d']) {
|
||||
request.data = parsedArguments['d']
|
||||
} else if (parsedArguments['data-ascii']) {
|
||||
request.data = parsedArguments['data-ascii']
|
||||
} else if (parsedArguments["d"]) {
|
||||
request.data = parsedArguments["d"]
|
||||
} else if (parsedArguments["data-ascii"]) {
|
||||
request.data = parsedArguments["data-ascii"]
|
||||
}
|
||||
|
||||
if (parsedArguments['u']) {
|
||||
request.auth = parsedArguments['u']
|
||||
if (parsedArguments["u"]) {
|
||||
request.auth = parsedArguments["u"]
|
||||
}
|
||||
if (parsedArguments['user']) {
|
||||
request.auth = parsedArguments['user']
|
||||
if (parsedArguments["user"]) {
|
||||
request.auth = parsedArguments["user"]
|
||||
}
|
||||
if (Array.isArray(request.data)) {
|
||||
request.dataArray = request.data
|
||||
request.data = joinDataArguments(request.data)
|
||||
}
|
||||
|
||||
if (parsedArguments['k'] || parsedArguments['insecure']) {
|
||||
if (parsedArguments["k"] || parsedArguments["insecure"]) {
|
||||
request.insecure = true
|
||||
}
|
||||
return request
|
||||
|
||||
Reference in New Issue
Block a user