mirror of
https://github.com/n8n-io/n8n.git
synced 2025-02-21 02:56:40 -08:00
1726 lines
187 KiB
Diff
1726 lines
187 KiB
Diff
diff --git a/dist/src/Request.d.ts b/dist/src/Request.d.ts
|
|
index 93eeb16a41a96fd3832cdd954e10c38793ab8526..a59d587e58694a3db42bc84b0d372d264059c703 100644
|
|
--- a/dist/src/Request.d.ts
|
|
+++ b/dist/src/Request.d.ts
|
|
@@ -58,6 +58,7 @@ export interface Request {
|
|
junkSessionCookies?: boolean;
|
|
compressed?: boolean;
|
|
transferEncoding?: boolean;
|
|
+ include?: boolean;
|
|
multipartUploads?: FormParam[];
|
|
multipartUploadsDoesntRoundtrip?: boolean;
|
|
formEscape?: boolean;
|
|
diff --git a/dist/src/Request.js b/dist/src/Request.js
|
|
index 7b295f0868ddd0fbf88017d40fd0812d7243d335..167d5535aeeca2c37b5592a427d26c61be9b3785 100644
|
|
--- a/dist/src/Request.js
|
|
+++ b/dist/src/Request.js
|
|
@@ -535,7 +535,7 @@ function buildRequest(global_, config, stdin, stdinFile) {
|
|
}
|
|
if ((config.output || []).length > config.url.length) {
|
|
warnf(global_, [
|
|
- "too-many-ouptut-files",
|
|
+ "too-many-output-files",
|
|
"Got more --output/-o options than URLs: " +
|
|
((_b = config.output) === null || _b === void 0 ? void 0 : _b.map((f) => JSON.stringify(f.toString())).join(", ")),
|
|
]);
|
|
@@ -586,6 +586,9 @@ function buildRequest(global_, config, stdin, stdinFile) {
|
|
if (Object.prototype.hasOwnProperty.call(config, "tr-encoding")) {
|
|
request.transferEncoding = config["tr-encoding"];
|
|
}
|
|
+ if (config.include) {
|
|
+ request.include = true;
|
|
+ }
|
|
if (config.json) {
|
|
headers.setIfMissing("Content-Type", "application/json");
|
|
headers.setIfMissing("Accept", "application/json");
|
|
diff --git a/dist/src/Request.js.map b/dist/src/Request.js.map
|
|
index 6ed7e7ef6ccc0cb927640570c2bed19e2adb1367..c42a2312c24fb69533ce260fa1c0010678291073 100644
|
|
--- a/dist/src/Request.js.map
|
|
+++ b/dist/src/Request.js.map
|
|
@@ -1 +1 @@
|
|
-{"version":3,"file":"Request.js","sourceRoot":"","sources":["../../src/Request.ts"],"names":[],"mappings":"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"}
|
|
\ No newline at end of file
|
|
+{"version":3,"file":"Request.js","sourceRoot":"","sources":["../../src/Request.ts"],"names":[],"mappings":"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"}
|
|
\ No newline at end of file
|
|
diff --git a/dist/src/generators/json.d.ts b/dist/src/generators/json.d.ts
|
|
index 5e78e442c56fc05d72938a73653e6ba02957c905..33d45f0dc013411cf1d757dde90d5277b5e35337 100644
|
|
--- a/dist/src/generators/json.d.ts
|
|
+++ b/dist/src/generators/json.d.ts
|
|
@@ -1,5 +1,45 @@
|
|
import type { Request, Warnings } from "../parse.js";
|
|
+import type { AuthType } from "../Request.js";
|
|
export declare const supportedArgs: Set<string>;
|
|
+export type JSONOutput = {
|
|
+ url: string;
|
|
+ raw_url: string;
|
|
+ method: string;
|
|
+ cookies?: {
|
|
+ [key: string]: string;
|
|
+ };
|
|
+ headers?: {
|
|
+ [key: string]: string | null;
|
|
+ };
|
|
+ queries?: {
|
|
+ [key: string]: string | string[];
|
|
+ };
|
|
+ data?: {
|
|
+ [key: string]: string;
|
|
+ } | string | any;
|
|
+ files?: {
|
|
+ [key: string]: string;
|
|
+ };
|
|
+ insecure?: boolean;
|
|
+ compressed?: boolean;
|
|
+ include?: boolean;
|
|
+ auth?: {
|
|
+ user: string;
|
|
+ password: string;
|
|
+ };
|
|
+ auth_type?: AuthType;
|
|
+ aws_sigv4?: string;
|
|
+ delegation?: string;
|
|
+ follow_redirects?: boolean;
|
|
+ max_redirects?: number;
|
|
+ proxy?: string;
|
|
+ timeout?: number;
|
|
+ connect_timeout?: number;
|
|
+ output?: string;
|
|
+};
|
|
+export declare function _toJsonObject(requests: Request[], warnings?: Warnings): JSONOutput;
|
|
+export declare function toJsonObjectWarn(curlCommand: string | string[], warnings?: Warnings): [JSONOutput, Warnings];
|
|
+export declare function toJsonObject(curlCommand: string | string[]): JSONOutput;
|
|
export declare function _toJsonString(requests: Request[], warnings?: Warnings): string;
|
|
export declare function toJsonStringWarn(curlCommand: string | string[], warnings?: Warnings): [string, Warnings];
|
|
export declare function toJsonString(curlCommand: string | string[]): string;
|
|
diff --git a/dist/src/generators/json.js b/dist/src/generators/json.js
|
|
index 5d80fc66526b185cdb2d648af4b5def836f855ba..ca5a2e15b0a3b6727ea06e1c476767f420a56fbd 100644
|
|
--- a/dist/src/generators/json.js
|
|
+++ b/dist/src/generators/json.js
|
|
@@ -11,6 +11,10 @@ export const supportedArgs = new Set([
|
|
"no-location",
|
|
"location-trusted",
|
|
"no-location-trusted",
|
|
+ "max-redirs",
|
|
+ "output",
|
|
+ "include",
|
|
+ "proxy",
|
|
"max-time",
|
|
"connect-timeout",
|
|
"anyauth",
|
|
@@ -78,18 +82,19 @@ function getFilesString(request) {
|
|
data: Object.keys(data.data).length ? data.data : undefined,
|
|
};
|
|
}
|
|
-export function _toJsonString(requests, warnings = []) {
|
|
+export function _toJsonObject(requests, warnings = []) {
|
|
const request = getFirst(requests, warnings);
|
|
+ const requestUrl = request.urls[0];
|
|
const requestJson = {
|
|
- url: (request.urls[0].queryDict
|
|
- ? request.urls[0].urlWithoutQueryList
|
|
- : request.urls[0].url)
|
|
+ url: (requestUrl.queryDict
|
|
+ ? requestUrl.urlWithoutQueryList
|
|
+ : requestUrl.url)
|
|
.toString()
|
|
.replace(/\/$/, ""),
|
|
// url: request.queryDict ? request.urlWithoutQueryList : request.url,
|
|
- raw_url: request.urls[0].url.toString(),
|
|
+ raw_url: requestUrl.url.toString(),
|
|
// TODO: move this after .query?
|
|
- method: request.urls[0].method.toLowerCase().toString(), // lowercase for backwards compatibility
|
|
+ method: requestUrl.method.toLowerCase().toString(), // lowercase for backwards compatibility
|
|
};
|
|
// if (request.queryDict) {
|
|
// requestJson.query = request.queryDict
|
|
@@ -109,9 +114,9 @@ export function _toJsonString(requests, warnings = []) {
|
|
// TODO: what if Object.keys().length !== request.headers.length?
|
|
requestJson.headers = Object.fromEntries(headers);
|
|
}
|
|
- if (request.urls[0].queryDict) {
|
|
+ if (requestUrl.queryDict) {
|
|
// TODO: rename
|
|
- requestJson.queries = Object.fromEntries(request.urls[0].queryDict.map((q) => [
|
|
+ requestJson.queries = Object.fromEntries(requestUrl.queryDict.map((q) => [
|
|
q[0].toString(),
|
|
Array.isArray(q[1]) ? q[1].map((qq) => qq.toString()) : q[1].toString(),
|
|
]));
|
|
@@ -130,8 +135,11 @@ export function _toJsonString(requests, warnings = []) {
|
|
// TODO: rename to verify? insecure=false doesn't make sense
|
|
requestJson.insecure = false;
|
|
}
|
|
- if (request.urls[0].auth) {
|
|
- const [user, password] = request.urls[0].auth;
|
|
+ if (request.include) {
|
|
+ requestJson.include = true;
|
|
+ }
|
|
+ if (requestUrl.auth) {
|
|
+ const [user, password] = requestUrl.auth;
|
|
requestJson.auth = {
|
|
user: user.toString(),
|
|
password: password.toString(),
|
|
@@ -148,6 +156,12 @@ export function _toJsonString(requests, warnings = []) {
|
|
}
|
|
if (Object.prototype.hasOwnProperty.call(request, "followRedirects")) {
|
|
requestJson.follow_redirects = request.followRedirects;
|
|
+ if (request.maxRedirects) {
|
|
+ requestJson.max_redirects = parseInt(request.maxRedirects.toString(), 10);
|
|
+ }
|
|
+ }
|
|
+ if (request.proxy) {
|
|
+ requestJson.proxy = request.proxy.toString();
|
|
}
|
|
if (request.timeout) {
|
|
requestJson.timeout = parseFloat(request.timeout.toString());
|
|
@@ -155,6 +169,21 @@ export function _toJsonString(requests, warnings = []) {
|
|
if (request.connectTimeout) {
|
|
requestJson.connect_timeout = parseFloat(request.connectTimeout.toString());
|
|
}
|
|
+ if (requestUrl.output) {
|
|
+ requestJson.output = requestUrl.output.toString();
|
|
+ }
|
|
+ return requestJson;
|
|
+}
|
|
+export function toJsonObjectWarn(curlCommand, warnings = []) {
|
|
+ const requests = parse(curlCommand, supportedArgs, warnings);
|
|
+ const json = _toJsonObject(requests, warnings);
|
|
+ return [json, warnings];
|
|
+}
|
|
+export function toJsonObject(curlCommand) {
|
|
+ return toJsonObjectWarn(curlCommand)[0];
|
|
+}
|
|
+export function _toJsonString(requests, warnings = []) {
|
|
+ const requestJson = _toJsonObject(requests, warnings);
|
|
return (JSON.stringify(Object.keys(requestJson).length ? requestJson : "{}", null, 4) + "\n");
|
|
}
|
|
export function toJsonStringWarn(curlCommand, warnings = []) {
|
|
diff --git a/dist/src/generators/json.js.map b/dist/src/generators/json.js.map
|
|
index f036af407562f608bd5abfeae53badff076f717a..101598f2cbb872efa6a0f322b9b9243a061ce429 100644
|
|
--- a/dist/src/generators/json.js.map
|
|
+++ b/dist/src/generators/json.js.map
|
|
@@ -1 +1 @@
|
|
-{"version":3,"file":"json.js","sourceRoot":"","sources":["../../../src/generators/json.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAGrE,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAE/C,MAAM,CAAC,MAAM,aAAa,GAAG,IAAI,GAAG,CAAC;IACnC,GAAG,qBAAqB;IAExB,UAAU;IACV,aAAa;IAEb,MAAM;IACN,aAAa;IAEb,YAAY;IAEZ,UAAU;IACV,aAAa;IACb,kBAAkB;IAClB,qBAAqB;IAErB,UAAU;IACV,iBAAiB;IAEjB,SAAS;IACT,YAAY;IACZ,QAAQ;IACR,WAAW;IACX,WAAW;IACX,WAAW;IACX,cAAc;IACd,YAAY,EAAE,eAAe;IAC7B,iDAAiD;IACjD,MAAM;IACN,SAAS;IACT,SAAS;IACT,YAAY;CACb,CAAC,CAAC;AA6BH,SAAS,aAAa,CACpB,OAAgB;IAEhB,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QAClB,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC;IACrD,IAAI,WAAW,KAAK,kBAAkB,EAAE,CAAC;QACvC,IAAI,CAAC;YACH,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC7C,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC,CAAA,CAAC;IAChB,CAAC;IAED,IAAI,WAAW,KAAK,mCAAmC,EAAE,CAAC;QACxD,MAAM,CAAC,WAAW,EAAE,eAAe,CAAC,GAAG,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACtE,IAAI,eAAe,EAAE,CAAC;YACpB,OAAO,MAAM,CAAC,WAAW,CACvB,eAAe,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC;gBAC7B,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;gBACnB,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;oBACrB,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;oBACnC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;aACxB,CAAC,CACH,CAAC;QACJ,CAAC;QACD,IAAI,WAAW,EAAE,CAAC;YAChB,iEAAiE;YACjE,OAAO,MAAM,CAAC,WAAW,CACvB,WAAW,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CACvE,CAAC;QACJ,CAAC;IACH,CAAC;IAED,kDAAkD;IAClD,OAAO,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;AACjC,CAAC;AAED,SAAS,cAAc,CACrB,OAAgB;IAIhB,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC;QAC9B,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,IAAI,GAGN;QACF,KAAK,EAAE,EAAE;QACT,IAAI,EAAE,EAAE;KACT,CAAC;IAEF,0BAA0B;IAC1B,KAAK,MAAM,CAAC,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;QACzC,IAAI,aAAa,IAAI,CAAC,EAAE,CAAC;YACvB,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC;QAC3D,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;QACtD,CAAC;IACH,CAAC;IAED,OAAO;QACL,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS;QAC9D,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS;KAC5D,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,aAAa,CAC3B,QAAmB,EACnB,WAAqB,EAAE;IAEvB,MAAM,OAAO,GAAG,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAE7C,MAAM,WAAW,GAAe;QAC9B,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS;YAC7B,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,mBAAmB;YACrC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CACtB;aACE,QAAQ,EAAE;aACV,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;QACrB,sEAAsE;QACtE,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE;QACvC,gCAAgC;QAChC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE,EAAE,wCAAwC;KAClG,CAAC;IACF,2BAA2B;IAC3B,0CAA0C;IAC1C,IAAI;IAEJ,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;QACpB,yBAAyB;QACzB,WAAW,CAAC,OAAO,GAAG,MAAM,CAAC,WAAW,CACtC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAC/D,CAAC;QACF,oEAAoE;QACpE,qEAAqE;QACrE,uBAAuB;IACzB,CAAC;IAED,IAAI,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;QAC3B,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO;aACpC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC;YAC7B,mCAAmC;aAClC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,CAAE,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;QACnD,iEAAiE;QACjE,WAAW,CAAC,OAAO,GAAG,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IACpD,CAAC;IAED,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC;QAC9B,eAAe;QACf,WAAW,CAAC,OAAO,GAAG,MAAM,CAAC,WAAW,CACtC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;YACnC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;YACf,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;SACxE,CAAC,CACH,CAAC;IACJ,CAAC;IAED,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;QACjB,WAAW,CAAC,IAAI,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;IAC5C,CAAC;SAAM,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;QACpC,yDAAyD;QACzD,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;IACtD,CAAC;IAED,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;QACvB,WAAW,CAAC,UAAU,GAAG,IAAI,CAAC;IAChC,CAAC;IACD,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;QACrB,4DAA4D;QAC5D,WAAW,CAAC,QAAQ,GAAG,KAAK,CAAC;IAC/B,CAAC;IAED,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QACzB,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAC9C,WAAW,CAAC,IAAI,GAAG;YACjB,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE;YACrB,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE;SAC9B,CAAC;QACF,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;YACrB,WAAW,CAAC,SAAS,GAAG,OAAO,CAAC,QAAQ,CAAC;QAC3C,CAAC;IACH,CAAC;IACD,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;QACrB,WAAW,CAAC,SAAS,GAAG,OAAO,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;IACtD,CAAC;IACD,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;QACvB,WAAW,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;IACzD,CAAC;IAED,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,EAAE,iBAAiB,CAAC,EAAE,CAAC;QACrE,WAAW,CAAC,gBAAgB,GAAG,OAAO,CAAC,eAAe,CAAC;IACzD,CAAC;IAED,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;QACpB,WAAW,CAAC,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC/D,CAAC;IACD,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;QAC3B,WAAW,CAAC,eAAe,GAAG,UAAU,CAAC,OAAO,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC9E,CAAC;IAED,OAAO,CACL,IAAI,CAAC,SAAS,CACZ,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,EACpD,IAAI,EACJ,CAAC,CACF,GAAG,IAAI,CACT,CAAC;AACJ,CAAC;AACD,MAAM,UAAU,gBAAgB,CAC9B,WAA8B,EAC9B,WAAqB,EAAE;IAEvB,MAAM,QAAQ,GAAG,KAAK,CAAC,WAAW,EAAE,aAAa,EAAE,QAAQ,CAAC,CAAC;IAC7D,MAAM,IAAI,GAAG,aAAa,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAC/C,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,MAAM,UAAU,YAAY,CAAC,WAA8B;IACzD,OAAO,gBAAgB,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;AAC1C,CAAC"}
|
|
\ No newline at end of file
|
|
+{"version":3,"file":"json.js","sourceRoot":"","sources":["../../../src/generators/json.ts"],"names":[],"mappings":"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"}
|
|
\ No newline at end of file
|
|
diff --git a/dist/src/index.d.ts b/dist/src/index.d.ts
|
|
index 585d53d39cf1e31873c6fac50803af2e05b908d8..a436c4683c59ef8a2e2ca183b2f7ba231b5c6938 100644
|
|
--- a/dist/src/index.d.ts
|
|
+++ b/dist/src/index.d.ts
|
|
@@ -16,7 +16,7 @@ export { toJavaOkHttp, toJavaOkHttpWarn } from "./generators/java/okhttp.js";
|
|
export { toJavaScript, toJavaScriptWarn, } from "./generators/javascript/javascript.js";
|
|
export { toJavaScriptJquery, toJavaScriptJqueryWarn, } from "./generators/javascript/jquery.js";
|
|
export { toJavaScriptXHR, toJavaScriptXHRWarn, } from "./generators/javascript/xhr.js";
|
|
-export { toJsonString, toJsonStringWarn } from "./generators/json.js";
|
|
+export { toJsonObject, toJsonObjectWarn, toJsonString, toJsonStringWarn, type JSONOutput, } from "./generators/json.js";
|
|
export { toJulia, toJuliaWarn } from "./generators/julia.js";
|
|
export { toKotlin, toKotlinWarn } from "./generators/kotlin.js";
|
|
export { toLua, toLuaWarn } from "./generators/lua.js";
|
|
diff --git a/dist/src/index.js b/dist/src/index.js
|
|
index 305ff31eadc19a3e1108cb656762406fe093cc19..73c23e8bc2fd713b0f6a543abc127b95f817a2e1 100644
|
|
--- a/dist/src/index.js
|
|
+++ b/dist/src/index.js
|
|
@@ -16,7 +16,7 @@ export { toJavaOkHttp, toJavaOkHttpWarn } from "./generators/java/okhttp.js";
|
|
export { toJavaScript, toJavaScriptWarn, } from "./generators/javascript/javascript.js";
|
|
export { toJavaScriptJquery, toJavaScriptJqueryWarn, } from "./generators/javascript/jquery.js";
|
|
export { toJavaScriptXHR, toJavaScriptXHRWarn, } from "./generators/javascript/xhr.js";
|
|
-export { toJsonString, toJsonStringWarn } from "./generators/json.js";
|
|
+export { toJsonObject, toJsonObjectWarn, toJsonString, toJsonStringWarn, } from "./generators/json.js";
|
|
export { toJulia, toJuliaWarn } from "./generators/julia.js";
|
|
export { toKotlin, toKotlinWarn } from "./generators/kotlin.js";
|
|
export { toLua, toLuaWarn } from "./generators/lua.js";
|
|
diff --git a/dist/src/index.js.map b/dist/src/index.js.map
|
|
index e07b4030dcbcbaef466125aba27971d46ae9cc1a..d1ab03b82c76d2058386b85d9b33f51278a6e8af 100644
|
|
--- a/dist/src/index.js.map
|
|
+++ b/dist/src/index.js.map
|
|
@@ -1 +1 @@
|
|
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
|
|
\ No newline at end of file
|
|
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
|
|
\ No newline at end of file
|
|
diff --git a/dist/test/test-utils.d.ts b/dist/test/test-utils.d.ts
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..5d202be38699c969d4dcb82889e8fc0da011abc6
|
|
--- /dev/null
|
|
+++ b/dist/test/test-utils.d.ts
|
|
@@ -0,0 +1,233 @@
|
|
+import * as curlconverter from "../src/index.js";
|
|
+export declare const fixturesDir: string;
|
|
+declare function toParser(curl: string | string[]): string;
|
|
+declare const converters: {
|
|
+ readonly ansible: {
|
|
+ readonly name: "Ansible";
|
|
+ readonly extension: ".yml";
|
|
+ readonly converter: typeof curlconverter.toAnsible;
|
|
+ };
|
|
+ readonly c: {
|
|
+ readonly name: "C";
|
|
+ readonly extension: ".c";
|
|
+ readonly converter: typeof curlconverter.toC;
|
|
+ };
|
|
+ readonly cfml: {
|
|
+ readonly name: "ColdFusion";
|
|
+ readonly extension: ".cfm";
|
|
+ readonly converter: typeof curlconverter.toCFML;
|
|
+ };
|
|
+ readonly clojure: {
|
|
+ readonly name: "Clojure";
|
|
+ readonly extension: ".clj";
|
|
+ readonly converter: typeof curlconverter.toClojure;
|
|
+ };
|
|
+ readonly csharp: {
|
|
+ readonly name: "C#";
|
|
+ readonly extension: ".cs";
|
|
+ readonly converter: typeof curlconverter.toCSharp;
|
|
+ };
|
|
+ readonly dart: {
|
|
+ readonly name: "Dart";
|
|
+ readonly extension: ".dart";
|
|
+ readonly converter: typeof curlconverter.toDart;
|
|
+ };
|
|
+ readonly elixir: {
|
|
+ readonly name: "Elixir";
|
|
+ readonly extension: ".ex";
|
|
+ readonly converter: typeof curlconverter.toElixir;
|
|
+ };
|
|
+ readonly go: {
|
|
+ readonly name: "Go";
|
|
+ readonly extension: ".go";
|
|
+ readonly converter: typeof curlconverter.toGo;
|
|
+ };
|
|
+ readonly har: {
|
|
+ readonly name: "HAR";
|
|
+ readonly extension: ".json";
|
|
+ readonly converter: typeof curlconverter.toHarString;
|
|
+ };
|
|
+ readonly http: {
|
|
+ readonly name: "HTTP";
|
|
+ readonly extension: ".txt";
|
|
+ readonly converter: typeof curlconverter.toHTTP;
|
|
+ };
|
|
+ readonly httpie: {
|
|
+ readonly name: "HTTPie";
|
|
+ readonly extension: ".sh";
|
|
+ readonly converter: typeof curlconverter.toHttpie;
|
|
+ };
|
|
+ readonly java: {
|
|
+ readonly name: "Java + HttpClient";
|
|
+ readonly extension: ".java";
|
|
+ readonly converter: typeof curlconverter.toJava;
|
|
+ };
|
|
+ readonly "java-httpurlconnection": {
|
|
+ readonly name: "Java + HttpUrlConnection";
|
|
+ readonly extension: ".java";
|
|
+ readonly converter: typeof curlconverter.toJavaHttpUrlConnection;
|
|
+ };
|
|
+ readonly "java-jsoup": {
|
|
+ readonly name: "Java + jsoup";
|
|
+ readonly extension: ".java";
|
|
+ readonly converter: (curlCommand: string | string[]) => string;
|
|
+ };
|
|
+ readonly "java-okhttp": {
|
|
+ readonly name: "Java + OkHttp";
|
|
+ readonly extension: ".java";
|
|
+ readonly converter: typeof curlconverter.toJavaOkHttp;
|
|
+ };
|
|
+ readonly javascript: {
|
|
+ readonly name: "JavaScript";
|
|
+ readonly extension: ".js";
|
|
+ readonly converter: typeof curlconverter.toJavaScript;
|
|
+ };
|
|
+ readonly "javascript-jquery": {
|
|
+ readonly name: "JavaScript + jQuery";
|
|
+ readonly extension: ".js";
|
|
+ readonly converter: typeof curlconverter.toJavaScriptJquery;
|
|
+ };
|
|
+ readonly "javascript-xhr": {
|
|
+ readonly name: "JavaScript + XHR";
|
|
+ readonly extension: ".js";
|
|
+ readonly converter: typeof curlconverter.toJavaScriptXHR;
|
|
+ };
|
|
+ readonly json: {
|
|
+ readonly name: "Json";
|
|
+ readonly extension: ".json";
|
|
+ readonly converter: typeof curlconverter.toJsonString;
|
|
+ };
|
|
+ readonly julia: {
|
|
+ readonly name: "Julia";
|
|
+ readonly extension: ".jl";
|
|
+ readonly converter: typeof curlconverter.toJulia;
|
|
+ };
|
|
+ readonly kotlin: {
|
|
+ readonly name: "Kotlin";
|
|
+ readonly extension: ".kt";
|
|
+ readonly converter: typeof curlconverter.toKotlin;
|
|
+ };
|
|
+ readonly lua: {
|
|
+ readonly name: "Lua";
|
|
+ readonly extension: ".lua";
|
|
+ readonly converter: typeof curlconverter.toLua;
|
|
+ };
|
|
+ readonly matlab: {
|
|
+ readonly name: "MATLAB";
|
|
+ readonly extension: ".m";
|
|
+ readonly converter: typeof curlconverter.toMATLAB;
|
|
+ };
|
|
+ readonly node: {
|
|
+ readonly name: "Node";
|
|
+ readonly extension: ".js";
|
|
+ readonly converter: typeof curlconverter.toNode;
|
|
+ };
|
|
+ readonly "node-axios": {
|
|
+ readonly name: "Node + Axios";
|
|
+ readonly extension: ".js";
|
|
+ readonly converter: typeof curlconverter.toNodeAxios;
|
|
+ };
|
|
+ readonly "node-got": {
|
|
+ readonly name: "Node + Got";
|
|
+ readonly extension: ".js";
|
|
+ readonly converter: typeof curlconverter.toNodeGot;
|
|
+ };
|
|
+ readonly "node-http": {
|
|
+ readonly name: "Node + http";
|
|
+ readonly extension: ".js";
|
|
+ readonly converter: typeof curlconverter.toNodeHttp;
|
|
+ };
|
|
+ readonly "node-ky": {
|
|
+ readonly name: "Node + Ky";
|
|
+ readonly extension: ".js";
|
|
+ readonly converter: typeof curlconverter.toNodeKy;
|
|
+ };
|
|
+ readonly "node-request": {
|
|
+ readonly name: "Node + request";
|
|
+ readonly extension: ".js";
|
|
+ readonly converter: typeof curlconverter.toNodeRequest;
|
|
+ };
|
|
+ readonly "node-superagent": {
|
|
+ readonly name: "Node + SuperAgent";
|
|
+ readonly extension: ".js";
|
|
+ readonly converter: typeof curlconverter.toNodeSuperAgent;
|
|
+ };
|
|
+ readonly objectivec: {
|
|
+ readonly name: "Objective-C";
|
|
+ readonly extension: ".m";
|
|
+ readonly converter: typeof curlconverter.toObjectiveC;
|
|
+ };
|
|
+ readonly ocaml: {
|
|
+ readonly name: "OCaml";
|
|
+ readonly extension: ".ml";
|
|
+ readonly converter: typeof curlconverter.toOCaml;
|
|
+ };
|
|
+ readonly perl: {
|
|
+ readonly name: "Perl";
|
|
+ readonly extension: ".pl";
|
|
+ readonly converter: typeof curlconverter.toPerl;
|
|
+ };
|
|
+ readonly php: {
|
|
+ readonly name: "PHP";
|
|
+ readonly extension: ".php";
|
|
+ readonly converter: typeof curlconverter.toPhp;
|
|
+ };
|
|
+ readonly "php-guzzle": {
|
|
+ readonly name: "PHP + Guzzle";
|
|
+ readonly extension: ".php";
|
|
+ readonly converter: typeof curlconverter.toPhpGuzzle;
|
|
+ };
|
|
+ readonly powershell: {
|
|
+ readonly name: "PowerShell";
|
|
+ readonly extension: ".ps1";
|
|
+ readonly converter: typeof curlconverter.toPowershellRestMethod;
|
|
+ };
|
|
+ readonly python: {
|
|
+ readonly name: "Python";
|
|
+ readonly extension: ".py";
|
|
+ readonly converter: typeof curlconverter.toPython;
|
|
+ };
|
|
+ readonly r: {
|
|
+ readonly name: "R";
|
|
+ readonly extension: ".r";
|
|
+ readonly converter: typeof curlconverter.toR;
|
|
+ };
|
|
+ readonly "r-httr2": {
|
|
+ readonly name: "R + httr2";
|
|
+ readonly extension: ".r";
|
|
+ readonly converter: typeof curlconverter.toRHttr2;
|
|
+ };
|
|
+ readonly ruby: {
|
|
+ readonly name: "Ruby";
|
|
+ readonly extension: ".rb";
|
|
+ readonly converter: typeof curlconverter.toRuby;
|
|
+ };
|
|
+ readonly "ruby-httparty": {
|
|
+ readonly name: "Ruby HTTParty";
|
|
+ readonly extension: ".rb";
|
|
+ readonly converter: typeof curlconverter.toRubyHttparty;
|
|
+ };
|
|
+ readonly rust: {
|
|
+ readonly name: "Rust";
|
|
+ readonly extension: ".rs";
|
|
+ readonly converter: typeof curlconverter.toRust;
|
|
+ };
|
|
+ readonly swift: {
|
|
+ readonly name: "Swift";
|
|
+ readonly extension: ".swift";
|
|
+ readonly converter: typeof curlconverter.toSwift;
|
|
+ };
|
|
+ readonly wget: {
|
|
+ readonly name: "Wget";
|
|
+ readonly extension: ".sh";
|
|
+ readonly converter: typeof curlconverter.toWget;
|
|
+ };
|
|
+ readonly parser: {
|
|
+ readonly name: "Parser";
|
|
+ readonly extension: ".json";
|
|
+ readonly converter: typeof toParser;
|
|
+ };
|
|
+};
|
|
+type Converter = keyof typeof converters;
|
|
+export { converters };
|
|
+export type { Converter };
|
|
diff --git a/dist/test/test-utils.js b/dist/test/test-utils.js
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..e3fc9b89bb3e514a1d90664a10883a742eeb90aa
|
|
--- /dev/null
|
|
+++ b/dist/test/test-utils.js
|
|
@@ -0,0 +1,297 @@
|
|
+import * as curlconverter from "../src/index.js";
|
|
+import { Word } from "../src/shell/Word.js";
|
|
+import { parse } from "../src/parse.js";
|
|
+import fs from "fs";
|
|
+import path from "path";
|
|
+import { fileURLToPath } from "url";
|
|
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
|
|
+export const fixturesDir = path.resolve(__dirname, "../../test/fixtures");
|
|
+function stringifyWords(o) {
|
|
+ if (o instanceof Word) {
|
|
+ return o.toString();
|
|
+ }
|
|
+ if (Array.isArray(o)) {
|
|
+ return o.map((oo) => stringifyWords(oo));
|
|
+ }
|
|
+ if (o && o.toString() == "[object Object]") {
|
|
+ return Object.fromEntries(Object.entries(o).map((oo) => [
|
|
+ stringifyWords(oo[0]),
|
|
+ stringifyWords(oo[1]),
|
|
+ ]));
|
|
+ }
|
|
+ return o;
|
|
+}
|
|
+// Special case that returns the parsed argument object
|
|
+function toParser(curl) {
|
|
+ const parserOutput = parse(curl);
|
|
+ const code = JSON.stringify(stringifyWords(parserOutput), null, 2);
|
|
+ return code + "\n";
|
|
+}
|
|
+// TODO: move this (or something like this) to index.js?
|
|
+const converters = {
|
|
+ ansible: {
|
|
+ name: "Ansible",
|
|
+ extension: ".yml",
|
|
+ converter: curlconverter.toAnsible,
|
|
+ },
|
|
+ c: {
|
|
+ name: "C",
|
|
+ extension: ".c",
|
|
+ converter: curlconverter.toC,
|
|
+ },
|
|
+ cfml: {
|
|
+ name: "ColdFusion",
|
|
+ extension: ".cfm",
|
|
+ converter: curlconverter.toCFML,
|
|
+ },
|
|
+ clojure: {
|
|
+ name: "Clojure",
|
|
+ extension: ".clj",
|
|
+ converter: curlconverter.toClojure,
|
|
+ },
|
|
+ csharp: {
|
|
+ name: "C#",
|
|
+ extension: ".cs",
|
|
+ converter: curlconverter.toCSharp,
|
|
+ },
|
|
+ dart: {
|
|
+ name: "Dart",
|
|
+ extension: ".dart",
|
|
+ converter: curlconverter.toDart,
|
|
+ },
|
|
+ elixir: {
|
|
+ name: "Elixir",
|
|
+ extension: ".ex",
|
|
+ converter: curlconverter.toElixir,
|
|
+ },
|
|
+ go: {
|
|
+ name: "Go",
|
|
+ extension: ".go",
|
|
+ converter: curlconverter.toGo,
|
|
+ },
|
|
+ har: {
|
|
+ name: "HAR",
|
|
+ extension: ".json",
|
|
+ converter: curlconverter.toHarString,
|
|
+ },
|
|
+ http: {
|
|
+ name: "HTTP",
|
|
+ extension: ".txt",
|
|
+ converter: curlconverter.toHTTP,
|
|
+ },
|
|
+ httpie: {
|
|
+ name: "HTTPie",
|
|
+ extension: ".sh",
|
|
+ converter: curlconverter.toHttpie,
|
|
+ },
|
|
+ java: {
|
|
+ name: "Java + HttpClient",
|
|
+ extension: ".java",
|
|
+ converter: curlconverter.toJava,
|
|
+ },
|
|
+ "java-httpurlconnection": {
|
|
+ name: "Java + HttpUrlConnection",
|
|
+ extension: ".java",
|
|
+ converter: curlconverter.toJavaHttpUrlConnection,
|
|
+ },
|
|
+ "java-jsoup": {
|
|
+ name: "Java + jsoup",
|
|
+ extension: ".java",
|
|
+ converter: curlconverter.toJavaJsoup,
|
|
+ },
|
|
+ "java-okhttp": {
|
|
+ name: "Java + OkHttp",
|
|
+ extension: ".java",
|
|
+ converter: curlconverter.toJavaOkHttp,
|
|
+ },
|
|
+ javascript: {
|
|
+ name: "JavaScript",
|
|
+ extension: ".js",
|
|
+ converter: curlconverter.toJavaScript,
|
|
+ },
|
|
+ "javascript-jquery": {
|
|
+ name: "JavaScript + jQuery",
|
|
+ extension: ".js",
|
|
+ converter: curlconverter.toJavaScriptJquery,
|
|
+ },
|
|
+ "javascript-xhr": {
|
|
+ name: "JavaScript + XHR",
|
|
+ extension: ".js",
|
|
+ converter: curlconverter.toJavaScriptXHR,
|
|
+ },
|
|
+ json: {
|
|
+ name: "Json",
|
|
+ extension: ".json",
|
|
+ converter: curlconverter.toJsonString,
|
|
+ },
|
|
+ julia: {
|
|
+ name: "Julia",
|
|
+ extension: ".jl",
|
|
+ converter: curlconverter.toJulia,
|
|
+ },
|
|
+ kotlin: {
|
|
+ name: "Kotlin",
|
|
+ extension: ".kt",
|
|
+ converter: curlconverter.toKotlin,
|
|
+ },
|
|
+ lua: {
|
|
+ name: "Lua",
|
|
+ extension: ".lua",
|
|
+ converter: curlconverter.toLua,
|
|
+ },
|
|
+ matlab: {
|
|
+ name: "MATLAB",
|
|
+ extension: ".m",
|
|
+ converter: curlconverter.toMATLAB,
|
|
+ },
|
|
+ node: {
|
|
+ name: "Node",
|
|
+ extension: ".js",
|
|
+ converter: curlconverter.toNode,
|
|
+ },
|
|
+ "node-axios": {
|
|
+ name: "Node + Axios",
|
|
+ extension: ".js",
|
|
+ converter: curlconverter.toNodeAxios,
|
|
+ },
|
|
+ "node-got": {
|
|
+ name: "Node + Got",
|
|
+ extension: ".js",
|
|
+ converter: curlconverter.toNodeGot,
|
|
+ },
|
|
+ "node-http": {
|
|
+ name: "Node + http",
|
|
+ extension: ".js",
|
|
+ converter: curlconverter.toNodeHttp,
|
|
+ },
|
|
+ "node-ky": {
|
|
+ name: "Node + Ky",
|
|
+ extension: ".js",
|
|
+ converter: curlconverter.toNodeKy,
|
|
+ },
|
|
+ "node-request": {
|
|
+ name: "Node + request",
|
|
+ extension: ".js",
|
|
+ converter: curlconverter.toNodeRequest,
|
|
+ },
|
|
+ "node-superagent": {
|
|
+ name: "Node + SuperAgent",
|
|
+ extension: ".js",
|
|
+ converter: curlconverter.toNodeSuperAgent,
|
|
+ },
|
|
+ objectivec: {
|
|
+ name: "Objective-C",
|
|
+ extension: ".m",
|
|
+ converter: curlconverter.toObjectiveC,
|
|
+ },
|
|
+ ocaml: {
|
|
+ name: "OCaml",
|
|
+ extension: ".ml",
|
|
+ converter: curlconverter.toOCaml,
|
|
+ },
|
|
+ perl: {
|
|
+ name: "Perl",
|
|
+ extension: ".pl",
|
|
+ converter: curlconverter.toPerl,
|
|
+ },
|
|
+ php: {
|
|
+ name: "PHP",
|
|
+ extension: ".php",
|
|
+ converter: curlconverter.toPhp,
|
|
+ },
|
|
+ "php-guzzle": {
|
|
+ name: "PHP + Guzzle",
|
|
+ extension: ".php",
|
|
+ converter: curlconverter.toPhpGuzzle,
|
|
+ },
|
|
+ powershell: {
|
|
+ name: "PowerShell",
|
|
+ extension: ".ps1",
|
|
+ converter: curlconverter.toPowershellRestMethod,
|
|
+ },
|
|
+ python: {
|
|
+ name: "Python",
|
|
+ extension: ".py",
|
|
+ converter: curlconverter.toPython,
|
|
+ },
|
|
+ r: {
|
|
+ name: "R",
|
|
+ extension: ".r",
|
|
+ converter: curlconverter.toR,
|
|
+ },
|
|
+ "r-httr2": {
|
|
+ name: "R + httr2",
|
|
+ extension: ".r",
|
|
+ converter: curlconverter.toRHttr2,
|
|
+ },
|
|
+ ruby: {
|
|
+ name: "Ruby",
|
|
+ extension: ".rb",
|
|
+ converter: curlconverter.toRuby,
|
|
+ },
|
|
+ "ruby-httparty": {
|
|
+ name: "Ruby HTTParty",
|
|
+ extension: ".rb",
|
|
+ converter: curlconverter.toRubyHttparty,
|
|
+ },
|
|
+ rust: {
|
|
+ name: "Rust",
|
|
+ extension: ".rs",
|
|
+ converter: curlconverter.toRust,
|
|
+ },
|
|
+ swift: {
|
|
+ name: "Swift",
|
|
+ extension: ".swift",
|
|
+ converter: curlconverter.toSwift,
|
|
+ },
|
|
+ wget: {
|
|
+ name: "Wget",
|
|
+ extension: ".sh",
|
|
+ converter: curlconverter.toWget,
|
|
+ },
|
|
+ parser: {
|
|
+ name: "Parser",
|
|
+ extension: ".json",
|
|
+ converter: toParser,
|
|
+ },
|
|
+};
|
|
+// Check that we have at least one test for every generator
|
|
+// https://github.com/curlconverter/curlconverter/pull/299
|
|
+const testedConverters = Object.entries(converters).map((c) => c[1].converter.name);
|
|
+const untestedConverters = ["toPhpRequests"];
|
|
+const notConverterExports = ["Word"];
|
|
+const availableConverters = Object.entries(curlconverter)
|
|
+ .map((c) => c[1].name)
|
|
+ .filter((n) => n !== "CCError");
|
|
+const missing = availableConverters.filter((c) => !testedConverters.includes(c) &&
|
|
+ !untestedConverters.includes(c) &&
|
|
+ !notConverterExports.includes(c) &&
|
|
+ !c.endsWith("Warn"));
|
|
+const extra = testedConverters.filter((c) => !availableConverters.includes(c) && c !== "toParser");
|
|
+if (missing.length) {
|
|
+ console.error("these converters are not tested: " + missing.join(", "));
|
|
+}
|
|
+if (extra.length) {
|
|
+ console.error("these non-existant converters are being tested: " + extra.join(", "));
|
|
+}
|
|
+for (const [converterName, converter] of Object.entries(converters)) {
|
|
+ const testDir = path.resolve(fixturesDir, converterName);
|
|
+ if (fs.existsSync(testDir)) {
|
|
+ const dirContents = fs.readdirSync(testDir);
|
|
+ if (!dirContents.length) {
|
|
+ console.error(testDir + " doesn't contain any files");
|
|
+ }
|
|
+ else if (!dirContents.filter((f) => f.endsWith(converter.extension)).length) {
|
|
+ // TODO: early stopping
|
|
+ console.error(testDir +
|
|
+ " doesn't have any files ending with '" +
|
|
+ converter.extension +
|
|
+ "'");
|
|
+ }
|
|
+ }
|
|
+ else {
|
|
+ console.error(converterName + " doesn't have a corresponding directory in fixtures/");
|
|
+ }
|
|
+}
|
|
+export { converters };
|
|
+//# sourceMappingURL=test-utils.js.map
|
|
\ No newline at end of file
|
|
diff --git a/dist/test/test-utils.js.map b/dist/test/test-utils.js.map
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..43d28eaaac2e561b08ef1653a5fb0db87e0ca540
|
|
--- /dev/null
|
|
+++ b/dist/test/test-utils.js.map
|
|
@@ -0,0 +1 @@
|
|
+{"version":3,"file":"test-utils.js","sourceRoot":"","sources":["../../test/test-utils.ts"],"names":[],"mappings":"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"}
|
|
\ No newline at end of file
|
|
diff --git a/dist/test/test.d.ts b/dist/test/test.d.ts
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..cb0ff5c3b541f646105198ee23ac0fc3d805023e
|
|
--- /dev/null
|
|
+++ b/dist/test/test.d.ts
|
|
@@ -0,0 +1 @@
|
|
+export {};
|
|
diff --git a/dist/test/test.js b/dist/test/test.js
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..7c2c8a1035a9faac7782b474d4545d9c97b4386a
|
|
--- /dev/null
|
|
+++ b/dist/test/test.js
|
|
@@ -0,0 +1,99 @@
|
|
+import fs from "fs";
|
|
+import path from "path";
|
|
+import test from "tape";
|
|
+import yargs from "yargs";
|
|
+import { hideBin } from "yargs/helpers";
|
|
+import { fixturesDir, converters } from "./test-utils.js";
|
|
+// The curl_commands/ directory contains input files
|
|
+// The file name is a description of the command.
|
|
+// For each input file, there may be a corresponding output file in
|
|
+// language-specific directories: node/, php/, python/, parser/
|
|
+// we get a list of all input files, iterate over it, and if an
|
|
+// output file exists, compare the output.
|
|
+const curlCommandsDir = path.resolve(fixturesDir, "curl_commands");
|
|
+const testArgs = await yargs(hideBin(process.argv))
|
|
+ .scriptName("test.js")
|
|
+ .usage("Usage: $0 [--language <language>] [--test <test_name>] [test_name...]")
|
|
+ .option("l", {
|
|
+ alias: "language",
|
|
+ describe: "the language to convert the curl command to",
|
|
+ choices: Object.keys(converters),
|
|
+ default: Object.keys(converters),
|
|
+ defaultDescription: "all of them",
|
|
+ demandOption: false,
|
|
+ type: "string",
|
|
+})
|
|
+ .option("test", {
|
|
+ describe: "the name of a file in fixtures/curl_commands without the .sh extension",
|
|
+ defaultDescription: "run all tests",
|
|
+ demandOption: false,
|
|
+ type: "string",
|
|
+})
|
|
+ .alias("h", "help")
|
|
+ .help()
|
|
+ .parse();
|
|
+const languages = Array.isArray(testArgs.language)
|
|
+ ? testArgs.language
|
|
+ : [testArgs.language];
|
|
+// Test names can be positional args or --test=<test name>. We need to merge them
|
|
+let testNames = testArgs._.slice(1);
|
|
+if (Array.isArray(testArgs.test)) {
|
|
+ testNames = testNames.concat(testArgs.test);
|
|
+}
|
|
+else if (typeof testArgs.test === "string") {
|
|
+ testNames.push(testArgs.test);
|
|
+}
|
|
+const testFileNames = testNames && testNames.length
|
|
+ ? testNames.map((t) => t
|
|
+ .toString()
|
|
+ .replace(/ /g, "_")
|
|
+ .replace(/(\.sh)?$/, ".sh"))
|
|
+ : fs.readdirSync(curlCommandsDir).filter((f) => f.endsWith(".sh")); // if no --test specified, run them all
|
|
+for (const outputLanguage of Object.keys(converters)) {
|
|
+ // TODO: always test 'parser'?
|
|
+ if (!languages.includes(outputLanguage)) {
|
|
+ console.error("skipping language: " + outputLanguage);
|
|
+ }
|
|
+}
|
|
+for (const fileName of testFileNames) {
|
|
+ const inputFilePath = path.resolve(curlCommandsDir, fileName);
|
|
+ const inputFileContents = fs
|
|
+ .readFileSync(inputFilePath, "utf8")
|
|
+ .replace(/\r\n/g, "\n");
|
|
+ for (const outputLanguage of languages) {
|
|
+ const converter = converters[outputLanguage];
|
|
+ const filePath = path.resolve(fixturesDir, outputLanguage, fileName.replace(/\.sh$/, converter.extension));
|
|
+ const testName = fileName.replace(/_/g, " ").replace(/\.sh$/, "");
|
|
+ const fullTestName = converter.name + ": " + testName;
|
|
+ if (fs.existsSync(filePath)) {
|
|
+ // normalize code for just \n line endings (aka fix input under Windows)
|
|
+ const expected = fs
|
|
+ .readFileSync(filePath, "utf-8")
|
|
+ .replace(/\r\n/g, "\n");
|
|
+ let actual;
|
|
+ try {
|
|
+ actual = converter.converter(inputFileContents);
|
|
+ }
|
|
+ catch (e) {
|
|
+ console.error("Failed converting " + fileName + " to " + converter.name + ":");
|
|
+ console.error(inputFileContents);
|
|
+ console.error(e);
|
|
+ process.exit(1);
|
|
+ }
|
|
+ if (outputLanguage === "parser") {
|
|
+ test(fullTestName, (t) => {
|
|
+ // TODO: `actual` is a needless roundtrip
|
|
+ t.deepEquals(JSON.parse(actual), JSON.parse(expected));
|
|
+ t.end();
|
|
+ });
|
|
+ }
|
|
+ else {
|
|
+ test(fullTestName, (t) => {
|
|
+ t.equal(actual, expected);
|
|
+ t.end();
|
|
+ });
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+}
|
|
+//# sourceMappingURL=test.js.map
|
|
\ No newline at end of file
|
|
diff --git a/dist/test/test.js.map b/dist/test/test.js.map
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..c2b324e88ff7dd2adb29ea6b0e884e1e97c700e6
|
|
--- /dev/null
|
|
+++ b/dist/test/test.js.map
|
|
@@ -0,0 +1 @@
|
|
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test/test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAG1D,oDAAoD;AACpD,iDAAiD;AACjD,mEAAmE;AACnE,+DAA+D;AAC/D,+DAA+D;AAC/D,0CAA0C;AAC1C,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;AAEnE,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;KAChD,UAAU,CAAC,SAAS,CAAC;KACrB,KAAK,CACJ,uEAAuE,CACxE;KACA,MAAM,CAAC,GAAG,EAAE;IACX,KAAK,EAAE,UAAU;IACjB,QAAQ,EAAE,6CAA6C;IACvD,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC;IAChC,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC;IAChC,kBAAkB,EAAE,aAAa;IACjC,YAAY,EAAE,KAAK;IACnB,IAAI,EAAE,QAAQ;CACf,CAAC;KACD,MAAM,CAAC,MAAM,EAAE;IACd,QAAQ,EACN,wEAAwE;IAC1E,kBAAkB,EAAE,eAAe;IACnC,YAAY,EAAE,KAAK;IACnB,IAAI,EAAE,QAAQ;CACf,CAAC;KACD,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC;KAClB,IAAI,EAAE;KACN,KAAK,EAAE,CAAC;AAEX,MAAM,SAAS,GAAgB,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC;IAC7D,CAAC,CAAC,QAAQ,CAAC,QAAQ;IACnB,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;AAExB,iFAAiF;AACjF,IAAI,SAAS,GAAG,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AACpC,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;IACjC,SAAS,GAAG,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;AAC9C,CAAC;KAAM,IAAI,OAAO,QAAQ,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;IAC7C,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;AAChC,CAAC;AAED,MAAM,aAAa,GACjB,SAAS,IAAI,SAAS,CAAC,MAAM;IAC3B,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAClB,CAAC;SACE,QAAQ,EAAE;SACV,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC;SAClB,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC,CAC9B;IACH,CAAC,CAAC,EAAE,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,uCAAuC;AAE/G,KAAK,MAAM,cAAc,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;IACrD,8BAA8B;IAC9B,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,cAA2B,CAAC,EAAE,CAAC;QACrD,OAAO,CAAC,KAAK,CAAC,qBAAqB,GAAG,cAAc,CAAC,CAAC;IACxD,CAAC;AACH,CAAC;AAED,KAAK,MAAM,QAAQ,IAAI,aAAa,EAAE,CAAC;IACrC,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;IAC9D,MAAM,iBAAiB,GAAG,EAAE;SACzB,YAAY,CAAC,aAAa,EAAE,MAAM,CAAC;SACnC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAE1B,KAAK,MAAM,cAAc,IAAI,SAAS,EAAE,CAAC;QACvC,MAAM,SAAS,GAAG,UAAU,CAAC,cAAc,CAAC,CAAC;QAE7C,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAC3B,WAAW,EACX,cAAc,EACd,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,SAAS,CAAC,CAC/C,CAAC;QACF,MAAM,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QAClE,MAAM,YAAY,GAAG,SAAS,CAAC,IAAI,GAAG,IAAI,GAAG,QAAQ,CAAC;QAEtD,IAAI,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC5B,wEAAwE;YACxE,MAAM,QAAQ,GAAG,EAAE;iBAChB,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC;iBAC/B,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YAC1B,IAAI,MAAc,CAAC;YACnB,IAAI,CAAC;gBACH,MAAM,GAAG,SAAS,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC;YAClD,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,OAAO,CAAC,KAAK,CACX,oBAAoB,GAAG,QAAQ,GAAG,MAAM,GAAG,SAAS,CAAC,IAAI,GAAG,GAAG,CAChE,CAAC;gBACF,OAAO,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;gBACjC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBACjB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;YACD,IAAI,cAAc,KAAK,QAAQ,EAAE,CAAC;gBAChC,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC,EAAE,EAAE;oBACvB,yCAAyC;oBACzC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;oBACvD,CAAC,CAAC,GAAG,EAAE,CAAC;gBACV,CAAC,CAAC,CAAC;YACL,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC,EAAE,EAAE;oBACvB,CAAC,CAAC,KAAK,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;oBAC1B,CAAC,CAAC,GAAG,EAAE,CAAC;gBACV,CAAC,CAAC,CAAC;YACL,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC"}
|
|
\ No newline at end of file
|
|
diff --git a/dist/tools/compare-requests.d.ts b/dist/tools/compare-requests.d.ts
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..b7988016daa5bf0b3d4fcdccaba52780a9983d9d
|
|
--- /dev/null
|
|
+++ b/dist/tools/compare-requests.d.ts
|
|
@@ -0,0 +1,2 @@
|
|
+#!/usr/bin/env node
|
|
+export {};
|
|
diff --git a/dist/tools/compare-requests.js b/dist/tools/compare-requests.js
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..26589b35db3e4abaa5008ab94b3b0d828bd302e5
|
|
--- /dev/null
|
|
+++ b/dist/tools/compare-requests.js
|
|
@@ -0,0 +1,448 @@
|
|
+#!/usr/bin/env node
|
|
+import { exec } from "child_process";
|
|
+import fs from "fs";
|
|
+import net from "net";
|
|
+import path from "path";
|
|
+import { promisify } from "util";
|
|
+import colors from "colors";
|
|
+import { diffLines } from "diff";
|
|
+import yargs from "yargs";
|
|
+import { hideBin } from "yargs/helpers";
|
|
+import { parse } from "../src/parse.js";
|
|
+import { fixturesDir, converters } from "../test/test-utils.js";
|
|
+const awaitableExec = promisify(exec);
|
|
+const DEFAULT_PORT = 28139; // chosen randomly
|
|
+const EXPECTED_URL = "localhost:" + DEFAULT_PORT;
|
|
+const MINIMAL_HTTP_RESPONSE = `\
|
|
+HTTP/1.1 200 OK
|
|
+Content-Length: 12
|
|
+Content-Type: text/plain; charset=utf-8
|
|
+
|
|
+Hello World!`.replace(/\n/g, "\r\n");
|
|
+const testDir = "/tmp/curlconverter"; // files are copied here to be executed
|
|
+const executables = {
|
|
+ clojure: {
|
|
+ copy: "cp <file> /tmp/curlconverter/clojure/main.clj",
|
|
+ exec: 'cd /tmp/curlconverter/clojure && clj -Sdeps \'{:deps {clj-http/clj-http {:mvn/version "3.12.3"} cheshire/cheshire {:mvn/version "5.11.0"}}}\' -M main.clj',
|
|
+ },
|
|
+ csharp: {
|
|
+ setup: "cd /tmp/curlconverter && dotnet new console -o csharp && sed -i '' 's/<ImplicitUsings>enable/<ImplicitUsings>disable/' /tmp/curlconverter/csharp/csharp.csproj",
|
|
+ copy: "cp <file> /tmp/curlconverter/csharp/Program.cs",
|
|
+ exec: "cd /tmp/curlconverter/csharp && dotnet run",
|
|
+ },
|
|
+ dart: {
|
|
+ setup: "cd /tmp && mkdir -p curlconverter/dart && cd /tmp/curlconverter/dart && echo $'name:\\n dart\\nenvironment:\\n sdk: \">=2.14.0\"\\ndependencies:\\n http: any\\n' > pubspec.yaml && dart pub get",
|
|
+ copy: "cp <file> /tmp/curlconverter/dart/main.dart",
|
|
+ exec: "cd /tmp/curlconverter/dart && dart run main.dart",
|
|
+ },
|
|
+ elixir: {
|
|
+ setup: "mix new /tmp/curlconverter/elixircurlconverter/ && sed -i '' 's/# {:dep_from_hexpm, \"~> 0.3.0\"}/{:httpoison, \"~> 1.8\"}/g' /tmp/curlconverter/elixirelixircurlconverter/mix.exs && cd /tmp/curlconverter/elixirelixircurlconverter/ && mix deps.get",
|
|
+ copy: "cp <file> /tmp/curlconverter/elixirelixircurlconverter/main.ex",
|
|
+ exec: "cd /tmp/curlconverter/elixirelixircurlconverter && mix run main.ex",
|
|
+ dir: "elixircurlconverter",
|
|
+ },
|
|
+ go: {
|
|
+ copy: "go build -o /tmp/curlconverter/go/go <file>",
|
|
+ exec: "cd /tmp/curlconverter/go && /tmp/curlconverter/go/go",
|
|
+ },
|
|
+ httpie: {
|
|
+ copy: function (contents) {
|
|
+ fs.writeFileSync("/tmp/curlconverter/httpie/main", contents.trimEnd() + " --ignore-stdin" + "\n", "utf8");
|
|
+ },
|
|
+ exec: "chmod +x /tmp/curlconverter/httpie/main && /tmp/curlconverter/httpie/main",
|
|
+ },
|
|
+ java: {
|
|
+ copy: function (contents) {
|
|
+ const [imports, ...rest] = contents.split("\n\n");
|
|
+ fs.writeFileSync("/tmp/curlconverter/java/Main.java", imports +
|
|
+ "\n\n" +
|
|
+ "public class Main {\n" +
|
|
+ " public static void main(String[] args) throws Exception {\n" +
|
|
+ " " +
|
|
+ rest.join("\n\n") +
|
|
+ "\n" +
|
|
+ " }\n" +
|
|
+ "}\n", "utf8");
|
|
+ },
|
|
+ exec: "cd /tmp/curlconverter/java && javac Main.java && java Main",
|
|
+ },
|
|
+ "java-httpurlconnection": {
|
|
+ copy: "cp <file> /tmp/curlconverter/java-httpurlconnection/Main.java",
|
|
+ exec: "cd /tmp/curlconverter/java-httpurlconnection && javac Main.java && java Main",
|
|
+ },
|
|
+ "java-jsoup": {
|
|
+ setup: "if [ ! -d /tmp/curlconverter/java-jsoup ]; then echo setup java-jsoup by hand. && exit 1; fi",
|
|
+ // Like this:
|
|
+ // cd /tmp/curlconverter && mvn archetype:generate -DgroupId=com.mycompany.app -DartifactId=java-jsoup -DarchetypeArtifactId=maven-archetype-quickstart -DarchetypeVersion=1.4 -DinteractiveMode=false
|
|
+ // cd java-jsoup
|
|
+ // then manually edit java-jsoup/pom.xml to fix the version of Java:
|
|
+ // <properties>
|
|
+ // <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
|
+ // <maven.compiler.source>18</maven.compiler.source>
|
|
+ // <maven.compiler.target>18</maven.compiler.target>
|
|
+ // </properties>
|
|
+ // and to install jsoup:
|
|
+ // <dependencies>
|
|
+ // <dependency>
|
|
+ // <groupId>org.jsoup</groupId>
|
|
+ // <artifactId>jsoup</artifactId>
|
|
+ // <version>1.16.1</version>
|
|
+ // </dependency>
|
|
+ // </dependencies>
|
|
+ // then install:
|
|
+ // mvn install
|
|
+ // setup: "cd /tmp/curlconverter && mvn archetype:generate -DgroupId=com.mycompany.app -DartifactId=java-jsoup -DarchetypeArtifactId=maven-archetype-quickstart -DarchetypeVersion=1.4 -DinteractiveMode=false",
|
|
+ copy: function (contents) {
|
|
+ fs.writeFileSync("/tmp/curlconverter/java-jsoup/src/main/java/com/mycompany/app/Main.java", `package com.mycompany.app;\n\n` +
|
|
+ contents.replace("class Main", "public class Main"), "utf8");
|
|
+ },
|
|
+ exec: "cd /tmp/curlconverter/java-jsoup && mvn compile && mvn exec:java -Dexec.mainClass=com.mycompany.app.Main",
|
|
+ },
|
|
+ // mkdir -p /tmp/curlconverter/java-okhttp && cd /tmp/curlconverter/java-okhttp && curl https://repo1.maven.org/maven2/com/squareup/okhttp3/okhttp/4.11.0/okhttp-4.11.0.jar > okhttp-4.11.0.jar
|
|
+ // "java-okhttp": {
|
|
+ // setup: "mkdir -p /tmp/curlconverter/java-okhttp && cd /tmp/curlconverter/java-okhttp",
|
|
+ // copy: "cp <file> /tmp/curlconverter/java-okhttp/Main.java",
|
|
+ // exec: "cd /tmp/curlconverter/java-okhttp && javac -cp okhttp-4.11.0.jar Main.java && java Main",
|
|
+ // },
|
|
+ // javascript:
|
|
+ "javascript-jquery": {
|
|
+ setup: "cd /tmp && mkdir -p curlconverter/javascript-jquery && cd curlconverter/javascript-jquery && npm init -y es6 && npm install jquery jsdom",
|
|
+ copy: function (contents) {
|
|
+ fs.writeFileSync("/tmp/curlconverter/javascript-jquery/main.js", `import { JSDOM } from 'jsdom';
|
|
+const { window } = new JSDOM();
|
|
+import jQueryInit from 'jquery';
|
|
+var $ = jQueryInit(window);
|
|
+
|
|
+` + contents, "utf8");
|
|
+ },
|
|
+ exec: "cd /tmp/curlconverter/javascript-jquery && node main.js",
|
|
+ },
|
|
+ "javascript-xhr": {
|
|
+ setup: "cd /tmp && mkdir -p curlconverter/javascript-xhr && cd curlconverter/javascript-xhr && npm init -y es6 && npm install xmlhttprequest",
|
|
+ copy: function (contents) {
|
|
+ fs.writeFileSync("/tmp/curlconverter/javascript-xhr/main.js", "import { XMLHttpRequest } from 'xmlhttprequest';\n\n" + contents, "utf8");
|
|
+ },
|
|
+ exec: "cd /tmp/curlconverter/javascript-xhr && node main.js",
|
|
+ },
|
|
+ julia: {
|
|
+ exec: "julia <file>",
|
|
+ },
|
|
+ kotlin: {
|
|
+ copy: function (contents) {
|
|
+ fs.writeFileSync("/tmp/curlconverter/kotlin/script.main.kts", '@file:DependsOn("com.squareup.okhttp3:okhttp:4.11.0")\n\n' + contents, "utf8");
|
|
+ },
|
|
+ exec: "cd /tmp/curlconverter/kotlin && kotlin script.main.kts",
|
|
+ },
|
|
+ lua: {
|
|
+ exec: "lua <file>",
|
|
+ },
|
|
+ node: {
|
|
+ setup: "cd /tmp && mkdir -p curlconverter/node && cd curlconverter/node && npm init -y es6 && npm install node-fetch",
|
|
+ copy: "cp <file> /tmp/curlconverter/node/main.js",
|
|
+ exec: "cd /tmp/curlconverter/node && node main.js",
|
|
+ },
|
|
+ "node-axios": {
|
|
+ setup: "cd /tmp && mkdir -p curlconverter/node-axios && cd curlconverter/node-axios && npm init -y es6 && npm install axios form-data",
|
|
+ copy: "cp <file> /tmp/curlconverter/node-axios/main.js",
|
|
+ exec: "cd /tmp/curlconverter/node-axios && node main.js",
|
|
+ },
|
|
+ "node-http": {
|
|
+ setup: "cd /tmp && mkdir -p curlconverter/node-http && cd curlconverter/node-http && npm init -y es6 && npm install form-data",
|
|
+ copy: function (contents) {
|
|
+ fs.writeFileSync("/tmp/curlconverter/node-http/main.js", contents.replace("hostname: 'localhost:28139',", "hostname: 'localhost', port: 28139,"), "utf8");
|
|
+ },
|
|
+ exec: "cd /tmp/curlconverter/node-http && node main.js",
|
|
+ },
|
|
+ "node-superagent": {
|
|
+ setup: "cd /tmp && mkdir -p curlconverter/node-superagent && cd curlconverter/node-superagent && npm init -y es6 && npm install superagent",
|
|
+ copy: "cp <file> /tmp/curlconverter/node-superagent/main.js",
|
|
+ exec: "cd /tmp/curlconverter/node-superagent && node main.js",
|
|
+ },
|
|
+ objectivec: {
|
|
+ copy: function (contents) {
|
|
+ fs.writeFileSync("/tmp/curlconverter/objectivec/main.m", contents
|
|
+ .replace("#import <Foundation/Foundation.h>\n", "#import <Foundation/Foundation.h>\n" +
|
|
+ "\n" +
|
|
+ "int main(int argc, const char * argv[]) {\n" +
|
|
+ " @autoreleasepool {\n")
|
|
+ .replace("NSURLSession *session = ", "\ndispatch_semaphore_t semaphore = dispatch_semaphore_create(0);\nNSURLSession *session = ")
|
|
+ .replace(' NSLog(@"%@", httpResponse);\n' + " }\n", ' NSLog(@"%@", httpResponse);\n' +
|
|
+ " }\n" +
|
|
+ "dispatch_semaphore_signal(semaphore);\n") +
|
|
+ "dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);\n" +
|
|
+ " }\n" +
|
|
+ " return 0;\n" +
|
|
+ "}\n", "utf8");
|
|
+ },
|
|
+ exec: "cd /tmp/curlconverter/objectivec && clang -framework Foundation main.m -o main && ./main",
|
|
+ },
|
|
+ ocaml: {
|
|
+ copy: function (contents) {
|
|
+ fs.writeFileSync("/tmp/curlconverter/ocaml/main.ml", contents
|
|
+ .replace("\nlet uri = Uri.of_string ", "let body =\nlet uri = Uri.of_string ")
|
|
+ .replace(" (* Do stuff with the result *)\n", " body |> Cohttp_lwt.Body.to_string\n" +
|
|
+ "\n" +
|
|
+ "" +
|
|
+ "let () =\n" +
|
|
+ " let body = Lwt_main.run body in\n" +
|
|
+ " print_endline body\n"), "utf8");
|
|
+ },
|
|
+ exec: "cd /tmp/curlconverter/ocaml && eval `opam config env` && ocamlbuild -use-ocamlfind -tag thread -pkg cohttp-lwt-unix main.native && ./main.native",
|
|
+ },
|
|
+ perl: {
|
|
+ exec: "perl <file>",
|
|
+ },
|
|
+ php: {
|
|
+ exec: "php <file>",
|
|
+ },
|
|
+ // php composer.phar global require guzzlehttp/guzzle:^7.0
|
|
+ "php-guzzle": {
|
|
+ setup: "cd /tmp && mkdir -p curlconverter/php-guzzle && cd curlconverter/php-guzzle && php composer.phar require guzzlehttp/guzzle:^7.0",
|
|
+ copy: "cp <file> /tmp/curlconverter/php-guzzle/main.php",
|
|
+ exec: "cd /tmp/curlconverter/php-guzzle && php main.php",
|
|
+ },
|
|
+ powershell: {
|
|
+ copy: "cp <file> /tmp/curlconverter/powershell/main.ps1",
|
|
+ exec: "cd /tmp/curlconverter/powershell && pwsh main.ps1",
|
|
+ },
|
|
+ python: {
|
|
+ exec: "python3 <file>",
|
|
+ },
|
|
+ r: {
|
|
+ exec: "r < <file> --no-save",
|
|
+ },
|
|
+ "r-httr2": {
|
|
+ exec: "r < <file> --no-save",
|
|
+ },
|
|
+ ruby: {
|
|
+ exec: "ruby <file>",
|
|
+ },
|
|
+ "ruby-httparty": {
|
|
+ exec: "ruby <file>",
|
|
+ },
|
|
+ rust: {
|
|
+ setup: "cd /tmp && cargo init --vcs none /tmp/curlconverter/rust && cd /tmp/curlconverter/rust && cargo add reqwest --features reqwest/blocking,reqwest/json",
|
|
+ copy: "cp <file> /tmp/curlconverter/rust/src/main.rs",
|
|
+ exec: "cd /tmp/curlconverter/rust && cargo run",
|
|
+ },
|
|
+ swift: {
|
|
+ copy: function (contents) {
|
|
+ fs.writeFileSync("/tmp/curlconverter/swift/main.swift", contents
|
|
+ .replace("import Foundation\n", "import Foundation\n\n// testing\nlet group = DispatchGroup()\ngroup.enter()\n")
|
|
+ .replace('print(str ?? "")\n }\n', 'print(str ?? "")\n }\n\n // testing\n group.leave()\n') +
|
|
+ `
|
|
+// testing
|
|
+group.notify(queue: .main) {
|
|
+ exit(EXIT_SUCCESS) // Exit program when done
|
|
+}
|
|
+dispatchMain()\n`, "utf8");
|
|
+ },
|
|
+ exec: "cd /tmp/curlconverter/swift && swift main.swift",
|
|
+ },
|
|
+ wget: {
|
|
+ exec: "bash <file>",
|
|
+ },
|
|
+};
|
|
+const argv = await yargs(hideBin(process.argv))
|
|
+ .scriptName("compare-request")
|
|
+ .usage("Usage: $0 [--no-diff] [-l <language>] [test_name...]")
|
|
+ .option("diff", {
|
|
+ describe: "print a colorized diff instead of the raw requests",
|
|
+ default: true,
|
|
+ demandOption: false,
|
|
+ type: "boolean",
|
|
+})
|
|
+ .option("sort", {
|
|
+ describe: "sort lines before comparing them",
|
|
+ default: false,
|
|
+ demandOption: false,
|
|
+ type: "boolean",
|
|
+})
|
|
+ .option("l", {
|
|
+ alias: "language",
|
|
+ describe: "the language of the generated program to compare against",
|
|
+ choices: Object.keys(executables),
|
|
+ default: ["python"],
|
|
+ demandOption: false,
|
|
+ type: "string",
|
|
+})
|
|
+ .alias("h", "help")
|
|
+ .help()
|
|
+ .parse();
|
|
+const languages = Array.isArray(argv.language)
|
|
+ ? argv.language
|
|
+ : [argv.language];
|
|
+const testFile = async (testFilename, languages) => {
|
|
+ const rawRequests = [];
|
|
+ // TODO: this is flaky
|
|
+ const server = net.createServer();
|
|
+ server.on("connection", (socket) => {
|
|
+ socket.setEncoding("utf8");
|
|
+ // Timeout very quickly because we only care about recieving the sent request.
|
|
+ socket.setTimeout(800, () => {
|
|
+ socket.end();
|
|
+ });
|
|
+ socket.on("data", (data) => {
|
|
+ // TODO: this is not a Buffer, it's a string...
|
|
+ rawRequests.push(data.replace(/\r\n/g, "\n"));
|
|
+ if (!socket.write(MINIMAL_HTTP_RESPONSE)) {
|
|
+ socket.pause();
|
|
+ }
|
|
+ });
|
|
+ socket.on("drain", () => {
|
|
+ socket.resume();
|
|
+ });
|
|
+ socket.on("timeout", () => {
|
|
+ socket.end();
|
|
+ });
|
|
+ socket.on("close", (error) => {
|
|
+ if (error) {
|
|
+ console.error("transmission error");
|
|
+ }
|
|
+ });
|
|
+ setTimeout(() => {
|
|
+ socket.destroy();
|
|
+ }, 1000);
|
|
+ });
|
|
+ server.maxConnections = 1;
|
|
+ server.listen(DEFAULT_PORT);
|
|
+ // setTimeout(function(){
|
|
+ // server.close();
|
|
+ // }, 5000);
|
|
+ const inputFile = path.join(fixturesDir, "curl_commands", testFilename + ".sh");
|
|
+ if (!fs.existsSync(inputFile)) {
|
|
+ server.close();
|
|
+ throw new Error("input file doesn't exist: " + inputFile);
|
|
+ }
|
|
+ const curlCommand = fs.readFileSync(inputFile, "utf8");
|
|
+ const requestedUrl = parse(curlCommand)[0]
|
|
+ .urls[0].url.replace("http://", "")
|
|
+ .toString();
|
|
+ if (!requestedUrl.startsWith(EXPECTED_URL)) {
|
|
+ console.error("bad requested URL for " + testFilename);
|
|
+ console.error(" " + requestedUrl);
|
|
+ console.error("it needs to request");
|
|
+ console.error(" http://" + EXPECTED_URL);
|
|
+ console.error("so we can capture the data it sends.");
|
|
+ server.close();
|
|
+ return;
|
|
+ }
|
|
+ try {
|
|
+ await awaitableExec("bash " + inputFile);
|
|
+ }
|
|
+ catch (e) { }
|
|
+ const files = languages.map((l) => path.join(fixturesDir, l, testFilename + converters[l].extension));
|
|
+ for (let i = 0; i < languages.length; i++) {
|
|
+ const language = languages[i];
|
|
+ const languageFile = files[i];
|
|
+ const executable = executables[language];
|
|
+ if (fs.existsSync(languageFile)) {
|
|
+ if ("copy" in executable) {
|
|
+ if (typeof executable.copy === "function") {
|
|
+ executable.copy(fs.readFileSync(languageFile).toString());
|
|
+ }
|
|
+ else {
|
|
+ await awaitableExec(executable.copy.replace("<file>", languageFile));
|
|
+ }
|
|
+ }
|
|
+ // TODO: escape?
|
|
+ const command = executable.exec.replace("<file>", languageFile);
|
|
+ try {
|
|
+ await awaitableExec(command);
|
|
+ }
|
|
+ catch (e) {
|
|
+ // Uncomment for debugging. An error can happen because
|
|
+ // our server responds with a generic response.
|
|
+ console.error(e);
|
|
+ }
|
|
+ }
|
|
+ else {
|
|
+ console.error(language + " file doesn't exist, skipping: " + languageFile);
|
|
+ }
|
|
+ }
|
|
+ // TODO: allow ignoring headers for each converter
|
|
+ function sortLines(a) {
|
|
+ return (a
|
|
+ .split("\n")
|
|
+ .filter(Boolean)
|
|
+ .filter((s) => !s.toLowerCase().startsWith("user-agent: "))
|
|
+ .sort(Intl.Collator().compare)
|
|
+ .join("\n") + "\n");
|
|
+ }
|
|
+ const requestName = path.parse(inputFile).name;
|
|
+ console.log(requestName);
|
|
+ console.log("=".repeat(requestName.length));
|
|
+ console.log(fs.readFileSync(inputFile).toString());
|
|
+ for (const f of files) {
|
|
+ if (fs.existsSync(f)) {
|
|
+ console.log("=".repeat(requestName.length));
|
|
+ console.log(fs.readFileSync(f).toString());
|
|
+ }
|
|
+ }
|
|
+ console.log("=".repeat(requestName.length));
|
|
+ const [curlRequest, ...languageRequests] = rawRequests;
|
|
+ for (const languageRequest of languageRequests) {
|
|
+ if (argv.diff) {
|
|
+ const a = argv.sort ? sortLines(curlRequest) : curlRequest;
|
|
+ const b = argv.sort ? sortLines(languageRequest) : languageRequest;
|
|
+ for (const part of diffLines(a, b)) {
|
|
+ // green for additions, red for deletions
|
|
+ // grey for common parts
|
|
+ const color = part.added ? "green" : part.removed ? "red" : "grey";
|
|
+ process.stdout.write(colors[color](part.value));
|
|
+ }
|
|
+ }
|
|
+ else {
|
|
+ console.log(curlRequest);
|
|
+ console.log(languageRequest);
|
|
+ }
|
|
+ }
|
|
+ console.log();
|
|
+ server.close();
|
|
+};
|
|
+// if no tests were specified, run them all
|
|
+const tests = argv._;
|
|
+if (!tests.length) {
|
|
+ const possibleTestFiles = fs
|
|
+ .readdirSync(path.join(fixturesDir, "curl_commands"))
|
|
+ .filter((n) => n.endsWith(".sh"));
|
|
+ for (const testFile of possibleTestFiles) {
|
|
+ for (const l of languages) {
|
|
+ if (fs.existsSync(path.join(fixturesDir, l, testFile.replace(".sh", converters[l].extension)))) {
|
|
+ tests.push(testFile);
|
|
+ break;
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+ if (!tests.length) {
|
|
+ console.error("no tests found");
|
|
+ process.exit(1);
|
|
+ }
|
|
+}
|
|
+// fs.rmSync(testDir, { recursive: true, force: true });
|
|
+if (tests.length) {
|
|
+ for (const l of languages) {
|
|
+ const executable = executables[l];
|
|
+ let dir = l;
|
|
+ if ("dir" in executable) {
|
|
+ dir = executable.dir;
|
|
+ }
|
|
+ fs.mkdirSync(path.join(testDir, dir), { recursive: true });
|
|
+ if ("setup" in executable) {
|
|
+ console.error("running");
|
|
+ console.error(executable.setup);
|
|
+ await awaitableExec(executable.setup);
|
|
+ console.error();
|
|
+ }
|
|
+ }
|
|
+}
|
|
+function delay(ms) {
|
|
+ return new Promise((resolve) => setTimeout(resolve, ms));
|
|
+}
|
|
+for (const test of tests.sort()) {
|
|
+ const testName = path.parse(test.toString()).name;
|
|
+ await testFile(testName, languages);
|
|
+ await delay(1000);
|
|
+}
|
|
+process.exit(0);
|
|
+//# sourceMappingURL=compare-requests.js.map
|
|
\ No newline at end of file
|
|
diff --git a/dist/tools/compare-requests.js.map b/dist/tools/compare-requests.js.map
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..748dee6867d6d3254cdc0239ed965cdf83342dd3
|
|
--- /dev/null
|
|
+++ b/dist/tools/compare-requests.js.map
|
|
@@ -0,0 +1 @@
|
|
+{"version":3,"file":"compare-requests.js","sourceRoot":"","sources":["../../tools/compare-requests.ts"],"names":[],"mappings":"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"}
|
|
\ No newline at end of file
|
|
diff --git a/dist/tools/gen-test.d.ts b/dist/tools/gen-test.d.ts
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..b7988016daa5bf0b3d4fcdccaba52780a9983d9d
|
|
--- /dev/null
|
|
+++ b/dist/tools/gen-test.d.ts
|
|
@@ -0,0 +1,2 @@
|
|
+#!/usr/bin/env node
|
|
+export {};
|
|
diff --git a/dist/tools/gen-test.js b/dist/tools/gen-test.js
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..23cb7acd18a564ff18cc0ef400a5b3b01fed5b57
|
|
--- /dev/null
|
|
+++ b/dist/tools/gen-test.js
|
|
@@ -0,0 +1,114 @@
|
|
+#!/usr/bin/env node
|
|
+import fs from "fs";
|
|
+import path from "path";
|
|
+import yargs from "yargs";
|
|
+import { hideBin } from "yargs/helpers";
|
|
+import { fixturesDir, converters } from "../test/test-utils.js";
|
|
+const curlCommandDir = path.resolve(fixturesDir, "curl_commands");
|
|
+const argv = await yargs(hideBin(process.argv))
|
|
+ .scriptName("gen-test")
|
|
+ .usage("Usage: $0 [-l <language>] [curl_command_filename...]")
|
|
+ .option("l", {
|
|
+ alias: "language",
|
|
+ describe: "the language to convert the curl command to " +
|
|
+ "(`--language parser` saves parser state as JSON)",
|
|
+ choices: Object.keys(converters),
|
|
+ default: Object.keys(converters),
|
|
+ defaultDescription: "all of them",
|
|
+ demandOption: false,
|
|
+ type: "string",
|
|
+})
|
|
+ .option("all", {
|
|
+ describe: "generate all tests for all languages",
|
|
+ default: false,
|
|
+ demandOption: false,
|
|
+ type: "boolean",
|
|
+})
|
|
+ .positional("curl_command_filename", {
|
|
+ // this has no effect, it's here for --help
|
|
+ describe: "the file to read the curl command from (or just its name without its path or file extension)",
|
|
+ type: "string",
|
|
+})
|
|
+ .alias("h", "help")
|
|
+ .help().argv;
|
|
+const languages = Array.isArray(argv.language)
|
|
+ ? argv.language
|
|
+ : [argv.language];
|
|
+for (const language of languages) {
|
|
+ // Create the directory if it doesn't exist
|
|
+ const outDir = path.resolve(curlCommandDir, "..", language);
|
|
+ if (!fs.existsSync(outDir)) {
|
|
+ console.error("creating directory " + outDir);
|
|
+ fs.mkdirSync(outDir);
|
|
+ }
|
|
+}
|
|
+if (argv.all && argv._.length) {
|
|
+ console.error("--all passed, ignoring names of test files");
|
|
+}
|
|
+const overwriteExistingOnly = !argv._.length && !argv.all;
|
|
+const inFiles = !argv._.length || argv.all
|
|
+ ? fs.readdirSync(curlCommandDir).filter((p) => p.endsWith(".sh"))
|
|
+ : argv._;
|
|
+const inPaths = inFiles.map((infile) => {
|
|
+ // Remove path and file extension
|
|
+ const filename = path.parse(infile.toString()).name;
|
|
+ const testfile = path.join(curlCommandDir, filename + ".sh");
|
|
+ if (!fs.existsSync(testfile)) {
|
|
+ console.error("no such file: " + testfile);
|
|
+ process.exit();
|
|
+ }
|
|
+ return testfile;
|
|
+});
|
|
+const printEachFile = inPaths.length < 10 || languages.length < Object.keys(converters).length;
|
|
+let total = 0;
|
|
+for (const inPath of inPaths) {
|
|
+ const curl = fs.readFileSync(inPath, "utf8");
|
|
+ for (const language of languages) {
|
|
+ const converter = converters[language];
|
|
+ const newFilename = path
|
|
+ .basename(inPath)
|
|
+ .replace(/\.sh$/, converter.extension);
|
|
+ const outDir = path.resolve(inPath, "../..", language);
|
|
+ if (!fs.existsSync(outDir)) {
|
|
+ console.error("creating directory " + outDir);
|
|
+ fs.mkdirSync(outDir);
|
|
+ }
|
|
+ const outPath = path.join(outDir, newFilename);
|
|
+ let code;
|
|
+ try {
|
|
+ code = converter.converter(curl);
|
|
+ }
|
|
+ catch (e) {
|
|
+ console.error("error converting curl command to " + language);
|
|
+ console.error(inPath);
|
|
+ console.error();
|
|
+ console.error(curl);
|
|
+ console.error();
|
|
+ console.error(e);
|
|
+ continue;
|
|
+ }
|
|
+ // Might as well generate the output to check
|
|
+ if (overwriteExistingOnly && !fs.existsSync(outPath)) {
|
|
+ continue;
|
|
+ }
|
|
+ const orig = fs.existsSync(outPath) ? fs.readFileSync(outPath, "utf8") : "";
|
|
+ fs.writeFileSync(outPath, code);
|
|
+ if (orig !== code) {
|
|
+ if (printEachFile) {
|
|
+ console.error("wrote to " + path.relative(fixturesDir, outPath));
|
|
+ }
|
|
+ else {
|
|
+ total += 1;
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+}
|
|
+if (!printEachFile) {
|
|
+ console.error("wrote " + total + " file" + (total === 1 ? "" : "s"));
|
|
+}
|
|
+// if (inPaths.length && languages.length) {
|
|
+// console.error(
|
|
+// "Please carefully check all the output for correctness before committing."
|
|
+// );
|
|
+// }
|
|
+//# sourceMappingURL=gen-test.js.map
|
|
\ No newline at end of file
|
|
diff --git a/dist/tools/gen-test.js.map b/dist/tools/gen-test.js.map
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..609359c64a6db14b63fef6021ac51771dd4ebddb
|
|
--- /dev/null
|
|
+++ b/dist/tools/gen-test.js.map
|
|
@@ -0,0 +1 @@
|
|
+{"version":3,"file":"gen-test.js","sourceRoot":"","sources":["../../tools/gen-test.ts"],"names":[],"mappings":"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"}
|
|
\ No newline at end of file
|
|
diff --git a/src/Request.ts b/src/Request.ts
|
|
index 14c42824ebf34141b543c1f84453678956283056..efbfed2fb1713febdef6bac248d88539f4f3ce0f 100644
|
|
--- a/src/Request.ts
|
|
+++ b/src/Request.ts
|
|
@@ -123,6 +123,8 @@ export interface Request {
|
|
compressed?: boolean;
|
|
transferEncoding?: boolean;
|
|
|
|
+ include?: boolean;
|
|
+
|
|
multipartUploads?: FormParam[];
|
|
// When multipartUploads comes from parsing a string in --data
|
|
// this can be set to true to say that sending the original data
|
|
@@ -924,7 +926,7 @@ function buildRequest(
|
|
}
|
|
if ((config.output || []).length > config.url.length) {
|
|
warnf(global_, [
|
|
- "too-many-ouptut-files",
|
|
+ "too-many-output-files",
|
|
"Got more --output/-o options than URLs: " +
|
|
config.output?.map((f) => JSON.stringify(f.toString())).join(", "),
|
|
]);
|
|
@@ -983,6 +985,10 @@ function buildRequest(
|
|
request.transferEncoding = config["tr-encoding"];
|
|
}
|
|
|
|
+ if (config.include) {
|
|
+ request.include = true;
|
|
+ }
|
|
+
|
|
if (config.json) {
|
|
headers.setIfMissing("Content-Type", "application/json");
|
|
headers.setIfMissing("Accept", "application/json");
|
|
diff --git a/src/generators/json.ts b/src/generators/json.ts
|
|
index 4a1a9561eaef1369c8ef41adb54239f92cdff98e..8c053ed374dc1ed18302ad69e488d87d16b06905 100644
|
|
--- a/src/generators/json.ts
|
|
+++ b/src/generators/json.ts
|
|
@@ -18,7 +18,12 @@ export const supportedArgs = new Set([
|
|
"no-location",
|
|
"location-trusted",
|
|
"no-location-trusted",
|
|
+ "max-redirs",
|
|
|
|
+ "output",
|
|
+ "include",
|
|
+
|
|
+ "proxy",
|
|
"max-time",
|
|
"connect-timeout",
|
|
|
|
@@ -37,8 +42,7 @@ export const supportedArgs = new Set([
|
|
"no-ntlm-wb",
|
|
]);
|
|
|
|
-// TODO: export this or Request
|
|
-type JSONOutput = {
|
|
+export type JSONOutput = {
|
|
url: string;
|
|
raw_url: string;
|
|
method: string;
|
|
@@ -53,15 +57,21 @@ type JSONOutput = {
|
|
insecure?: boolean;
|
|
compressed?: boolean;
|
|
|
|
+ include?: boolean;
|
|
auth?: { user: string; password: string };
|
|
auth_type?: AuthType;
|
|
aws_sigv4?: string;
|
|
delegation?: string;
|
|
|
|
follow_redirects?: boolean; // --location
|
|
+ max_redirects?: number;
|
|
+
|
|
+ proxy?: string;
|
|
|
|
timeout?: number; // --max-time
|
|
connect_timeout?: number;
|
|
+
|
|
+ output?: string;
|
|
};
|
|
|
|
function getDataString(
|
|
@@ -133,23 +143,24 @@ function getFilesString(
|
|
};
|
|
}
|
|
|
|
-export function _toJsonString(
|
|
+export function _toJsonObject(
|
|
requests: Request[],
|
|
warnings: Warnings = [],
|
|
-): string {
|
|
+): JSONOutput {
|
|
const request = getFirst(requests, warnings);
|
|
+ const requestUrl = request.urls[0];
|
|
|
|
const requestJson: JSONOutput = {
|
|
- url: (request.urls[0].queryDict
|
|
- ? request.urls[0].urlWithoutQueryList
|
|
- : request.urls[0].url
|
|
+ url: (requestUrl.queryDict
|
|
+ ? requestUrl.urlWithoutQueryList
|
|
+ : requestUrl.url
|
|
)
|
|
.toString()
|
|
.replace(/\/$/, ""),
|
|
// url: request.queryDict ? request.urlWithoutQueryList : request.url,
|
|
- raw_url: request.urls[0].url.toString(),
|
|
+ raw_url: requestUrl.url.toString(),
|
|
// TODO: move this after .query?
|
|
- method: request.urls[0].method.toLowerCase().toString(), // lowercase for backwards compatibility
|
|
+ method: requestUrl.method.toLowerCase().toString(), // lowercase for backwards compatibility
|
|
};
|
|
// if (request.queryDict) {
|
|
// requestJson.query = request.queryDict
|
|
@@ -174,10 +185,10 @@ export function _toJsonString(
|
|
requestJson.headers = Object.fromEntries(headers);
|
|
}
|
|
|
|
- if (request.urls[0].queryDict) {
|
|
+ if (requestUrl.queryDict) {
|
|
// TODO: rename
|
|
requestJson.queries = Object.fromEntries(
|
|
- request.urls[0].queryDict.map((q) => [
|
|
+ requestUrl.queryDict.map((q) => [
|
|
q[0].toString(),
|
|
Array.isArray(q[1]) ? q[1].map((qq) => qq.toString()) : q[1].toString(),
|
|
]),
|
|
@@ -199,8 +210,12 @@ export function _toJsonString(
|
|
requestJson.insecure = false;
|
|
}
|
|
|
|
- if (request.urls[0].auth) {
|
|
- const [user, password] = request.urls[0].auth;
|
|
+ if (request.include) {
|
|
+ requestJson.include = true;
|
|
+ }
|
|
+
|
|
+ if (requestUrl.auth) {
|
|
+ const [user, password] = requestUrl.auth;
|
|
requestJson.auth = {
|
|
user: user.toString(),
|
|
password: password.toString(),
|
|
@@ -218,6 +233,13 @@ export function _toJsonString(
|
|
|
|
if (Object.prototype.hasOwnProperty.call(request, "followRedirects")) {
|
|
requestJson.follow_redirects = request.followRedirects;
|
|
+ if (request.maxRedirects) {
|
|
+ requestJson.max_redirects = parseInt(request.maxRedirects.toString(), 10);
|
|
+ }
|
|
+ }
|
|
+
|
|
+ if (request.proxy) {
|
|
+ requestJson.proxy = request.proxy.toString();
|
|
}
|
|
|
|
if (request.timeout) {
|
|
@@ -227,6 +249,29 @@ export function _toJsonString(
|
|
requestJson.connect_timeout = parseFloat(request.connectTimeout.toString());
|
|
}
|
|
|
|
+ if (requestUrl.output) {
|
|
+ requestJson.output = requestUrl.output.toString();
|
|
+ }
|
|
+
|
|
+ return requestJson;
|
|
+}
|
|
+export function toJsonObjectWarn(
|
|
+ curlCommand: string | string[],
|
|
+ warnings: Warnings = [],
|
|
+): [JSONOutput, Warnings] {
|
|
+ const requests = parse(curlCommand, supportedArgs, warnings);
|
|
+ const json = _toJsonObject(requests, warnings);
|
|
+ return [json, warnings];
|
|
+}
|
|
+export function toJsonObject(curlCommand: string | string[]): JSONOutput {
|
|
+ return toJsonObjectWarn(curlCommand)[0];
|
|
+}
|
|
+
|
|
+export function _toJsonString(
|
|
+ requests: Request[],
|
|
+ warnings: Warnings = [],
|
|
+): string {
|
|
+ const requestJson = _toJsonObject(requests, warnings);
|
|
return (
|
|
JSON.stringify(
|
|
Object.keys(requestJson).length ? requestJson : "{}",
|
|
diff --git a/src/index.ts b/src/index.ts
|
|
index 9402a577c419ccc4b083b58e8422409d408670a3..c97377a1d46585c3f7ae694149c0def07a97acb2 100644
|
|
--- a/src/index.ts
|
|
+++ b/src/index.ts
|
|
@@ -28,7 +28,13 @@ export {
|
|
toJavaScriptXHR,
|
|
toJavaScriptXHRWarn,
|
|
} from "./generators/javascript/xhr.js";
|
|
-export { toJsonString, toJsonStringWarn } from "./generators/json.js";
|
|
+export {
|
|
+ toJsonObject,
|
|
+ toJsonObjectWarn,
|
|
+ toJsonString,
|
|
+ toJsonStringWarn,
|
|
+ type JSONOutput,
|
|
+} from "./generators/json.js";
|
|
export { toJulia, toJuliaWarn } from "./generators/julia.js";
|
|
export { toKotlin, toKotlinWarn } from "./generators/kotlin.js";
|
|
export { toLua, toLuaWarn } from "./generators/lua.js";
|