From 66baca6ff8557b368d2b8c80e1210c805f9a828b Mon Sep 17 00:00:00 2001 From: Dimitri Mitropoulos Date: Tue, 26 Apr 2022 08:30:09 -0400 Subject: [PATCH 01/12] Total Overhaul (but with all the same fixtures!) (#248) see https://github.com/Kong/httpsnippet/pull/248 and the commits therein for more context. Essentially: - the original client fixtures were unchanged, which hopefully means the - all source code is now in strict mode TypeScript - tests are now all in jest - the file structure was reorganized so that everything for a particular client is in one place - the CLI is updated and now using yargs - all dependencies were updated and some (i.e. `format.utils`) were able to be removed entirely - more work left to do (including CI with GitHub Actions, for example), but this is a start --- .editorconfig | 10 + .eslintignore | 3 + .eslintrc.js | 30 + .gitattributes | 1 + .gitignore | 1 + .npmignore | 9 +- .prettierignore | 5 + .prettierrc.js | 16 + .travis.yml | 12 - .vscode/extensions.json | 3 + .vscode/settings.json | 4 + CONTRIBUTING.md | 126 +- LICENSE | 2 +- README.md | 128 +- bin/httpsnippet | 97 +- jest.config.js | 17 + package-lock.json | 10261 +++++++++++----- package.json | 87 +- src/cli.ts | 99 + src/fixtures/customTarget.ts | 14 + src/fixtures/mimetypes.ts | 84 + .../requests/application-form-encoded.json | 0 .../fixtures/requests/application-json.json | 0 {test => src}/fixtures/requests/cookies.json | 2 +- .../fixtures/requests/custom-method.json | 0 {test => src}/fixtures/requests/full.json | 2 +- {test => src}/fixtures/requests/headers.json | 0 {test => src}/fixtures/requests/https.json | 0 .../fixtures/requests/jsonObj-multiline.json | 10 +- .../fixtures/requests/jsonObj-null-value.json | 12 +- .../fixtures/requests/multipart-data.json | 0 .../fixtures/requests/multipart-file.json | 0 .../requests/multipart-form-data.json | 0 {test => src}/fixtures/requests/nested.json | 2 +- {test => src}/fixtures/requests/query.json | 0 {test => src}/fixtures/requests/short.json | 0 .../fixtures/requests/text-plain.json | 0 src/fixtures/runCustomFixtures.ts | 42 + .../helpers/__snapshots__/utils.test.ts.snap | 616 +- src/helpers/code-builder.js | 103 - src/helpers/code-builder.test.ts | 21 + src/helpers/code-builder.ts | 67 + src/helpers/{form-data.js => form-data.ts} | 88 +- src/helpers/har-validator.ts | 31 + src/helpers/headers.js | 39 - src/helpers/headers.test.ts | 39 + src/helpers/headers.ts | 24 + src/helpers/reducer.js | 24 - src/helpers/reducer.test.ts | 27 + src/helpers/reducer.ts | 22 + src/helpers/shell.js | 25 - src/helpers/shell.ts | 18 + src/helpers/utils.test.ts | 19 + src/helpers/utils.ts | 15 + src/httpsnippet.test.ts | 220 + src/httpsnippet.ts | 336 + src/index.js | 332 - src/targets/c/index.js | 12 - src/targets/c/libcurl.js | 50 - src/targets/c/libcurl/client.ts | 50 + .../fixtures}/application-form-encoded.c | 2 +- .../c/libcurl/fixtures}/application-json.c | 2 +- .../targets/c/libcurl/fixtures}/cookies.c | 2 +- .../c/libcurl/fixtures}/custom-method.c | 2 +- .../targets/c/libcurl/fixtures}/full.c | 2 +- .../targets/c/libcurl/fixtures}/headers.c | 2 +- .../targets/c/libcurl/fixtures}/https.c | 2 +- .../c/libcurl/fixtures}/jsonObj-multiline.c | 2 +- .../c/libcurl/fixtures}/jsonObj-null-value.c | 2 +- .../c/libcurl/fixtures}/multipart-data.c | 2 +- .../c/libcurl/fixtures}/multipart-file.c | 2 +- .../c/libcurl/fixtures}/multipart-form-data.c | 2 +- .../targets/c/libcurl/fixtures}/nested.c | 2 +- .../targets/c/libcurl/fixtures}/query.c | 2 +- .../targets/c/libcurl/fixtures}/short.c | 2 +- .../targets/c/libcurl/fixtures}/text-plain.c | 2 +- src/targets/c/target.ts | 14 + src/targets/clojure/clj_http.js | 160 - src/targets/clojure/clj_http/client.ts | 193 + .../fixtures}/application-form-encoded.clj | 2 +- .../clj_http/fixtures}/application-json.clj | 2 +- .../clojure/clj_http/fixtures}/cookies.clj | 2 +- .../clj_http/fixtures/custom-method.clj | 1 + .../clojure/clj_http/fixtures}/full.clj | 2 +- .../clojure/clj_http/fixtures}/headers.clj | 2 +- .../clojure/clj_http/fixtures}/https.clj | 2 +- .../clj_http/fixtures/jsonObj-multiline.clj | 1 + .../clj_http/fixtures/jsonObj-null-value.clj | 1 + .../clj_http/fixtures}/multipart-data.clj | 2 +- .../clj_http/fixtures}/multipart-file.clj | 2 +- .../fixtures}/multipart-form-data.clj | 2 +- .../clojure/clj_http/fixtures}/nested.clj | 2 +- .../clojure/clj_http/fixtures}/query.clj | 2 +- .../clojure/clj_http/fixtures}/short.clj | 2 +- .../clojure/clj_http/fixtures/text-plain.clj | 3 + src/targets/clojure/index.js | 12 - src/targets/clojure/target.ts | 14 + src/targets/csharp/httpclient.js | 157 - src/targets/csharp/httpclient/client.ts | 169 + .../fixtures}/application-form-encoded.cs | 2 +- .../httpclient/fixtures}/application-json.cs | 2 +- .../csharp/httpclient/fixtures}/cookies.cs | 2 +- .../httpclient/fixtures}/custom-method.cs | 2 +- .../csharp/httpclient/fixtures}/full.cs | 2 +- .../csharp/httpclient/fixtures}/headers.cs | 2 +- .../csharp/httpclient/fixtures}/https.cs | 2 +- .../httpclient/fixtures}/jsonObj-multiline.cs | 2 +- .../fixtures}/jsonObj-null-value.cs | 2 +- .../httpclient/fixtures}/multipart-data.cs | 2 +- .../httpclient/fixtures}/multipart-file.cs | 2 +- .../fixtures}/multipart-form-data.cs | 2 +- .../csharp/httpclient/fixtures}/nested.cs | 2 +- .../csharp/httpclient/fixtures}/query.cs | 2 +- .../csharp/httpclient/fixtures}/short.cs | 2 +- .../csharp/httpclient/fixtures}/text-plain.cs | 2 +- src/targets/csharp/index.js | 13 - src/targets/csharp/restsharp.js | 51 - src/targets/csharp/restsharp/client.ts | 44 + .../fixtures}/application-form-encoded.cs | 2 +- .../restsharp/fixtures}/application-json.cs | 2 +- .../csharp/restsharp/fixtures}/cookies.cs | 2 +- .../restsharp/fixtures/custom-method.cs | 1 + .../csharp/restsharp/fixtures}/full.cs | 2 +- .../csharp/restsharp/fixtures}/headers.cs | 2 +- .../csharp/restsharp/fixtures}/https.cs | 2 +- .../restsharp/fixtures}/jsonObj-multiline.cs | 2 +- .../restsharp/fixtures}/jsonObj-null-value.cs | 2 +- .../restsharp/fixtures}/multipart-data.cs | 2 +- .../restsharp/fixtures}/multipart-file.cs | 2 +- .../fixtures}/multipart-form-data.cs | 2 +- .../csharp/restsharp/fixtures}/nested.cs | 2 +- .../csharp/restsharp/fixtures}/query.cs | 2 +- .../csharp/restsharp/fixtures}/short.cs | 2 +- .../csharp/restsharp/fixtures}/text-plain.cs | 2 +- src/targets/csharp/target.ts | 17 + src/targets/go/index.js | 12 - src/targets/go/native.js | 137 - src/targets/go/native/client.test.ts | 42 + src/targets/go/native/client.ts | 143 + .../fixtures}/application-form-encoded.go | 2 +- .../go/native/fixtures}/application-json.go | 2 +- .../go/native/fixtures/boilerplate-option.go | 17 + .../go/native/fixtures/check-errors-option.go | 39 + .../targets/go/native/fixtures}/cookies.go | 2 +- .../go/native/fixtures}/custom-method.go | 2 +- .../targets/go/native/fixtures}/full.go | 2 +- .../targets/go/native/fixtures}/headers.go | 2 +- .../targets/go/native/fixtures}/https.go | 2 +- .../go/native/fixtures}/jsonObj-multiline.go | 2 +- .../go/native/fixtures}/jsonObj-null-value.go | 2 +- .../go/native/fixtures}/multipart-data.go | 2 +- .../go/native/fixtures}/multipart-file.go | 2 +- .../native/fixtures}/multipart-form-data.go | 2 +- .../targets/go/native/fixtures}/nested.go | 2 +- .../go/native/fixtures/print-body-option.go | 25 + .../targets/go/native/fixtures}/query.go | 2 +- .../targets/go/native/fixtures}/short.go | 2 +- .../targets/go/native/fixtures}/text-plain.go | 2 +- .../go/native/fixtures/timeout-option.go | 35 + src/targets/go/target.ts | 14 + src/targets/har-schema.d.ts | 4 + src/targets/http/http1.1.js | 99 - src/targets/http/http1.1/client.ts | 89 + .../fixtures}/application-form-encoded | 12 +- .../http/http1.1/fixtures}/application-json | 12 +- .../targets/http/http1.1/fixtures}/cookies | 9 +- .../http/http1.1/fixtures}/custom-method | 7 +- .../targets/http/http1.1/fixtures}/full | 16 +- .../targets/http/http1.1/fixtures}/headers | 11 +- .../targets/http/http1.1/fixtures}/https | 7 +- .../http/http1.1/fixtures}/jsonObj-multiline | 12 +- .../http/http1.1/fixtures}/jsonObj-null-value | 12 +- .../http/http1.1/fixtures}/multipart-data | 22 +- .../http/http1.1/fixtures}/multipart-file | 22 +- .../http1.1/fixtures}/multipart-form-data | 20 +- .../targets/http/http1.1/fixtures}/nested | 7 +- .../targets/http/http1.1/fixtures}/query | 7 +- .../targets/http/http1.1/fixtures}/short | 7 +- .../targets/http/http1.1/fixtures}/text-plain | 12 +- src/targets/http/index.js | 12 - src/targets/http/target.ts | 14 + src/targets/index.js | 22 - src/targets/java/asynchttp.js | 55 - src/targets/java/asynchttp/client.ts | 50 + .../fixtures}/application-form-encoded.java | 2 +- .../asynchttp/fixtures}/application-json.java | 2 +- .../java/asynchttp/fixtures}/cookies.java | 2 +- .../asynchttp/fixtures}/custom-method.java | 2 +- .../java/asynchttp/fixtures}/full.java | 2 +- .../java/asynchttp/fixtures}/headers.java | 2 +- .../java/asynchttp/fixtures}/https.java | 2 +- .../fixtures}/jsonObj-multiline.java | 2 +- .../fixtures}/jsonObj-null-value.java | 2 +- .../asynchttp/fixtures}/multipart-data.java | 2 +- .../asynchttp/fixtures}/multipart-file.java | 2 +- .../fixtures}/multipart-form-data.java | 2 +- .../java/asynchttp/fixtures}/nested.java | 2 +- .../java/asynchttp/fixtures}/query.java | 2 +- .../java/asynchttp/fixtures}/short.java | 2 +- .../java/asynchttp/fixtures}/text-plain.java | 2 +- src/targets/java/index.js | 15 - src/targets/java/nethttp.js | 63 - src/targets/java/nethttp/client.ts | 60 + .../fixtures}/application-form-encoded.java | 2 +- .../nethttp/fixtures}/application-json.java | 2 +- .../java/nethttp/fixtures}/cookies.java | 2 +- .../java/nethttp/fixtures}/custom-method.java | 2 +- .../targets/java/nethttp/fixtures}/full.java | 2 +- .../java/nethttp/fixtures}/headers.java | 2 +- .../targets/java/nethttp/fixtures}/https.java | 2 +- .../nethttp/fixtures}/jsonObj-multiline.java | 2 +- .../nethttp/fixtures}/jsonObj-null-value.java | 2 +- .../nethttp/fixtures}/multipart-data.java | 2 +- .../nethttp/fixtures}/multipart-file.java | 2 +- .../fixtures}/multipart-form-data.java | 2 +- .../java/nethttp/fixtures}/nested.java | 2 +- .../targets/java/nethttp/fixtures}/query.java | 2 +- .../targets/java/nethttp/fixtures}/short.java | 2 +- .../java/nethttp/fixtures}/text-plain.java | 2 +- src/targets/java/okhttp.js | 78 - src/targets/java/okhttp/client.ts | 74 + .../fixtures}/application-form-encoded.java | 2 +- .../okhttp/fixtures}/application-json.java | 2 +- .../java/okhttp/fixtures}/cookies.java | 2 +- .../java/okhttp/fixtures}/custom-method.java | 2 +- .../targets/java/okhttp/fixtures}/full.java | 2 +- .../java/okhttp/fixtures}/headers.java | 2 +- .../targets/java/okhttp/fixtures}/https.java | 2 +- .../okhttp/fixtures}/jsonObj-multiline.java | 2 +- .../okhttp/fixtures}/jsonObj-null-value.java | 2 +- .../java/okhttp/fixtures}/multipart-data.java | 2 +- .../java/okhttp/fixtures}/multipart-file.java | 2 +- .../okhttp/fixtures}/multipart-form-data.java | 2 +- .../targets/java/okhttp/fixtures}/nested.java | 2 +- .../targets/java/okhttp/fixtures}/query.java | 2 +- .../targets/java/okhttp/fixtures}/short.java | 2 +- .../java/okhttp/fixtures}/text-plain.java | 2 +- src/targets/java/target.ts | 21 + src/targets/java/unirest.js | 54 - src/targets/java/unirest/client.ts | 52 + .../fixtures}/application-form-encoded.java | 2 +- .../unirest/fixtures}/application-json.java | 2 +- .../java/unirest/fixtures}/cookies.java | 2 +- .../java/unirest/fixtures}/custom-method.java | 2 +- .../targets/java/unirest/fixtures}/full.java | 2 +- .../java/unirest/fixtures}/headers.java | 2 +- .../targets/java/unirest/fixtures}/https.java | 2 +- .../unirest/fixtures}/jsonObj-multiline.java | 2 +- .../unirest/fixtures}/jsonObj-null-value.java | 2 +- .../unirest/fixtures}/multipart-data.java | 2 +- .../unirest/fixtures}/multipart-file.java | 2 +- .../fixtures}/multipart-form-data.java | 2 +- .../java/unirest/fixtures}/nested.java | 2 +- .../targets/java/unirest/fixtures}/query.java | 2 +- .../targets/java/unirest/fixtures}/short.java | 2 +- .../java/unirest/fixtures}/text-plain.java | 2 +- src/targets/javascript/axios.js | 89 - src/targets/javascript/axios/client.ts | 94 + .../fixtures/application-form-encoded.js | 17 + .../axios/fixtures}/application-json.js | 15 +- .../javascript/axios/fixtures/cookies.js | 16 + .../axios/fixtures/custom-method.js | 12 + .../javascript/axios/fixtures}/full.js | 15 +- .../javascript/axios/fixtures/headers.js | 16 + .../javascript/axios/fixtures/https.js | 12 + .../axios/fixtures/jsonObj-multiline.js | 17 + .../axios/fixtures/jsonObj-null-value.js | 17 + .../axios/fixtures/multipart-data.js | 20 + .../axios/fixtures/multipart-file.js | 20 + .../axios/fixtures}/multipart-form-data.js | 17 +- .../javascript/axios/fixtures/nested.js | 16 + .../javascript/axios/fixtures/query.js | 16 + .../javascript/axios/fixtures/short.js | 12 + .../javascript/axios/fixtures/text-plain.js | 17 + src/targets/javascript/fetch.js | 101 - src/targets/javascript/fetch/client.ts | 99 + .../fixtures}/application-form-encoded.js | 2 +- .../fetch/fixtures}/application-json.js | 2 +- .../javascript/fetch/fixtures}/cookies.js | 2 +- .../fetch/fixtures}/custom-method.js | 2 +- .../javascript/fetch/fixtures}/full.js | 2 +- .../javascript/fetch/fixtures}/headers.js | 2 +- .../javascript/fetch/fixtures}/https.js | 2 +- .../fetch/fixtures}/jsonObj-multiline.js | 2 +- .../fetch/fixtures}/jsonObj-null-value.js | 2 +- .../fetch/fixtures}/multipart-data.js | 4 +- .../fetch/fixtures}/multipart-file.js | 4 +- .../fetch/fixtures}/multipart-form-data.js | 4 +- .../javascript/fetch/fixtures}/nested.js | 2 +- .../javascript/fetch/fixtures}/query.js | 2 +- .../javascript/fetch/fixtures}/short.js | 2 +- .../javascript/fetch/fixtures}/text-plain.js | 2 +- src/targets/javascript/index.js | 15 - src/targets/javascript/jquery.js | 83 - src/targets/javascript/jquery/client.ts | 94 + .../fixtures/application-form-encoded.js | 17 + .../jquery/fixtures/application-json.js | 15 + .../javascript/jquery/fixtures/cookies.js | 13 + .../jquery/fixtures/custom-method.js | 11 + .../javascript/jquery/fixtures/full.js | 18 + .../javascript/jquery/fixtures/headers.js | 14 + .../javascript/jquery/fixtures/https.js | 11 + .../jquery/fixtures/jsonObj-multiline.js | 15 + .../jquery/fixtures/jsonObj-null-value.js | 15 + .../jquery/fixtures/multipart-data.js | 18 + .../jquery/fixtures/multipart-file.js | 18 + .../jquery/fixtures/multipart-form-data.js | 18 + .../javascript/jquery/fixtures/nested.js | 11 + .../javascript/jquery/fixtures/query.js | 11 + .../javascript/jquery/fixtures/short.js | 11 + .../javascript/jquery/fixtures/text-plain.js | 14 + src/targets/javascript/target.ts | 21 + src/targets/javascript/xhr.js | 82 - src/targets/javascript/xhr/client.test.ts | 18 + src/targets/javascript/xhr/client.ts | 96 + .../xhr/fixtures/application-form-encoded.js | 15 + .../xhr/fixtures/application-json.js | 34 + .../javascript/xhr/fixtures/cookies.js | 7 +- src/targets/javascript/xhr/fixtures/cors.js | 13 + .../javascript/xhr/fixtures}/custom-method.js | 6 +- src/targets/javascript/xhr/fixtures/full.js | 17 + .../javascript/xhr/fixtures/headers.js | 16 + .../targets/javascript/xhr/fixtures}/https.js | 6 +- .../xhr/fixtures/jsonObj-multiline.js | 17 + .../xhr/fixtures/jsonObj-null-value.js | 17 + .../xhr/fixtures}/multipart-data.js | 8 +- .../xhr/fixtures}/multipart-file.js | 8 +- .../xhr/fixtures}/multipart-form-data.js | 8 +- src/targets/javascript/xhr/fixtures/nested.js | 14 + .../targets/javascript/xhr/fixtures}/query.js | 6 +- .../targets/javascript/xhr/fixtures}/short.js | 6 +- .../javascript/xhr/fixtures/text-plain.js | 15 + src/targets/kotlin/index.js | 12 - src/targets/kotlin/okhttp.js | 78 - src/targets/kotlin/okhttp/client.ts | 75 + .../fixtures}/application-form-encoded.kt | 2 +- .../okhttp/fixtures}/application-json.kt | 2 +- .../kotlin/okhttp/fixtures}/cookies.kt | 2 +- .../kotlin/okhttp/fixtures}/custom-method.kt | 2 +- .../targets/kotlin/okhttp/fixtures}/full.kt | 2 +- .../kotlin/okhttp/fixtures}/headers.kt | 2 +- .../targets/kotlin/okhttp/fixtures}/https.kt | 2 +- .../okhttp/fixtures}/jsonObj-multiline.kt | 2 +- .../okhttp/fixtures}/jsonObj-null-value.kt | 2 +- .../kotlin/okhttp/fixtures}/multipart-data.kt | 2 +- .../kotlin/okhttp/fixtures}/multipart-file.kt | 2 +- .../okhttp/fixtures}/multipart-form-data.kt | 2 +- .../targets/kotlin/okhttp/fixtures}/nested.kt | 2 +- .../targets/kotlin/okhttp/fixtures}/query.kt | 2 +- .../targets/kotlin/okhttp/fixtures}/short.kt | 2 +- .../kotlin/okhttp/fixtures}/text-plain.kt | 2 +- src/targets/kotlin/target.ts | 14 + src/targets/node/axios.js | 73 - src/targets/node/axios/client.ts | 79 + .../fixtures/application-form-encoded.js | 17 + .../node/axios/fixtures}/application-json.js | 15 +- src/targets/node/axios/fixtures/cookies.js | 16 + .../node/axios/fixtures/custom-method.js | 12 + .../targets/node/axios/fixtures}/full.js | 15 +- src/targets/node/axios/fixtures/headers.js | 16 + src/targets/node/axios/fixtures/https.js | 12 + .../node/axios/fixtures/jsonObj-multiline.js | 17 + .../node/axios/fixtures/jsonObj-null-value.js | 17 + .../node/axios/fixtures}/multipart-data.js | 15 +- .../node/axios/fixtures}/multipart-file.js | 15 +- .../axios/fixtures}/multipart-form-data.js | 15 +- src/targets/node/axios/fixtures/nested.js | 16 + src/targets/node/axios/fixtures/query.js | 16 + src/targets/node/axios/fixtures/short.js | 12 + src/targets/node/axios/fixtures/text-plain.js | 17 + src/targets/node/fetch.js | 118 - src/targets/node/fetch/client.ts | 121 + .../fixtures}/application-form-encoded.js | 2 +- .../node/fetch/fixtures}/application-json.js | 2 +- .../targets/node/fetch/fixtures}/cookies.js | 2 +- .../node/fetch/fixtures}/custom-method.js | 2 +- .../targets/node/fetch/fixtures}/full.js | 2 +- .../targets/node/fetch/fixtures}/headers.js | 2 +- .../targets/node/fetch/fixtures}/https.js | 2 +- .../node/fetch/fixtures}/jsonObj-multiline.js | 2 +- .../fetch/fixtures}/jsonObj-null-value.js | 2 +- .../node/fetch/fixtures}/multipart-data.js | 2 +- .../node/fetch/fixtures}/multipart-file.js | 2 +- .../fetch/fixtures}/multipart-form-data.js | 2 +- .../targets/node/fetch/fixtures}/nested.js | 2 +- .../targets/node/fetch/fixtures}/query.js | 2 +- .../targets/node/fetch/fixtures}/short.js | 2 +- .../node/fetch/fixtures}/text-plain.js | 2 +- src/targets/node/index.js | 16 - src/targets/node/native.js | 86 - src/targets/node/native/client.ts | 92 + .../fixtures/application-form-encoded.js | 28 + .../node/native/fixtures}/application-json.js | 20 +- src/targets/node/native/fixtures/cookies.js | 26 + .../node/native/fixtures}/custom-method.js | 18 +- src/targets/node/native/fixtures/full.js | 30 + src/targets/node/native/fixtures/headers.js | 27 + .../targets/node/native/fixtures}/https.js | 18 +- .../native/fixtures}/jsonObj-multiline.js | 20 +- .../native/fixtures}/jsonObj-null-value.js | 20 +- .../node/native/fixtures/multipart-data.js | 27 + .../node/native/fixtures/multipart-file.js | 27 + .../native/fixtures/multipart-form-data.js | 27 + src/targets/node/native/fixtures/nested.js | 24 + src/targets/node/native/fixtures/query.js | 24 + .../targets/node/native/fixtures}/short.js | 18 +- .../node/native/fixtures/text-plain.js | 27 + src/targets/node/request.js | 126 - src/targets/node/request/client.ts | 135 + .../fixtures}/application-form-encoded.js | 3 +- .../request/fixtures}/application-json.js | 3 +- .../targets/node/request/fixtures}/cookies.js | 5 +- .../node/request/fixtures}/custom-method.js | 3 +- .../targets/node/request/fixtures}/full.js | 5 +- .../targets/node/request/fixtures}/headers.js | 3 +- .../targets/node/request/fixtures}/https.js | 3 +- .../request/fixtures}/jsonObj-multiline.js | 3 +- .../request/fixtures}/jsonObj-null-value.js | 3 +- .../node/request/fixtures}/multipart-data.js | 3 +- .../node/request/fixtures}/multipart-file.js | 3 +- .../request/fixtures}/multipart-form-data.js | 3 +- .../targets/node/request/fixtures}/nested.js | 3 +- .../targets/node/request/fixtures}/query.js | 3 +- .../targets/node/request/fixtures}/short.js | 3 +- .../node/request/fixtures}/text-plain.js | 3 +- src/targets/node/target.ts | 22 + src/targets/node/unirest.js | 119 - src/targets/node/unirest/client.ts | 126 + .../fixtures/application-form-encoded.js | 18 + .../node/unirest/fixtures/application-json.js | 35 + src/targets/node/unirest/fixtures/cookies.js | 14 + .../node/unirest/fixtures/custom-method.js | 9 + src/targets/node/unirest/fixtures/full.js | 32 + src/targets/node/unirest/fixtures/headers.js | 14 + .../targets/node/unirest/fixtures}/https.js | 7 +- .../unirest/fixtures/jsonObj-multiline.js | 18 + .../unirest/fixtures/jsonObj-null-value.js | 18 + .../node/unirest/fixtures/multipart-data.js | 20 + .../node/unirest/fixtures/multipart-file.js | 21 + .../unirest/fixtures/multipart-form-data.js | 19 + src/targets/node/unirest/fixtures/nested.js | 15 + src/targets/node/unirest/fixtures/query.js | 18 + .../targets/node/unirest/fixtures}/short.js | 7 +- .../node/unirest/fixtures/text-plain.js | 15 + src/targets/objc/helpers.js | 79 - src/targets/objc/helpers.ts | 65 + src/targets/objc/index.js | 12 - src/targets/objc/nsurlsession.js | 136 - src/targets/objc/nsurlsession/client.test.ts | 36 + src/targets/objc/nsurlsession/client.ts | 176 + .../fixtures}/application-form-encoded.m | 2 +- .../nsurlsession/fixtures}/application-json.m | 2 +- .../objc/nsurlsession/fixtures}/cookies.m | 2 +- .../nsurlsession/fixtures}/custom-method.m | 2 +- .../objc/nsurlsession/fixtures}/full.m | 2 +- .../objc/nsurlsession/fixtures}/headers.m | 2 +- .../objc/nsurlsession/fixtures}/https.m | 2 +- .../nsurlsession/fixtures/indent-option.m | 18 + .../fixtures/json-with-null-value.m | 25 + .../fixtures}/jsonObj-multiline.m | 2 +- .../fixtures}/jsonObj-null-value.m | 2 +- .../nsurlsession/fixtures}/multipart-data.m | 2 +- .../nsurlsession/fixtures}/multipart-file.m | 2 +- .../fixtures}/multipart-form-data.m | 2 +- .../objc/nsurlsession/fixtures}/nested.m | 2 +- .../nsurlsession/fixtures/pretty-option.m | 24 + .../objc/nsurlsession/fixtures}/query.m | 2 +- .../objc/nsurlsession/fixtures}/short.m | 2 +- .../objc/nsurlsession/fixtures}/text-plain.m | 2 +- .../nsurlsession/fixtures/timeout-option.m | 18 + src/targets/objc/target.ts | 14 + src/targets/ocaml/cohttp.js | 71 - src/targets/ocaml/cohttp/client.ts | 74 + .../fixtures}/application-form-encoded.ml | 2 +- .../cohttp/fixtures}/application-json.ml | 2 +- .../targets/ocaml/cohttp/fixtures}/cookies.ml | 2 +- .../ocaml/cohttp/fixtures}/custom-method.ml | 2 +- .../targets/ocaml/cohttp/fixtures}/full.ml | 2 +- .../targets/ocaml/cohttp/fixtures}/headers.ml | 2 +- .../targets/ocaml/cohttp/fixtures}/https.ml | 2 +- .../cohttp/fixtures}/jsonObj-multiline.ml | 2 +- .../cohttp/fixtures}/jsonObj-null-value.ml | 2 +- .../ocaml/cohttp/fixtures}/multipart-data.ml | 2 +- .../ocaml/cohttp/fixtures}/multipart-file.ml | 2 +- .../cohttp/fixtures}/multipart-form-data.ml | 2 +- .../targets/ocaml/cohttp/fixtures}/nested.ml | 2 +- .../targets/ocaml/cohttp/fixtures}/query.ml | 2 +- .../targets/ocaml/cohttp/fixtures}/short.ml | 2 +- .../ocaml/cohttp/fixtures}/text-plain.ml | 2 +- src/targets/ocaml/index.js | 12 - src/targets/ocaml/target.ts | 14 + src/targets/php/curl.js | 138 - src/targets/php/curl/client.ts | 156 + .../fixtures}/application-form-encoded.php | 2 +- .../php/curl/fixtures}/application-json.php | 2 +- .../targets/php/curl/fixtures}/cookies.php | 2 +- .../php/curl/fixtures}/custom-method.php | 2 +- .../targets/php/curl/fixtures}/full.php | 2 +- .../targets/php/curl/fixtures}/headers.php | 2 +- .../targets/php/curl/fixtures}/https.php | 2 +- .../php/curl/fixtures}/jsonObj-multiline.php | 2 +- .../php/curl/fixtures}/jsonObj-null-value.php | 2 +- .../php/curl/fixtures}/multipart-data.php | 2 +- .../php/curl/fixtures}/multipart-file.php | 2 +- .../curl/fixtures}/multipart-form-data.php | 2 +- .../targets/php/curl/fixtures}/nested.php | 2 +- .../targets/php/curl/fixtures}/query.php | 2 +- .../targets/php/curl/fixtures}/short.php | 2 +- .../targets/php/curl/fixtures}/text-plain.php | 2 +- src/targets/php/helpers.js | 86 - src/targets/php/helpers.ts | 70 + src/targets/php/http1.js | 96 - src/targets/php/http1/client.ts | 103 + .../fixtures}/application-form-encoded.php | 2 +- .../php/http1/fixtures}/application-json.php | 2 +- .../targets/php/http1/fixtures}/cookies.php | 2 +- .../php/http1/fixtures}/custom-method.php | 2 +- .../targets/php/http1/fixtures}/full.php | 2 +- .../targets/php/http1/fixtures}/headers.php | 2 +- .../targets/php/http1/fixtures}/https.php | 2 +- .../php/http1/fixtures}/jsonObj-multiline.php | 2 +- .../http1/fixtures}/jsonObj-null-value.php | 2 +- .../php/http1/fixtures}/multipart-data.php | 14 +- .../php/http1/fixtures}/multipart-file.php | 14 +- .../http1/fixtures}/multipart-form-data.php | 12 +- .../targets/php/http1/fixtures}/nested.php | 2 +- .../targets/php/http1/fixtures}/query.php | 2 +- .../targets/php/http1/fixtures}/short.php | 2 +- .../php/http1/fixtures}/text-plain.php | 2 +- src/targets/php/http2.js | 132 - src/targets/php/http2/client.ts | 151 + .../fixtures}/application-form-encoded.php | 2 +- .../php/http2/fixtures}/application-json.php | 2 +- .../targets/php/http2/fixtures}/cookies.php | 2 +- .../php/http2/fixtures}/custom-method.php | 2 +- .../targets/php/http2/fixtures}/full.php | 2 +- .../targets/php/http2/fixtures}/headers.php | 2 +- .../targets/php/http2/fixtures}/https.php | 2 +- .../php/http2/fixtures}/jsonObj-multiline.php | 2 +- .../http2/fixtures}/jsonObj-null-value.php | 2 +- .../php/http2/fixtures}/multipart-data.php | 2 +- .../php/http2/fixtures}/multipart-file.php | 2 +- .../http2/fixtures}/multipart-form-data.php | 2 +- .../targets/php/http2/fixtures}/nested.php | 2 +- .../targets/php/http2/fixtures}/query.php | 2 +- .../targets/php/http2/fixtures}/short.php | 2 +- .../php/http2/fixtures}/text-plain.php | 2 +- src/targets/php/index.js | 14 - src/targets/php/target.ts | 18 + src/targets/powershell/common.js | 55 - src/targets/powershell/common.ts | 66 + src/targets/powershell/index.js | 13 - src/targets/powershell/restmethod.js | 10 - src/targets/powershell/restmethod/client.ts | 12 + .../fixtures}/application-form-encoded.ps1 | 2 +- .../restmethod/fixtures}/application-json.ps1 | 2 +- .../restmethod/fixtures}/cookies.ps1 | 2 +- .../restmethod/fixtures/custom-method.ps1 | 1 + .../powershell/restmethod/fixtures}/full.ps1 | 2 +- .../restmethod/fixtures}/headers.ps1 | 2 +- .../powershell/restmethod/fixtures}/https.ps1 | 2 +- .../fixtures}/jsonObj-multiline.ps1 | 2 +- .../fixtures}/jsonObj-null-value.ps1 | 2 +- .../restmethod/fixtures}/multipart-data.ps1 | 14 +- .../restmethod/fixtures}/multipart-file.ps1 | 14 +- .../fixtures}/multipart-form-data.ps1 | 12 +- .../restmethod/fixtures}/nested.ps1 | 2 +- .../powershell/restmethod/fixtures}/query.ps1 | 2 +- .../powershell/restmethod/fixtures}/short.ps1 | 2 +- .../restmethod/fixtures}/text-plain.ps1 | 2 +- src/targets/powershell/target.ts | 16 + src/targets/powershell/webrequest.js | 10 - src/targets/powershell/webrequest/client.ts | 12 + .../fixtures}/application-form-encoded.ps1 | 2 +- .../webrequest/fixtures}/application-json.ps1 | 2 +- .../webrequest/fixtures}/cookies.ps1 | 2 +- .../webrequest/fixtures/custom-method.ps1 | 1 + .../powershell/webrequest/fixtures}/full.ps1 | 2 +- .../webrequest/fixtures}/headers.ps1 | 2 +- .../powershell/webrequest/fixtures}/https.ps1 | 2 +- .../fixtures}/jsonObj-multiline.ps1 | 2 +- .../fixtures}/jsonObj-null-value.ps1 | 2 +- .../webrequest/fixtures}/multipart-data.ps1 | 14 +- .../webrequest/fixtures}/multipart-file.ps1 | 14 +- .../fixtures}/multipart-form-data.ps1 | 12 +- .../webrequest/fixtures}/nested.ps1 | 2 +- .../powershell/webrequest/fixtures}/query.ps1 | 2 +- .../powershell/webrequest/fixtures}/short.ps1 | 2 +- .../webrequest/fixtures}/text-plain.ps1 | 2 +- src/targets/python/helpers.js | 81 - src/targets/python/helpers.ts | 92 + src/targets/python/index.js | 13 - src/targets/python/python3.js | 91 - src/targets/python/python3/client.ts | 88 + .../fixtures}/application-form-encoded.py | 2 +- .../python3/fixtures}/application-json.py | 2 +- .../python/python3/fixtures}/cookies.py | 2 +- .../python/python3/fixtures}/custom-method.py | 2 +- .../targets/python/python3/fixtures}/full.py | 2 +- .../python/python3/fixtures}/headers.py | 2 +- .../targets/python/python3/fixtures}/https.py | 2 +- .../python3/fixtures}/jsonObj-multiline.py | 2 +- .../python3/fixtures}/jsonObj-null-value.py | 2 +- .../python3/fixtures}/multipart-data.py | 2 +- .../python3/fixtures}/multipart-file.py | 2 +- .../python3/fixtures}/multipart-form-data.py | 2 +- .../python/python3/fixtures}/nested.py | 2 +- .../targets/python/python3/fixtures}/query.py | 2 +- .../targets/python/python3/fixtures}/short.py | 2 +- .../python/python3/fixtures}/text-plain.py | 2 +- src/targets/python/requests.js | 126 - src/targets/python/requests/client.test.ts | 17 + src/targets/python/requests/client.ts | 128 + .../fixtures}/application-form-encoded.py | 2 +- .../requests/fixtures}/application-json.py | 2 +- .../python/requests/fixtures}/cookies.py | 2 +- .../requests/fixtures}/custom-method.py | 2 +- .../targets/python/requests/fixtures}/full.py | 2 +- .../python/requests/fixtures}/headers.py | 2 +- .../python/requests/fixtures}/https.py | 2 +- .../requests/fixtures}/jsonObj-multiline.py | 2 +- .../requests/fixtures}/jsonObj-null-value.py | 2 +- .../requests/fixtures}/multipart-data.py | 2 +- .../requests/fixtures}/multipart-file.py | 2 +- .../requests/fixtures}/multipart-form-data.py | 2 +- .../python/requests/fixtures}/nested.py | 2 +- .../python/requests/fixtures/query-params.py | 9 + .../python/requests/fixtures}/query.py | 2 +- .../python/requests/fixtures}/short.py | 2 +- .../python/requests/fixtures}/text-plain.py | 2 +- src/targets/python/target.ts | 16 + src/targets/r/httr.js | 152 - src/targets/r/httr/client.ts | 155 + .../httr/fixtures}/application-form-encoded.r | 2 +- .../r/httr/fixtures}/application-json.r | 2 +- .../targets/r/httr/fixtures}/cookies.r | 2 +- .../targets/r/httr/fixtures}/custom-method.r | 2 +- .../targets/r/httr/fixtures}/full.r | 2 +- .../targets/r/httr/fixtures}/headers.r | 2 +- .../targets/r/httr/fixtures}/https.r | 2 +- .../r/httr/fixtures}/jsonObj-multiline.r | 2 +- .../r/httr/fixtures}/jsonObj-null-value.r | 2 +- .../targets/r/httr/fixtures}/multipart-data.r | 2 +- .../targets/r/httr/fixtures}/multipart-file.r | 2 +- .../r/httr/fixtures}/multipart-form-data.r | 2 +- .../targets/r/httr/fixtures}/nested.r | 2 +- .../targets/r/httr/fixtures}/query.r | 2 +- .../targets/r/httr/fixtures}/short.r | 2 +- .../targets/r/httr/fixtures}/text-plain.r | 2 +- src/targets/r/index.js | 12 - src/targets/r/target.ts | 14 + src/targets/ruby/index.js | 12 - src/targets/ruby/native.js | 66 - src/targets/ruby/native/client.ts | 79 + .../fixtures}/application-form-encoded.rb | 2 +- .../ruby/native/fixtures}/application-json.rb | 2 +- .../targets/ruby/native/fixtures}/cookies.rb | 2 +- .../ruby/native/fixtures}/custom-method.rb | 2 +- .../targets/ruby/native/fixtures}/full.rb | 2 +- .../targets/ruby/native/fixtures}/headers.rb | 2 +- .../targets/ruby/native/fixtures}/https.rb | 2 +- .../native/fixtures}/jsonObj-multiline.rb | 2 +- .../native/fixtures}/jsonObj-null-value.rb | 2 +- .../ruby/native/fixtures}/multipart-data.rb | 2 +- .../ruby/native/fixtures}/multipart-file.rb | 2 +- .../native/fixtures}/multipart-form-data.rb | 2 +- .../targets/ruby/native/fixtures}/nested.rb | 2 +- .../targets/ruby/native/fixtures}/query.rb | 2 +- .../targets/ruby/native/fixtures}/short.rb | 2 +- .../ruby/native/fixtures}/text-plain.rb | 2 +- src/targets/ruby/target.ts | 14 + src/targets/shell/curl.js | 118 - src/targets/shell/curl/client.test.ts | 75 + src/targets/shell/curl/client.ts | 134 + .../fixtures}/application-form-encoded.sh | 2 +- .../shell/curl/fixtures}/application-json.sh | 2 +- .../shell/curl/fixtures/binary-option.sh | 1 + .../targets/shell/curl/fixtures}/cookies.sh | 2 +- .../shell/curl/fixtures/custom-indentation.sh | 6 + .../shell/curl/fixtures/custom-method.sh | 2 + .../shell/curl/fixtures/dont-deglob.sh | 1 + .../targets/shell/curl/fixtures}/full.sh | 2 +- .../shell/curl/fixtures/globoff-option.sh | 1 + .../targets/shell/curl/fixtures}/headers.sh | 2 +- .../targets/shell/curl/fixtures}/http1.sh | 2 +- src/targets/shell/curl/fixtures/http10.sh | 1 + src/targets/shell/curl/fixtures/https.sh | 2 + .../shell/curl/fixtures}/jsonObj-multiline.sh | 2 +- .../curl/fixtures}/jsonObj-null-value.sh | 2 +- .../curl/fixtures/long-globoff-option.sh | 1 + .../shell/curl/fixtures}/multipart-data.sh | 2 +- .../shell/curl/fixtures}/multipart-file.sh | 2 +- .../curl/fixtures}/multipart-form-data.sh | 2 +- .../targets/shell/curl/fixtures}/nested.sh | 2 +- .../targets/shell/curl/fixtures}/query.sh | 2 +- .../shell/curl/fixtures/short-options.sh | 1 + src/targets/shell/curl/fixtures/short.sh | 2 + .../shell/curl/fixtures}/text-plain.sh | 2 +- src/targets/shell/httpie.js | 123 - src/targets/shell/httpie/client.test.ts | 72 + src/targets/shell/httpie/client.ts | 144 + .../fixtures}/application-form-encoded.sh | 2 +- .../httpie/fixtures}/application-json.sh | 2 +- .../shell/httpie/fixtures/build-parameters.sh | 1 + .../targets/shell/httpie/fixtures}/cookies.sh | 2 +- .../httpie/fixtures/custom-indentation.sh | 5 + .../shell/httpie/fixtures/custom-method.sh | 1 + .../targets/shell/httpie/fixtures}/full.sh | 2 +- .../targets/shell/httpie/fixtures}/headers.sh | 2 +- src/targets/shell/httpie/fixtures/https.sh | 1 + .../httpie/fixtures}/jsonObj-multiline.sh | 2 +- .../httpie/fixtures}/jsonObj-null-value.sh | 2 +- .../shell/httpie/fixtures/long-flags.sh | 1 + .../shell/httpie/fixtures}/multipart-data.sh | 14 +- .../shell/httpie/fixtures}/multipart-file.sh | 14 +- .../httpie/fixtures}/multipart-form-data.sh | 12 +- .../targets/shell/httpie/fixtures}/nested.sh | 2 +- .../targets/shell/httpie/fixtures}/query.sh | 2 +- .../httpie/fixtures/querystring-parameters.sh | 1 + .../shell/httpie/fixtures/short-flags.sh | 1 + src/targets/shell/httpie/fixtures/short.sh | 1 + .../shell/httpie/fixtures}/text-plain.sh | 2 +- .../shell/httpie/fixtures/verbose-output.sh | 1 + src/targets/shell/index.js | 14 - src/targets/shell/target.ts | 18 + src/targets/shell/wget.js | 54 - src/targets/shell/wget/client.test.ts | 35 + src/targets/shell/wget/client.ts | 63 + .../fixtures}/application-form-encoded.sh | 2 +- .../shell/wget/fixtures}/application-json.sh | 2 +- .../targets/shell/wget/fixtures}/cookies.sh | 2 +- .../shell/wget/fixtures/custom-indentation.sh | 8 + .../shell/wget/fixtures}/custom-method.sh | 2 +- .../targets/shell/wget/fixtures}/full.sh | 2 +- .../targets/shell/wget/fixtures}/headers.sh | 2 +- .../targets/shell/wget/fixtures}/https.sh | 2 +- .../shell/wget/fixtures}/jsonObj-multiline.sh | 2 +- .../wget/fixtures}/jsonObj-null-value.sh | 2 +- .../shell/wget/fixtures}/multipart-data.sh | 2 +- .../shell/wget/fixtures}/multipart-file.sh | 2 +- .../wget/fixtures}/multipart-form-data.sh | 2 +- .../targets/shell/wget/fixtures}/nested.sh | 2 +- src/targets/shell/wget/fixtures/query.sh | 4 + .../shell/wget/fixtures/short-options.sh | 1 + .../targets/shell/wget/fixtures}/short.sh | 2 +- .../shell/wget/fixtures}/text-plain.sh | 2 +- src/targets/shell/wget/fixtures/v-output.sh | 1 + .../shell/wget/fixtures/verbose-output.sh | 1 + src/targets/swift/helpers.js | 90 - src/targets/swift/helpers.ts | 89 + src/targets/swift/index.js | 12 - src/targets/swift/nsurlsession.js | 138 - src/targets/swift/nsurlsession/client.test.ts | 44 + src/targets/swift/nsurlsession/client.ts | 165 + .../fixtures}/application-form-encoded.swift | 2 +- .../fixtures}/application-json.swift | 2 +- .../nsurlsession/fixtures}/cookies.swift | 2 +- .../fixtures}/custom-method.swift | 2 +- .../swift/nsurlsession/fixtures}/full.swift | 2 +- .../nsurlsession/fixtures}/headers.swift | 2 +- .../swift/nsurlsession/fixtures}/https.swift | 2 +- .../nsurlsession/fixtures/indent-option.swift | 18 + .../fixtures/json-null-value.swift | 25 + .../fixtures}/jsonObj-multiline.swift | 2 +- .../fixtures}/jsonObj-null-value.swift | 2 +- .../fixtures}/multipart-data.swift | 2 +- .../fixtures}/multipart-file.swift | 2 +- .../fixtures}/multipart-form-data.swift | 2 +- .../swift/nsurlsession/fixtures}/nested.swift | 2 +- .../nsurlsession/fixtures/pretty-option.swift | 24 + .../swift/nsurlsession/fixtures}/query.swift | 2 +- .../swift/nsurlsession/fixtures}/short.swift | 2 +- .../nsurlsession/fixtures}/text-plain.swift | 2 +- .../fixtures/timeout-option.swift | 18 + src/targets/swift/target.ts | 14 + src/targets/targets.test.ts | 239 + src/targets/targets.ts | 204 + test/fixtures/cli.json | 25 - test/fixtures/curl/http1.json | 5 - test/fixtures/curl/index.js | 3 - test/fixtures/customTarget.js | 12 - test/fixtures/files/hello.txt | 1 - test/fixtures/har.json | 23 - test/fixtures/index.js | 3 - test/fixtures/mimetypes.json | 74 - .../output/clojure/clj_http/custom-method.clj | 1 - .../output/clojure/clj_http/text-plain.clj | 3 - .../output/csharp/restsharp/custom-method.cs | 1 - .../axios/application-form-encoded.js | 14 - .../output/javascript/axios/cookies.js | 13 - .../output/javascript/axios/custom-method.js | 9 - .../output/javascript/axios/headers.js | 13 - .../fixtures/output/javascript/axios/https.js | 9 - .../javascript/axios/jsonObj-multiline.js | 14 - .../javascript/axios/jsonObj-null-value.js | 14 - .../output/javascript/axios/multipart-data.js | 17 - .../output/javascript/axios/multipart-file.js | 17 - .../output/javascript/axios/nested.js | 13 - .../fixtures/output/javascript/axios/query.js | 13 - .../fixtures/output/javascript/axios/short.js | 9 - .../output/javascript/axios/text-plain.js | 14 - .../jquery/application-form-encoded.js | 17 - .../javascript/jquery/application-json.js | 15 - .../output/javascript/jquery/cookies.js | 13 - .../output/javascript/jquery/custom-method.js | 11 - .../fixtures/output/javascript/jquery/full.js | 18 - .../output/javascript/jquery/headers.js | 14 - .../output/javascript/jquery/https.js | 11 - .../javascript/jquery/jsonObj-multiline.js | 15 - .../javascript/jquery/jsonObj-null-value.js | 15 - .../javascript/jquery/multipart-data.js | 18 - .../javascript/jquery/multipart-file.js | 18 - .../javascript/jquery/multipart-form-data.js | 18 - .../output/javascript/jquery/nested.js | 11 - .../output/javascript/jquery/query.js | 11 - .../output/javascript/jquery/short.js | 11 - .../output/javascript/jquery/text-plain.js | 14 - .../xhr/application-form-encoded.js | 15 - .../output/javascript/xhr/application-json.js | 34 - .../fixtures/output/javascript/xhr/cookies.js | 15 - test/fixtures/output/javascript/xhr/full.js | 17 - .../fixtures/output/javascript/xhr/headers.js | 16 - .../javascript/xhr/jsonObj-multiline.js | 17 - .../javascript/xhr/jsonObj-null-value.js | 17 - .../output/javascript/xhr/text-plain.js | 15 - .../node/axios/application-form-encoded.js | 14 - test/fixtures/output/node/axios/cookies.js | 13 - .../output/node/axios/custom-method.js | 9 - test/fixtures/output/node/axios/headers.js | 13 - test/fixtures/output/node/axios/https.js | 9 - .../output/node/axios/jsonObj-multiline.js | 14 - .../output/node/axios/jsonObj-null-value.js | 14 - test/fixtures/output/node/axios/nested.js | 13 - test/fixtures/output/node/axios/query.js | 13 - test/fixtures/output/node/axios/short.js | 9 - test/fixtures/output/node/axios/text-plain.js | 14 - .../node/native/application-form-encoded.js | 28 - test/fixtures/output/node/native/cookies.js | 26 - test/fixtures/output/node/native/full.js | 30 - test/fixtures/output/node/native/headers.js | 27 - .../output/node/native/multipart-data.js | 27 - .../output/node/native/multipart-file.js | 27 - .../output/node/native/multipart-form-data.js | 27 - test/fixtures/output/node/native/nested.js | 24 - test/fixtures/output/node/native/query.js | 24 - .../fixtures/output/node/native/text-plain.js | 27 - .../node/unirest/application-form-encoded.js | 19 - .../output/node/unirest/application-json.js | 36 - test/fixtures/output/node/unirest/cookies.js | 15 - .../output/node/unirest/custom-method.js | 10 - test/fixtures/output/node/unirest/full.js | 33 - test/fixtures/output/node/unirest/headers.js | 15 - .../output/node/unirest/jsonObj-multiline.js | 19 - .../output/node/unirest/jsonObj-null-value.js | 19 - .../output/node/unirest/multipart-data.js | 21 - .../output/node/unirest/multipart-file.js | 22 - .../node/unirest/multipart-form-data.js | 20 - test/fixtures/output/node/unirest/nested.js | 16 - test/fixtures/output/node/unirest/query.js | 19 - .../output/node/unirest/text-plain.js | 16 - .../powershell/restmethod/custom-method.ps1 | 1 - .../powershell/webrequest/custom-method.ps1 | 1 - .../output/shell/curl/custom-method.sh | 2 - test/fixtures/output/shell/curl/https.sh | 2 - test/fixtures/output/shell/curl/short.sh | 2 - .../output/shell/httpie/custom-method.sh | 1 - test/fixtures/output/shell/httpie/https.sh | 1 - test/fixtures/output/shell/httpie/short.sh | 1 - test/fixtures/output/shell/wget/query.sh | 4 - test/fixtures/requests/index.js | 3 - test/headers.js | 41 - test/index.js | 231 - test/reducer.js | 37 - test/requests.js | 77 - test/targets.js | 222 - test/targets/c/libcurl.js | 5 - test/targets/clojure/clj_http.js | 5 - test/targets/csharp/httpclient.js | 5 - test/targets/csharp/restsharp.js | 5 - test/targets/go/native.js | 137 - test/targets/http/1.1.js | 5 - test/targets/java/asynchttp.js | 5 - test/targets/java/nethttp.js | 5 - test/targets/java/okhttp.js | 5 - test/targets/java/unirest.js | 5 - test/targets/javascript/axios.js | 3 - test/targets/javascript/fetch.js | 3 - test/targets/javascript/jquery.js | 3 - test/targets/javascript/xhr.js | 14 - test/targets/kotlin/okhttp.js | 5 - test/targets/node/axios.js | 3 - test/targets/node/fetch.js | 3 - test/targets/node/native.js | 3 - test/targets/node/request.js | 3 - test/targets/node/unirest.js | 3 - test/targets/objc/nsurlsession.js | 41 - test/targets/ocaml/cohttp.js | 3 - test/targets/php/curl.js | 3 - test/targets/php/http1.js | 3 - test/targets/php/http2.js | 3 - test/targets/powershell/restmethod.js | 5 - test/targets/powershell/webrequest.js | 5 - test/targets/python/python3.js | 5 - test/targets/python/requests.js | 22 - test/targets/r/httr.js | 5 - test/targets/ruby/native.js | 3 - test/targets/shell/curl.js | 75 - test/targets/shell/httpie.js | 92 - test/targets/shell/wget.js | 46 - test/targets/swift/nsurlsession.js | 41 - tsconfig.build.json | 14 + tsconfig.json | 9 + 912 files changed, 16500 insertions(+), 11426 deletions(-) create mode 100644 .eslintignore create mode 100644 .eslintrc.js create mode 100644 .gitattributes create mode 100644 .prettierignore create mode 100644 .prettierrc.js delete mode 100644 .travis.yml create mode 100644 .vscode/extensions.json create mode 100644 .vscode/settings.json create mode 100644 jest.config.js create mode 100644 src/cli.ts create mode 100644 src/fixtures/customTarget.ts create mode 100644 src/fixtures/mimetypes.ts rename {test => src}/fixtures/requests/application-form-encoded.json (100%) rename {test => src}/fixtures/requests/application-json.json (100%) rename {test => src}/fixtures/requests/cookies.json (91%) rename {test => src}/fixtures/requests/custom-method.json (100%) rename {test => src}/fixtures/requests/full.json (97%) rename {test => src}/fixtures/requests/headers.json (100%) rename {test => src}/fixtures/requests/https.json (100%) rename {test => src}/fixtures/requests/jsonObj-multiline.json (61%) rename {test => src}/fixtures/requests/jsonObj-null-value.json (68%) rename {test => src}/fixtures/requests/multipart-data.json (100%) rename {test => src}/fixtures/requests/multipart-file.json (100%) rename {test => src}/fixtures/requests/multipart-form-data.json (100%) rename {test => src}/fixtures/requests/nested.json (99%) rename {test => src}/fixtures/requests/query.json (100%) rename {test => src}/fixtures/requests/short.json (100%) rename {test => src}/fixtures/requests/text-plain.json (100%) create mode 100644 src/fixtures/runCustomFixtures.ts rename test/fixtures/available-targets.json => src/helpers/__snapshots__/utils.test.ts.snap (70%) delete mode 100644 src/helpers/code-builder.js create mode 100644 src/helpers/code-builder.test.ts create mode 100644 src/helpers/code-builder.ts rename src/helpers/{form-data.js => form-data.ts} (50%) create mode 100644 src/helpers/har-validator.ts delete mode 100644 src/helpers/headers.js create mode 100644 src/helpers/headers.test.ts create mode 100644 src/helpers/headers.ts delete mode 100644 src/helpers/reducer.js create mode 100644 src/helpers/reducer.test.ts create mode 100644 src/helpers/reducer.ts delete mode 100644 src/helpers/shell.js create mode 100644 src/helpers/shell.ts create mode 100644 src/helpers/utils.test.ts create mode 100644 src/helpers/utils.ts create mode 100644 src/httpsnippet.test.ts create mode 100644 src/httpsnippet.ts delete mode 100644 src/index.js delete mode 100644 src/targets/c/index.js delete mode 100644 src/targets/c/libcurl.js create mode 100644 src/targets/c/libcurl/client.ts rename {test/fixtures/output/c/libcurl => src/targets/c/libcurl/fixtures}/application-form-encoded.c (90%) rename {test/fixtures/output/c/libcurl => src/targets/c/libcurl/fixtures}/application-json.c (92%) rename {test/fixtures/output/c/libcurl => src/targets/c/libcurl/fixtures}/cookies.c (84%) rename {test/fixtures/output/c/libcurl => src/targets/c/libcurl/fixtures}/custom-method.c (79%) rename {test/fixtures/output/c/libcurl => src/targets/c/libcurl/fixtures}/full.c (93%) rename {test/fixtures/output/c/libcurl => src/targets/c/libcurl/fixtures}/headers.c (90%) rename {test/fixtures/output/c/libcurl => src/targets/c/libcurl/fixtures}/https.c (79%) rename {test/fixtures/output/c/libcurl => src/targets/c/libcurl/fixtures}/jsonObj-multiline.c (90%) rename {test/fixtures/output/c/libcurl => src/targets/c/libcurl/fixtures}/jsonObj-null-value.c (90%) rename {test/fixtures/output/c/libcurl => src/targets/c/libcurl/fixtures}/multipart-data.c (93%) rename {test/fixtures/output/c/libcurl => src/targets/c/libcurl/fixtures}/multipart-file.c (93%) rename {test/fixtures/output/c/libcurl => src/targets/c/libcurl/fixtures}/multipart-form-data.c (93%) rename {test/fixtures/output/c/libcurl => src/targets/c/libcurl/fixtures}/nested.c (82%) rename {test/fixtures/output/c/libcurl => src/targets/c/libcurl/fixtures}/query.c (82%) rename {test/fixtures/output/c/libcurl => src/targets/c/libcurl/fixtures}/short.c (79%) rename {test/fixtures/output/c/libcurl => src/targets/c/libcurl/fixtures}/text-plain.c (90%) create mode 100644 src/targets/c/target.ts delete mode 100644 src/targets/clojure/clj_http.js create mode 100644 src/targets/clojure/clj_http/client.ts rename {test/fixtures/output/clojure/clj_http => src/targets/clojure/clj_http/fixtures}/application-form-encoded.clj (96%) rename {test/fixtures/output/clojure/clj_http => src/targets/clojure/clj_http/fixtures}/application-json.clj (98%) rename {test/fixtures/output/clojure/clj_http => src/targets/clojure/clj_http/fixtures}/cookies.clj (87%) create mode 100644 src/targets/clojure/clj_http/fixtures/custom-method.clj rename {test/fixtures/output/clojure/clj_http => src/targets/clojure/clj_http/fixtures}/full.clj (87%) rename {test/fixtures/output/clojure/clj_http => src/targets/clojure/clj_http/fixtures}/headers.clj (65%) rename {test/fixtures/output/clojure/clj_http => src/targets/clojure/clj_http/fixtures}/https.clj (51%) create mode 100644 src/targets/clojure/clj_http/fixtures/jsonObj-multiline.clj create mode 100644 src/targets/clojure/clj_http/fixtures/jsonObj-null-value.clj rename {test/fixtures/output/clojure/clj_http => src/targets/clojure/clj_http/fixtures}/multipart-data.clj (91%) rename {test/fixtures/output/clojure/clj_http => src/targets/clojure/clj_http/fixtures}/multipart-file.clj (75%) rename {test/fixtures/output/clojure/clj_http => src/targets/clojure/clj_http/fixtures}/multipart-form-data.clj (96%) rename {test/fixtures/output/clojure/clj_http => src/targets/clojure/clj_http/fixtures}/nested.clj (97%) rename {test/fixtures/output/clojure/clj_http => src/targets/clojure/clj_http/fixtures}/query.clj (97%) rename {test/fixtures/output/clojure/clj_http => src/targets/clojure/clj_http/fixtures}/short.clj (51%) create mode 100644 src/targets/clojure/clj_http/fixtures/text-plain.clj delete mode 100644 src/targets/clojure/index.js create mode 100644 src/targets/clojure/target.ts delete mode 100644 src/targets/csharp/httpclient.js create mode 100644 src/targets/csharp/httpclient/client.ts rename {test/fixtures/output/csharp/httpclient => src/targets/csharp/httpclient/fixtures}/application-form-encoded.cs (99%) rename {test/fixtures/output/csharp/httpclient => src/targets/csharp/httpclient/fixtures}/application-json.cs (99%) rename {test/fixtures/output/csharp/httpclient => src/targets/csharp/httpclient/fixtures}/cookies.cs (99%) rename {test/fixtures/output/csharp/httpclient => src/targets/csharp/httpclient/fixtures}/custom-method.cs (99%) rename {test/fixtures/output/csharp/httpclient => src/targets/csharp/httpclient/fixtures}/full.cs (99%) rename {test/fixtures/output/csharp/httpclient => src/targets/csharp/httpclient/fixtures}/headers.cs (99%) rename {test/fixtures/output/csharp/httpclient => src/targets/csharp/httpclient/fixtures}/https.cs (99%) rename {test/fixtures/output/csharp/httpclient => src/targets/csharp/httpclient/fixtures}/jsonObj-multiline.cs (99%) rename {test/fixtures/output/csharp/httpclient => src/targets/csharp/httpclient/fixtures}/jsonObj-null-value.cs (99%) rename {test/fixtures/output/csharp/httpclient => src/targets/csharp/httpclient/fixtures}/multipart-data.cs (99%) rename {test/fixtures/output/csharp/httpclient => src/targets/csharp/httpclient/fixtures}/multipart-file.cs (99%) rename {test/fixtures/output/csharp/httpclient => src/targets/csharp/httpclient/fixtures}/multipart-form-data.cs (99%) rename {test/fixtures/output/csharp/httpclient => src/targets/csharp/httpclient/fixtures}/nested.cs (99%) rename {test/fixtures/output/csharp/httpclient => src/targets/csharp/httpclient/fixtures}/query.cs (99%) rename {test/fixtures/output/csharp/httpclient => src/targets/csharp/httpclient/fixtures}/short.cs (99%) rename {test/fixtures/output/csharp/httpclient => src/targets/csharp/httpclient/fixtures}/text-plain.cs (99%) delete mode 100644 src/targets/csharp/index.js delete mode 100644 src/targets/csharp/restsharp.js create mode 100644 src/targets/csharp/restsharp/client.ts rename {test/fixtures/output/csharp/restsharp => src/targets/csharp/restsharp/fixtures}/application-form-encoded.cs (84%) rename {test/fixtures/output/csharp/restsharp => src/targets/csharp/restsharp/fixtures}/application-json.cs (88%) rename {test/fixtures/output/csharp/restsharp => src/targets/csharp/restsharp/fixtures}/cookies.cs (76%) create mode 100644 src/targets/csharp/restsharp/fixtures/custom-method.cs rename {test/fixtures/output/csharp/restsharp => src/targets/csharp/restsharp/fixtures}/full.cs (89%) rename {test/fixtures/output/csharp/restsharp => src/targets/csharp/restsharp/fixtures}/headers.cs (78%) rename {test/fixtures/output/csharp/restsharp => src/targets/csharp/restsharp/fixtures}/https.cs (66%) rename {test/fixtures/output/csharp/restsharp => src/targets/csharp/restsharp/fixtures}/jsonObj-multiline.cs (83%) rename {test/fixtures/output/csharp/restsharp => src/targets/csharp/restsharp/fixtures}/jsonObj-null-value.cs (82%) rename {test/fixtures/output/csharp/restsharp => src/targets/csharp/restsharp/fixtures}/multipart-data.cs (90%) rename {test/fixtures/output/csharp/restsharp => src/targets/csharp/restsharp/fixtures}/multipart-file.cs (90%) rename {test/fixtures/output/csharp/restsharp => src/targets/csharp/restsharp/fixtures}/multipart-form-data.cs (89%) rename {test/fixtures/output/csharp/restsharp => src/targets/csharp/restsharp/fixtures}/nested.cs (73%) rename {test/fixtures/output/csharp/restsharp => src/targets/csharp/restsharp/fixtures}/query.cs (72%) rename {test/fixtures/output/csharp/restsharp => src/targets/csharp/restsharp/fixtures}/short.cs (66%) rename {test/fixtures/output/csharp/restsharp => src/targets/csharp/restsharp/fixtures}/text-plain.cs (81%) create mode 100644 src/targets/csharp/target.ts delete mode 100644 src/targets/go/index.js delete mode 100644 src/targets/go/native.js create mode 100644 src/targets/go/native/client.test.ts create mode 100644 src/targets/go/native/client.ts rename {test/fixtures/output/go/native => src/targets/go/native/fixtures}/application-form-encoded.go (99%) rename {test/fixtures/output/go/native => src/targets/go/native/fixtures}/application-json.go (99%) create mode 100644 src/targets/go/native/fixtures/boilerplate-option.go create mode 100644 src/targets/go/native/fixtures/check-errors-option.go rename {test/fixtures/output/go/native => src/targets/go/native/fixtures}/cookies.go (99%) rename {test/fixtures/output/go/native => src/targets/go/native/fixtures}/custom-method.go (99%) rename {test/fixtures/output/go/native => src/targets/go/native/fixtures}/full.go (99%) rename {test/fixtures/output/go/native => src/targets/go/native/fixtures}/headers.go (99%) rename {test/fixtures/output/go/native => src/targets/go/native/fixtures}/https.go (99%) rename {test/fixtures/output/go/native => src/targets/go/native/fixtures}/jsonObj-multiline.go (99%) rename {test/fixtures/output/go/native => src/targets/go/native/fixtures}/jsonObj-null-value.go (99%) rename {test/fixtures/output/go/native => src/targets/go/native/fixtures}/multipart-data.go (99%) rename {test/fixtures/output/go/native => src/targets/go/native/fixtures}/multipart-file.go (99%) rename {test/fixtures/output/go/native => src/targets/go/native/fixtures}/multipart-form-data.go (99%) rename {test/fixtures/output/go/native => src/targets/go/native/fixtures}/nested.go (99%) create mode 100644 src/targets/go/native/fixtures/print-body-option.go rename {test/fixtures/output/go/native => src/targets/go/native/fixtures}/query.go (99%) rename {test/fixtures/output/go/native => src/targets/go/native/fixtures}/short.go (99%) rename {test/fixtures/output/go/native => src/targets/go/native/fixtures}/text-plain.go (99%) create mode 100644 src/targets/go/native/fixtures/timeout-option.go create mode 100644 src/targets/go/target.ts create mode 100644 src/targets/har-schema.d.ts delete mode 100644 src/targets/http/http1.1.js create mode 100644 src/targets/http/http1.1/client.ts rename {test/fixtures/output/http/1.1 => src/targets/http/http1.1/fixtures}/application-form-encoded (81%) rename {test/fixtures/output/http/1.1 => src/targets/http/http1.1/fixtures}/application-json (72%) rename {test/fixtures/output/http/1.1 => src/targets/http/http1.1/fixtures}/cookies (94%) rename {test/fixtures/output/http/1.1 => src/targets/http/http1.1/fixtures}/custom-method (93%) rename {test/fixtures/output/http/1.1 => src/targets/http/http1.1/fixtures}/full (93%) rename {test/fixtures/output/http/1.1 => src/targets/http/http1.1/fixtures}/headers (93%) rename {test/fixtures/output/http/1.1 => src/targets/http/http1.1/fixtures}/https (92%) rename {test/fixtures/output/http/1.1 => src/targets/http/http1.1/fixtures}/jsonObj-multiline (94%) rename {test/fixtures/output/http/1.1 => src/targets/http/http1.1/fixtures}/jsonObj-null-value (83%) rename {test/fixtures/output/http/1.1 => src/targets/http/http1.1/fixtures}/multipart-data (96%) rename {test/fixtures/output/http/1.1 => src/targets/http/http1.1/fixtures}/multipart-file (96%) rename {test/fixtures/output/http/1.1 => src/targets/http/http1.1/fixtures}/multipart-form-data (96%) rename {test/fixtures/output/http/1.1 => src/targets/http/http1.1/fixtures}/nested (96%) rename {test/fixtures/output/http/1.1 => src/targets/http/http1.1/fixtures}/query (95%) rename {test/fixtures/output/http/1.1 => src/targets/http/http1.1/fixtures}/short (92%) rename {test/fixtures/output/http/1.1 => src/targets/http/http1.1/fixtures}/text-plain (83%) delete mode 100644 src/targets/http/index.js create mode 100644 src/targets/http/target.ts delete mode 100644 src/targets/index.js delete mode 100644 src/targets/java/asynchttp.js create mode 100644 src/targets/java/asynchttp/client.ts rename {test/fixtures/output/java/asynchttp => src/targets/java/asynchttp/fixtures}/application-form-encoded.java (94%) rename {test/fixtures/output/java/asynchttp => src/targets/java/asynchttp/fixtures}/application-json.java (96%) rename {test/fixtures/output/java/asynchttp => src/targets/java/asynchttp/fixtures}/cookies.java (93%) rename {test/fixtures/output/java/asynchttp => src/targets/java/asynchttp/fixtures}/custom-method.java (92%) rename {test/fixtures/output/java/asynchttp => src/targets/java/asynchttp/fixtures}/full.java (96%) rename {test/fixtures/output/java/asynchttp => src/targets/java/asynchttp/fixtures}/headers.java (94%) rename {test/fixtures/output/java/asynchttp => src/targets/java/asynchttp/fixtures}/https.java (92%) rename {test/fixtures/output/java/asynchttp => src/targets/java/asynchttp/fixtures}/jsonObj-multiline.java (94%) rename {test/fixtures/output/java/asynchttp => src/targets/java/asynchttp/fixtures}/jsonObj-null-value.java (94%) rename {test/fixtures/output/java/asynchttp => src/targets/java/asynchttp/fixtures}/multipart-data.java (96%) rename {test/fixtures/output/java/asynchttp => src/targets/java/asynchttp/fixtures}/multipart-file.java (96%) rename {test/fixtures/output/java/asynchttp => src/targets/java/asynchttp/fixtures}/multipart-form-data.java (96%) rename {test/fixtures/output/java/asynchttp => src/targets/java/asynchttp/fixtures}/nested.java (93%) rename {test/fixtures/output/java/asynchttp => src/targets/java/asynchttp/fixtures}/query.java (93%) rename {test/fixtures/output/java/asynchttp => src/targets/java/asynchttp/fixtures}/short.java (92%) rename {test/fixtures/output/java/asynchttp => src/targets/java/asynchttp/fixtures}/text-plain.java (94%) delete mode 100644 src/targets/java/index.js delete mode 100644 src/targets/java/nethttp.js create mode 100644 src/targets/java/nethttp/client.ts rename {test/fixtures/output/java/nethttp => src/targets/java/nethttp/fixtures}/application-form-encoded.java (90%) rename {test/fixtures/output/java/nethttp => src/targets/java/nethttp/fixtures}/application-json.java (92%) rename {test/fixtures/output/java/nethttp => src/targets/java/nethttp/fixtures}/cookies.java (89%) rename {test/fixtures/output/java/nethttp => src/targets/java/nethttp/fixtures}/custom-method.java (88%) rename {test/fixtures/output/java/nethttp => src/targets/java/nethttp/fixtures}/full.java (92%) rename {test/fixtures/output/java/nethttp => src/targets/java/nethttp/fixtures}/headers.java (90%) rename {test/fixtures/output/java/nethttp => src/targets/java/nethttp/fixtures}/https.java (88%) rename {test/fixtures/output/java/nethttp => src/targets/java/nethttp/fixtures}/jsonObj-multiline.java (90%) rename {test/fixtures/output/java/nethttp => src/targets/java/nethttp/fixtures}/jsonObj-null-value.java (90%) rename {test/fixtures/output/java/nethttp => src/targets/java/nethttp/fixtures}/multipart-data.java (93%) rename {test/fixtures/output/java/nethttp => src/targets/java/nethttp/fixtures}/multipart-file.java (93%) rename {test/fixtures/output/java/nethttp => src/targets/java/nethttp/fixtures}/multipart-form-data.java (93%) rename {test/fixtures/output/java/nethttp => src/targets/java/nethttp/fixtures}/nested.java (89%) rename {test/fixtures/output/java/nethttp => src/targets/java/nethttp/fixtures}/query.java (89%) rename {test/fixtures/output/java/nethttp => src/targets/java/nethttp/fixtures}/short.java (88%) rename {test/fixtures/output/java/nethttp => src/targets/java/nethttp/fixtures}/text-plain.java (90%) delete mode 100644 src/targets/java/okhttp.js create mode 100644 src/targets/java/okhttp/client.ts rename {test/fixtures/output/java/okhttp => src/targets/java/okhttp/fixtures}/application-form-encoded.java (86%) rename {test/fixtures/output/java/okhttp => src/targets/java/okhttp/fixtures}/application-json.java (89%) rename {test/fixtures/output/java/okhttp => src/targets/java/okhttp/fixtures}/cookies.java (77%) rename {test/fixtures/output/java/okhttp => src/targets/java/okhttp/fixtures}/custom-method.java (74%) rename {test/fixtures/output/java/okhttp => src/targets/java/okhttp/fixtures}/full.java (89%) rename {test/fixtures/output/java/okhttp => src/targets/java/okhttp/fixtures}/headers.java (79%) rename {test/fixtures/output/java/okhttp => src/targets/java/okhttp/fixtures}/https.java (71%) rename {test/fixtures/output/java/okhttp => src/targets/java/okhttp/fixtures}/jsonObj-multiline.java (85%) rename {test/fixtures/output/java/okhttp => src/targets/java/okhttp/fixtures}/jsonObj-null-value.java (85%) rename {test/fixtures/output/java/okhttp => src/targets/java/okhttp/fixtures}/multipart-data.java (91%) rename {test/fixtures/output/java/okhttp => src/targets/java/okhttp/fixtures}/multipart-file.java (91%) rename {test/fixtures/output/java/okhttp => src/targets/java/okhttp/fixtures}/multipart-form-data.java (90%) rename {test/fixtures/output/java/okhttp => src/targets/java/okhttp/fixtures}/nested.java (76%) rename {test/fixtures/output/java/okhttp => src/targets/java/okhttp/fixtures}/query.java (75%) rename {test/fixtures/output/java/okhttp => src/targets/java/okhttp/fixtures}/short.java (71%) rename {test/fixtures/output/java/okhttp => src/targets/java/okhttp/fixtures}/text-plain.java (84%) create mode 100644 src/targets/java/target.ts delete mode 100644 src/targets/java/unirest.js create mode 100644 src/targets/java/unirest/client.ts rename {test/fixtures/output/java/unirest => src/targets/java/unirest/fixtures}/application-form-encoded.java (91%) rename {test/fixtures/output/java/unirest => src/targets/java/unirest/fixtures}/application-json.java (94%) rename {test/fixtures/output/java/unirest => src/targets/java/unirest/fixtures}/cookies.java (88%) rename {test/fixtures/output/java/unirest => src/targets/java/unirest/fixtures}/custom-method.java (85%) rename {test/fixtures/output/java/unirest => src/targets/java/unirest/fixtures}/full.java (94%) rename {test/fixtures/output/java/unirest => src/targets/java/unirest/fixtures}/headers.java (90%) rename {test/fixtures/output/java/unirest => src/targets/java/unirest/fixtures}/https.java (82%) rename {test/fixtures/output/java/unirest => src/targets/java/unirest/fixtures}/jsonObj-multiline.java (91%) rename {test/fixtures/output/java/unirest => src/targets/java/unirest/fixtures}/jsonObj-null-value.java (90%) rename {test/fixtures/output/java/unirest => src/targets/java/unirest/fixtures}/multipart-data.java (95%) rename {test/fixtures/output/java/unirest => src/targets/java/unirest/fixtures}/multipart-file.java (95%) rename {test/fixtures/output/java/unirest => src/targets/java/unirest/fixtures}/multipart-form-data.java (95%) rename {test/fixtures/output/java/unirest => src/targets/java/unirest/fixtures}/nested.java (88%) rename {test/fixtures/output/java/unirest => src/targets/java/unirest/fixtures}/query.java (87%) rename {test/fixtures/output/java/unirest => src/targets/java/unirest/fixtures}/short.java (82%) rename {test/fixtures/output/java/unirest => src/targets/java/unirest/fixtures}/text-plain.java (89%) delete mode 100644 src/targets/javascript/axios.js create mode 100644 src/targets/javascript/axios/client.ts create mode 100644 src/targets/javascript/axios/fixtures/application-form-encoded.js rename {test/fixtures/output/javascript/axios => src/targets/javascript/axios/fixtures}/application-json.js (60%) create mode 100644 src/targets/javascript/axios/fixtures/cookies.js create mode 100644 src/targets/javascript/axios/fixtures/custom-method.js rename {test/fixtures/output/javascript/axios => src/targets/javascript/axios/fixtures}/full.js (61%) create mode 100644 src/targets/javascript/axios/fixtures/headers.js create mode 100644 src/targets/javascript/axios/fixtures/https.js create mode 100644 src/targets/javascript/axios/fixtures/jsonObj-multiline.js create mode 100644 src/targets/javascript/axios/fixtures/jsonObj-null-value.js create mode 100644 src/targets/javascript/axios/fixtures/multipart-data.js create mode 100644 src/targets/javascript/axios/fixtures/multipart-file.js rename {test/fixtures/output/javascript/axios => src/targets/javascript/axios/fixtures}/multipart-form-data.js (50%) create mode 100644 src/targets/javascript/axios/fixtures/nested.js create mode 100644 src/targets/javascript/axios/fixtures/query.js create mode 100644 src/targets/javascript/axios/fixtures/short.js create mode 100644 src/targets/javascript/axios/fixtures/text-plain.js delete mode 100644 src/targets/javascript/fetch.js create mode 100644 src/targets/javascript/fetch/client.ts rename {test/fixtures/output/javascript/fetch => src/targets/javascript/fetch/fixtures}/application-form-encoded.js (88%) rename {test/fixtures/output/javascript/fetch => src/targets/javascript/fetch/fixtures}/application-json.js (90%) rename {test/fixtures/output/javascript/fetch => src/targets/javascript/fetch/fixtures}/cookies.js (84%) rename {test/fixtures/output/javascript/fetch => src/targets/javascript/fetch/fixtures}/custom-method.js (81%) rename {test/fixtures/output/javascript/fetch => src/targets/javascript/fetch/fixtures}/full.js (91%) rename {test/fixtures/output/javascript/fetch => src/targets/javascript/fetch/fixtures}/headers.js (85%) rename {test/fixtures/output/javascript/fetch => src/targets/javascript/fetch/fixtures}/https.js (80%) rename {test/fixtures/output/javascript/fetch => src/targets/javascript/fetch/fixtures}/jsonObj-multiline.js (86%) rename {test/fixtures/output/javascript/fetch => src/targets/javascript/fetch/fixtures}/jsonObj-null-value.js (86%) rename {test/fixtures/output/javascript/fetch => src/targets/javascript/fetch/fixtures}/multipart-data.js (80%) rename {test/fixtures/output/javascript/fetch => src/targets/javascript/fetch/fixtures}/multipart-file.js (77%) rename {test/fixtures/output/javascript/fetch => src/targets/javascript/fetch/fixtures}/multipart-form-data.js (82%) rename {test/fixtures/output/javascript/fetch => src/targets/javascript/fetch/fixtures}/nested.js (84%) rename {test/fixtures/output/javascript/fetch => src/targets/javascript/fetch/fixtures}/query.js (83%) rename {test/fixtures/output/javascript/fetch => src/targets/javascript/fetch/fixtures}/short.js (80%) rename {test/fixtures/output/javascript/fetch => src/targets/javascript/fetch/fixtures}/text-plain.js (85%) delete mode 100644 src/targets/javascript/index.js delete mode 100644 src/targets/javascript/jquery.js create mode 100644 src/targets/javascript/jquery/client.ts create mode 100644 src/targets/javascript/jquery/fixtures/application-form-encoded.js create mode 100644 src/targets/javascript/jquery/fixtures/application-json.js create mode 100644 src/targets/javascript/jquery/fixtures/cookies.js create mode 100644 src/targets/javascript/jquery/fixtures/custom-method.js create mode 100644 src/targets/javascript/jquery/fixtures/full.js create mode 100644 src/targets/javascript/jquery/fixtures/headers.js create mode 100644 src/targets/javascript/jquery/fixtures/https.js create mode 100644 src/targets/javascript/jquery/fixtures/jsonObj-multiline.js create mode 100644 src/targets/javascript/jquery/fixtures/jsonObj-null-value.js create mode 100644 src/targets/javascript/jquery/fixtures/multipart-data.js create mode 100644 src/targets/javascript/jquery/fixtures/multipart-file.js create mode 100644 src/targets/javascript/jquery/fixtures/multipart-form-data.js create mode 100644 src/targets/javascript/jquery/fixtures/nested.js create mode 100644 src/targets/javascript/jquery/fixtures/query.js create mode 100644 src/targets/javascript/jquery/fixtures/short.js create mode 100644 src/targets/javascript/jquery/fixtures/text-plain.js create mode 100644 src/targets/javascript/target.ts delete mode 100644 src/targets/javascript/xhr.js create mode 100644 src/targets/javascript/xhr/client.test.ts create mode 100644 src/targets/javascript/xhr/client.ts create mode 100644 src/targets/javascript/xhr/fixtures/application-form-encoded.js create mode 100644 src/targets/javascript/xhr/fixtures/application-json.js rename test/fixtures/output/javascript/xhr/nested.js => src/targets/javascript/xhr/fixtures/cookies.js (50%) create mode 100644 src/targets/javascript/xhr/fixtures/cors.js rename {test/fixtures/output/javascript/xhr => src/targets/javascript/xhr/fixtures}/custom-method.js (58%) create mode 100644 src/targets/javascript/xhr/fixtures/full.js create mode 100644 src/targets/javascript/xhr/fixtures/headers.js rename {test/fixtures/output/javascript/xhr => src/targets/javascript/xhr/fixtures}/https.js (59%) create mode 100644 src/targets/javascript/xhr/fixtures/jsonObj-multiline.js create mode 100644 src/targets/javascript/xhr/fixtures/jsonObj-null-value.js rename {test/fixtures/output/javascript/xhr => src/targets/javascript/xhr/fixtures}/multipart-data.js (54%) rename {test/fixtures/output/javascript/xhr => src/targets/javascript/xhr/fixtures}/multipart-file.js (51%) rename {test/fixtures/output/javascript/xhr => src/targets/javascript/xhr/fixtures}/multipart-form-data.js (55%) create mode 100644 src/targets/javascript/xhr/fixtures/nested.js rename {test/fixtures/output/javascript/xhr => src/targets/javascript/xhr/fixtures}/query.js (53%) rename {test/fixtures/output/javascript/xhr => src/targets/javascript/xhr/fixtures}/short.js (59%) create mode 100644 src/targets/javascript/xhr/fixtures/text-plain.js delete mode 100644 src/targets/kotlin/index.js delete mode 100644 src/targets/kotlin/okhttp.js create mode 100644 src/targets/kotlin/okhttp/client.ts rename {test/fixtures/output/kotlin/okhttp => src/targets/kotlin/okhttp/fixtures}/application-form-encoded.kt (86%) rename {test/fixtures/output/kotlin/okhttp => src/targets/kotlin/okhttp/fixtures}/application-json.kt (89%) rename {test/fixtures/output/kotlin/okhttp => src/targets/kotlin/okhttp/fixtures}/cookies.kt (76%) rename {test/fixtures/output/kotlin/okhttp => src/targets/kotlin/okhttp/fixtures}/custom-method.kt (73%) rename {test/fixtures/output/kotlin/okhttp => src/targets/kotlin/okhttp/fixtures}/full.kt (89%) rename {test/fixtures/output/kotlin/okhttp => src/targets/kotlin/okhttp/fixtures}/headers.kt (79%) rename {test/fixtures/output/kotlin/okhttp => src/targets/kotlin/okhttp/fixtures}/https.kt (70%) rename {test/fixtures/output/kotlin/okhttp => src/targets/kotlin/okhttp/fixtures}/jsonObj-multiline.kt (85%) rename {test/fixtures/output/kotlin/okhttp => src/targets/kotlin/okhttp/fixtures}/jsonObj-null-value.kt (85%) rename {test/fixtures/output/kotlin/okhttp => src/targets/kotlin/okhttp/fixtures}/multipart-data.kt (91%) rename {test/fixtures/output/kotlin/okhttp => src/targets/kotlin/okhttp/fixtures}/multipart-file.kt (91%) rename {test/fixtures/output/kotlin/okhttp => src/targets/kotlin/okhttp/fixtures}/multipart-form-data.kt (90%) rename {test/fixtures/output/kotlin/okhttp => src/targets/kotlin/okhttp/fixtures}/nested.kt (76%) rename {test/fixtures/output/kotlin/okhttp => src/targets/kotlin/okhttp/fixtures}/query.kt (75%) rename {test/fixtures/output/kotlin/okhttp => src/targets/kotlin/okhttp/fixtures}/short.kt (70%) rename {test/fixtures/output/kotlin/okhttp => src/targets/kotlin/okhttp/fixtures}/text-plain.kt (84%) create mode 100644 src/targets/kotlin/target.ts delete mode 100644 src/targets/node/axios.js create mode 100644 src/targets/node/axios/client.ts create mode 100644 src/targets/node/axios/fixtures/application-form-encoded.js rename {test/fixtures/output/node/axios => src/targets/node/axios/fixtures}/application-json.js (59%) create mode 100644 src/targets/node/axios/fixtures/cookies.js create mode 100644 src/targets/node/axios/fixtures/custom-method.js rename {test/fixtures/output/node/axios => src/targets/node/axios/fixtures}/full.js (60%) create mode 100644 src/targets/node/axios/fixtures/headers.js create mode 100644 src/targets/node/axios/fixtures/https.js create mode 100644 src/targets/node/axios/fixtures/jsonObj-multiline.js create mode 100644 src/targets/node/axios/fixtures/jsonObj-null-value.js rename {test/fixtures/output/node/axios => src/targets/node/axios/fixtures}/multipart-data.js (65%) rename {test/fixtures/output/node/axios => src/targets/node/axios/fixtures}/multipart-file.js (64%) rename {test/fixtures/output/node/axios => src/targets/node/axios/fixtures}/multipart-form-data.js (61%) create mode 100644 src/targets/node/axios/fixtures/nested.js create mode 100644 src/targets/node/axios/fixtures/query.js create mode 100644 src/targets/node/axios/fixtures/short.js create mode 100644 src/targets/node/axios/fixtures/text-plain.js delete mode 100644 src/targets/node/fetch.js create mode 100644 src/targets/node/fetch/client.ts rename {test/fixtures/output/node/fetch => src/targets/node/fetch/fixtures}/application-form-encoded.js (90%) rename {test/fixtures/output/node/fetch => src/targets/node/fetch/fixtures}/application-json.js (88%) rename {test/fixtures/output/node/fetch => src/targets/node/fetch/fixtures}/cookies.js (82%) rename {test/fixtures/output/node/fetch => src/targets/node/fetch/fixtures}/custom-method.js (80%) rename {test/fixtures/output/node/fetch => src/targets/node/fetch/fixtures}/full.js (91%) rename {test/fixtures/output/node/fetch => src/targets/node/fetch/fixtures}/headers.js (83%) rename {test/fixtures/output/node/fetch => src/targets/node/fetch/fixtures}/https.js (79%) rename {test/fixtures/output/node/fetch => src/targets/node/fetch/fixtures}/jsonObj-multiline.js (84%) rename {test/fixtures/output/node/fetch => src/targets/node/fetch/fixtures}/jsonObj-null-value.js (84%) rename {test/fixtures/output/node/fetch => src/targets/node/fetch/fixtures}/multipart-data.js (90%) rename {test/fixtures/output/node/fetch => src/targets/node/fetch/fixtures}/multipart-file.js (91%) rename {test/fixtures/output/node/fetch => src/targets/node/fetch/fixtures}/multipart-form-data.js (89%) rename {test/fixtures/output/node/fetch => src/targets/node/fetch/fixtures}/nested.js (82%) rename {test/fixtures/output/node/fetch => src/targets/node/fetch/fixtures}/query.js (82%) rename {test/fixtures/output/node/fetch => src/targets/node/fetch/fixtures}/short.js (79%) rename {test/fixtures/output/node/fetch => src/targets/node/fetch/fixtures}/text-plain.js (84%) delete mode 100644 src/targets/node/index.js delete mode 100644 src/targets/node/native.js create mode 100644 src/targets/node/native/client.ts create mode 100644 src/targets/node/native/fixtures/application-form-encoded.js rename {test/fixtures/output/node/native => src/targets/node/native/fixtures}/application-json.js (60%) create mode 100644 src/targets/node/native/fixtures/cookies.js rename {test/fixtures/output/node/native => src/targets/node/native/fixtures}/custom-method.js (50%) create mode 100644 src/targets/node/native/fixtures/full.js create mode 100644 src/targets/node/native/fixtures/headers.js rename {test/fixtures/output/node/native => src/targets/node/native/fixtures}/https.js (50%) rename {test/fixtures/output/node/native => src/targets/node/native/fixtures}/jsonObj-multiline.js (51%) rename {test/fixtures/output/node/native => src/targets/node/native/fixtures}/jsonObj-null-value.js (51%) create mode 100644 src/targets/node/native/fixtures/multipart-data.js create mode 100644 src/targets/node/native/fixtures/multipart-file.js create mode 100644 src/targets/node/native/fixtures/multipart-form-data.js create mode 100644 src/targets/node/native/fixtures/nested.js create mode 100644 src/targets/node/native/fixtures/query.js rename {test/fixtures/output/node/native => src/targets/node/native/fixtures}/short.js (50%) create mode 100644 src/targets/node/native/fixtures/text-plain.js delete mode 100644 src/targets/node/request.js create mode 100644 src/targets/node/request/client.ts rename {test/fixtures/output/node/request => src/targets/node/request/fixtures}/application-form-encoded.js (98%) rename {test/fixtures/output/node/request => src/targets/node/request/fixtures}/application-json.js (98%) rename {test/fixtures/output/node/request => src/targets/node/request/fixtures}/cookies.js (95%) rename {test/fixtures/output/node/request => src/targets/node/request/fixtures}/custom-method.js (97%) rename {test/fixtures/output/node/request => src/targets/node/request/fixtures}/full.js (96%) rename {test/fixtures/output/node/request => src/targets/node/request/fixtures}/headers.js (98%) rename {test/fixtures/output/node/request => src/targets/node/request/fixtures}/https.js (97%) rename {test/fixtures/output/node/request => src/targets/node/request/fixtures}/jsonObj-multiline.js (98%) rename {test/fixtures/output/node/request => src/targets/node/request/fixtures}/jsonObj-null-value.js (98%) rename {test/fixtures/output/node/request => src/targets/node/request/fixtures}/multipart-data.js (98%) rename {test/fixtures/output/node/request => src/targets/node/request/fixtures}/multipart-file.js (99%) rename {test/fixtures/output/node/request => src/targets/node/request/fixtures}/multipart-form-data.js (98%) rename {test/fixtures/output/node/request => src/targets/node/request/fixtures}/nested.js (98%) rename {test/fixtures/output/node/request => src/targets/node/request/fixtures}/query.js (98%) rename {test/fixtures/output/node/request => src/targets/node/request/fixtures}/short.js (97%) rename {test/fixtures/output/node/request => src/targets/node/request/fixtures}/text-plain.js (98%) create mode 100644 src/targets/node/target.ts delete mode 100644 src/targets/node/unirest.js create mode 100644 src/targets/node/unirest/client.ts create mode 100644 src/targets/node/unirest/fixtures/application-form-encoded.js create mode 100644 src/targets/node/unirest/fixtures/application-json.js create mode 100644 src/targets/node/unirest/fixtures/cookies.js create mode 100644 src/targets/node/unirest/fixtures/custom-method.js create mode 100644 src/targets/node/unirest/fixtures/full.js create mode 100644 src/targets/node/unirest/fixtures/headers.js rename {test/fixtures/output/node/unirest => src/targets/node/unirest/fixtures}/https.js (50%) create mode 100644 src/targets/node/unirest/fixtures/jsonObj-multiline.js create mode 100644 src/targets/node/unirest/fixtures/jsonObj-null-value.js create mode 100644 src/targets/node/unirest/fixtures/multipart-data.js create mode 100644 src/targets/node/unirest/fixtures/multipart-file.js create mode 100644 src/targets/node/unirest/fixtures/multipart-form-data.js create mode 100644 src/targets/node/unirest/fixtures/nested.js create mode 100644 src/targets/node/unirest/fixtures/query.js rename {test/fixtures/output/node/unirest => src/targets/node/unirest/fixtures}/short.js (50%) create mode 100644 src/targets/node/unirest/fixtures/text-plain.js delete mode 100644 src/targets/objc/helpers.js create mode 100644 src/targets/objc/helpers.ts delete mode 100644 src/targets/objc/index.js delete mode 100644 src/targets/objc/nsurlsession.js create mode 100644 src/targets/objc/nsurlsession/client.test.ts create mode 100644 src/targets/objc/nsurlsession/client.ts rename {test/fixtures/output/objc/nsurlsession => src/targets/objc/nsurlsession/fixtures}/application-form-encoded.m (98%) rename {test/fixtures/output/objc/nsurlsession => src/targets/objc/nsurlsession/fixtures}/application-json.m (98%) rename {test/fixtures/output/objc/nsurlsession => src/targets/objc/nsurlsession/fixtures}/cookies.m (98%) rename {test/fixtures/output/objc/nsurlsession => src/targets/objc/nsurlsession/fixtures}/custom-method.m (98%) rename {test/fixtures/output/objc/nsurlsession => src/targets/objc/nsurlsession/fixtures}/full.m (98%) rename {test/fixtures/output/objc/nsurlsession => src/targets/objc/nsurlsession/fixtures}/headers.m (98%) rename {test/fixtures/output/objc/nsurlsession => src/targets/objc/nsurlsession/fixtures}/https.m (98%) create mode 100644 src/targets/objc/nsurlsession/fixtures/indent-option.m create mode 100644 src/targets/objc/nsurlsession/fixtures/json-with-null-value.m rename {test/fixtures/output/objc/nsurlsession => src/targets/objc/nsurlsession/fixtures}/jsonObj-multiline.m (98%) rename {test/fixtures/output/objc/nsurlsession => src/targets/objc/nsurlsession/fixtures}/jsonObj-null-value.m (98%) rename {test/fixtures/output/objc/nsurlsession => src/targets/objc/nsurlsession/fixtures}/multipart-data.m (99%) rename {test/fixtures/output/objc/nsurlsession => src/targets/objc/nsurlsession/fixtures}/multipart-file.m (99%) rename {test/fixtures/output/objc/nsurlsession => src/targets/objc/nsurlsession/fixtures}/multipart-form-data.m (99%) rename {test/fixtures/output/objc/nsurlsession => src/targets/objc/nsurlsession/fixtures}/nested.m (98%) create mode 100644 src/targets/objc/nsurlsession/fixtures/pretty-option.m rename {test/fixtures/output/objc/nsurlsession => src/targets/objc/nsurlsession/fixtures}/query.m (98%) rename {test/fixtures/output/objc/nsurlsession => src/targets/objc/nsurlsession/fixtures}/short.m (98%) rename {test/fixtures/output/objc/nsurlsession => src/targets/objc/nsurlsession/fixtures}/text-plain.m (98%) create mode 100644 src/targets/objc/nsurlsession/fixtures/timeout-option.m create mode 100644 src/targets/objc/target.ts delete mode 100644 src/targets/ocaml/cohttp.js create mode 100644 src/targets/ocaml/cohttp/client.ts rename {test/fixtures/output/ocaml/cohttp => src/targets/ocaml/cohttp/fixtures}/application-form-encoded.ml (90%) rename {test/fixtures/output/ocaml/cohttp => src/targets/ocaml/cohttp/fixtures}/application-json.ml (92%) rename {test/fixtures/output/ocaml/cohttp => src/targets/ocaml/cohttp/fixtures}/cookies.ml (87%) rename {test/fixtures/output/ocaml/cohttp => src/targets/ocaml/cohttp/fixtures}/custom-method.ml (84%) rename {test/fixtures/output/ocaml/cohttp => src/targets/ocaml/cohttp/fixtures}/full.ml (92%) rename {test/fixtures/output/ocaml/cohttp => src/targets/ocaml/cohttp/fixtures}/headers.ml (88%) rename {test/fixtures/output/ocaml/cohttp => src/targets/ocaml/cohttp/fixtures}/https.ml (81%) rename {test/fixtures/output/ocaml/cohttp => src/targets/ocaml/cohttp/fixtures}/jsonObj-multiline.ml (90%) rename {test/fixtures/output/ocaml/cohttp => src/targets/ocaml/cohttp/fixtures}/jsonObj-null-value.ml (90%) rename {test/fixtures/output/ocaml/cohttp => src/targets/ocaml/cohttp/fixtures}/multipart-data.ml (93%) rename {test/fixtures/output/ocaml/cohttp => src/targets/ocaml/cohttp/fixtures}/multipart-file.ml (93%) rename {test/fixtures/output/ocaml/cohttp => src/targets/ocaml/cohttp/fixtures}/multipart-form-data.ml (93%) rename {test/fixtures/output/ocaml/cohttp => src/targets/ocaml/cohttp/fixtures}/nested.ml (85%) rename {test/fixtures/output/ocaml/cohttp => src/targets/ocaml/cohttp/fixtures}/query.ml (84%) rename {test/fixtures/output/ocaml/cohttp => src/targets/ocaml/cohttp/fixtures}/short.ml (81%) rename {test/fixtures/output/ocaml/cohttp => src/targets/ocaml/cohttp/fixtures}/text-plain.ml (89%) delete mode 100644 src/targets/ocaml/index.js create mode 100644 src/targets/ocaml/target.ts delete mode 100644 src/targets/php/curl.js create mode 100644 src/targets/php/curl/client.ts rename {test/fixtures/output/php/curl => src/targets/php/curl/fixtures}/application-form-encoded.php (99%) rename {test/fixtures/output/php/curl => src/targets/php/curl/fixtures}/application-json.php (99%) rename {test/fixtures/output/php/curl => src/targets/php/curl/fixtures}/cookies.php (99%) rename {test/fixtures/output/php/curl => src/targets/php/curl/fixtures}/custom-method.php (99%) rename {test/fixtures/output/php/curl => src/targets/php/curl/fixtures}/full.php (99%) rename {test/fixtures/output/php/curl => src/targets/php/curl/fixtures}/headers.php (99%) rename {test/fixtures/output/php/curl => src/targets/php/curl/fixtures}/https.php (99%) rename {test/fixtures/output/php/curl => src/targets/php/curl/fixtures}/jsonObj-multiline.php (99%) rename {test/fixtures/output/php/curl => src/targets/php/curl/fixtures}/jsonObj-null-value.php (99%) rename {test/fixtures/output/php/curl => src/targets/php/curl/fixtures}/multipart-data.php (99%) rename {test/fixtures/output/php/curl => src/targets/php/curl/fixtures}/multipart-file.php (99%) rename {test/fixtures/output/php/curl => src/targets/php/curl/fixtures}/multipart-form-data.php (99%) rename {test/fixtures/output/php/curl => src/targets/php/curl/fixtures}/nested.php (99%) rename {test/fixtures/output/php/curl => src/targets/php/curl/fixtures}/query.php (99%) rename {test/fixtures/output/php/curl => src/targets/php/curl/fixtures}/short.php (99%) rename {test/fixtures/output/php/curl => src/targets/php/curl/fixtures}/text-plain.php (99%) delete mode 100644 src/targets/php/helpers.js create mode 100644 src/targets/php/helpers.ts delete mode 100644 src/targets/php/http1.js create mode 100644 src/targets/php/http1/client.ts rename {test/fixtures/output/php/http1 => src/targets/php/http1/fixtures}/application-form-encoded.php (99%) rename {test/fixtures/output/php/http1 => src/targets/php/http1/fixtures}/application-json.php (99%) rename {test/fixtures/output/php/http1 => src/targets/php/http1/fixtures}/cookies.php (99%) rename {test/fixtures/output/php/http1 => src/targets/php/http1/fixtures}/custom-method.php (99%) rename {test/fixtures/output/php/http1 => src/targets/php/http1/fixtures}/full.php (99%) rename {test/fixtures/output/php/http1 => src/targets/php/http1/fixtures}/headers.php (99%) rename {test/fixtures/output/php/http1 => src/targets/php/http1/fixtures}/https.php (99%) rename {test/fixtures/output/php/http1 => src/targets/php/http1/fixtures}/jsonObj-multiline.php (99%) rename {test/fixtures/output/php/http1 => src/targets/php/http1/fixtures}/jsonObj-null-value.php (99%) rename {test/fixtures/output/php/http1 => src/targets/php/http1/fixtures}/multipart-data.php (98%) rename {test/fixtures/output/php/http1 => src/targets/php/http1/fixtures}/multipart-file.php (98%) rename {test/fixtures/output/php/http1 => src/targets/php/http1/fixtures}/multipart-form-data.php (98%) rename {test/fixtures/output/php/http1 => src/targets/php/http1/fixtures}/nested.php (99%) rename {test/fixtures/output/php/http1 => src/targets/php/http1/fixtures}/query.php (99%) rename {test/fixtures/output/php/http1 => src/targets/php/http1/fixtures}/short.php (99%) rename {test/fixtures/output/php/http1 => src/targets/php/http1/fixtures}/text-plain.php (99%) delete mode 100644 src/targets/php/http2.js create mode 100644 src/targets/php/http2/client.ts rename {test/fixtures/output/php/http2 => src/targets/php/http2/fixtures}/application-form-encoded.php (94%) rename {test/fixtures/output/php/http2 => src/targets/php/http2/fixtures}/application-json.php (94%) rename {test/fixtures/output/php/http2 => src/targets/php/http2/fixtures}/cookies.php (91%) rename {test/fixtures/output/php/http2 => src/targets/php/http2/fixtures}/custom-method.php (89%) rename {test/fixtures/output/php/http2 => src/targets/php/http2/fixtures}/full.php (96%) rename {test/fixtures/output/php/http2 => src/targets/php/http2/fixtures}/headers.php (92%) rename {test/fixtures/output/php/http2 => src/targets/php/http2/fixtures}/https.php (89%) rename {test/fixtures/output/php/http2 => src/targets/php/http2/fixtures}/jsonObj-multiline.php (93%) rename {test/fixtures/output/php/http2 => src/targets/php/http2/fixtures}/jsonObj-null-value.php (93%) rename {test/fixtures/output/php/http2 => src/targets/php/http2/fixtures}/multipart-data.php (94%) rename {test/fixtures/output/php/http2 => src/targets/php/http2/fixtures}/multipart-file.php (94%) rename {test/fixtures/output/php/http2 => src/targets/php/http2/fixtures}/multipart-form-data.php (92%) rename {test/fixtures/output/php/http2 => src/targets/php/http2/fixtures}/nested.php (92%) rename {test/fixtures/output/php/http2 => src/targets/php/http2/fixtures}/query.php (92%) rename {test/fixtures/output/php/http2 => src/targets/php/http2/fixtures}/short.php (89%) rename {test/fixtures/output/php/http2 => src/targets/php/http2/fixtures}/text-plain.php (93%) delete mode 100644 src/targets/php/index.js create mode 100644 src/targets/php/target.ts delete mode 100644 src/targets/powershell/common.js create mode 100644 src/targets/powershell/common.ts delete mode 100644 src/targets/powershell/index.js delete mode 100644 src/targets/powershell/restmethod.js create mode 100644 src/targets/powershell/restmethod/client.ts rename {test/fixtures/output/powershell/restmethod => src/targets/powershell/restmethod/fixtures}/application-form-encoded.ps1 (83%) rename {test/fixtures/output/powershell/restmethod => src/targets/powershell/restmethod/fixtures}/application-json.ps1 (81%) rename {test/fixtures/output/powershell/restmethod => src/targets/powershell/restmethod/fixtures}/cookies.ps1 (93%) create mode 100644 src/targets/powershell/restmethod/fixtures/custom-method.ps1 rename {test/fixtures/output/powershell/restmethod => src/targets/powershell/restmethod/fixtures}/full.ps1 (97%) rename {test/fixtures/output/powershell/restmethod => src/targets/powershell/restmethod/fixtures}/headers.ps1 (85%) rename {test/fixtures/output/powershell/restmethod => src/targets/powershell/restmethod/fixtures}/https.ps1 (86%) rename {test/fixtures/output/powershell/restmethod => src/targets/powershell/restmethod/fixtures}/jsonObj-multiline.ps1 (98%) rename {test/fixtures/output/powershell/restmethod => src/targets/powershell/restmethod/fixtures}/jsonObj-null-value.ps1 (92%) rename {test/fixtures/output/powershell/restmethod => src/targets/powershell/restmethod/fixtures}/multipart-data.ps1 (98%) rename {test/fixtures/output/powershell/restmethod => src/targets/powershell/restmethod/fixtures}/multipart-file.ps1 (98%) rename {test/fixtures/output/powershell/restmethod => src/targets/powershell/restmethod/fixtures}/multipart-form-data.ps1 (98%) rename {test/fixtures/output/powershell/restmethod => src/targets/powershell/restmethod/fixtures}/nested.ps1 (56%) rename {test/fixtures/output/powershell/restmethod => src/targets/powershell/restmethod/fixtures}/query.ps1 (59%) rename {test/fixtures/output/powershell/restmethod => src/targets/powershell/restmethod/fixtures}/short.ps1 (87%) rename {test/fixtures/output/powershell/restmethod => src/targets/powershell/restmethod/fixtures}/text-plain.ps1 (95%) create mode 100644 src/targets/powershell/target.ts delete mode 100644 src/targets/powershell/webrequest.js create mode 100644 src/targets/powershell/webrequest/client.ts rename {test/fixtures/output/powershell/webrequest => src/targets/powershell/webrequest/fixtures}/application-form-encoded.ps1 (83%) rename {test/fixtures/output/powershell/webrequest => src/targets/powershell/webrequest/fixtures}/application-json.ps1 (81%) rename {test/fixtures/output/powershell/webrequest => src/targets/powershell/webrequest/fixtures}/cookies.ps1 (93%) create mode 100644 src/targets/powershell/webrequest/fixtures/custom-method.ps1 rename {test/fixtures/output/powershell/webrequest => src/targets/powershell/webrequest/fixtures}/full.ps1 (97%) rename {test/fixtures/output/powershell/webrequest => src/targets/powershell/webrequest/fixtures}/headers.ps1 (85%) rename {test/fixtures/output/powershell/webrequest => src/targets/powershell/webrequest/fixtures}/https.ps1 (86%) rename {test/fixtures/output/powershell/webrequest => src/targets/powershell/webrequest/fixtures}/jsonObj-multiline.ps1 (98%) rename {test/fixtures/output/powershell/webrequest => src/targets/powershell/webrequest/fixtures}/jsonObj-null-value.ps1 (92%) rename {test/fixtures/output/powershell/webrequest => src/targets/powershell/webrequest/fixtures}/multipart-data.ps1 (98%) rename {test/fixtures/output/powershell/webrequest => src/targets/powershell/webrequest/fixtures}/multipart-file.ps1 (98%) rename {test/fixtures/output/powershell/webrequest => src/targets/powershell/webrequest/fixtures}/multipart-form-data.ps1 (98%) rename {test/fixtures/output/powershell/webrequest => src/targets/powershell/webrequest/fixtures}/nested.ps1 (56%) rename {test/fixtures/output/powershell/webrequest => src/targets/powershell/webrequest/fixtures}/query.ps1 (59%) rename {test/fixtures/output/powershell/webrequest => src/targets/powershell/webrequest/fixtures}/short.ps1 (87%) rename {test/fixtures/output/powershell/webrequest => src/targets/powershell/webrequest/fixtures}/text-plain.ps1 (95%) delete mode 100644 src/targets/python/helpers.js create mode 100644 src/targets/python/helpers.ts delete mode 100644 src/targets/python/index.js delete mode 100644 src/targets/python/python3.js create mode 100644 src/targets/python/python3/client.ts rename {test/fixtures/output/python/python3 => src/targets/python/python3/fixtures}/application-form-encoded.py (90%) rename {test/fixtures/output/python/python3 => src/targets/python/python3/fixtures}/application-json.py (92%) rename {test/fixtures/output/python/python3 => src/targets/python/python3/fixtures}/cookies.py (87%) rename {test/fixtures/output/python/python3 => src/targets/python/python3/fixtures}/custom-method.py (84%) rename {test/fixtures/output/python/python3 => src/targets/python/python3/fixtures}/full.py (92%) rename {test/fixtures/output/python/python3 => src/targets/python/python3/fixtures}/headers.py (89%) rename {test/fixtures/output/python/python3 => src/targets/python/python3/fixtures}/https.py (83%) rename {test/fixtures/output/python/python3 => src/targets/python/python3/fixtures}/jsonObj-multiline.py (89%) rename {test/fixtures/output/python/python3 => src/targets/python/python3/fixtures}/jsonObj-null-value.py (89%) rename {test/fixtures/output/python/python3 => src/targets/python/python3/fixtures}/multipart-data.py (94%) rename {test/fixtures/output/python/python3 => src/targets/python/python3/fixtures}/multipart-file.py (94%) rename {test/fixtures/output/python/python3 => src/targets/python/python3/fixtures}/multipart-form-data.py (93%) rename {test/fixtures/output/python/python3 => src/targets/python/python3/fixtures}/nested.py (86%) rename {test/fixtures/output/python/python3 => src/targets/python/python3/fixtures}/query.py (86%) rename {test/fixtures/output/python/python3 => src/targets/python/python3/fixtures}/short.py (83%) rename {test/fixtures/output/python/python3 => src/targets/python/python3/fixtures}/text-plain.py (89%) delete mode 100644 src/targets/python/requests.js create mode 100644 src/targets/python/requests/client.test.ts create mode 100644 src/targets/python/requests/client.ts rename {test/fixtures/output/python/requests => src/targets/python/requests/fixtures}/application-form-encoded.py (91%) rename {test/fixtures/output/python/requests => src/targets/python/requests/fixtures}/application-json.py (94%) rename {test/fixtures/output/python/requests => src/targets/python/requests/fixtures}/cookies.py (87%) rename {test/fixtures/output/python/requests => src/targets/python/requests/fixtures}/custom-method.py (81%) rename {test/fixtures/output/python/requests => src/targets/python/requests/fixtures}/full.py (94%) rename {test/fixtures/output/python/requests => src/targets/python/requests/fixtures}/headers.py (89%) rename {test/fixtures/output/python/requests => src/targets/python/requests/fixtures}/https.py (81%) rename {test/fixtures/output/python/requests => src/targets/python/requests/fixtures}/jsonObj-multiline.py (90%) rename {test/fixtures/output/python/requests => src/targets/python/requests/fixtures}/jsonObj-null-value.py (90%) rename {test/fixtures/output/python/requests => src/targets/python/requests/fixtures}/multipart-data.py (95%) rename {test/fixtures/output/python/requests => src/targets/python/requests/fixtures}/multipart-file.py (95%) rename {test/fixtures/output/python/requests => src/targets/python/requests/fixtures}/multipart-form-data.py (94%) rename {test/fixtures/output/python/requests => src/targets/python/requests/fixtures}/nested.py (89%) create mode 100644 src/targets/python/requests/fixtures/query-params.py rename {test/fixtures/output/python/requests => src/targets/python/requests/fixtures}/query.py (89%) rename {test/fixtures/output/python/requests => src/targets/python/requests/fixtures}/short.py (81%) rename {test/fixtures/output/python/requests => src/targets/python/requests/fixtures}/text-plain.py (89%) create mode 100644 src/targets/python/target.ts delete mode 100644 src/targets/r/httr.js create mode 100644 src/targets/r/httr/client.ts rename {test/fixtures/output/r/httr => src/targets/r/httr/fixtures}/application-form-encoded.r (89%) rename {test/fixtures/output/r/httr => src/targets/r/httr/fixtures}/application-json.r (92%) rename {test/fixtures/output/r/httr => src/targets/r/httr/fixtures}/cookies.r (86%) rename {test/fixtures/output/r/httr => src/targets/r/httr/fixtures}/custom-method.r (82%) rename {test/fixtures/output/r/httr => src/targets/r/httr/fixtures}/full.r (93%) rename {test/fixtures/output/r/httr => src/targets/r/httr/fixtures}/headers.r (87%) rename {test/fixtures/output/r/httr => src/targets/r/httr/fixtures}/https.r (82%) rename {test/fixtures/output/r/httr => src/targets/r/httr/fixtures}/jsonObj-multiline.r (88%) rename {test/fixtures/output/r/httr => src/targets/r/httr/fixtures}/jsonObj-null-value.r (88%) rename {test/fixtures/output/r/httr => src/targets/r/httr/fixtures}/multipart-data.r (93%) rename {test/fixtures/output/r/httr => src/targets/r/httr/fixtures}/multipart-file.r (93%) rename {test/fixtures/output/r/httr => src/targets/r/httr/fixtures}/multipart-form-data.r (92%) rename {test/fixtures/output/r/httr => src/targets/r/httr/fixtures}/nested.r (88%) rename {test/fixtures/output/r/httr => src/targets/r/httr/fixtures}/query.r (88%) rename {test/fixtures/output/r/httr => src/targets/r/httr/fixtures}/short.r (82%) rename {test/fixtures/output/r/httr => src/targets/r/httr/fixtures}/text-plain.r (87%) delete mode 100644 src/targets/r/index.js create mode 100644 src/targets/r/target.ts delete mode 100644 src/targets/ruby/index.js delete mode 100644 src/targets/ruby/native.js create mode 100644 src/targets/ruby/native/client.ts rename {test/fixtures/output/ruby/native => src/targets/ruby/native/fixtures}/application-form-encoded.rb (92%) rename {test/fixtures/output/ruby/native => src/targets/ruby/native/fixtures}/application-json.rb (94%) rename {test/fixtures/output/ruby/native => src/targets/ruby/native/fixtures}/cookies.rb (90%) rename {test/fixtures/output/ruby/native => src/targets/ruby/native/fixtures}/custom-method.rb (92%) rename {test/fixtures/output/ruby/native => src/targets/ruby/native/fixtures}/full.rb (94%) rename {test/fixtures/output/ruby/native => src/targets/ruby/native/fixtures}/headers.rb (91%) rename {test/fixtures/output/ruby/native => src/targets/ruby/native/fixtures}/https.rb (91%) rename {test/fixtures/output/ruby/native => src/targets/ruby/native/fixtures}/jsonObj-multiline.rb (91%) rename {test/fixtures/output/ruby/native => src/targets/ruby/native/fixtures}/jsonObj-null-value.rb (91%) rename {test/fixtures/output/ruby/native => src/targets/ruby/native/fixtures}/multipart-data.rb (95%) rename {test/fixtures/output/ruby/native => src/targets/ruby/native/fixtures}/multipart-file.rb (95%) rename {test/fixtures/output/ruby/native => src/targets/ruby/native/fixtures}/multipart-form-data.rb (94%) rename {test/fixtures/output/ruby/native => src/targets/ruby/native/fixtures}/nested.rb (90%) rename {test/fixtures/output/ruby/native => src/targets/ruby/native/fixtures}/query.rb (89%) rename {test/fixtures/output/ruby/native => src/targets/ruby/native/fixtures}/short.rb (88%) rename {test/fixtures/output/ruby/native => src/targets/ruby/native/fixtures}/text-plain.rb (91%) create mode 100644 src/targets/ruby/target.ts delete mode 100644 src/targets/shell/curl.js create mode 100644 src/targets/shell/curl/client.test.ts create mode 100644 src/targets/shell/curl/client.ts rename {test/fixtures/output/shell/curl => src/targets/shell/curl/fixtures}/application-form-encoded.sh (86%) rename {test/fixtures/output/shell/curl => src/targets/shell/curl/fixtures}/application-json.sh (99%) create mode 100644 src/targets/shell/curl/fixtures/binary-option.sh rename {test/fixtures/output/shell/curl => src/targets/shell/curl/fixtures}/cookies.sh (64%) create mode 100644 src/targets/shell/curl/fixtures/custom-indentation.sh create mode 100644 src/targets/shell/curl/fixtures/custom-method.sh create mode 100644 src/targets/shell/curl/fixtures/dont-deglob.sh rename {test/fixtures/output/shell/curl => src/targets/shell/curl/fixtures}/full.sh (93%) create mode 100644 src/targets/shell/curl/fixtures/globoff-option.sh rename {test/fixtures/output/shell/curl => src/targets/shell/curl/fixtures}/headers.sh (79%) rename {test/fixtures/output/shell/curl => src/targets/shell/curl/fixtures}/http1.sh (83%) create mode 100644 src/targets/shell/curl/fixtures/http10.sh create mode 100644 src/targets/shell/curl/fixtures/https.sh rename {test/fixtures/output/shell/curl => src/targets/shell/curl/fixtures}/jsonObj-multiline.sh (97%) rename {test/fixtures/output/shell/curl => src/targets/shell/curl/fixtures}/jsonObj-null-value.sh (80%) create mode 100644 src/targets/shell/curl/fixtures/long-globoff-option.sh rename {test/fixtures/output/shell/curl => src/targets/shell/curl/fixtures}/multipart-data.sh (81%) rename {test/fixtures/output/shell/curl => src/targets/shell/curl/fixtures}/multipart-file.sh (70%) rename {test/fixtures/output/shell/curl => src/targets/shell/curl/fixtures}/multipart-form-data.sh (85%) rename {test/fixtures/output/shell/curl => src/targets/shell/curl/fixtures}/nested.sh (89%) rename {test/fixtures/output/shell/curl => src/targets/shell/curl/fixtures}/query.sh (96%) create mode 100644 src/targets/shell/curl/fixtures/short-options.sh create mode 100644 src/targets/shell/curl/fixtures/short.sh rename {test/fixtures/output/shell/curl => src/targets/shell/curl/fixtures}/text-plain.sh (80%) delete mode 100644 src/targets/shell/httpie.js create mode 100644 src/targets/shell/httpie/client.test.ts create mode 100644 src/targets/shell/httpie/client.ts rename {test/fixtures/output/shell/httpie => src/targets/shell/httpie/fixtures}/application-form-encoded.sh (88%) rename {test/fixtures/output/shell/httpie => src/targets/shell/httpie/fixtures}/application-json.sh (84%) create mode 100644 src/targets/shell/httpie/fixtures/build-parameters.sh rename {test/fixtures/output/shell/httpie => src/targets/shell/httpie/fixtures}/cookies.sh (55%) create mode 100644 src/targets/shell/httpie/fixtures/custom-indentation.sh create mode 100644 src/targets/shell/httpie/fixtures/custom-method.sh rename {test/fixtures/output/shell/httpie => src/targets/shell/httpie/fixtures}/full.sh (94%) rename {test/fixtures/output/shell/httpie => src/targets/shell/httpie/fixtures}/headers.sh (83%) create mode 100644 src/targets/shell/httpie/fixtures/https.sh rename {test/fixtures/output/shell/httpie => src/targets/shell/httpie/fixtures}/jsonObj-multiline.sh (68%) rename {test/fixtures/output/shell/httpie => src/targets/shell/httpie/fixtures}/jsonObj-null-value.sh (65%) create mode 100644 src/targets/shell/httpie/fixtures/long-flags.sh rename {test/fixtures/output/shell/httpie => src/targets/shell/httpie/fixtures}/multipart-data.sh (94%) rename {test/fixtures/output/shell/httpie => src/targets/shell/httpie/fixtures}/multipart-file.sh (94%) rename {test/fixtures/output/shell/httpie => src/targets/shell/httpie/fixtures}/multipart-form-data.sh (93%) rename {test/fixtures/output/shell/httpie => src/targets/shell/httpie/fixtures}/nested.sh (85%) rename {test/fixtures/output/shell/httpie => src/targets/shell/httpie/fixtures}/query.sh (94%) create mode 100644 src/targets/shell/httpie/fixtures/querystring-parameters.sh create mode 100644 src/targets/shell/httpie/fixtures/short-flags.sh create mode 100644 src/targets/shell/httpie/fixtures/short.sh rename {test/fixtures/output/shell/httpie => src/targets/shell/httpie/fixtures}/text-plain.sh (70%) create mode 100644 src/targets/shell/httpie/fixtures/verbose-output.sh delete mode 100644 src/targets/shell/index.js create mode 100644 src/targets/shell/target.ts delete mode 100644 src/targets/shell/wget.js create mode 100644 src/targets/shell/wget/client.test.ts create mode 100644 src/targets/shell/wget/client.ts rename {test/fixtures/output/shell/wget => src/targets/shell/wget/fixtures}/application-form-encoded.sh (85%) rename {test/fixtures/output/shell/wget => src/targets/shell/wget/fixtures}/application-json.sh (89%) rename {test/fixtures/output/shell/wget => src/targets/shell/wget/fixtures}/cookies.sh (77%) create mode 100644 src/targets/shell/wget/fixtures/custom-indentation.sh rename {test/fixtures/output/shell/wget => src/targets/shell/wget/fixtures}/custom-method.sh (68%) rename {test/fixtures/output/shell/wget => src/targets/shell/wget/fixtures}/full.sh (77%) rename {test/fixtures/output/shell/wget => src/targets/shell/wget/fixtures}/headers.sh (81%) rename {test/fixtures/output/shell/wget => src/targets/shell/wget/fixtures}/https.sh (65%) rename {test/fixtures/output/shell/wget => src/targets/shell/wget/fixtures}/jsonObj-multiline.sh (83%) rename {test/fixtures/output/shell/wget => src/targets/shell/wget/fixtures}/jsonObj-null-value.sh (83%) rename {test/fixtures/output/shell/wget => src/targets/shell/wget/fixtures}/multipart-data.sh (92%) rename {test/fixtures/output/shell/wget => src/targets/shell/wget/fixtures}/multipart-file.sh (92%) rename {test/fixtures/output/shell/wget => src/targets/shell/wget/fixtures}/multipart-form-data.sh (91%) rename {test/fixtures/output/shell/wget => src/targets/shell/wget/fixtures}/nested.sh (95%) create mode 100644 src/targets/shell/wget/fixtures/query.sh create mode 100644 src/targets/shell/wget/fixtures/short-options.sh rename {test/fixtures/output/shell/wget => src/targets/shell/wget/fixtures}/short.sh (66%) rename {test/fixtures/output/shell/wget => src/targets/shell/wget/fixtures}/text-plain.sh (82%) create mode 100644 src/targets/shell/wget/fixtures/v-output.sh create mode 100644 src/targets/shell/wget/fixtures/verbose-output.sh delete mode 100644 src/targets/swift/helpers.js create mode 100644 src/targets/swift/helpers.ts delete mode 100644 src/targets/swift/index.js delete mode 100644 src/targets/swift/nsurlsession.js create mode 100644 src/targets/swift/nsurlsession/client.test.ts create mode 100644 src/targets/swift/nsurlsession/client.ts rename {test/fixtures/output/swift/nsurlsession => src/targets/swift/nsurlsession/fixtures}/application-form-encoded.swift (97%) rename {test/fixtures/output/swift/nsurlsession => src/targets/swift/nsurlsession/fixtures}/application-json.swift (98%) rename {test/fixtures/output/swift/nsurlsession => src/targets/swift/nsurlsession/fixtures}/cookies.swift (97%) rename {test/fixtures/output/swift/nsurlsession => src/targets/swift/nsurlsession/fixtures}/custom-method.swift (96%) rename {test/fixtures/output/swift/nsurlsession => src/targets/swift/nsurlsession/fixtures}/full.swift (98%) rename {test/fixtures/output/swift/nsurlsession => src/targets/swift/nsurlsession/fixtures}/headers.swift (97%) rename {test/fixtures/output/swift/nsurlsession => src/targets/swift/nsurlsession/fixtures}/https.swift (96%) create mode 100644 src/targets/swift/nsurlsession/fixtures/indent-option.swift create mode 100644 src/targets/swift/nsurlsession/fixtures/json-null-value.swift rename {test/fixtures/output/swift/nsurlsession => src/targets/swift/nsurlsession/fixtures}/jsonObj-multiline.swift (97%) rename {test/fixtures/output/swift/nsurlsession => src/targets/swift/nsurlsession/fixtures}/jsonObj-null-value.swift (97%) rename {test/fixtures/output/swift/nsurlsession => src/targets/swift/nsurlsession/fixtures}/multipart-data.swift (98%) rename {test/fixtures/output/swift/nsurlsession => src/targets/swift/nsurlsession/fixtures}/multipart-file.swift (98%) rename {test/fixtures/output/swift/nsurlsession => src/targets/swift/nsurlsession/fixtures}/multipart-form-data.swift (98%) rename {test/fixtures/output/swift/nsurlsession => src/targets/swift/nsurlsession/fixtures}/nested.swift (97%) create mode 100644 src/targets/swift/nsurlsession/fixtures/pretty-option.swift rename {test/fixtures/output/swift/nsurlsession => src/targets/swift/nsurlsession/fixtures}/query.swift (97%) rename {test/fixtures/output/swift/nsurlsession => src/targets/swift/nsurlsession/fixtures}/short.swift (96%) rename {test/fixtures/output/swift/nsurlsession => src/targets/swift/nsurlsession/fixtures}/text-plain.swift (97%) create mode 100644 src/targets/swift/nsurlsession/fixtures/timeout-option.swift create mode 100644 src/targets/swift/target.ts create mode 100644 src/targets/targets.test.ts create mode 100644 src/targets/targets.ts delete mode 100644 test/fixtures/cli.json delete mode 100644 test/fixtures/curl/http1.json delete mode 100644 test/fixtures/curl/index.js delete mode 100644 test/fixtures/customTarget.js delete mode 100644 test/fixtures/files/hello.txt delete mode 100644 test/fixtures/har.json delete mode 100644 test/fixtures/index.js delete mode 100644 test/fixtures/mimetypes.json delete mode 100644 test/fixtures/output/clojure/clj_http/custom-method.clj delete mode 100644 test/fixtures/output/clojure/clj_http/text-plain.clj delete mode 100644 test/fixtures/output/csharp/restsharp/custom-method.cs delete mode 100644 test/fixtures/output/javascript/axios/application-form-encoded.js delete mode 100644 test/fixtures/output/javascript/axios/cookies.js delete mode 100644 test/fixtures/output/javascript/axios/custom-method.js delete mode 100644 test/fixtures/output/javascript/axios/headers.js delete mode 100644 test/fixtures/output/javascript/axios/https.js delete mode 100644 test/fixtures/output/javascript/axios/jsonObj-multiline.js delete mode 100644 test/fixtures/output/javascript/axios/jsonObj-null-value.js delete mode 100644 test/fixtures/output/javascript/axios/multipart-data.js delete mode 100644 test/fixtures/output/javascript/axios/multipart-file.js delete mode 100644 test/fixtures/output/javascript/axios/nested.js delete mode 100644 test/fixtures/output/javascript/axios/query.js delete mode 100644 test/fixtures/output/javascript/axios/short.js delete mode 100644 test/fixtures/output/javascript/axios/text-plain.js delete mode 100644 test/fixtures/output/javascript/jquery/application-form-encoded.js delete mode 100644 test/fixtures/output/javascript/jquery/application-json.js delete mode 100644 test/fixtures/output/javascript/jquery/cookies.js delete mode 100644 test/fixtures/output/javascript/jquery/custom-method.js delete mode 100644 test/fixtures/output/javascript/jquery/full.js delete mode 100644 test/fixtures/output/javascript/jquery/headers.js delete mode 100644 test/fixtures/output/javascript/jquery/https.js delete mode 100644 test/fixtures/output/javascript/jquery/jsonObj-multiline.js delete mode 100644 test/fixtures/output/javascript/jquery/jsonObj-null-value.js delete mode 100644 test/fixtures/output/javascript/jquery/multipart-data.js delete mode 100644 test/fixtures/output/javascript/jquery/multipart-file.js delete mode 100644 test/fixtures/output/javascript/jquery/multipart-form-data.js delete mode 100644 test/fixtures/output/javascript/jquery/nested.js delete mode 100644 test/fixtures/output/javascript/jquery/query.js delete mode 100644 test/fixtures/output/javascript/jquery/short.js delete mode 100644 test/fixtures/output/javascript/jquery/text-plain.js delete mode 100644 test/fixtures/output/javascript/xhr/application-form-encoded.js delete mode 100644 test/fixtures/output/javascript/xhr/application-json.js delete mode 100644 test/fixtures/output/javascript/xhr/cookies.js delete mode 100644 test/fixtures/output/javascript/xhr/full.js delete mode 100644 test/fixtures/output/javascript/xhr/headers.js delete mode 100644 test/fixtures/output/javascript/xhr/jsonObj-multiline.js delete mode 100644 test/fixtures/output/javascript/xhr/jsonObj-null-value.js delete mode 100644 test/fixtures/output/javascript/xhr/text-plain.js delete mode 100644 test/fixtures/output/node/axios/application-form-encoded.js delete mode 100644 test/fixtures/output/node/axios/cookies.js delete mode 100644 test/fixtures/output/node/axios/custom-method.js delete mode 100644 test/fixtures/output/node/axios/headers.js delete mode 100644 test/fixtures/output/node/axios/https.js delete mode 100644 test/fixtures/output/node/axios/jsonObj-multiline.js delete mode 100644 test/fixtures/output/node/axios/jsonObj-null-value.js delete mode 100644 test/fixtures/output/node/axios/nested.js delete mode 100644 test/fixtures/output/node/axios/query.js delete mode 100644 test/fixtures/output/node/axios/short.js delete mode 100644 test/fixtures/output/node/axios/text-plain.js delete mode 100644 test/fixtures/output/node/native/application-form-encoded.js delete mode 100644 test/fixtures/output/node/native/cookies.js delete mode 100644 test/fixtures/output/node/native/full.js delete mode 100644 test/fixtures/output/node/native/headers.js delete mode 100644 test/fixtures/output/node/native/multipart-data.js delete mode 100644 test/fixtures/output/node/native/multipart-file.js delete mode 100644 test/fixtures/output/node/native/multipart-form-data.js delete mode 100644 test/fixtures/output/node/native/nested.js delete mode 100644 test/fixtures/output/node/native/query.js delete mode 100644 test/fixtures/output/node/native/text-plain.js delete mode 100644 test/fixtures/output/node/unirest/application-form-encoded.js delete mode 100644 test/fixtures/output/node/unirest/application-json.js delete mode 100644 test/fixtures/output/node/unirest/cookies.js delete mode 100644 test/fixtures/output/node/unirest/custom-method.js delete mode 100644 test/fixtures/output/node/unirest/full.js delete mode 100644 test/fixtures/output/node/unirest/headers.js delete mode 100644 test/fixtures/output/node/unirest/jsonObj-multiline.js delete mode 100644 test/fixtures/output/node/unirest/jsonObj-null-value.js delete mode 100644 test/fixtures/output/node/unirest/multipart-data.js delete mode 100644 test/fixtures/output/node/unirest/multipart-file.js delete mode 100644 test/fixtures/output/node/unirest/multipart-form-data.js delete mode 100644 test/fixtures/output/node/unirest/nested.js delete mode 100644 test/fixtures/output/node/unirest/query.js delete mode 100644 test/fixtures/output/node/unirest/text-plain.js delete mode 100644 test/fixtures/output/powershell/restmethod/custom-method.ps1 delete mode 100644 test/fixtures/output/powershell/webrequest/custom-method.ps1 delete mode 100644 test/fixtures/output/shell/curl/custom-method.sh delete mode 100644 test/fixtures/output/shell/curl/https.sh delete mode 100644 test/fixtures/output/shell/curl/short.sh delete mode 100644 test/fixtures/output/shell/httpie/custom-method.sh delete mode 100644 test/fixtures/output/shell/httpie/https.sh delete mode 100644 test/fixtures/output/shell/httpie/short.sh delete mode 100644 test/fixtures/output/shell/wget/query.sh delete mode 100644 test/fixtures/requests/index.js delete mode 100644 test/headers.js delete mode 100644 test/index.js delete mode 100644 test/reducer.js delete mode 100644 test/requests.js delete mode 100644 test/targets.js delete mode 100644 test/targets/c/libcurl.js delete mode 100644 test/targets/clojure/clj_http.js delete mode 100644 test/targets/csharp/httpclient.js delete mode 100644 test/targets/csharp/restsharp.js delete mode 100644 test/targets/go/native.js delete mode 100644 test/targets/http/1.1.js delete mode 100644 test/targets/java/asynchttp.js delete mode 100644 test/targets/java/nethttp.js delete mode 100644 test/targets/java/okhttp.js delete mode 100644 test/targets/java/unirest.js delete mode 100644 test/targets/javascript/axios.js delete mode 100644 test/targets/javascript/fetch.js delete mode 100644 test/targets/javascript/jquery.js delete mode 100644 test/targets/javascript/xhr.js delete mode 100644 test/targets/kotlin/okhttp.js delete mode 100644 test/targets/node/axios.js delete mode 100644 test/targets/node/fetch.js delete mode 100644 test/targets/node/native.js delete mode 100644 test/targets/node/request.js delete mode 100644 test/targets/node/unirest.js delete mode 100644 test/targets/objc/nsurlsession.js delete mode 100644 test/targets/ocaml/cohttp.js delete mode 100644 test/targets/php/curl.js delete mode 100644 test/targets/php/http1.js delete mode 100644 test/targets/php/http2.js delete mode 100644 test/targets/powershell/restmethod.js delete mode 100644 test/targets/powershell/webrequest.js delete mode 100644 test/targets/python/python3.js delete mode 100644 test/targets/python/requests.js delete mode 100644 test/targets/r/httr.js delete mode 100644 test/targets/ruby/native.js delete mode 100644 test/targets/shell/curl.js delete mode 100644 test/targets/shell/httpie.js delete mode 100644 test/targets/shell/wget.js delete mode 100644 test/targets/swift/nsurlsession.js create mode 100644 tsconfig.build.json create mode 100644 tsconfig.json diff --git a/.editorconfig b/.editorconfig index e717f5eb6..366bdb572 100644 --- a/.editorconfig +++ b/.editorconfig @@ -9,5 +9,15 @@ charset = utf-8 trim_trailing_whitespace = true insert_final_newline = true +[targets/**/fixtures/*] +insert_final_newline = false + +[**/http1.1/fixtures/*] +end_of_line = crlf +insert_final_newline = false + +[**/http1.1/fixtures/jsonObj-multiline] +end_of_line = unset + [*.md] trim_trailing_whitespace = false diff --git a/.eslintignore b/.eslintignore new file mode 100644 index 000000000..d407cb0de --- /dev/null +++ b/.eslintignore @@ -0,0 +1,3 @@ +src/targets/**/fixtures +dist +bin diff --git a/.eslintrc.js b/.eslintrc.js new file mode 100644 index 000000000..7ca6d3251 --- /dev/null +++ b/.eslintrc.js @@ -0,0 +1,30 @@ +/** @type { import('eslint').Linter.Config } */ +module.exports = { + parser: '@typescript-eslint/parser', + env: { + node: true, + }, + parserOptions: { + project: 'tsconfig.json', + }, + extends: [ + 'eslint:recommended', + 'plugin:@typescript-eslint/recommended', + 'plugin:jest/all', + 'plugin:jest-formatting/strict', + 'plugin:eslint-comments/recommended', + 'prettier', + ], + plugins: ['eslint-comments', 'simple-import-sort', 'jest', 'jest-formatting'], + rules: { + 'prefer-template': 'error', + 'no-else-return': 'error', + '@typescript-eslint/no-explicit-any': 'off', + 'eslint-comments/require-description': 'error', + 'eslint-comments/disable-enable-pair': 'off', + 'simple-import-sort/imports': 'error', + 'simple-import-sort/exports': 'error', + 'jest/prefer-expect-assertions': 'off', + 'jest/require-hook': 'off', + }, +}; diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..491fe1370 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +targets/http/http1.1/fixtures text diff --git a/.gitignore b/.gitignore index dddca890c..ca885047b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ *.log node_modules coverage* +dist diff --git a/.npmignore b/.npmignore index 2908abdd3..b962347fa 100644 --- a/.npmignore +++ b/.npmignore @@ -1,2 +1,7 @@ -.editorconfig -test +# Ignore everything by default +# NOTE: NPM publish will never ignore package.json, package-lock.json, README, LICENSE, CHANGELOG +# https://npm.github.io/publishing-pkgs-docs/publishing/the-npmignore-file.html +* + +# Don't ignore dist folder +!dist/** diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 000000000..f4eb0aa54 --- /dev/null +++ b/.prettierignore @@ -0,0 +1,5 @@ +build +node_modules +src/targets/**/fixtures +dist +bin diff --git a/.prettierrc.js b/.prettierrc.js new file mode 100644 index 000000000..a97111a52 --- /dev/null +++ b/.prettierrc.js @@ -0,0 +1,16 @@ +/** @type { import('prettier').Config } */ +module.exports = { + arrowParens: 'avoid', + bracketSameLine: false, + bracketSpacing: true, + jsxSingleQuote: false, + printWidth: 100, + proseWrap: 'never', + quoteProps: 'as-needed', + semi: true, + singleAttributePerLine: true, + singleQuote: true, + tabWidth: 2, + trailingComma: 'all', + useTabs: false, +}; diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index c7e2c8e1c..000000000 --- a/.travis.yml +++ /dev/null @@ -1,12 +0,0 @@ -language: node_js - -node_js: - - node - - lts/* - -before_install: - - sudo apt-get update -qq - - sudo apt-get install -qq php7.0 php7.0-curl php7.0-cli - -after_script: - - npm run codeclimate diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 000000000..8faf83c1a --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,3 @@ +{ + "recommendations": ["EditorConfig.EditorConfig"] +} diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 000000000..f3efd0c24 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,4 @@ +{ + "files.insertFinalNewline": false, // controlled by the .editorconfig at root since we can't map vscode settings directly to files (see: https://github.com/microsoft/vscode/issues/35350) + "editor.defaultFormatter": "esbenp.prettier-vscode" +} diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c4cae9482..9c3eb7cb8 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,53 +1,36 @@ # Contributing to this project -Please take a moment to review this document in order to make the contribution -process easy and effective for everyone involved. +Please take a moment to review this document in order to make the contribution process easy and effective for everyone involved. -Following these guidelines helps to communicate that you respect the time of -the developers managing and developing this open source project. In return, -they should reciprocate that respect in addressing your issue or assessing -patches and features. +Following these guidelines helps to communicate that you respect the time of the developers managing and developing this open source project. In return, they should reciprocate that respect in addressing your issue or assessing patches and features. ## Using the issue tracker -The [issue tracker](/issues) is the preferred channel for [bug reports](#bug-reports), -[features requests](#feature-requests) and [submitting pull requests](#pull-requests), -but please respect the following restrictions: +The [issue tracker](/issues) is the preferred channel for [bug reports](#bug-reports), [features requests](#feature-requests) and [submitting pull requests](#pull-requests), but please respect the following restrictions: -* Please **do not** use the issue tracker for personal support requests (use - [Stack Overflow](http://stackoverflow.com) or IRC). +- Please **do not** use the issue tracker for personal support requests (use [Stack Overflow](http://stackoverflow.com) or IRC). -* Please **do not** derail or troll issues. Keep the discussion on topic and - respect the opinions of others. +- Please **do not** derail or troll issues. Keep the discussion on topic and respect the opinions of others. ## Bug reports -A bug is a _demonstrable problem_ that is caused by the code in the repository. -Good bug reports are extremely helpful - thank you! +A bug is a _demonstrable problem_ that is caused by the code in the repository. Good bug reports are extremely helpful - thank you! Guidelines for bug reports: -1. **Use the GitHub issue search** — check if the issue has already been - reported. +1. **Use the GitHub issue search** — check if the issue has already been reported. -2. **Check if the issue has been fixed** — try to reproduce it using the - latest `master` or development branch in the repository. +2. **Check if the issue has been fixed** — try to reproduce it using the latest `master` or development branch in the repository. -3. **Isolate the problem** — create a [reduced test - case](http://css-tricks.com/6263-reduced-test-cases/) and a live example. +3. **Isolate the problem** — create a [reduced test case](http://css-tricks.com/6263-reduced-test-cases/) and a live example. -A good bug report shouldn't leave others needing to chase you up for more -information. Please try to be as detailed as possible in your report. What is -your environment? What steps will reproduce the issue? What browser(s) and OS -experience the problem? What would you expect to be the outcome? All these -details will help people to fix any potential bugs. +A good bug report shouldn't leave others needing to chase you up for more information. Please try to be as detailed as possible in your report. What is your environment? What steps will reproduce the issue? What browser(s) and OS experience the problem? What would you expect to be the outcome? All these details will help people to fix any potential bugs. Example: > Short and descriptive example bug report title > -> A summary of the issue and the browser/OS environment in which it occurs. If -> suitable, include the steps required to reproduce the bug. +> A summary of the issue and the browser/OS environment in which it occurs. If suitable, include the steps required to reproduce the bug. > > 1. This is the first step > 2. This is the second step @@ -55,85 +38,64 @@ Example: > > `` - a link to the reduced test case > -> Any other information you want to share that is relevant to the issue being -> reported. This might include the lines of code that you have identified as -> causing the bug, and potential solutions (and your opinions on their -> merits). +> Any other information you want to share that is relevant to the issue being reported. This might include the lines of code that you have identified as causing the bug, and potential solutions (and your opinions on their merits). ## Feature requests -Feature requests are welcome. But take a moment to find out whether your idea -fits with the scope and aims of the project. It's up to *you* to make a strong -case to convince the project's developers of the merits of this feature. Please -provide as much detail and context as possible. +Feature requests are welcome. But take a moment to find out whether your idea fits with the scope and aims of the project. It's up to _you_ to make a strong case to convince the project's developers of the merits of this feature. Please provide as much detail and context as possible. ## Pull requests -Good pull requests (patches, improvements, new features) are a fantastic -help. They should remain focused in scope and avoid containing unrelated -commits. +Good pull requests (patches, improvements, new features) are a fantastic help. They should remain focused in scope and avoid containing unrelated commits. -**Please ask first** before embarking on any significant pull request (e.g. -implementing features, refactoring code, porting to a different language), -otherwise you risk spending a lot of time working on something that the -project's developers might not want to merge into the project. +**Please ask first** before embarking on any significant pull request (e.g. implementing features, refactoring code, porting to a different language), otherwise you risk spending a lot of time working on something that the project's developers might not want to merge into the project. -Please adhere to the coding conventions used throughout a project (indentation, -accurate comments, etc.) and any other requirements (such as test coverage). +Please adhere to the coding conventions used throughout a project (indentation, accurate comments, etc.) and any other requirements (such as test coverage). -Follow this process if you'd like your work considered for inclusion in the -project: +Follow this process if you'd like your work considered for inclusion in the project: -1. [Fork](http://help.github.com/fork-a-repo/) the project, clone your fork, - and configure the remotes: +1. [Fork](http://help.github.com/fork-a-repo/) the project, clone your fork, and configure the remotes: - ```bash - # Clone your fork of the repo into the current directory - git clone https://github.com// - # Navigate to the newly cloned directory - cd - # Assign the original repo to a remote called "upstream" - git remote add upstream https://github.com/Mashape/httpsnippet.git - ``` + ```bash + # Clone your fork of the repo into the current directory + git clone https://github.com// + # Navigate to the newly cloned directory + cd + # Assign the original repo to a remote called "upstream" + git remote add upstream https://github.com/Kong/httpsnippet.git + ``` 2. If you cloned a while ago, get the latest changes from upstream: - ```bash - git checkout - git pull upstream - ``` + ```bash + git checkout + git pull upstream + ``` -3. Create a new topic branch (off the main project development branch) to - contain your feature, change, or fix: +3. Create a new topic branch (off the main project development branch) to contain your feature, change, or fix: - ```bash - git checkout -b - ``` + ```bash + git checkout -b + ``` -4. Commit your changes in logical chunks. Please adhere to these [git commit - message guidelines](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html) - or your code is unlikely be merged into the main project. Use Git's - [interactive rebase](https://help.github.com/articles/interactive-rebase) - feature to tidy up your commits before making them public. +4. Commit your changes in logical chunks. Please adhere to these [git commit message guidelines](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html) or your code is unlikely be merged into the main project. Use Git's [interactive rebase](https://help.github.com/articles/interactive-rebase) feature to tidy up your commits before making them public. 5. Locally merge (or rebase) the upstream development branch into your topic branch: - ```bash - git pull [--rebase] upstream - ``` + ```bash + git pull [--rebase] upstream + ``` 6. Push your topic branch up to your fork: - ```bash - git push origin - ``` + ```bash + git push origin + ``` -7. [Open a Pull Request](https://help.github.com/articles/using-pull-requests/) - with a clear title and description. +7. [Open a Pull Request](https://help.github.com/articles/using-pull-requests/) with a clear title and description. -**IMPORTANT**: By submitting a patch, you agree to allow the project owner to -license your work under the same license as that used by the project. +**IMPORTANT**: By submitting a patch, you agree to allow the project owner to license your work under the same license as that used by the project. ## Creating New Conversion Targets -For a info on creating new conversion targets, please review this [guideline](https://github.com/Mashape/httpsnippet/wiki/Creating-Targets) +For a info on creating new conversion targets, please review this [guideline](https://github.com/Kong/httpsnippet/wiki/Creating-Targets) diff --git a/LICENSE b/LICENSE index fbab00b10..dafaf46b4 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2015 Mashape (https://www.mashape.com) +Copyright (c) 2022 Kong (https://www.konghq.com) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index acb7dd9c3..dfcec37b4 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,12 @@ # HTTP Snippet [![version][npm-version]][npm-url] [![License][npm-license]][license-url] -> HTTP Request snippet generator for *many* languages & tools including: `cURL`, `HTTPie`, `Javascript`, `Node`, `C`, `Java`, `PHP`, `Objective-C`, `Swift`, `Python`, `Ruby`, `C#`, `Go`, `OCaml` and [more](https://github.com/Mashape/httpsnippet/wiki/Targets)! +> HTTP Request snippet generator for _many_ languages & tools including: `cURL`, `HTTPie`, `Javascript`, `Node`, `C`, `Java`, `PHP`, `Objective-C`, `Swift`, `Python`, `Ruby`, `C#`, `Go`, `OCaml` and [more](https://github.com/Kong/httpsnippet/wiki/Targets)! Relies on the popular [HAR](http://www.softwareishard.com/blog/har-12-spec/#request) format to import data and describe HTTP calls. See it in action on companion service: [APIembed](https://apiembed.com/) -[![Build Status][travis-image]][travis-url] -[![Downloads][npm-downloads]][npm-url] +[![Build Status][travis-image]][travis-url] [![Downloads][npm-downloads]][npm-url] ## Install @@ -21,8 +20,7 @@ npm install --save httpsnippet ## Usage -``` - +```text Usage: httpsnippet [options] Options: @@ -33,7 +31,6 @@ npm install --save httpsnippet -c, --client [client] target client library -o, --output write output to directory -x, --extra [{"optionKey": "optionValue"}] provide extra options for the target/client - ``` ###### Example @@ -70,24 +67,22 @@ provide extra options: httpsnippet example.json --target http --output ./snippets -x '{"autoHost": false, "autoContentLength": false}' ``` - ## API ### HTTPSnippet(source) #### source -*Required* -Type: `object` +_Required_ Type: `object` -Name of [conversion target](https://github.com/Mashape/httpsnippet/wiki/Targets) +Name of [conversion target](https://github.com/Kong/httpsnippet/wiki/Targets) -```js -var HTTPSnippet = require('httpsnippet'); +```ts +import { HTTPSnippet } from 'httpsnippet'; -var snippet = new HTTPSnippet({ +const snippet = new HTTPSnippet({ method: 'GET', - url: 'http://mockbin.com/request' + url: 'http://mockbin.com/request', }); ``` @@ -95,102 +90,103 @@ var snippet = new HTTPSnippet({ #### target -*Required* -Type: `string` +_Required_ Type: `string` -Name of [conversion target](https://github.com/Mashape/httpsnippet/wiki/Targets) +Name of [conversion target](https://github.com/Kong/httpsnippet/wiki/Targets) #### options Type: `object` -Target options, *see [wiki](https://github.com/Mashape/httpsnippet/wiki/Targets) for details* +Target options, _see [wiki](https://github.com/Kong/httpsnippet/wiki/Targets) for details_ -```js -var HTTPSnippet = require('httpsnippet'); +```ts +import { HTTPSnippet } from 'httpsnippet'; -var snippet = new HTTPSnippet({ +const snippet = new HTTPSnippet({ method: 'GET', - url: 'http://mockbin.com/request' + url: 'http://mockbin.com/request', }); // generate Node.js: Native output console.log(snippet.convert('node')); // generate Node.js: Native output, indent with tabs -console.log(snippet.convert('node', { - indent: '\t' -})); +console.log( + snippet.convert('node', { + indent: '\t', + }), +); ``` ### convert(target [, client, options]) -#### target +#### Target -*Required* -Type: `string` +_Required_ Type: `string` -Name of [conversion target](https://github.com/Mashape/httpsnippet/wiki/Targets) +Name of [conversion target](https://github.com/Kong/httpsnippet/wiki/Targets) -#### client +#### Client Type: `string` -Name of conversion target [client library](https://github.com/Mashape/httpsnippet/wiki/Targets) +Name of conversion target [client library](https://github.com/Kong/httpsnippet/wiki/Targets) -#### options +#### Options Type: `object` -Target options, *see [wiki](https://github.com/Mashape/httpsnippet/wiki/Targets) for details* +Target options, _see [wiki](https://github.com/Kong/httpsnippet/wiki/Targets) for details_ -```js -var HTTPSnippet = require('httpsnippet'); +```ts +import { HTTPSnippet } from 'httpsnippet'; -var snippet = new HTTPSnippet({ +const snippet = new HTTPSnippet({ method: 'GET', - url: 'http://mockbin.com/request' + url: 'http://mockbin.com/request', }); // generate Shell: cURL output -console.log(snippet.convert('shell', 'curl', { - indent: '\t' -})); +console.log( + snippet.convert('shell', 'curl', { + indent: '\t', + }), +); // generate Node.js: Unirest output console.log(snippet.convert('node', 'unirest')); ``` ### addTarget(target) + #### target -*Required* -Type: `object` +_Required_ Type: `object` Representation of a [conversion target](https://github.com/Kong/httpsnippet/wiki/Creating-Targets). Can use this to use targets that are not officially supported. -```js -const customLanguageTarget = require('httpsnippet-for-my-lang'); +```ts +import { customLanguageTarget } from 'httpsnippet-for-my-lang'; HTTPSnippet.addTarget(customLanguageTarget); ``` ### addTargetClient(target, client) -### target -*Required* -Type: `string` +### Target -Name of [conversion target](https://github.com/Mashape/httpsnippet/wiki/Targets) +_Required_ Type: `string` -### client +Name of [conversion target](https://github.com/Kong/httpsnippet/wiki/Targets) -*Required* -Type: `object` +### Client + +_Required_ Type: `object` Representation of a [conversion target client](https://github.com/Kong/httpsnippet/wiki/Creating-Targets). Can use this to use target clients that are not officially supported. -```js -const customClient = require('httpsnippet-for-my-node-http-client'); +```ts +import { customClient } from 'httpsnippet-for-my-node-http-client'; HTTPSnippet.addTargetClient('node', customClient); ``` @@ -198,7 +194,7 @@ HTTPSnippet.addTargetClient('node', customClient); At the heart of this module is the [HAR Format](http://www.softwareishard.com/blog/har-12-spec/#request) as the HTTP request description format, please review some of the sample JSON HAR Request objects in [test fixtures](/test/fixtures/requests), or read the [HAR Docs](http://www.softwareishard.com/blog/har-12-spec/#request) for more details. -For detailed information on each target, please review the [wiki](https://github.com/Mashape/httpsnippet/wiki). +For detailed information on each target, please review the [wiki](https://github.com/Kong/httpsnippet/wiki). ## Bugs and feature requests @@ -208,37 +204,15 @@ Have a bug or a feature request? Please first read the [issue guidelines](CONTRI Please read through our [contributing guidelines](CONTRIBUTING.md). Included are directions for opening issues, coding standards, and notes on development. -For info on creating new conversion targets, please review this [guideline](https://github.com/Mashape/httpsnippet/wiki/Creating-Targets) +For info on creating new conversion targets, please review this [guideline](https://github.com/Kong/httpsnippet/wiki/Creating-Targets) Moreover, if your pull request contains JavaScript patches or features, you must include relevant unit tests. Editor preferences are available in the [editor config](.editorconfig) for easy use in common text editors. Read more and download plugins at . -## Versioning - -For transparency into our release cycle and in striving to maintain backward compatibility, this project is maintained under the Semantic Versioning guidelines. Sometimes we screw up, but we'll adhere to these rules whenever possible. - -Releases will be numbered with the following format: - -`..` - -And constructed with the following guidelines: - -- Breaking backward compatibility **bumps the major** while resetting minor and patch -- New additions without breaking backward compatibility **bumps the minor** while resetting the patch -- Bug fixes and misc changes **bumps only the patch** - -For more information on SemVer, please visit . - -## License - -[MIT](LICENSE) © [Kong](https://konghq.com) - [license-url]: https://github.com/Kong/httpsnippet/blob/master/LICENSE - [travis-url]: https://travis-ci.org/Kong/httpsnippet [travis-image]: https://api.travis-ci.org/Kong/httpsnippet.svg?branch=master - [npm-url]: https://www.npmjs.com/package/httpsnippet [npm-license]: https://img.shields.io/npm/l/httpsnippet.svg?style=flat-square [npm-version]: https://img.shields.io/npm/v/httpsnippet.svg?style=flat-square diff --git a/bin/httpsnippet b/bin/httpsnippet index 49410f8e4..fe8cdf1a3 100755 --- a/bin/httpsnippet +++ b/bin/httpsnippet @@ -1,97 +1,2 @@ #!/usr/bin/env node - -'use strict' - -const chalk = require('chalk') -const cmd = require('commander') -const fs = require('fs') -const readFile = require('fs-readfile-promise') -const writeFile = require('fs-writefile-promise') -const HTTPSnippet = require('..') -const path = require('path') -const pkg = require('../package.json') - -cmd - .version(pkg.version) - .usage('[options] ') - .option('-t, --target ', 'target output') - .option('-c, --client [client]', 'target client library') - .option('-o, --output ', 'write output to directory') - .option('-x, --extra [{"optionKey": "optionValue"}]', 'provide extra options for the target/client') - .parse(process.argv) - -if (!cmd.args.length || !cmd.target) { - cmd.help() -} - -let extraOptions -if (cmd.extra) { - try { - extraOptions = JSON.parse(cmd.extra) - } catch (e) { - console.error('%s failed to parse options %s (should be JSON)', chalk.red('✖'), chalk.cyan.bold(cmd.extra)) - process.exit() - } -} - -let dir -if (cmd.output) { - dir = path.resolve(cmd.output) - - if (!fs.existsSync(dir)) { - fs.mkdirSync(dir) - } -} - -cmd.args.forEach(function (fileName) { - const file = path.basename(fileName) - - readFile(fileName) - .then(JSON.parse) - - .catch(function (e) { - console.error('%s %s failed to read JSON: %s', chalk.red('✖'), chalk.cyan.bold(file), chalk.red(e.message)) - }) - - .then(function (data) { - return new HTTPSnippet(data) - }) - - .catch(function (e) { - e.errors.forEach(function (err) { - console.error('%s %s failed validation: (%s: %s) %s', chalk.red('✖'), chalk.cyan.bold(file), chalk.cyan.italic(err.field), chalk.magenta.italic(err.value), chalk.red(err.message)) - }) - }) - - .then(function (snippet) { - return snippet.convert(cmd.target, cmd.client, extraOptions) - }) - - .then(function (output) { - if (!output) { - const targetNames = HTTPSnippet.availableTargets().map(function (t) { return t.key }).join(', ') - return console.error('%s %s is not a valid target. Valid targets: %s', chalk.red('✖'), chalk.red(cmd.target), chalk.cyan(targetNames)) - } - - // print - if (!cmd.output) { - return console.log('%s %s > %s [%s] :\n%s', chalk.green('✓'), chalk.cyan.bold(file), chalk.yellow(cmd.target), chalk.yellow(cmd.client ? cmd.client : 'default'), output) - } - - // write to file - const name = path.basename(file, path.extname(file)) - - const filename = path.format({ - dir: dir, - base: name + HTTPSnippet.extname(cmd.target) - }) - - return writeFile(filename, output + '\n', function () { - console.log('%s %s > %s', chalk.green('✓'), chalk.cyan.bold(file), filename) - }) - }) - - .catch(function (e) { - console.error('%s %s fail: %s', chalk.red('✖'), chalk.cyan.bold(file), chalk.red(e.message)) - }) -}) +require('../dist/src/cli.js').go(); diff --git a/jest.config.js b/jest.config.js new file mode 100644 index 000000000..04bea86f7 --- /dev/null +++ b/jest.config.js @@ -0,0 +1,17 @@ +/** @type { import('@jest/types').Config.InitialOptions } */ +module.exports = { + collectCoverage: false, + globals: { + 'ts-jest': { + isolatedModules: true, + }, + }, + moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'], + modulePathIgnorePatterns: ['/dist'], + resetMocks: true, + resetModules: true, + testEnvironment: 'node', + testRegex: ['.+\\.test\\.tsx?$'], + transform: { '^.+\\.tsx?$': 'ts-jest' }, + // verbose: true, +}; diff --git a/package-lock.json b/package-lock.json index c6b1cc041..ed3678fe5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,1690 +1,6789 @@ { "name": "httpsnippet", - "version": "1.25.0", - "lockfileVersion": 1, + "version": "3.0.0", + "lockfileVersion": 2, "requires": true, - "dependencies": { - "@babel/code-frame": { - "version": "7.12.11", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz", - "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==", - "dev": true, - "requires": { - "@babel/highlight": "^7.10.4" + "packages": { + "": { + "name": "httpsnippet", + "version": "3.0.0", + "license": "MIT", + "dependencies": { + "chalk": "^4.1.2", + "event-stream": "4.0.1", + "form-data": "4.0.0", + "har-schema": "^2.0.0", + "stringify-object": "3.3.0", + "yargs": "^17.4.0" + }, + "bin": { + "httpsnippet": "bin/httpsnippet" + }, + "devDependencies": { + "@types/eslint": "^8.4.1", + "@types/event-stream": "^4.0.0", + "@types/har-format": "^1.2.8", + "@types/jest": "^27.4.1", + "@types/node": "^16.11.26", + "@types/stringify-object": "^3.3.0", + "@types/yargs": "^17.0.10", + "@typescript-eslint/eslint-plugin": "^5.17.0", + "@typescript-eslint/parser": "^5.17.0", + "eslint": "^8.12.0", + "eslint-config-prettier": "^8.5.0", + "eslint-plugin-eslint-comments": "^3.2.0", + "eslint-plugin-jest": "^26.1.3", + "eslint-plugin-jest-formatting": "^3.1.0", + "eslint-plugin-simple-import-sort": "^7.0.0", + "jest": "^27.5.1", + "prettier": "^2.6.2", + "ts-jest": "^27.1.4", + "type-fest": "^2.12.2", + "typescript": "^4.6.3" + }, + "engines": { + "node": "^14.19.1 || ^16.14.2 || ^18.0.0" } }, - "@babel/helper-validator-identifier": { - "version": "7.12.11", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz", - "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==", - "dev": true - }, - "@babel/highlight": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz", - "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==", + "node_modules/@ampproject/remapping": { + "version": "2.1.2", "dev": true, - "requires": { - "@babel/helper-validator-identifier": "^7.10.4", - "chalk": "^2.0.0", - "js-tokens": "^4.0.0" - }, + "license": "Apache-2.0", "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } + "@jridgewell/trace-mapping": "^0.3.0" + }, + "engines": { + "node": ">=6.0.0" } }, - "@eslint/eslintrc": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.2.2.tgz", - "integrity": "sha512-EfB5OHNYp1F4px/LI/FEnGylop7nOqkQ1LRzCM0KccA2U8tvV8w01KBv37LbO7nW4H+YhKyo2LcJhRwjjV17QQ==", + "node_modules/@babel/code-frame": { + "version": "7.16.7", "dev": true, - "requires": { - "ajv": "^6.12.4", - "debug": "^4.1.1", - "espree": "^7.3.0", - "globals": "^12.1.0", - "ignore": "^4.0.6", - "import-fresh": "^3.2.1", - "js-yaml": "^3.13.1", - "lodash": "^4.17.19", - "minimatch": "^3.0.4", - "strip-json-comments": "^3.1.1" - }, + "license": "MIT", "dependencies": { - "ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "requires": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, - "debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", - "dev": true, - "requires": { - "ms": "2.1.2" - } - }, - "fast-deep-equal": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, - "strip-json-comments": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", - "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", - "dev": true - } + "@babel/highlight": "^7.16.7" + }, + "engines": { + "node": ">=6.9.0" } }, - "@types/json5": { - "version": "0.0.29", - "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", - "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=", - "dev": true - }, - "@ungap/promise-all-settled": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz", - "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==", - "dev": true - }, - "abbrev": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz", - "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=", - "dev": true - }, - "acorn": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", - "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", - "dev": true - }, - "acorn-jsx": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz", - "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==", - "dev": true - }, - "ajv": { - "version": "6.10.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz", - "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==", - "requires": { - "fast-deep-equal": "^2.0.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" + "node_modules/@babel/compat-data": { + "version": "7.17.7", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" } }, - "amdefine": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", - "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", + "node_modules/@babel/core": { + "version": "7.17.8", "dev": true, - "optional": true - }, - "ansi-colors": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", - "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", - "dev": true - }, - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" - }, - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=" + "license": "MIT", + "dependencies": { + "@ampproject/remapping": "^2.1.0", + "@babel/code-frame": "^7.16.7", + "@babel/generator": "^7.17.7", + "@babel/helper-compilation-targets": "^7.17.7", + "@babel/helper-module-transforms": "^7.17.7", + "@babel/helpers": "^7.17.8", + "@babel/parser": "^7.17.8", + "@babel/template": "^7.16.7", + "@babel/traverse": "^7.17.3", + "@babel/types": "^7.17.0", + "convert-source-map": "^1.7.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.2", + "json5": "^2.1.2", + "semver": "^6.3.0" + }, + "engines": { + "node": ">=6.9.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/babel" + } }, - "anymatch": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz", - "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==", + "node_modules/@babel/generator": { + "version": "7.17.7", "dev": true, - "requires": { - "normalize-path": "^3.0.0", - "picomatch": "^2.0.4" + "license": "MIT", + "dependencies": { + "@babel/types": "^7.17.0", + "jsesc": "^2.5.1", + "source-map": "^0.5.0" + }, + "engines": { + "node": ">=6.9.0" } }, - "argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "node_modules/@babel/generator/node_modules/source-map": { + "version": "0.5.7", "dev": true, - "requires": { - "sprintf-js": "~1.0.2" + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.10.0" } }, - "array-includes": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.2.tgz", - "integrity": "sha512-w2GspexNQpx+PutG3QpT437/BenZBj0M/MZGn5mzv/MofYqo0xmRHzn4lFsoDlWJ+THYsGJmFlW68WlDFx7VRw==", + "node_modules/@babel/helper-compilation-targets": { + "version": "7.17.7", "dev": true, - "requires": { - "call-bind": "^1.0.0", - "define-properties": "^1.1.3", - "es-abstract": "^1.18.0-next.1", - "get-intrinsic": "^1.0.1", - "is-string": "^1.0.5" + "license": "MIT", + "dependencies": { + "@babel/compat-data": "^7.17.7", + "@babel/helper-validator-option": "^7.16.7", + "browserslist": "^4.17.5", + "semver": "^6.3.0" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" } }, - "array.prototype.flat": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz", - "integrity": "sha512-4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg==", + "node_modules/@babel/helper-environment-visitor": { + "version": "7.16.7", "dev": true, - "requires": { - "call-bind": "^1.0.0", - "define-properties": "^1.1.3", - "es-abstract": "^1.18.0-next.1" + "license": "MIT", + "dependencies": { + "@babel/types": "^7.16.7" + }, + "engines": { + "node": ">=6.9.0" } }, - "array.prototype.flatmap": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.2.4.tgz", - "integrity": "sha512-r9Z0zYoxqHz60vvQbWEdXIEtCwHF0yxaWfno9qzXeNHvfyl3BZqygmGzb84dsubyaXLH4husF+NFgMSdpZhk2Q==", + "node_modules/@babel/helper-function-name": { + "version": "7.16.7", "dev": true, - "requires": { - "call-bind": "^1.0.0", - "define-properties": "^1.1.3", - "es-abstract": "^1.18.0-next.1", - "function-bind": "^1.1.1" + "license": "MIT", + "dependencies": { + "@babel/helper-get-function-arity": "^7.16.7", + "@babel/template": "^7.16.7", + "@babel/types": "^7.16.7" + }, + "engines": { + "node": ">=6.9.0" } }, - "asn1": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", - "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", + "node_modules/@babel/helper-get-function-arity": { + "version": "7.16.7", "dev": true, - "requires": { - "safer-buffer": "~2.1.0" + "license": "MIT", + "dependencies": { + "@babel/types": "^7.16.7" + }, + "engines": { + "node": ">=6.9.0" } }, - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", - "dev": true - }, - "astral-regex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz", - "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==", - "dev": true - }, - "asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" - }, - "aws-sign2": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", - "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=", - "dev": true - }, - "aws4": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz", - "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==", - "dev": true - }, - "balanced-match": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true - }, - "bcrypt-pbkdf": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", - "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", + "node_modules/@babel/helper-hoist-variables": { + "version": "7.16.7", "dev": true, - "requires": { - "tweetnacl": "^0.14.3" + "license": "MIT", + "dependencies": { + "@babel/types": "^7.16.7" + }, + "engines": { + "node": ">=6.9.0" } }, - "binary-extensions": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", - "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", - "dev": true - }, - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "node_modules/@babel/helper-module-imports": { + "version": "7.16.7", "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" + "license": "MIT", + "dependencies": { + "@babel/types": "^7.16.7" + }, + "engines": { + "node": ">=6.9.0" } }, - "braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "node_modules/@babel/helper-module-transforms": { + "version": "7.17.7", "dev": true, - "requires": { - "fill-range": "^7.0.1" + "license": "MIT", + "dependencies": { + "@babel/helper-environment-visitor": "^7.16.7", + "@babel/helper-module-imports": "^7.16.7", + "@babel/helper-simple-access": "^7.17.7", + "@babel/helper-split-export-declaration": "^7.16.7", + "@babel/helper-validator-identifier": "^7.16.7", + "@babel/template": "^7.16.7", + "@babel/traverse": "^7.17.3", + "@babel/types": "^7.17.0" + }, + "engines": { + "node": ">=6.9.0" } }, - "browser-stdout": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", - "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", - "dev": true - }, - "call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "node_modules/@babel/helper-plugin-utils": { + "version": "7.16.7", "dev": true, - "requires": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" + "license": "MIT", + "engines": { + "node": ">=6.9.0" } }, - "callsites": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", - "dev": true - }, - "camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", - "dev": true + "node_modules/@babel/helper-simple-access": { + "version": "7.17.7", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/types": "^7.17.0" + }, + "engines": { + "node": ">=6.9.0" + } }, - "caseless": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", - "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", - "dev": true + "node_modules/@babel/helper-split-export-declaration": { + "version": "7.16.7", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/types": "^7.16.7" + }, + "engines": { + "node": ">=6.9.0" + } }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "requires": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" + "node_modules/@babel/helper-validator-identifier": { + "version": "7.16.7", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" } }, - "chokidar": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.3.tgz", - "integrity": "sha512-DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ==", + "node_modules/@babel/helper-validator-option": { + "version": "7.16.7", "dev": true, - "requires": { - "anymatch": "~3.1.1", - "braces": "~3.0.2", - "fsevents": "~2.1.2", - "glob-parent": "~5.1.0", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.5.0" + "license": "MIT", + "engines": { + "node": ">=6.9.0" } }, - "cliui": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", - "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", + "node_modules/@babel/helpers": { + "version": "7.17.8", "dev": true, - "requires": { - "string-width": "^3.1.0", - "strip-ansi": "^5.2.0", - "wrap-ansi": "^5.1.0" + "license": "MIT", + "dependencies": { + "@babel/template": "^7.16.7", + "@babel/traverse": "^7.17.3", + "@babel/types": "^7.17.0" }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/highlight": { + "version": "7.16.10", + "dev": true, + "license": "MIT", "dependencies": { - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "dev": true - }, - "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true, - "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - } - }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "requires": { - "ansi-regex": "^4.1.0" - } - } + "@babel/helper-validator-identifier": "^7.16.7", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + }, + "engines": { + "node": ">=6.9.0" } }, - "codeclimate-test-reporter": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/codeclimate-test-reporter/-/codeclimate-test-reporter-0.5.1.tgz", - "integrity": "sha512-XCzmc8dH+R4orK11BCg5pBbXc35abxq9sept4YvUFRkFl9zb9MIVRrCKENe6U1TKAMTgvGJmrYyHn0y2lerpmg==", + "node_modules/@babel/highlight/node_modules/ansi-styles": { + "version": "3.2.1", "dev": true, - "requires": { - "async": "~1.5.2", - "commander": "2.9.0", - "lcov-parse": "0.0.10", - "request": "~2.88.0" + "license": "MIT", + "dependencies": { + "color-convert": "^1.9.0" }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/highlight/node_modules/chalk": { + "version": "2.4.2", + "dev": true, + "license": "MIT", "dependencies": { - "async": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", - "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", - "dev": true - }, - "commander": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz", - "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=", - "dev": true, - "requires": { - "graceful-readlink": ">= 1.0.0" - } - } + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + }, + "engines": { + "node": ">=4" } }, - "color-convert": { + "node_modules/@babel/highlight/node_modules/color-convert": { "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", "dev": true, - "requires": { + "license": "MIT", + "dependencies": { "color-name": "1.1.3" } }, - "color-name": { + "node_modules/@babel/highlight/node_modules/color-name": { "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true + "dev": true, + "license": "MIT" }, - "combined-stream": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz", - "integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==", + "node_modules/@babel/highlight/node_modules/has-flag": { + "version": "3.0.0", "dev": true, - "requires": { - "delayed-stream": "~1.0.0" + "license": "MIT", + "engines": { + "node": ">=4" } }, - "commander": { - "version": "2.20.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz", - "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==" - }, - "concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true + "node_modules/@babel/highlight/node_modules/supports-color": { + "version": "5.5.0", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" + } }, - "contains-path": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz", - "integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=", - "dev": true + "node_modules/@babel/parser": { + "version": "7.17.8", + "dev": true, + "license": "MIT", + "bin": { + "parser": "bin/babel-parser.js" + }, + "engines": { + "node": ">=6.0.0" + } }, - "core-util-is": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", - "dev": true + "node_modules/@babel/plugin-syntax-async-generators": { + "version": "7.8.4", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } }, - "cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "node_modules/@babel/plugin-syntax-bigint": { + "version": "7.8.3", "dev": true, - "requires": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-class-properties": { + "version": "7.12.13", + "dev": true, + "license": "MIT", "dependencies": { - "which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, - "requires": { - "isexe": "^2.0.0" - } - } + "@babel/helper-plugin-utils": "^7.12.13" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "dashdash": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", - "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", + "node_modules/@babel/plugin-syntax-import-meta": { + "version": "7.10.4", "dev": true, - "requires": { - "assert-plus": "^1.0.0" + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.10.4" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=", - "requires": { - "ms": "2.0.0" + "node_modules/@babel/plugin-syntax-json-strings": { + "version": "7.8.3", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "debug-log": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/debug-log/-/debug-log-1.0.1.tgz", - "integrity": "sha1-IwdjLUwEOCuN+KMvcLiVBG1SdF8=", - "dev": true + "node_modules/@babel/plugin-syntax-logical-assignment-operators": { + "version": "7.10.4", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.10.4" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } }, - "decamelize": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", - "dev": true + "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": { + "version": "7.8.3", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } }, - "deep-extend": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", - "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", - "dev": true + "node_modules/@babel/plugin-syntax-numeric-separator": { + "version": "7.10.4", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.10.4" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } }, - "deep-is": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", - "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", - "dev": true + "node_modules/@babel/plugin-syntax-object-rest-spread": { + "version": "7.8.3", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } }, - "define-properties": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", - "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", + "node_modules/@babel/plugin-syntax-optional-catch-binding": { + "version": "7.8.3", "dev": true, - "requires": { - "object-keys": "^1.0.12" + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" + "node_modules/@babel/plugin-syntax-optional-chaining": { + "version": "7.8.3", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } }, - "diff": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", - "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", - "dev": true + "node_modules/@babel/plugin-syntax-top-level-await": { + "version": "7.14.5", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } }, - "doctrine": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", - "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", + "node_modules/@babel/plugin-syntax-typescript": { + "version": "7.16.7", "dev": true, - "requires": { - "esutils": "^2.0.2" + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.16.7" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "dotenv": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-7.0.0.tgz", - "integrity": "sha512-M3NhsLbV1i6HuGzBUH8vXrtxOk+tWmzWKDMbAVSUp3Zsjm7ywFeuwrUXhmhQyRK1q5B5GGy7hcXPbj3bnfZg2g==", - "dev": true + "node_modules/@babel/template": { + "version": "7.16.7", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.16.7", + "@babel/parser": "^7.16.7", + "@babel/types": "^7.16.7" + }, + "engines": { + "node": ">=6.9.0" + } }, - "duplexer": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz", - "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=" + "node_modules/@babel/traverse": { + "version": "7.17.3", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.16.7", + "@babel/generator": "^7.17.3", + "@babel/helper-environment-visitor": "^7.16.7", + "@babel/helper-function-name": "^7.16.7", + "@babel/helper-hoist-variables": "^7.16.7", + "@babel/helper-split-export-declaration": "^7.16.7", + "@babel/parser": "^7.17.3", + "@babel/types": "^7.17.0", + "debug": "^4.1.0", + "globals": "^11.1.0" + }, + "engines": { + "node": ">=6.9.0" + } }, - "ecc-jsbn": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", - "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", + "node_modules/@babel/traverse/node_modules/globals": { + "version": "11.12.0", "dev": true, - "requires": { - "jsbn": "~0.1.0", - "safer-buffer": "^2.1.0" + "license": "MIT", + "engines": { + "node": ">=4" } }, - "echint": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/echint/-/echint-4.0.2.tgz", - "integrity": "sha512-iUEHrTxUqpZ0V6ayTmjyf9/f3Iz/Pp3EGKhmfFpnZQ4tjTk3ZyO9bO2qGwgr3coSknzXdieYrcCe3JDsiI/Uvw==", + "node_modules/@babel/types": { + "version": "7.17.0", "dev": true, - "requires": { - "chalk": "^2.4.2", - "commander": "^2.19.0", - "dotenv": "^7.0.0", - "glob": "^7.1.3", - "lintspaces": "0.6.3", + "license": "MIT", + "dependencies": { + "@babel/helper-validator-identifier": "^7.16.7", + "to-fast-properties": "^2.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@bcoe/v8-coverage": { + "version": "0.2.3", + "dev": true, + "license": "MIT" + }, + "node_modules/@eslint/eslintrc": { + "version": "1.2.1", + "dev": true, + "license": "MIT", + "dependencies": { + "ajv": "^6.12.4", + "debug": "^4.3.2", + "espree": "^9.3.1", + "globals": "^13.9.0", + "ignore": "^5.2.0", + "import-fresh": "^3.2.1", + "js-yaml": "^4.1.0", "minimatch": "^3.0.4", - "pkg-config": "^1.1.1" + "strip-json-comments": "^3.1.1" }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, + "node_modules/@humanwhocodes/config-array": { + "version": "0.9.5", + "dev": true, + "license": "Apache-2.0", "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "glob": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", - "integrity": "sha1-OWCDLT8VdBCDQtr9OmezMsCWnfE=", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } + "@humanwhocodes/object-schema": "^1.2.1", + "debug": "^4.1.1", + "minimatch": "^3.0.4" + }, + "engines": { + "node": ">=10.10.0" } }, - "editorconfig": { - "version": "0.15.3", - "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-0.15.3.tgz", - "integrity": "sha512-M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g==", + "node_modules/@humanwhocodes/object-schema": { + "version": "1.2.1", "dev": true, - "requires": { - "commander": "^2.19.0", - "lru-cache": "^4.1.5", - "semver": "^5.6.0", - "sigmund": "^1.0.1" + "license": "BSD-3-Clause" + }, + "node_modules/@istanbuljs/load-nyc-config": { + "version": "1.1.0", + "dev": true, + "license": "ISC", + "dependencies": { + "camelcase": "^5.3.1", + "find-up": "^4.1.0", + "get-package-type": "^0.1.0", + "js-yaml": "^3.13.1", + "resolve-from": "^5.0.0" }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@istanbuljs/load-nyc-config/node_modules/argparse": { + "version": "1.0.10", + "dev": true, + "license": "MIT", "dependencies": { - "semver": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz", - "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==", - "dev": true - } + "sprintf-js": "~1.0.2" } }, - "emoji-regex": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", - "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", - "dev": true + "node_modules/@istanbuljs/load-nyc-config/node_modules/camelcase": { + "version": "5.3.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } }, - "enquirer": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz", - "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==", + "node_modules/@istanbuljs/load-nyc-config/node_modules/js-yaml": { + "version": "3.14.1", "dev": true, - "requires": { - "ansi-colors": "^4.1.1" - }, + "license": "MIT", "dependencies": { - "ansi-colors": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", - "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", - "dev": true - } + "argparse": "^1.0.7", + "esprima": "^4.0.0" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" } }, - "error-ex": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", - "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "node_modules/@istanbuljs/schema": { + "version": "0.1.3", "dev": true, - "requires": { - "is-arrayish": "^0.2.1" + "license": "MIT", + "engines": { + "node": ">=8" } }, - "es-abstract": { - "version": "1.18.0-next.2", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.2.tgz", - "integrity": "sha512-Ih4ZMFHEtZupnUh6497zEL4y2+w8+1ljnCyaTa+adcoafI1GOvMwFlDjBLfWR7y9VLfrjRJe9ocuHY1PSR9jjw==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "es-to-primitive": "^1.2.1", - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2", - "has": "^1.0.3", - "has-symbols": "^1.0.1", - "is-callable": "^1.2.2", - "is-negative-zero": "^2.0.1", - "is-regex": "^1.1.1", - "object-inspect": "^1.9.0", - "object-keys": "^1.1.1", - "object.assign": "^4.1.2", - "string.prototype.trimend": "^1.0.3", - "string.prototype.trimstart": "^1.0.3" - }, - "dependencies": { - "has-symbols": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", - "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", - "dev": true - }, - "object-inspect": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz", - "integrity": "sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==", - "dev": true - }, - "object.assign": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz", - "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==", - "dev": true, - "requires": { - "call-bind": "^1.0.0", - "define-properties": "^1.1.3", - "has-symbols": "^1.0.1", - "object-keys": "^1.1.1" - } - }, - "string.prototype.trimend": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz", - "integrity": "sha512-ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw==", - "dev": true, - "requires": { - "call-bind": "^1.0.0", - "define-properties": "^1.1.3" - } - }, - "string.prototype.trimstart": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz", - "integrity": "sha512-oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg==", - "dev": true, - "requires": { - "call-bind": "^1.0.0", - "define-properties": "^1.1.3" - } + "node_modules/@jest/console": { + "version": "27.5.1", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/types": "^27.5.1", + "@types/node": "*", + "chalk": "^4.0.0", + "jest-message-util": "^27.5.1", + "jest-util": "^27.5.1", + "slash": "^3.0.0" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/@jest/console/node_modules/@types/node": { + "version": "17.0.23", + "dev": true, + "license": "MIT" + }, + "node_modules/@jest/core": { + "version": "27.5.1", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/console": "^27.5.1", + "@jest/reporters": "^27.5.1", + "@jest/test-result": "^27.5.1", + "@jest/transform": "^27.5.1", + "@jest/types": "^27.5.1", + "@types/node": "*", + "ansi-escapes": "^4.2.1", + "chalk": "^4.0.0", + "emittery": "^0.8.1", + "exit": "^0.1.2", + "graceful-fs": "^4.2.9", + "jest-changed-files": "^27.5.1", + "jest-config": "^27.5.1", + "jest-haste-map": "^27.5.1", + "jest-message-util": "^27.5.1", + "jest-regex-util": "^27.5.1", + "jest-resolve": "^27.5.1", + "jest-resolve-dependencies": "^27.5.1", + "jest-runner": "^27.5.1", + "jest-runtime": "^27.5.1", + "jest-snapshot": "^27.5.1", + "jest-util": "^27.5.1", + "jest-validate": "^27.5.1", + "jest-watcher": "^27.5.1", + "micromatch": "^4.0.4", + "rimraf": "^3.0.0", + "slash": "^3.0.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + }, + "peerDependencies": { + "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" + }, + "peerDependenciesMeta": { + "node-notifier": { + "optional": true } } }, - "es-to-primitive": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", - "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", + "node_modules/@jest/core/node_modules/@types/node": { + "version": "17.0.23", "dev": true, - "requires": { - "is-callable": "^1.1.4", - "is-date-object": "^1.0.1", - "is-symbol": "^1.0.2" + "license": "MIT" + }, + "node_modules/@jest/environment": { + "version": "27.5.1", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/fake-timers": "^27.5.1", + "@jest/types": "^27.5.1", + "@types/node": "*", + "jest-mock": "^27.5.1" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" } }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" + "node_modules/@jest/environment/node_modules/@types/node": { + "version": "17.0.23", + "dev": true, + "license": "MIT" }, - "escodegen": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz", - "integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=", + "node_modules/@jest/fake-timers": { + "version": "27.5.1", "dev": true, - "requires": { - "esprima": "^2.7.1", - "estraverse": "^1.9.1", - "esutils": "^2.0.2", - "optionator": "^0.8.1", - "source-map": "~0.2.0" + "license": "MIT", + "dependencies": { + "@jest/types": "^27.5.1", + "@sinonjs/fake-timers": "^8.0.1", + "@types/node": "*", + "jest-message-util": "^27.5.1", + "jest-mock": "^27.5.1", + "jest-util": "^27.5.1" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" } }, - "eslint": { - "version": "7.13.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.13.0.tgz", - "integrity": "sha512-uCORMuOO8tUzJmsdRtrvcGq5qposf7Rw0LwkTJkoDbOycVQtQjmnhZSuLQnozLE4TmAzlMVV45eCHmQ1OpDKUQ==", + "node_modules/@jest/fake-timers/node_modules/@types/node": { + "version": "17.0.23", "dev": true, - "requires": { - "@babel/code-frame": "^7.0.0", - "@eslint/eslintrc": "^0.2.1", - "ajv": "^6.10.0", - "chalk": "^4.0.0", - "cross-spawn": "^7.0.2", - "debug": "^4.0.1", - "doctrine": "^3.0.0", - "enquirer": "^2.3.5", - "eslint-scope": "^5.1.1", - "eslint-utils": "^2.1.0", - "eslint-visitor-keys": "^2.0.0", - "espree": "^7.3.0", - "esquery": "^1.2.0", - "esutils": "^2.0.2", - "file-entry-cache": "^5.0.1", - "functional-red-black-tree": "^1.0.1", - "glob-parent": "^5.0.0", - "globals": "^12.1.0", - "ignore": "^4.0.6", - "import-fresh": "^3.0.0", - "imurmurhash": "^0.1.4", - "is-glob": "^4.0.0", - "js-yaml": "^3.13.1", - "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.4.1", - "lodash": "^4.17.19", - "minimatch": "^3.0.4", - "natural-compare": "^1.4.0", - "optionator": "^0.9.1", - "progress": "^2.0.0", - "regexpp": "^3.1.0", - "semver": "^7.2.1", - "strip-ansi": "^6.0.0", - "strip-json-comments": "^3.1.0", - "table": "^5.2.3", - "text-table": "^0.2.0", - "v8-compile-cache": "^2.0.3" + "license": "MIT" + }, + "node_modules/@jest/globals": { + "version": "27.5.1", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/environment": "^27.5.1", + "@jest/types": "^27.5.1", + "expect": "^27.5.1" }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/@jest/reporters": { + "version": "27.5.1", + "dev": true, + "license": "MIT", "dependencies": { - "ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", - "dev": true - }, - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "@bcoe/v8-coverage": "^0.2.3", + "@jest/console": "^27.5.1", + "@jest/test-result": "^27.5.1", + "@jest/transform": "^27.5.1", + "@jest/types": "^27.5.1", + "@types/node": "*", + "chalk": "^4.0.0", + "collect-v8-coverage": "^1.0.0", + "exit": "^0.1.2", + "glob": "^7.1.2", + "graceful-fs": "^4.2.9", + "istanbul-lib-coverage": "^3.0.0", + "istanbul-lib-instrument": "^5.1.0", + "istanbul-lib-report": "^3.0.0", + "istanbul-lib-source-maps": "^4.0.0", + "istanbul-reports": "^3.1.3", + "jest-haste-map": "^27.5.1", + "jest-resolve": "^27.5.1", + "jest-util": "^27.5.1", + "jest-worker": "^27.5.1", + "slash": "^3.0.0", + "source-map": "^0.6.0", + "string-length": "^4.0.1", + "terminal-link": "^2.0.0", + "v8-to-istanbul": "^8.1.0" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + }, + "peerDependencies": { + "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" + }, + "peerDependenciesMeta": { + "node-notifier": { + "optional": true + } + } + }, + "node_modules/@jest/reporters/node_modules/@types/node": { + "version": "17.0.23", + "dev": true, + "license": "MIT" + }, + "node_modules/@jest/source-map": { + "version": "27.5.1", + "dev": true, + "license": "MIT", + "dependencies": { + "callsites": "^3.0.0", + "graceful-fs": "^4.2.9", + "source-map": "^0.6.0" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/@jest/test-result": { + "version": "27.5.1", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/console": "^27.5.1", + "@jest/types": "^27.5.1", + "@types/istanbul-lib-coverage": "^2.0.0", + "collect-v8-coverage": "^1.0.0" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/@jest/test-sequencer": { + "version": "27.5.1", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/test-result": "^27.5.1", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^27.5.1", + "jest-runtime": "^27.5.1" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/@jest/transform": { + "version": "27.5.1", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/core": "^7.1.0", + "@jest/types": "^27.5.1", + "babel-plugin-istanbul": "^6.1.1", + "chalk": "^4.0.0", + "convert-source-map": "^1.4.0", + "fast-json-stable-stringify": "^2.0.0", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^27.5.1", + "jest-regex-util": "^27.5.1", + "jest-util": "^27.5.1", + "micromatch": "^4.0.4", + "pirates": "^4.0.4", + "slash": "^3.0.0", + "source-map": "^0.6.1", + "write-file-atomic": "^3.0.0" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/@jest/types": { + "version": "27.5.1", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", + "@types/node": "*", + "@types/yargs": "^16.0.0", + "chalk": "^4.0.0" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/@jest/types/node_modules/@types/node": { + "version": "17.0.23", + "dev": true, + "license": "MIT" + }, + "node_modules/@jest/types/node_modules/@types/yargs": { + "version": "16.0.4", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/yargs-parser": "*" + } + }, + "node_modules/@jridgewell/resolve-uri": { + "version": "3.0.5", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/sourcemap-codec": { + "version": "1.4.11", + "dev": true, + "license": "MIT" + }, + "node_modules/@jridgewell/trace-mapping": { + "version": "0.3.4", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/resolve-uri": "^3.0.3", + "@jridgewell/sourcemap-codec": "^1.4.10" + } + }, + "node_modules/@nodelib/fs.scandir": { + "version": "2.1.5", + "dev": true, + "license": "MIT", + "dependencies": { + "@nodelib/fs.stat": "2.0.5", + "run-parallel": "^1.1.9" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.stat": { + "version": "2.0.5", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.walk": { + "version": "1.2.8", + "dev": true, + "license": "MIT", + "dependencies": { + "@nodelib/fs.scandir": "2.1.5", + "fastq": "^1.6.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@sinonjs/commons": { + "version": "1.8.3", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "type-detect": "4.0.8" + } + }, + "node_modules/@sinonjs/fake-timers": { + "version": "8.1.0", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@sinonjs/commons": "^1.7.0" + } + }, + "node_modules/@tootallnate/once": { + "version": "1.1.2", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 6" + } + }, + "node_modules/@types/babel__core": { + "version": "7.1.19", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/parser": "^7.1.0", + "@babel/types": "^7.0.0", + "@types/babel__generator": "*", + "@types/babel__template": "*", + "@types/babel__traverse": "*" + } + }, + "node_modules/@types/babel__generator": { + "version": "7.6.4", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/types": "^7.0.0" + } + }, + "node_modules/@types/babel__template": { + "version": "7.4.1", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/parser": "^7.1.0", + "@babel/types": "^7.0.0" + } + }, + "node_modules/@types/babel__traverse": { + "version": "7.14.2", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/types": "^7.3.0" + } + }, + "node_modules/@types/eslint": { + "version": "8.4.1", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/estree": "*", + "@types/json-schema": "*" + } + }, + "node_modules/@types/estree": { + "version": "0.0.51", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/event-stream": { + "version": "4.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/event-stream/node_modules/@types/node": { + "version": "17.0.23", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/graceful-fs": { + "version": "4.1.5", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/graceful-fs/node_modules/@types/node": { + "version": "17.0.23", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/har-format": { + "version": "1.2.8", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/istanbul-lib-coverage": { + "version": "2.0.4", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/istanbul-lib-report": { + "version": "3.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/istanbul-lib-coverage": "*" + } + }, + "node_modules/@types/istanbul-reports": { + "version": "3.0.1", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/istanbul-lib-report": "*" + } + }, + "node_modules/@types/jest": { + "version": "27.4.1", + "dev": true, + "license": "MIT", + "dependencies": { + "jest-matcher-utils": "^27.0.0", + "pretty-format": "^27.0.0" + } + }, + "node_modules/@types/json-schema": { + "version": "7.0.11", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/node": { + "version": "16.11.26", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/prettier": { + "version": "2.4.4", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/stack-utils": { + "version": "2.0.1", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/stringify-object": { + "version": "3.3.1", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/yargs": { + "version": "17.0.10", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/yargs-parser": "*" + } + }, + "node_modules/@types/yargs-parser": { + "version": "21.0.0", + "dev": true, + "license": "MIT" + }, + "node_modules/@typescript-eslint/eslint-plugin": { + "version": "5.18.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/scope-manager": "5.18.0", + "@typescript-eslint/type-utils": "5.18.0", + "@typescript-eslint/utils": "5.18.0", + "debug": "^4.3.2", + "functional-red-black-tree": "^1.0.1", + "ignore": "^5.1.8", + "regexpp": "^3.2.0", + "semver": "^7.3.5", + "tsutils": "^3.21.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "@typescript-eslint/parser": "^5.0.0", + "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/eslint-plugin/node_modules/semver": { + "version": "7.3.5", + "dev": true, + "license": "ISC", + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@typescript-eslint/parser": { + "version": "5.18.0", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "@typescript-eslint/scope-manager": "5.18.0", + "@typescript-eslint/types": "5.18.0", + "@typescript-eslint/typescript-estree": "5.18.0", + "debug": "^4.3.2" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/scope-manager": { + "version": "5.18.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/types": "5.18.0", + "@typescript-eslint/visitor-keys": "5.18.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/type-utils": { + "version": "5.18.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/utils": "5.18.0", + "debug": "^4.3.2", + "tsutils": "^3.21.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "*" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/types": { + "version": "5.18.0", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/typescript-estree": { + "version": "5.18.0", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "@typescript-eslint/types": "5.18.0", + "@typescript-eslint/visitor-keys": "5.18.0", + "debug": "^4.3.2", + "globby": "^11.0.4", + "is-glob": "^4.0.3", + "semver": "^7.3.5", + "tsutils": "^3.21.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": { + "version": "7.3.5", + "dev": true, + "license": "ISC", + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@typescript-eslint/utils": { + "version": "5.18.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/json-schema": "^7.0.9", + "@typescript-eslint/scope-manager": "5.18.0", + "@typescript-eslint/types": "5.18.0", + "@typescript-eslint/typescript-estree": "5.18.0", + "eslint-scope": "^5.1.1", + "eslint-utils": "^3.0.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" + } + }, + "node_modules/@typescript-eslint/utils/node_modules/eslint-scope": { + "version": "5.1.1", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "esrecurse": "^4.3.0", + "estraverse": "^4.1.1" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/@typescript-eslint/utils/node_modules/estraverse": { + "version": "4.3.0", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=4.0" + } + }, + "node_modules/@typescript-eslint/visitor-keys": { + "version": "5.18.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/types": "5.18.0", + "eslint-visitor-keys": "^3.0.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/abab": { + "version": "2.0.5", + "dev": true, + "license": "BSD-3-Clause" + }, + "node_modules/acorn": { + "version": "8.7.0", + "dev": true, + "license": "MIT", + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-globals": { + "version": "6.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "acorn": "^7.1.1", + "acorn-walk": "^7.1.1" + } + }, + "node_modules/acorn-globals/node_modules/acorn": { + "version": "7.4.1", + "dev": true, + "license": "MIT", + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-jsx": { + "version": "5.3.2", + "dev": true, + "license": "MIT", + "peerDependencies": { + "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" + } + }, + "node_modules/acorn-walk": { + "version": "7.2.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/agent-base": { + "version": "6.0.2", + "dev": true, + "license": "MIT", + "dependencies": { + "debug": "4" + }, + "engines": { + "node": ">= 6.0.0" + } + }, + "node_modules/ajv": { + "version": "6.12.6", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/ansi-escapes": { + "version": "4.3.2", + "dev": true, + "license": "MIT", + "dependencies": { + "type-fest": "^0.21.3" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ansi-escapes/node_modules/type-fest": { + "version": "0.21.3", + "dev": true, + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ansi-regex": { + "version": "5.0.1", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/ansi-styles": { + "version": "4.3.0", + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/anymatch": { + "version": "3.1.2", + "dev": true, + "license": "ISC", + "dependencies": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/argparse": { + "version": "2.0.1", + "dev": true, + "license": "Python-2.0" + }, + "node_modules/array-union": { + "version": "2.1.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/asynckit": { + "version": "0.4.0", + "license": "MIT" + }, + "node_modules/babel-jest": { + "version": "27.5.1", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/transform": "^27.5.1", + "@jest/types": "^27.5.1", + "@types/babel__core": "^7.1.14", + "babel-plugin-istanbul": "^6.1.1", + "babel-preset-jest": "^27.5.1", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.9", + "slash": "^3.0.0" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + }, + "peerDependencies": { + "@babel/core": "^7.8.0" + } + }, + "node_modules/babel-plugin-istanbul": { + "version": "6.1.1", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@babel/helper-plugin-utils": "^7.0.0", + "@istanbuljs/load-nyc-config": "^1.0.0", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-instrument": "^5.0.4", + "test-exclude": "^6.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/babel-plugin-jest-hoist": { + "version": "27.5.1", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/template": "^7.3.3", + "@babel/types": "^7.3.3", + "@types/babel__core": "^7.0.0", + "@types/babel__traverse": "^7.0.6" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/babel-preset-current-node-syntax": { + "version": "1.0.1", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/plugin-syntax-async-generators": "^7.8.4", + "@babel/plugin-syntax-bigint": "^7.8.3", + "@babel/plugin-syntax-class-properties": "^7.8.3", + "@babel/plugin-syntax-import-meta": "^7.8.3", + "@babel/plugin-syntax-json-strings": "^7.8.3", + "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3", + "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", + "@babel/plugin-syntax-numeric-separator": "^7.8.3", + "@babel/plugin-syntax-object-rest-spread": "^7.8.3", + "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", + "@babel/plugin-syntax-optional-chaining": "^7.8.3", + "@babel/plugin-syntax-top-level-await": "^7.8.3" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "node_modules/babel-preset-jest": { + "version": "27.5.1", + "dev": true, + "license": "MIT", + "dependencies": { + "babel-plugin-jest-hoist": "^27.5.1", + "babel-preset-current-node-syntax": "^1.0.0" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "dev": true, + "license": "MIT" + }, + "node_modules/brace-expansion": { + "version": "1.1.11", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/braces": { + "version": "3.0.2", + "dev": true, + "license": "MIT", + "dependencies": { + "fill-range": "^7.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/browser-process-hrtime": { + "version": "1.0.0", + "dev": true, + "license": "BSD-2-Clause" + }, + "node_modules/browserslist": { + "version": "4.20.2", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + } + ], + "license": "MIT", + "dependencies": { + "caniuse-lite": "^1.0.30001317", + "electron-to-chromium": "^1.4.84", + "escalade": "^3.1.1", + "node-releases": "^2.0.2", + "picocolors": "^1.0.0" + }, + "bin": { + "browserslist": "cli.js" + }, + "engines": { + "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" + } + }, + "node_modules/bs-logger": { + "version": "0.2.6", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-json-stable-stringify": "2.x" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/bser": { + "version": "2.1.1", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "node-int64": "^0.4.0" + } + }, + "node_modules/buffer-from": { + "version": "1.1.2", + "dev": true, + "license": "MIT" + }, + "node_modules/callsites": { + "version": "3.1.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/camelcase": { + "version": "6.3.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/caniuse-lite": { + "version": "1.0.30001322", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + } + ], + "license": "CC-BY-4.0" + }, + "node_modules/chalk": { + "version": "4.1.2", + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/char-regex": { + "version": "1.0.2", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + } + }, + "node_modules/ci-info": { + "version": "3.3.0", + "dev": true, + "license": "MIT" + }, + "node_modules/cjs-module-lexer": { + "version": "1.2.2", + "dev": true, + "license": "MIT" + }, + "node_modules/cliui": { + "version": "7.0.4", + "license": "ISC", + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^7.0.0" + } + }, + "node_modules/co": { + "version": "4.6.0", + "dev": true, + "license": "MIT", + "engines": { + "iojs": ">= 1.0.0", + "node": ">= 0.12.0" + } + }, + "node_modules/collect-v8-coverage": { + "version": "1.0.1", + "dev": true, + "license": "MIT" + }, + "node_modules/color-convert": { + "version": "2.0.1", + "license": "MIT", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/color-name": { + "version": "1.1.4", + "license": "MIT" + }, + "node_modules/combined-stream": { + "version": "1.0.8", + "license": "MIT", + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/concat-map": { + "version": "0.0.1", + "dev": true, + "license": "MIT" + }, + "node_modules/convert-source-map": { + "version": "1.8.0", + "dev": true, + "license": "MIT", + "dependencies": { + "safe-buffer": "~5.1.1" + } + }, + "node_modules/cross-spawn": { + "version": "7.0.3", + "dev": true, + "license": "MIT", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/cssom": { + "version": "0.4.4", + "dev": true, + "license": "MIT" + }, + "node_modules/cssstyle": { + "version": "2.3.0", + "dev": true, + "license": "MIT", + "dependencies": { + "cssom": "~0.3.6" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/cssstyle/node_modules/cssom": { + "version": "0.3.8", + "dev": true, + "license": "MIT" + }, + "node_modules/data-urls": { + "version": "2.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "abab": "^2.0.3", + "whatwg-mimetype": "^2.3.0", + "whatwg-url": "^8.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/debug": { + "version": "4.3.4", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/decimal.js": { + "version": "10.3.1", + "dev": true, + "license": "MIT" + }, + "node_modules/dedent": { + "version": "0.7.0", + "dev": true, + "license": "MIT" + }, + "node_modules/deep-is": { + "version": "0.1.4", + "dev": true, + "license": "MIT" + }, + "node_modules/deepmerge": { + "version": "4.2.2", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "license": "MIT", + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/detect-newline": { + "version": "3.1.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/diff-sequences": { + "version": "27.5.1", + "dev": true, + "license": "MIT", + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/dir-glob": { + "version": "3.0.1", + "dev": true, + "license": "MIT", + "dependencies": { + "path-type": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/doctrine": { + "version": "3.0.0", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/domexception": { + "version": "2.0.1", + "dev": true, + "license": "MIT", + "dependencies": { + "webidl-conversions": "^5.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/domexception/node_modules/webidl-conversions": { + "version": "5.0.0", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=8" + } + }, + "node_modules/duplexer": { + "version": "0.1.2", + "license": "MIT" + }, + "node_modules/electron-to-chromium": { + "version": "1.4.99", + "dev": true, + "license": "ISC" + }, + "node_modules/emittery": { + "version": "0.8.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sindresorhus/emittery?sponsor=1" + } + }, + "node_modules/emoji-regex": { + "version": "8.0.0", + "license": "MIT" + }, + "node_modules/error-ex": { + "version": "1.3.2", + "dev": true, + "license": "MIT", + "dependencies": { + "is-arrayish": "^0.2.1" + } + }, + "node_modules/escalade": { + "version": "3.1.1", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/escape-string-regexp": { + "version": "1.0.5", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/escodegen": { + "version": "2.0.0", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "esprima": "^4.0.1", + "estraverse": "^5.2.0", + "esutils": "^2.0.2", + "optionator": "^0.8.1" + }, + "bin": { + "escodegen": "bin/escodegen.js", + "esgenerate": "bin/esgenerate.js" + }, + "engines": { + "node": ">=6.0" + }, + "optionalDependencies": { + "source-map": "~0.6.1" + } + }, + "node_modules/escodegen/node_modules/levn": { + "version": "0.3.0", + "dev": true, + "license": "MIT", + "dependencies": { + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/escodegen/node_modules/optionator": { + "version": "0.8.3", + "dev": true, + "license": "MIT", + "dependencies": { + "deep-is": "~0.1.3", + "fast-levenshtein": "~2.0.6", + "levn": "~0.3.0", + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2", + "word-wrap": "~1.2.3" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/eslint": { + "version": "8.12.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@eslint/eslintrc": "^1.2.1", + "@humanwhocodes/config-array": "^0.9.2", + "ajv": "^6.10.0", + "chalk": "^4.0.0", + "cross-spawn": "^7.0.2", + "debug": "^4.3.2", + "doctrine": "^3.0.0", + "escape-string-regexp": "^4.0.0", + "eslint-scope": "^7.1.1", + "eslint-utils": "^3.0.0", + "eslint-visitor-keys": "^3.3.0", + "espree": "^9.3.1", + "esquery": "^1.4.0", + "esutils": "^2.0.2", + "fast-deep-equal": "^3.1.3", + "file-entry-cache": "^6.0.1", + "functional-red-black-tree": "^1.0.1", + "glob-parent": "^6.0.1", + "globals": "^13.6.0", + "ignore": "^5.2.0", + "import-fresh": "^3.0.0", + "imurmurhash": "^0.1.4", + "is-glob": "^4.0.0", + "js-yaml": "^4.1.0", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.4.1", + "lodash.merge": "^4.6.2", + "minimatch": "^3.0.4", + "natural-compare": "^1.4.0", + "optionator": "^0.9.1", + "regexpp": "^3.2.0", + "strip-ansi": "^6.0.1", + "strip-json-comments": "^3.1.0", + "text-table": "^0.2.0", + "v8-compile-cache": "^2.0.3" + }, + "bin": { + "eslint": "bin/eslint.js" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint-config-prettier": { + "version": "8.5.0", + "dev": true, + "license": "MIT", + "bin": { + "eslint-config-prettier": "bin/cli.js" + }, + "peerDependencies": { + "eslint": ">=7.0.0" + } + }, + "node_modules/eslint-plugin-eslint-comments": { + "version": "3.2.0", + "dev": true, + "license": "MIT", + "dependencies": { + "escape-string-regexp": "^1.0.5", + "ignore": "^5.0.5" + }, + "engines": { + "node": ">=6.5.0" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + }, + "peerDependencies": { + "eslint": ">=4.19.1" + } + }, + "node_modules/eslint-plugin-jest": { + "version": "26.1.4", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/utils": "^5.10.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "peerDependencies": { + "@typescript-eslint/eslint-plugin": "^5.0.0", + "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" + }, + "peerDependenciesMeta": { + "@typescript-eslint/eslint-plugin": { + "optional": true + }, + "jest": { + "optional": true + } + } + }, + "node_modules/eslint-plugin-jest-formatting": { + "version": "3.1.0", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "peerDependencies": { + "eslint": ">=0.8.0" + } + }, + "node_modules/eslint-plugin-simple-import-sort": { + "version": "7.0.0", + "dev": true, + "license": "MIT", + "peerDependencies": { + "eslint": ">=5.0.0" + } + }, + "node_modules/eslint-scope": { + "version": "7.1.1", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "esrecurse": "^4.3.0", + "estraverse": "^5.2.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, + "node_modules/eslint-utils": { + "version": "3.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "eslint-visitor-keys": "^2.0.0" + }, + "engines": { + "node": "^10.0.0 || ^12.0.0 || >= 14.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + }, + "peerDependencies": { + "eslint": ">=5" + } + }, + "node_modules/eslint-utils/node_modules/eslint-visitor-keys": { + "version": "2.1.0", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=10" + } + }, + "node_modules/eslint-visitor-keys": { + "version": "3.3.0", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, + "node_modules/eslint/node_modules/escape-string-regexp": { + "version": "4.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/espree": { + "version": "9.3.1", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "acorn": "^8.7.0", + "acorn-jsx": "^5.3.1", + "eslint-visitor-keys": "^3.3.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, + "node_modules/esprima": { + "version": "4.0.1", + "dev": true, + "license": "BSD-2-Clause", + "bin": { + "esparse": "bin/esparse.js", + "esvalidate": "bin/esvalidate.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/esquery": { + "version": "1.4.0", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "estraverse": "^5.1.0" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/esrecurse": { + "version": "4.3.0", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "estraverse": "^5.2.0" + }, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/estraverse": { + "version": "5.3.0", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=4.0" + } + }, + "node_modules/esutils": { + "version": "2.0.3", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/event-stream": { + "version": "4.0.1", + "license": "MIT", + "dependencies": { + "duplexer": "^0.1.1", + "from": "^0.1.7", + "map-stream": "0.0.7", + "pause-stream": "^0.0.11", + "split": "^1.0.1", + "stream-combiner": "^0.2.2", + "through": "^2.3.8" + } + }, + "node_modules/execa": { + "version": "5.1.1", + "dev": true, + "license": "MIT", + "dependencies": { + "cross-spawn": "^7.0.3", + "get-stream": "^6.0.0", + "human-signals": "^2.1.0", + "is-stream": "^2.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^4.0.1", + "onetime": "^5.1.2", + "signal-exit": "^3.0.3", + "strip-final-newline": "^2.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sindresorhus/execa?sponsor=1" + } + }, + "node_modules/exit": { + "version": "0.1.2", + "dev": true, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/expect": { + "version": "27.5.1", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/types": "^27.5.1", + "jest-get-type": "^27.5.1", + "jest-matcher-utils": "^27.5.1", + "jest-message-util": "^27.5.1" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/fast-deep-equal": { + "version": "3.1.3", + "dev": true, + "license": "MIT" + }, + "node_modules/fast-glob": { + "version": "3.2.11", + "dev": true, + "license": "MIT", + "dependencies": { + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.2", + "merge2": "^1.3.0", + "micromatch": "^4.0.4" + }, + "engines": { + "node": ">=8.6.0" + } + }, + "node_modules/fast-glob/node_modules/glob-parent": { + "version": "5.1.2", + "dev": true, + "license": "ISC", + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/fast-json-stable-stringify": { + "version": "2.1.0", + "dev": true, + "license": "MIT" + }, + "node_modules/fast-levenshtein": { + "version": "2.0.6", + "dev": true, + "license": "MIT" + }, + "node_modules/fastq": { + "version": "1.13.0", + "dev": true, + "license": "ISC", + "dependencies": { + "reusify": "^1.0.4" + } + }, + "node_modules/fb-watchman": { + "version": "2.0.1", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "bser": "2.1.1" + } + }, + "node_modules/file-entry-cache": { + "version": "6.0.1", + "dev": true, + "license": "MIT", + "dependencies": { + "flat-cache": "^3.0.4" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/fill-range": { + "version": "7.0.1", + "dev": true, + "license": "MIT", + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/find-up": { + "version": "4.1.0", + "dev": true, + "license": "MIT", + "dependencies": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/flat-cache": { + "version": "3.0.4", + "dev": true, + "license": "MIT", + "dependencies": { + "flatted": "^3.1.0", + "rimraf": "^3.0.2" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/flatted": { + "version": "3.2.5", + "dev": true, + "license": "ISC" + }, + "node_modules/form-data": { + "version": "4.0.0", + "license": "MIT", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/from": { + "version": "0.1.7", + "license": "MIT" + }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "dev": true, + "license": "ISC" + }, + "node_modules/function-bind": { + "version": "1.1.1", + "dev": true, + "license": "MIT" + }, + "node_modules/functional-red-black-tree": { + "version": "1.0.1", + "dev": true, + "license": "MIT" + }, + "node_modules/gensync": { + "version": "1.0.0-beta.2", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/get-caller-file": { + "version": "2.0.5", + "license": "ISC", + "engines": { + "node": "6.* || 8.* || >= 10.*" + } + }, + "node_modules/get-own-enumerable-property-symbols": { + "version": "3.0.2", + "license": "ISC" + }, + "node_modules/get-package-type": { + "version": "0.1.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/get-stream": { + "version": "6.0.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/glob": { + "version": "7.2.0", + "dev": true, + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/glob-parent": { + "version": "6.0.2", + "dev": true, + "license": "ISC", + "dependencies": { + "is-glob": "^4.0.3" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/globals": { + "version": "13.13.0", + "dev": true, + "license": "MIT", + "dependencies": { + "type-fest": "^0.20.2" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/globals/node_modules/type-fest": { + "version": "0.20.2", + "dev": true, + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/globby": { + "version": "11.1.0", + "dev": true, + "license": "MIT", + "dependencies": { + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.2.9", + "ignore": "^5.2.0", + "merge2": "^1.4.1", + "slash": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/graceful-fs": { + "version": "4.2.9", + "dev": true, + "license": "ISC" + }, + "node_modules/har-schema": { + "version": "2.0.0", + "license": "ISC", + "engines": { + "node": ">=4" + } + }, + "node_modules/has": { + "version": "1.0.3", + "dev": true, + "license": "MIT", + "dependencies": { + "function-bind": "^1.1.1" + }, + "engines": { + "node": ">= 0.4.0" + } + }, + "node_modules/has-flag": { + "version": "4.0.0", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/html-encoding-sniffer": { + "version": "2.0.1", + "dev": true, + "license": "MIT", + "dependencies": { + "whatwg-encoding": "^1.0.5" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/html-escaper": { + "version": "2.0.2", + "dev": true, + "license": "MIT" + }, + "node_modules/http-proxy-agent": { + "version": "4.0.1", + "dev": true, + "license": "MIT", + "dependencies": { + "@tootallnate/once": "1", + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/https-proxy-agent": { + "version": "5.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/human-signals": { + "version": "2.1.0", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=10.17.0" + } + }, + "node_modules/iconv-lite": { + "version": "0.4.24", + "dev": true, + "license": "MIT", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/ignore": { + "version": "5.2.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 4" + } + }, + "node_modules/import-fresh": { + "version": "3.3.0", + "dev": true, + "license": "MIT", + "dependencies": { + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/import-fresh/node_modules/resolve-from": { + "version": "4.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/import-local": { + "version": "3.1.0", + "dev": true, + "license": "MIT", + "dependencies": { + "pkg-dir": "^4.2.0", + "resolve-cwd": "^3.0.0" + }, + "bin": { + "import-local-fixture": "fixtures/cli.js" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/imurmurhash": { + "version": "0.1.4", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.8.19" + } + }, + "node_modules/inflight": { + "version": "1.0.6", + "dev": true, + "license": "ISC", + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "dev": true, + "license": "ISC" + }, + "node_modules/is-arrayish": { + "version": "0.2.1", + "dev": true, + "license": "MIT" + }, + "node_modules/is-core-module": { + "version": "2.8.1", + "dev": true, + "license": "MIT", + "dependencies": { + "has": "^1.0.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-extglob": { + "version": "2.1.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/is-generator-fn": { + "version": "2.1.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/is-glob": { + "version": "4.0.3", + "dev": true, + "license": "MIT", + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-number": { + "version": "7.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/is-obj": { + "version": "1.0.1", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-potential-custom-element-name": { + "version": "1.0.1", + "dev": true, + "license": "MIT" + }, + "node_modules/is-regexp": { + "version": "1.0.0", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-stream": { + "version": "2.0.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/is-typedarray": { + "version": "1.0.0", + "dev": true, + "license": "MIT" + }, + "node_modules/isexe": { + "version": "2.0.0", + "dev": true, + "license": "ISC" + }, + "node_modules/istanbul-lib-coverage": { + "version": "3.2.0", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=8" + } + }, + "node_modules/istanbul-lib-instrument": { + "version": "5.1.0", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@babel/core": "^7.12.3", + "@babel/parser": "^7.14.7", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-coverage": "^3.2.0", + "semver": "^6.3.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/istanbul-lib-report": { + "version": "3.0.0", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "istanbul-lib-coverage": "^3.0.0", + "make-dir": "^3.0.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/istanbul-lib-source-maps": { + "version": "4.0.1", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "debug": "^4.1.1", + "istanbul-lib-coverage": "^3.0.0", + "source-map": "^0.6.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/istanbul-reports": { + "version": "3.1.4", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "html-escaper": "^2.0.0", + "istanbul-lib-report": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/jest": { + "version": "27.5.1", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/core": "^27.5.1", + "import-local": "^3.0.2", + "jest-cli": "^27.5.1" + }, + "bin": { + "jest": "bin/jest.js" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + }, + "peerDependencies": { + "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" + }, + "peerDependenciesMeta": { + "node-notifier": { + "optional": true + } + } + }, + "node_modules/jest-changed-files": { + "version": "27.5.1", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/types": "^27.5.1", + "execa": "^5.0.0", + "throat": "^6.0.1" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-circus": { + "version": "27.5.1", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/environment": "^27.5.1", + "@jest/test-result": "^27.5.1", + "@jest/types": "^27.5.1", + "@types/node": "*", + "chalk": "^4.0.0", + "co": "^4.6.0", + "dedent": "^0.7.0", + "expect": "^27.5.1", + "is-generator-fn": "^2.0.0", + "jest-each": "^27.5.1", + "jest-matcher-utils": "^27.5.1", + "jest-message-util": "^27.5.1", + "jest-runtime": "^27.5.1", + "jest-snapshot": "^27.5.1", + "jest-util": "^27.5.1", + "pretty-format": "^27.5.1", + "slash": "^3.0.0", + "stack-utils": "^2.0.3", + "throat": "^6.0.1" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-circus/node_modules/@types/node": { + "version": "17.0.23", + "dev": true, + "license": "MIT" + }, + "node_modules/jest-cli": { + "version": "27.5.1", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/core": "^27.5.1", + "@jest/test-result": "^27.5.1", + "@jest/types": "^27.5.1", + "chalk": "^4.0.0", + "exit": "^0.1.2", + "graceful-fs": "^4.2.9", + "import-local": "^3.0.2", + "jest-config": "^27.5.1", + "jest-util": "^27.5.1", + "jest-validate": "^27.5.1", + "prompts": "^2.0.1", + "yargs": "^16.2.0" + }, + "bin": { + "jest": "bin/jest.js" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + }, + "peerDependencies": { + "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" + }, + "peerDependenciesMeta": { + "node-notifier": { + "optional": true + } + } + }, + "node_modules/jest-cli/node_modules/yargs": { + "version": "16.2.0", + "dev": true, + "license": "MIT", + "dependencies": { + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.0", + "y18n": "^5.0.5", + "yargs-parser": "^20.2.2" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/jest-config": { + "version": "27.5.1", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/core": "^7.8.0", + "@jest/test-sequencer": "^27.5.1", + "@jest/types": "^27.5.1", + "babel-jest": "^27.5.1", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "deepmerge": "^4.2.2", + "glob": "^7.1.1", + "graceful-fs": "^4.2.9", + "jest-circus": "^27.5.1", + "jest-environment-jsdom": "^27.5.1", + "jest-environment-node": "^27.5.1", + "jest-get-type": "^27.5.1", + "jest-jasmine2": "^27.5.1", + "jest-regex-util": "^27.5.1", + "jest-resolve": "^27.5.1", + "jest-runner": "^27.5.1", + "jest-util": "^27.5.1", + "jest-validate": "^27.5.1", + "micromatch": "^4.0.4", + "parse-json": "^5.2.0", + "pretty-format": "^27.5.1", + "slash": "^3.0.0", + "strip-json-comments": "^3.1.1" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + }, + "peerDependencies": { + "ts-node": ">=9.0.0" + }, + "peerDependenciesMeta": { + "ts-node": { + "optional": true + } + } + }, + "node_modules/jest-diff": { + "version": "27.5.1", + "dev": true, + "license": "MIT", + "dependencies": { + "chalk": "^4.0.0", + "diff-sequences": "^27.5.1", + "jest-get-type": "^27.5.1", + "pretty-format": "^27.5.1" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-docblock": { + "version": "27.5.1", + "dev": true, + "license": "MIT", + "dependencies": { + "detect-newline": "^3.0.0" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-each": { + "version": "27.5.1", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/types": "^27.5.1", + "chalk": "^4.0.0", + "jest-get-type": "^27.5.1", + "jest-util": "^27.5.1", + "pretty-format": "^27.5.1" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-environment-jsdom": { + "version": "27.5.1", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/environment": "^27.5.1", + "@jest/fake-timers": "^27.5.1", + "@jest/types": "^27.5.1", + "@types/node": "*", + "jest-mock": "^27.5.1", + "jest-util": "^27.5.1", + "jsdom": "^16.6.0" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-environment-jsdom/node_modules/@types/node": { + "version": "17.0.23", + "dev": true, + "license": "MIT" + }, + "node_modules/jest-environment-node": { + "version": "27.5.1", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/environment": "^27.5.1", + "@jest/fake-timers": "^27.5.1", + "@jest/types": "^27.5.1", + "@types/node": "*", + "jest-mock": "^27.5.1", + "jest-util": "^27.5.1" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-environment-node/node_modules/@types/node": { + "version": "17.0.23", + "dev": true, + "license": "MIT" + }, + "node_modules/jest-get-type": { + "version": "27.5.1", + "dev": true, + "license": "MIT", + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-haste-map": { + "version": "27.5.1", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/types": "^27.5.1", + "@types/graceful-fs": "^4.1.2", + "@types/node": "*", + "anymatch": "^3.0.3", + "fb-watchman": "^2.0.0", + "graceful-fs": "^4.2.9", + "jest-regex-util": "^27.5.1", + "jest-serializer": "^27.5.1", + "jest-util": "^27.5.1", + "jest-worker": "^27.5.1", + "micromatch": "^4.0.4", + "walker": "^1.0.7" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + }, + "optionalDependencies": { + "fsevents": "^2.3.2" + } + }, + "node_modules/jest-haste-map/node_modules/@types/node": { + "version": "17.0.23", + "dev": true, + "license": "MIT" + }, + "node_modules/jest-jasmine2": { + "version": "27.5.1", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/environment": "^27.5.1", + "@jest/source-map": "^27.5.1", + "@jest/test-result": "^27.5.1", + "@jest/types": "^27.5.1", + "@types/node": "*", + "chalk": "^4.0.0", + "co": "^4.6.0", + "expect": "^27.5.1", + "is-generator-fn": "^2.0.0", + "jest-each": "^27.5.1", + "jest-matcher-utils": "^27.5.1", + "jest-message-util": "^27.5.1", + "jest-runtime": "^27.5.1", + "jest-snapshot": "^27.5.1", + "jest-util": "^27.5.1", + "pretty-format": "^27.5.1", + "throat": "^6.0.1" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-jasmine2/node_modules/@types/node": { + "version": "17.0.23", + "dev": true, + "license": "MIT" + }, + "node_modules/jest-leak-detector": { + "version": "27.5.1", + "dev": true, + "license": "MIT", + "dependencies": { + "jest-get-type": "^27.5.1", + "pretty-format": "^27.5.1" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-matcher-utils": { + "version": "27.5.1", + "dev": true, + "license": "MIT", + "dependencies": { + "chalk": "^4.0.0", + "jest-diff": "^27.5.1", + "jest-get-type": "^27.5.1", + "pretty-format": "^27.5.1" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-message-util": { + "version": "27.5.1", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.12.13", + "@jest/types": "^27.5.1", + "@types/stack-utils": "^2.0.0", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.9", + "micromatch": "^4.0.4", + "pretty-format": "^27.5.1", + "slash": "^3.0.0", + "stack-utils": "^2.0.3" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-mock": { + "version": "27.5.1", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/types": "^27.5.1", + "@types/node": "*" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-mock/node_modules/@types/node": { + "version": "17.0.23", + "dev": true, + "license": "MIT" + }, + "node_modules/jest-pnp-resolver": { + "version": "1.2.2", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + }, + "peerDependencies": { + "jest-resolve": "*" + }, + "peerDependenciesMeta": { + "jest-resolve": { + "optional": true + } + } + }, + "node_modules/jest-regex-util": { + "version": "27.5.1", + "dev": true, + "license": "MIT", + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-resolve": { + "version": "27.5.1", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/types": "^27.5.1", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^27.5.1", + "jest-pnp-resolver": "^1.2.2", + "jest-util": "^27.5.1", + "jest-validate": "^27.5.1", + "resolve": "^1.20.0", + "resolve.exports": "^1.1.0", + "slash": "^3.0.0" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-resolve-dependencies": { + "version": "27.5.1", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/types": "^27.5.1", + "jest-regex-util": "^27.5.1", + "jest-snapshot": "^27.5.1" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-runner": { + "version": "27.5.1", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/console": "^27.5.1", + "@jest/environment": "^27.5.1", + "@jest/test-result": "^27.5.1", + "@jest/transform": "^27.5.1", + "@jest/types": "^27.5.1", + "@types/node": "*", + "chalk": "^4.0.0", + "emittery": "^0.8.1", + "graceful-fs": "^4.2.9", + "jest-docblock": "^27.5.1", + "jest-environment-jsdom": "^27.5.1", + "jest-environment-node": "^27.5.1", + "jest-haste-map": "^27.5.1", + "jest-leak-detector": "^27.5.1", + "jest-message-util": "^27.5.1", + "jest-resolve": "^27.5.1", + "jest-runtime": "^27.5.1", + "jest-util": "^27.5.1", + "jest-worker": "^27.5.1", + "source-map-support": "^0.5.6", + "throat": "^6.0.1" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-runner/node_modules/@types/node": { + "version": "17.0.23", + "dev": true, + "license": "MIT" + }, + "node_modules/jest-runtime": { + "version": "27.5.1", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/environment": "^27.5.1", + "@jest/fake-timers": "^27.5.1", + "@jest/globals": "^27.5.1", + "@jest/source-map": "^27.5.1", + "@jest/test-result": "^27.5.1", + "@jest/transform": "^27.5.1", + "@jest/types": "^27.5.1", + "chalk": "^4.0.0", + "cjs-module-lexer": "^1.0.0", + "collect-v8-coverage": "^1.0.0", + "execa": "^5.0.0", + "glob": "^7.1.3", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^27.5.1", + "jest-message-util": "^27.5.1", + "jest-mock": "^27.5.1", + "jest-regex-util": "^27.5.1", + "jest-resolve": "^27.5.1", + "jest-snapshot": "^27.5.1", + "jest-util": "^27.5.1", + "slash": "^3.0.0", + "strip-bom": "^4.0.0" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-serializer": { + "version": "27.5.1", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*", + "graceful-fs": "^4.2.9" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-serializer/node_modules/@types/node": { + "version": "17.0.23", + "dev": true, + "license": "MIT" + }, + "node_modules/jest-snapshot": { + "version": "27.5.1", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/core": "^7.7.2", + "@babel/generator": "^7.7.2", + "@babel/plugin-syntax-typescript": "^7.7.2", + "@babel/traverse": "^7.7.2", + "@babel/types": "^7.0.0", + "@jest/transform": "^27.5.1", + "@jest/types": "^27.5.1", + "@types/babel__traverse": "^7.0.4", + "@types/prettier": "^2.1.5", + "babel-preset-current-node-syntax": "^1.0.0", + "chalk": "^4.0.0", + "expect": "^27.5.1", + "graceful-fs": "^4.2.9", + "jest-diff": "^27.5.1", + "jest-get-type": "^27.5.1", + "jest-haste-map": "^27.5.1", + "jest-matcher-utils": "^27.5.1", + "jest-message-util": "^27.5.1", + "jest-util": "^27.5.1", + "natural-compare": "^1.4.0", + "pretty-format": "^27.5.1", + "semver": "^7.3.2" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-snapshot/node_modules/semver": { + "version": "7.3.5", + "dev": true, + "license": "ISC", + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/jest-util": { + "version": "27.5.1", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/types": "^27.5.1", + "@types/node": "*", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "graceful-fs": "^4.2.9", + "picomatch": "^2.2.3" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-util/node_modules/@types/node": { + "version": "17.0.23", + "dev": true, + "license": "MIT" + }, + "node_modules/jest-validate": { + "version": "27.5.1", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/types": "^27.5.1", + "camelcase": "^6.2.0", + "chalk": "^4.0.0", + "jest-get-type": "^27.5.1", + "leven": "^3.1.0", + "pretty-format": "^27.5.1" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-watcher": { + "version": "27.5.1", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/test-result": "^27.5.1", + "@jest/types": "^27.5.1", + "@types/node": "*", + "ansi-escapes": "^4.2.1", + "chalk": "^4.0.0", + "jest-util": "^27.5.1", + "string-length": "^4.0.1" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-watcher/node_modules/@types/node": { + "version": "17.0.23", + "dev": true, + "license": "MIT" + }, + "node_modules/jest-worker": { + "version": "27.5.1", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*", + "merge-stream": "^2.0.0", + "supports-color": "^8.0.0" + }, + "engines": { + "node": ">= 10.13.0" + } + }, + "node_modules/jest-worker/node_modules/@types/node": { + "version": "17.0.23", + "dev": true, + "license": "MIT" + }, + "node_modules/jest-worker/node_modules/supports-color": { + "version": "8.1.1", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" + } + }, + "node_modules/js-tokens": { + "version": "4.0.0", + "dev": true, + "license": "MIT" + }, + "node_modules/js-yaml": { + "version": "4.1.0", + "dev": true, + "license": "MIT", + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/jsdom": { + "version": "16.7.0", + "dev": true, + "license": "MIT", + "dependencies": { + "abab": "^2.0.5", + "acorn": "^8.2.4", + "acorn-globals": "^6.0.0", + "cssom": "^0.4.4", + "cssstyle": "^2.3.0", + "data-urls": "^2.0.0", + "decimal.js": "^10.2.1", + "domexception": "^2.0.1", + "escodegen": "^2.0.0", + "form-data": "^3.0.0", + "html-encoding-sniffer": "^2.0.1", + "http-proxy-agent": "^4.0.1", + "https-proxy-agent": "^5.0.0", + "is-potential-custom-element-name": "^1.0.1", + "nwsapi": "^2.2.0", + "parse5": "6.0.1", + "saxes": "^5.0.1", + "symbol-tree": "^3.2.4", + "tough-cookie": "^4.0.0", + "w3c-hr-time": "^1.0.2", + "w3c-xmlserializer": "^2.0.0", + "webidl-conversions": "^6.1.0", + "whatwg-encoding": "^1.0.5", + "whatwg-mimetype": "^2.3.0", + "whatwg-url": "^8.5.0", + "ws": "^7.4.6", + "xml-name-validator": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "peerDependencies": { + "canvas": "^2.5.0" + }, + "peerDependenciesMeta": { + "canvas": { + "optional": true + } + } + }, + "node_modules/jsdom/node_modules/form-data": { + "version": "3.0.1", + "dev": true, + "license": "MIT", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/jsesc": { + "version": "2.5.2", + "dev": true, + "license": "MIT", + "bin": { + "jsesc": "bin/jsesc" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/json-parse-even-better-errors": { + "version": "2.3.1", + "dev": true, + "license": "MIT" + }, + "node_modules/json-schema-traverse": { + "version": "0.4.1", + "dev": true, + "license": "MIT" + }, + "node_modules/json-stable-stringify-without-jsonify": { + "version": "1.0.1", + "dev": true, + "license": "MIT" + }, + "node_modules/json5": { + "version": "2.2.1", + "dev": true, + "license": "MIT", + "bin": { + "json5": "lib/cli.js" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/kleur": { + "version": "3.0.3", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/leven": { + "version": "3.1.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/levn": { + "version": "0.4.1", + "dev": true, + "license": "MIT", + "dependencies": { + "prelude-ls": "^1.2.1", + "type-check": "~0.4.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/levn/node_modules/prelude-ls": { + "version": "1.2.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/levn/node_modules/type-check": { + "version": "0.4.0", + "dev": true, + "license": "MIT", + "dependencies": { + "prelude-ls": "^1.2.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/lines-and-columns": { + "version": "1.2.4", + "dev": true, + "license": "MIT" + }, + "node_modules/locate-path": { + "version": "5.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "p-locate": "^4.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/lodash": { + "version": "4.17.21", + "dev": true, + "license": "MIT" + }, + "node_modules/lodash.memoize": { + "version": "4.1.2", + "dev": true, + "license": "MIT" + }, + "node_modules/lodash.merge": { + "version": "4.6.2", + "dev": true, + "license": "MIT" + }, + "node_modules/lru-cache": { + "version": "6.0.0", + "dev": true, + "license": "ISC", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/make-dir": { + "version": "3.1.0", + "dev": true, + "license": "MIT", + "dependencies": { + "semver": "^6.0.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/make-error": { + "version": "1.3.6", + "dev": true, + "license": "ISC" + }, + "node_modules/makeerror": { + "version": "1.0.12", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "tmpl": "1.0.5" + } + }, + "node_modules/map-stream": { + "version": "0.0.7", + "license": "MIT" + }, + "node_modules/merge-stream": { + "version": "2.0.0", + "dev": true, + "license": "MIT" + }, + "node_modules/merge2": { + "version": "1.4.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 8" + } + }, + "node_modules/micromatch": { + "version": "4.0.5", + "dev": true, + "license": "MIT", + "dependencies": { + "braces": "^3.0.2", + "picomatch": "^2.3.1" + }, + "engines": { + "node": ">=8.6" + } + }, + "node_modules/mime-db": { + "version": "1.52.0", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.35", + "license": "MIT", + "dependencies": { + "mime-db": "1.52.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mimic-fn": { + "version": "2.1.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/minimatch": { + "version": "3.1.2", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/ms": { + "version": "2.1.2", + "dev": true, + "license": "MIT" + }, + "node_modules/natural-compare": { + "version": "1.4.0", + "dev": true, + "license": "MIT" + }, + "node_modules/node-int64": { + "version": "0.4.0", + "dev": true, + "license": "MIT" + }, + "node_modules/node-releases": { + "version": "2.0.2", + "dev": true, + "license": "MIT" + }, + "node_modules/normalize-path": { + "version": "3.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/npm-run-path": { + "version": "4.0.1", + "dev": true, + "license": "MIT", + "dependencies": { + "path-key": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/nwsapi": { + "version": "2.2.0", + "dev": true, + "license": "MIT" + }, + "node_modules/once": { + "version": "1.4.0", + "dev": true, + "license": "ISC", + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/onetime": { + "version": "5.1.2", + "dev": true, + "license": "MIT", + "dependencies": { + "mimic-fn": "^2.1.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/optionator": { + "version": "0.9.1", + "dev": true, + "license": "MIT", + "dependencies": { + "deep-is": "^0.1.3", + "fast-levenshtein": "^2.0.6", + "levn": "^0.4.1", + "prelude-ls": "^1.2.1", + "type-check": "^0.4.0", + "word-wrap": "^1.2.3" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/optionator/node_modules/prelude-ls": { + "version": "1.2.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/optionator/node_modules/type-check": { + "version": "0.4.0", + "dev": true, + "license": "MIT", + "dependencies": { + "prelude-ls": "^1.2.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/p-limit": { + "version": "2.3.0", + "dev": true, + "license": "MIT", + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-locate": { + "version": "4.1.0", + "dev": true, + "license": "MIT", + "dependencies": { + "p-limit": "^2.2.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/p-try": { + "version": "2.2.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/parent-module": { + "version": "1.0.1", + "dev": true, + "license": "MIT", + "dependencies": { + "callsites": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/parse-json": { + "version": "5.2.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.0.0", + "error-ex": "^1.3.1", + "json-parse-even-better-errors": "^2.3.0", + "lines-and-columns": "^1.1.6" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/parse5": { + "version": "6.0.1", + "dev": true, + "license": "MIT" + }, + "node_modules/path-exists": { + "version": "4.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-is-absolute": { + "version": "1.0.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/path-key": { + "version": "3.1.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-parse": { + "version": "1.0.7", + "dev": true, + "license": "MIT" + }, + "node_modules/path-type": { + "version": "4.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/pause-stream": { + "version": "0.0.11", + "license": [ + "MIT", + "Apache2" + ], + "dependencies": { + "through": "~2.3" + } + }, + "node_modules/picocolors": { + "version": "1.0.0", + "dev": true, + "license": "ISC" + }, + "node_modules/picomatch": { + "version": "2.3.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/pirates": { + "version": "4.0.5", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 6" + } + }, + "node_modules/pkg-dir": { + "version": "4.2.0", + "dev": true, + "license": "MIT", + "dependencies": { + "find-up": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/prelude-ls": { + "version": "1.1.2", + "dev": true, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/prettier": { + "version": "2.6.2", + "dev": true, + "license": "MIT", + "bin": { + "prettier": "bin-prettier.js" + }, + "engines": { + "node": ">=10.13.0" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" + } + }, + "node_modules/pretty-format": { + "version": "27.5.1", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1", + "ansi-styles": "^5.0.0", + "react-is": "^17.0.1" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/pretty-format/node_modules/ansi-styles": { + "version": "5.2.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/prompts": { + "version": "2.4.2", + "dev": true, + "license": "MIT", + "dependencies": { + "kleur": "^3.0.3", + "sisteransi": "^1.0.5" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/psl": { + "version": "1.8.0", + "dev": true, + "license": "MIT" + }, + "node_modules/punycode": { + "version": "2.1.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/queue-microtask": { + "version": "1.2.3", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, + "node_modules/react-is": { + "version": "17.0.2", + "dev": true, + "license": "MIT" + }, + "node_modules/regexpp": { + "version": "3.2.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + } + }, + "node_modules/require-directory": { + "version": "2.1.1", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/resolve": { + "version": "1.22.0", + "dev": true, + "license": "MIT", + "dependencies": { + "is-core-module": "^2.8.1", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/resolve-cwd": { + "version": "3.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "resolve-from": "^5.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/resolve-from": { + "version": "5.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/resolve.exports": { + "version": "1.1.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + } + }, + "node_modules/reusify": { + "version": "1.0.4", + "dev": true, + "license": "MIT", + "engines": { + "iojs": ">=1.0.0", + "node": ">=0.10.0" + } + }, + "node_modules/rimraf": { + "version": "3.0.2", + "dev": true, + "license": "ISC", + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/run-parallel": { + "version": "1.2.0", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "dependencies": { + "queue-microtask": "^1.2.2" + } + }, + "node_modules/safe-buffer": { + "version": "5.1.2", + "dev": true, + "license": "MIT" + }, + "node_modules/safer-buffer": { + "version": "2.1.2", + "dev": true, + "license": "MIT" + }, + "node_modules/saxes": { + "version": "5.0.1", + "dev": true, + "license": "ISC", + "dependencies": { + "xmlchars": "^2.2.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/semver": { + "version": "6.3.0", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/shebang-command": { + "version": "2.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-regex": { + "version": "3.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/signal-exit": { + "version": "3.0.7", + "dev": true, + "license": "ISC" + }, + "node_modules/sisteransi": { + "version": "1.0.5", + "dev": true, + "license": "MIT" + }, + "node_modules/slash": { + "version": "3.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/source-map": { + "version": "0.6.1", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/source-map-support": { + "version": "0.5.21", + "dev": true, + "license": "MIT", + "dependencies": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, + "node_modules/split": { + "version": "1.0.1", + "license": "MIT", + "dependencies": { + "through": "2" + }, + "engines": { + "node": "*" + } + }, + "node_modules/sprintf-js": { + "version": "1.0.3", + "dev": true, + "license": "BSD-3-Clause" + }, + "node_modules/stack-utils": { + "version": "2.0.5", + "dev": true, + "license": "MIT", + "dependencies": { + "escape-string-regexp": "^2.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/stack-utils/node_modules/escape-string-regexp": { + "version": "2.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/stream-combiner": { + "version": "0.2.2", + "license": "MIT", + "dependencies": { + "duplexer": "~0.1.1", + "through": "~2.3.4" + } + }, + "node_modules/string-length": { + "version": "4.0.2", + "dev": true, + "license": "MIT", + "dependencies": { + "char-regex": "^1.0.2", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/string-width": { + "version": "4.2.3", + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/stringify-object": { + "version": "3.3.0", + "license": "BSD-2-Clause", + "dependencies": { + "get-own-enumerable-property-symbols": "^3.0.0", + "is-obj": "^1.0.1", + "is-regexp": "^1.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/strip-ansi": { + "version": "6.0.1", + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-bom": { + "version": "4.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-final-newline": { + "version": "2.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/strip-json-comments": { + "version": "3.1.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/supports-color": { + "version": "7.2.0", + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/supports-hyperlinks": { + "version": "2.2.0", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0", + "supports-color": "^7.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/supports-preserve-symlinks-flag": { + "version": "1.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/symbol-tree": { + "version": "3.2.4", + "dev": true, + "license": "MIT" + }, + "node_modules/terminal-link": { + "version": "2.1.1", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-escapes": "^4.2.1", + "supports-hyperlinks": "^2.0.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/test-exclude": { + "version": "6.0.0", + "dev": true, + "license": "ISC", + "dependencies": { + "@istanbuljs/schema": "^0.1.2", + "glob": "^7.1.4", + "minimatch": "^3.0.4" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/text-table": { + "version": "0.2.0", + "dev": true, + "license": "MIT" + }, + "node_modules/throat": { + "version": "6.0.1", + "dev": true, + "license": "MIT" + }, + "node_modules/through": { + "version": "2.3.8", + "license": "MIT" + }, + "node_modules/tmpl": { + "version": "1.0.5", + "dev": true, + "license": "BSD-3-Clause" + }, + "node_modules/to-fast-properties": { + "version": "2.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "dev": true, + "license": "MIT", + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, + "node_modules/tough-cookie": { + "version": "4.0.0", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "psl": "^1.1.33", + "punycode": "^2.1.1", + "universalify": "^0.1.2" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/tr46": { + "version": "2.1.0", + "dev": true, + "license": "MIT", + "dependencies": { + "punycode": "^2.1.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/ts-jest": { + "version": "27.1.4", + "dev": true, + "license": "MIT", + "dependencies": { + "bs-logger": "0.x", + "fast-json-stable-stringify": "2.x", + "jest-util": "^27.0.0", + "json5": "2.x", + "lodash.memoize": "4.x", + "make-error": "1.x", + "semver": "7.x", + "yargs-parser": "20.x" + }, + "bin": { + "ts-jest": "cli.js" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + }, + "peerDependencies": { + "@babel/core": ">=7.0.0-beta.0 <8", + "@types/jest": "^27.0.0", + "babel-jest": ">=27.0.0 <28", + "jest": "^27.0.0", + "typescript": ">=3.8 <5.0" + }, + "peerDependenciesMeta": { + "@babel/core": { + "optional": true + }, + "@types/jest": { + "optional": true + }, + "babel-jest": { + "optional": true + }, + "esbuild": { + "optional": true + } + } + }, + "node_modules/ts-jest/node_modules/semver": { + "version": "7.3.5", + "dev": true, + "license": "ISC", + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/tslib": { + "version": "1.14.1", + "dev": true, + "license": "0BSD" + }, + "node_modules/tsutils": { + "version": "3.21.0", + "dev": true, + "license": "MIT", + "dependencies": { + "tslib": "^1.8.1" + }, + "engines": { + "node": ">= 6" + }, + "peerDependencies": { + "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta" + } + }, + "node_modules/type-check": { + "version": "0.3.2", + "dev": true, + "license": "MIT", + "dependencies": { + "prelude-ls": "~1.1.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/type-detect": { + "version": "4.0.8", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/type-fest": { + "version": "2.12.2", + "dev": true, + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=12.20" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/typedarray-to-buffer": { + "version": "3.1.5", + "dev": true, + "license": "MIT", + "dependencies": { + "is-typedarray": "^1.0.0" + } + }, + "node_modules/typescript": { + "version": "4.6.3", + "dev": true, + "license": "Apache-2.0", + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=4.2.0" + } + }, + "node_modules/universalify": { + "version": "0.1.2", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 4.0.0" + } + }, + "node_modules/uri-js": { + "version": "4.4.1", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "punycode": "^2.1.0" + } + }, + "node_modules/v8-compile-cache": { + "version": "2.3.0", + "dev": true, + "license": "MIT" + }, + "node_modules/v8-to-istanbul": { + "version": "8.1.1", + "dev": true, + "license": "ISC", + "dependencies": { + "@types/istanbul-lib-coverage": "^2.0.1", + "convert-source-map": "^1.6.0", + "source-map": "^0.7.3" + }, + "engines": { + "node": ">=10.12.0" + } + }, + "node_modules/v8-to-istanbul/node_modules/source-map": { + "version": "0.7.3", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">= 8" + } + }, + "node_modules/w3c-hr-time": { + "version": "1.0.2", + "dev": true, + "license": "MIT", + "dependencies": { + "browser-process-hrtime": "^1.0.0" + } + }, + "node_modules/w3c-xmlserializer": { + "version": "2.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "xml-name-validator": "^3.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/walker": { + "version": "1.0.8", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "makeerror": "1.0.12" + } + }, + "node_modules/webidl-conversions": { + "version": "6.1.0", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=10.4" + } + }, + "node_modules/whatwg-encoding": { + "version": "1.0.5", + "dev": true, + "license": "MIT", + "dependencies": { + "iconv-lite": "0.4.24" + } + }, + "node_modules/whatwg-mimetype": { + "version": "2.3.0", + "dev": true, + "license": "MIT" + }, + "node_modules/whatwg-url": { + "version": "8.7.0", + "dev": true, + "license": "MIT", + "dependencies": { + "lodash": "^4.7.0", + "tr46": "^2.1.0", + "webidl-conversions": "^6.1.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/which": { + "version": "2.0.2", + "dev": true, + "license": "ISC", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/word-wrap": { + "version": "1.2.3", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/wrap-ansi": { + "version": "7.0.0", + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/wrappy": { + "version": "1.0.2", + "dev": true, + "license": "ISC" + }, + "node_modules/write-file-atomic": { + "version": "3.0.3", + "dev": true, + "license": "ISC", + "dependencies": { + "imurmurhash": "^0.1.4", + "is-typedarray": "^1.0.0", + "signal-exit": "^3.0.2", + "typedarray-to-buffer": "^3.1.5" + } + }, + "node_modules/ws": { + "version": "7.5.7", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8.3.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": "^5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, + "node_modules/xml-name-validator": { + "version": "3.0.0", + "dev": true, + "license": "Apache-2.0" + }, + "node_modules/xmlchars": { + "version": "2.2.0", + "dev": true, + "license": "MIT" + }, + "node_modules/y18n": { + "version": "5.0.8", + "license": "ISC", + "engines": { + "node": ">=10" + } + }, + "node_modules/yallist": { + "version": "4.0.0", + "dev": true, + "license": "ISC" + }, + "node_modules/yargs": { + "version": "17.4.0", + "license": "MIT", + "dependencies": { + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.3", + "y18n": "^5.0.5", + "yargs-parser": "^21.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/yargs-parser": { + "version": "20.2.9", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs/node_modules/yargs-parser": { + "version": "21.0.1", + "license": "ISC", + "engines": { + "node": ">=12" + } + } + }, + "dependencies": { + "@ampproject/remapping": { + "version": "2.1.2", + "dev": true, + "requires": { + "@jridgewell/trace-mapping": "^0.3.0" + } + }, + "@babel/code-frame": { + "version": "7.16.7", + "dev": true, + "requires": { + "@babel/highlight": "^7.16.7" + } + }, + "@babel/compat-data": { + "version": "7.17.7", + "dev": true + }, + "@babel/core": { + "version": "7.17.8", + "dev": true, + "requires": { + "@ampproject/remapping": "^2.1.0", + "@babel/code-frame": "^7.16.7", + "@babel/generator": "^7.17.7", + "@babel/helper-compilation-targets": "^7.17.7", + "@babel/helper-module-transforms": "^7.17.7", + "@babel/helpers": "^7.17.8", + "@babel/parser": "^7.17.8", + "@babel/template": "^7.16.7", + "@babel/traverse": "^7.17.3", + "@babel/types": "^7.17.0", + "convert-source-map": "^1.7.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.2", + "json5": "^2.1.2", + "semver": "^6.3.0" + } + }, + "@babel/generator": { + "version": "7.17.7", + "dev": true, + "requires": { + "@babel/types": "^7.17.0", + "jsesc": "^2.5.1", + "source-map": "^0.5.0" + }, + "dependencies": { + "source-map": { + "version": "0.5.7", + "dev": true + } + } + }, + "@babel/helper-compilation-targets": { + "version": "7.17.7", + "dev": true, + "requires": { + "@babel/compat-data": "^7.17.7", + "@babel/helper-validator-option": "^7.16.7", + "browserslist": "^4.17.5", + "semver": "^6.3.0" + } + }, + "@babel/helper-environment-visitor": { + "version": "7.16.7", + "dev": true, + "requires": { + "@babel/types": "^7.16.7" + } + }, + "@babel/helper-function-name": { + "version": "7.16.7", + "dev": true, + "requires": { + "@babel/helper-get-function-arity": "^7.16.7", + "@babel/template": "^7.16.7", + "@babel/types": "^7.16.7" + } + }, + "@babel/helper-get-function-arity": { + "version": "7.16.7", + "dev": true, + "requires": { + "@babel/types": "^7.16.7" + } + }, + "@babel/helper-hoist-variables": { + "version": "7.16.7", + "dev": true, + "requires": { + "@babel/types": "^7.16.7" + } + }, + "@babel/helper-module-imports": { + "version": "7.16.7", + "dev": true, + "requires": { + "@babel/types": "^7.16.7" + } + }, + "@babel/helper-module-transforms": { + "version": "7.17.7", + "dev": true, + "requires": { + "@babel/helper-environment-visitor": "^7.16.7", + "@babel/helper-module-imports": "^7.16.7", + "@babel/helper-simple-access": "^7.17.7", + "@babel/helper-split-export-declaration": "^7.16.7", + "@babel/helper-validator-identifier": "^7.16.7", + "@babel/template": "^7.16.7", + "@babel/traverse": "^7.17.3", + "@babel/types": "^7.17.0" + } + }, + "@babel/helper-plugin-utils": { + "version": "7.16.7", + "dev": true + }, + "@babel/helper-simple-access": { + "version": "7.17.7", + "dev": true, + "requires": { + "@babel/types": "^7.17.0" + } + }, + "@babel/helper-split-export-declaration": { + "version": "7.16.7", + "dev": true, + "requires": { + "@babel/types": "^7.16.7" + } + }, + "@babel/helper-validator-identifier": { + "version": "7.16.7", + "dev": true + }, + "@babel/helper-validator-option": { + "version": "7.16.7", + "dev": true + }, + "@babel/helpers": { + "version": "7.17.8", + "dev": true, + "requires": { + "@babel/template": "^7.16.7", + "@babel/traverse": "^7.17.3", + "@babel/types": "^7.17.0" + } + }, + "@babel/highlight": { + "version": "7.16.10", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.16.7", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.1", + "dev": true, + "requires": { + "color-convert": "^1.9.0" + } + }, + "chalk": { + "version": "2.4.2", + "dev": true, + "requires": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + } + }, + "color-convert": { + "version": "1.9.3", + "dev": true, + "requires": { + "color-name": "1.1.3" + } + }, + "color-name": { + "version": "1.1.3", + "dev": true + }, + "has-flag": { + "version": "3.0.0", + "dev": true + }, + "supports-color": { + "version": "5.5.0", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, + "@babel/parser": { + "version": "7.17.8", + "dev": true + }, + "@babel/plugin-syntax-async-generators": { + "version": "7.8.4", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-bigint": { + "version": "7.8.3", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-class-properties": { + "version": "7.12.13", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.12.13" + } + }, + "@babel/plugin-syntax-import-meta": { + "version": "7.10.4", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.10.4" + } + }, + "@babel/plugin-syntax-json-strings": { + "version": "7.8.3", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-logical-assignment-operators": { + "version": "7.10.4", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.10.4" + } + }, + "@babel/plugin-syntax-nullish-coalescing-operator": { + "version": "7.8.3", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-numeric-separator": { + "version": "7.10.4", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.10.4" + } + }, + "@babel/plugin-syntax-object-rest-spread": { + "version": "7.8.3", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-optional-catch-binding": { + "version": "7.8.3", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-optional-chaining": { + "version": "7.8.3", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-top-level-await": { + "version": "7.14.5", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.14.5" + } + }, + "@babel/plugin-syntax-typescript": { + "version": "7.16.7", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.16.7" + } + }, + "@babel/template": { + "version": "7.16.7", + "dev": true, + "requires": { + "@babel/code-frame": "^7.16.7", + "@babel/parser": "^7.16.7", + "@babel/types": "^7.16.7" + } + }, + "@babel/traverse": { + "version": "7.17.3", + "dev": true, + "requires": { + "@babel/code-frame": "^7.16.7", + "@babel/generator": "^7.17.3", + "@babel/helper-environment-visitor": "^7.16.7", + "@babel/helper-function-name": "^7.16.7", + "@babel/helper-hoist-variables": "^7.16.7", + "@babel/helper-split-export-declaration": "^7.16.7", + "@babel/parser": "^7.17.3", + "@babel/types": "^7.17.0", + "debug": "^4.1.0", + "globals": "^11.1.0" + }, + "dependencies": { + "globals": { + "version": "11.12.0", + "dev": true + } + } + }, + "@babel/types": { + "version": "7.17.0", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.16.7", + "to-fast-properties": "^2.0.0" + } + }, + "@bcoe/v8-coverage": { + "version": "0.2.3", + "dev": true + }, + "@eslint/eslintrc": { + "version": "1.2.1", + "dev": true, + "requires": { + "ajv": "^6.12.4", + "debug": "^4.3.2", + "espree": "^9.3.1", + "globals": "^13.9.0", + "ignore": "^5.2.0", + "import-fresh": "^3.2.1", + "js-yaml": "^4.1.0", + "minimatch": "^3.0.4", + "strip-json-comments": "^3.1.1" + } + }, + "@humanwhocodes/config-array": { + "version": "0.9.5", + "dev": true, + "requires": { + "@humanwhocodes/object-schema": "^1.2.1", + "debug": "^4.1.1", + "minimatch": "^3.0.4" + } + }, + "@humanwhocodes/object-schema": { + "version": "1.2.1", + "dev": true + }, + "@istanbuljs/load-nyc-config": { + "version": "1.1.0", + "dev": true, + "requires": { + "camelcase": "^5.3.1", + "find-up": "^4.1.0", + "get-package-type": "^0.1.0", + "js-yaml": "^3.13.1", + "resolve-from": "^5.0.0" + }, + "dependencies": { + "argparse": { + "version": "1.0.10", "dev": true, "requires": { - "color-convert": "^2.0.1" + "sprintf-js": "~1.0.2" } }, - "chalk": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", - "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "camelcase": { + "version": "5.3.1", + "dev": true + }, + "js-yaml": { + "version": "3.14.1", "dev": true, "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" + "argparse": "^1.0.7", + "esprima": "^4.0.0" } + } + } + }, + "@istanbuljs/schema": { + "version": "0.1.3", + "dev": true + }, + "@jest/console": { + "version": "27.5.1", + "dev": true, + "requires": { + "@jest/types": "^27.5.1", + "@types/node": "*", + "chalk": "^4.0.0", + "jest-message-util": "^27.5.1", + "jest-util": "^27.5.1", + "slash": "^3.0.0" + }, + "dependencies": { + "@types/node": { + "version": "17.0.23", + "dev": true + } + } + }, + "@jest/core": { + "version": "27.5.1", + "dev": true, + "requires": { + "@jest/console": "^27.5.1", + "@jest/reporters": "^27.5.1", + "@jest/test-result": "^27.5.1", + "@jest/transform": "^27.5.1", + "@jest/types": "^27.5.1", + "@types/node": "*", + "ansi-escapes": "^4.2.1", + "chalk": "^4.0.0", + "emittery": "^0.8.1", + "exit": "^0.1.2", + "graceful-fs": "^4.2.9", + "jest-changed-files": "^27.5.1", + "jest-config": "^27.5.1", + "jest-haste-map": "^27.5.1", + "jest-message-util": "^27.5.1", + "jest-regex-util": "^27.5.1", + "jest-resolve": "^27.5.1", + "jest-resolve-dependencies": "^27.5.1", + "jest-runner": "^27.5.1", + "jest-runtime": "^27.5.1", + "jest-snapshot": "^27.5.1", + "jest-util": "^27.5.1", + "jest-validate": "^27.5.1", + "jest-watcher": "^27.5.1", + "micromatch": "^4.0.4", + "rimraf": "^3.0.0", + "slash": "^3.0.0", + "strip-ansi": "^6.0.0" + }, + "dependencies": { + "@types/node": { + "version": "17.0.23", + "dev": true + } + } + }, + "@jest/environment": { + "version": "27.5.1", + "dev": true, + "requires": { + "@jest/fake-timers": "^27.5.1", + "@jest/types": "^27.5.1", + "@types/node": "*", + "jest-mock": "^27.5.1" + }, + "dependencies": { + "@types/node": { + "version": "17.0.23", + "dev": true + } + } + }, + "@jest/fake-timers": { + "version": "27.5.1", + "dev": true, + "requires": { + "@jest/types": "^27.5.1", + "@sinonjs/fake-timers": "^8.0.1", + "@types/node": "*", + "jest-message-util": "^27.5.1", + "jest-mock": "^27.5.1", + "jest-util": "^27.5.1" + }, + "dependencies": { + "@types/node": { + "version": "17.0.23", + "dev": true + } + } + }, + "@jest/globals": { + "version": "27.5.1", + "dev": true, + "requires": { + "@jest/environment": "^27.5.1", + "@jest/types": "^27.5.1", + "expect": "^27.5.1" + } + }, + "@jest/reporters": { + "version": "27.5.1", + "dev": true, + "requires": { + "@bcoe/v8-coverage": "^0.2.3", + "@jest/console": "^27.5.1", + "@jest/test-result": "^27.5.1", + "@jest/transform": "^27.5.1", + "@jest/types": "^27.5.1", + "@types/node": "*", + "chalk": "^4.0.0", + "collect-v8-coverage": "^1.0.0", + "exit": "^0.1.2", + "glob": "^7.1.2", + "graceful-fs": "^4.2.9", + "istanbul-lib-coverage": "^3.0.0", + "istanbul-lib-instrument": "^5.1.0", + "istanbul-lib-report": "^3.0.0", + "istanbul-lib-source-maps": "^4.0.0", + "istanbul-reports": "^3.1.3", + "jest-haste-map": "^27.5.1", + "jest-resolve": "^27.5.1", + "jest-util": "^27.5.1", + "jest-worker": "^27.5.1", + "slash": "^3.0.0", + "source-map": "^0.6.0", + "string-length": "^4.0.1", + "terminal-link": "^2.0.0", + "v8-to-istanbul": "^8.1.0" + }, + "dependencies": { + "@types/node": { + "version": "17.0.23", + "dev": true + } + } + }, + "@jest/source-map": { + "version": "27.5.1", + "dev": true, + "requires": { + "callsites": "^3.0.0", + "graceful-fs": "^4.2.9", + "source-map": "^0.6.0" + } + }, + "@jest/test-result": { + "version": "27.5.1", + "dev": true, + "requires": { + "@jest/console": "^27.5.1", + "@jest/types": "^27.5.1", + "@types/istanbul-lib-coverage": "^2.0.0", + "collect-v8-coverage": "^1.0.0" + } + }, + "@jest/test-sequencer": { + "version": "27.5.1", + "dev": true, + "requires": { + "@jest/test-result": "^27.5.1", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^27.5.1", + "jest-runtime": "^27.5.1" + } + }, + "@jest/transform": { + "version": "27.5.1", + "dev": true, + "requires": { + "@babel/core": "^7.1.0", + "@jest/types": "^27.5.1", + "babel-plugin-istanbul": "^6.1.1", + "chalk": "^4.0.0", + "convert-source-map": "^1.4.0", + "fast-json-stable-stringify": "^2.0.0", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^27.5.1", + "jest-regex-util": "^27.5.1", + "jest-util": "^27.5.1", + "micromatch": "^4.0.4", + "pirates": "^4.0.4", + "slash": "^3.0.0", + "source-map": "^0.6.1", + "write-file-atomic": "^3.0.0" + } + }, + "@jest/types": { + "version": "27.5.1", + "dev": true, + "requires": { + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", + "@types/node": "*", + "@types/yargs": "^16.0.0", + "chalk": "^4.0.0" + }, + "dependencies": { + "@types/node": { + "version": "17.0.23", + "dev": true }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "@types/yargs": { + "version": "16.0.4", + "dev": true, + "requires": { + "@types/yargs-parser": "*" + } + } + } + }, + "@jridgewell/resolve-uri": { + "version": "3.0.5", + "dev": true + }, + "@jridgewell/sourcemap-codec": { + "version": "1.4.11", + "dev": true + }, + "@jridgewell/trace-mapping": { + "version": "0.3.4", + "dev": true, + "requires": { + "@jridgewell/resolve-uri": "^3.0.3", + "@jridgewell/sourcemap-codec": "^1.4.10" + } + }, + "@nodelib/fs.scandir": { + "version": "2.1.5", + "dev": true, + "requires": { + "@nodelib/fs.stat": "2.0.5", + "run-parallel": "^1.1.9" + } + }, + "@nodelib/fs.stat": { + "version": "2.0.5", + "dev": true + }, + "@nodelib/fs.walk": { + "version": "1.2.8", + "dev": true, + "requires": { + "@nodelib/fs.scandir": "2.1.5", + "fastq": "^1.6.0" + } + }, + "@sinonjs/commons": { + "version": "1.8.3", + "dev": true, + "requires": { + "type-detect": "4.0.8" + } + }, + "@sinonjs/fake-timers": { + "version": "8.1.0", + "dev": true, + "requires": { + "@sinonjs/commons": "^1.7.0" + } + }, + "@tootallnate/once": { + "version": "1.1.2", + "dev": true + }, + "@types/babel__core": { + "version": "7.1.19", + "dev": true, + "requires": { + "@babel/parser": "^7.1.0", + "@babel/types": "^7.0.0", + "@types/babel__generator": "*", + "@types/babel__template": "*", + "@types/babel__traverse": "*" + } + }, + "@types/babel__generator": { + "version": "7.6.4", + "dev": true, + "requires": { + "@babel/types": "^7.0.0" + } + }, + "@types/babel__template": { + "version": "7.4.1", + "dev": true, + "requires": { + "@babel/parser": "^7.1.0", + "@babel/types": "^7.0.0" + } + }, + "@types/babel__traverse": { + "version": "7.14.2", + "dev": true, + "requires": { + "@babel/types": "^7.3.0" + } + }, + "@types/eslint": { + "version": "8.4.1", + "dev": true, + "requires": { + "@types/estree": "*", + "@types/json-schema": "*" + } + }, + "@types/estree": { + "version": "0.0.51", + "dev": true + }, + "@types/event-stream": { + "version": "4.0.0", + "dev": true, + "requires": { + "@types/node": "*" + }, + "dependencies": { + "@types/node": { + "version": "17.0.23", + "dev": true + } + } + }, + "@types/graceful-fs": { + "version": "4.1.5", + "dev": true, + "requires": { + "@types/node": "*" + }, + "dependencies": { + "@types/node": { + "version": "17.0.23", + "dev": true + } + } + }, + "@types/har-format": { + "version": "1.2.8", + "dev": true + }, + "@types/istanbul-lib-coverage": { + "version": "2.0.4", + "dev": true + }, + "@types/istanbul-lib-report": { + "version": "3.0.0", + "dev": true, + "requires": { + "@types/istanbul-lib-coverage": "*" + } + }, + "@types/istanbul-reports": { + "version": "3.0.1", + "dev": true, + "requires": { + "@types/istanbul-lib-report": "*" + } + }, + "@types/jest": { + "version": "27.4.1", + "dev": true, + "requires": { + "jest-matcher-utils": "^27.0.0", + "pretty-format": "^27.0.0" + } + }, + "@types/json-schema": { + "version": "7.0.11", + "dev": true + }, + "@types/node": { + "version": "16.11.26", + "dev": true + }, + "@types/prettier": { + "version": "2.4.4", + "dev": true + }, + "@types/stack-utils": { + "version": "2.0.1", + "dev": true + }, + "@types/stringify-object": { + "version": "3.3.1", + "dev": true + }, + "@types/yargs": { + "version": "17.0.10", + "dev": true, + "requires": { + "@types/yargs-parser": "*" + } + }, + "@types/yargs-parser": { + "version": "21.0.0", + "dev": true + }, + "@typescript-eslint/eslint-plugin": { + "version": "5.18.0", + "dev": true, + "requires": { + "@typescript-eslint/scope-manager": "5.18.0", + "@typescript-eslint/type-utils": "5.18.0", + "@typescript-eslint/utils": "5.18.0", + "debug": "^4.3.2", + "functional-red-black-tree": "^1.0.1", + "ignore": "^5.1.8", + "regexpp": "^3.2.0", + "semver": "^7.3.5", + "tsutils": "^3.21.0" + }, + "dependencies": { + "semver": { + "version": "7.3.5", "dev": true, "requires": { - "color-name": "~1.1.4" + "lru-cache": "^6.0.0" } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + } + } + }, + "@typescript-eslint/parser": { + "version": "5.18.0", + "dev": true, + "requires": { + "@typescript-eslint/scope-manager": "5.18.0", + "@typescript-eslint/types": "5.18.0", + "@typescript-eslint/typescript-estree": "5.18.0", + "debug": "^4.3.2" + } + }, + "@typescript-eslint/scope-manager": { + "version": "5.18.0", + "dev": true, + "requires": { + "@typescript-eslint/types": "5.18.0", + "@typescript-eslint/visitor-keys": "5.18.0" + } + }, + "@typescript-eslint/type-utils": { + "version": "5.18.0", + "dev": true, + "requires": { + "@typescript-eslint/utils": "5.18.0", + "debug": "^4.3.2", + "tsutils": "^3.21.0" + } + }, + "@typescript-eslint/types": { + "version": "5.18.0", + "dev": true + }, + "@typescript-eslint/typescript-estree": { + "version": "5.18.0", + "dev": true, + "requires": { + "@typescript-eslint/types": "5.18.0", + "@typescript-eslint/visitor-keys": "5.18.0", + "debug": "^4.3.2", + "globby": "^11.0.4", + "is-glob": "^4.0.3", + "semver": "^7.3.5", + "tsutils": "^3.21.0" + }, + "dependencies": { + "semver": { + "version": "7.3.5", "dev": true, "requires": { - "ms": "2.1.2" + "lru-cache": "^6.0.0" } - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "levn": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", - "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", + } + } + }, + "@typescript-eslint/utils": { + "version": "5.18.0", + "dev": true, + "requires": { + "@types/json-schema": "^7.0.9", + "@typescript-eslint/scope-manager": "5.18.0", + "@typescript-eslint/types": "5.18.0", + "@typescript-eslint/typescript-estree": "5.18.0", + "eslint-scope": "^5.1.1", + "eslint-utils": "^3.0.0" + }, + "dependencies": { + "eslint-scope": { + "version": "5.1.1", "dev": true, "requires": { - "prelude-ls": "^1.2.1", - "type-check": "~0.4.0" + "esrecurse": "^4.3.0", + "estraverse": "^4.1.1" } }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "estraverse": { + "version": "4.3.0", "dev": true - }, - "optionator": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz", - "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==", - "dev": true, - "requires": { - "deep-is": "^0.1.3", - "fast-levenshtein": "^2.0.6", - "levn": "^0.4.1", - "prelude-ls": "^1.2.1", - "type-check": "^0.4.0", - "word-wrap": "^1.2.3" - } - }, - "prelude-ls": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", - "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", + } + } + }, + "@typescript-eslint/visitor-keys": { + "version": "5.18.0", + "dev": true, + "requires": { + "@typescript-eslint/types": "5.18.0", + "eslint-visitor-keys": "^3.0.0" + } + }, + "abab": { + "version": "2.0.5", + "dev": true + }, + "acorn": { + "version": "8.7.0", + "dev": true + }, + "acorn-globals": { + "version": "6.0.0", + "dev": true, + "requires": { + "acorn": "^7.1.1", + "acorn-walk": "^7.1.1" + }, + "dependencies": { + "acorn": { + "version": "7.4.1", "dev": true - }, - "strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "dev": true, - "requires": { - "ansi-regex": "^5.0.0" - } - }, - "strip-json-comments": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", - "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + } + } + }, + "acorn-jsx": { + "version": "5.3.2", + "dev": true, + "requires": {} + }, + "acorn-walk": { + "version": "7.2.0", + "dev": true + }, + "agent-base": { + "version": "6.0.2", + "dev": true, + "requires": { + "debug": "4" + } + }, + "ajv": { + "version": "6.12.6", + "dev": true, + "requires": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, + "ansi-escapes": { + "version": "4.3.2", + "dev": true, + "requires": { + "type-fest": "^0.21.3" + }, + "dependencies": { + "type-fest": { + "version": "0.21.3", "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - }, - "type-check": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", - "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", - "dev": true, - "requires": { - "prelude-ls": "^1.2.1" - } } } }, - "eslint-config-standard": { - "version": "16.0.2", - "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-16.0.2.tgz", - "integrity": "sha512-fx3f1rJDsl9bY7qzyX8SAtP8GBSk6MfXFaTfaGgk12aAYW4gJSyRm7dM790L6cbXv63fvjY4XeSzXnb4WM+SKw==", + "ansi-regex": { + "version": "5.0.1" + }, + "ansi-styles": { + "version": "4.3.0", + "requires": { + "color-convert": "^2.0.1" + } + }, + "anymatch": { + "version": "3.1.2", + "dev": true, + "requires": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + } + }, + "argparse": { + "version": "2.0.1", + "dev": true + }, + "array-union": { + "version": "2.1.0", + "dev": true + }, + "asynckit": { + "version": "0.4.0" + }, + "babel-jest": { + "version": "27.5.1", + "dev": true, + "requires": { + "@jest/transform": "^27.5.1", + "@jest/types": "^27.5.1", + "@types/babel__core": "^7.1.14", + "babel-plugin-istanbul": "^6.1.1", + "babel-preset-jest": "^27.5.1", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.9", + "slash": "^3.0.0" + } + }, + "babel-plugin-istanbul": { + "version": "6.1.1", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.0.0", + "@istanbuljs/load-nyc-config": "^1.0.0", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-instrument": "^5.0.4", + "test-exclude": "^6.0.0" + } + }, + "babel-plugin-jest-hoist": { + "version": "27.5.1", + "dev": true, + "requires": { + "@babel/template": "^7.3.3", + "@babel/types": "^7.3.3", + "@types/babel__core": "^7.0.0", + "@types/babel__traverse": "^7.0.6" + } + }, + "babel-preset-current-node-syntax": { + "version": "1.0.1", + "dev": true, + "requires": { + "@babel/plugin-syntax-async-generators": "^7.8.4", + "@babel/plugin-syntax-bigint": "^7.8.3", + "@babel/plugin-syntax-class-properties": "^7.8.3", + "@babel/plugin-syntax-import-meta": "^7.8.3", + "@babel/plugin-syntax-json-strings": "^7.8.3", + "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3", + "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", + "@babel/plugin-syntax-numeric-separator": "^7.8.3", + "@babel/plugin-syntax-object-rest-spread": "^7.8.3", + "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", + "@babel/plugin-syntax-optional-chaining": "^7.8.3", + "@babel/plugin-syntax-top-level-await": "^7.8.3" + } + }, + "babel-preset-jest": { + "version": "27.5.1", + "dev": true, + "requires": { + "babel-plugin-jest-hoist": "^27.5.1", + "babel-preset-current-node-syntax": "^1.0.0" + } + }, + "balanced-match": { + "version": "1.0.2", + "dev": true + }, + "brace-expansion": { + "version": "1.1.11", + "dev": true, + "requires": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "braces": { + "version": "3.0.2", + "dev": true, + "requires": { + "fill-range": "^7.0.1" + } + }, + "browser-process-hrtime": { + "version": "1.0.0", + "dev": true + }, + "browserslist": { + "version": "4.20.2", + "dev": true, + "requires": { + "caniuse-lite": "^1.0.30001317", + "electron-to-chromium": "^1.4.84", + "escalade": "^3.1.1", + "node-releases": "^2.0.2", + "picocolors": "^1.0.0" + } + }, + "bs-logger": { + "version": "0.2.6", + "dev": true, + "requires": { + "fast-json-stable-stringify": "2.x" + } + }, + "bser": { + "version": "2.1.1", + "dev": true, + "requires": { + "node-int64": "^0.4.0" + } + }, + "buffer-from": { + "version": "1.1.2", + "dev": true + }, + "callsites": { + "version": "3.1.0", + "dev": true + }, + "camelcase": { + "version": "6.3.0", + "dev": true + }, + "caniuse-lite": { + "version": "1.0.30001322", + "dev": true + }, + "chalk": { + "version": "4.1.2", + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "char-regex": { + "version": "1.0.2", + "dev": true + }, + "ci-info": { + "version": "3.3.0", + "dev": true + }, + "cjs-module-lexer": { + "version": "1.2.2", + "dev": true + }, + "cliui": { + "version": "7.0.4", + "requires": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^7.0.0" + } + }, + "co": { + "version": "4.6.0", + "dev": true + }, + "collect-v8-coverage": { + "version": "1.0.1", + "dev": true + }, + "color-convert": { + "version": "2.0.1", + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4" + }, + "combined-stream": { + "version": "1.0.8", + "requires": { + "delayed-stream": "~1.0.0" + } + }, + "concat-map": { + "version": "0.0.1", "dev": true }, - "eslint-config-standard-jsx": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/eslint-config-standard-jsx/-/eslint-config-standard-jsx-10.0.0.tgz", - "integrity": "sha512-hLeA2f5e06W1xyr/93/QJulN/rLbUVUmqTlexv9PRKHFwEC9ffJcH2LvJhMoEqYQBEYafedgGZXH2W8NUpt5lA==", + "convert-source-map": { + "version": "1.8.0", + "dev": true, + "requires": { + "safe-buffer": "~5.1.1" + } + }, + "cross-spawn": { + "version": "7.0.3", + "dev": true, + "requires": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + } + }, + "cssom": { + "version": "0.4.4", "dev": true }, - "eslint-import-resolver-node": { - "version": "0.3.4", - "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz", - "integrity": "sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA==", + "cssstyle": { + "version": "2.3.0", "dev": true, "requires": { - "debug": "^2.6.9", - "resolve": "^1.13.1" + "cssom": "~0.3.6" }, "dependencies": { - "resolve": { - "version": "1.19.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz", - "integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==", - "dev": true, - "requires": { - "is-core-module": "^2.1.0", - "path-parse": "^1.0.6" - } + "cssom": { + "version": "0.3.8", + "dev": true } } }, - "eslint-module-utils": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz", - "integrity": "sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA==", + "data-urls": { + "version": "2.0.0", + "dev": true, + "requires": { + "abab": "^2.0.3", + "whatwg-mimetype": "^2.3.0", + "whatwg-url": "^8.0.0" + } + }, + "debug": { + "version": "4.3.4", "dev": true, "requires": { - "debug": "^2.6.9", - "pkg-dir": "^2.0.0" + "ms": "2.1.2" } }, - "eslint-plugin-es": { + "decimal.js": { + "version": "10.3.1", + "dev": true + }, + "dedent": { + "version": "0.7.0", + "dev": true + }, + "deep-is": { + "version": "0.1.4", + "dev": true + }, + "deepmerge": { + "version": "4.2.2", + "dev": true + }, + "delayed-stream": { + "version": "1.0.0" + }, + "detect-newline": { + "version": "3.1.0", + "dev": true + }, + "diff-sequences": { + "version": "27.5.1", + "dev": true + }, + "dir-glob": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-3.0.1.tgz", - "integrity": "sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ==", "dev": true, "requires": { - "eslint-utils": "^2.0.0", - "regexpp": "^3.0.0" + "path-type": "^4.0.0" } }, - "eslint-plugin-import": { - "version": "2.22.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz", - "integrity": "sha512-8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw==", + "doctrine": { + "version": "3.0.0", "dev": true, "requires": { - "array-includes": "^3.1.1", - "array.prototype.flat": "^1.2.3", - "contains-path": "^0.1.0", - "debug": "^2.6.9", - "doctrine": "1.5.0", - "eslint-import-resolver-node": "^0.3.4", - "eslint-module-utils": "^2.6.0", - "has": "^1.0.3", - "minimatch": "^3.0.4", - "object.values": "^1.1.1", - "read-pkg-up": "^2.0.0", - "resolve": "^1.17.0", - "tsconfig-paths": "^3.9.0" - }, - "dependencies": { - "doctrine": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz", - "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=", - "dev": true, - "requires": { - "esutils": "^2.0.2", - "isarray": "^1.0.0" - } - }, - "resolve": { - "version": "1.19.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz", - "integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==", - "dev": true, - "requires": { - "is-core-module": "^2.1.0", - "path-parse": "^1.0.6" - } - } + "esutils": "^2.0.2" } }, - "eslint-plugin-node": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz", - "integrity": "sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==", + "domexception": { + "version": "2.0.1", "dev": true, "requires": { - "eslint-plugin-es": "^3.0.0", - "eslint-utils": "^2.0.0", - "ignore": "^5.1.1", - "minimatch": "^3.0.4", - "resolve": "^1.10.1", - "semver": "^6.1.0" + "webidl-conversions": "^5.0.0" }, "dependencies": { - "ignore": { - "version": "5.1.8", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz", - "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==", - "dev": true - }, - "resolve": { - "version": "1.19.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz", - "integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==", - "dev": true, - "requires": { - "is-core-module": "^2.1.0", - "path-parse": "^1.0.6" - } - }, - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "webidl-conversions": { + "version": "5.0.0", "dev": true } } }, - "eslint-plugin-promise": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-4.2.1.tgz", - "integrity": "sha512-VoM09vT7bfA7D+upt+FjeBO5eHIJQBUWki1aPvB+vbNiHS3+oGIJGIeyBtKQTME6UPXXy3vV07OL1tHd3ANuDw==", + "duplexer": { + "version": "0.1.2" + }, + "electron-to-chromium": { + "version": "1.4.99", + "dev": true + }, + "emittery": { + "version": "0.8.1", + "dev": true + }, + "emoji-regex": { + "version": "8.0.0" + }, + "error-ex": { + "version": "1.3.2", + "dev": true, + "requires": { + "is-arrayish": "^0.2.1" + } + }, + "escalade": { + "version": "3.1.1" + }, + "escape-string-regexp": { + "version": "1.0.5", "dev": true }, - "eslint-plugin-react": { - "version": "7.21.5", - "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.21.5.tgz", - "integrity": "sha512-8MaEggC2et0wSF6bUeywF7qQ46ER81irOdWS4QWxnnlAEsnzeBevk1sWh7fhpCghPpXb+8Ks7hvaft6L/xsR6g==", + "escodegen": { + "version": "2.0.0", "dev": true, "requires": { - "array-includes": "^3.1.1", - "array.prototype.flatmap": "^1.2.3", - "doctrine": "^2.1.0", - "has": "^1.0.3", - "jsx-ast-utils": "^2.4.1 || ^3.0.0", - "object.entries": "^1.1.2", - "object.fromentries": "^2.0.2", - "object.values": "^1.1.1", - "prop-types": "^15.7.2", - "resolve": "^1.18.1", - "string.prototype.matchall": "^4.0.2" + "esprima": "^4.0.1", + "estraverse": "^5.2.0", + "esutils": "^2.0.2", + "optionator": "^0.8.1", + "source-map": "~0.6.1" }, "dependencies": { - "doctrine": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", - "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", + "levn": { + "version": "0.3.0", "dev": true, "requires": { - "esutils": "^2.0.2" + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2" } }, - "resolve": { - "version": "1.19.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz", - "integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==", + "optionator": { + "version": "0.8.3", "dev": true, "requires": { - "is-core-module": "^2.1.0", - "path-parse": "^1.0.6" + "deep-is": "~0.1.3", + "fast-levenshtein": "~2.0.6", + "levn": "~0.3.0", + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2", + "word-wrap": "~1.2.3" } } } }, - "eslint-scope": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", - "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", + "eslint": { + "version": "8.12.0", "dev": true, "requires": { - "esrecurse": "^4.3.0", - "estraverse": "^4.1.1" + "@eslint/eslintrc": "^1.2.1", + "@humanwhocodes/config-array": "^0.9.2", + "ajv": "^6.10.0", + "chalk": "^4.0.0", + "cross-spawn": "^7.0.2", + "debug": "^4.3.2", + "doctrine": "^3.0.0", + "escape-string-regexp": "^4.0.0", + "eslint-scope": "^7.1.1", + "eslint-utils": "^3.0.0", + "eslint-visitor-keys": "^3.3.0", + "espree": "^9.3.1", + "esquery": "^1.4.0", + "esutils": "^2.0.2", + "fast-deep-equal": "^3.1.3", + "file-entry-cache": "^6.0.1", + "functional-red-black-tree": "^1.0.1", + "glob-parent": "^6.0.1", + "globals": "^13.6.0", + "ignore": "^5.2.0", + "import-fresh": "^3.0.0", + "imurmurhash": "^0.1.4", + "is-glob": "^4.0.0", + "js-yaml": "^4.1.0", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.4.1", + "lodash.merge": "^4.6.2", + "minimatch": "^3.0.4", + "natural-compare": "^1.4.0", + "optionator": "^0.9.1", + "regexpp": "^3.2.0", + "strip-ansi": "^6.0.1", + "strip-json-comments": "^3.1.0", + "text-table": "^0.2.0", + "v8-compile-cache": "^2.0.3" }, "dependencies": { - "estraverse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", - "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "escape-string-regexp": { + "version": "4.0.0", "dev": true } } }, + "eslint-config-prettier": { + "version": "8.5.0", + "dev": true, + "requires": {} + }, + "eslint-plugin-eslint-comments": { + "version": "3.2.0", + "dev": true, + "requires": { + "escape-string-regexp": "^1.0.5", + "ignore": "^5.0.5" + } + }, + "eslint-plugin-jest": { + "version": "26.1.4", + "dev": true, + "requires": { + "@typescript-eslint/utils": "^5.10.0" + } + }, + "eslint-plugin-jest-formatting": { + "version": "3.1.0", + "dev": true, + "requires": {} + }, + "eslint-plugin-simple-import-sort": { + "version": "7.0.0", + "dev": true, + "requires": {} + }, + "eslint-scope": { + "version": "7.1.1", + "dev": true, + "requires": { + "esrecurse": "^4.3.0", + "estraverse": "^5.2.0" + } + }, "eslint-utils": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", - "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", + "version": "3.0.0", "dev": true, "requires": { - "eslint-visitor-keys": "^1.1.0" + "eslint-visitor-keys": "^2.0.0" }, "dependencies": { "eslint-visitor-keys": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", + "version": "2.1.0", "dev": true } } }, "eslint-visitor-keys": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz", - "integrity": "sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==", + "version": "3.3.0", "dev": true }, "espree": { - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz", - "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==", + "version": "9.3.1", "dev": true, "requires": { - "acorn": "^7.4.0", + "acorn": "^8.7.0", "acorn-jsx": "^5.3.1", - "eslint-visitor-keys": "^1.3.0" - }, - "dependencies": { - "eslint-visitor-keys": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", - "dev": true - } + "eslint-visitor-keys": "^3.3.0" } }, "esprima": { - "version": "2.7.3", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", - "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=", + "version": "4.0.1", "dev": true }, "esquery": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.3.1.tgz", - "integrity": "sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==", + "version": "1.4.0", "dev": true, "requires": { "estraverse": "^5.1.0" - }, - "dependencies": { - "estraverse": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", - "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", - "dev": true - } } }, "esrecurse": { "version": "4.3.0", - "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", - "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", "dev": true, "requires": { "estraverse": "^5.2.0" - }, - "dependencies": { - "estraverse": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", - "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", - "dev": true - } } }, "estraverse": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz", - "integrity": "sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=", + "version": "5.3.0", "dev": true }, "esutils": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", - "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", + "version": "2.0.3", "dev": true }, "event-stream": { - "version": "3.3.4", - "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz", - "integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=", + "version": "4.0.1", "requires": { - "duplexer": "~0.1.1", - "from": "~0", - "map-stream": "~0.1.0", - "pause-stream": "0.0.11", - "split": "0.3", - "stream-combiner": "~0.0.4", - "through": "~2.3.1" + "duplexer": "^0.1.1", + "from": "^0.1.7", + "map-stream": "0.0.7", + "pause-stream": "^0.0.11", + "split": "^1.0.1", + "stream-combiner": "^0.2.2", + "through": "^2.3.8" } }, - "extend": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", - "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", - "dev": true + "execa": { + "version": "5.1.1", + "dev": true, + "requires": { + "cross-spawn": "^7.0.3", + "get-stream": "^6.0.0", + "human-signals": "^2.1.0", + "is-stream": "^2.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^4.0.1", + "onetime": "^5.1.2", + "signal-exit": "^3.0.3", + "strip-final-newline": "^2.0.0" + } }, - "extsprintf": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", - "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", + "exit": { + "version": "0.1.2", "dev": true }, + "expect": { + "version": "27.5.1", + "dev": true, + "requires": { + "@jest/types": "^27.5.1", + "jest-get-type": "^27.5.1", + "jest-matcher-utils": "^27.5.1", + "jest-message-util": "^27.5.1" + } + }, "fast-deep-equal": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=" + "version": "3.1.3", + "dev": true + }, + "fast-glob": { + "version": "3.2.11", + "dev": true, + "requires": { + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.2", + "merge2": "^1.3.0", + "micromatch": "^4.0.4" + }, + "dependencies": { + "glob-parent": { + "version": "5.1.2", + "dev": true, + "requires": { + "is-glob": "^4.0.1" + } + } + } }, "fast-json-stable-stringify": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", - "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=" + "version": "2.1.0", + "dev": true }, "fast-levenshtein": { "version": "2.0.6", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", "dev": true }, + "fastq": { + "version": "1.13.0", + "dev": true, + "requires": { + "reusify": "^1.0.4" + } + }, + "fb-watchman": { + "version": "2.0.1", + "dev": true, + "requires": { + "bser": "2.1.1" + } + }, "file-entry-cache": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz", - "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==", + "version": "6.0.1", "dev": true, "requires": { - "flat-cache": "^2.0.1" + "flat-cache": "^3.0.4" } }, "fill-range": { "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", "dev": true, "requires": { "to-regex-range": "^5.0.1" } }, - "find-root": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz", - "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==", - "dev": true - }, "find-up": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", + "version": "4.1.0", "dev": true, "requires": { - "locate-path": "^2.0.0" + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" } }, - "flat": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", - "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==", - "dev": true - }, "flat-cache": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz", - "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==", + "version": "3.0.4", "dev": true, "requires": { - "flatted": "^2.0.0", - "rimraf": "2.6.3", - "write": "1.0.3" + "flatted": "^3.1.0", + "rimraf": "^3.0.2" } }, "flatted": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz", - "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==", - "dev": true - }, - "forever-agent": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", - "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", + "version": "3.2.5", "dev": true }, "form-data": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.0.tgz", - "integrity": "sha512-CKMFDglpbMi6PyN+brwB9Q/GOw0eAnsrEZDgcsH5Krhz5Od/haKHAX0NmQfha2zPPz0JpWzA7GJHGSnvCRLWsg==", - "requires": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.8", - "mime-types": "^2.1.12" - }, - "dependencies": { - "combined-stream": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "requires": { - "delayed-stream": "~1.0.0" - } - } - } - }, - "from": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz", - "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=" - }, - "fs-readfile-promise": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/fs-readfile-promise/-/fs-readfile-promise-2.0.1.tgz", - "integrity": "sha1-gAI4I5gfn//+AWCei+Zo9prknnA=", - "requires": { - "graceful-fs": "^4.1.2" - } - }, - "fs-writefile-promise": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/fs-writefile-promise/-/fs-writefile-promise-1.0.3.tgz", - "integrity": "sha1-4C+bWP/CVe2CKtx6ARFPRF1I0GM=", + "version": "4.0.0", "requires": { - "mkdirp-promise": "^1.0.0", - "pinkie-promise": "^1.0.0" - }, - "dependencies": { - "pinkie-promise": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-1.0.0.tgz", - "integrity": "sha1-0dpn9UglY7t89X8oauKCLs+/NnA=", - "requires": { - "pinkie": "^1.0.0" - } - } + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" } }, + "from": { + "version": "0.1.7" + }, "fs.realpath": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", "dev": true }, - "fsevents": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz", - "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==", - "dev": true, - "optional": true - }, "function-bind": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", "dev": true }, "functional-red-black-tree": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", - "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", "dev": true }, - "get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "gensync": { + "version": "1.0.0-beta.2", "dev": true }, - "get-intrinsic": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.0.tgz", - "integrity": "sha512-M11rgtQp5GZMZzDL7jLTNxbDfurpzuau5uqRWDPvlHjfvg3TdScAZo96GLvhMjImrmR8uAt0FS2RLoMrfWGKlg==", - "dev": true, - "requires": { - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.1" - }, - "dependencies": { - "has-symbols": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", - "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", - "dev": true - } - } + "get-caller-file": { + "version": "2.0.5" }, "get-own-enumerable-property-symbols": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.0.tgz", - "integrity": "sha512-CIJYJC4GGF06TakLg8z4GQKvDsx9EMspVxOYih7LerEL/WosUnFIww45CGfxfeKHqlg3twgUrYRT1O3WQqjGCg==" + "version": "3.0.2" }, - "get-stdin": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz", - "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==", + "get-package-type": { + "version": "0.1.0", "dev": true }, - "getpass": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", - "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", - "dev": true, - "requires": { - "assert-plus": "^1.0.0" - } + "get-stream": { + "version": "6.0.1", + "dev": true }, "glob": { - "version": "6.0.4", - "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz", - "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=", + "version": "7.2.0", "dev": true, "requires": { + "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", - "minimatch": "2 || 3", + "minimatch": "^3.0.4", "once": "^1.3.0", "path-is-absolute": "^1.0.0" } }, "glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "version": "6.0.2", "dev": true, "requires": { - "is-glob": "^4.0.1" + "is-glob": "^4.0.3" } }, "globals": { - "version": "12.4.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz", - "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==", - "dev": true, - "requires": { - "type-fest": "^0.8.1" - } - }, - "graceful-fs": { - "version": "4.1.15", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz", - "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==" - }, - "graceful-readlink": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz", - "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=", - "dev": true - }, - "growl": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz", - "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==", - "dev": true - }, - "handlebars": { - "version": "4.7.7", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz", - "integrity": "sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==", + "version": "13.13.0", "dev": true, "requires": { - "minimist": "^1.2.5", - "neo-async": "^2.6.0", - "source-map": "^0.6.1", - "uglify-js": "^3.1.4", - "wordwrap": "^1.0.0" + "type-fest": "^0.20.2" }, "dependencies": { - "minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", - "dev": true - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "type-fest": { + "version": "0.20.2", "dev": true } } }, - "har-schema": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", - "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=" - }, - "har-validator": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz", - "integrity": "sha1-HvievT5JllV2de7ZiTEQ3DUPoIA=", + "globby": { + "version": "11.1.0", + "dev": true, "requires": { - "ajv": "^6.5.5", - "har-schema": "^2.0.0" + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.2.9", + "ignore": "^5.2.0", + "merge2": "^1.4.1", + "slash": "^3.0.0" } }, + "graceful-fs": { + "version": "4.2.9", + "dev": true + }, + "har-schema": { + "version": "2.0.0" + }, "has": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", "dev": true, "requires": { "function-bind": "^1.1.1" } }, - "has-ansi": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", - "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", + "has-flag": { + "version": "4.0.0" + }, + "html-encoding-sniffer": { + "version": "2.0.1", + "dev": true, "requires": { - "ansi-regex": "^2.0.0" + "whatwg-encoding": "^1.0.5" } }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", + "html-escaper": { + "version": "2.0.2", "dev": true }, - "has-symbols": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz", - "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=", - "dev": true + "http-proxy-agent": { + "version": "4.0.1", + "dev": true, + "requires": { + "@tootallnate/once": "1", + "agent-base": "6", + "debug": "4" + } }, - "he": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", - "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", - "dev": true + "https-proxy-agent": { + "version": "5.0.0", + "dev": true, + "requires": { + "agent-base": "6", + "debug": "4" + } }, - "hosted-git-info": { - "version": "2.8.9", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", - "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==", + "human-signals": { + "version": "2.1.0", "dev": true }, - "http-signature": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", - "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", + "iconv-lite": { + "version": "0.4.24", "dev": true, "requires": { - "assert-plus": "^1.0.0", - "jsprim": "^1.2.2", - "sshpk": "^1.7.0" + "safer-buffer": ">= 2.1.2 < 3" } }, "ignore": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", - "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", + "version": "5.2.0", "dev": true }, "import-fresh": { "version": "3.3.0", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", - "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", "dev": true, "requires": { "parent-module": "^1.0.0", "resolve-from": "^4.0.0" + }, + "dependencies": { + "resolve-from": { + "version": "4.0.0", + "dev": true + } + } + }, + "import-local": { + "version": "3.1.0", + "dev": true, + "requires": { + "pkg-dir": "^4.2.0", + "resolve-cwd": "^3.0.0" } }, "imurmurhash": { "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", "dev": true }, "inflight": { "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "dev": true, "requires": { "once": "^1.3.0", @@ -1692,1306 +6791,1066 @@ } }, "inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true - }, - "ini": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", - "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", + "version": "2.0.4", "dev": true }, - "internal-slot": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz", - "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==", - "dev": true, - "requires": { - "get-intrinsic": "^1.1.0", - "has": "^1.0.3", - "side-channel": "^1.0.4" - } - }, "is-arrayish": { "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", - "dev": true - }, - "is-binary-path": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", - "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", - "dev": true, - "requires": { - "binary-extensions": "^2.0.0" - } - }, - "is-callable": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz", - "integrity": "sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==", "dev": true }, "is-core-module": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz", - "integrity": "sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==", + "version": "2.8.1", "dev": true, "requires": { "has": "^1.0.3" } }, - "is-date-object": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz", - "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=", - "dev": true - }, "is-extglob": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", "dev": true }, "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "version": "3.0.0" + }, + "is-generator-fn": { + "version": "2.1.0", "dev": true }, "is-glob": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", - "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", + "version": "4.0.3", "dev": true, "requires": { "is-extglob": "^2.1.1" } }, - "is-negative-zero": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz", - "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==", - "dev": true - }, "is-number": { "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", "dev": true }, "is-obj": { + "version": "1.0.1" + }, + "is-potential-custom-element-name": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", - "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=" + "dev": true }, - "is-plain-obj": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", - "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==", + "is-regexp": { + "version": "1.0.0" + }, + "is-stream": { + "version": "2.0.1", "dev": true }, - "is-regex": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz", - "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==", + "is-typedarray": { + "version": "1.0.0", + "dev": true + }, + "isexe": { + "version": "2.0.0", + "dev": true + }, + "istanbul-lib-coverage": { + "version": "3.2.0", + "dev": true + }, + "istanbul-lib-instrument": { + "version": "5.1.0", "dev": true, "requires": { - "has-symbols": "^1.0.1" - }, - "dependencies": { - "has-symbols": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", - "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", - "dev": true - } + "@babel/core": "^7.12.3", + "@babel/parser": "^7.14.7", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-coverage": "^3.2.0", + "semver": "^6.3.0" } }, - "is-regexp": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz", - "integrity": "sha1-/S2INUXEa6xaYz57mgnof6LLUGk=" - }, - "is-string": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz", - "integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==", - "dev": true + "istanbul-lib-report": { + "version": "3.0.0", + "dev": true, + "requires": { + "istanbul-lib-coverage": "^3.0.0", + "make-dir": "^3.0.0", + "supports-color": "^7.1.0" + } }, - "is-symbol": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz", - "integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==", + "istanbul-lib-source-maps": { + "version": "4.0.1", "dev": true, "requires": { - "has-symbols": "^1.0.0" + "debug": "^4.1.1", + "istanbul-lib-coverage": "^3.0.0", + "source-map": "^0.6.1" } }, - "is-typedarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", - "dev": true + "istanbul-reports": { + "version": "3.1.4", + "dev": true, + "requires": { + "html-escaper": "^2.0.0", + "istanbul-lib-report": "^3.0.0" + } }, - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true + "jest": { + "version": "27.5.1", + "dev": true, + "requires": { + "@jest/core": "^27.5.1", + "import-local": "^3.0.2", + "jest-cli": "^27.5.1" + } }, - "isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", - "dev": true + "jest-changed-files": { + "version": "27.5.1", + "dev": true, + "requires": { + "@jest/types": "^27.5.1", + "execa": "^5.0.0", + "throat": "^6.0.1" + } }, - "isstream": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", - "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", - "dev": true - }, - "istanbul": { - "version": "0.4.5", - "resolved": "https://registry.npmjs.org/istanbul/-/istanbul-0.4.5.tgz", - "integrity": "sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs=", - "dev": true, - "requires": { - "abbrev": "1.0.x", - "async": "1.x", - "escodegen": "1.8.x", - "esprima": "2.7.x", - "glob": "^5.0.15", - "handlebars": "^4.0.1", - "js-yaml": "3.x", - "mkdirp": "0.5.x", - "nopt": "3.x", - "once": "1.x", - "resolve": "1.1.x", - "supports-color": "^3.1.0", - "which": "^1.1.1", - "wordwrap": "^1.0.0" - }, - "dependencies": { - "async": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", - "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", + "jest-circus": { + "version": "27.5.1", + "dev": true, + "requires": { + "@jest/environment": "^27.5.1", + "@jest/test-result": "^27.5.1", + "@jest/types": "^27.5.1", + "@types/node": "*", + "chalk": "^4.0.0", + "co": "^4.6.0", + "dedent": "^0.7.0", + "expect": "^27.5.1", + "is-generator-fn": "^2.0.0", + "jest-each": "^27.5.1", + "jest-matcher-utils": "^27.5.1", + "jest-message-util": "^27.5.1", + "jest-runtime": "^27.5.1", + "jest-snapshot": "^27.5.1", + "jest-util": "^27.5.1", + "pretty-format": "^27.5.1", + "slash": "^3.0.0", + "stack-utils": "^2.0.3", + "throat": "^6.0.1" + }, + "dependencies": { + "@types/node": { + "version": "17.0.23", "dev": true - }, - "glob": { - "version": "5.0.15", - "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", - "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", - "dev": true, - "requires": { - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "2 || 3", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + } + } + }, + "jest-cli": { + "version": "27.5.1", + "dev": true, + "requires": { + "@jest/core": "^27.5.1", + "@jest/test-result": "^27.5.1", + "@jest/types": "^27.5.1", + "chalk": "^4.0.0", + "exit": "^0.1.2", + "graceful-fs": "^4.2.9", + "import-local": "^3.0.2", + "jest-config": "^27.5.1", + "jest-util": "^27.5.1", + "jest-validate": "^27.5.1", + "prompts": "^2.0.1", + "yargs": "^16.2.0" + }, + "dependencies": { + "yargs": { + "version": "16.2.0", "dev": true, "requires": { - "has-flag": "^1.0.0" + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.0", + "y18n": "^5.0.5", + "yargs-parser": "^20.2.2" } } } }, - "js-tokens": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", - "dev": true + "jest-config": { + "version": "27.5.1", + "dev": true, + "requires": { + "@babel/core": "^7.8.0", + "@jest/test-sequencer": "^27.5.1", + "@jest/types": "^27.5.1", + "babel-jest": "^27.5.1", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "deepmerge": "^4.2.2", + "glob": "^7.1.1", + "graceful-fs": "^4.2.9", + "jest-circus": "^27.5.1", + "jest-environment-jsdom": "^27.5.1", + "jest-environment-node": "^27.5.1", + "jest-get-type": "^27.5.1", + "jest-jasmine2": "^27.5.1", + "jest-regex-util": "^27.5.1", + "jest-resolve": "^27.5.1", + "jest-runner": "^27.5.1", + "jest-util": "^27.5.1", + "jest-validate": "^27.5.1", + "micromatch": "^4.0.4", + "parse-json": "^5.2.0", + "pretty-format": "^27.5.1", + "slash": "^3.0.0", + "strip-json-comments": "^3.1.1" + } }, - "js-yaml": { - "version": "3.13.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", - "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==", + "jest-diff": { + "version": "27.5.1", "dev": true, "requires": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" + "chalk": "^4.0.0", + "diff-sequences": "^27.5.1", + "jest-get-type": "^27.5.1", + "pretty-format": "^27.5.1" + } + }, + "jest-docblock": { + "version": "27.5.1", + "dev": true, + "requires": { + "detect-newline": "^3.0.0" + } + }, + "jest-each": { + "version": "27.5.1", + "dev": true, + "requires": { + "@jest/types": "^27.5.1", + "chalk": "^4.0.0", + "jest-get-type": "^27.5.1", + "jest-util": "^27.5.1", + "pretty-format": "^27.5.1" + } + }, + "jest-environment-jsdom": { + "version": "27.5.1", + "dev": true, + "requires": { + "@jest/environment": "^27.5.1", + "@jest/fake-timers": "^27.5.1", + "@jest/types": "^27.5.1", + "@types/node": "*", + "jest-mock": "^27.5.1", + "jest-util": "^27.5.1", + "jsdom": "^16.6.0" }, "dependencies": { - "esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "@types/node": { + "version": "17.0.23", "dev": true } } }, - "jsbn": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", - "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", - "dev": true - }, - "json-parse-better-errors": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", - "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==", - "dev": true + "jest-environment-node": { + "version": "27.5.1", + "dev": true, + "requires": { + "@jest/environment": "^27.5.1", + "@jest/fake-timers": "^27.5.1", + "@jest/types": "^27.5.1", + "@types/node": "*", + "jest-mock": "^27.5.1", + "jest-util": "^27.5.1" + }, + "dependencies": { + "@types/node": { + "version": "17.0.23", + "dev": true + } + } }, - "json-schema": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", - "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=", + "jest-get-type": { + "version": "27.5.1", "dev": true }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" + "jest-haste-map": { + "version": "27.5.1", + "dev": true, + "requires": { + "@jest/types": "^27.5.1", + "@types/graceful-fs": "^4.1.2", + "@types/node": "*", + "anymatch": "^3.0.3", + "fb-watchman": "^2.0.0", + "fsevents": "^2.3.2", + "graceful-fs": "^4.2.9", + "jest-regex-util": "^27.5.1", + "jest-serializer": "^27.5.1", + "jest-util": "^27.5.1", + "jest-worker": "^27.5.1", + "micromatch": "^4.0.4", + "walker": "^1.0.7" + }, + "dependencies": { + "@types/node": { + "version": "17.0.23", + "dev": true + } + } }, - "json-stable-stringify-without-jsonify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", - "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=", - "dev": true + "jest-jasmine2": { + "version": "27.5.1", + "dev": true, + "requires": { + "@jest/environment": "^27.5.1", + "@jest/source-map": "^27.5.1", + "@jest/test-result": "^27.5.1", + "@jest/types": "^27.5.1", + "@types/node": "*", + "chalk": "^4.0.0", + "co": "^4.6.0", + "expect": "^27.5.1", + "is-generator-fn": "^2.0.0", + "jest-each": "^27.5.1", + "jest-matcher-utils": "^27.5.1", + "jest-message-util": "^27.5.1", + "jest-runtime": "^27.5.1", + "jest-snapshot": "^27.5.1", + "jest-util": "^27.5.1", + "pretty-format": "^27.5.1", + "throat": "^6.0.1" + }, + "dependencies": { + "@types/node": { + "version": "17.0.23", + "dev": true + } + } }, - "json-stringify-safe": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", - "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", - "dev": true + "jest-leak-detector": { + "version": "27.5.1", + "dev": true, + "requires": { + "jest-get-type": "^27.5.1", + "pretty-format": "^27.5.1" + } }, - "json5": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", - "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", + "jest-matcher-utils": { + "version": "27.5.1", "dev": true, "requires": { - "minimist": "^1.2.0" + "chalk": "^4.0.0", + "jest-diff": "^27.5.1", + "jest-get-type": "^27.5.1", + "pretty-format": "^27.5.1" } }, - "jsprim": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", - "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", + "jest-message-util": { + "version": "27.5.1", "dev": true, "requires": { - "assert-plus": "1.0.0", - "extsprintf": "1.3.0", - "json-schema": "0.2.3", - "verror": "1.10.0" + "@babel/code-frame": "^7.12.13", + "@jest/types": "^27.5.1", + "@types/stack-utils": "^2.0.0", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.9", + "micromatch": "^4.0.4", + "pretty-format": "^27.5.1", + "slash": "^3.0.0", + "stack-utils": "^2.0.3" } }, - "jsx-ast-utils": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.2.0.tgz", - "integrity": "sha512-EIsmt3O3ljsU6sot/J4E1zDRxfBNrhjyf/OKjlydwgEimQuznlM4Wv7U+ueONJMyEn1WRE0K8dhi3dVAXYT24Q==", + "jest-mock": { + "version": "27.5.1", "dev": true, "requires": { - "array-includes": "^3.1.2", - "object.assign": "^4.1.2" + "@jest/types": "^27.5.1", + "@types/node": "*" }, "dependencies": { - "has-symbols": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", - "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", + "@types/node": { + "version": "17.0.23", "dev": true - }, - "object.assign": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz", - "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==", - "dev": true, - "requires": { - "call-bind": "^1.0.0", - "define-properties": "^1.1.3", - "has-symbols": "^1.0.1", - "object-keys": "^1.1.1" - } } } }, - "lcov-parse": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/lcov-parse/-/lcov-parse-0.0.10.tgz", - "integrity": "sha1-GwuP+ayceIklBYK3C3ExXZ2m2aM=", + "jest-pnp-resolver": { + "version": "1.2.2", + "dev": true, + "requires": {} + }, + "jest-regex-util": { + "version": "27.5.1", "dev": true }, - "levn": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", - "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", + "jest-resolve": { + "version": "27.5.1", "dev": true, "requires": { - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2" + "@jest/types": "^27.5.1", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^27.5.1", + "jest-pnp-resolver": "^1.2.2", + "jest-util": "^27.5.1", + "jest-validate": "^27.5.1", + "resolve": "^1.20.0", + "resolve.exports": "^1.1.0", + "slash": "^3.0.0" } }, - "lintspaces": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/lintspaces/-/lintspaces-0.6.3.tgz", - "integrity": "sha512-nUwq/jK+gUhpILtV9Ms2cuF16LB9a8nnecowSQD5LRNX3+h1Bl1zIvPZNQgJYeK9xxuoR+HuWnjagQsvyJbS4w==", + "jest-resolve-dependencies": { + "version": "27.5.1", "dev": true, "requires": { - "deep-extend": "^0.6.0", - "editorconfig": "^0.15.0", - "rc": "^1.2.8" + "@jest/types": "^27.5.1", + "jest-regex-util": "^27.5.1", + "jest-snapshot": "^27.5.1" } }, - "load-json-file": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", - "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", + "jest-runner": { + "version": "27.5.1", "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "parse-json": "^2.2.0", - "pify": "^2.0.0", - "strip-bom": "^3.0.0" + "@jest/console": "^27.5.1", + "@jest/environment": "^27.5.1", + "@jest/test-result": "^27.5.1", + "@jest/transform": "^27.5.1", + "@jest/types": "^27.5.1", + "@types/node": "*", + "chalk": "^4.0.0", + "emittery": "^0.8.1", + "graceful-fs": "^4.2.9", + "jest-docblock": "^27.5.1", + "jest-environment-jsdom": "^27.5.1", + "jest-environment-node": "^27.5.1", + "jest-haste-map": "^27.5.1", + "jest-leak-detector": "^27.5.1", + "jest-message-util": "^27.5.1", + "jest-resolve": "^27.5.1", + "jest-runtime": "^27.5.1", + "jest-util": "^27.5.1", + "jest-worker": "^27.5.1", + "source-map-support": "^0.5.6", + "throat": "^6.0.1" + }, + "dependencies": { + "@types/node": { + "version": "17.0.23", + "dev": true + } } }, - "locate-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", - "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", + "jest-runtime": { + "version": "27.5.1", "dev": true, "requires": { - "p-locate": "^2.0.0", - "path-exists": "^3.0.0" + "@jest/environment": "^27.5.1", + "@jest/fake-timers": "^27.5.1", + "@jest/globals": "^27.5.1", + "@jest/source-map": "^27.5.1", + "@jest/test-result": "^27.5.1", + "@jest/transform": "^27.5.1", + "@jest/types": "^27.5.1", + "chalk": "^4.0.0", + "cjs-module-lexer": "^1.0.0", + "collect-v8-coverage": "^1.0.0", + "execa": "^5.0.0", + "glob": "^7.1.3", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^27.5.1", + "jest-message-util": "^27.5.1", + "jest-mock": "^27.5.1", + "jest-regex-util": "^27.5.1", + "jest-resolve": "^27.5.1", + "jest-snapshot": "^27.5.1", + "jest-util": "^27.5.1", + "slash": "^3.0.0", + "strip-bom": "^4.0.0" } }, - "lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "dev": true - }, - "log-symbols": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.0.0.tgz", - "integrity": "sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==", + "jest-serializer": { + "version": "27.5.1", "dev": true, "requires": { - "chalk": "^4.0.0" + "@types/node": "*", + "graceful-fs": "^4.2.9" }, "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", - "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "@types/node": { + "version": "17.0.23", "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } } } }, - "loose-envify": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", - "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", + "jest-snapshot": { + "version": "27.5.1", "dev": true, "requires": { - "js-tokens": "^3.0.0 || ^4.0.0" + "@babel/core": "^7.7.2", + "@babel/generator": "^7.7.2", + "@babel/plugin-syntax-typescript": "^7.7.2", + "@babel/traverse": "^7.7.2", + "@babel/types": "^7.0.0", + "@jest/transform": "^27.5.1", + "@jest/types": "^27.5.1", + "@types/babel__traverse": "^7.0.4", + "@types/prettier": "^2.1.5", + "babel-preset-current-node-syntax": "^1.0.0", + "chalk": "^4.0.0", + "expect": "^27.5.1", + "graceful-fs": "^4.2.9", + "jest-diff": "^27.5.1", + "jest-get-type": "^27.5.1", + "jest-haste-map": "^27.5.1", + "jest-matcher-utils": "^27.5.1", + "jest-message-util": "^27.5.1", + "jest-util": "^27.5.1", + "natural-compare": "^1.4.0", + "pretty-format": "^27.5.1", + "semver": "^7.3.2" + }, + "dependencies": { + "semver": { + "version": "7.3.5", + "dev": true, + "requires": { + "lru-cache": "^6.0.0" + } + } } }, - "lru-cache": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", - "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", + "jest-util": { + "version": "27.5.1", "dev": true, "requires": { - "pseudomap": "^1.0.2", - "yallist": "^2.1.2" - } - }, - "map-stream": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz", - "integrity": "sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=" - }, - "mime-db": { - "version": "1.40.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz", - "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==" - }, - "mime-types": { - "version": "2.1.24", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz", - "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==", - "requires": { - "mime-db": "1.40.0" + "@jest/types": "^27.5.1", + "@types/node": "*", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "graceful-fs": "^4.2.9", + "picomatch": "^2.2.3" + }, + "dependencies": { + "@types/node": { + "version": "17.0.23", + "dev": true + } } }, - "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "jest-validate": { + "version": "27.5.1", "dev": true, "requires": { - "brace-expansion": "^1.1.7" + "@jest/types": "^27.5.1", + "camelcase": "^6.2.0", + "chalk": "^4.0.0", + "jest-get-type": "^27.5.1", + "leven": "^3.1.0", + "pretty-format": "^27.5.1" } }, - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true - }, - "mkdirp": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "jest-watcher": { + "version": "27.5.1", "dev": true, "requires": { - "minimist": "0.0.8" + "@jest/test-result": "^27.5.1", + "@jest/types": "^27.5.1", + "@types/node": "*", + "ansi-escapes": "^4.2.1", + "chalk": "^4.0.0", + "jest-util": "^27.5.1", + "string-length": "^4.0.1" }, "dependencies": { - "minimist": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", + "@types/node": { + "version": "17.0.23", "dev": true } } }, - "mkdirp-promise": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/mkdirp-promise/-/mkdirp-promise-1.1.0.tgz", - "integrity": "sha1-LISJPtZ24NmPsY+5piEv0bK5qBk=" - }, - "mocha": { - "version": "8.2.1", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-8.2.1.tgz", - "integrity": "sha512-cuLBVfyFfFqbNR0uUKbDGXKGk+UDFe6aR4os78XIrMQpZl/nv7JYHcvP5MFIAb374b2zFXsdgEGwmzMtP0Xg8w==", - "dev": true, - "requires": { - "@ungap/promise-all-settled": "1.1.2", - "ansi-colors": "4.1.1", - "browser-stdout": "1.3.1", - "chokidar": "3.4.3", - "debug": "4.2.0", - "diff": "4.0.2", - "escape-string-regexp": "4.0.0", - "find-up": "5.0.0", - "glob": "7.1.6", - "growl": "1.10.5", - "he": "1.2.0", - "js-yaml": "3.14.0", - "log-symbols": "4.0.0", - "minimatch": "3.0.4", - "ms": "2.1.2", - "nanoid": "3.1.12", - "serialize-javascript": "5.0.1", - "strip-json-comments": "3.1.1", - "supports-color": "7.2.0", - "which": "2.0.2", - "wide-align": "1.1.3", - "workerpool": "6.0.2", - "yargs": "13.3.2", - "yargs-parser": "13.1.2", - "yargs-unparser": "2.0.0" - }, - "dependencies": { - "debug": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", - "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", - "dev": true, - "requires": { - "ms": "2.1.2" - } - }, - "escape-string-regexp": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", - "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", - "dev": true - }, - "esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "dev": true - }, - "find-up": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", - "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", - "dev": true, - "requires": { - "locate-path": "^6.0.0", - "path-exists": "^4.0.0" - } - }, - "glob": { - "version": "7.1.6", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", - "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "js-yaml": { - "version": "3.14.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz", - "integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==", - "dev": true, - "requires": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - } - }, - "locate-path": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", - "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", - "dev": true, - "requires": { - "p-locate": "^5.0.0" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, - "p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "dev": true, - "requires": { - "yocto-queue": "^0.1.0" - } - }, - "p-locate": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", - "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", - "dev": true, - "requires": { - "p-limit": "^3.0.2" - } - }, - "path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true - }, - "strip-json-comments": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", - "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "jest-worker": { + "version": "27.5.1", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^2.0.0", + "supports-color": "^8.0.0" + }, + "dependencies": { + "@types/node": { + "version": "17.0.23", "dev": true }, "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "version": "8.1.1", "dev": true, "requires": { "has-flag": "^4.0.0" } - }, - "which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + } + } + }, + "js-tokens": { + "version": "4.0.0", + "dev": true + }, + "js-yaml": { + "version": "4.1.0", + "dev": true, + "requires": { + "argparse": "^2.0.1" + } + }, + "jsdom": { + "version": "16.7.0", + "dev": true, + "requires": { + "abab": "^2.0.5", + "acorn": "^8.2.4", + "acorn-globals": "^6.0.0", + "cssom": "^0.4.4", + "cssstyle": "^2.3.0", + "data-urls": "^2.0.0", + "decimal.js": "^10.2.1", + "domexception": "^2.0.1", + "escodegen": "^2.0.0", + "form-data": "^3.0.0", + "html-encoding-sniffer": "^2.0.1", + "http-proxy-agent": "^4.0.1", + "https-proxy-agent": "^5.0.0", + "is-potential-custom-element-name": "^1.0.1", + "nwsapi": "^2.2.0", + "parse5": "6.0.1", + "saxes": "^5.0.1", + "symbol-tree": "^3.2.4", + "tough-cookie": "^4.0.0", + "w3c-hr-time": "^1.0.2", + "w3c-xmlserializer": "^2.0.0", + "webidl-conversions": "^6.1.0", + "whatwg-encoding": "^1.0.5", + "whatwg-mimetype": "^2.3.0", + "whatwg-url": "^8.5.0", + "ws": "^7.4.6", + "xml-name-validator": "^3.0.0" + }, + "dependencies": { + "form-data": { + "version": "3.0.1", "dev": true, "requires": { - "isexe": "^2.0.0" + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" } } } }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + "jsesc": { + "version": "2.5.2", + "dev": true }, - "nanoid": { - "version": "3.1.12", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.12.tgz", - "integrity": "sha512-1qstj9z5+x491jfiC4Nelk+f8XBad7LN20PmyWINJEMRSf3wcAjAWysw1qaA8z6NSKe2sjq1hRSDpBH5paCb6A==", + "json-parse-even-better-errors": { + "version": "2.3.1", "dev": true }, - "natural-compare": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", + "json-schema-traverse": { + "version": "0.4.1", "dev": true }, - "neo-async": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.0.tgz", - "integrity": "sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==", + "json-stable-stringify-without-jsonify": { + "version": "1.0.1", "dev": true }, - "nopt": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", - "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", - "dev": true, - "requires": { - "abbrev": "1" - } + "json5": { + "version": "2.2.1", + "dev": true + }, + "kleur": { + "version": "3.0.3", + "dev": true + }, + "leven": { + "version": "3.1.0", + "dev": true }, - "normalize-package-data": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", - "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", + "levn": { + "version": "0.4.1", "dev": true, "requires": { - "hosted-git-info": "^2.1.4", - "resolve": "^1.10.0", - "semver": "2 || 3 || 4 || 5", - "validate-npm-package-license": "^3.0.1" + "prelude-ls": "^1.2.1", + "type-check": "~0.4.0" }, "dependencies": { - "resolve": { - "version": "1.19.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz", - "integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==", + "prelude-ls": { + "version": "1.2.1", + "dev": true + }, + "type-check": { + "version": "0.4.0", "dev": true, "requires": { - "is-core-module": "^2.1.0", - "path-parse": "^1.0.6" + "prelude-ls": "^1.2.1" } - }, - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true } } }, - "normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "lines-and-columns": { + "version": "1.2.4", "dev": true }, - "oauth-sign": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", - "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==", + "locate-path": { + "version": "5.0.0", + "dev": true, + "requires": { + "p-locate": "^4.1.0" + } + }, + "lodash": { + "version": "4.17.21", "dev": true }, - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", + "lodash.memoize": { + "version": "4.1.2", "dev": true }, - "object-keys": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", - "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", + "lodash.merge": { + "version": "4.6.2", "dev": true }, - "object.entries": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.3.tgz", - "integrity": "sha512-ym7h7OZebNS96hn5IJeyUmaWhaSM4SVtAPPfNLQEI2MYWCO2egsITb9nab2+i/Pwibx+R0mtn+ltKJXRSeTMGg==", + "lru-cache": { + "version": "6.0.0", "dev": true, "requires": { - "call-bind": "^1.0.0", - "define-properties": "^1.1.3", - "es-abstract": "^1.18.0-next.1", - "has": "^1.0.3" + "yallist": "^4.0.0" } }, - "object.fromentries": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.3.tgz", - "integrity": "sha512-IDUSMXs6LOSJBWE++L0lzIbSqHl9KDCfff2x/JSEIDtEUavUnyMYC2ZGay/04Zq4UT8lvd4xNhU4/YHKibAOlw==", + "make-dir": { + "version": "3.1.0", "dev": true, "requires": { - "call-bind": "^1.0.0", - "define-properties": "^1.1.3", - "es-abstract": "^1.18.0-next.1", - "has": "^1.0.3" + "semver": "^6.0.0" + } + }, + "make-error": { + "version": "1.3.6", + "dev": true + }, + "makeerror": { + "version": "1.0.12", + "dev": true, + "requires": { + "tmpl": "1.0.5" + } + }, + "map-stream": { + "version": "0.0.7" + }, + "merge-stream": { + "version": "2.0.0", + "dev": true + }, + "merge2": { + "version": "1.4.1", + "dev": true + }, + "micromatch": { + "version": "4.0.5", + "dev": true, + "requires": { + "braces": "^3.0.2", + "picomatch": "^2.3.1" + } + }, + "mime-db": { + "version": "1.52.0" + }, + "mime-types": { + "version": "2.1.35", + "requires": { + "mime-db": "1.52.0" + } + }, + "mimic-fn": { + "version": "2.1.0", + "dev": true + }, + "minimatch": { + "version": "3.1.2", + "dev": true, + "requires": { + "brace-expansion": "^1.1.7" } }, - "object.values": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.2.tgz", - "integrity": "sha512-MYC0jvJopr8EK6dPBiO8Nb9mvjdypOachO5REGk6MXzujbBrAisKo3HmdEI6kZDL6fC31Mwee/5YbtMebixeag==", + "ms": { + "version": "2.1.2", + "dev": true + }, + "natural-compare": { + "version": "1.4.0", + "dev": true + }, + "node-int64": { + "version": "0.4.0", + "dev": true + }, + "node-releases": { + "version": "2.0.2", + "dev": true + }, + "normalize-path": { + "version": "3.0.0", + "dev": true + }, + "npm-run-path": { + "version": "4.0.1", "dev": true, "requires": { - "call-bind": "^1.0.0", - "define-properties": "^1.1.3", - "es-abstract": "^1.18.0-next.1", - "has": "^1.0.3" + "path-key": "^3.0.0" } }, + "nwsapi": { + "version": "2.2.0", + "dev": true + }, "once": { "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, "requires": { "wrappy": "1" } }, + "onetime": { + "version": "5.1.2", + "dev": true, + "requires": { + "mimic-fn": "^2.1.0" + } + }, "optionator": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz", - "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", + "version": "0.9.1", "dev": true, "requires": { - "deep-is": "~0.1.3", - "fast-levenshtein": "~2.0.4", - "levn": "~0.3.0", - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2", - "wordwrap": "~1.0.0" + "deep-is": "^0.1.3", + "fast-levenshtein": "^2.0.6", + "levn": "^0.4.1", + "prelude-ls": "^1.2.1", + "type-check": "^0.4.0", + "word-wrap": "^1.2.3" + }, + "dependencies": { + "prelude-ls": { + "version": "1.2.1", + "dev": true + }, + "type-check": { + "version": "0.4.0", + "dev": true, + "requires": { + "prelude-ls": "^1.2.1" + } + } } }, "p-limit": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", - "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", + "version": "2.3.0", "dev": true, "requires": { - "p-try": "^1.0.0" + "p-try": "^2.0.0" } }, "p-locate": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", - "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", + "version": "4.1.0", "dev": true, "requires": { - "p-limit": "^1.1.0" + "p-limit": "^2.2.0" } }, "p-try": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", - "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", + "version": "2.2.0", "dev": true }, "parent-module": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", - "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", "dev": true, "requires": { "callsites": "^3.0.0" } }, "parse-json": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", - "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", + "version": "5.2.0", "dev": true, "requires": { - "error-ex": "^1.2.0" + "@babel/code-frame": "^7.0.0", + "error-ex": "^1.3.1", + "json-parse-even-better-errors": "^2.3.0", + "lines-and-columns": "^1.1.6" } }, + "parse5": { + "version": "6.0.1", + "dev": true + }, "path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "version": "4.0.0", "dev": true }, "path-is-absolute": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", "dev": true }, "path-key": { "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", "dev": true }, "path-parse": { "version": "1.0.7", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", - "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", "dev": true }, "path-type": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz", - "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", - "dev": true, - "requires": { - "pify": "^2.0.0" - } + "version": "4.0.0", + "dev": true }, "pause-stream": { "version": "0.0.11", - "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz", - "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=", "requires": { "through": "~2.3" } }, - "performance-now": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", - "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", + "picocolors": { + "version": "1.0.0", "dev": true }, "picomatch": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", - "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==", + "version": "2.3.1", "dev": true }, - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "pirates": { + "version": "4.0.5", "dev": true }, - "pinkie": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-1.0.0.tgz", - "integrity": "sha1-Wkfyi6EBXQIBvae/DzWOR77Ix+Q=" - }, - "pkg-conf": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/pkg-conf/-/pkg-conf-3.1.0.tgz", - "integrity": "sha512-m0OTbR/5VPNPqO1ph6Fqbj7Hv6QU7gR/tQW40ZqrL1rjgCU85W6C1bJn0BItuJqnR98PWzw7Z8hHeChD1WrgdQ==", - "dev": true, - "requires": { - "find-up": "^3.0.0", - "load-json-file": "^5.2.0" - }, - "dependencies": { - "find-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", - "dev": true, - "requires": { - "locate-path": "^3.0.0" - } - }, - "load-json-file": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-5.3.0.tgz", - "integrity": "sha512-cJGP40Jc/VXUsp8/OrnyKyTZ1y6v/dphm3bioS+RrKXjK2BB6wHUd6JptZEFDGgGahMT+InnZO5i1Ei9mpC8Bw==", - "dev": true, - "requires": { - "graceful-fs": "^4.1.15", - "parse-json": "^4.0.0", - "pify": "^4.0.1", - "strip-bom": "^3.0.0", - "type-fest": "^0.3.0" - } - }, - "locate-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", - "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", - "dev": true, - "requires": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" - } - }, - "p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "requires": { - "p-try": "^2.0.0" - } - }, - "p-locate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", - "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", - "dev": true, - "requires": { - "p-limit": "^2.0.0" - } - }, - "p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "dev": true - }, - "parse-json": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", - "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", - "dev": true, - "requires": { - "error-ex": "^1.3.1", - "json-parse-better-errors": "^1.0.1" - } - }, - "pify": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", - "dev": true - }, - "type-fest": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz", - "integrity": "sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==", - "dev": true - } - } - }, - "pkg-config": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/pkg-config/-/pkg-config-1.1.1.tgz", - "integrity": "sha1-VX7yLXPaPIg3EHdmxS6tq94pj+Q=", - "dev": true, - "requires": { - "debug-log": "^1.0.0", - "find-root": "^1.0.0", - "xtend": "^4.0.1" - } - }, "pkg-dir": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz", - "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=", + "version": "4.2.0", "dev": true, "requires": { - "find-up": "^2.1.0" + "find-up": "^4.0.0" } }, "prelude-ls": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", - "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", "dev": true }, - "progress": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", - "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", + "prettier": { + "version": "2.6.2", "dev": true }, - "prop-types": { - "version": "15.7.2", - "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz", - "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==", + "pretty-format": { + "version": "27.5.1", "dev": true, "requires": { - "loose-envify": "^1.4.0", - "object-assign": "^4.1.1", - "react-is": "^16.8.1" + "ansi-regex": "^5.0.1", + "ansi-styles": "^5.0.0", + "react-is": "^17.0.1" + }, + "dependencies": { + "ansi-styles": { + "version": "5.2.0", + "dev": true + } } }, - "pseudomap": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", - "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=", - "dev": true + "prompts": { + "version": "2.4.2", + "dev": true, + "requires": { + "kleur": "^3.0.3", + "sisteransi": "^1.0.5" + } }, "psl": { - "version": "1.1.31", - "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz", - "integrity": "sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw==", + "version": "1.8.0", "dev": true }, "punycode": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" - }, - "qs": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", - "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", "dev": true }, - "randombytes": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", - "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", - "dev": true, - "requires": { - "safe-buffer": "^5.1.0" - } - }, - "rc": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", - "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", - "dev": true, - "requires": { - "deep-extend": "^0.6.0", - "ini": "~1.3.0", - "minimist": "^1.2.0", - "strip-json-comments": "~2.0.1" - } + "queue-microtask": { + "version": "1.2.3", + "dev": true }, "react-is": { - "version": "16.13.1", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", - "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", + "version": "17.0.2", "dev": true }, - "read-pkg": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz", - "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=", - "dev": true, - "requires": { - "load-json-file": "^2.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^2.0.0" - } + "regexpp": { + "version": "3.2.0", + "dev": true }, - "read-pkg-up": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz", - "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=", - "dev": true, - "requires": { - "find-up": "^2.0.0", - "read-pkg": "^2.0.0" - } + "require-directory": { + "version": "2.1.1" }, - "readdirp": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz", - "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==", + "resolve": { + "version": "1.22.0", "dev": true, "requires": { - "picomatch": "^2.2.1" + "is-core-module": "^2.8.1", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" } }, - "regexp.prototype.flags": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz", - "integrity": "sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==", + "resolve-cwd": { + "version": "3.0.0", "dev": true, "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.3" - } - }, - "regexpp": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz", - "integrity": "sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==", - "dev": true - }, - "request": { - "version": "2.88.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz", - "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==", - "dev": true, - "requires": { - "aws-sign2": "~0.7.0", - "aws4": "^1.8.0", - "caseless": "~0.12.0", - "combined-stream": "~1.0.6", - "extend": "~3.0.2", - "forever-agent": "~0.6.1", - "form-data": "~2.3.2", - "har-validator": "~5.1.0", - "http-signature": "~1.2.0", - "is-typedarray": "~1.0.0", - "isstream": "~0.1.2", - "json-stringify-safe": "~5.0.1", - "mime-types": "~2.1.19", - "oauth-sign": "~0.9.0", - "performance-now": "^2.1.0", - "qs": "~6.5.2", - "safe-buffer": "^5.1.2", - "tough-cookie": "~2.4.3", - "tunnel-agent": "^0.6.0", - "uuid": "^3.3.2" - }, - "dependencies": { - "form-data": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", - "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", - "dev": true, - "requires": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.6", - "mime-types": "^2.1.12" - } - } + "resolve-from": "^5.0.0" } }, - "require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", - "dev": true - }, - "require-main-filename": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", - "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", + "resolve-from": { + "version": "5.0.0", "dev": true }, - "resolve": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", - "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=", + "resolve.exports": { + "version": "1.1.0", "dev": true }, - "resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "reusify": { + "version": "1.0.4", "dev": true }, "rimraf": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", - "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", + "version": "3.0.2", "dev": true, "requires": { "glob": "^7.1.3" - }, - "dependencies": { - "glob": { - "version": "7.1.6", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", - "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - } + } + }, + "run-parallel": { + "version": "1.2.0", + "dev": true, + "requires": { + "queue-microtask": "^1.2.2" } }, "safe-buffer": { "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", "dev": true }, "safer-buffer": { "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", "dev": true }, - "semver": { - "version": "7.3.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz", - "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==", - "dev": true, - "requires": { - "lru-cache": "^6.0.0" - }, - "dependencies": { - "lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "requires": { - "yallist": "^4.0.0" - } - }, - "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - } - } - }, - "serialize-javascript": { + "saxes": { "version": "5.0.1", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz", - "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==", "dev": true, "requires": { - "randombytes": "^2.1.0" + "xmlchars": "^2.2.0" } }, - "set-blocking": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", + "semver": { + "version": "6.3.0", "dev": true }, "shebang-command": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", "dev": true, "requires": { "shebang-regex": "^3.0.0" @@ -2999,288 +7858,80 @@ }, "shebang-regex": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", "dev": true }, - "should": { - "version": "13.2.3", - "resolved": "https://registry.npmjs.org/should/-/should-13.2.3.tgz", - "integrity": "sha512-ggLesLtu2xp+ZxI+ysJTmNjh2U0TsC+rQ/pfED9bUZZ4DKefP27D+7YJVVTvKsmjLpIi9jAa7itwDGkDDmt1GQ==", - "dev": true, - "requires": { - "should-equal": "^2.0.0", - "should-format": "^3.0.3", - "should-type": "^1.4.0", - "should-type-adaptors": "^1.0.1", - "should-util": "^1.0.0" - } - }, - "should-equal": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/should-equal/-/should-equal-2.0.0.tgz", - "integrity": "sha512-ZP36TMrK9euEuWQYBig9W55WPC7uo37qzAEmbjHz4gfyuXrEUgF8cUvQVO+w+d3OMfPvSRQJ22lSm8MQJ43LTA==", - "dev": true, - "requires": { - "should-type": "^1.4.0" - } - }, - "should-format": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/should-format/-/should-format-3.0.3.tgz", - "integrity": "sha1-m/yPdPo5IFxT04w01xcwPidxJPE=", - "dev": true, - "requires": { - "should-type": "^1.3.0", - "should-type-adaptors": "^1.0.1" - } - }, - "should-type": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/should-type/-/should-type-1.4.0.tgz", - "integrity": "sha1-B1bYzoRt/QmEOmlHcZ36DUz/XPM=", + "signal-exit": { + "version": "3.0.7", "dev": true }, - "should-type-adaptors": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/should-type-adaptors/-/should-type-adaptors-1.1.0.tgz", - "integrity": "sha512-JA4hdoLnN+kebEp2Vs8eBe9g7uy0zbRo+RMcU0EsNy+R+k049Ki+N5tT5Jagst2g7EAja+euFuoXFCa8vIklfA==", - "dev": true, - "requires": { - "should-type": "^1.3.0", - "should-util": "^1.0.0" - } - }, - "should-util": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/should-util/-/should-util-1.0.0.tgz", - "integrity": "sha1-yYzaN0qmsZDfi6h8mInCtNtiAGM=", + "sisteransi": { + "version": "1.0.5", "dev": true }, - "side-channel": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", - "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", - "dev": true, - "requires": { - "call-bind": "^1.0.0", - "get-intrinsic": "^1.0.2", - "object-inspect": "^1.9.0" - }, - "dependencies": { - "object-inspect": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz", - "integrity": "sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==", - "dev": true - } - } - }, - "sigmund": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz", - "integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=", + "slash": { + "version": "3.0.0", "dev": true }, - "slice-ansi": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz", - "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.0", - "astral-regex": "^1.0.0", - "is-fullwidth-code-point": "^2.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true - } - } - }, "source-map": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz", - "integrity": "sha1-2rc/vPwrqBm03gO9b26qSBZLP50=", - "dev": true, - "optional": true, - "requires": { - "amdefine": ">=0.0.4" - } - }, - "spdx-correct": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz", - "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==", - "dev": true, - "requires": { - "spdx-expression-parse": "^3.0.0", - "spdx-license-ids": "^3.0.0" - } - }, - "spdx-exceptions": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz", - "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==", + "version": "0.6.1", "dev": true }, - "spdx-expression-parse": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", - "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", + "source-map-support": { + "version": "0.5.21", "dev": true, "requires": { - "spdx-exceptions": "^2.1.0", - "spdx-license-ids": "^3.0.0" + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" } }, - "spdx-license-ids": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz", - "integrity": "sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==", - "dev": true - }, "split": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz", - "integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=", + "version": "1.0.1", "requires": { "through": "2" } }, "sprintf-js": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", "dev": true }, - "sshpk": { - "version": "1.16.1", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", - "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", - "dev": true, - "requires": { - "asn1": "~0.2.3", - "assert-plus": "^1.0.0", - "bcrypt-pbkdf": "^1.0.0", - "dashdash": "^1.12.0", - "ecc-jsbn": "~0.1.1", - "getpass": "^0.1.1", - "jsbn": "~0.1.0", - "safer-buffer": "^2.0.2", - "tweetnacl": "~0.14.0" - } - }, - "standard": { - "version": "16.0.3", - "resolved": "https://registry.npmjs.org/standard/-/standard-16.0.3.tgz", - "integrity": "sha512-70F7NH0hSkNXosXRltjSv6KpTAOkUkSfyu3ynyM5dtRUiLtR+yX9EGZ7RKwuGUqCJiX/cnkceVM6HTZ4JpaqDg==", - "dev": true, - "requires": { - "eslint": "~7.13.0", - "eslint-config-standard": "16.0.2", - "eslint-config-standard-jsx": "10.0.0", - "eslint-plugin-import": "~2.22.1", - "eslint-plugin-node": "~11.1.0", - "eslint-plugin-promise": "~4.2.1", - "eslint-plugin-react": "~7.21.5", - "standard-engine": "^14.0.1" - } - }, - "standard-engine": { - "version": "14.0.1", - "resolved": "https://registry.npmjs.org/standard-engine/-/standard-engine-14.0.1.tgz", - "integrity": "sha512-7FEzDwmHDOGva7r9ifOzD3BGdTbA7ujJ50afLVdW/tK14zQEptJjbFuUfn50irqdHDcTbNh0DTIoMPynMCXb0Q==", + "stack-utils": { + "version": "2.0.5", "dev": true, "requires": { - "get-stdin": "^8.0.0", - "minimist": "^1.2.5", - "pkg-conf": "^3.1.0", - "xdg-basedir": "^4.0.0" + "escape-string-regexp": "^2.0.0" }, "dependencies": { - "minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "escape-string-regexp": { + "version": "2.0.0", "dev": true } } }, "stream-combiner": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz", - "integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=", + "version": "0.2.2", "requires": { - "duplexer": "~0.1.1" + "duplexer": "~0.1.1", + "through": "~2.3.4" } }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "string-length": { + "version": "4.0.2", "dev": true, "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "^3.0.0" - } - } + "char-regex": "^1.0.2", + "strip-ansi": "^6.0.0" } }, - "string.prototype.matchall": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.3.tgz", - "integrity": "sha512-OBxYDA2ifZQ2e13cP82dWFMaCV9CGF8GzmN4fljBVw5O5wep0lu4gacm1OL6MjROoUnB8VbkWRThqkV2YFLNxw==", - "dev": true, + "string-width": { + "version": "4.2.3", "requires": { - "call-bind": "^1.0.0", - "define-properties": "^1.1.3", - "es-abstract": "^1.18.0-next.1", - "has-symbols": "^1.0.1", - "internal-slot": "^1.0.2", - "regexp.prototype.flags": "^1.3.0", - "side-channel": "^1.0.3" - }, - "dependencies": { - "has-symbols": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", - "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", - "dev": true - } + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" } }, "stringify-object": { "version": "3.3.0", - "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz", - "integrity": "sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==", "requires": { "get-own-enumerable-property-symbols": "^3.0.0", "is-obj": "^1.0.1", @@ -3288,493 +7939,311 @@ } }, "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "version": "6.0.1", "requires": { - "ansi-regex": "^2.0.0" + "ansi-regex": "^5.0.1" } }, "strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", + "version": "4.0.0", + "dev": true + }, + "strip-final-newline": { + "version": "2.0.0", "dev": true }, "strip-json-comments": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", + "version": "3.1.1", "dev": true }, "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" + "version": "7.2.0", + "requires": { + "has-flag": "^4.0.0" + } }, - "table": { - "version": "5.4.6", - "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz", - "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==", + "supports-hyperlinks": { + "version": "2.2.0", "dev": true, "requires": { - "ajv": "^6.10.2", - "lodash": "^4.17.14", - "slice-ansi": "^2.1.0", - "string-width": "^3.0.0" - }, - "dependencies": { - "ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "requires": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "dev": true - }, - "fast-deep-equal": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true - }, - "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true, - "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - } - }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "requires": { - "ansi-regex": "^4.1.0" - } - } + "has-flag": "^4.0.0", + "supports-color": "^7.0.0" + } + }, + "supports-preserve-symlinks-flag": { + "version": "1.0.0", + "dev": true + }, + "symbol-tree": { + "version": "3.2.4", + "dev": true + }, + "terminal-link": { + "version": "2.1.1", + "dev": true, + "requires": { + "ansi-escapes": "^4.2.1", + "supports-hyperlinks": "^2.0.0" + } + }, + "test-exclude": { + "version": "6.0.0", + "dev": true, + "requires": { + "@istanbuljs/schema": "^0.1.2", + "glob": "^7.1.4", + "minimatch": "^3.0.4" } }, "text-table": { "version": "0.2.0", - "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=", + "dev": true + }, + "throat": { + "version": "6.0.1", "dev": true }, "through": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=" + "version": "2.3.8" + }, + "tmpl": { + "version": "1.0.5", + "dev": true + }, + "to-fast-properties": { + "version": "2.0.0", + "dev": true }, "to-regex-range": { "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", "dev": true, "requires": { "is-number": "^7.0.0" } }, "tough-cookie": { - "version": "2.4.3", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz", - "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==", + "version": "4.0.0", "dev": true, "requires": { - "psl": "^1.1.24", - "punycode": "^1.4.1" - }, - "dependencies": { - "punycode": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", - "dev": true - } + "psl": "^1.1.33", + "punycode": "^2.1.1", + "universalify": "^0.1.2" } }, - "tsconfig-paths": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz", - "integrity": "sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==", + "tr46": { + "version": "2.1.0", "dev": true, "requires": { - "@types/json5": "^0.0.29", - "json5": "^1.0.1", - "minimist": "^1.2.0", - "strip-bom": "^3.0.0" + "punycode": "^2.1.1" } }, - "tunnel-agent": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", - "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", + "ts-jest": { + "version": "27.1.4", "dev": true, "requires": { - "safe-buffer": "^5.0.1" + "bs-logger": "0.x", + "fast-json-stable-stringify": "2.x", + "jest-util": "^27.0.0", + "json5": "2.x", + "lodash.memoize": "4.x", + "make-error": "1.x", + "semver": "7.x", + "yargs-parser": "20.x" + }, + "dependencies": { + "semver": { + "version": "7.3.5", + "dev": true, + "requires": { + "lru-cache": "^6.0.0" + } + } } }, - "tweetnacl": { - "version": "0.14.5", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", - "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", + "tslib": { + "version": "1.14.1", "dev": true }, + "tsutils": { + "version": "3.21.0", + "dev": true, + "requires": { + "tslib": "^1.8.1" + } + }, "type-check": { "version": "0.3.2", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", - "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", "dev": true, "requires": { "prelude-ls": "~1.1.2" } }, + "type-detect": { + "version": "4.0.8", + "dev": true + }, "type-fest": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", - "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", + "version": "2.12.2", "dev": true }, - "uglify-js": { - "version": "3.5.8", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.5.8.tgz", - "integrity": "sha512-GFSjB1nZIzoIq70qvDRtWRORHX3vFkAnyK/rDExc0BN7r9+/S+Voz3t/fwJuVfjppAMz+ceR2poE7tkhvnVwQQ==", + "typedarray-to-buffer": { + "version": "3.1.5", "dev": true, - "optional": true, "requires": { - "commander": "~2.20.0", - "source-map": "~0.6.1" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "optional": true - } + "is-typedarray": "^1.0.0" } }, + "typescript": { + "version": "4.6.3", + "dev": true + }, + "universalify": { + "version": "0.1.2", + "dev": true + }, "uri-js": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", - "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", + "version": "4.4.1", + "dev": true, "requires": { "punycode": "^2.1.0" } }, - "uuid": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", - "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==", - "dev": true - }, "v8-compile-cache": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz", - "integrity": "sha512-gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q==", + "version": "2.3.0", "dev": true }, - "validate-npm-package-license": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", - "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", + "v8-to-istanbul": { + "version": "8.1.1", "dev": true, "requires": { - "spdx-correct": "^3.0.0", - "spdx-expression-parse": "^3.0.0" + "@types/istanbul-lib-coverage": "^2.0.1", + "convert-source-map": "^1.6.0", + "source-map": "^0.7.3" + }, + "dependencies": { + "source-map": { + "version": "0.7.3", + "dev": true + } } }, - "verror": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", - "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", + "w3c-hr-time": { + "version": "1.0.2", "dev": true, "requires": { - "assert-plus": "^1.0.0", - "core-util-is": "1.0.2", - "extsprintf": "^1.2.0" + "browser-process-hrtime": "^1.0.0" } }, - "which": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", - "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", + "w3c-xmlserializer": { + "version": "2.0.0", "dev": true, "requires": { - "isexe": "^2.0.0" + "xml-name-validator": "^3.0.0" } }, - "which-module": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", + "walker": { + "version": "1.0.8", + "dev": true, + "requires": { + "makeerror": "1.0.12" + } + }, + "webidl-conversions": { + "version": "6.1.0", "dev": true }, - "wide-align": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", - "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", + "whatwg-encoding": { + "version": "1.0.5", "dev": true, "requires": { - "string-width": "^1.0.2 || 2" + "iconv-lite": "0.4.24" } }, - "word-wrap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", + "whatwg-mimetype": { + "version": "2.3.0", "dev": true }, - "wordwrap": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", - "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", - "dev": true + "whatwg-url": { + "version": "8.7.0", + "dev": true, + "requires": { + "lodash": "^4.7.0", + "tr46": "^2.1.0", + "webidl-conversions": "^6.1.0" + } }, - "workerpool": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.0.2.tgz", - "integrity": "sha512-DSNyvOpFKrNusaaUwk+ej6cBj1bmhLcBfj80elGk+ZIo5JSkq+unB1dLKEOcNfJDZgjGICfhQ0Q5TbP0PvF4+Q==", + "which": { + "version": "2.0.2", + "dev": true, + "requires": { + "isexe": "^2.0.0" + } + }, + "word-wrap": { + "version": "1.2.3", "dev": true }, "wrap-ansi": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", - "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", - "dev": true, + "version": "7.0.0", "requires": { - "ansi-styles": "^3.2.0", - "string-width": "^3.0.0", - "strip-ansi": "^5.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "dev": true - }, - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true, - "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - } - }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "requires": { - "ansi-regex": "^4.1.0" - } - } + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" } }, "wrappy": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", "dev": true }, - "write": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz", - "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==", + "write-file-atomic": { + "version": "3.0.3", "dev": true, "requires": { - "mkdirp": "^0.5.1" + "imurmurhash": "^0.1.4", + "is-typedarray": "^1.0.0", + "signal-exit": "^3.0.2", + "typedarray-to-buffer": "^3.1.5" } }, - "xdg-basedir": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz", - "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==", + "ws": { + "version": "7.5.7", + "dev": true, + "requires": {} + }, + "xml-name-validator": { + "version": "3.0.0", "dev": true }, - "xtend": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", - "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=", + "xmlchars": { + "version": "2.2.0", "dev": true }, "y18n": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz", - "integrity": "sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==", - "dev": true + "version": "5.0.8" }, "yallist": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", - "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", + "version": "4.0.0", "dev": true }, "yargs": { - "version": "13.3.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz", - "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==", - "dev": true, + "version": "17.4.0", "requires": { - "cliui": "^5.0.0", - "find-up": "^3.0.0", - "get-caller-file": "^2.0.1", + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^3.0.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^13.1.2" - }, - "dependencies": { - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "dev": true - }, - "find-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", - "dev": true, - "requires": { - "locate-path": "^3.0.0" - } - }, - "locate-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", - "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", - "dev": true, - "requires": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" - } - }, - "p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "requires": { - "p-try": "^2.0.0" - } - }, - "p-locate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", - "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", - "dev": true, - "requires": { - "p-limit": "^2.0.0" - } - }, - "p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "dev": true - }, - "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true, - "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - } - }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "requires": { - "ansi-regex": "^4.1.0" - } - } - } - }, - "yargs-parser": { - "version": "13.1.2", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz", - "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==", - "dev": true, - "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - } - }, - "yargs-unparser": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz", - "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==", - "dev": true, - "requires": { - "camelcase": "^6.0.0", - "decamelize": "^4.0.0", - "flat": "^5.0.2", - "is-plain-obj": "^2.1.0" + "string-width": "^4.2.3", + "y18n": "^5.0.5", + "yargs-parser": "^21.0.0" }, "dependencies": { - "camelcase": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz", - "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==", - "dev": true - }, - "decamelize": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz", - "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==", - "dev": true + "yargs-parser": { + "version": "21.0.1" } } }, - "yocto-queue": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", - "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "yargs-parser": { + "version": "20.2.9", "dev": true } } diff --git a/package.json b/package.json index 0f9f6b063..5d17b6fae 100644 --- a/package.json +++ b/package.json @@ -1,11 +1,12 @@ { - "version": "2.0.0", + "version": "3.0.0", "name": "httpsnippet", "description": "HTTP Request snippet generator for *most* languages", - "author": "Ahmad Nassri (https://www.mashape.com/)", - "homepage": "https://github.com/Mashape/httpsnippet", + "author": "Kong ", + "homepage": "https://github.com/Kong/httpsnippet", "license": "MIT", - "main": "src/index.js", + "main": "dist/httpsnippet.js", + "types": "dist/httpsnippet.d.ts", "bin": "bin/httpsnippet", "keywords": [ "api", @@ -38,56 +39,48 @@ "xmlhttprequest" ], "engines": { - "node": ">=10" + "node": "^14.19.1 || ^16.14.2 || ^18.0.0" }, - "files": [ - "bin", - "src" - ], - "repository": "Mashape/httpsnippet", + "repository": "Kong/httpsnippet", "bugs": { - "url": "https://github.com/Mashape/httpsnippet/issues" + "url": "https://github.com/Kong/httpsnippet/issues" }, "scripts": { - "quick": "mocha --no-timeouts --fgrep 'Request Validation' --invert", - "pretest": "standard && echint", - "test": "mocha --no-timeouts", - "posttest": "exit 0 && npm run coverage", - "coverage": "istanbul cover --dir coverage _mocha -- --fgrep 'Request Validation' --invert -R dot", - "codeclimate": "codeclimate < coverage/lcov.info" - }, - "standard": { - "env": "mocha", - "ignore": [ - "**/test/fixtures/**" - ] - }, - "echint": { - "ignore": [ - "coverage/**", - "**/node_modules/**", - "**/fixtures/**" - ] + "clean": "tsc --build tsconfig.build.json --clean", + "prebuild": "npm run clean", + "lint": "prettier --write . && eslint . --ext ts,d.ts,test.ts --fix", + "build": "tsc --build tsconfig.build.json", + "build:cli": "tsc --build tsconfig.cli.json", + "test": "jest" }, "devDependencies": { - "codeclimate-test-reporter": "^0.5.1", - "echint": "^4.0.2", - "glob": "^6.0.1", - "istanbul": "^0.4.0", - "mocha": "^8.2.1", - "require-directory": "^2.1.1", - "should": "^13.2.3", - "standard": "^16.0.3" + "@types/eslint": "^8.4.1", + "@types/event-stream": "^4.0.0", + "@types/har-format": "^1.2.8", + "@types/jest": "^27.4.1", + "@types/node": "^16.11.26", + "@types/stringify-object": "^3.3.0", + "@types/yargs": "^17.0.10", + "@typescript-eslint/eslint-plugin": "^5.17.0", + "@typescript-eslint/parser": "^5.17.0", + "eslint": "^8.12.0", + "eslint-config-prettier": "^8.5.0", + "eslint-plugin-eslint-comments": "^3.2.0", + "eslint-plugin-jest": "^26.1.3", + "eslint-plugin-jest-formatting": "^3.1.0", + "eslint-plugin-simple-import-sort": "^7.0.0", + "jest": "^27.5.1", + "prettier": "^2.6.2", + "ts-jest": "^27.1.4", + "type-fest": "^2.12.2", + "typescript": "^4.6.3" }, "dependencies": { - "chalk": "^1.1.1", - "commander": "^2.9.0", - "debug": "^2.2.0", - "event-stream": "3.3.4", - "form-data": "3.0.0", - "fs-readfile-promise": "^2.0.1", - "fs-writefile-promise": "^1.0.3", - "har-validator": "^5.0.0", - "stringify-object": "^3.3.0" + "chalk": "^4.1.2", + "event-stream": "4.0.1", + "form-data": "4.0.0", + "har-schema": "^2.0.0", + "stringify-object": "3.3.0", + "yargs": "^17.4.0" } } diff --git a/src/cli.ts b/src/cli.ts new file mode 100644 index 000000000..b3e378bfe --- /dev/null +++ b/src/cli.ts @@ -0,0 +1,99 @@ +import chalk from 'chalk'; +import { readFileSync, writeFileSync } from 'fs'; +import path from 'path'; +import { hideBin } from 'yargs/helpers'; +import yargs from 'yargs/yargs'; + +import packageJson from '../package.json'; +import { extname, HarRequest, HTTPSnippet } from './httpsnippet'; +import { ClientId, TargetId, targets } from './targets/targets'; + +const { cyan, green, red, yellow } = chalk; + +const bad = (message: string) => console.error(`${red('✖')} ${message}`); +const good = (message: string) => console.log(`${green('✓')} ${message}`); + +interface CliOptions { + target: TargetId; + client?: ClientId; + output?: string; + harFilePath: string; + extra?: any; +} + +export const go = () => + yargs(hideBin(process.argv)) + .version(packageJson.version) + .command( + '$0 [harFilePath]', + 'the default command', + builder => { + builder + .option('target', { + alias: 't', + type: 'string', + description: 'target output', + requiresArg: true, + }) + .option('client', { + alias: 'c', + type: 'string', + description: 'language client', + requiresArg: true, + }) + .option('output', { + alias: 'o', + type: 'string', + description: 'write output to directory', + }) + .option('extra', { + alias: 'x', + type: 'string', + description: 'provide extra options for the target/client', + requiresArg: true, + }) + .demandOption(['target'], 'please provide a target') + .strict() + .showHelpOnFail(true) + .help(); + }, + ({ target: targetId, client, output, extra, harFilePath }) => { + const har = JSON.parse(readFileSync(harFilePath).toString()) as HarRequest; + const httpsnippet = new HTTPSnippet(har); + + let options: Record = {}; + try { + if (extra) { + options = JSON.parse(extra); + } + } catch (error) { + if (error instanceof Error) { + bad(`${cyan.bold(harFilePath)} failed to read JSON: ${red(error.message)}`); + } + return; + } + + const result = httpsnippet.convert(targetId, client, options); + + if (!result) { + throw new Error('something went wrong'); + } + + if (!output) { + console.log(result); + return; + } + + const file = path.parse(harFilePath).name; + const writeFilePath = path.join(output, `${file}${extname(targetId)}`); + writeFileSync(writeFilePath, String(result)); + const target = targets[targetId]; + const clientId = target.clientsById[client || target.info.default].info.key; + good( + `converted ${cyan.bold(harFilePath)} with ${yellow(targetId)}[${yellow( + clientId, + )}] at ${cyan(writeFilePath)}\n\n${result}`, + ); + }, + ) + .example('$0 my_har.json', '--target rust --client actix --output my_src_directory').argv; diff --git a/src/fixtures/customTarget.ts b/src/fixtures/customTarget.ts new file mode 100644 index 000000000..15dc0590c --- /dev/null +++ b/src/fixtures/customTarget.ts @@ -0,0 +1,14 @@ +import { request } from '../targets/node/request/client'; +import { Target } from '../targets/targets'; + +export const customTarget = { + info: { + key: 'js-variant', + title: 'JavaScript Variant', + extname: '.js', + default: 'request', + }, + clientsById: { + request, + }, +} as unknown as Target; diff --git a/src/fixtures/mimetypes.ts b/src/fixtures/mimetypes.ts new file mode 100644 index 000000000..14673788a --- /dev/null +++ b/src/fixtures/mimetypes.ts @@ -0,0 +1,84 @@ +import { Request } from '../httpsnippet'; + +export const mimetypes = { + 'multipart/mixed': { + method: 'POST', + url: 'http://mockbin.com/har', + postData: { + mimeType: 'multipart/mixed', + text: '', + }, + } as Request, + + 'multipart/related': { + method: 'POST', + url: 'http://mockbin.com/har', + postData: { + mimeType: 'multipart/related', + text: '', + }, + } as Request, + + 'multipart/form-data': { + method: 'POST', + url: 'http://mockbin.com/har', + postData: { + mimeType: 'multipart/form-data', + text: '', + }, + } as Request, + + 'multipart/alternative': { + method: 'POST', + url: 'http://mockbin.com/har', + postData: { + mimeType: 'multipart/alternative', + text: '', + }, + } as Request, + + 'application/x-www-form-urlencoded': { + method: 'POST', + url: 'http://mockbin.com/har', + postData: { + mimeType: 'application/x-www-form-urlencoded', + text: '', + }, + } as Request, + + 'text/json': { + method: 'POST', + url: 'http://mockbin.com/har', + postData: { + mimeType: 'text/json', + text: '', + }, + } as Request, + + 'text/x-json': { + method: 'POST', + url: 'http://mockbin.com/har', + postData: { + mimeType: 'text/x-json', + text: '', + }, + } as Request, + + 'application/x-json': { + method: 'POST', + url: 'http://mockbin.com/har', + postData: { + mimeType: 'application/x-json', + text: '', + }, + } as Request, + + 'invalid-json': { + method: 'POST', + url: 'http://mockbin.com/har', + postData: { + mimeType: 'application/json', + text: 'foo/bar', + }, + } as Request, +}; diff --git a/test/fixtures/requests/application-form-encoded.json b/src/fixtures/requests/application-form-encoded.json similarity index 100% rename from test/fixtures/requests/application-form-encoded.json rename to src/fixtures/requests/application-form-encoded.json diff --git a/test/fixtures/requests/application-json.json b/src/fixtures/requests/application-json.json similarity index 100% rename from test/fixtures/requests/application-json.json rename to src/fixtures/requests/application-json.json diff --git a/test/fixtures/requests/cookies.json b/src/fixtures/requests/cookies.json similarity index 91% rename from test/fixtures/requests/cookies.json rename to src/fixtures/requests/cookies.json index 248907cf6..4c27077ff 100644 --- a/test/fixtures/requests/cookies.json +++ b/src/fixtures/requests/cookies.json @@ -1,7 +1,7 @@ { "method": "POST", "url": "http://mockbin.com/har", - "cookies": [ + "cookies": [ { "name": "foo", "value": "bar" diff --git a/test/fixtures/requests/custom-method.json b/src/fixtures/requests/custom-method.json similarity index 100% rename from test/fixtures/requests/custom-method.json rename to src/fixtures/requests/custom-method.json diff --git a/test/fixtures/requests/full.json b/src/fixtures/requests/full.json similarity index 97% rename from test/fixtures/requests/full.json rename to src/fixtures/requests/full.json index 640839a1f..4711268f3 100644 --- a/test/fixtures/requests/full.json +++ b/src/fixtures/requests/full.json @@ -26,7 +26,7 @@ "value": "application/x-www-form-urlencoded" } ], - "cookies": [ + "cookies": [ { "name": "foo", "value": "bar" diff --git a/test/fixtures/requests/headers.json b/src/fixtures/requests/headers.json similarity index 100% rename from test/fixtures/requests/headers.json rename to src/fixtures/requests/headers.json diff --git a/test/fixtures/requests/https.json b/src/fixtures/requests/https.json similarity index 100% rename from test/fixtures/requests/https.json rename to src/fixtures/requests/https.json diff --git a/test/fixtures/requests/jsonObj-multiline.json b/src/fixtures/requests/jsonObj-multiline.json similarity index 61% rename from test/fixtures/requests/jsonObj-multiline.json rename to src/fixtures/requests/jsonObj-multiline.json index ed94a351a..2db7e1243 100644 --- a/test/fixtures/requests/jsonObj-multiline.json +++ b/src/fixtures/requests/jsonObj-multiline.json @@ -1,10 +1,12 @@ { "url": "http://mockbin.com/har", "method": "POST", - "headers": [{ - "name": "content-type", - "value": "application/json" - }], + "headers": [ + { + "name": "content-type", + "value": "application/json" + } + ], "postData": { "text": "{\n \"foo\": \"bar\"\n}", "mimeType": "application/json" diff --git a/test/fixtures/requests/jsonObj-null-value.json b/src/fixtures/requests/jsonObj-null-value.json similarity index 68% rename from test/fixtures/requests/jsonObj-null-value.json rename to src/fixtures/requests/jsonObj-null-value.json index c08860ac2..f54a24423 100644 --- a/test/fixtures/requests/jsonObj-null-value.json +++ b/src/fixtures/requests/jsonObj-null-value.json @@ -1,10 +1,12 @@ { "url": "http://mockbin.com/har", "method": "POST", - "headers": [{ - "name": "content-type", - "value": "application/json" - }], + "headers": [ + { + "name": "content-type", + "value": "application/json" + } + ], "postData": { "params": [], "text": "{\"foo\":null}", @@ -12,7 +14,7 @@ "mimeType": "application/json", "size": 0, "jsonObj": { - "foo":null + "foo": null }, "paramsObj": false } diff --git a/test/fixtures/requests/multipart-data.json b/src/fixtures/requests/multipart-data.json similarity index 100% rename from test/fixtures/requests/multipart-data.json rename to src/fixtures/requests/multipart-data.json diff --git a/test/fixtures/requests/multipart-file.json b/src/fixtures/requests/multipart-file.json similarity index 100% rename from test/fixtures/requests/multipart-file.json rename to src/fixtures/requests/multipart-file.json diff --git a/test/fixtures/requests/multipart-form-data.json b/src/fixtures/requests/multipart-form-data.json similarity index 100% rename from test/fixtures/requests/multipart-form-data.json rename to src/fixtures/requests/multipart-form-data.json diff --git a/test/fixtures/requests/nested.json b/src/fixtures/requests/nested.json similarity index 99% rename from test/fixtures/requests/nested.json rename to src/fixtures/requests/nested.json index a9caa7565..cc7c12050 100644 --- a/test/fixtures/requests/nested.json +++ b/src/fixtures/requests/nested.json @@ -16,4 +16,4 @@ "value": "value" } ] -} \ No newline at end of file +} diff --git a/test/fixtures/requests/query.json b/src/fixtures/requests/query.json similarity index 100% rename from test/fixtures/requests/query.json rename to src/fixtures/requests/query.json diff --git a/test/fixtures/requests/short.json b/src/fixtures/requests/short.json similarity index 100% rename from test/fixtures/requests/short.json rename to src/fixtures/requests/short.json diff --git a/test/fixtures/requests/text-plain.json b/src/fixtures/requests/text-plain.json similarity index 100% rename from test/fixtures/requests/text-plain.json rename to src/fixtures/requests/text-plain.json diff --git a/src/fixtures/runCustomFixtures.ts b/src/fixtures/runCustomFixtures.ts new file mode 100644 index 000000000..bea882996 --- /dev/null +++ b/src/fixtures/runCustomFixtures.ts @@ -0,0 +1,42 @@ +import { readFile } from 'fs/promises'; +import path from 'path'; + +import { HTTPSnippet, Request } from '../httpsnippet'; +import { ClientId, TargetId } from '../targets/targets'; + +/* eslint-disable jest/no-export,jest/valid-title -- we want to do it just for this one case */ +export interface CustomFixture { + targetId: TargetId; + clientId: ClientId; + tests: { + it: string; + input: Request; + options: any; + + /** a file path pointing to the expected custom fixture result */ + expected: string; + }[]; +} + +export const runCustomFixtures = ({ targetId, clientId, tests }: CustomFixture) => { + describe(`custom fixtures for ${targetId}:${clientId}`, () => { + tests.forEach(({ it: title, expected: fixtureFile, options, input: request }) => { + it(title, async () => { + const result = new HTTPSnippet(request).convert(targetId, clientId, options); + const filePath = path.join( + __dirname, + '..', + 'targets', + targetId, + clientId, + 'fixtures', + fixtureFile, + ); + const buffer = await readFile(filePath); + const fixture = String(buffer); + + expect(result).toStrictEqual(fixture); + }); + }); + }); +}; diff --git a/test/fixtures/available-targets.json b/src/helpers/__snapshots__/utils.test.ts.snap similarity index 70% rename from test/fixtures/available-targets.json rename to src/helpers/__snapshots__/utils.test.ts.snap index 7ad7857ab..1b0b9e58b 100644 --- a/test/fixtures/available-targets.json +++ b/src/helpers/__snapshots__/utils.test.ts.snap @@ -1,356 +1,360 @@ -[ - { - "key": "shell", - "title": "Shell", - "extname": ".sh", - "default": "curl", - "clients": [ - { - "key": "curl", - "title": "cURL", - "link": "http://curl.haxx.se/", - "description": "cURL is a command line tool and library for transferring data with URL syntax" +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`availableTargets returns all available targets 1`] = ` +Array [ + Object { + "clients": Array [ + Object { + "description": "Simple REST and HTTP API Client for C", + "key": "libcurl", + "link": "http://curl.haxx.se/libcurl", + "title": "Libcurl", }, - { - "key": "httpie", - "title": "HTTPie", - "link": "http://httpie.org/", - "description": "a CLI, cURL-like tool for humans" + ], + "default": "libcurl", + "extname": ".c", + "key": "c", + "title": "C", + }, + Object { + "clients": Array [ + Object { + "description": "An idiomatic clojure http client wrapping the apache client.", + "key": "clj_http", + "link": "https://github.com/dakrone/clj-http", + "title": "clj-http", }, - { - "key": "wget", - "title": "Wget", - "link": "https://www.gnu.org/software/wget/", - "description": "a free software package for retrieving files using HTTP, HTTPS" - } - ] + ], + "default": "clj_http", + "extname": ".clj", + "key": "clojure", + "title": "Clojure", }, - { - "key": "node", - "title": "Node.js", - "extname": ".js", - "default": "native", - "clients": [ - { + Object { + "clients": Array [ + Object { + "description": ".NET Standard HTTP Client", + "key": "httpclient", + "link": "https://docs.microsoft.com/en-us/dotnet/api/system.net.http.httpclient", + "title": "HttpClient", + }, + Object { + "description": "Simple REST and HTTP API Client for .NET", + "key": "restsharp", + "link": "http://restsharp.org/", + "title": "RestSharp", + }, + ], + "default": "restsharp", + "extname": ".cs", + "key": "csharp", + "title": "C#", + }, + Object { + "clients": Array [ + Object { + "description": "Golang HTTP client request", "key": "native", - "title": "HTTP", - "link": "http://nodejs.org/api/http.html#http_http_request_options_callback", - "description": "Node.js native HTTP interface" + "link": "http://golang.org/pkg/net/http/#NewRequest", + "title": "NewRequest", }, - { - "key": "request", - "title": "Request", - "link": "https://github.com/request/request", - "description": "Simplified HTTP request client" + ], + "default": "native", + "extname": ".go", + "key": "go", + "title": "Go", + }, + Object { + "clients": Array [ + Object { + "description": "HTTP/1.1 request string in accordance with RFC 7230", + "key": "http1.1", + "link": "https://tools.ietf.org/html/rfc7230", + "title": "HTTP/1.1", + }, + ], + "default": "1.1", + "extname": null, + "key": "http", + "title": "HTTP", + }, + Object { + "clients": Array [ + Object { + "description": "Asynchronous Http and WebSocket Client library for Java", + "key": "asynchttp", + "link": "https://github.com/AsyncHttpClient/async-http-client", + "title": "AsyncHttp", + }, + Object { + "description": "Java Standardized HTTP Client API", + "key": "nethttp", + "link": "https://openjdk.java.net/groups/net/httpclient/intro.html", + "title": "java.net.http", }, - { + Object { + "description": "An HTTP Request Client Library", + "key": "okhttp", + "link": "http://square.github.io/okhttp/", + "title": "OkHttp", + }, + Object { + "description": "Lightweight HTTP Request Client Library", "key": "unirest", + "link": "http://unirest.io/java.html", "title": "Unirest", - "link": "http://unirest.io/nodejs.html", - "description": "Lightweight HTTP Request Client Library" }, - { + ], + "default": "unirest", + "extname": ".java", + "key": "java", + "title": "Java", + }, + Object { + "clients": Array [ + Object { + "description": "W3C Standard API that provides scripted client functionality", + "key": "xhr", + "link": "https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest", + "title": "XMLHttpRequest", + }, + Object { + "description": "Promise based HTTP client for the browser and node.js", "key": "axios", - "title": "Axios", "link": "https://github.com/axios/axios", - "description": "Promise based HTTP client for the browser and node.js" + "title": "Axios", }, - { + Object { + "description": "Perform asynchronous HTTP requests with the Fetch API", "key": "fetch", - "title": "Fetch", - "link": "https://github.com/bitinn/node-fetch", - "description": "Simplified HTTP node-fetch client" - } - ] - }, - { - "key": "javascript", - "title": "JavaScript", - "extname": ".js", - "default": "xhr", - "clients": [ - { + "link": "https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API/Using_Fetch", + "title": "fetch", + }, + Object { + "description": "Perform an asynchronous HTTP (Ajax) requests with jQuery", "key": "jquery", - "title": "jQuery", "link": "http://api.jquery.com/jquery.ajax/", - "description": "Perform an asynchronous HTTP (Ajax) requests with jQuery" + "title": "jQuery", }, - { - "key": "fetch", - "title": "fetch", - "link": "https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API/Using_Fetch", - "description": "Perform asynchronous HTTP requests with the Fetch API" + ], + "default": "xhr", + "extname": ".js", + "key": "javascript", + "title": "JavaScript", + }, + Object { + "clients": Array [ + Object { + "description": "An HTTP Request Client Library", + "key": "okhttp", + "link": "http://square.github.io/okhttp/", + "title": "OkHttp", }, - { - "key": "xhr", - "title": "XMLHttpRequest", - "link": "https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest", - "description": "W3C Standard API that provides scripted client functionality" + ], + "default": "okhttp", + "extname": ".kt", + "key": "kotlin", + "title": "Kotlin", + }, + Object { + "clients": Array [ + Object { + "description": "Node.js native HTTP interface", + "key": "native", + "link": "http://nodejs.org/api/http.html#http_http_request_options_callback", + "title": "HTTP", + }, + Object { + "description": "Simplified HTTP request client", + "key": "request", + "link": "https://github.com/request/request", + "title": "Request", + }, + Object { + "description": "Lightweight HTTP Request Client Library", + "key": "unirest", + "link": "http://unirest.io/nodejs.html", + "title": "Unirest", }, - { + Object { + "description": "Promise based HTTP client for the browser and node.js", "key": "axios", - "title": "Axios", "link": "https://github.com/axios/axios", - "description": "Promise based HTTP client for the browser and node.js" - } - ] + "title": "Axios", + }, + Object { + "description": "Simplified HTTP node-fetch client", + "key": "fetch", + "link": "https://github.com/bitinn/node-fetch", + "title": "Fetch", + }, + ], + "default": "native", + "extname": ".js", + "key": "node", + "title": "Node.js", }, - { - "key": "ocaml", - "title": "OCaml", - "extname": ".ml", - "default": "cohttp", - "clients": [ - { + Object { + "clients": Array [ + Object { + "description": "Foundation's NSURLSession request", + "key": "nsurlsession", + "link": "https://developer.apple.com/library/mac/documentation/Foundation/Reference/NSURLSession_class/index.html", + "title": "NSURLSession", + }, + ], + "default": "nsurlsession", + "extname": ".m", + "key": "objc", + "title": "Objective-C", + }, + Object { + "clients": Array [ + Object { + "description": "Cohttp is a very lightweight HTTP server using Lwt or Async for OCaml", "key": "cohttp", - "title": "CoHTTP", "link": "https://github.com/mirage/ocaml-cohttp", - "description": "Cohttp is a very lightweight HTTP server using Lwt or Async for OCaml" - } - ] + "title": "CoHTTP", + }, + ], + "default": "cohttp", + "extname": ".ml", + "key": "ocaml", + "title": "OCaml", }, - { - "key": "php", - "title": "PHP", - "extname": ".php", - "default": "curl", - "clients": [ - { + Object { + "clients": Array [ + Object { + "description": "PHP with ext-curl", "key": "curl", - "title": "cURL", "link": "http://php.net/manual/en/book.curl.php", - "description": "PHP with ext-curl" + "title": "cURL", }, - { + Object { + "description": "PHP with pecl/http v1", "key": "http1", - "title": "HTTP v1", "link": "http://php.net/manual/en/book.http.php", - "description": "PHP with pecl/http v1" + "title": "HTTP v1", }, - { + Object { + "description": "PHP with pecl/http v2", "key": "http2", - "title": "HTTP v2", "link": "http://devel-m6w6.rhcloud.com/mdref/http", - "description": "PHP with pecl/http v2" - } - ] + "title": "HTTP v2", + }, + ], + "default": "curl", + "extname": ".php", + "key": "php", + "title": "PHP", }, - { - "key": "python", - "title": "Python", - "extname": ".py", - "default": "python3", - "clients": [ - { + Object { + "clients": Array [ + Object { + "description": "Powershell Invoke-WebRequest client", + "key": "webrequest", + "link": "https://docs.microsoft.com/en-us/powershell/module/Microsoft.PowerShell.Utility/Invoke-WebRequest", + "title": "Invoke-WebRequest", + }, + Object { + "description": "Powershell Invoke-RestMethod client", + "key": "restmethod", + "link": "https://docs.microsoft.com/en-us/powershell/module/Microsoft.PowerShell.Utility/Invoke-RestMethod", + "title": "Invoke-RestMethod", + }, + ], + "default": "webrequest", + "extname": ".ps1", + "key": "powershell", + "title": "Powershell", + }, + Object { + "clients": Array [ + Object { + "description": "Python3 HTTP Client", "key": "python3", - "title": "http.client", "link": "https://docs.python.org/3/library/http.client.html", - "description": "Python3 HTTP Client" + "title": "http.client", }, - { + Object { + "description": "Requests HTTP library", "key": "requests", - "title": "Requests", "link": "http://docs.python-requests.org/en/latest/api/#requests.request", - "description": "Requests HTTP library" - } - ] - }, - { - "key": "objc", - "title": "Objective-C", - "extname": ".m", - "default": "nsurlsession", - "clients": [ - { - "key": "nsurlsession", - "title": "NSURLSession", - "link": "https://developer.apple.com/library/mac/documentation/Foundation/Reference/NSURLSession_class/index.html", - "description": "Foundation's NSURLSession request" - } - ] + "title": "Requests", + }, + ], + "default": "python3", + "extname": ".py", + "key": "python", + "title": "Python", }, - { - "key": "swift", - "title": "Swift", - "extname": ".swift", - "default": "nsurlsession", - "clients": [ - { - "key": "nsurlsession", - "title": "NSURLSession", - "link": "https://developer.apple.com/library/mac/documentation/Foundation/Reference/NSURLSession_class/index.html", - "description": "Foundation's NSURLSession request" - } - ] + Object { + "clients": Array [ + Object { + "description": "httr: Tools for Working with URLs and HTTP", + "key": "httr", + "link": "https://cran.r-project.org/web/packages/httr/vignettes/quickstart.html", + "title": "httr", + }, + ], + "default": "httr", + "extname": ".r", + "key": "r", + "title": "R", }, - { - "key": "go", - "title": "Go", - "extname": ".go", - "default": "native", - "clients": [ - { + Object { + "clients": Array [ + Object { + "description": "Ruby HTTP client", "key": "native", - "title": "NewRequest", - "link": "http://golang.org/pkg/net/http/#NewRequest", - "description": "Golang HTTP client request" - } - ] - }, - { - "key": "java", - "title": "Java", - "extname": ".java", - "default": "unirest", - "clients": [ - { - "key": "okhttp", - "title": "OkHttp", - "link": "http://square.github.io/okhttp/", - "description": "An HTTP Request Client Library" - }, - { - "key": "unirest", - "title": "Unirest", - "link": "http://unirest.io/java.html", - "description": "Lightweight HTTP Request Client Library" - }, - { - "key": "asynchttp", - "title": "AsyncHttp", - "link": "https://github.com/AsyncHttpClient/async-http-client", - "description": "Asynchronous Http and WebSocket Client library for Java" + "link": "http://ruby-doc.org/stdlib-2.2.1/libdoc/net/http/rdoc/Net/HTTP.html", + "title": "net::http", }, - { - "key": "nethttp", - "title": "java.net.http", - "link": "https://openjdk.java.net/groups/net/httpclient/intro.html", - "description": "Java Standardized HTTP Client API" - } - ] - }, - { + ], + "default": "native", + "extname": ".rb", "key": "ruby", "title": "Ruby", - "extname": ".rb", - "default": "native", - "clients": [ - { - "key": "native", - "title": "net::http", - "link": "http://ruby-doc.org/stdlib-2.2.1/libdoc/net/http/rdoc/Net/HTTP.html", - "description": "Ruby HTTP client" - } - ] }, - { - "key": "csharp", - "title": "C#", - "extname": ".cs", - "default": "restsharp", - "clients": [ - { - "key": "restsharp", - "title": "RestSharp", - "link": "http://restsharp.org/", - "description": "Simple REST and HTTP API Client for .NET" + Object { + "clients": Array [ + Object { + "description": "cURL is a command line tool and library for transferring data with URL syntax", + "key": "curl", + "link": "http://curl.haxx.se/", + "title": "cURL", }, - { - "key": "httpclient", - "title": "HttpClient", - "link": "https://docs.microsoft.com/en-us/dotnet/api/system.net.http.httpclient", - "description": ".NET Standard HTTP Client" - } - ] - }, - { - "key": "clojure", - "title": "Clojure", - "extname": ".clj", - "default": "clj_http", - "clients": [ - { - "key": "clj_http", - "title": "clj-http", - "link": "https://github.com/dakrone/clj-http", - "description": "An idiomatic clojure http client wrapping the apache client." - } - ] - }, - { - "key": "c", - "title": "C", - "extname": ".c", - "default": "libcurl", - "clients": [ - { - "key": "libcurl", - "title": "Libcurl", - "link": "http://curl.haxx.se/libcurl/", - "description": "Simple REST and HTTP API Client for C" - } - ] - }, - { - "key": "r", - "title": "R", - "extname": ".r", - "default": "httr", - "clients": [ - { - "key": "httr", - "title": "httr", - "link": "https://cran.r-project.org/web/packages/httr/vignettes/quickstart.html", - "description": "httr: Tools for Working with URLs and HTTP" - } - ] - }, - { - "default": "webrequest", - "extname": ".ps1", - "key": "powershell", - "title": "Powershell", - "clients": [ - { - "description": "Powershell Invoke-WebRequest client", - "key": "webrequest", - "link": "https://docs.microsoft.com/en-us/powershell/module/Microsoft.PowerShell.Utility/Invoke-WebRequest", - "title": "Invoke-WebRequest" + Object { + "description": "a CLI, cURL-like tool for humans", + "key": "httpie", + "link": "http://httpie.org/", + "title": "HTTPie", }, - { - "description": "Powershell Invoke-RestMethod client", - "key": "restmethod", - "link": "https://docs.microsoft.com/en-us/powershell/module/Microsoft.PowerShell.Utility/Invoke-RestMethod", - "title": "Invoke-RestMethod" - } - ] + Object { + "description": "a free software package for retrieving files using HTTP, HTTPS", + "key": "wget", + "link": "https://www.gnu.org/software/wget/", + "title": "Wget", + }, + ], + "default": "curl", + "extname": ".sh", + "key": "shell", + "title": "Shell", }, - { - "default": "1.1", - "extname": "", - "key": "http", - "title": "HTTP", - "clients": [ - { - "description": "HTTP/1.1 request string in accordance with RFC 7230", - "key": "1.1", - "link": "https://tools.ietf.org/html/rfc7230", - "title": "HTTP/1.1" - } - ] + Object { + "clients": Array [ + Object { + "description": "Foundation's NSURLSession request", + "key": "nsurlsession", + "link": "https://developer.apple.com/library/mac/documentation/Foundation/Reference/NSURLSession_class/index.html", + "title": "NSURLSession", + }, + ], + "default": "nsurlsession", + "extname": ".swift", + "key": "swift", + "title": "Swift", }, - { - "key": "kotlin", - "title": "Kotlin", - "extname": ".kt", - "default": "okhttp", - "clients": [ - { - "key": "okhttp", - "title": "OkHttp", - "link": "http://square.github.io/okhttp/", - "description": "An HTTP Request Client Library" - } - ] - } ] +`; diff --git a/src/helpers/code-builder.js b/src/helpers/code-builder.js deleted file mode 100644 index c1a75e86d..000000000 --- a/src/helpers/code-builder.js +++ /dev/null @@ -1,103 +0,0 @@ -'use strict' - -const util = require('util') - -/** - * Helper object to format and aggragate lines of code. - * Lines are aggregated in a `code` array, and need to be joined to obtain a proper code snippet. - * - * @class - * - * @param {string} indentation Desired indentation character for aggregated lines of code - * @param {string} join Desired character to join each line of code - */ -const CodeBuilder = function (indentation, join) { - this.code = [] - this.indentation = indentation - this.lineJoin = join || '\n' -} - -/** - * Add given indentation level to given string and format the string (variadic) - * @param {number} [indentationLevel=0] - Desired level of indentation for this line - * @param {string} line - Line of code. Can contain formatting placeholders - * @param {...anyobject} - Parameter to bind to `line`'s formatting placeholders - * @return {string} - * - * @example - * var builder = CodeBuilder('\t') - * - * builder.buildLine('console.log("hello world")') - * // returns: 'console.log("hello world")' - * - * builder.buildLine(2, 'console.log("hello world")') - * // returns: 'console.log("\t\thello world")' - * - * builder.buildLine(2, 'console.log("%s %s")', 'hello', 'world') - * // returns: 'console.log("\t\thello world")' - */ -CodeBuilder.prototype.buildLine = function (indentationLevel, line) { - let lineIndentation = '' - let slice = 2 - if (Object.prototype.toString.call(indentationLevel) === '[object String]') { - slice = 1 - line = indentationLevel - indentationLevel = 0 - } else if (indentationLevel === null) { - return null - } - - while (indentationLevel) { - lineIndentation += this.indentation - indentationLevel-- - } - - const format = Array.prototype.slice.call(arguments, slice, arguments.length) - format.unshift(lineIndentation + line) - - return util.format.apply(this, format) -} - -/** - * Invoke buildLine() and add the line at the top of current lines - * @param {number} [indentationLevel=0] Desired level of indentation for this line - * @param {string} line Line of code - * @return {this} - */ -CodeBuilder.prototype.unshift = function () { - this.code.unshift(this.buildLine.apply(this, arguments)) - - return this -} - -/** - * Invoke buildLine() and add the line at the bottom of current lines - * @param {number} [indentationLevel=0] Desired level of indentation for this line - * @param {string} line Line of code - * @return {this} - */ -CodeBuilder.prototype.push = function () { - this.code.push(this.buildLine.apply(this, arguments)) - - return this -} - -/** - * Add an empty line at the end of current lines - * @return {this} - */ -CodeBuilder.prototype.blank = function () { - this.code.push(null) - - return this -} - -/** - * Concatenate all current lines using the given lineJoin - * @return {string} - */ -CodeBuilder.prototype.join = function () { - return this.code.join(this.lineJoin) -} - -module.exports = CodeBuilder diff --git a/src/helpers/code-builder.test.ts b/src/helpers/code-builder.test.ts new file mode 100644 index 000000000..0873da4c2 --- /dev/null +++ b/src/helpers/code-builder.test.ts @@ -0,0 +1,21 @@ +import { CodeBuilder } from './code-builder'; + +describe('codeBuilder', () => { + describe('indentLine', () => { + const indent = '\t'; + const builder = new CodeBuilder({ indent }); + const line = 'console.log("hello world")'; + + it('handles a single argument', () => { + const result = builder.indentLine(line); + + expect(result).toStrictEqual(line); + }); + + it('handels indentation', () => { + const result = builder.indentLine(line, 2); + + expect(result).toBe(`${indent.repeat(2)}${line}`); + }); + }); +}); diff --git a/src/helpers/code-builder.ts b/src/helpers/code-builder.ts new file mode 100644 index 000000000..65e5917ea --- /dev/null +++ b/src/helpers/code-builder.ts @@ -0,0 +1,67 @@ +const DEFAULT_INDENTATION_CHARACTER = ''; +const DEFAULT_LINE_JOIN = '\n'; + +export interface CodeBuilderOptions { + /** + * Desired indentation character for aggregated lines of code + * @default '' + */ + indent?: string; + + /** + * Desired character to join each line of code + * @default \n + */ + join?: string; +} + +export class CodeBuilder { + code: string[] = []; + indentationCharacter: string = DEFAULT_INDENTATION_CHARACTER; + lineJoin = DEFAULT_LINE_JOIN; + + /** + * Helper object to format and aggragate lines of code. + * Lines are aggregated in a `code` array, and need to be joined to obtain a proper code snippet. + */ + constructor({ indent, join }: CodeBuilderOptions = {}) { + this.indentationCharacter = indent || DEFAULT_INDENTATION_CHARACTER; + this.lineJoin = join || DEFAULT_LINE_JOIN; + } + + /** + * Add given indentation level to given line of code + */ + indentLine = (line: string, indentationLevel = 0) => { + const indent = this.indentationCharacter.repeat(indentationLevel); + return `${indent}${line}`; + }; + + /** + * Add the line at the beginning of the current lines + */ + unshift = (line: string, indentationLevel?: number) => { + const newLine = this.indentLine(line, indentationLevel); + this.code.unshift(newLine); + }; + + /** + * Add the line at the end of the current lines + */ + push = (line: string, indentationLevel?: number) => { + const newLine = this.indentLine(line, indentationLevel); + this.code.push(newLine); + }; + + /** + * Add an empty line at the end of current lines + */ + blank = () => { + this.code.push(''); + }; + + /** + * Concatenate all current lines using the given lineJoin + */ + join = () => this.code.join(this.lineJoin); +} diff --git a/src/helpers/form-data.js b/src/helpers/form-data.ts similarity index 50% rename from src/helpers/form-data.js rename to src/helpers/form-data.ts index 73689f7b2..d367489ce 100644 --- a/src/helpers/form-data.js +++ b/src/helpers/form-data.ts @@ -26,80 +26,50 @@ * Extracted from https://github.com/node-fetch/node-fetch/blob/64c5c296a0250b852010746c76144cb9e14698d9/src/utils/form-data.js */ -const carriage = '\r\n' -const dashes = '-'.repeat(2) +import type FormData from 'form-data'; -const NAME = Symbol.toStringTag +const carriage = '\r\n'; +const dashes = '-'.repeat(2); -const isBlob = object => { - return ( - typeof object === 'object' && - typeof object.arrayBuffer === 'function' && - typeof object.type === 'string' && - typeof object.stream === 'function' && - typeof object.constructor === 'function' && - /^(Blob|File)$/.test(object[NAME]) - ) -} +const NAME = Symbol.toStringTag; -/** - * @param {string} boundary - */ -const getFooter = boundary => `${dashes}${boundary}${dashes}${carriage.repeat(2)}` +export const isBlob = (object: any) => + typeof object === 'object' && + typeof object.arrayBuffer === 'function' && + typeof object.type === 'string' && + typeof object.stream === 'function' && + typeof object.constructor === 'function' && + /^(Blob|File)$/.test(object[NAME]); -/** - * @param {string} boundary - * @param {string} name - * @param {*} field - * - * @return {string} - */ -function getHeader (boundary, name, field) { - let header = '' - - header += `${dashes}${boundary}${carriage}` - header += `Content-Disposition: form-data; name="${name}"` +const getFooter = (boundary: string) => `${dashes}${boundary}${dashes}${carriage.repeat(2)}`; - if (isBlob(field)) { - header += `; filename="${field.name}"${carriage}` - header += `Content-Type: ${field.type || 'application/octet-stream'}` - } +const getHeader = (boundary: string, name: string, field: { name: string; type: string }) => { + let header = ''; - return `${header}${carriage.repeat(2)}` -} + header += `${dashes}${boundary}${carriage}`; + header += `Content-Disposition: form-data; name="${name}"`; -/** - * @return {string} - */ -module.exports.getBoundary = () => { - // This generates a 50 character boundary similar to those used by Firefox. - // They are optimized for boyer-moore parsing. - let boundary = '--------------------------' - for (let i = 0; i < 24; i++) { - boundary += Math.floor(Math.random() * 10).toString(16) + if (isBlob(field)) { + header += `; filename="${field.name}"${carriage}`; + header += `Content-Type: ${field.type || 'application/octet-stream'}`; } - return boundary -} + return `${header}${carriage.repeat(2)}`; +}; -/** - * @param {FormData} form - * @param {string} boundary - */ -module.exports.formDataIterator = function * (form, boundary) { +export const formDataIterator = function* (form: FormData, boundary: string) { + // @ts-expect-error not sure how this ever worked for (const [name, value] of form) { - yield getHeader(boundary, name, value) + yield getHeader(boundary, name, value); if (isBlob(value)) { - yield * value.stream() + yield* value.stream(); } else { - yield value + yield value; } - yield carriage + yield carriage; } - yield getFooter(boundary) -} - -module.exports.isBlob = isBlob + yield getFooter(boundary); +}; diff --git a/src/helpers/har-validator.ts b/src/helpers/har-validator.ts new file mode 100644 index 000000000..45d802717 --- /dev/null +++ b/src/helpers/har-validator.ts @@ -0,0 +1,31 @@ +import Ajv, { ErrorObject } from 'ajv'; +import { Request } from 'har-format'; +import * as schema from 'har-schema'; + +export class HARError extends Error { + name = 'HARError'; + message = 'validation failed'; + errors: ErrorObject[] = []; + constructor(errors: ErrorObject[]) { + super(); + this.errors = errors; + Error.captureStackTrace(this, this.constructor); + } +} + +const ajv = new Ajv({ + allErrors: true, +}); +ajv.addSchema(schema); + +export const validateHarRequest = (request: any): request is Request => { + const validate = ajv.getSchema('request.json'); + if (!validate) { + throw new Error('failed to find HAR request schema'); + } + const valid = validate(request); + if (!valid && validate.errors) { + throw new HARError(validate.errors); + } + return true; +}; diff --git a/src/helpers/headers.js b/src/helpers/headers.js deleted file mode 100644 index c37701adf..000000000 --- a/src/helpers/headers.js +++ /dev/null @@ -1,39 +0,0 @@ -module.exports = { - /** - * Given a headers object retrieve the contents of a header out of it via a case-insensitive key. - * - * @param {object} headers - * @param {string} name - * @return {string} - */ - getHeader: (headers, name) => { - return headers[Object.keys(headers).find(k => k.toLowerCase() === name.toLowerCase())] - }, - - /** - * Given a headers object retrieve a specific header out of it via a case-insensitive key. - * - * @param {object} headers - * @param {string} name - * @return {string} - */ - getHeaderName: (headers, name) => { - // eslint-disable-next-line array-callback-return - return Object.keys(headers).find(k => { - if (k.toLowerCase() === name.toLowerCase()) { - return k - } - }) - }, - - /** - * Determine if a given case-insensitive header exists within a header object. - * - * @param {object} headers - * @param {string} name - * @return {(integer|boolean)} - */ - hasHeader: (headers, name) => { - return Boolean(Object.keys(headers).find(k => k.toLowerCase() === name.toLowerCase())) - } -} diff --git a/src/helpers/headers.test.ts b/src/helpers/headers.test.ts new file mode 100644 index 000000000..c6853e1b2 --- /dev/null +++ b/src/helpers/headers.test.ts @@ -0,0 +1,39 @@ +import { getHeader, getHeaderName, hasHeader } from './headers'; + +const headers = { + 'Content-Type': 'multipart/form-data; boundary=---011000010111000001101001', + accept: 'application/json', +}; + +describe('headers', () => { + describe('getHeader', () => { + it('should get a header', () => { + expect(getHeader(headers, 'content-type')).toBe( + 'multipart/form-data; boundary=---011000010111000001101001', + ); + expect(getHeader(headers, 'content-TYPE')).toBe( + 'multipart/form-data; boundary=---011000010111000001101001', + ); + expect(getHeader(headers, 'Accept')).toBe('application/json'); + expect(getHeader(headers, 'authorization')).toBeUndefined(); + }); + }); + + describe('getHeaderName', () => { + it('should get a header name', () => { + expect(getHeaderName(headers, 'content-type')).toBe('Content-Type'); + expect(getHeaderName(headers, 'content-TYPE')).toBe('Content-Type'); + expect(getHeaderName(headers, 'Accept')).toBe('accept'); + expect(getHeaderName(headers, 'authorization')).toBeUndefined(); + }); + }); + + describe('hasHeader', () => { + it('should return if a header is present', () => { + expect(hasHeader(headers, 'content-type')).toBe(true); + expect(hasHeader(headers, 'content-TYPE')).toBe(true); + expect(hasHeader(headers, 'Accept')).toBe(true); + expect(hasHeader(headers, 'authorization')).toBe(false); + }); + }); +}); diff --git a/src/helpers/headers.ts b/src/helpers/headers.ts new file mode 100644 index 000000000..662746330 --- /dev/null +++ b/src/helpers/headers.ts @@ -0,0 +1,24 @@ +type Headers = Record; + +/** + * Given a headers object retrieve a specific header out of it via a case-insensitive key. + */ +export const getHeaderName = (headers: Headers, name: string) => + Object.keys(headers).find(header => header.toLowerCase() === name.toLowerCase()); + +/** + * Given a headers object retrieve the contents of a header out of it via a case-insensitive key. + */ +export const getHeader = (headers: Headers, name: string) => { + const headerName = getHeaderName(headers, name); + if (!headerName) { + return undefined; + } + return headers[headerName]; +}; + +/** + * Determine if a given case-insensitive header exists within a header object. + */ +export const hasHeader = (headers: Headers, name: string) => + Boolean(getHeaderName(headers, name)); diff --git a/src/helpers/reducer.js b/src/helpers/reducer.js deleted file mode 100644 index 30c854980..000000000 --- a/src/helpers/reducer.js +++ /dev/null @@ -1,24 +0,0 @@ -'use strict' - -module.exports = function (obj, pair) { - if (obj[pair.name] === undefined) { - obj[pair.name] = pair.value - return obj - } - - // If we already have it as array just push the value - if (obj[pair.name] instanceof Array) { - obj[pair.name].push(pair.value) - return obj - } - - // convert to array - const arr = [ - obj[pair.name], - pair.value - ] - - obj[pair.name] = arr - - return obj -} diff --git a/src/helpers/reducer.test.ts b/src/helpers/reducer.test.ts new file mode 100644 index 000000000..549014966 --- /dev/null +++ b/src/helpers/reducer.test.ts @@ -0,0 +1,27 @@ +import { reducer } from './reducer'; + +describe('reducer', () => { + it('should convert array object pair to key-value object', () => { + const query = [ + { name: 'key', value: 'value' }, + { name: 'foo', value: 'bar' }, + ]; + + const result = query.reduce(reducer, {}); + + expect(result).toMatchObject({ key: 'value', foo: 'bar' }); + }); + + it('should convert multi-dimensional arrays to key=[array] object', () => { + const query = [ + { name: 'key', value: 'value' }, + { name: 'foo', value: 'bar1' }, + { name: 'foo', value: 'bar2' }, + { name: 'foo', value: 'bar3' }, + ]; + + const result = query.reduce(reducer, {}); + + expect(result).toMatchObject({ key: 'value', foo: ['bar1', 'bar2', 'bar3'] }); + }); +}); diff --git a/src/helpers/reducer.ts b/src/helpers/reducer.ts new file mode 100644 index 000000000..0aecf53fc --- /dev/null +++ b/src/helpers/reducer.ts @@ -0,0 +1,22 @@ +export type ReducedHelperObject = Record; + +export const reducer = ( + accumulator: ReducedHelperObject, + pair: T, +) => { + const currentValue = accumulator[pair.name]; + if (currentValue === undefined) { + accumulator[pair.name] = pair.value; + return accumulator; + } + + // If we already have it as array just push the value + if (Array.isArray(currentValue)) { + currentValue.push(pair.value); + return accumulator; + } + + // convert to array since now we have more than one value for this key + accumulator[pair.name] = [currentValue, pair.value]; + return accumulator; +}; diff --git a/src/helpers/shell.js b/src/helpers/shell.js deleted file mode 100644 index e20783831..000000000 --- a/src/helpers/shell.js +++ /dev/null @@ -1,25 +0,0 @@ -'use strict' - -const util = require('util') - -module.exports = { - /** - * Use 'strong quoting' using single quotes so that we only need - * to deal with nested single quote characters. - * http://wiki.bash-hackers.org/syntax/quoting#strong_quoting - */ - quote: function (value) { - const safe = /^[a-z0-9-_/.@%^=:]+$/i - - // Unless `value` is a simple shell-safe string, quote it. - if (!safe.test(value)) { - return util.format('\'%s\'', value.replace(/'/g, "'\\''")) - } - - return value - }, - - escape: function (value) { - return value.replace(/\r/g, '\\r').replace(/\n/g, '\\n') - } -} diff --git a/src/helpers/shell.ts b/src/helpers/shell.ts new file mode 100644 index 000000000..5f8b7e1cb --- /dev/null +++ b/src/helpers/shell.ts @@ -0,0 +1,18 @@ +/** + * Use 'strong quoting' using single quotes so that we only need to deal with nested single quote characters. + * see: http://wiki.bash-hackers.org/syntax/quoting#strong_quoting + */ +export const quote = (value = '') => { + const safe = /^[a-z0-9-_/.@%^=:]+$/i; + + const isShellSafe = safe.test(value); + + if (isShellSafe) { + return value; + } + + // if the value is not shell safe, then quote it + return `'${value.replace(/'/g, "'\\''")}'`; +}; + +export const escape = (value: string) => value.replace(/\r/g, '\\r').replace(/\n/g, '\\n'); diff --git a/src/helpers/utils.test.ts b/src/helpers/utils.test.ts new file mode 100644 index 000000000..0fc3eb854 --- /dev/null +++ b/src/helpers/utils.test.ts @@ -0,0 +1,19 @@ +import { availableTargets, extname } from './utils'; + +describe('availableTargets', () => { + it('returns all available targets', () => { + expect(availableTargets()).toMatchSnapshot(); + }); +}); + +describe('extname', () => { + it('returns the correct extension', () => { + expect(extname('c')).toBe('.c'); + expect(extname('clojure')).toBe('.clj'); + }); + + it('returns empty string if the extension is not found', () => { + // @ts-expect-error intentionally incorrect + expect(extname('ziltoid')).toBe(''); + }); +}); diff --git a/src/helpers/utils.ts b/src/helpers/utils.ts new file mode 100644 index 000000000..ebc65a437 --- /dev/null +++ b/src/helpers/utils.ts @@ -0,0 +1,15 @@ +import { ClientInfo, TargetId, TargetInfo, targets } from '../targets/targets'; + +export interface AvailableTarget extends TargetInfo { + clients: ClientInfo[]; +} + +export const availableTargets = () => + Object.keys(targets).map(targetId => ({ + ...targets[targetId as TargetId].info, + clients: Object.keys(targets[targetId as TargetId].clientsById).map( + clientId => targets[targetId as TargetId].clientsById[clientId].info, + ), + })); + +export const extname = (targetId: TargetId) => targets[targetId]?.info.extname || ''; diff --git a/src/httpsnippet.test.ts b/src/httpsnippet.test.ts new file mode 100644 index 000000000..2be95ce2b --- /dev/null +++ b/src/httpsnippet.test.ts @@ -0,0 +1,220 @@ +import { mimetypes } from './fixtures/mimetypes'; +import headers from './fixtures/requests/headers.json'; +import query from './fixtures/requests/query.json'; +import short from './fixtures/requests/short.json'; +import { HTTPSnippet, Request } from './httpsnippet'; + +describe('hTTPSnippet', () => { + it('should return false if no matching target', () => { + const snippet = new HTTPSnippet(short as Request); + // @ts-expect-error intentionally incorrect + const result = snippet.convert(null); + + expect(result).toBe(false); + }); + + it('should fail validation for non-HAR inputs', () => { + expect.assertions(1); + + // @ts-expect-error intentionally incorrect + const attempt = () => new HTTPSnippet({ ziltoid: 'the omniscient' }); + + expect(attempt).toThrow('validation failed'); + }); + + it('should parse HAR file with multiple entries', () => { + const snippet = new HTTPSnippet({ + log: { + version: '1.2', + creator: { + name: 'HTTPSnippet', + version: '1.0.0', + }, + entries: [ + { + request: { + method: 'GET', + url: 'http://mockbin.com/har', + }, + }, + { + request: { + method: 'POST', + url: 'http://mockbin.com/har', + }, + }, + ], + }, + }); + + expect(snippet).toHaveProperty('requests'); + expect(Array.isArray(snippet.requests)).toBeTruthy(); + expect(snippet.requests).toHaveLength(2); + }); + + describe('mimetype conversion', () => { + it.each([ + { + input: 'multipart/mixed', + expected: 'multipart/form-data', + }, + { + input: 'multipart/related', + expected: 'multipart/form-data', + }, + { + input: 'multipart/alternative', + expected: 'multipart/form-data', + }, + { + input: 'text/json', + expected: 'application/json', + }, + { + input: 'text/x-json', + expected: 'application/json', + }, + { + input: 'application/x-json', + expected: 'application/json', + }, + { + input: 'invalid-json', + expected: 'text/plain', + }, + ] as { + input: keyof typeof mimetypes; + expected: string; + }[])(`mimetype conversion of $input to $output`, ({ input, expected }) => { + const snippet = new HTTPSnippet(mimetypes[input]); + const request = snippet.requests[0]; + + expect(request.postData.mimeType).toStrictEqual(expected); + }); + }); + + it('should set postData.text to empty string when postData.params is undefined in application/x-www-form-urlencoded', () => { + const snippet = new HTTPSnippet(mimetypes['application/x-www-form-urlencoded']); + const request = snippet.requests[0]; + + expect(request.postData.text).toBe(''); + }); + + describe('requestExtras', () => { + describe('uriObj', () => { + it('should add uriObj', () => { + const snippet = new HTTPSnippet(query as Request); + const request = snippet.requests[0]; + + expect(request.uriObj).toMatchObject({ + auth: null, + hash: null, + host: 'mockbin.com', + hostname: 'mockbin.com', + href: 'http://mockbin.com/har?key=value', + path: '/har?foo=bar&foo=baz&baz=abc&key=value', + pathname: '/har', + port: null, + protocol: 'http:', + query: { + baz: 'abc', + key: 'value', + foo: ['bar', 'baz'], + }, + search: 'foo=bar&foo=baz&baz=abc&key=value', + slashes: true, + }); + }); + + it('should fix the `path` propety of uriObj to match queryString', () => { + const snippet = new HTTPSnippet(query as Request); + const request = snippet.requests[0]; + + expect(request.uriObj.path).toBe('/har?foo=bar&foo=baz&baz=abc&key=value'); + }); + }); + + describe('queryObj', () => { + it('should add queryObj', () => { + const snippet = new HTTPSnippet(query as Request); + const request = snippet.requests[0]; + + expect(request.queryObj).toMatchObject({ baz: 'abc', key: 'value', foo: ['bar', 'baz'] }); + }); + }); + + describe('headersObj', () => { + it('should add headersObj', () => { + const snippet = new HTTPSnippet(headers as Request); + const request = snippet.requests[0]; + + expect(request.headersObj).toMatchObject({ + accept: 'application/json', + 'x-foo': 'Bar', + }); + }); + + it('should add headersObj to source object case insensitive when HTTP/1.0', () => { + const snippet = new HTTPSnippet({ + ...headers, + httpVersion: 'HTTP/1.1', + headers: [ + ...headers.headers, + { + name: 'Kong-Admin-Token', + value: 'Ziltoid The Omniscient', + }, + ], + } as Request); + + const request = snippet.requests[0]; + + expect(request.headersObj).toMatchObject({ + 'Kong-Admin-Token': 'Ziltoid The Omniscient', + accept: 'application/json', + 'x-foo': 'Bar', + }); + }); + + it('should add headersObj to source object lowercased when HTTP/2.x', () => { + const snippet = new HTTPSnippet({ + ...headers, + httpVersion: 'HTTP/2', + headers: [ + ...headers.headers, + { + name: 'Kong-Admin-Token', + value: 'Ziltoid The Omniscient', + }, + ], + } as Request); + + const request = snippet.requests[0]; + + expect(request.headersObj).toMatchObject({ + 'kong-admin-token': 'Ziltoid The Omniscient', + accept: 'application/json', + 'x-foo': 'Bar', + }); + }); + }); + + describe('url', () => { + it('shoudl modify the original url to strip query string', () => { + const snippet = new HTTPSnippet(query as Request); + const request = snippet.requests[0]; + + expect(request.url).toBe('http://mockbin.com/har'); + }); + }); + + describe('fullUrl', () => { + it('adds fullURL', () => { + const snippet = new HTTPSnippet(query as Request); + const request = snippet.requests[0]; + + expect(request.fullUrl).toBe('http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value'); + }); + }); + }); +}); diff --git a/src/httpsnippet.ts b/src/httpsnippet.ts new file mode 100644 index 000000000..8d315a5cf --- /dev/null +++ b/src/httpsnippet.ts @@ -0,0 +1,336 @@ +import { map as eventStreamMap } from 'event-stream'; +import FormData from 'form-data'; +import { Param, PostDataCommon, Request as NpmHarRequest } from 'har-format'; +import { stringify as queryStringify } from 'querystring'; +import { format as urlFormat, parse as urlParse, UrlWithParsedQuery } from 'url'; + +import { formDataIterator, isBlob } from './helpers/form-data'; +import { validateHarRequest } from './helpers/har-validator'; +import { getHeaderName } from './helpers/headers'; +import { ReducedHelperObject, reducer } from './helpers/reducer'; +import { ClientId, TargetId, targets } from './targets/targets'; + +export { availableTargets, extname } from './helpers/utils'; +export { addTarget, addTargetClient } from './targets/targets'; + +const DEBUG_MODE = false; + +const debug = { + // eslint-disable-next-line @typescript-eslint/no-empty-function -- intentional noop + info: DEBUG_MODE ? console.info : () => {}, +}; + +/** is this wrong? yes. according to the spec (http://www.softwareishard.com/blog/har-12-spec/#postData) it's technically wrong since `params` and `text` are (by the spec) mutually exclusive. However, in practice, this is not what is often the case. + * + * In general, this library takes a _descriptive_ rather than _perscriptive_ approach (see https://amyrey.web.unc.edu/classes/ling-101-online/tutorials/understanding-prescriptive-vs-descriptive-grammar/). + * + * Then, in addition to that, it really adds to complexity with TypeScript (TypeScript takes this constraint very very seriously) in a way that's not actually super useful. So, we treat this object as though it could have both or either of `params` and/or `text`. + */ +type PostDataBase = PostDataCommon & { + text?: string; + params?: Param[]; +}; + +export type HarRequest = Omit & { postData: PostDataBase }; + +export interface RequestExtras { + postData: PostDataBase & { + jsonObj?: ReducedHelperObject; + paramsObj?: ReducedHelperObject; + boundary?: string; + }; + fullUrl: string; + queryObj: ReducedHelperObject; + headersObj: ReducedHelperObject; + uriObj: UrlWithParsedQuery; + cookiesObj: ReducedHelperObject; + allHeaders: ReducedHelperObject; +} + +export type Request = HarRequest & RequestExtras; + +interface Entry { + request: Partial; +} + +interface HarEntry { + log: { + version: string; + creator: { + name: string; + version: string; + }; + entries: Entry[]; + }; +} + +const isHarEntry = (value: any): value is HarEntry => + typeof value === 'object' && + 'log' in value && + typeof value.log === 'object' && + 'entries' in value.log && + Array.isArray(value.log.entries); + +export class HTTPSnippet { + requests: Request[] = []; + + constructor(input: HarEntry | HarRequest) { + let entries: Entry[] = []; + + // prep the main container + this.requests = []; + + // is it har? + if (isHarEntry(input)) { + entries = input.log.entries; + } else { + entries = [ + { + request: input, + }, + ]; + } + + entries.forEach(({ request }) => { + // add optional properties to make validation successful + const req = { + bodySize: 0, + headersSize: 0, + headers: [], + cookies: [], + httpVersion: 'HTTP/1.1', + queryString: [], + postData: { + mimeType: request.postData?.mimeType || 'application/octet-stream', + }, + ...request, + }; + + if (validateHarRequest(req)) { + this.requests.push(this.prepare(req)); + } + }); + } + + prepare = (harRequest: HarRequest) => { + const request: Request = { + ...harRequest, + fullUrl: '', + uriObj: {} as UrlWithParsedQuery, + queryObj: {}, + headersObj: {}, + cookiesObj: {}, + allHeaders: {}, + }; + + // construct query objects + if (request.queryString && request.queryString.length) { + debug.info('queryString found, constructing queryString pair map'); + + request.queryObj = request.queryString.reduce(reducer, {}); + } + + // construct headers objects + if (request.headers && request.headers.length) { + const http2VersionRegex = /^HTTP\/2/; + request.headersObj = request.headers.reduce((accumulator, { name, value }) => { + const headerName = http2VersionRegex.exec(request.httpVersion) + ? name.toLocaleLowerCase() + : name; + return { + ...accumulator, + [headerName]: value, + }; + }, {}); + } + + // construct headers objects + if (request.cookies && request.cookies.length) { + request.cookiesObj = request.cookies.reduceRight( + (accumulator, { name, value }) => ({ + ...accumulator, + [name]: value, + }), + {}, + ); + } + + // construct Cookie header + const cookies = request.cookies?.map( + ({ name, value }) => `${encodeURIComponent(name)}=${encodeURIComponent(value)}`, + ); + + if (cookies?.length) { + request.allHeaders.cookie = cookies.join('; '); + } + + switch (request.postData.mimeType) { + case 'multipart/mixed': + case 'multipart/related': + case 'multipart/form-data': + case 'multipart/alternative': + // reset values + request.postData.text = ''; + request.postData.mimeType = 'multipart/form-data'; + + if (request.postData?.params) { + const form = new FormData(); + + // The `form-data` module returns one of two things: a native FormData object, or its own polyfill + // Since the polyfill does not support the full API of the native FormData object, when this library is running in a browser environment it'll fail on two things: + // + // 1. The API for `form.append()` has three arguments and the third should only be present when the second is a + // Blob or USVString. + // 1. `FormData.pipe()` isn't a function. + // + // Since the native FormData object is iterable, we easily detect what version of `form-data` we're working with here to allow `multipart/form-data` requests to be compiled under both browser and Node environments. + // + // This hack is pretty awful but it's the only way we can use this library in the browser as if we code this against just the native FormData object, we can't polyfill that back into Node because Blob and File objects, which something like `formdata-polyfill` requires, don't exist there. + // @ts-expect-error TODO + const isNativeFormData = typeof form[Symbol.iterator] === 'function'; + + // TODO: THIS ABSOLUTELY MUST BE REMOVED. + // IT BREAKS SOME USE-CASES FOR MULTIPART FORMS THAT DEPEND ON BEING ABLE TO SET THE BOUNDARY. + // easter egg + const boundary = '---011000010111000001101001'; // this is binary for "api". yep. + if (!isNativeFormData) { + // @ts-expect-error THIS IS WRONG. VERY WRONG. + form._boundary = boundary; + } + + request.postData?.params.forEach(param => { + const name = param.name; + const value = param.value || ''; + const filename = param.fileName || null; + + if (isNativeFormData) { + if (isBlob(value)) { + // @ts-expect-error TODO + form.append(name, value, filename); + } else { + form.append(name, value); + } + } else { + form.append(name, value, { + // @ts-expect-error TODO + filename, + // @ts-expect-error TODO + contentType: param.contentType || null, + }); + } + }); + + if (isNativeFormData) { + for (const data of formDataIterator(form, boundary)) { + request.postData.text += data; + } + } else { + form.pipe( + // @ts-expect-error TODO + eventStreamMap(data => { + request.postData.text += data; + }), + ); + } + + request.postData.boundary = boundary; + + // Since headers are case-sensitive we need to see if there's an existing `Content-Type` header that we can override. + const contentTypeHeader = + getHeaderName(request.headersObj, 'content-type') || 'content-type'; + + request.headersObj[contentTypeHeader] = `multipart/form-data; boundary=${boundary}`; + } + break; + + case 'application/x-www-form-urlencoded': + if (!request.postData.params) { + request.postData.text = ''; + } else { + // @ts-expect-error the `har-format` types make this challenging + request.postData.paramsObj = request.postData.params.reduce(reducer, {}); + + // always overwrite + request.postData.text = queryStringify(request.postData.paramsObj); + } + break; + + case 'text/json': + case 'text/x-json': + case 'application/json': + case 'application/x-json': + request.postData.mimeType = 'application/json'; + + if (request.postData.text) { + try { + request.postData.jsonObj = JSON.parse(request.postData.text); + } catch (e) { + debug.info(e); + + // force back to `text/plain` if headers have proper content-type value, then this should also work + request.postData.mimeType = 'text/plain'; + } + } + break; + } + + // create allHeaders object + const allHeaders = { + ...request.allHeaders, + ...request.headersObj, + }; + + const urlWithParsedQuery = urlParse(request.url, true, true); //? + + // query string key/value pairs in with literal querystrings containd within the url + request.queryObj = { + ...request.queryObj, + ...(urlWithParsedQuery.query as ReducedHelperObject), + }; //? + + // reset uriObj values for a clean url + const search = queryStringify(request.queryObj); + + const uriObj = { + ...urlWithParsedQuery, + query: request.queryObj, + search, + path: search ? `${urlWithParsedQuery.pathname}?${search}` : urlWithParsedQuery.pathname, + }; + + // keep the base url clean of queryString + const url = urlFormat({ + ...urlWithParsedQuery, + query: null, + search: null, + }); //? + + const fullUrl = urlFormat({ + ...urlWithParsedQuery, + ...uriObj, + }); //? + + return { + ...request, + allHeaders, + fullUrl, + url, + uriObj, + }; + }; + + convert = (targetId: TargetId, clientId?: ClientId, options?: any) => { + if (!options && clientId) { + options = clientId; + } + + const target = targets[targetId]; + if (!target) { + return false; + } + + const { convert } = target.clientsById[clientId || target.info.default]; + const results = this.requests.map(request => convert(request, options)); + return results.length === 1 ? results[0] : results; + }; +} diff --git a/src/index.js b/src/index.js deleted file mode 100644 index c8ebfc894..000000000 --- a/src/index.js +++ /dev/null @@ -1,332 +0,0 @@ -/* eslint-env browser */ - -'use strict' - -const debug = require('debug')('httpsnippet') -const es = require('event-stream') -const MultiPartForm = require('form-data') -const qs = require('querystring') -const reducer = require('./helpers/reducer') -const helpers = require('./helpers/headers') -const targets = require('./targets') -const url = require('url') -const validate = require('har-validator/lib/async') - -const { formDataIterator, isBlob } = require('./helpers/form-data.js') - -// constructor -const HTTPSnippet = function (data) { - let entries - const self = this - const input = Object.assign({}, data) - - // prep the main container - self.requests = [] - - // is it har? - if (input.log && input.log.entries) { - entries = input.log.entries - } else { - entries = [{ - request: input - }] - } - - entries.forEach(function (entry) { - // add optional properties to make validation successful - entry.request.httpVersion = entry.request.httpVersion || 'HTTP/1.1' - entry.request.queryString = entry.request.queryString || [] - entry.request.headers = entry.request.headers || [] - entry.request.cookies = entry.request.cookies || [] - entry.request.postData = entry.request.postData || {} - entry.request.postData.mimeType = entry.request.postData.mimeType || 'application/octet-stream' - - entry.request.bodySize = 0 - entry.request.headersSize = 0 - entry.request.postData.size = 0 - - validate.request(entry.request, function (err, valid) { - if (!valid) { - throw err - } - - self.requests.push(self.prepare(entry.request)) - }) - }) -} - -HTTPSnippet.prototype.prepare = function (request) { - // construct utility properties - request.queryObj = {} - request.headersObj = {} - request.cookiesObj = {} - request.allHeaders = {} - request.postData.jsonObj = false - request.postData.paramsObj = false - - // construct query objects - if (request.queryString && request.queryString.length) { - debug('queryString found, constructing queryString pair map') - - request.queryObj = request.queryString.reduce(reducer, {}) - } - - // construct headers objects - if (request.headers && request.headers.length) { - const http2VersionRegex = /^HTTP\/2/ - request.headersObj = request.headers.reduce(function (headers, header) { - let headerName = header.name - if (request.httpVersion.match(http2VersionRegex)) { - headerName = headerName.toLowerCase() - } - - headers[headerName] = header.value - return headers - }, {}) - } - - // construct headers objects - if (request.cookies && request.cookies.length) { - request.cookiesObj = request.cookies.reduceRight(function (cookies, cookie) { - cookies[cookie.name] = cookie.value - return cookies - }, {}) - } - - // construct Cookie header - const cookies = request.cookies.map(function (cookie) { - return encodeURIComponent(cookie.name) + '=' + encodeURIComponent(cookie.value) - }) - - if (cookies.length) { - request.allHeaders.cookie = cookies.join('; ') - } - - switch (request.postData.mimeType) { - case 'multipart/mixed': - case 'multipart/related': - case 'multipart/form-data': - case 'multipart/alternative': - // reset values - request.postData.text = '' - request.postData.mimeType = 'multipart/form-data' - - if (request.postData.params) { - const form = new MultiPartForm() - - // The `form-data` module returns one of two things: a native FormData object, or its own polyfill. Since the - // polyfill does not support the full API of the native FormData object, when this library is running in a - // browser environment it'll fail on two things: - // - // - The API for `form.append()` has three arguments and the third should only be present when the second is a - // Blob or USVString. - // - `FormData.pipe()` isn't a function. - // - // Since the native FormData object is iterable, we easily detect what version of `form-data` we're working - // with here to allow `multipart/form-data` requests to be compiled under both browser and Node environments. - // - // This hack is pretty awful but it's the only way we can use this library in the browser as if we code this - // against just the native FormData object, we can't polyfill that back into Node because Blob and File objects, - // which something like `formdata-polyfill` requires, don't exist there. - const isNativeFormData = (typeof form[Symbol.iterator] === 'function') - - // easter egg - const boundary = '---011000010111000001101001' - if (!isNativeFormData) { - form._boundary = boundary - } - - request.postData.params.forEach(function (param) { - const name = param.name - const value = param.value || '' - const filename = param.fileName || null - - if (isNativeFormData) { - if (isBlob(value)) { - form.append(name, value, filename) - } else { - form.append(name, value) - } - } else { - form.append(name, value, { - filename: filename, - contentType: param.contentType || null - }) - } - }) - - if (isNativeFormData) { - for (const data of formDataIterator(form, boundary)) { - request.postData.text += data - } - } else { - // eslint-disable-next-line array-callback-return - form.pipe(es.map(function (data, cb) { - request.postData.text += data - })) - } - - request.postData.boundary = boundary - - // Since headers are case-sensitive we need to see if there's an existing `Content-Type` header that we can - // override. - const contentTypeHeader = helpers.hasHeader(request.headersObj, 'content-type') - ? helpers.getHeaderName(request.headersObj, 'content-type') - : 'content-type' - - request.headersObj[contentTypeHeader] = 'multipart/form-data; boundary=' + boundary - } - break - - case 'application/x-www-form-urlencoded': - if (!request.postData.params) { - request.postData.text = '' - } else { - request.postData.paramsObj = request.postData.params.reduce(reducer, {}) - - // always overwrite - request.postData.text = qs.stringify(request.postData.paramsObj) - } - break - - case 'text/json': - case 'text/x-json': - case 'application/json': - case 'application/x-json': - request.postData.mimeType = 'application/json' - - if (request.postData.text) { - try { - request.postData.jsonObj = JSON.parse(request.postData.text) - } catch (e) { - debug(e) - - // force back to text/plain - // if headers have proper content-type value, then this should also work - request.postData.mimeType = 'text/plain' - } - } - break - } - - // create allHeaders object - request.allHeaders = Object.assign(request.allHeaders, request.headersObj) - - // deconstruct the uri - // eslint-disable-next-line node/no-deprecated-api - request.uriObj = url.parse(request.url, true, true) - - // merge all possible queryString values - request.queryObj = Object.assign(request.queryObj, request.uriObj.query) - - // reset uriObj values for a clean url - request.uriObj.query = null - request.uriObj.search = null - request.uriObj.path = request.uriObj.pathname - - // keep the base url clean of queryString - request.url = url.format(request.uriObj) - - // update the uri object - request.uriObj.query = request.queryObj - request.uriObj.search = qs.stringify(request.queryObj) - - if (request.uriObj.search) { - request.uriObj.path = request.uriObj.pathname + '?' + request.uriObj.search - } - - // construct a full url - request.fullUrl = url.format(request.uriObj) - - return request -} - -HTTPSnippet.prototype.convert = function (target, client, opts) { - if (!opts && client) { - opts = client - } - - const func = this._matchTarget(target, client) - if (func) { - const results = this.requests.map(function (request) { - return func(request, opts) - }) - - return results.length === 1 ? results[0] : results - } - - return false -} - -HTTPSnippet.prototype._matchTarget = function (target, client) { - // does it exist? - // eslint-disable-next-line no-prototype-builtins - if (!targets.hasOwnProperty(target)) { - return false - } - - // shorthand - if (typeof client === 'string' && typeof targets[target][client] === 'function') { - return targets[target][client] - } - - // default target - return targets[target][targets[target].info.default] -} - -// exports -module.exports = HTTPSnippet - -module.exports.addTarget = function (target) { - if (!('info' in target)) { - throw new Error('The supplied custom target must contain an `info` object.') - } else if (!('key' in target.info) || !('title' in target.info) || !('extname' in target.info) || !('default' in target.info)) { - throw new Error('The supplied custom target must have an `info` object with a `key`, `title`, `extname`, and `default` property.') - // eslint-disable-next-line no-prototype-builtins - } else if (targets.hasOwnProperty(target.info.key)) { - throw new Error('The supplied custom target already exists.') - } else if (Object.keys(target).length === 1) { - throw new Error('A custom target must have a client defined on it.') - } - - targets[target.info.key] = target -} - -module.exports.addTargetClient = function (target, client) { - // eslint-disable-next-line no-prototype-builtins - if (!targets.hasOwnProperty(target)) { - throw new Error(`Sorry, but no ${target} target exists to add clients to.`) - } else if (!('info' in client)) { - throw new Error('The supplied custom target client must contain an `info` object.') - } else if (!('key' in client.info) || !('title' in client.info)) { - throw new Error('The supplied custom target client must have an `info` object with a `key` and `title` property.') - // eslint-disable-next-line no-prototype-builtins - } else if (targets[target].hasOwnProperty(client.info.key)) { - throw new Error('The supplied custom target client already exists, please use a different key') - } - - targets[target][client.info.key] = client -} - -module.exports.availableTargets = function () { - return Object.keys(targets).map(function (key) { - const target = Object.assign({}, targets[key].info) - const clients = Object.keys(targets[key]) - .filter(function (prop) { - return !~['info', 'index'].indexOf(prop) - }) - .map(function (client) { - return targets[key][client].info - }) - - if (clients.length) { - target.clients = clients - } - - return target - }) -} - -module.exports.extname = function (target) { - return targets[target] ? targets[target].info.extname : '' -} diff --git a/src/targets/c/index.js b/src/targets/c/index.js deleted file mode 100644 index 0a6272651..000000000 --- a/src/targets/c/index.js +++ /dev/null @@ -1,12 +0,0 @@ -'use strict' - -module.exports = { - info: { - key: 'c', - title: 'C', - extname: '.c', - default: 'libcurl' - }, - - libcurl: require('./libcurl') -} diff --git a/src/targets/c/libcurl.js b/src/targets/c/libcurl.js deleted file mode 100644 index 1609074cf..000000000 --- a/src/targets/c/libcurl.js +++ /dev/null @@ -1,50 +0,0 @@ -'use strict' - -const CodeBuilder = require('../../helpers/code-builder') - -module.exports = function (source, options) { - const code = new CodeBuilder() - - code.push('CURL *hnd = curl_easy_init();') - .blank() - .push('curl_easy_setopt(hnd, CURLOPT_CUSTOMREQUEST, "%s");', source.method.toUpperCase()) - .push('curl_easy_setopt(hnd, CURLOPT_URL, "%s");', source.fullUrl) - - // Add headers, including the cookies - const headers = Object.keys(source.headersObj) - - // construct headers - if (headers.length) { - code.blank() - .push('struct curl_slist *headers = NULL;') - - headers.forEach(function (key) { - code.push('headers = curl_slist_append(headers, "%s: %s");', key, source.headersObj[key]) - }) - - code.push('curl_easy_setopt(hnd, CURLOPT_HTTPHEADER, headers);') - } - - // construct cookies - if (source.allHeaders.cookie) { - code.blank() - .push('curl_easy_setopt(hnd, CURLOPT_COOKIE, "%s");', source.allHeaders.cookie) - } - - if (source.postData.text) { - code.blank() - .push('curl_easy_setopt(hnd, CURLOPT_POSTFIELDS, %s);', JSON.stringify(source.postData.text)) - } - - code.blank() - .push('CURLcode ret = curl_easy_perform(hnd);') - - return code.join() -} - -module.exports.info = { - key: 'libcurl', - title: 'Libcurl', - link: 'http://curl.haxx.se/libcurl/', - description: 'Simple REST and HTTP API Client for C' -} diff --git a/src/targets/c/libcurl/client.ts b/src/targets/c/libcurl/client.ts new file mode 100644 index 000000000..686aaed53 --- /dev/null +++ b/src/targets/c/libcurl/client.ts @@ -0,0 +1,50 @@ +import { CodeBuilder } from '../../../helpers/code-builder'; +import { Client } from '../../targets'; + +export const libcurl: Client = { + info: { + key: 'libcurl', + title: 'Libcurl', + link: 'http://curl.haxx.se/libcurl', + description: 'Simple REST and HTTP API Client for C', + }, + convert: ({ method, fullUrl, headersObj, allHeaders, postData }) => { + const { push, blank, join } = new CodeBuilder(); + + push('CURL *hnd = curl_easy_init();'); + blank(); + push(`curl_easy_setopt(hnd, CURLOPT_CUSTOMREQUEST, "${method.toUpperCase()}");`); + push(`curl_easy_setopt(hnd, CURLOPT_URL, "${fullUrl}");`); + + // Add headers, including the cookies + const headers = Object.keys(headersObj); + + // construct headers + if (headers.length) { + blank(); + push('struct curl_slist *headers = NULL;'); + + headers.forEach(header => { + push(`headers = curl_slist_append(headers, "${header}: ${headersObj[header]}");`); + }); + + push('curl_easy_setopt(hnd, CURLOPT_HTTPHEADER, headers);'); + } + + // construct cookies + if (allHeaders.cookie) { + blank(); + push(`curl_easy_setopt(hnd, CURLOPT_COOKIE, "${allHeaders.cookie}");`); + } + + if (postData.text) { + blank(); + push(`curl_easy_setopt(hnd, CURLOPT_POSTFIELDS, ${JSON.stringify(postData.text)});`); + } + + blank(); + push('CURLcode ret = curl_easy_perform(hnd);'); + + return join(); + }, +}; diff --git a/test/fixtures/output/c/libcurl/application-form-encoded.c b/src/targets/c/libcurl/fixtures/application-form-encoded.c similarity index 90% rename from test/fixtures/output/c/libcurl/application-form-encoded.c rename to src/targets/c/libcurl/fixtures/application-form-encoded.c index bf14b1134..bb19b3ab2 100644 --- a/test/fixtures/output/c/libcurl/application-form-encoded.c +++ b/src/targets/c/libcurl/fixtures/application-form-encoded.c @@ -9,4 +9,4 @@ curl_easy_setopt(hnd, CURLOPT_HTTPHEADER, headers); curl_easy_setopt(hnd, CURLOPT_POSTFIELDS, "foo=bar&hello=world"); -CURLcode ret = curl_easy_perform(hnd); +CURLcode ret = curl_easy_perform(hnd); \ No newline at end of file diff --git a/test/fixtures/output/c/libcurl/application-json.c b/src/targets/c/libcurl/fixtures/application-json.c similarity index 92% rename from test/fixtures/output/c/libcurl/application-json.c rename to src/targets/c/libcurl/fixtures/application-json.c index e1318a578..9ecfebadc 100644 --- a/test/fixtures/output/c/libcurl/application-json.c +++ b/src/targets/c/libcurl/fixtures/application-json.c @@ -9,4 +9,4 @@ curl_easy_setopt(hnd, CURLOPT_HTTPHEADER, headers); curl_easy_setopt(hnd, CURLOPT_POSTFIELDS, "{\"number\":1,\"string\":\"f\\\"oo\",\"arr\":[1,2,3],\"nested\":{\"a\":\"b\"},\"arr_mix\":[1,\"a\",{\"arr_mix_nested\":{}}],\"boolean\":false}"); -CURLcode ret = curl_easy_perform(hnd); +CURLcode ret = curl_easy_perform(hnd); \ No newline at end of file diff --git a/test/fixtures/output/c/libcurl/cookies.c b/src/targets/c/libcurl/fixtures/cookies.c similarity index 84% rename from test/fixtures/output/c/libcurl/cookies.c rename to src/targets/c/libcurl/fixtures/cookies.c index 92fa7053d..31395c17e 100644 --- a/test/fixtures/output/c/libcurl/cookies.c +++ b/src/targets/c/libcurl/fixtures/cookies.c @@ -5,4 +5,4 @@ curl_easy_setopt(hnd, CURLOPT_URL, "http://mockbin.com/har"); curl_easy_setopt(hnd, CURLOPT_COOKIE, "foo=bar; bar=baz"); -CURLcode ret = curl_easy_perform(hnd); +CURLcode ret = curl_easy_perform(hnd); \ No newline at end of file diff --git a/test/fixtures/output/c/libcurl/custom-method.c b/src/targets/c/libcurl/fixtures/custom-method.c similarity index 79% rename from test/fixtures/output/c/libcurl/custom-method.c rename to src/targets/c/libcurl/fixtures/custom-method.c index 12045a0b3..32233522f 100644 --- a/test/fixtures/output/c/libcurl/custom-method.c +++ b/src/targets/c/libcurl/fixtures/custom-method.c @@ -3,4 +3,4 @@ CURL *hnd = curl_easy_init(); curl_easy_setopt(hnd, CURLOPT_CUSTOMREQUEST, "PROPFIND"); curl_easy_setopt(hnd, CURLOPT_URL, "http://mockbin.com/har"); -CURLcode ret = curl_easy_perform(hnd); +CURLcode ret = curl_easy_perform(hnd); \ No newline at end of file diff --git a/test/fixtures/output/c/libcurl/full.c b/src/targets/c/libcurl/fixtures/full.c similarity index 93% rename from test/fixtures/output/c/libcurl/full.c rename to src/targets/c/libcurl/fixtures/full.c index c6348ba60..5adac0e55 100644 --- a/test/fixtures/output/c/libcurl/full.c +++ b/src/targets/c/libcurl/fixtures/full.c @@ -12,4 +12,4 @@ curl_easy_setopt(hnd, CURLOPT_COOKIE, "foo=bar; bar=baz"); curl_easy_setopt(hnd, CURLOPT_POSTFIELDS, "foo=bar"); -CURLcode ret = curl_easy_perform(hnd); +CURLcode ret = curl_easy_perform(hnd); \ No newline at end of file diff --git a/test/fixtures/output/c/libcurl/headers.c b/src/targets/c/libcurl/fixtures/headers.c similarity index 90% rename from test/fixtures/output/c/libcurl/headers.c rename to src/targets/c/libcurl/fixtures/headers.c index 54ed7a82e..befd745b6 100644 --- a/test/fixtures/output/c/libcurl/headers.c +++ b/src/targets/c/libcurl/fixtures/headers.c @@ -8,4 +8,4 @@ headers = curl_slist_append(headers, "accept: application/json"); headers = curl_slist_append(headers, "x-foo: Bar"); curl_easy_setopt(hnd, CURLOPT_HTTPHEADER, headers); -CURLcode ret = curl_easy_perform(hnd); +CURLcode ret = curl_easy_perform(hnd); \ No newline at end of file diff --git a/test/fixtures/output/c/libcurl/https.c b/src/targets/c/libcurl/fixtures/https.c similarity index 79% rename from test/fixtures/output/c/libcurl/https.c rename to src/targets/c/libcurl/fixtures/https.c index d5e403be3..e5381861f 100644 --- a/test/fixtures/output/c/libcurl/https.c +++ b/src/targets/c/libcurl/fixtures/https.c @@ -3,4 +3,4 @@ CURL *hnd = curl_easy_init(); curl_easy_setopt(hnd, CURLOPT_CUSTOMREQUEST, "GET"); curl_easy_setopt(hnd, CURLOPT_URL, "https://mockbin.com/har"); -CURLcode ret = curl_easy_perform(hnd); +CURLcode ret = curl_easy_perform(hnd); \ No newline at end of file diff --git a/test/fixtures/output/c/libcurl/jsonObj-multiline.c b/src/targets/c/libcurl/fixtures/jsonObj-multiline.c similarity index 90% rename from test/fixtures/output/c/libcurl/jsonObj-multiline.c rename to src/targets/c/libcurl/fixtures/jsonObj-multiline.c index 4036cf230..3f617d605 100644 --- a/test/fixtures/output/c/libcurl/jsonObj-multiline.c +++ b/src/targets/c/libcurl/fixtures/jsonObj-multiline.c @@ -9,4 +9,4 @@ curl_easy_setopt(hnd, CURLOPT_HTTPHEADER, headers); curl_easy_setopt(hnd, CURLOPT_POSTFIELDS, "{\n \"foo\": \"bar\"\n}"); -CURLcode ret = curl_easy_perform(hnd); +CURLcode ret = curl_easy_perform(hnd); \ No newline at end of file diff --git a/test/fixtures/output/c/libcurl/jsonObj-null-value.c b/src/targets/c/libcurl/fixtures/jsonObj-null-value.c similarity index 90% rename from test/fixtures/output/c/libcurl/jsonObj-null-value.c rename to src/targets/c/libcurl/fixtures/jsonObj-null-value.c index 0f66eb801..8c09fb73f 100644 --- a/test/fixtures/output/c/libcurl/jsonObj-null-value.c +++ b/src/targets/c/libcurl/fixtures/jsonObj-null-value.c @@ -9,4 +9,4 @@ curl_easy_setopt(hnd, CURLOPT_HTTPHEADER, headers); curl_easy_setopt(hnd, CURLOPT_POSTFIELDS, "{\"foo\":null}"); -CURLcode ret = curl_easy_perform(hnd); +CURLcode ret = curl_easy_perform(hnd); \ No newline at end of file diff --git a/test/fixtures/output/c/libcurl/multipart-data.c b/src/targets/c/libcurl/fixtures/multipart-data.c similarity index 93% rename from test/fixtures/output/c/libcurl/multipart-data.c rename to src/targets/c/libcurl/fixtures/multipart-data.c index 80cccdb02..ffb4c4277 100644 --- a/test/fixtures/output/c/libcurl/multipart-data.c +++ b/src/targets/c/libcurl/fixtures/multipart-data.c @@ -9,4 +9,4 @@ curl_easy_setopt(hnd, CURLOPT_HTTPHEADER, headers); curl_easy_setopt(hnd, CURLOPT_POSTFIELDS, "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001--\r\n"); -CURLcode ret = curl_easy_perform(hnd); +CURLcode ret = curl_easy_perform(hnd); \ No newline at end of file diff --git a/test/fixtures/output/c/libcurl/multipart-file.c b/src/targets/c/libcurl/fixtures/multipart-file.c similarity index 93% rename from test/fixtures/output/c/libcurl/multipart-file.c rename to src/targets/c/libcurl/fixtures/multipart-file.c index 90e125278..54e75c63d 100644 --- a/test/fixtures/output/c/libcurl/multipart-file.c +++ b/src/targets/c/libcurl/fixtures/multipart-file.c @@ -9,4 +9,4 @@ curl_easy_setopt(hnd, CURLOPT_HTTPHEADER, headers); curl_easy_setopt(hnd, CURLOPT_POSTFIELDS, "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\n\r\n-----011000010111000001101001--\r\n"); -CURLcode ret = curl_easy_perform(hnd); +CURLcode ret = curl_easy_perform(hnd); \ No newline at end of file diff --git a/test/fixtures/output/c/libcurl/multipart-form-data.c b/src/targets/c/libcurl/fixtures/multipart-form-data.c similarity index 93% rename from test/fixtures/output/c/libcurl/multipart-form-data.c rename to src/targets/c/libcurl/fixtures/multipart-form-data.c index e47d6e573..24fce9623 100644 --- a/test/fixtures/output/c/libcurl/multipart-form-data.c +++ b/src/targets/c/libcurl/fixtures/multipart-form-data.c @@ -9,4 +9,4 @@ curl_easy_setopt(hnd, CURLOPT_HTTPHEADER, headers); curl_easy_setopt(hnd, CURLOPT_POSTFIELDS, "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"\r\n\r\nbar\r\n-----011000010111000001101001--\r\n"); -CURLcode ret = curl_easy_perform(hnd); +CURLcode ret = curl_easy_perform(hnd); \ No newline at end of file diff --git a/test/fixtures/output/c/libcurl/nested.c b/src/targets/c/libcurl/fixtures/nested.c similarity index 82% rename from test/fixtures/output/c/libcurl/nested.c rename to src/targets/c/libcurl/fixtures/nested.c index dfb8ee8f2..6b7a7e879 100644 --- a/test/fixtures/output/c/libcurl/nested.c +++ b/src/targets/c/libcurl/fixtures/nested.c @@ -3,4 +3,4 @@ CURL *hnd = curl_easy_init(); curl_easy_setopt(hnd, CURLOPT_CUSTOMREQUEST, "GET"); curl_easy_setopt(hnd, CURLOPT_URL, "http://mockbin.com/har?foo%5Bbar%5D=baz%2Czap&fiz=buz&key=value"); -CURLcode ret = curl_easy_perform(hnd); +CURLcode ret = curl_easy_perform(hnd); \ No newline at end of file diff --git a/test/fixtures/output/c/libcurl/query.c b/src/targets/c/libcurl/fixtures/query.c similarity index 82% rename from test/fixtures/output/c/libcurl/query.c rename to src/targets/c/libcurl/fixtures/query.c index 709188c90..238127976 100644 --- a/test/fixtures/output/c/libcurl/query.c +++ b/src/targets/c/libcurl/fixtures/query.c @@ -3,4 +3,4 @@ CURL *hnd = curl_easy_init(); curl_easy_setopt(hnd, CURLOPT_CUSTOMREQUEST, "GET"); curl_easy_setopt(hnd, CURLOPT_URL, "http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value"); -CURLcode ret = curl_easy_perform(hnd); +CURLcode ret = curl_easy_perform(hnd); \ No newline at end of file diff --git a/test/fixtures/output/c/libcurl/short.c b/src/targets/c/libcurl/fixtures/short.c similarity index 79% rename from test/fixtures/output/c/libcurl/short.c rename to src/targets/c/libcurl/fixtures/short.c index c858ae76d..257fac4f5 100644 --- a/test/fixtures/output/c/libcurl/short.c +++ b/src/targets/c/libcurl/fixtures/short.c @@ -3,4 +3,4 @@ CURL *hnd = curl_easy_init(); curl_easy_setopt(hnd, CURLOPT_CUSTOMREQUEST, "GET"); curl_easy_setopt(hnd, CURLOPT_URL, "http://mockbin.com/har"); -CURLcode ret = curl_easy_perform(hnd); +CURLcode ret = curl_easy_perform(hnd); \ No newline at end of file diff --git a/test/fixtures/output/c/libcurl/text-plain.c b/src/targets/c/libcurl/fixtures/text-plain.c similarity index 90% rename from test/fixtures/output/c/libcurl/text-plain.c rename to src/targets/c/libcurl/fixtures/text-plain.c index 5d8b1fd22..b148feea8 100644 --- a/test/fixtures/output/c/libcurl/text-plain.c +++ b/src/targets/c/libcurl/fixtures/text-plain.c @@ -9,4 +9,4 @@ curl_easy_setopt(hnd, CURLOPT_HTTPHEADER, headers); curl_easy_setopt(hnd, CURLOPT_POSTFIELDS, "Hello World"); -CURLcode ret = curl_easy_perform(hnd); +CURLcode ret = curl_easy_perform(hnd); \ No newline at end of file diff --git a/src/targets/c/target.ts b/src/targets/c/target.ts new file mode 100644 index 000000000..51286a0fe --- /dev/null +++ b/src/targets/c/target.ts @@ -0,0 +1,14 @@ +import { Target } from '../targets'; +import { libcurl } from './libcurl/client'; + +export const c: Target = { + info: { + key: 'c', + title: 'C', + extname: '.c', + default: 'libcurl', + }, + clientsById: { + libcurl, + }, +}; diff --git a/src/targets/clojure/clj_http.js b/src/targets/clojure/clj_http.js deleted file mode 100644 index dd9286443..000000000 --- a/src/targets/clojure/clj_http.js +++ /dev/null @@ -1,160 +0,0 @@ -/** - * @description - * HTTP code snippet generator for Clojure using clj-http. - * - * @author - * @tggreene - * - * for any questions or issues regarding the generated code snippet, please open an issue mentioning the author. - */ - -'use strict' - -const CodeBuilder = require('../../helpers/code-builder') -const helpers = require('../../helpers/headers') - -const Keyword = function (name) { - this.name = name -} - -Keyword.prototype.toString = function () { - return ':' + this.name -} - -const File = function (path) { - this.path = path -} - -File.prototype.toString = function () { - return '(clojure.java.io/file "' + this.path + '")' -} - -const jsType = function (x) { - return (typeof x !== 'undefined') - ? x.constructor.name.toLowerCase() - : null -} - -const objEmpty = function (x) { - return (jsType(x) === 'object') - ? Object.keys(x).length === 0 - : false -} - -const filterEmpty = function (m) { - Object.keys(m) - .filter(function (x) { return objEmpty(m[x]) }) - .forEach(function (x) { delete m[x] }) - return m -} - -const padBlock = function (x, s) { - const padding = Array.apply(null, Array(x)) - .map(function (_) { - return ' ' - }) - .join('') - return s.replace(/\n/g, '\n' + padding) -} - -const jsToEdn = function (js) { - switch (jsType(js)) { - case 'string': - return '"' + js.replace(/"/g, '\\"') + '"' - case 'file': - return js.toString() - case 'keyword': - return js.toString() - case 'null': - return 'nil' - case 'regexp': - return '#"' + js.source + '"' - case 'object': { // simple vertical format - const obj = Object.keys(js) - .reduce(function (acc, key) { - const val = padBlock(key.length + 2, jsToEdn(js[key])) - return acc + ':' + key + ' ' + val + '\n ' - }, '') - .trim() - return '{' + padBlock(1, obj) + '}' - } - case 'array': { // simple horizontal format - const arr = js.reduce(function (acc, val) { - return acc + ' ' + jsToEdn(val) - }, '').trim() - return '[' + padBlock(1, arr) + ']' - } - default: // 'number' 'boolean' - return js.toString() - } -} - -module.exports = function (source, options) { - const code = new CodeBuilder(options) - const methods = ['get', 'post', 'put', 'delete', 'patch', 'head', 'options'] - - if (methods.indexOf(source.method.toLowerCase()) === -1) { - return code.push('Method not supported').join() - } - - const params = { - headers: source.allHeaders, - 'query-params': source.queryObj - } - - switch (source.postData.mimeType) { - case 'application/json': - params['content-type'] = new Keyword('json') - params['form-params'] = source.postData.jsonObj - delete params.headers[helpers.getHeaderName(params.headers, 'content-type')] - break - case 'application/x-www-form-urlencoded': - params['form-params'] = source.postData.paramsObj - delete params.headers[helpers.getHeaderName(params.headers, 'content-type')] - break - case 'text/plain': - params.body = source.postData.text - delete params.headers[helpers.getHeaderName(params.headers, 'content-type')] - break - case 'multipart/form-data': - params.multipart = source.postData.params.map(function (x) { - if (x.fileName && !x.value) { - return { - name: x.name, - content: new File(x.fileName) - } - } else { - return { - name: x.name, - content: x.value - } - } - }) - delete params.headers[helpers.getHeaderName(params.headers, 'content-type')] - break - } - - switch (helpers.getHeader(params.headers, 'accept')) { - case 'application/json': - params.accept = new Keyword('json') - delete params.headers[helpers.getHeaderName(params.headers, 'accept')] - break - } - - code.push('(require \'[clj-http.client :as client])\n') - - if (objEmpty(filterEmpty(params))) { - code.push('(client/%s "%s")', source.method.toLowerCase(), source.url) - } else { - code.push('(client/%s "%s" %s)', source.method.toLowerCase(), source.url, padBlock(11 + source.method.length + source.url.length, jsToEdn(filterEmpty(params)))) - } - - return code.join() -} - -module.exports.info = { - key: 'clj_http', - title: 'clj-http', - link: 'https://github.com/dakrone/clj-http', - description: 'An idiomatic clojure http client wrapping the apache client.' -} diff --git a/src/targets/clojure/clj_http/client.ts b/src/targets/clojure/clj_http/client.ts new file mode 100644 index 000000000..9476fd804 --- /dev/null +++ b/src/targets/clojure/clj_http/client.ts @@ -0,0 +1,193 @@ +/** + * @description + * HTTP code snippet generator for Clojure using clj-http. + * + * @author + * @tggreene + * + * for any questions or issues regarding the generated code snippet, please open an issue mentioning the author. + */ + +import { CodeBuilder } from '../../../helpers/code-builder'; +import { getHeader, getHeaderName } from '../../../helpers/headers'; +import { Client } from '../../targets'; + +class Keyword { + name = ''; + constructor(name: string) { + this.name = name; + } + + toString = () => `:${this.name}`; +} + +class File { + path = ''; + constructor(path: string) { + this.path = path; + } + + toString = () => `(clojure.java.io/file "${this.path}")`; +} + +const jsType = (x?: any) => (typeof x !== 'undefined' ? x.constructor.name.toLowerCase() : null); + +const objEmpty = (x?: any) => (jsType(x) === 'object' ? Object.keys(x).length === 0 : false); + +const filterEmpty = (m: Record) => { + Object.keys(m) + .filter(x => objEmpty(m[x])) + .forEach(x => { + delete m[x]; + }); + return m; +}; + +const padBlock = (padSize: number, input: string) => { + const padding = ' '.repeat(padSize); + return input.replace(/\n/g, `\n${padding}`); +}; + +const jsToEdn = (js: any) => { + switch (jsType(js)) { + case 'string': + return `"${js.replace(/"/g, '\\"')}"`; + + case 'file': + return js.toString(); + + case 'keyword': + return js.toString(); + + case 'null': + return 'nil'; + + case 'regexp': + return `#"${js.source}"`; + + case 'object': { + // simple vertical format + const obj = Object.keys(js) + .reduce((accumulator, key) => { + const val = padBlock(key.length + 2, jsToEdn(js[key])); + return `${accumulator}:${key} ${val}\n `; + }, '') + .trim(); + return `{${padBlock(1, obj)}}`; + } + + case 'array': { + // simple horizontal format + const arr = js + .reduce((accumulator: string, value: string) => `${accumulator} ${jsToEdn(value)}`, '') + .trim(); + return `[${padBlock(1, arr)}]`; + } + + default: // 'number' 'boolean' + return js.toString(); + } +}; + +export const clj_http: Client = { + info: { + key: 'clj_http', + title: 'clj-http', + link: 'https://github.com/dakrone/clj-http', + description: 'An idiomatic clojure http client wrapping the apache client.', + }, + convert: ({ queryObj, method, postData, url, allHeaders }, options) => { + const { push, join } = new CodeBuilder({ indent: options?.indent }); + const methods = ['get', 'post', 'put', 'delete', 'patch', 'head', 'options']; + method = method.toLowerCase(); + + if (!methods.includes(method)) { + push('Method not supported'); + return join(); + } + + const params: Record = { + headers: allHeaders, + 'query-params': queryObj, + }; + + switch (postData.mimeType) { + case 'application/json': + { + params['content-type'] = new Keyword('json'); + params['form-params'] = postData.jsonObj; + const header = getHeaderName(params.headers, 'content-type'); + if (header) { + delete params.headers[header]; + } + } + break; + + case 'application/x-www-form-urlencoded': + { + params['form-params'] = postData.paramsObj; + const header = getHeaderName(params.headers, 'content-type'); + if (header) { + delete params.headers[header]; + } + } + break; + + case 'text/plain': + { + params.body = postData.text; + const header = getHeaderName(params.headers, 'content-type'); + if (header) { + delete params.headers[header]; + } + } + break; + + case 'multipart/form-data': { + params.multipart = postData.params?.map(param => { + if (param.fileName && !param.value) { + return { + name: param.name, + content: new File(param.fileName), + }; + } + return { + name: param.name, + content: param.value, + }; + }); + + const header = getHeaderName(params.headers, 'content-type'); + if (header) { + delete params.headers[header]; + } + break; + } + } + + switch (getHeader(params.headers, 'accept')) { + case 'application/json': + { + params.accept = new Keyword('json'); + + const header = getHeaderName(params.headers, 'accept'); + if (header) { + delete params.headers[header]; + } + } + break; + } + + push("(require '[clj-http.client :as client])\n"); + + if (objEmpty(filterEmpty(params))) { + push(`(client/${method} "${url}")`); + } else { + const padding = 11 + method.length + url.length; + const formattedParams = padBlock(padding, jsToEdn(filterEmpty(params))); + push(`(client/${method} "${url}" ${formattedParams})`); + } + + return join(); + }, +}; diff --git a/test/fixtures/output/clojure/clj_http/application-form-encoded.clj b/src/targets/clojure/clj_http/fixtures/application-form-encoded.clj similarity index 96% rename from test/fixtures/output/clojure/clj_http/application-form-encoded.clj rename to src/targets/clojure/clj_http/fixtures/application-form-encoded.clj index 5abefec9a..de2f19930 100644 --- a/test/fixtures/output/clojure/clj_http/application-form-encoded.clj +++ b/src/targets/clojure/clj_http/fixtures/application-form-encoded.clj @@ -1,4 +1,4 @@ (require '[clj-http.client :as client]) (client/post "http://mockbin.com/har" {:form-params {:foo "bar" - :hello "world"}}) + :hello "world"}}) \ No newline at end of file diff --git a/test/fixtures/output/clojure/clj_http/application-json.clj b/src/targets/clojure/clj_http/fixtures/application-json.clj similarity index 98% rename from test/fixtures/output/clojure/clj_http/application-json.clj rename to src/targets/clojure/clj_http/fixtures/application-json.clj index d2eeaa38c..a4e5b3d01 100644 --- a/test/fixtures/output/clojure/clj_http/application-json.clj +++ b/src/targets/clojure/clj_http/fixtures/application-json.clj @@ -6,4 +6,4 @@ :arr [1 2 3] :nested {:a "b"} :arr_mix [1 "a" {:arr_mix_nested {}}] - :boolean false}}) + :boolean false}}) \ No newline at end of file diff --git a/test/fixtures/output/clojure/clj_http/cookies.clj b/src/targets/clojure/clj_http/fixtures/cookies.clj similarity index 87% rename from test/fixtures/output/clojure/clj_http/cookies.clj rename to src/targets/clojure/clj_http/fixtures/cookies.clj index eaea2a4ea..85608fe55 100644 --- a/test/fixtures/output/clojure/clj_http/cookies.clj +++ b/src/targets/clojure/clj_http/fixtures/cookies.clj @@ -1,3 +1,3 @@ (require '[clj-http.client :as client]) -(client/post "http://mockbin.com/har" {:headers {:cookie "foo=bar; bar=baz"}}) +(client/post "http://mockbin.com/har" {:headers {:cookie "foo=bar; bar=baz"}}) \ No newline at end of file diff --git a/src/targets/clojure/clj_http/fixtures/custom-method.clj b/src/targets/clojure/clj_http/fixtures/custom-method.clj new file mode 100644 index 000000000..8eb41a680 --- /dev/null +++ b/src/targets/clojure/clj_http/fixtures/custom-method.clj @@ -0,0 +1 @@ +Method not supported \ No newline at end of file diff --git a/test/fixtures/output/clojure/clj_http/full.clj b/src/targets/clojure/clj_http/fixtures/full.clj similarity index 87% rename from test/fixtures/output/clojure/clj_http/full.clj rename to src/targets/clojure/clj_http/fixtures/full.clj index e4282c83d..42e0bc032 100644 --- a/test/fixtures/output/clojure/clj_http/full.clj +++ b/src/targets/clojure/clj_http/fixtures/full.clj @@ -5,4 +5,4 @@ :baz "abc" :key "value"} :form-params {:foo "bar"} - :accept :json}) + :accept :json}) \ No newline at end of file diff --git a/test/fixtures/output/clojure/clj_http/headers.clj b/src/targets/clojure/clj_http/fixtures/headers.clj similarity index 65% rename from test/fixtures/output/clojure/clj_http/headers.clj rename to src/targets/clojure/clj_http/fixtures/headers.clj index d2816fb53..6cd592f28 100644 --- a/test/fixtures/output/clojure/clj_http/headers.clj +++ b/src/targets/clojure/clj_http/fixtures/headers.clj @@ -1,4 +1,4 @@ (require '[clj-http.client :as client]) (client/get "http://mockbin.com/har" {:headers {:x-foo "Bar"} - :accept :json}) + :accept :json}) \ No newline at end of file diff --git a/test/fixtures/output/clojure/clj_http/https.clj b/src/targets/clojure/clj_http/fixtures/https.clj similarity index 51% rename from test/fixtures/output/clojure/clj_http/https.clj rename to src/targets/clojure/clj_http/fixtures/https.clj index f81797cf7..44c388b5c 100644 --- a/test/fixtures/output/clojure/clj_http/https.clj +++ b/src/targets/clojure/clj_http/fixtures/https.clj @@ -1,3 +1,3 @@ (require '[clj-http.client :as client]) -(client/get "https://mockbin.com/har") +(client/get "https://mockbin.com/har") \ No newline at end of file diff --git a/src/targets/clojure/clj_http/fixtures/jsonObj-multiline.clj b/src/targets/clojure/clj_http/fixtures/jsonObj-multiline.clj new file mode 100644 index 000000000..866b2e07b --- /dev/null +++ b/src/targets/clojure/clj_http/fixtures/jsonObj-multiline.clj @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/targets/clojure/clj_http/fixtures/jsonObj-null-value.clj b/src/targets/clojure/clj_http/fixtures/jsonObj-null-value.clj new file mode 100644 index 000000000..866b2e07b --- /dev/null +++ b/src/targets/clojure/clj_http/fixtures/jsonObj-null-value.clj @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/test/fixtures/output/clojure/clj_http/multipart-data.clj b/src/targets/clojure/clj_http/fixtures/multipart-data.clj similarity index 91% rename from test/fixtures/output/clojure/clj_http/multipart-data.clj rename to src/targets/clojure/clj_http/fixtures/multipart-data.clj index 57c8bdaff..4f6136046 100644 --- a/test/fixtures/output/clojure/clj_http/multipart-data.clj +++ b/src/targets/clojure/clj_http/fixtures/multipart-data.clj @@ -1,4 +1,4 @@ (require '[clj-http.client :as client]) (client/post "http://mockbin.com/har" {:multipart [{:name "foo" - :content "Hello World"}]}) + :content "Hello World"}]}) \ No newline at end of file diff --git a/test/fixtures/output/clojure/clj_http/multipart-file.clj b/src/targets/clojure/clj_http/fixtures/multipart-file.clj similarity index 75% rename from test/fixtures/output/clojure/clj_http/multipart-file.clj rename to src/targets/clojure/clj_http/fixtures/multipart-file.clj index dd97b412c..10d05be8d 100644 --- a/test/fixtures/output/clojure/clj_http/multipart-file.clj +++ b/src/targets/clojure/clj_http/fixtures/multipart-file.clj @@ -1,4 +1,4 @@ (require '[clj-http.client :as client]) (client/post "http://mockbin.com/har" {:multipart [{:name "foo" - :content (clojure.java.io/file "test/fixtures/files/hello.txt")}]}) + :content (clojure.java.io/file "test/fixtures/files/hello.txt")}]}) \ No newline at end of file diff --git a/test/fixtures/output/clojure/clj_http/multipart-form-data.clj b/src/targets/clojure/clj_http/fixtures/multipart-form-data.clj similarity index 96% rename from test/fixtures/output/clojure/clj_http/multipart-form-data.clj rename to src/targets/clojure/clj_http/fixtures/multipart-form-data.clj index 2091d2a80..8ed98b1bb 100644 --- a/test/fixtures/output/clojure/clj_http/multipart-form-data.clj +++ b/src/targets/clojure/clj_http/fixtures/multipart-form-data.clj @@ -1,4 +1,4 @@ (require '[clj-http.client :as client]) (client/post "http://mockbin.com/har" {:multipart [{:name "foo" - :content "bar"}]}) + :content "bar"}]}) \ No newline at end of file diff --git a/test/fixtures/output/clojure/clj_http/nested.clj b/src/targets/clojure/clj_http/fixtures/nested.clj similarity index 97% rename from test/fixtures/output/clojure/clj_http/nested.clj rename to src/targets/clojure/clj_http/fixtures/nested.clj index 73016ab59..f7fbc7ab5 100644 --- a/test/fixtures/output/clojure/clj_http/nested.clj +++ b/src/targets/clojure/clj_http/fixtures/nested.clj @@ -2,4 +2,4 @@ (client/get "http://mockbin.com/har" {:query-params {:foo[bar] "baz,zap" :fiz "buz" - :key "value"}}) + :key "value"}}) \ No newline at end of file diff --git a/test/fixtures/output/clojure/clj_http/query.clj b/src/targets/clojure/clj_http/fixtures/query.clj similarity index 97% rename from test/fixtures/output/clojure/clj_http/query.clj rename to src/targets/clojure/clj_http/fixtures/query.clj index 63f3c2ddc..ea1a84f73 100644 --- a/test/fixtures/output/clojure/clj_http/query.clj +++ b/src/targets/clojure/clj_http/fixtures/query.clj @@ -2,4 +2,4 @@ (client/get "http://mockbin.com/har" {:query-params {:foo ["bar" "baz"] :baz "abc" - :key "value"}}) + :key "value"}}) \ No newline at end of file diff --git a/test/fixtures/output/clojure/clj_http/short.clj b/src/targets/clojure/clj_http/fixtures/short.clj similarity index 51% rename from test/fixtures/output/clojure/clj_http/short.clj rename to src/targets/clojure/clj_http/fixtures/short.clj index b6f67a52c..cd698b60a 100644 --- a/test/fixtures/output/clojure/clj_http/short.clj +++ b/src/targets/clojure/clj_http/fixtures/short.clj @@ -1,3 +1,3 @@ (require '[clj-http.client :as client]) -(client/get "http://mockbin.com/har") +(client/get "http://mockbin.com/har") \ No newline at end of file diff --git a/src/targets/clojure/clj_http/fixtures/text-plain.clj b/src/targets/clojure/clj_http/fixtures/text-plain.clj new file mode 100644 index 000000000..0768de695 --- /dev/null +++ b/src/targets/clojure/clj_http/fixtures/text-plain.clj @@ -0,0 +1,3 @@ +(require '[clj-http.client :as client]) + +(client/post "http://mockbin.com/har" {:body "Hello World"}) \ No newline at end of file diff --git a/src/targets/clojure/index.js b/src/targets/clojure/index.js deleted file mode 100644 index bf84319a1..000000000 --- a/src/targets/clojure/index.js +++ /dev/null @@ -1,12 +0,0 @@ -'use strict' - -module.exports = { - info: { - key: 'clojure', - title: 'Clojure', - extname: '.clj', - default: 'clj_http' - }, - - clj_http: require('./clj_http') -} diff --git a/src/targets/clojure/target.ts b/src/targets/clojure/target.ts new file mode 100644 index 000000000..0ab610376 --- /dev/null +++ b/src/targets/clojure/target.ts @@ -0,0 +1,14 @@ +import { Target } from '../targets'; +import { clj_http } from './clj_http/client'; + +export const clojure: Target = { + info: { + key: 'clojure', + title: 'Clojure', + extname: '.clj', + default: 'clj_http', + }, + clientsById: { + clj_http, + }, +}; diff --git a/src/targets/csharp/httpclient.js b/src/targets/csharp/httpclient.js deleted file mode 100644 index 8523a00ed..000000000 --- a/src/targets/csharp/httpclient.js +++ /dev/null @@ -1,157 +0,0 @@ -'use strict' - -const CodeBuilder = require('../../helpers/code-builder') -const helpers = require('../../helpers/headers') - -function getDecompressionMethods (source) { - const acceptEncoding = helpers.getHeader(source.allHeaders, 'accept-encoding') - if (!acceptEncoding) { - return [] // no decompression - } - - const supportedMethods = { - gzip: 'DecompressionMethods.GZip', - deflate: 'DecompressionMethods.Deflate' - } - const methods = [] - acceptEncoding.split(',').forEach(function (encoding) { - const match = /\s*([^;\s]+)/.exec(encoding) - if (match) { - const method = supportedMethods[match[1]] - if (method) { - methods.push(method) - } - } - }) - - return methods -} - -module.exports = function (source, options) { - const opts = Object.assign({ - indent: ' ' - }, options) - - const code = new CodeBuilder(opts.indent) - - let clienthandler = '' - const cookies = !!source.allHeaders.cookie - const decompressionMethods = getDecompressionMethods(source) - if (cookies || decompressionMethods.length) { - clienthandler = 'clientHandler' - code.push('var clientHandler = new HttpClientHandler') - code.push('{') - if (cookies) { - // enable setting the cookie header - code.push(1, 'UseCookies = false,') - } - if (decompressionMethods.length) { - // enable decompression for supported methods - code.push(1, 'AutomaticDecompression = %s,', decompressionMethods.join(' | ')) - } - code.push('};') - } - - code.push('var client = new HttpClient(%s);', clienthandler) - - code.push('var request = new HttpRequestMessage') - code.push('{') - - const methods = ['GET', 'POST', 'PUT', 'DELETE', 'PATCH', 'HEAD', 'OPTIONS', 'TRACE'] - let method = source.method.toUpperCase() - if (method && (methods.indexOf(method) !== -1)) { - // buildin method - method = `HttpMethod.${method[0]}${method.substring(1).toLowerCase()}` - } else { - // custom method - method = `new HttpMethod("${method}")` - } - code.push(1, 'Method = %s,', method) - - code.push(1, 'RequestUri = new Uri("%s"),', source.fullUrl) - - const headers = Object.keys(source.allHeaders).filter(function (header) { - switch (header.toLowerCase()) { - case 'content-type': - case 'content-length': - case 'accept-encoding': - // skip these headers - return false - default: - return true - } - }) - if (headers.length) { - code.push(1, 'Headers =') - code.push(1, '{') - headers.forEach(function (key) { - code.push(2, '{ "%s", "%s" },', key, source.allHeaders[key]) - }) - code.push(1, '},') - } - - if (source.postData.text) { - const contentType = source.postData.mimeType - switch (contentType) { - case 'application/x-www-form-urlencoded': - code.push(1, 'Content = new FormUrlEncodedContent(new Dictionary') - code.push(1, '{') - source.postData.params.forEach(function (param) { - code.push(2, '{ "%s", "%s" },', param.name, param.value) - }) - code.push(1, '}),') - break - case 'multipart/form-data': - code.push(1, 'Content = new MultipartFormDataContent') - code.push(1, '{') - source.postData.params.forEach(function (param) { - code.push(2, 'new StringContent(%s)', JSON.stringify(param.value || '')) - code.push(2, '{') - code.push(3, 'Headers =') - code.push(3, '{') - if (param.contentType) { - code.push(4, 'ContentType = new MediaTypeHeaderValue("%s"),', param.contentType) - } - code.push(4, 'ContentDisposition = new ContentDispositionHeaderValue("form-data")') - code.push(4, '{') - code.push(5, 'Name = "%s",', param.name) - if (param.fileName) { - code.push(5, 'FileName = "%s",', param.fileName) - } - code.push(4, '}') - code.push(3, '}') - code.push(2, '},') - }) - - code.push(1, '},') - break - default: - code.push(1, 'Content = new StringContent(%s)', JSON.stringify(source.postData.text || '')) - code.push(1, '{') - code.push(2, 'Headers =') - code.push(2, '{') - code.push(3, 'ContentType = new MediaTypeHeaderValue("%s")', contentType) - code.push(2, '}') - code.push(1, '}') - break - } - } - code.push('};') - - // send and read response - code.push('using (var response = await client.SendAsync(request))') - code.push('{') - code.push(1, 'response.EnsureSuccessStatusCode();') - code.push(1, 'var body = await response.Content.ReadAsStringAsync();') - code.push(1, 'Console.WriteLine(body);') - code.push('}') - - return code.join() -} - -module.exports.info = { - key: 'httpclient', - title: 'HttpClient', - link: 'https://docs.microsoft.com/en-us/dotnet/api/system.net.http.httpclient', - description: '.NET Standard HTTP Client' -} diff --git a/src/targets/csharp/httpclient/client.ts b/src/targets/csharp/httpclient/client.ts new file mode 100644 index 000000000..5c83933dc --- /dev/null +++ b/src/targets/csharp/httpclient/client.ts @@ -0,0 +1,169 @@ +import { CodeBuilder } from '../../../helpers/code-builder'; +import { getHeader } from '../../../helpers/headers'; +import { Request } from '../../../httpsnippet'; +import { Client } from '../../targets'; + +const getDecompressionMethods = (allHeaders: Request['allHeaders']) => { + let acceptEncodings = getHeader(allHeaders, 'accept-encoding'); + if (!acceptEncodings) { + return []; // no decompression + } + + const supportedMethods: Record = { + gzip: 'DecompressionMethods.GZip', + deflate: 'DecompressionMethods.Deflate', + }; + + const methods: string[] = []; + if (typeof acceptEncodings === 'string') { + acceptEncodings = [acceptEncodings]; + } + acceptEncodings.forEach(acceptEncoding => { + acceptEncoding.split(',').forEach(encoding => { + const match = /\s*([^;\s]+)/.exec(encoding); + if (match) { + const method = supportedMethods[match[1]]; + if (method) { + methods.push(method); + } + } + }); + }); + + return methods; +}; + +export const httpclient: Client = { + info: { + key: 'httpclient', + title: 'HttpClient', + link: 'https://docs.microsoft.com/en-us/dotnet/api/system.net.http.httpclient', + description: '.NET Standard HTTP Client', + }, + convert: ({ allHeaders, postData, method, fullUrl }, options) => { + const opts = { + indent: ' ', + ...options, + }; + + const { push, join } = new CodeBuilder({ indent: opts.indent }); + + let clienthandler = ''; + const cookies = Boolean(allHeaders.cookie); + const decompressionMethods = getDecompressionMethods(allHeaders); + if (cookies || decompressionMethods.length) { + clienthandler = 'clientHandler'; + push('var clientHandler = new HttpClientHandler'); + push('{'); + if (cookies) { + // enable setting the cookie header + push('UseCookies = false,', 1); + } + if (decompressionMethods.length) { + // enable decompression for supported methods + push(`AutomaticDecompression = ${decompressionMethods.join(' | ')},`, 1); + } + push('};'); + } + + push(`var client = new HttpClient(${clienthandler});`); + + push('var request = new HttpRequestMessage'); + push('{'); + + const methods = ['GET', 'POST', 'PUT', 'DELETE', 'PATCH', 'HEAD', 'OPTIONS', 'TRACE']; + method = method.toUpperCase(); + if (method && methods.includes(method)) { + // buildin method + method = `HttpMethod.${method[0]}${method.substring(1).toLowerCase()}`; + } else { + // custom method + method = `new HttpMethod("${method}")`; + } + push(`Method = ${method},`, 1); + + push(`RequestUri = new Uri("${fullUrl}"),`, 1); + + const headers: (keyof typeof allHeaders)[] = Object.keys(allHeaders).filter(header => { + switch (header.toLowerCase()) { + case 'content-type': + case 'content-length': + case 'accept-encoding': + // skip these headers + return false; + + default: + return true; + } + }); + + if (headers.length) { + push('Headers =', 1); + push('{', 1); + headers.forEach(key => { + push(`{ "${key}", "${allHeaders[key]}" },`, 2); + }); + push('},', 1); + } + + if (postData.text) { + const contentType = postData.mimeType; + switch (contentType) { + case 'application/x-www-form-urlencoded': + push('Content = new FormUrlEncodedContent(new Dictionary', 1); + push('{', 1); + postData.params?.forEach(param => { + push(`{ "${param.name}", "${param.value}" },`, 2); + }); + push('}),', 1); + break; + + case 'multipart/form-data': + push('Content = new MultipartFormDataContent', 1); + push('{', 1); + postData.params?.forEach(param => { + push(`new StringContent(${JSON.stringify(param.value || '')})`, 2); + push('{', 2); + push('Headers =', 3); + push('{', 3); + if (param.contentType) { + push(`ContentType = new MediaTypeHeaderValue("${param.contentType}"),`, 4); + } + push('ContentDisposition = new ContentDispositionHeaderValue("form-data")', 4); + push('{', 4); + push(`Name = "${param.name}",`, 5); + if (param.fileName) { + push(`FileName = "${param.fileName}",`, 5); + } + push('}', 4); + push('}', 3); + push('},', 2); + }); + + push('},', 1); + break; + + default: + push(`Content = new StringContent(${JSON.stringify(postData.text || '')})`, 1); + push('{', 1); + push('Headers =', 2); + push('{', 2); + push(`ContentType = new MediaTypeHeaderValue("${contentType}")`, 3); + push('}', 2); + push('}', 1); + break; + } + } + push('};'); + + // send and read response + push('using (var response = await client.SendAsync(request))'); + push('{'); + push('response.EnsureSuccessStatusCode();', 1); + push('var body = await response.Content.ReadAsStringAsync();', 1); + push('Console.WriteLine(body);', 1); + push('}'); + + return join(); + }, +}; diff --git a/test/fixtures/output/csharp/httpclient/application-form-encoded.cs b/src/targets/csharp/httpclient/fixtures/application-form-encoded.cs similarity index 99% rename from test/fixtures/output/csharp/httpclient/application-form-encoded.cs rename to src/targets/csharp/httpclient/fixtures/application-form-encoded.cs index 1fd11f8e0..073b04c33 100644 --- a/test/fixtures/output/csharp/httpclient/application-form-encoded.cs +++ b/src/targets/csharp/httpclient/fixtures/application-form-encoded.cs @@ -14,4 +14,4 @@ response.EnsureSuccessStatusCode(); var body = await response.Content.ReadAsStringAsync(); Console.WriteLine(body); -} +} \ No newline at end of file diff --git a/test/fixtures/output/csharp/httpclient/application-json.cs b/src/targets/csharp/httpclient/fixtures/application-json.cs similarity index 99% rename from test/fixtures/output/csharp/httpclient/application-json.cs rename to src/targets/csharp/httpclient/fixtures/application-json.cs index 9bf3269f8..c0a32cb03 100644 --- a/test/fixtures/output/csharp/httpclient/application-json.cs +++ b/src/targets/csharp/httpclient/fixtures/application-json.cs @@ -16,4 +16,4 @@ response.EnsureSuccessStatusCode(); var body = await response.Content.ReadAsStringAsync(); Console.WriteLine(body); -} +} \ No newline at end of file diff --git a/test/fixtures/output/csharp/httpclient/cookies.cs b/src/targets/csharp/httpclient/fixtures/cookies.cs similarity index 99% rename from test/fixtures/output/csharp/httpclient/cookies.cs rename to src/targets/csharp/httpclient/fixtures/cookies.cs index 3ebced64e..5ae551b6d 100644 --- a/test/fixtures/output/csharp/httpclient/cookies.cs +++ b/src/targets/csharp/httpclient/fixtures/cookies.cs @@ -17,4 +17,4 @@ response.EnsureSuccessStatusCode(); var body = await response.Content.ReadAsStringAsync(); Console.WriteLine(body); -} +} \ No newline at end of file diff --git a/test/fixtures/output/csharp/httpclient/custom-method.cs b/src/targets/csharp/httpclient/fixtures/custom-method.cs similarity index 99% rename from test/fixtures/output/csharp/httpclient/custom-method.cs rename to src/targets/csharp/httpclient/fixtures/custom-method.cs index a82173dac..0e234fc02 100644 --- a/test/fixtures/output/csharp/httpclient/custom-method.cs +++ b/src/targets/csharp/httpclient/fixtures/custom-method.cs @@ -9,4 +9,4 @@ response.EnsureSuccessStatusCode(); var body = await response.Content.ReadAsStringAsync(); Console.WriteLine(body); -} +} \ No newline at end of file diff --git a/test/fixtures/output/csharp/httpclient/full.cs b/src/targets/csharp/httpclient/fixtures/full.cs similarity index 99% rename from test/fixtures/output/csharp/httpclient/full.cs rename to src/targets/csharp/httpclient/fixtures/full.cs index f1ae328b2..b6940549c 100644 --- a/test/fixtures/output/csharp/httpclient/full.cs +++ b/src/targets/csharp/httpclient/fixtures/full.cs @@ -22,4 +22,4 @@ response.EnsureSuccessStatusCode(); var body = await response.Content.ReadAsStringAsync(); Console.WriteLine(body); -} +} \ No newline at end of file diff --git a/test/fixtures/output/csharp/httpclient/headers.cs b/src/targets/csharp/httpclient/fixtures/headers.cs similarity index 99% rename from test/fixtures/output/csharp/httpclient/headers.cs rename to src/targets/csharp/httpclient/fixtures/headers.cs index ad317d71e..cfbf19332 100644 --- a/test/fixtures/output/csharp/httpclient/headers.cs +++ b/src/targets/csharp/httpclient/fixtures/headers.cs @@ -14,4 +14,4 @@ response.EnsureSuccessStatusCode(); var body = await response.Content.ReadAsStringAsync(); Console.WriteLine(body); -} +} \ No newline at end of file diff --git a/test/fixtures/output/csharp/httpclient/https.cs b/src/targets/csharp/httpclient/fixtures/https.cs similarity index 99% rename from test/fixtures/output/csharp/httpclient/https.cs rename to src/targets/csharp/httpclient/fixtures/https.cs index c36e055ef..88a5a60b1 100644 --- a/test/fixtures/output/csharp/httpclient/https.cs +++ b/src/targets/csharp/httpclient/fixtures/https.cs @@ -9,4 +9,4 @@ response.EnsureSuccessStatusCode(); var body = await response.Content.ReadAsStringAsync(); Console.WriteLine(body); -} +} \ No newline at end of file diff --git a/test/fixtures/output/csharp/httpclient/jsonObj-multiline.cs b/src/targets/csharp/httpclient/fixtures/jsonObj-multiline.cs similarity index 99% rename from test/fixtures/output/csharp/httpclient/jsonObj-multiline.cs rename to src/targets/csharp/httpclient/fixtures/jsonObj-multiline.cs index dbd732960..9ec0374a6 100644 --- a/test/fixtures/output/csharp/httpclient/jsonObj-multiline.cs +++ b/src/targets/csharp/httpclient/fixtures/jsonObj-multiline.cs @@ -16,4 +16,4 @@ response.EnsureSuccessStatusCode(); var body = await response.Content.ReadAsStringAsync(); Console.WriteLine(body); -} +} \ No newline at end of file diff --git a/test/fixtures/output/csharp/httpclient/jsonObj-null-value.cs b/src/targets/csharp/httpclient/fixtures/jsonObj-null-value.cs similarity index 99% rename from test/fixtures/output/csharp/httpclient/jsonObj-null-value.cs rename to src/targets/csharp/httpclient/fixtures/jsonObj-null-value.cs index f2451a477..e2674df24 100644 --- a/test/fixtures/output/csharp/httpclient/jsonObj-null-value.cs +++ b/src/targets/csharp/httpclient/fixtures/jsonObj-null-value.cs @@ -16,4 +16,4 @@ response.EnsureSuccessStatusCode(); var body = await response.Content.ReadAsStringAsync(); Console.WriteLine(body); -} +} \ No newline at end of file diff --git a/test/fixtures/output/csharp/httpclient/multipart-data.cs b/src/targets/csharp/httpclient/fixtures/multipart-data.cs similarity index 99% rename from test/fixtures/output/csharp/httpclient/multipart-data.cs rename to src/targets/csharp/httpclient/fixtures/multipart-data.cs index cba898143..fc01aae51 100644 --- a/test/fixtures/output/csharp/httpclient/multipart-data.cs +++ b/src/targets/csharp/httpclient/fixtures/multipart-data.cs @@ -24,4 +24,4 @@ response.EnsureSuccessStatusCode(); var body = await response.Content.ReadAsStringAsync(); Console.WriteLine(body); -} +} \ No newline at end of file diff --git a/test/fixtures/output/csharp/httpclient/multipart-file.cs b/src/targets/csharp/httpclient/fixtures/multipart-file.cs similarity index 99% rename from test/fixtures/output/csharp/httpclient/multipart-file.cs rename to src/targets/csharp/httpclient/fixtures/multipart-file.cs index b150479b6..817180d93 100644 --- a/test/fixtures/output/csharp/httpclient/multipart-file.cs +++ b/src/targets/csharp/httpclient/fixtures/multipart-file.cs @@ -24,4 +24,4 @@ response.EnsureSuccessStatusCode(); var body = await response.Content.ReadAsStringAsync(); Console.WriteLine(body); -} +} \ No newline at end of file diff --git a/test/fixtures/output/csharp/httpclient/multipart-form-data.cs b/src/targets/csharp/httpclient/fixtures/multipart-form-data.cs similarity index 99% rename from test/fixtures/output/csharp/httpclient/multipart-form-data.cs rename to src/targets/csharp/httpclient/fixtures/multipart-form-data.cs index dafa4a1ff..1a029c682 100644 --- a/test/fixtures/output/csharp/httpclient/multipart-form-data.cs +++ b/src/targets/csharp/httpclient/fixtures/multipart-form-data.cs @@ -22,4 +22,4 @@ response.EnsureSuccessStatusCode(); var body = await response.Content.ReadAsStringAsync(); Console.WriteLine(body); -} +} \ No newline at end of file diff --git a/test/fixtures/output/csharp/httpclient/nested.cs b/src/targets/csharp/httpclient/fixtures/nested.cs similarity index 99% rename from test/fixtures/output/csharp/httpclient/nested.cs rename to src/targets/csharp/httpclient/fixtures/nested.cs index 0024a37e6..33b7c10f8 100644 --- a/test/fixtures/output/csharp/httpclient/nested.cs +++ b/src/targets/csharp/httpclient/fixtures/nested.cs @@ -9,4 +9,4 @@ response.EnsureSuccessStatusCode(); var body = await response.Content.ReadAsStringAsync(); Console.WriteLine(body); -} +} \ No newline at end of file diff --git a/test/fixtures/output/csharp/httpclient/query.cs b/src/targets/csharp/httpclient/fixtures/query.cs similarity index 99% rename from test/fixtures/output/csharp/httpclient/query.cs rename to src/targets/csharp/httpclient/fixtures/query.cs index 702642147..0215c1059 100644 --- a/test/fixtures/output/csharp/httpclient/query.cs +++ b/src/targets/csharp/httpclient/fixtures/query.cs @@ -9,4 +9,4 @@ response.EnsureSuccessStatusCode(); var body = await response.Content.ReadAsStringAsync(); Console.WriteLine(body); -} +} \ No newline at end of file diff --git a/test/fixtures/output/csharp/httpclient/short.cs b/src/targets/csharp/httpclient/fixtures/short.cs similarity index 99% rename from test/fixtures/output/csharp/httpclient/short.cs rename to src/targets/csharp/httpclient/fixtures/short.cs index 265b1967d..419599281 100644 --- a/test/fixtures/output/csharp/httpclient/short.cs +++ b/src/targets/csharp/httpclient/fixtures/short.cs @@ -9,4 +9,4 @@ response.EnsureSuccessStatusCode(); var body = await response.Content.ReadAsStringAsync(); Console.WriteLine(body); -} +} \ No newline at end of file diff --git a/test/fixtures/output/csharp/httpclient/text-plain.cs b/src/targets/csharp/httpclient/fixtures/text-plain.cs similarity index 99% rename from test/fixtures/output/csharp/httpclient/text-plain.cs rename to src/targets/csharp/httpclient/fixtures/text-plain.cs index cf56fa86f..5683d7d9c 100644 --- a/test/fixtures/output/csharp/httpclient/text-plain.cs +++ b/src/targets/csharp/httpclient/fixtures/text-plain.cs @@ -16,4 +16,4 @@ response.EnsureSuccessStatusCode(); var body = await response.Content.ReadAsStringAsync(); Console.WriteLine(body); -} +} \ No newline at end of file diff --git a/src/targets/csharp/index.js b/src/targets/csharp/index.js deleted file mode 100644 index f266f466e..000000000 --- a/src/targets/csharp/index.js +++ /dev/null @@ -1,13 +0,0 @@ -'use strict' - -module.exports = { - info: { - key: 'csharp', - title: 'C#', - extname: '.cs', - default: 'restsharp' - }, - - restsharp: require('./restsharp'), - httpclient: require('./httpclient') -} diff --git a/src/targets/csharp/restsharp.js b/src/targets/csharp/restsharp.js deleted file mode 100644 index d724c368b..000000000 --- a/src/targets/csharp/restsharp.js +++ /dev/null @@ -1,51 +0,0 @@ -'use strict' - -const CodeBuilder = require('../../helpers/code-builder') -const helpers = require('../../helpers/headers') - -module.exports = function (source, options) { - const code = new CodeBuilder() - const methods = ['GET', 'POST', 'PUT', 'DELETE', 'PATCH', 'HEAD', 'OPTIONS'] - - if (methods.indexOf(source.method.toUpperCase()) === -1) { - return 'Method not supported' - } else { - code.push('var client = new RestClient("%s");', source.fullUrl) - code.push('var request = new RestRequest(Method.%s);', source.method.toUpperCase()) - } - - // Add headers, including the cookies - const headers = Object.keys(source.headersObj) - - // construct headers - if (headers.length) { - headers.forEach(function (key) { - code.push('request.AddHeader("%s", "%s");', key, source.headersObj[key]) - }) - } - - // construct cookies - if (source.cookies.length) { - source.cookies.forEach(function (cookie) { - code.push('request.AddCookie("%s", "%s");', cookie.name, cookie.value) - }) - } - - if (source.postData.text) { - code.push( - 'request.AddParameter("%s", %s, ParameterType.RequestBody);', - helpers.getHeader(source.allHeaders, 'content-type'), - JSON.stringify(source.postData.text) - ) - } - - code.push('IRestResponse response = client.Execute(request);') - return code.join() -} - -module.exports.info = { - key: 'restsharp', - title: 'RestSharp', - link: 'http://restsharp.org/', - description: 'Simple REST and HTTP API Client for .NET' -} diff --git a/src/targets/csharp/restsharp/client.ts b/src/targets/csharp/restsharp/client.ts new file mode 100644 index 000000000..1bc05cf66 --- /dev/null +++ b/src/targets/csharp/restsharp/client.ts @@ -0,0 +1,44 @@ +import { CodeBuilder } from '../../../helpers/code-builder'; +import { getHeader } from '../../../helpers/headers'; +import { Client } from '../../targets'; + +export const restsharp: Client = { + info: { + key: 'restsharp', + title: 'RestSharp', + link: 'http://restsharp.org/', + description: 'Simple REST and HTTP API Client for .NET', + }, + convert: ({ allHeaders, method, fullUrl, headersObj, cookies, postData }) => { + const { push, join } = new CodeBuilder(); + const isSupportedMethod = ['GET', 'POST', 'PUT', 'DELETE', 'PATCH', 'HEAD', 'OPTIONS'].includes( + method.toUpperCase(), + ); + + if (!isSupportedMethod) { + return 'Method not supported'; + } + + push(`var client = new RestClient("${fullUrl}");`); + push(`var request = new RestRequest(Method.${method.toUpperCase()});`); + + // Add headers, including the cookies + + Object.keys(headersObj).forEach(key => { + push(`request.AddHeader("${key}", "${headersObj[key]}");`); + }); + + cookies.forEach(({ name, value }) => { + push(`request.AddCookie("${name}", "${value}");`); + }); + + if (postData.text) { + const header = getHeader(allHeaders, 'content-type'); + const text = JSON.stringify(postData.text); + push(`request.AddParameter("${header}", ${text}, ParameterType.RequestBody);`); + } + + push('IRestResponse response = client.Execute(request);'); + return join(); + }, +}; diff --git a/test/fixtures/output/csharp/restsharp/application-form-encoded.cs b/src/targets/csharp/restsharp/fixtures/application-form-encoded.cs similarity index 84% rename from test/fixtures/output/csharp/restsharp/application-form-encoded.cs rename to src/targets/csharp/restsharp/fixtures/application-form-encoded.cs index 96f3f8b69..4e4744d01 100644 --- a/test/fixtures/output/csharp/restsharp/application-form-encoded.cs +++ b/src/targets/csharp/restsharp/fixtures/application-form-encoded.cs @@ -2,4 +2,4 @@ var request = new RestRequest(Method.POST); request.AddHeader("content-type", "application/x-www-form-urlencoded"); request.AddParameter("application/x-www-form-urlencoded", "foo=bar&hello=world", ParameterType.RequestBody); -IRestResponse response = client.Execute(request); +IRestResponse response = client.Execute(request); \ No newline at end of file diff --git a/test/fixtures/output/csharp/restsharp/application-json.cs b/src/targets/csharp/restsharp/fixtures/application-json.cs similarity index 88% rename from test/fixtures/output/csharp/restsharp/application-json.cs rename to src/targets/csharp/restsharp/fixtures/application-json.cs index 30a977be9..2ee8c46f1 100644 --- a/test/fixtures/output/csharp/restsharp/application-json.cs +++ b/src/targets/csharp/restsharp/fixtures/application-json.cs @@ -2,4 +2,4 @@ var request = new RestRequest(Method.POST); request.AddHeader("content-type", "application/json"); request.AddParameter("application/json", "{\"number\":1,\"string\":\"f\\\"oo\",\"arr\":[1,2,3],\"nested\":{\"a\":\"b\"},\"arr_mix\":[1,\"a\",{\"arr_mix_nested\":{}}],\"boolean\":false}", ParameterType.RequestBody); -IRestResponse response = client.Execute(request); +IRestResponse response = client.Execute(request); \ No newline at end of file diff --git a/test/fixtures/output/csharp/restsharp/cookies.cs b/src/targets/csharp/restsharp/fixtures/cookies.cs similarity index 76% rename from test/fixtures/output/csharp/restsharp/cookies.cs rename to src/targets/csharp/restsharp/fixtures/cookies.cs index 910b4f580..f0489b650 100644 --- a/test/fixtures/output/csharp/restsharp/cookies.cs +++ b/src/targets/csharp/restsharp/fixtures/cookies.cs @@ -2,4 +2,4 @@ var request = new RestRequest(Method.POST); request.AddCookie("foo", "bar"); request.AddCookie("bar", "baz"); -IRestResponse response = client.Execute(request); +IRestResponse response = client.Execute(request); \ No newline at end of file diff --git a/src/targets/csharp/restsharp/fixtures/custom-method.cs b/src/targets/csharp/restsharp/fixtures/custom-method.cs new file mode 100644 index 000000000..8eb41a680 --- /dev/null +++ b/src/targets/csharp/restsharp/fixtures/custom-method.cs @@ -0,0 +1 @@ +Method not supported \ No newline at end of file diff --git a/test/fixtures/output/csharp/restsharp/full.cs b/src/targets/csharp/restsharp/fixtures/full.cs similarity index 89% rename from test/fixtures/output/csharp/restsharp/full.cs rename to src/targets/csharp/restsharp/fixtures/full.cs index 2a326ccb5..14b52d976 100644 --- a/test/fixtures/output/csharp/restsharp/full.cs +++ b/src/targets/csharp/restsharp/fixtures/full.cs @@ -5,4 +5,4 @@ request.AddCookie("foo", "bar"); request.AddCookie("bar", "baz"); request.AddParameter("application/x-www-form-urlencoded", "foo=bar", ParameterType.RequestBody); -IRestResponse response = client.Execute(request); +IRestResponse response = client.Execute(request); \ No newline at end of file diff --git a/test/fixtures/output/csharp/restsharp/headers.cs b/src/targets/csharp/restsharp/fixtures/headers.cs similarity index 78% rename from test/fixtures/output/csharp/restsharp/headers.cs rename to src/targets/csharp/restsharp/fixtures/headers.cs index e338bb136..4f6b54d8c 100644 --- a/test/fixtures/output/csharp/restsharp/headers.cs +++ b/src/targets/csharp/restsharp/fixtures/headers.cs @@ -2,4 +2,4 @@ var request = new RestRequest(Method.GET); request.AddHeader("accept", "application/json"); request.AddHeader("x-foo", "Bar"); -IRestResponse response = client.Execute(request); +IRestResponse response = client.Execute(request); \ No newline at end of file diff --git a/test/fixtures/output/csharp/restsharp/https.cs b/src/targets/csharp/restsharp/fixtures/https.cs similarity index 66% rename from test/fixtures/output/csharp/restsharp/https.cs rename to src/targets/csharp/restsharp/fixtures/https.cs index 8be49d72b..05a369073 100644 --- a/test/fixtures/output/csharp/restsharp/https.cs +++ b/src/targets/csharp/restsharp/fixtures/https.cs @@ -1,3 +1,3 @@ var client = new RestClient("https://mockbin.com/har"); var request = new RestRequest(Method.GET); -IRestResponse response = client.Execute(request); +IRestResponse response = client.Execute(request); \ No newline at end of file diff --git a/test/fixtures/output/csharp/restsharp/jsonObj-multiline.cs b/src/targets/csharp/restsharp/fixtures/jsonObj-multiline.cs similarity index 83% rename from test/fixtures/output/csharp/restsharp/jsonObj-multiline.cs rename to src/targets/csharp/restsharp/fixtures/jsonObj-multiline.cs index 20a7577f8..14fbe7778 100644 --- a/test/fixtures/output/csharp/restsharp/jsonObj-multiline.cs +++ b/src/targets/csharp/restsharp/fixtures/jsonObj-multiline.cs @@ -2,4 +2,4 @@ var request = new RestRequest(Method.POST); request.AddHeader("content-type", "application/json"); request.AddParameter("application/json", "{\n \"foo\": \"bar\"\n}", ParameterType.RequestBody); -IRestResponse response = client.Execute(request); +IRestResponse response = client.Execute(request); \ No newline at end of file diff --git a/test/fixtures/output/csharp/restsharp/jsonObj-null-value.cs b/src/targets/csharp/restsharp/fixtures/jsonObj-null-value.cs similarity index 82% rename from test/fixtures/output/csharp/restsharp/jsonObj-null-value.cs rename to src/targets/csharp/restsharp/fixtures/jsonObj-null-value.cs index fda921531..36b092c94 100644 --- a/test/fixtures/output/csharp/restsharp/jsonObj-null-value.cs +++ b/src/targets/csharp/restsharp/fixtures/jsonObj-null-value.cs @@ -2,4 +2,4 @@ var request = new RestRequest(Method.POST); request.AddHeader("content-type", "application/json"); request.AddParameter("application/json", "{\"foo\":null}", ParameterType.RequestBody); -IRestResponse response = client.Execute(request); +IRestResponse response = client.Execute(request); \ No newline at end of file diff --git a/test/fixtures/output/csharp/restsharp/multipart-data.cs b/src/targets/csharp/restsharp/fixtures/multipart-data.cs similarity index 90% rename from test/fixtures/output/csharp/restsharp/multipart-data.cs rename to src/targets/csharp/restsharp/fixtures/multipart-data.cs index 9db5bec09..be9d00858 100644 --- a/test/fixtures/output/csharp/restsharp/multipart-data.cs +++ b/src/targets/csharp/restsharp/fixtures/multipart-data.cs @@ -2,4 +2,4 @@ var request = new RestRequest(Method.POST); request.AddHeader("content-type", "multipart/form-data; boundary=---011000010111000001101001"); request.AddParameter("multipart/form-data; boundary=---011000010111000001101001", "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001--\r\n", ParameterType.RequestBody); -IRestResponse response = client.Execute(request); +IRestResponse response = client.Execute(request); \ No newline at end of file diff --git a/test/fixtures/output/csharp/restsharp/multipart-file.cs b/src/targets/csharp/restsharp/fixtures/multipart-file.cs similarity index 90% rename from test/fixtures/output/csharp/restsharp/multipart-file.cs rename to src/targets/csharp/restsharp/fixtures/multipart-file.cs index d91e66b4c..47758542c 100644 --- a/test/fixtures/output/csharp/restsharp/multipart-file.cs +++ b/src/targets/csharp/restsharp/fixtures/multipart-file.cs @@ -2,4 +2,4 @@ var request = new RestRequest(Method.POST); request.AddHeader("content-type", "multipart/form-data; boundary=---011000010111000001101001"); request.AddParameter("multipart/form-data; boundary=---011000010111000001101001", "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\n\r\n-----011000010111000001101001--\r\n", ParameterType.RequestBody); -IRestResponse response = client.Execute(request); +IRestResponse response = client.Execute(request); \ No newline at end of file diff --git a/test/fixtures/output/csharp/restsharp/multipart-form-data.cs b/src/targets/csharp/restsharp/fixtures/multipart-form-data.cs similarity index 89% rename from test/fixtures/output/csharp/restsharp/multipart-form-data.cs rename to src/targets/csharp/restsharp/fixtures/multipart-form-data.cs index aae6aa514..9eb6893b6 100644 --- a/test/fixtures/output/csharp/restsharp/multipart-form-data.cs +++ b/src/targets/csharp/restsharp/fixtures/multipart-form-data.cs @@ -2,4 +2,4 @@ var request = new RestRequest(Method.POST); request.AddHeader("Content-Type", "multipart/form-data; boundary=---011000010111000001101001"); request.AddParameter("multipart/form-data; boundary=---011000010111000001101001", "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"\r\n\r\nbar\r\n-----011000010111000001101001--\r\n", ParameterType.RequestBody); -IRestResponse response = client.Execute(request); +IRestResponse response = client.Execute(request); \ No newline at end of file diff --git a/test/fixtures/output/csharp/restsharp/nested.cs b/src/targets/csharp/restsharp/fixtures/nested.cs similarity index 73% rename from test/fixtures/output/csharp/restsharp/nested.cs rename to src/targets/csharp/restsharp/fixtures/nested.cs index fbc0fd775..e28bf3190 100644 --- a/test/fixtures/output/csharp/restsharp/nested.cs +++ b/src/targets/csharp/restsharp/fixtures/nested.cs @@ -1,3 +1,3 @@ var client = new RestClient("http://mockbin.com/har?foo%5Bbar%5D=baz%2Czap&fiz=buz&key=value"); var request = new RestRequest(Method.GET); -IRestResponse response = client.Execute(request); +IRestResponse response = client.Execute(request); \ No newline at end of file diff --git a/test/fixtures/output/csharp/restsharp/query.cs b/src/targets/csharp/restsharp/fixtures/query.cs similarity index 72% rename from test/fixtures/output/csharp/restsharp/query.cs rename to src/targets/csharp/restsharp/fixtures/query.cs index 938453075..3e3112c02 100644 --- a/test/fixtures/output/csharp/restsharp/query.cs +++ b/src/targets/csharp/restsharp/fixtures/query.cs @@ -1,3 +1,3 @@ var client = new RestClient("http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value"); var request = new RestRequest(Method.GET); -IRestResponse response = client.Execute(request); +IRestResponse response = client.Execute(request); \ No newline at end of file diff --git a/test/fixtures/output/csharp/restsharp/short.cs b/src/targets/csharp/restsharp/fixtures/short.cs similarity index 66% rename from test/fixtures/output/csharp/restsharp/short.cs rename to src/targets/csharp/restsharp/fixtures/short.cs index eb5c9f510..b644539c4 100644 --- a/test/fixtures/output/csharp/restsharp/short.cs +++ b/src/targets/csharp/restsharp/fixtures/short.cs @@ -1,3 +1,3 @@ var client = new RestClient("http://mockbin.com/har"); var request = new RestRequest(Method.GET); -IRestResponse response = client.Execute(request); +IRestResponse response = client.Execute(request); \ No newline at end of file diff --git a/test/fixtures/output/csharp/restsharp/text-plain.cs b/src/targets/csharp/restsharp/fixtures/text-plain.cs similarity index 81% rename from test/fixtures/output/csharp/restsharp/text-plain.cs rename to src/targets/csharp/restsharp/fixtures/text-plain.cs index 958eb97d4..a0a672de6 100644 --- a/test/fixtures/output/csharp/restsharp/text-plain.cs +++ b/src/targets/csharp/restsharp/fixtures/text-plain.cs @@ -2,4 +2,4 @@ var request = new RestRequest(Method.POST); request.AddHeader("content-type", "text/plain"); request.AddParameter("text/plain", "Hello World", ParameterType.RequestBody); -IRestResponse response = client.Execute(request); +IRestResponse response = client.Execute(request); \ No newline at end of file diff --git a/src/targets/csharp/target.ts b/src/targets/csharp/target.ts new file mode 100644 index 000000000..5fc9bb6be --- /dev/null +++ b/src/targets/csharp/target.ts @@ -0,0 +1,17 @@ +import { Target } from '../targets'; +import { httpclient } from './httpclient/client'; +import { restsharp } from './restsharp/client'; + +export const csharp: Target = { + info: { + key: 'csharp', + title: 'C#', + extname: '.cs', + default: 'restsharp', + }, + + clientsById: { + httpclient, + restsharp, + }, +}; diff --git a/src/targets/go/index.js b/src/targets/go/index.js deleted file mode 100644 index 64630875a..000000000 --- a/src/targets/go/index.js +++ /dev/null @@ -1,12 +0,0 @@ -'use strict' - -module.exports = { - info: { - key: 'go', - title: 'Go', - extname: '.go', - default: 'native' - }, - - native: require('./native') -} diff --git a/src/targets/go/native.js b/src/targets/go/native.js deleted file mode 100644 index fe36c93b5..000000000 --- a/src/targets/go/native.js +++ /dev/null @@ -1,137 +0,0 @@ -/** - * @description - * HTTP code snippet generator for native Go. - * - * @author - * @montanaflynn - * - * for any questions or issues regarding the generated code snippet, please open an issue mentioning the author. - */ - -'use strict' - -const CodeBuilder = require('../../helpers/code-builder') - -module.exports = function (source, options) { - // Let's Go! - const code = new CodeBuilder('\t') - - // Define Options - const opts = Object.assign({ - showBoilerplate: true, - checkErrors: false, - printBody: true, - timeout: -1 - }, options) - - const errorPlaceholder = opts.checkErrors ? 'err' : '_' - - const indent = opts.showBoilerplate ? 1 : 0 - - const errorCheck = function () { - if (opts.checkErrors) { - code.push(indent, 'if err != nil {') - .push(indent + 1, 'panic(err)') - .push(indent, '}') - } - } - - // Create boilerplate - if (opts.showBoilerplate) { - code.push('package main') - .blank() - .push('import (') - .push(indent, '"fmt"') - - if (opts.timeout > 0) { - code.push(indent, '"time"') - } - - if (source.postData.text) { - code.push(indent, '"strings"') - } - - code.push(indent, '"net/http"') - - if (opts.printBody) { - code.push(indent, '"io/ioutil"') - } - - code.push(')') - .blank() - .push('func main() {') - .blank() - } - - // Create client - let client - if (opts.timeout > 0) { - client = 'client' - code.push(indent, 'client := http.Client{') - .push(indent + 1, 'Timeout: time.Duration(%s * time.Second),', opts.timeout) - .push(indent, '}') - .blank() - } else { - client = 'http.DefaultClient' - } - - code.push(indent, 'url := "%s"', source.fullUrl) - .blank() - - // If we have body content or not create the var and reader or nil - if (source.postData.text) { - code.push(indent, 'payload := strings.NewReader(%s)', JSON.stringify(source.postData.text)) - .blank() - .push(indent, 'req, %s := http.NewRequest("%s", url, payload)', errorPlaceholder, source.method) - .blank() - } else { - code.push(indent, 'req, %s := http.NewRequest("%s", url, nil)', errorPlaceholder, source.method) - .blank() - } - - errorCheck() - - // Add headers - if (Object.keys(source.allHeaders).length) { - Object.keys(source.allHeaders).forEach(function (key) { - code.push(indent, 'req.Header.Add("%s", "%s")', key, source.allHeaders[key]) - }) - - code.blank() - } - - // Make request - code.push(indent, 'res, %s := %s.Do(req)', errorPlaceholder, client) - errorCheck() - - // Get Body - if (opts.printBody) { - code.blank() - .push(indent, 'defer res.Body.Close()') - .push(indent, 'body, %s := ioutil.ReadAll(res.Body)', errorPlaceholder) - errorCheck() - } - - // Print it - code.blank() - .push(indent, 'fmt.Println(res)') - - if (opts.printBody) { - code.push(indent, 'fmt.Println(string(body))') - } - - // End main block - if (opts.showBoilerplate) { - code.blank() - .push('}') - } - - return code.join() -} - -module.exports.info = { - key: 'native', - title: 'NewRequest', - link: 'http://golang.org/pkg/net/http/#NewRequest', - description: 'Golang HTTP client request' -} diff --git a/src/targets/go/native/client.test.ts b/src/targets/go/native/client.test.ts new file mode 100644 index 000000000..abfb22234 --- /dev/null +++ b/src/targets/go/native/client.test.ts @@ -0,0 +1,42 @@ +import request from '../../../fixtures/requests/full.json'; +import { runCustomFixtures } from '../../../fixtures/runCustomFixtures'; +import { Request } from '../../../httpsnippet'; + +runCustomFixtures({ + targetId: 'go', + clientId: 'native', + tests: [ + { + it: 'should support false boilerplate option', + input: request as Request, + options: { + showBoilerplate: false, + }, + expected: 'boilerplate-option.go', + }, + { + it: 'should support checkErrors option', + input: request as Request, + options: { + checkErrors: true, + }, + expected: 'check-errors-option.go', + }, + { + it: 'should support printBody option', + input: request as Request, + options: { + printBody: false, + }, + expected: 'print-body-option.go', + }, + { + it: 'should support timeout option', + input: request as Request, + options: { + timeout: 30, + }, + expected: 'timeout-option.go', + }, + ], +}); diff --git a/src/targets/go/native/client.ts b/src/targets/go/native/client.ts new file mode 100644 index 000000000..a4f9ff0ef --- /dev/null +++ b/src/targets/go/native/client.ts @@ -0,0 +1,143 @@ +/** + * @description + * HTTP code snippet generator for native Go. + * + * @author + * @montanaflynn + * + * for any questions or issues regarding the generated code snippet, please open an issue mentioning the author. + */ + +import { CodeBuilder } from '../../../helpers/code-builder'; +import { Client } from '../../targets'; + +export interface GoNativeOptions { + showBoilerplate?: boolean; + checkErrors?: boolean; + printBody?: boolean; + timeout?: number; +} + +export const native: Client = { + info: { + key: 'native', + title: 'NewRequest', + link: 'http://golang.org/pkg/net/http/#NewRequest', + description: 'Golang HTTP client request', + }, + convert: ({ postData, method, allHeaders, fullUrl }, options) => { + const { blank, push, join } = new CodeBuilder({ indent: '\t' }); + + const opts = { + showBoilerplate: true, + checkErrors: false, + printBody: true, + timeout: -1, + ...options, + }; + + const errorPlaceholder = opts.checkErrors ? 'err' : '_'; + + const indent = opts.showBoilerplate ? 1 : 0; + + const errorCheck = () => { + if (opts.checkErrors) { + push('if err != nil {', indent); + push('panic(err)', indent + 1); + push('}', indent); + } + }; + + // Create boilerplate + if (opts.showBoilerplate) { + push('package main'); + blank(); + push('import ('); + push('"fmt"', indent); + + if (opts.timeout > 0) { + push('"time"', indent); + } + + if (postData.text) { + push('"strings"', indent); + } + + push('"net/http"', indent); + + if (opts.printBody) { + push('"io/ioutil"', indent); + } + + push(')'); + blank(); + push('func main() {'); + blank(); + } + + // Create client + let client; + if (opts.timeout > 0) { + client = 'client'; + push('client := http.Client{', indent); + push(`Timeout: time.Duration(${opts.timeout} * time.Second),`, indent + 1); + push('}', indent); + blank(); + } else { + client = 'http.DefaultClient'; + } + + push(`url := "${fullUrl}"`, indent); + blank(); + + // If we have body content or not create the var and reader or nil + if (postData.text) { + push(`payload := strings.NewReader(${JSON.stringify(postData.text)})`, indent); + blank(); + push(`req, ${errorPlaceholder} := http.NewRequest("${method}", url, payload)`, indent); + blank(); + } else { + push(`req, ${errorPlaceholder} := http.NewRequest("${method}", url, nil)`, indent); + blank(); + } + + errorCheck(); + + // Add headers + if (Object.keys(allHeaders).length) { + Object.keys(allHeaders).forEach(key => { + push(`req.Header.Add("${key}", "${allHeaders[key]}")`, indent); + }); + + blank(); + } + + // Make request + push(`res, ${errorPlaceholder} := ${client}.Do(req)`, indent); + errorCheck(); + + // Get Body + if (opts.printBody) { + blank(); + push('defer res.Body.Close()', indent); + push(`body, ${errorPlaceholder} := ioutil.ReadAll(res.Body)`, indent); + errorCheck(); + } + + // Print it + blank(); + push('fmt.Println(res)', indent); + + if (opts.printBody) { + push('fmt.Println(string(body))', indent); + } + + // End main block + if (opts.showBoilerplate) { + blank(); + push('}'); + } + + return join(); + }, +}; diff --git a/test/fixtures/output/go/native/application-form-encoded.go b/src/targets/go/native/fixtures/application-form-encoded.go similarity index 99% rename from test/fixtures/output/go/native/application-form-encoded.go rename to src/targets/go/native/fixtures/application-form-encoded.go index 5344b4ea0..1aac5c584 100644 --- a/test/fixtures/output/go/native/application-form-encoded.go +++ b/src/targets/go/native/fixtures/application-form-encoded.go @@ -25,4 +25,4 @@ func main() { fmt.Println(res) fmt.Println(string(body)) -} +} \ No newline at end of file diff --git a/test/fixtures/output/go/native/application-json.go b/src/targets/go/native/fixtures/application-json.go similarity index 99% rename from test/fixtures/output/go/native/application-json.go rename to src/targets/go/native/fixtures/application-json.go index c9dba6a0b..a4bd02691 100644 --- a/test/fixtures/output/go/native/application-json.go +++ b/src/targets/go/native/fixtures/application-json.go @@ -25,4 +25,4 @@ func main() { fmt.Println(res) fmt.Println(string(body)) -} +} \ No newline at end of file diff --git a/src/targets/go/native/fixtures/boilerplate-option.go b/src/targets/go/native/fixtures/boilerplate-option.go new file mode 100644 index 000000000..bdbf8ddf4 --- /dev/null +++ b/src/targets/go/native/fixtures/boilerplate-option.go @@ -0,0 +1,17 @@ +url := "http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value" + +payload := strings.NewReader("foo=bar") + +req, _ := http.NewRequest("POST", url, payload) + +req.Header.Add("cookie", "foo=bar; bar=baz") +req.Header.Add("accept", "application/json") +req.Header.Add("content-type", "application/x-www-form-urlencoded") + +res, _ := http.DefaultClient.Do(req) + +defer res.Body.Close() +body, _ := ioutil.ReadAll(res.Body) + +fmt.Println(res) +fmt.Println(string(body)) \ No newline at end of file diff --git a/src/targets/go/native/fixtures/check-errors-option.go b/src/targets/go/native/fixtures/check-errors-option.go new file mode 100644 index 000000000..e15894625 --- /dev/null +++ b/src/targets/go/native/fixtures/check-errors-option.go @@ -0,0 +1,39 @@ +package main + +import ( + "fmt" + "strings" + "net/http" + "io/ioutil" +) + +func main() { + + url := "http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value" + + payload := strings.NewReader("foo=bar") + + req, err := http.NewRequest("POST", url, payload) + + if err != nil { + panic(err) + } + req.Header.Add("cookie", "foo=bar; bar=baz") + req.Header.Add("accept", "application/json") + req.Header.Add("content-type", "application/x-www-form-urlencoded") + + res, err := http.DefaultClient.Do(req) + if err != nil { + panic(err) + } + + defer res.Body.Close() + body, err := ioutil.ReadAll(res.Body) + if err != nil { + panic(err) + } + + fmt.Println(res) + fmt.Println(string(body)) + +} \ No newline at end of file diff --git a/test/fixtures/output/go/native/cookies.go b/src/targets/go/native/fixtures/cookies.go similarity index 99% rename from test/fixtures/output/go/native/cookies.go rename to src/targets/go/native/fixtures/cookies.go index cd706384e..7b556379d 100644 --- a/test/fixtures/output/go/native/cookies.go +++ b/src/targets/go/native/fixtures/cookies.go @@ -22,4 +22,4 @@ func main() { fmt.Println(res) fmt.Println(string(body)) -} +} \ No newline at end of file diff --git a/test/fixtures/output/go/native/custom-method.go b/src/targets/go/native/fixtures/custom-method.go similarity index 99% rename from test/fixtures/output/go/native/custom-method.go rename to src/targets/go/native/fixtures/custom-method.go index 00c86aeb8..83b88070f 100644 --- a/test/fixtures/output/go/native/custom-method.go +++ b/src/targets/go/native/fixtures/custom-method.go @@ -20,4 +20,4 @@ func main() { fmt.Println(res) fmt.Println(string(body)) -} +} \ No newline at end of file diff --git a/test/fixtures/output/go/native/full.go b/src/targets/go/native/fixtures/full.go similarity index 99% rename from test/fixtures/output/go/native/full.go rename to src/targets/go/native/fixtures/full.go index 7166a6ab2..004f0b532 100644 --- a/test/fixtures/output/go/native/full.go +++ b/src/targets/go/native/fixtures/full.go @@ -27,4 +27,4 @@ func main() { fmt.Println(res) fmt.Println(string(body)) -} +} \ No newline at end of file diff --git a/test/fixtures/output/go/native/headers.go b/src/targets/go/native/fixtures/headers.go similarity index 99% rename from test/fixtures/output/go/native/headers.go rename to src/targets/go/native/fixtures/headers.go index 0d09039ff..3ea6084ef 100644 --- a/test/fixtures/output/go/native/headers.go +++ b/src/targets/go/native/fixtures/headers.go @@ -23,4 +23,4 @@ func main() { fmt.Println(res) fmt.Println(string(body)) -} +} \ No newline at end of file diff --git a/test/fixtures/output/go/native/https.go b/src/targets/go/native/fixtures/https.go similarity index 99% rename from test/fixtures/output/go/native/https.go rename to src/targets/go/native/fixtures/https.go index 40e77239d..348a3e560 100644 --- a/test/fixtures/output/go/native/https.go +++ b/src/targets/go/native/fixtures/https.go @@ -20,4 +20,4 @@ func main() { fmt.Println(res) fmt.Println(string(body)) -} +} \ No newline at end of file diff --git a/test/fixtures/output/go/native/jsonObj-multiline.go b/src/targets/go/native/fixtures/jsonObj-multiline.go similarity index 99% rename from test/fixtures/output/go/native/jsonObj-multiline.go rename to src/targets/go/native/fixtures/jsonObj-multiline.go index 9f804865c..e93651721 100644 --- a/test/fixtures/output/go/native/jsonObj-multiline.go +++ b/src/targets/go/native/fixtures/jsonObj-multiline.go @@ -25,4 +25,4 @@ func main() { fmt.Println(res) fmt.Println(string(body)) -} +} \ No newline at end of file diff --git a/test/fixtures/output/go/native/jsonObj-null-value.go b/src/targets/go/native/fixtures/jsonObj-null-value.go similarity index 99% rename from test/fixtures/output/go/native/jsonObj-null-value.go rename to src/targets/go/native/fixtures/jsonObj-null-value.go index 8d920d7f9..8ce0fc46f 100644 --- a/test/fixtures/output/go/native/jsonObj-null-value.go +++ b/src/targets/go/native/fixtures/jsonObj-null-value.go @@ -25,4 +25,4 @@ func main() { fmt.Println(res) fmt.Println(string(body)) -} +} \ No newline at end of file diff --git a/test/fixtures/output/go/native/multipart-data.go b/src/targets/go/native/fixtures/multipart-data.go similarity index 99% rename from test/fixtures/output/go/native/multipart-data.go rename to src/targets/go/native/fixtures/multipart-data.go index 3bc875abc..331e29100 100644 --- a/test/fixtures/output/go/native/multipart-data.go +++ b/src/targets/go/native/fixtures/multipart-data.go @@ -25,4 +25,4 @@ func main() { fmt.Println(res) fmt.Println(string(body)) -} +} \ No newline at end of file diff --git a/test/fixtures/output/go/native/multipart-file.go b/src/targets/go/native/fixtures/multipart-file.go similarity index 99% rename from test/fixtures/output/go/native/multipart-file.go rename to src/targets/go/native/fixtures/multipart-file.go index 931cd280b..d9c1a1d63 100644 --- a/test/fixtures/output/go/native/multipart-file.go +++ b/src/targets/go/native/fixtures/multipart-file.go @@ -25,4 +25,4 @@ func main() { fmt.Println(res) fmt.Println(string(body)) -} +} \ No newline at end of file diff --git a/test/fixtures/output/go/native/multipart-form-data.go b/src/targets/go/native/fixtures/multipart-form-data.go similarity index 99% rename from test/fixtures/output/go/native/multipart-form-data.go rename to src/targets/go/native/fixtures/multipart-form-data.go index cf31548a9..7eb0d8c8e 100644 --- a/test/fixtures/output/go/native/multipart-form-data.go +++ b/src/targets/go/native/fixtures/multipart-form-data.go @@ -25,4 +25,4 @@ func main() { fmt.Println(res) fmt.Println(string(body)) -} +} \ No newline at end of file diff --git a/test/fixtures/output/go/native/nested.go b/src/targets/go/native/fixtures/nested.go similarity index 99% rename from test/fixtures/output/go/native/nested.go rename to src/targets/go/native/fixtures/nested.go index f392179d7..1c9ff8523 100644 --- a/test/fixtures/output/go/native/nested.go +++ b/src/targets/go/native/fixtures/nested.go @@ -20,4 +20,4 @@ func main() { fmt.Println(res) fmt.Println(string(body)) -} +} \ No newline at end of file diff --git a/src/targets/go/native/fixtures/print-body-option.go b/src/targets/go/native/fixtures/print-body-option.go new file mode 100644 index 000000000..5243f5a31 --- /dev/null +++ b/src/targets/go/native/fixtures/print-body-option.go @@ -0,0 +1,25 @@ +package main + +import ( + "fmt" + "strings" + "net/http" +) + +func main() { + + url := "http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value" + + payload := strings.NewReader("foo=bar") + + req, _ := http.NewRequest("POST", url, payload) + + req.Header.Add("cookie", "foo=bar; bar=baz") + req.Header.Add("accept", "application/json") + req.Header.Add("content-type", "application/x-www-form-urlencoded") + + res, _ := http.DefaultClient.Do(req) + + fmt.Println(res) + +} \ No newline at end of file diff --git a/test/fixtures/output/go/native/query.go b/src/targets/go/native/fixtures/query.go similarity index 99% rename from test/fixtures/output/go/native/query.go rename to src/targets/go/native/fixtures/query.go index e2e47aca6..5d181e8a3 100644 --- a/test/fixtures/output/go/native/query.go +++ b/src/targets/go/native/fixtures/query.go @@ -20,4 +20,4 @@ func main() { fmt.Println(res) fmt.Println(string(body)) -} +} \ No newline at end of file diff --git a/test/fixtures/output/go/native/short.go b/src/targets/go/native/fixtures/short.go similarity index 99% rename from test/fixtures/output/go/native/short.go rename to src/targets/go/native/fixtures/short.go index 441f2a062..78e51ceaf 100644 --- a/test/fixtures/output/go/native/short.go +++ b/src/targets/go/native/fixtures/short.go @@ -20,4 +20,4 @@ func main() { fmt.Println(res) fmt.Println(string(body)) -} +} \ No newline at end of file diff --git a/test/fixtures/output/go/native/text-plain.go b/src/targets/go/native/fixtures/text-plain.go similarity index 99% rename from test/fixtures/output/go/native/text-plain.go rename to src/targets/go/native/fixtures/text-plain.go index ccf1c7a6b..f030b9fcb 100644 --- a/test/fixtures/output/go/native/text-plain.go +++ b/src/targets/go/native/fixtures/text-plain.go @@ -25,4 +25,4 @@ func main() { fmt.Println(res) fmt.Println(string(body)) -} +} \ No newline at end of file diff --git a/src/targets/go/native/fixtures/timeout-option.go b/src/targets/go/native/fixtures/timeout-option.go new file mode 100644 index 000000000..665cd9cfc --- /dev/null +++ b/src/targets/go/native/fixtures/timeout-option.go @@ -0,0 +1,35 @@ +package main + +import ( + "fmt" + "time" + "strings" + "net/http" + "io/ioutil" +) + +func main() { + + client := http.Client{ + Timeout: time.Duration(30 * time.Second), + } + + url := "http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value" + + payload := strings.NewReader("foo=bar") + + req, _ := http.NewRequest("POST", url, payload) + + req.Header.Add("cookie", "foo=bar; bar=baz") + req.Header.Add("accept", "application/json") + req.Header.Add("content-type", "application/x-www-form-urlencoded") + + res, _ := client.Do(req) + + defer res.Body.Close() + body, _ := ioutil.ReadAll(res.Body) + + fmt.Println(res) + fmt.Println(string(body)) + +} \ No newline at end of file diff --git a/src/targets/go/target.ts b/src/targets/go/target.ts new file mode 100644 index 000000000..1a951468f --- /dev/null +++ b/src/targets/go/target.ts @@ -0,0 +1,14 @@ +import { Target } from '../targets'; +import { native } from './native/client'; + +export const go: Target = { + info: { + key: 'go', + title: 'Go', + extname: '.go', + default: 'native', + }, + clientsById: { + native, + }, +}; diff --git a/src/targets/har-schema.d.ts b/src/targets/har-schema.d.ts new file mode 100644 index 000000000..1df95659e --- /dev/null +++ b/src/targets/har-schema.d.ts @@ -0,0 +1,4 @@ +declare module 'har-schema' { + const schema: object; + export default schema; +} diff --git a/src/targets/http/http1.1.js b/src/targets/http/http1.1.js deleted file mode 100644 index 58b5918b5..000000000 --- a/src/targets/http/http1.1.js +++ /dev/null @@ -1,99 +0,0 @@ -/** - * @description - * HTTP code snippet generator to generate raw HTTP/1.1 request strings, - * in accordance to the RFC 7230 (and RFC 7231) specifications. - * - * @author - * @irvinlim - * - * For any questions or issues regarding the generated code snippet, please open an issue mentioning the author. - */ - -'use strict' - -const CRLF = '\r\n' -const CodeBuilder = require('../../helpers/code-builder') -const util = require('util') - -/** - * Request follows the request message format in accordance to RFC 7230, Section 3. - * Each section is prepended with the RFC and section number. - * See more at https://tools.ietf.org/html/rfc7230#section-3. - */ -module.exports = function (source, options) { - const opts = Object.assign( - { - absoluteURI: false, - autoContentLength: true, - autoHost: true - }, - options - ) - - // RFC 7230 Section 3. Message Format - // All lines have no indentation, and should be terminated with CRLF. - const code = new CodeBuilder('', CRLF) - - // RFC 7230 Section 5.3. Request Target - // Determines if the Request-Line should use 'absolute-form' or 'origin-form'. - // Basically it means whether the "http://domain.com" will prepend the full url. - const requestUrl = opts.absoluteURI ? source.fullUrl : source.uriObj.path - - // RFC 7230 Section 3.1.1. Request-Line - code.push('%s %s %s', source.method, requestUrl, source.httpVersion) - - // RFC 7231 Section 5. Header Fields - Object.keys(source.allHeaders).forEach(function (key) { - // Capitalize header keys, even though it's not required by the spec. - const keyCapitalized = key.toLowerCase().replace(/(^|-)(\w)/g, function (x) { - return x.toUpperCase() - }) - - code.push( - '%s', - util.format('%s: %s', keyCapitalized, source.allHeaders[key]) - ) - }) - - // RFC 7230 Section 5.4. Host - // Automatically set Host header if option is on and on header already exists. - if (opts.autoHost && Object.keys(source.allHeaders).indexOf('host') === -1) { - code.push('Host: %s', source.uriObj.host) - } - - // RFC 7230 Section 3.3.3. Message Body Length - // Automatically set Content-Length header if option is on, postData is present and no header already exists. - if ( - opts.autoContentLength && - source.postData.text && - Object.keys(source.allHeaders).indexOf('content-length') === -1 - ) { - code.push( - 'Content-Length: %d', - Buffer.byteLength(source.postData.text, 'ascii') - ) - } - - // Add extra line after header section. - code.blank() - - // Separate header section and message body section. - const headerSection = code.join() - let messageBody = '' - - // RFC 7230 Section 3.3. Message Body - if (source.postData.text) { - messageBody = source.postData.text - } - - // RFC 7230 Section 3. Message Format - // Extra CRLF separating the headers from the body. - return headerSection + CRLF + messageBody -} - -module.exports.info = { - key: '1.1', - title: 'HTTP/1.1', - link: 'https://tools.ietf.org/html/rfc7230', - description: 'HTTP/1.1 request string in accordance with RFC 7230' -} diff --git a/src/targets/http/http1.1/client.ts b/src/targets/http/http1.1/client.ts new file mode 100644 index 000000000..0b28ef079 --- /dev/null +++ b/src/targets/http/http1.1/client.ts @@ -0,0 +1,89 @@ +/** + * @description + * HTTP code snippet generator to generate raw HTTP/1.1 request strings, + * in accordance to the RFC 7230 (and RFC 7231) specifications. + * + * @author + * @irvinlim + * + * For any questions or issues regarding the generated code snippet, please open an issue mentioning the author. + */ + +import { CodeBuilder } from '../../../helpers/code-builder'; +import { Client } from '../../targets'; + +const CRLF = '\r\n'; + +interface Http11Options { + absoluteURI?: boolean; + autoContentLength?: boolean; + autoHost?: boolean; +} + +/** + * Request follows the request message format in accordance to RFC 7230, Section 3. + * Each section is prepended with the RFC and section number. + * See more at https://tools.ietf.org/html/rfc7230#section-3. + */ +export const http11: Client = { + info: { + key: 'http1.1', + title: 'HTTP/1.1', + link: 'https://tools.ietf.org/html/rfc7230', + description: 'HTTP/1.1 request string in accordance with RFC 7230', + }, + convert: ({ method, fullUrl, uriObj, httpVersion, allHeaders, postData }, options) => { + const opts = { + absoluteURI: false, + autoContentLength: true, + autoHost: true, + ...options, + }; + + // RFC 7230 Section 3. Message Format + // All lines have no indentation, and should be terminated with CRLF. + const { blank, push, join } = new CodeBuilder({ indent: '', join: CRLF }); + + // RFC 7230 Section 5.3. Request Target + // Determines if the Request-Line should use 'absolute-form' or 'origin-form'. + // Basically it means whether the "http://domain.com" will prepend the full url. + const requestUrl = opts.absoluteURI ? fullUrl : uriObj.path; + + // RFC 7230 Section 3.1.1. Request-Line + push(`${method} ${requestUrl} ${httpVersion}`); + + const headerKeys = Object.keys(allHeaders); + // RFC 7231 Section 5. Header Fields + headerKeys.forEach(key => { + // Capitalize header keys, even though it's not required by the spec. + const keyCapitalized = key.toLowerCase().replace(/(^|-)(\w)/g, input => input.toUpperCase()); + push(`${keyCapitalized}: ${allHeaders[key]}`); + }); + + // RFC 7230 Section 5.4. Host + // Automatically set Host header if option is on and on header already exists. + if (opts.autoHost && !headerKeys.includes('host')) { + push(`Host: ${uriObj.host}`); + } + + // RFC 7230 Section 3.3.3. Message Body Length + // Automatically set Content-Length header if option is on, postData is present and no header already exists. + if (opts.autoContentLength && postData.text && !headerKeys.includes('content-length')) { + const length = Buffer.byteLength(postData.text, 'ascii').toString(); + push(`Content-Length: ${length}`); + } + + // Add extra line after header section. + blank(); + + // Separate header section and message body section. + const headerSection = join(); + + // RFC 7230 Section 3.3. Message Body + const messageBody = postData.text || ''; + + // RFC 7230 Section 3. Message Format + // Extra CRLF separating the headers from the body. + return `${headerSection}${CRLF}${messageBody}`; + }, +}; diff --git a/test/fixtures/output/http/1.1/application-form-encoded b/src/targets/http/http1.1/fixtures/application-form-encoded similarity index 81% rename from test/fixtures/output/http/1.1/application-form-encoded rename to src/targets/http/http1.1/fixtures/application-form-encoded index 723d94a90..ff23ca597 100644 --- a/test/fixtures/output/http/1.1/application-form-encoded +++ b/src/targets/http/http1.1/fixtures/application-form-encoded @@ -1,6 +1,6 @@ -POST /har HTTP/1.1 -Content-Type: application/x-www-form-urlencoded -Host: mockbin.com -Content-Length: 19 - -foo=bar&hello=world +POST /har HTTP/1.1 +Content-Type: application/x-www-form-urlencoded +Host: mockbin.com +Content-Length: 19 + +foo=bar&hello=world \ No newline at end of file diff --git a/test/fixtures/output/http/1.1/application-json b/src/targets/http/http1.1/fixtures/application-json similarity index 72% rename from test/fixtures/output/http/1.1/application-json rename to src/targets/http/http1.1/fixtures/application-json index ee65b5469..fcfdd81c2 100644 --- a/test/fixtures/output/http/1.1/application-json +++ b/src/targets/http/http1.1/fixtures/application-json @@ -1,6 +1,6 @@ -POST /har HTTP/1.1 -Content-Type: application/json -Host: mockbin.com -Content-Length: 118 - -{"number":1,"string":"f\"oo","arr":[1,2,3],"nested":{"a":"b"},"arr_mix":[1,"a",{"arr_mix_nested":{}}],"boolean":false} +POST /har HTTP/1.1 +Content-Type: application/json +Host: mockbin.com +Content-Length: 118 + +{"number":1,"string":"f\"oo","arr":[1,2,3],"nested":{"a":"b"},"arr_mix":[1,"a",{"arr_mix_nested":{}}],"boolean":false} \ No newline at end of file diff --git a/test/fixtures/output/http/1.1/cookies b/src/targets/http/http1.1/fixtures/cookies similarity index 94% rename from test/fixtures/output/http/1.1/cookies rename to src/targets/http/http1.1/fixtures/cookies index 15945bcc8..5e46f3964 100644 --- a/test/fixtures/output/http/1.1/cookies +++ b/src/targets/http/http1.1/fixtures/cookies @@ -1,5 +1,4 @@ -POST /har HTTP/1.1 -Cookie: foo=bar; bar=baz -Host: mockbin.com - - +POST /har HTTP/1.1 +Cookie: foo=bar; bar=baz +Host: mockbin.com + diff --git a/test/fixtures/output/http/1.1/custom-method b/src/targets/http/http1.1/fixtures/custom-method similarity index 93% rename from test/fixtures/output/http/1.1/custom-method rename to src/targets/http/http1.1/fixtures/custom-method index 76f546524..a5c8f45be 100644 --- a/test/fixtures/output/http/1.1/custom-method +++ b/src/targets/http/http1.1/fixtures/custom-method @@ -1,4 +1,3 @@ -PROPFIND /har HTTP/1.1 -Host: mockbin.com - - +PROPFIND /har HTTP/1.1 +Host: mockbin.com + diff --git a/test/fixtures/output/http/1.1/full b/src/targets/http/http1.1/fixtures/full similarity index 93% rename from test/fixtures/output/http/1.1/full rename to src/targets/http/http1.1/fixtures/full index d4d41ecff..a3e5a559b 100644 --- a/test/fixtures/output/http/1.1/full +++ b/src/targets/http/http1.1/fixtures/full @@ -1,8 +1,8 @@ -POST /har?foo=bar&foo=baz&baz=abc&key=value HTTP/1.1 -Cookie: foo=bar; bar=baz -Accept: application/json -Content-Type: application/x-www-form-urlencoded -Host: mockbin.com -Content-Length: 7 - -foo=bar +POST /har?foo=bar&foo=baz&baz=abc&key=value HTTP/1.1 +Cookie: foo=bar; bar=baz +Accept: application/json +Content-Type: application/x-www-form-urlencoded +Host: mockbin.com +Content-Length: 7 + +foo=bar \ No newline at end of file diff --git a/test/fixtures/output/http/1.1/headers b/src/targets/http/http1.1/fixtures/headers similarity index 93% rename from test/fixtures/output/http/1.1/headers rename to src/targets/http/http1.1/fixtures/headers index 7bde2bcc7..f84932e91 100644 --- a/test/fixtures/output/http/1.1/headers +++ b/src/targets/http/http1.1/fixtures/headers @@ -1,6 +1,5 @@ -GET /har HTTP/1.1 -Accept: application/json -X-Foo: Bar -Host: mockbin.com - - +GET /har HTTP/1.1 +Accept: application/json +X-Foo: Bar +Host: mockbin.com + diff --git a/test/fixtures/output/http/1.1/https b/src/targets/http/http1.1/fixtures/https similarity index 92% rename from test/fixtures/output/http/1.1/https rename to src/targets/http/http1.1/fixtures/https index 122711d7a..858edeeb2 100644 --- a/test/fixtures/output/http/1.1/https +++ b/src/targets/http/http1.1/fixtures/https @@ -1,4 +1,3 @@ -GET /har HTTP/1.1 -Host: mockbin.com - - +GET /har HTTP/1.1 +Host: mockbin.com + diff --git a/test/fixtures/output/http/1.1/jsonObj-multiline b/src/targets/http/http1.1/fixtures/jsonObj-multiline similarity index 94% rename from test/fixtures/output/http/1.1/jsonObj-multiline rename to src/targets/http/http1.1/fixtures/jsonObj-multiline index ebc26ade1..1a9e3322a 100644 --- a/test/fixtures/output/http/1.1/jsonObj-multiline +++ b/src/targets/http/http1.1/fixtures/jsonObj-multiline @@ -1,8 +1,8 @@ -POST /har HTTP/1.1 -Content-Type: application/json -Host: mockbin.com -Content-Length: 18 - +POST /har HTTP/1.1 +Content-Type: application/json +Host: mockbin.com +Content-Length: 18 + { "foo": "bar" -} +} \ No newline at end of file diff --git a/test/fixtures/output/http/1.1/jsonObj-null-value b/src/targets/http/http1.1/fixtures/jsonObj-null-value similarity index 83% rename from test/fixtures/output/http/1.1/jsonObj-null-value rename to src/targets/http/http1.1/fixtures/jsonObj-null-value index 240a57bce..6d9414a74 100644 --- a/test/fixtures/output/http/1.1/jsonObj-null-value +++ b/src/targets/http/http1.1/fixtures/jsonObj-null-value @@ -1,6 +1,6 @@ -POST /har HTTP/1.1 -Content-Type: application/json -Host: mockbin.com -Content-Length: 12 - -{"foo":null} +POST /har HTTP/1.1 +Content-Type: application/json +Host: mockbin.com +Content-Length: 12 + +{"foo":null} \ No newline at end of file diff --git a/test/fixtures/output/http/1.1/multipart-data b/src/targets/http/http1.1/fixtures/multipart-data similarity index 96% rename from test/fixtures/output/http/1.1/multipart-data rename to src/targets/http/http1.1/fixtures/multipart-data index cbe1c5f5a..ba6df27f0 100644 --- a/test/fixtures/output/http/1.1/multipart-data +++ b/src/targets/http/http1.1/fixtures/multipart-data @@ -1,11 +1,11 @@ -POST /har HTTP/1.1 -Content-Type: multipart/form-data; boundary=---011000010111000001101001 -Host: mockbin.com -Content-Length: 171 - ------011000010111000001101001 -Content-Disposition: form-data; name="foo"; filename="hello.txt" -Content-Type: text/plain - -Hello World ------011000010111000001101001-- +POST /har HTTP/1.1 +Content-Type: multipart/form-data; boundary=---011000010111000001101001 +Host: mockbin.com +Content-Length: 171 + +-----011000010111000001101001 +Content-Disposition: form-data; name="foo"; filename="hello.txt" +Content-Type: text/plain + +Hello World +-----011000010111000001101001-- diff --git a/test/fixtures/output/http/1.1/multipart-file b/src/targets/http/http1.1/fixtures/multipart-file similarity index 96% rename from test/fixtures/output/http/1.1/multipart-file rename to src/targets/http/http1.1/fixtures/multipart-file index be0776f19..cededb2c7 100644 --- a/test/fixtures/output/http/1.1/multipart-file +++ b/src/targets/http/http1.1/fixtures/multipart-file @@ -1,11 +1,11 @@ -POST /har HTTP/1.1 -Content-Type: multipart/form-data; boundary=---011000010111000001101001 -Host: mockbin.com -Content-Length: 160 - ------011000010111000001101001 -Content-Disposition: form-data; name="foo"; filename="hello.txt" -Content-Type: text/plain - - ------011000010111000001101001-- +POST /har HTTP/1.1 +Content-Type: multipart/form-data; boundary=---011000010111000001101001 +Host: mockbin.com +Content-Length: 160 + +-----011000010111000001101001 +Content-Disposition: form-data; name="foo"; filename="hello.txt" +Content-Type: text/plain + + +-----011000010111000001101001-- diff --git a/test/fixtures/output/http/1.1/multipart-form-data b/src/targets/http/http1.1/fixtures/multipart-form-data similarity index 96% rename from test/fixtures/output/http/1.1/multipart-form-data rename to src/targets/http/http1.1/fixtures/multipart-form-data index 5fd60b6f4..ff3f7041d 100644 --- a/test/fixtures/output/http/1.1/multipart-form-data +++ b/src/targets/http/http1.1/fixtures/multipart-form-data @@ -1,10 +1,10 @@ -POST /har HTTP/1.1 -Content-Type: multipart/form-data; boundary=---011000010111000001101001 -Host: mockbin.com -Content-Length: 115 - ------011000010111000001101001 -Content-Disposition: form-data; name="foo" - -bar ------011000010111000001101001-- +POST /har HTTP/1.1 +Content-Type: multipart/form-data; boundary=---011000010111000001101001 +Host: mockbin.com +Content-Length: 115 + +-----011000010111000001101001 +Content-Disposition: form-data; name="foo" + +bar +-----011000010111000001101001-- diff --git a/test/fixtures/output/http/1.1/nested b/src/targets/http/http1.1/fixtures/nested similarity index 96% rename from test/fixtures/output/http/1.1/nested rename to src/targets/http/http1.1/fixtures/nested index 04944865c..125f6be42 100644 --- a/test/fixtures/output/http/1.1/nested +++ b/src/targets/http/http1.1/fixtures/nested @@ -1,4 +1,3 @@ -GET /har?foo%5Bbar%5D=baz%2Czap&fiz=buz&key=value HTTP/1.1 -Host: mockbin.com - - +GET /har?foo%5Bbar%5D=baz%2Czap&fiz=buz&key=value HTTP/1.1 +Host: mockbin.com + diff --git a/test/fixtures/output/http/1.1/query b/src/targets/http/http1.1/fixtures/query similarity index 95% rename from test/fixtures/output/http/1.1/query rename to src/targets/http/http1.1/fixtures/query index 5d2fd5d42..2c5300a7c 100644 --- a/test/fixtures/output/http/1.1/query +++ b/src/targets/http/http1.1/fixtures/query @@ -1,4 +1,3 @@ -GET /har?foo=bar&foo=baz&baz=abc&key=value HTTP/1.1 -Host: mockbin.com - - +GET /har?foo=bar&foo=baz&baz=abc&key=value HTTP/1.1 +Host: mockbin.com + diff --git a/test/fixtures/output/http/1.1/short b/src/targets/http/http1.1/fixtures/short similarity index 92% rename from test/fixtures/output/http/1.1/short rename to src/targets/http/http1.1/fixtures/short index 122711d7a..858edeeb2 100644 --- a/test/fixtures/output/http/1.1/short +++ b/src/targets/http/http1.1/fixtures/short @@ -1,4 +1,3 @@ -GET /har HTTP/1.1 -Host: mockbin.com - - +GET /har HTTP/1.1 +Host: mockbin.com + diff --git a/test/fixtures/output/http/1.1/text-plain b/src/targets/http/http1.1/fixtures/text-plain similarity index 83% rename from test/fixtures/output/http/1.1/text-plain rename to src/targets/http/http1.1/fixtures/text-plain index c341a43ac..47aac69ec 100644 --- a/test/fixtures/output/http/1.1/text-plain +++ b/src/targets/http/http1.1/fixtures/text-plain @@ -1,6 +1,6 @@ -POST /har HTTP/1.1 -Content-Type: text/plain -Host: mockbin.com -Content-Length: 11 - -Hello World +POST /har HTTP/1.1 +Content-Type: text/plain +Host: mockbin.com +Content-Length: 11 + +Hello World \ No newline at end of file diff --git a/src/targets/http/index.js b/src/targets/http/index.js deleted file mode 100644 index 9ad83c680..000000000 --- a/src/targets/http/index.js +++ /dev/null @@ -1,12 +0,0 @@ -'use strict' - -module.exports = { - info: { - key: 'http', - title: 'HTTP', - extname: '', - default: '1.1' - }, - - 1.1: require('./http1.1') -} diff --git a/src/targets/http/target.ts b/src/targets/http/target.ts new file mode 100644 index 000000000..abeb5e38e --- /dev/null +++ b/src/targets/http/target.ts @@ -0,0 +1,14 @@ +import { Target } from '../targets'; +import { http11 } from './http1.1/client'; + +export const http: Target = { + info: { + key: 'http', + title: 'HTTP', + extname: null, + default: '1.1', + }, + clientsById: { + 'http1.1': http11, + }, +}; diff --git a/src/targets/index.js b/src/targets/index.js deleted file mode 100644 index dd90b4874..000000000 --- a/src/targets/index.js +++ /dev/null @@ -1,22 +0,0 @@ -'use strict' - -module.exports = { - c: require('./c'), - clojure: require('./clojure'), - csharp: require('./csharp'), - go: require('./go'), - http: require('./http'), - java: require('./java'), - javascript: require('./javascript'), - kotlin: require('./kotlin'), - node: require('./node'), - objc: require('./objc'), - ocaml: require('./ocaml'), - php: require('./php'), - powershell: require('./powershell'), - python: require('./python'), - r: require('./r'), - ruby: require('./ruby'), - shell: require('./shell'), - swift: require('./swift') -} diff --git a/src/targets/java/asynchttp.js b/src/targets/java/asynchttp.js deleted file mode 100644 index ce3db5db5..000000000 --- a/src/targets/java/asynchttp.js +++ /dev/null @@ -1,55 +0,0 @@ -/** - * @description - * Asynchronous Http and WebSocket Client library for Java - * - * @author - * @windard - * - * for any questions or issues regarding the generated code snippet, please open an issue mentioning the author. - */ - -'use strict' - -const CodeBuilder = require('../../helpers/code-builder') - -module.exports = function (source, options) { - const opts = Object.assign({ - indent: ' ' - }, options) - - const code = new CodeBuilder(opts.indent) - - code.push('AsyncHttpClient client = new DefaultAsyncHttpClient();') - - code.push(`client.prepare("${source.method.toUpperCase()}", "${source.fullUrl}")`) - - // Add headers, including the cookies - const headers = Object.keys(source.allHeaders) - - // construct headers - if (headers.length) { - headers.forEach(function (key) { - code.push(1, '.setHeader("%s", "%s")', key, source.allHeaders[key]) - }) - } - - if (source.postData.text) { - code.push(1, '.setBody(%s)', JSON.stringify(source.postData.text)) - } - - code.push(1, '.execute()') - code.push(1, '.toCompletableFuture()') - code.push(1, '.thenAccept(System.out::println)') - code.push(1, '.join();') - code.blank() - code.push('client.close();') - - return code.join() -} - -module.exports.info = { - key: 'asynchttp', - title: 'AsyncHttp', - link: 'https://github.com/AsyncHttpClient/async-http-client', - description: 'Asynchronous Http and WebSocket Client library for Java' -} diff --git a/src/targets/java/asynchttp/client.ts b/src/targets/java/asynchttp/client.ts new file mode 100644 index 000000000..fee21b2cc --- /dev/null +++ b/src/targets/java/asynchttp/client.ts @@ -0,0 +1,50 @@ +/** + * @description + * Asynchronous Http and WebSocket Client library for Java + * + * @author + * @windard + * + * for any questions or issues regarding the generated code snippet, please open an issue mentioning the author. + */ + +import { CodeBuilder } from '../../../helpers/code-builder'; +import { Client } from '../../targets'; + +export const asynchttp: Client = { + info: { + key: 'asynchttp', + title: 'AsyncHttp', + link: 'https://github.com/AsyncHttpClient/async-http-client', + description: 'Asynchronous Http and WebSocket Client library for Java', + }, + convert: ({ method, allHeaders, postData, fullUrl }, options) => { + const opts = { + indent: ' ', + ...options, + }; + const { blank, push, join } = new CodeBuilder({ indent: opts.indent }); + + push('AsyncHttpClient client = new DefaultAsyncHttpClient();'); + + push(`client.prepare("${method.toUpperCase()}", "${fullUrl}")`); + + // Add headers, including the cookies + Object.keys(allHeaders).forEach(key => { + push(`.setHeader("${key}", "${allHeaders[key]}")`, 1); + }); + + if (postData.text) { + push(`.setBody(${JSON.stringify(postData.text)})`, 1); + } + + push('.execute()', 1); + push('.toCompletableFuture()', 1); + push('.thenAccept(System.out::println)', 1); + push('.join();', 1); + blank(); + push('client.close();'); + + return join(); + }, +}; diff --git a/test/fixtures/output/java/asynchttp/application-form-encoded.java b/src/targets/java/asynchttp/fixtures/application-form-encoded.java similarity index 94% rename from test/fixtures/output/java/asynchttp/application-form-encoded.java rename to src/targets/java/asynchttp/fixtures/application-form-encoded.java index b4d515b1c..457b6120b 100644 --- a/test/fixtures/output/java/asynchttp/application-form-encoded.java +++ b/src/targets/java/asynchttp/fixtures/application-form-encoded.java @@ -7,4 +7,4 @@ .thenAccept(System.out::println) .join(); -client.close(); +client.close(); \ No newline at end of file diff --git a/test/fixtures/output/java/asynchttp/application-json.java b/src/targets/java/asynchttp/fixtures/application-json.java similarity index 96% rename from test/fixtures/output/java/asynchttp/application-json.java rename to src/targets/java/asynchttp/fixtures/application-json.java index 1633e36c9..91ce7cf5f 100644 --- a/test/fixtures/output/java/asynchttp/application-json.java +++ b/src/targets/java/asynchttp/fixtures/application-json.java @@ -7,4 +7,4 @@ .thenAccept(System.out::println) .join(); -client.close(); +client.close(); \ No newline at end of file diff --git a/test/fixtures/output/java/asynchttp/cookies.java b/src/targets/java/asynchttp/fixtures/cookies.java similarity index 93% rename from test/fixtures/output/java/asynchttp/cookies.java rename to src/targets/java/asynchttp/fixtures/cookies.java index 62b6eee43..7f648170d 100644 --- a/test/fixtures/output/java/asynchttp/cookies.java +++ b/src/targets/java/asynchttp/fixtures/cookies.java @@ -6,4 +6,4 @@ .thenAccept(System.out::println) .join(); -client.close(); +client.close(); \ No newline at end of file diff --git a/test/fixtures/output/java/asynchttp/custom-method.java b/src/targets/java/asynchttp/fixtures/custom-method.java similarity index 92% rename from test/fixtures/output/java/asynchttp/custom-method.java rename to src/targets/java/asynchttp/fixtures/custom-method.java index be1e9fc46..a5af54896 100644 --- a/test/fixtures/output/java/asynchttp/custom-method.java +++ b/src/targets/java/asynchttp/fixtures/custom-method.java @@ -5,4 +5,4 @@ .thenAccept(System.out::println) .join(); -client.close(); +client.close(); \ No newline at end of file diff --git a/test/fixtures/output/java/asynchttp/full.java b/src/targets/java/asynchttp/fixtures/full.java similarity index 96% rename from test/fixtures/output/java/asynchttp/full.java rename to src/targets/java/asynchttp/fixtures/full.java index 9fd2c6ffb..bae23b7ca 100644 --- a/test/fixtures/output/java/asynchttp/full.java +++ b/src/targets/java/asynchttp/fixtures/full.java @@ -9,4 +9,4 @@ .thenAccept(System.out::println) .join(); -client.close(); +client.close(); \ No newline at end of file diff --git a/test/fixtures/output/java/asynchttp/headers.java b/src/targets/java/asynchttp/fixtures/headers.java similarity index 94% rename from test/fixtures/output/java/asynchttp/headers.java rename to src/targets/java/asynchttp/fixtures/headers.java index 472fe09bd..3bdbeaf36 100644 --- a/test/fixtures/output/java/asynchttp/headers.java +++ b/src/targets/java/asynchttp/fixtures/headers.java @@ -7,4 +7,4 @@ .thenAccept(System.out::println) .join(); -client.close(); +client.close(); \ No newline at end of file diff --git a/test/fixtures/output/java/asynchttp/https.java b/src/targets/java/asynchttp/fixtures/https.java similarity index 92% rename from test/fixtures/output/java/asynchttp/https.java rename to src/targets/java/asynchttp/fixtures/https.java index 779198c27..4897505e6 100644 --- a/test/fixtures/output/java/asynchttp/https.java +++ b/src/targets/java/asynchttp/fixtures/https.java @@ -5,4 +5,4 @@ .thenAccept(System.out::println) .join(); -client.close(); +client.close(); \ No newline at end of file diff --git a/test/fixtures/output/java/asynchttp/jsonObj-multiline.java b/src/targets/java/asynchttp/fixtures/jsonObj-multiline.java similarity index 94% rename from test/fixtures/output/java/asynchttp/jsonObj-multiline.java rename to src/targets/java/asynchttp/fixtures/jsonObj-multiline.java index 25f44e5cb..08f53079b 100644 --- a/test/fixtures/output/java/asynchttp/jsonObj-multiline.java +++ b/src/targets/java/asynchttp/fixtures/jsonObj-multiline.java @@ -7,4 +7,4 @@ .thenAccept(System.out::println) .join(); -client.close(); +client.close(); \ No newline at end of file diff --git a/test/fixtures/output/java/asynchttp/jsonObj-null-value.java b/src/targets/java/asynchttp/fixtures/jsonObj-null-value.java similarity index 94% rename from test/fixtures/output/java/asynchttp/jsonObj-null-value.java rename to src/targets/java/asynchttp/fixtures/jsonObj-null-value.java index 6d299feb9..92086329e 100644 --- a/test/fixtures/output/java/asynchttp/jsonObj-null-value.java +++ b/src/targets/java/asynchttp/fixtures/jsonObj-null-value.java @@ -7,4 +7,4 @@ .thenAccept(System.out::println) .join(); -client.close(); +client.close(); \ No newline at end of file diff --git a/test/fixtures/output/java/asynchttp/multipart-data.java b/src/targets/java/asynchttp/fixtures/multipart-data.java similarity index 96% rename from test/fixtures/output/java/asynchttp/multipart-data.java rename to src/targets/java/asynchttp/fixtures/multipart-data.java index 50c9f504d..0b5a2bdb1 100644 --- a/test/fixtures/output/java/asynchttp/multipart-data.java +++ b/src/targets/java/asynchttp/fixtures/multipart-data.java @@ -7,4 +7,4 @@ .thenAccept(System.out::println) .join(); -client.close(); +client.close(); \ No newline at end of file diff --git a/test/fixtures/output/java/asynchttp/multipart-file.java b/src/targets/java/asynchttp/fixtures/multipart-file.java similarity index 96% rename from test/fixtures/output/java/asynchttp/multipart-file.java rename to src/targets/java/asynchttp/fixtures/multipart-file.java index cee440818..1c34564e3 100644 --- a/test/fixtures/output/java/asynchttp/multipart-file.java +++ b/src/targets/java/asynchttp/fixtures/multipart-file.java @@ -7,4 +7,4 @@ .thenAccept(System.out::println) .join(); -client.close(); +client.close(); \ No newline at end of file diff --git a/test/fixtures/output/java/asynchttp/multipart-form-data.java b/src/targets/java/asynchttp/fixtures/multipart-form-data.java similarity index 96% rename from test/fixtures/output/java/asynchttp/multipart-form-data.java rename to src/targets/java/asynchttp/fixtures/multipart-form-data.java index 90c80c631..cd7a7fff0 100644 --- a/test/fixtures/output/java/asynchttp/multipart-form-data.java +++ b/src/targets/java/asynchttp/fixtures/multipart-form-data.java @@ -7,4 +7,4 @@ .thenAccept(System.out::println) .join(); -client.close(); +client.close(); \ No newline at end of file diff --git a/test/fixtures/output/java/asynchttp/nested.java b/src/targets/java/asynchttp/fixtures/nested.java similarity index 93% rename from test/fixtures/output/java/asynchttp/nested.java rename to src/targets/java/asynchttp/fixtures/nested.java index ae76e58a1..b05658ca7 100644 --- a/test/fixtures/output/java/asynchttp/nested.java +++ b/src/targets/java/asynchttp/fixtures/nested.java @@ -5,4 +5,4 @@ .thenAccept(System.out::println) .join(); -client.close(); +client.close(); \ No newline at end of file diff --git a/test/fixtures/output/java/asynchttp/query.java b/src/targets/java/asynchttp/fixtures/query.java similarity index 93% rename from test/fixtures/output/java/asynchttp/query.java rename to src/targets/java/asynchttp/fixtures/query.java index 524cbd27a..7bba4c3db 100644 --- a/test/fixtures/output/java/asynchttp/query.java +++ b/src/targets/java/asynchttp/fixtures/query.java @@ -5,4 +5,4 @@ .thenAccept(System.out::println) .join(); -client.close(); +client.close(); \ No newline at end of file diff --git a/test/fixtures/output/java/asynchttp/short.java b/src/targets/java/asynchttp/fixtures/short.java similarity index 92% rename from test/fixtures/output/java/asynchttp/short.java rename to src/targets/java/asynchttp/fixtures/short.java index 0ab245f40..e303378e6 100644 --- a/test/fixtures/output/java/asynchttp/short.java +++ b/src/targets/java/asynchttp/fixtures/short.java @@ -5,4 +5,4 @@ .thenAccept(System.out::println) .join(); -client.close(); +client.close(); \ No newline at end of file diff --git a/test/fixtures/output/java/asynchttp/text-plain.java b/src/targets/java/asynchttp/fixtures/text-plain.java similarity index 94% rename from test/fixtures/output/java/asynchttp/text-plain.java rename to src/targets/java/asynchttp/fixtures/text-plain.java index 4b2cf1a61..3b94d273f 100644 --- a/test/fixtures/output/java/asynchttp/text-plain.java +++ b/src/targets/java/asynchttp/fixtures/text-plain.java @@ -7,4 +7,4 @@ .thenAccept(System.out::println) .join(); -client.close(); +client.close(); \ No newline at end of file diff --git a/src/targets/java/index.js b/src/targets/java/index.js deleted file mode 100644 index 37b0db718..000000000 --- a/src/targets/java/index.js +++ /dev/null @@ -1,15 +0,0 @@ -'use strict' - -module.exports = { - info: { - key: 'java', - title: 'Java', - extname: '.java', - default: 'unirest' - }, - - okhttp: require('./okhttp'), - unirest: require('./unirest'), - asynchttp: require('./asynchttp'), - nethttp: require('./nethttp') -} diff --git a/src/targets/java/nethttp.js b/src/targets/java/nethttp.js deleted file mode 100644 index 328eeaa78..000000000 --- a/src/targets/java/nethttp.js +++ /dev/null @@ -1,63 +0,0 @@ -/** - * @description - * HTTP code snippet generator for Java using java.net.http. - * - * @author - * @wtetsu - * - * for any questions or issues regarding the generated code snippet, please open an issue mentioning the author. - */ - -'use strict' - -const CodeBuilder = require('../../helpers/code-builder') - -module.exports = function (source, options) { - const opts = Object.assign( - { - indent: ' ' - }, - options - ) - - const code = new CodeBuilder(opts.indent) - - code.push('HttpRequest request = HttpRequest.newBuilder()') - code.push(2, '.uri(URI.create("%s"))', source.fullUrl) - - const headers = Object.keys(source.allHeaders) - - // construct headers - if (headers.length) { - headers.forEach(function (key) { - code.push(2, '.header("%s", "%s")', key, source.allHeaders[key]) - }) - } - - if (source.postData.text) { - code.push( - 2, - '.method("%s", HttpRequest.BodyPublishers.ofString(%s))', - source.method.toUpperCase(), - JSON.stringify(source.postData.text) - ) - } else { - code.push(2, '.method("%s", HttpRequest.BodyPublishers.noBody())', source.method.toUpperCase()) - } - - code.push(2, '.build();') - - code.push( - 'HttpResponse response = HttpClient.newHttpClient().send(request, HttpResponse.BodyHandlers.ofString());' - ) - code.push('System.out.println(response.body());') - - return code.join() -} - -module.exports.info = { - key: 'nethttp', - title: 'java.net.http', - link: 'https://openjdk.java.net/groups/net/httpclient/intro.html', - description: 'Java Standardized HTTP Client API' -} diff --git a/src/targets/java/nethttp/client.ts b/src/targets/java/nethttp/client.ts new file mode 100644 index 000000000..faff5ac2c --- /dev/null +++ b/src/targets/java/nethttp/client.ts @@ -0,0 +1,60 @@ +/** + * @description + * HTTP code snippet generator for Java using java.net.http. + * + * @author + * @wtetsu + * + * for any questions or issues regarding the generated code snippet, please open an issue mentioning the author. + */ + +import { CodeBuilder } from '../../../helpers/code-builder'; +import { Client } from '../../targets'; + +export interface NetHttpOptions { + indent?: string; +} + +export const nethttp: Client = { + info: { + key: 'nethttp', + title: 'java.net.http', + link: 'https://openjdk.java.net/groups/net/httpclient/intro.html', + description: 'Java Standardized HTTP Client API', + }, + convert: ({ allHeaders, fullUrl, method, postData }, options) => { + const opts = { + indent: ' ', + ...options, + }; + + const { push, join } = new CodeBuilder({ indent: opts.indent }); + + push('HttpRequest request = HttpRequest.newBuilder()'); + push(`.uri(URI.create("${fullUrl}"))`, 2); + + Object.keys(allHeaders).forEach(key => { + push(`.header("${key}", "${allHeaders[key]}")`, 2); + }); + + if (postData.text) { + push( + `.method("${method.toUpperCase()}", HttpRequest.BodyPublishers.ofString(${JSON.stringify( + postData.text, + )}))`, + 2, + ); + } else { + push(`.method("${method.toUpperCase()}", HttpRequest.BodyPublishers.noBody())`, 2); + } + + push('.build();', 2); + + push( + 'HttpResponse response = HttpClient.newHttpClient().send(request, HttpResponse.BodyHandlers.ofString());', + ); + push('System.out.println(response.body());'); + + return join(); + }, +}; diff --git a/test/fixtures/output/java/nethttp/application-form-encoded.java b/src/targets/java/nethttp/fixtures/application-form-encoded.java similarity index 90% rename from test/fixtures/output/java/nethttp/application-form-encoded.java rename to src/targets/java/nethttp/fixtures/application-form-encoded.java index bb31130e1..ff02e6a04 100644 --- a/test/fixtures/output/java/nethttp/application-form-encoded.java +++ b/src/targets/java/nethttp/fixtures/application-form-encoded.java @@ -4,4 +4,4 @@ .method("POST", HttpRequest.BodyPublishers.ofString("foo=bar&hello=world")) .build(); HttpResponse response = HttpClient.newHttpClient().send(request, HttpResponse.BodyHandlers.ofString()); -System.out.println(response.body()); +System.out.println(response.body()); \ No newline at end of file diff --git a/test/fixtures/output/java/nethttp/application-json.java b/src/targets/java/nethttp/fixtures/application-json.java similarity index 92% rename from test/fixtures/output/java/nethttp/application-json.java rename to src/targets/java/nethttp/fixtures/application-json.java index 60e2402b8..3b424074e 100644 --- a/test/fixtures/output/java/nethttp/application-json.java +++ b/src/targets/java/nethttp/fixtures/application-json.java @@ -4,4 +4,4 @@ .method("POST", HttpRequest.BodyPublishers.ofString("{\"number\":1,\"string\":\"f\\\"oo\",\"arr\":[1,2,3],\"nested\":{\"a\":\"b\"},\"arr_mix\":[1,\"a\",{\"arr_mix_nested\":{}}],\"boolean\":false}")) .build(); HttpResponse response = HttpClient.newHttpClient().send(request, HttpResponse.BodyHandlers.ofString()); -System.out.println(response.body()); +System.out.println(response.body()); \ No newline at end of file diff --git a/test/fixtures/output/java/nethttp/cookies.java b/src/targets/java/nethttp/fixtures/cookies.java similarity index 89% rename from test/fixtures/output/java/nethttp/cookies.java rename to src/targets/java/nethttp/fixtures/cookies.java index 7aa98347d..b72787d60 100644 --- a/test/fixtures/output/java/nethttp/cookies.java +++ b/src/targets/java/nethttp/fixtures/cookies.java @@ -4,4 +4,4 @@ .method("POST", HttpRequest.BodyPublishers.noBody()) .build(); HttpResponse response = HttpClient.newHttpClient().send(request, HttpResponse.BodyHandlers.ofString()); -System.out.println(response.body()); +System.out.println(response.body()); \ No newline at end of file diff --git a/test/fixtures/output/java/nethttp/custom-method.java b/src/targets/java/nethttp/fixtures/custom-method.java similarity index 88% rename from test/fixtures/output/java/nethttp/custom-method.java rename to src/targets/java/nethttp/fixtures/custom-method.java index 07e71ab10..9fa883cfa 100644 --- a/test/fixtures/output/java/nethttp/custom-method.java +++ b/src/targets/java/nethttp/fixtures/custom-method.java @@ -3,4 +3,4 @@ .method("PROPFIND", HttpRequest.BodyPublishers.noBody()) .build(); HttpResponse response = HttpClient.newHttpClient().send(request, HttpResponse.BodyHandlers.ofString()); -System.out.println(response.body()); +System.out.println(response.body()); \ No newline at end of file diff --git a/test/fixtures/output/java/nethttp/full.java b/src/targets/java/nethttp/fixtures/full.java similarity index 92% rename from test/fixtures/output/java/nethttp/full.java rename to src/targets/java/nethttp/fixtures/full.java index b6e02eedd..311418bb9 100644 --- a/test/fixtures/output/java/nethttp/full.java +++ b/src/targets/java/nethttp/fixtures/full.java @@ -6,4 +6,4 @@ .method("POST", HttpRequest.BodyPublishers.ofString("foo=bar")) .build(); HttpResponse response = HttpClient.newHttpClient().send(request, HttpResponse.BodyHandlers.ofString()); -System.out.println(response.body()); +System.out.println(response.body()); \ No newline at end of file diff --git a/test/fixtures/output/java/nethttp/headers.java b/src/targets/java/nethttp/fixtures/headers.java similarity index 90% rename from test/fixtures/output/java/nethttp/headers.java rename to src/targets/java/nethttp/fixtures/headers.java index 2e8a09f87..433de1cdf 100644 --- a/test/fixtures/output/java/nethttp/headers.java +++ b/src/targets/java/nethttp/fixtures/headers.java @@ -5,4 +5,4 @@ .method("GET", HttpRequest.BodyPublishers.noBody()) .build(); HttpResponse response = HttpClient.newHttpClient().send(request, HttpResponse.BodyHandlers.ofString()); -System.out.println(response.body()); +System.out.println(response.body()); \ No newline at end of file diff --git a/test/fixtures/output/java/nethttp/https.java b/src/targets/java/nethttp/fixtures/https.java similarity index 88% rename from test/fixtures/output/java/nethttp/https.java rename to src/targets/java/nethttp/fixtures/https.java index a32c4305b..b48d75904 100644 --- a/test/fixtures/output/java/nethttp/https.java +++ b/src/targets/java/nethttp/fixtures/https.java @@ -3,4 +3,4 @@ .method("GET", HttpRequest.BodyPublishers.noBody()) .build(); HttpResponse response = HttpClient.newHttpClient().send(request, HttpResponse.BodyHandlers.ofString()); -System.out.println(response.body()); +System.out.println(response.body()); \ No newline at end of file diff --git a/test/fixtures/output/java/nethttp/jsonObj-multiline.java b/src/targets/java/nethttp/fixtures/jsonObj-multiline.java similarity index 90% rename from test/fixtures/output/java/nethttp/jsonObj-multiline.java rename to src/targets/java/nethttp/fixtures/jsonObj-multiline.java index 2a76e6bd6..5f1f4e3f2 100644 --- a/test/fixtures/output/java/nethttp/jsonObj-multiline.java +++ b/src/targets/java/nethttp/fixtures/jsonObj-multiline.java @@ -4,4 +4,4 @@ .method("POST", HttpRequest.BodyPublishers.ofString("{\n \"foo\": \"bar\"\n}")) .build(); HttpResponse response = HttpClient.newHttpClient().send(request, HttpResponse.BodyHandlers.ofString()); -System.out.println(response.body()); +System.out.println(response.body()); \ No newline at end of file diff --git a/test/fixtures/output/java/nethttp/jsonObj-null-value.java b/src/targets/java/nethttp/fixtures/jsonObj-null-value.java similarity index 90% rename from test/fixtures/output/java/nethttp/jsonObj-null-value.java rename to src/targets/java/nethttp/fixtures/jsonObj-null-value.java index 14cc4f3c8..52558a353 100644 --- a/test/fixtures/output/java/nethttp/jsonObj-null-value.java +++ b/src/targets/java/nethttp/fixtures/jsonObj-null-value.java @@ -4,4 +4,4 @@ .method("POST", HttpRequest.BodyPublishers.ofString("{\"foo\":null}")) .build(); HttpResponse response = HttpClient.newHttpClient().send(request, HttpResponse.BodyHandlers.ofString()); -System.out.println(response.body()); +System.out.println(response.body()); \ No newline at end of file diff --git a/test/fixtures/output/java/nethttp/multipart-data.java b/src/targets/java/nethttp/fixtures/multipart-data.java similarity index 93% rename from test/fixtures/output/java/nethttp/multipart-data.java rename to src/targets/java/nethttp/fixtures/multipart-data.java index f4cf85bfb..4f0e49963 100644 --- a/test/fixtures/output/java/nethttp/multipart-data.java +++ b/src/targets/java/nethttp/fixtures/multipart-data.java @@ -4,4 +4,4 @@ .method("POST", HttpRequest.BodyPublishers.ofString("-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001--\r\n")) .build(); HttpResponse response = HttpClient.newHttpClient().send(request, HttpResponse.BodyHandlers.ofString()); -System.out.println(response.body()); +System.out.println(response.body()); \ No newline at end of file diff --git a/test/fixtures/output/java/nethttp/multipart-file.java b/src/targets/java/nethttp/fixtures/multipart-file.java similarity index 93% rename from test/fixtures/output/java/nethttp/multipart-file.java rename to src/targets/java/nethttp/fixtures/multipart-file.java index 7c86e4be3..8c46a4f4e 100644 --- a/test/fixtures/output/java/nethttp/multipart-file.java +++ b/src/targets/java/nethttp/fixtures/multipart-file.java @@ -4,4 +4,4 @@ .method("POST", HttpRequest.BodyPublishers.ofString("-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\n\r\n-----011000010111000001101001--\r\n")) .build(); HttpResponse response = HttpClient.newHttpClient().send(request, HttpResponse.BodyHandlers.ofString()); -System.out.println(response.body()); +System.out.println(response.body()); \ No newline at end of file diff --git a/test/fixtures/output/java/nethttp/multipart-form-data.java b/src/targets/java/nethttp/fixtures/multipart-form-data.java similarity index 93% rename from test/fixtures/output/java/nethttp/multipart-form-data.java rename to src/targets/java/nethttp/fixtures/multipart-form-data.java index 5a8c8f9f9..69af4aaa3 100644 --- a/test/fixtures/output/java/nethttp/multipart-form-data.java +++ b/src/targets/java/nethttp/fixtures/multipart-form-data.java @@ -4,4 +4,4 @@ .method("POST", HttpRequest.BodyPublishers.ofString("-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"\r\n\r\nbar\r\n-----011000010111000001101001--\r\n")) .build(); HttpResponse response = HttpClient.newHttpClient().send(request, HttpResponse.BodyHandlers.ofString()); -System.out.println(response.body()); +System.out.println(response.body()); \ No newline at end of file diff --git a/test/fixtures/output/java/nethttp/nested.java b/src/targets/java/nethttp/fixtures/nested.java similarity index 89% rename from test/fixtures/output/java/nethttp/nested.java rename to src/targets/java/nethttp/fixtures/nested.java index edd4a0ff1..abe7fce7e 100644 --- a/test/fixtures/output/java/nethttp/nested.java +++ b/src/targets/java/nethttp/fixtures/nested.java @@ -3,4 +3,4 @@ .method("GET", HttpRequest.BodyPublishers.noBody()) .build(); HttpResponse response = HttpClient.newHttpClient().send(request, HttpResponse.BodyHandlers.ofString()); -System.out.println(response.body()); +System.out.println(response.body()); \ No newline at end of file diff --git a/test/fixtures/output/java/nethttp/query.java b/src/targets/java/nethttp/fixtures/query.java similarity index 89% rename from test/fixtures/output/java/nethttp/query.java rename to src/targets/java/nethttp/fixtures/query.java index 7d8f106dd..cd4303f52 100644 --- a/test/fixtures/output/java/nethttp/query.java +++ b/src/targets/java/nethttp/fixtures/query.java @@ -3,4 +3,4 @@ .method("GET", HttpRequest.BodyPublishers.noBody()) .build(); HttpResponse response = HttpClient.newHttpClient().send(request, HttpResponse.BodyHandlers.ofString()); -System.out.println(response.body()); +System.out.println(response.body()); \ No newline at end of file diff --git a/test/fixtures/output/java/nethttp/short.java b/src/targets/java/nethttp/fixtures/short.java similarity index 88% rename from test/fixtures/output/java/nethttp/short.java rename to src/targets/java/nethttp/fixtures/short.java index 5e282c106..1c7c3d541 100644 --- a/test/fixtures/output/java/nethttp/short.java +++ b/src/targets/java/nethttp/fixtures/short.java @@ -3,4 +3,4 @@ .method("GET", HttpRequest.BodyPublishers.noBody()) .build(); HttpResponse response = HttpClient.newHttpClient().send(request, HttpResponse.BodyHandlers.ofString()); -System.out.println(response.body()); +System.out.println(response.body()); \ No newline at end of file diff --git a/test/fixtures/output/java/nethttp/text-plain.java b/src/targets/java/nethttp/fixtures/text-plain.java similarity index 90% rename from test/fixtures/output/java/nethttp/text-plain.java rename to src/targets/java/nethttp/fixtures/text-plain.java index 634823835..fe43a562e 100644 --- a/test/fixtures/output/java/nethttp/text-plain.java +++ b/src/targets/java/nethttp/fixtures/text-plain.java @@ -4,4 +4,4 @@ .method("POST", HttpRequest.BodyPublishers.ofString("Hello World")) .build(); HttpResponse response = HttpClient.newHttpClient().send(request, HttpResponse.BodyHandlers.ofString()); -System.out.println(response.body()); +System.out.println(response.body()); \ No newline at end of file diff --git a/src/targets/java/okhttp.js b/src/targets/java/okhttp.js deleted file mode 100644 index 3dc756419..000000000 --- a/src/targets/java/okhttp.js +++ /dev/null @@ -1,78 +0,0 @@ -/** - * @description - * HTTP code snippet generator for Java using OkHttp. - * - * @author - * @shashiranjan84 - * - * for any questions or issues regarding the generated code snippet, please open an issue mentioning the author. - */ - -'use strict' - -const CodeBuilder = require('../../helpers/code-builder') - -module.exports = function (source, options) { - const opts = Object.assign({ - indent: ' ' - }, options) - - const code = new CodeBuilder(opts.indent) - - const methods = ['GET', 'POST', 'PUT', 'DELETE', 'PATCH', 'HEAD'] - - const methodsWithBody = ['POST', 'PUT', 'DELETE', 'PATCH'] - - code.push('OkHttpClient client = new OkHttpClient();') - .blank() - - if (source.postData.text) { - if (source.postData.boundary) { - code.push('MediaType mediaType = MediaType.parse("%s; boundary=%s");', source.postData.mimeType, source.postData.boundary) - } else { - code.push('MediaType mediaType = MediaType.parse("%s");', source.postData.mimeType) - } - code.push('RequestBody body = RequestBody.create(mediaType, %s);', JSON.stringify(source.postData.text)) - } - - code.push('Request request = new Request.Builder()') - code.push(1, '.url("%s")', source.fullUrl) - if (methods.indexOf(source.method.toUpperCase()) === -1) { - if (source.postData.text) { - code.push(1, '.method("%s", body)', source.method.toUpperCase()) - } else { - code.push(1, '.method("%s", null)', source.method.toUpperCase()) - } - } else if (methodsWithBody.indexOf(source.method.toUpperCase()) >= 0) { - if (source.postData.text) { - code.push(1, '.%s(body)', source.method.toLowerCase()) - } else { - code.push(1, '.%s(null)', source.method.toLowerCase()) - } - } else { - code.push(1, '.%s()', source.method.toLowerCase()) - } - - // Add headers, including the cookies - const headers = Object.keys(source.allHeaders) - - // construct headers - if (headers.length) { - headers.forEach(function (key) { - code.push(1, '.addHeader("%s", "%s")', key, source.allHeaders[key]) - }) - } - - code.push(1, '.build();') - .blank() - .push('Response response = client.newCall(request).execute();') - - return code.join() -} - -module.exports.info = { - key: 'okhttp', - title: 'OkHttp', - link: 'http://square.github.io/okhttp/', - description: 'An HTTP Request Client Library' -} diff --git a/src/targets/java/okhttp/client.ts b/src/targets/java/okhttp/client.ts new file mode 100644 index 000000000..c39480cba --- /dev/null +++ b/src/targets/java/okhttp/client.ts @@ -0,0 +1,74 @@ +/** + * @description + * HTTP code snippet generator for Java using OkHttp. + * + * @author + * @shashiranjan84 + * + * for any questions or issues regarding the generated code snippet, please open an issue mentioning the author. + */ + +import { CodeBuilder } from '../../../helpers/code-builder'; +import { Client } from '../../targets'; + +export const okhttp: Client = { + info: { + key: 'okhttp', + title: 'OkHttp', + link: 'http://square.github.io/okhttp/', + description: 'An HTTP Request Client Library', + }, + convert: ({ postData, method, fullUrl, allHeaders }, options) => { + const opts = { + indent: ' ', + ...options, + }; + const { push, blank, join } = new CodeBuilder({ indent: opts.indent }); + + const methods = ['GET', 'POST', 'PUT', 'DELETE', 'PATCH', 'HEAD']; + const methodsWithBody = ['POST', 'PUT', 'DELETE', 'PATCH']; + + push('OkHttpClient client = new OkHttpClient();'); + blank(); + + if (postData.text) { + if (postData.boundary) { + push( + `MediaType mediaType = MediaType.parse("${postData.mimeType}; boundary=${postData.boundary}");`, + ); + } else { + push(`MediaType mediaType = MediaType.parse("${postData.mimeType}");`); + } + push(`RequestBody body = RequestBody.create(mediaType, ${JSON.stringify(postData.text)});`); + } + + push('Request request = new Request.Builder()'); + push(`.url("${fullUrl}")`, 1); + if (!methods.includes(method.toUpperCase())) { + if (postData.text) { + push(`.method("${method.toUpperCase()}", body)`, 1); + } else { + push(`.method("${method.toUpperCase()}", null)`, 1); + } + } else if (methodsWithBody.includes(method.toUpperCase())) { + if (postData.text) { + push(`.${method.toLowerCase()}(body)`, 1); + } else { + push(`.${method.toLowerCase()}(null)`, 1); + } + } else { + push(`.${method.toLowerCase()}()`, 1); + } + + // Add headers, including the cookies + Object.keys(allHeaders).forEach(key => { + push(`.addHeader("${key}", "${allHeaders[key]}")`, 1); + }); + + push('.build();', 1); + blank(); + push('Response response = client.newCall(request).execute();'); + + return join(); + }, +}; diff --git a/test/fixtures/output/java/okhttp/application-form-encoded.java b/src/targets/java/okhttp/fixtures/application-form-encoded.java similarity index 86% rename from test/fixtures/output/java/okhttp/application-form-encoded.java rename to src/targets/java/okhttp/fixtures/application-form-encoded.java index 0521f0074..12b8e5ce4 100644 --- a/test/fixtures/output/java/okhttp/application-form-encoded.java +++ b/src/targets/java/okhttp/fixtures/application-form-encoded.java @@ -8,4 +8,4 @@ .addHeader("content-type", "application/x-www-form-urlencoded") .build(); -Response response = client.newCall(request).execute(); +Response response = client.newCall(request).execute(); \ No newline at end of file diff --git a/test/fixtures/output/java/okhttp/application-json.java b/src/targets/java/okhttp/fixtures/application-json.java similarity index 89% rename from test/fixtures/output/java/okhttp/application-json.java rename to src/targets/java/okhttp/fixtures/application-json.java index a344381db..748c0dbbc 100644 --- a/test/fixtures/output/java/okhttp/application-json.java +++ b/src/targets/java/okhttp/fixtures/application-json.java @@ -8,4 +8,4 @@ .addHeader("content-type", "application/json") .build(); -Response response = client.newCall(request).execute(); +Response response = client.newCall(request).execute(); \ No newline at end of file diff --git a/test/fixtures/output/java/okhttp/cookies.java b/src/targets/java/okhttp/fixtures/cookies.java similarity index 77% rename from test/fixtures/output/java/okhttp/cookies.java rename to src/targets/java/okhttp/fixtures/cookies.java index 033501272..320039d77 100644 --- a/test/fixtures/output/java/okhttp/cookies.java +++ b/src/targets/java/okhttp/fixtures/cookies.java @@ -6,4 +6,4 @@ .addHeader("cookie", "foo=bar; bar=baz") .build(); -Response response = client.newCall(request).execute(); +Response response = client.newCall(request).execute(); \ No newline at end of file diff --git a/test/fixtures/output/java/okhttp/custom-method.java b/src/targets/java/okhttp/fixtures/custom-method.java similarity index 74% rename from test/fixtures/output/java/okhttp/custom-method.java rename to src/targets/java/okhttp/fixtures/custom-method.java index 817d75ff0..d01ad6ad6 100644 --- a/test/fixtures/output/java/okhttp/custom-method.java +++ b/src/targets/java/okhttp/fixtures/custom-method.java @@ -5,4 +5,4 @@ .method("PROPFIND", null) .build(); -Response response = client.newCall(request).execute(); +Response response = client.newCall(request).execute(); \ No newline at end of file diff --git a/test/fixtures/output/java/okhttp/full.java b/src/targets/java/okhttp/fixtures/full.java similarity index 89% rename from test/fixtures/output/java/okhttp/full.java rename to src/targets/java/okhttp/fixtures/full.java index 8b8ee15b5..baba5b975 100644 --- a/test/fixtures/output/java/okhttp/full.java +++ b/src/targets/java/okhttp/fixtures/full.java @@ -10,4 +10,4 @@ .addHeader("content-type", "application/x-www-form-urlencoded") .build(); -Response response = client.newCall(request).execute(); +Response response = client.newCall(request).execute(); \ No newline at end of file diff --git a/test/fixtures/output/java/okhttp/headers.java b/src/targets/java/okhttp/fixtures/headers.java similarity index 79% rename from test/fixtures/output/java/okhttp/headers.java rename to src/targets/java/okhttp/fixtures/headers.java index 081a33adb..7188ec87e 100644 --- a/test/fixtures/output/java/okhttp/headers.java +++ b/src/targets/java/okhttp/fixtures/headers.java @@ -7,4 +7,4 @@ .addHeader("x-foo", "Bar") .build(); -Response response = client.newCall(request).execute(); +Response response = client.newCall(request).execute(); \ No newline at end of file diff --git a/test/fixtures/output/java/okhttp/https.java b/src/targets/java/okhttp/fixtures/https.java similarity index 71% rename from test/fixtures/output/java/okhttp/https.java rename to src/targets/java/okhttp/fixtures/https.java index f9be6532f..26bf048df 100644 --- a/test/fixtures/output/java/okhttp/https.java +++ b/src/targets/java/okhttp/fixtures/https.java @@ -5,4 +5,4 @@ .get() .build(); -Response response = client.newCall(request).execute(); +Response response = client.newCall(request).execute(); \ No newline at end of file diff --git a/test/fixtures/output/java/okhttp/jsonObj-multiline.java b/src/targets/java/okhttp/fixtures/jsonObj-multiline.java similarity index 85% rename from test/fixtures/output/java/okhttp/jsonObj-multiline.java rename to src/targets/java/okhttp/fixtures/jsonObj-multiline.java index 69ca60842..9d1bdfeff 100644 --- a/test/fixtures/output/java/okhttp/jsonObj-multiline.java +++ b/src/targets/java/okhttp/fixtures/jsonObj-multiline.java @@ -8,4 +8,4 @@ .addHeader("content-type", "application/json") .build(); -Response response = client.newCall(request).execute(); +Response response = client.newCall(request).execute(); \ No newline at end of file diff --git a/test/fixtures/output/java/okhttp/jsonObj-null-value.java b/src/targets/java/okhttp/fixtures/jsonObj-null-value.java similarity index 85% rename from test/fixtures/output/java/okhttp/jsonObj-null-value.java rename to src/targets/java/okhttp/fixtures/jsonObj-null-value.java index 15b8482a7..31e3fa3fb 100644 --- a/test/fixtures/output/java/okhttp/jsonObj-null-value.java +++ b/src/targets/java/okhttp/fixtures/jsonObj-null-value.java @@ -8,4 +8,4 @@ .addHeader("content-type", "application/json") .build(); -Response response = client.newCall(request).execute(); +Response response = client.newCall(request).execute(); \ No newline at end of file diff --git a/test/fixtures/output/java/okhttp/multipart-data.java b/src/targets/java/okhttp/fixtures/multipart-data.java similarity index 91% rename from test/fixtures/output/java/okhttp/multipart-data.java rename to src/targets/java/okhttp/fixtures/multipart-data.java index 9ad294f82..143ffa10f 100644 --- a/test/fixtures/output/java/okhttp/multipart-data.java +++ b/src/targets/java/okhttp/fixtures/multipart-data.java @@ -8,4 +8,4 @@ .addHeader("content-type", "multipart/form-data; boundary=---011000010111000001101001") .build(); -Response response = client.newCall(request).execute(); +Response response = client.newCall(request).execute(); \ No newline at end of file diff --git a/test/fixtures/output/java/okhttp/multipart-file.java b/src/targets/java/okhttp/fixtures/multipart-file.java similarity index 91% rename from test/fixtures/output/java/okhttp/multipart-file.java rename to src/targets/java/okhttp/fixtures/multipart-file.java index 6d771f173..e2ca1ea26 100644 --- a/test/fixtures/output/java/okhttp/multipart-file.java +++ b/src/targets/java/okhttp/fixtures/multipart-file.java @@ -8,4 +8,4 @@ .addHeader("content-type", "multipart/form-data; boundary=---011000010111000001101001") .build(); -Response response = client.newCall(request).execute(); +Response response = client.newCall(request).execute(); \ No newline at end of file diff --git a/test/fixtures/output/java/okhttp/multipart-form-data.java b/src/targets/java/okhttp/fixtures/multipart-form-data.java similarity index 90% rename from test/fixtures/output/java/okhttp/multipart-form-data.java rename to src/targets/java/okhttp/fixtures/multipart-form-data.java index 517e4fb48..5aaa5dbd2 100644 --- a/test/fixtures/output/java/okhttp/multipart-form-data.java +++ b/src/targets/java/okhttp/fixtures/multipart-form-data.java @@ -8,4 +8,4 @@ .addHeader("Content-Type", "multipart/form-data; boundary=---011000010111000001101001") .build(); -Response response = client.newCall(request).execute(); +Response response = client.newCall(request).execute(); \ No newline at end of file diff --git a/test/fixtures/output/java/okhttp/nested.java b/src/targets/java/okhttp/fixtures/nested.java similarity index 76% rename from test/fixtures/output/java/okhttp/nested.java rename to src/targets/java/okhttp/fixtures/nested.java index fface6c99..1debd4815 100644 --- a/test/fixtures/output/java/okhttp/nested.java +++ b/src/targets/java/okhttp/fixtures/nested.java @@ -5,4 +5,4 @@ .get() .build(); -Response response = client.newCall(request).execute(); +Response response = client.newCall(request).execute(); \ No newline at end of file diff --git a/test/fixtures/output/java/okhttp/query.java b/src/targets/java/okhttp/fixtures/query.java similarity index 75% rename from test/fixtures/output/java/okhttp/query.java rename to src/targets/java/okhttp/fixtures/query.java index e105dd434..aa46360c2 100644 --- a/test/fixtures/output/java/okhttp/query.java +++ b/src/targets/java/okhttp/fixtures/query.java @@ -5,4 +5,4 @@ .get() .build(); -Response response = client.newCall(request).execute(); +Response response = client.newCall(request).execute(); \ No newline at end of file diff --git a/test/fixtures/output/java/okhttp/short.java b/src/targets/java/okhttp/fixtures/short.java similarity index 71% rename from test/fixtures/output/java/okhttp/short.java rename to src/targets/java/okhttp/fixtures/short.java index 5bd44ca99..0dc25193f 100644 --- a/test/fixtures/output/java/okhttp/short.java +++ b/src/targets/java/okhttp/fixtures/short.java @@ -5,4 +5,4 @@ .get() .build(); -Response response = client.newCall(request).execute(); +Response response = client.newCall(request).execute(); \ No newline at end of file diff --git a/test/fixtures/output/java/okhttp/text-plain.java b/src/targets/java/okhttp/fixtures/text-plain.java similarity index 84% rename from test/fixtures/output/java/okhttp/text-plain.java rename to src/targets/java/okhttp/fixtures/text-plain.java index 5501c9aab..0d2ceb7ea 100644 --- a/test/fixtures/output/java/okhttp/text-plain.java +++ b/src/targets/java/okhttp/fixtures/text-plain.java @@ -8,4 +8,4 @@ .addHeader("content-type", "text/plain") .build(); -Response response = client.newCall(request).execute(); +Response response = client.newCall(request).execute(); \ No newline at end of file diff --git a/src/targets/java/target.ts b/src/targets/java/target.ts new file mode 100644 index 000000000..8ba580e3a --- /dev/null +++ b/src/targets/java/target.ts @@ -0,0 +1,21 @@ +import { Target } from '../targets'; +import { asynchttp } from './asynchttp/client'; +import { nethttp } from './nethttp/client'; +import { okhttp } from './okhttp/client'; +import { unirest } from './unirest/client'; + +export const java: Target = { + info: { + key: 'java', + title: 'Java', + extname: '.java', + default: 'unirest', + }, + + clientsById: { + asynchttp, + nethttp, + okhttp, + unirest, + }, +}; diff --git a/src/targets/java/unirest.js b/src/targets/java/unirest.js deleted file mode 100644 index 7def78eec..000000000 --- a/src/targets/java/unirest.js +++ /dev/null @@ -1,54 +0,0 @@ -/** - * @description - * HTTP code snippet generator for Java using Unirest. - * - * @author - * @shashiranjan84 - * - * for any questions or issues regarding the generated code snippet, please open an issue mentioning the author. - */ - -'use strict' - -const CodeBuilder = require('../../helpers/code-builder') - -module.exports = function (source, options) { - const opts = Object.assign({ - indent: ' ' - }, options) - - const code = new CodeBuilder(opts.indent) - - const methods = ['GET', 'POST', 'PUT', 'DELETE', 'PATCH', 'HEAD', 'OPTIONS'] - - if (methods.indexOf(source.method.toUpperCase()) === -1) { - code.push('HttpResponse response = Unirest.customMethod("%s","%s")', source.method.toUpperCase(), source.fullUrl) - } else { - code.push('HttpResponse response = Unirest.%s("%s")', source.method.toLowerCase(), source.fullUrl) - } - - // Add headers, including the cookies - const headers = Object.keys(source.allHeaders) - - // construct headers - if (headers.length) { - headers.forEach(function (key) { - code.push(1, '.header("%s", "%s")', key, source.allHeaders[key]) - }) - } - - if (source.postData.text) { - code.push(1, '.body(%s)', JSON.stringify(source.postData.text)) - } - - code.push(1, '.asString();') - - return code.join() -} - -module.exports.info = { - key: 'unirest', - title: 'Unirest', - link: 'http://unirest.io/java.html', - description: 'Lightweight HTTP Request Client Library' -} diff --git a/src/targets/java/unirest/client.ts b/src/targets/java/unirest/client.ts new file mode 100644 index 000000000..7e4f69c69 --- /dev/null +++ b/src/targets/java/unirest/client.ts @@ -0,0 +1,52 @@ +/** + * @description + * HTTP code snippet generator for Java using Unirest. + * + * @author + * @shashiranjan84 + * + * for any questions or issues regarding the generated code snippet, please open an issue mentioning the author. + */ + +import { CodeBuilder } from '../../../helpers/code-builder'; +import { Client } from '../../targets'; + +export const unirest: Client = { + info: { + key: 'unirest', + title: 'Unirest', + link: 'http://unirest.io/java.html', + description: 'Lightweight HTTP Request Client Library', + }, + convert: ({ method, allHeaders, postData, fullUrl }, options) => { + const opts = { + indent: ' ', + ...options, + }; + + const { join, push } = new CodeBuilder({ indent: opts.indent }); + + const methods = ['GET', 'POST', 'PUT', 'DELETE', 'PATCH', 'HEAD', 'OPTIONS']; + + if (!methods.includes(method.toUpperCase())) { + push( + `HttpResponse response = Unirest.customMethod("${method.toUpperCase()}","${fullUrl}")`, + ); + } else { + push(`HttpResponse response = Unirest.${method.toLowerCase()}("${fullUrl}")`); + } + + // Add headers, including the cookies + Object.keys(allHeaders).forEach(key => { + push(`.header("${key}", "${allHeaders[key]}")`, 1); + }); + + if (postData.text) { + push(`.body(${JSON.stringify(postData.text)})`, 1); + } + + push('.asString();', 1); + + return join(); + }, +}; diff --git a/test/fixtures/output/java/unirest/application-form-encoded.java b/src/targets/java/unirest/fixtures/application-form-encoded.java similarity index 91% rename from test/fixtures/output/java/unirest/application-form-encoded.java rename to src/targets/java/unirest/fixtures/application-form-encoded.java index 81508b841..905a27e18 100644 --- a/test/fixtures/output/java/unirest/application-form-encoded.java +++ b/src/targets/java/unirest/fixtures/application-form-encoded.java @@ -1,4 +1,4 @@ HttpResponse response = Unirest.post("http://mockbin.com/har") .header("content-type", "application/x-www-form-urlencoded") .body("foo=bar&hello=world") - .asString(); + .asString(); \ No newline at end of file diff --git a/test/fixtures/output/java/unirest/application-json.java b/src/targets/java/unirest/fixtures/application-json.java similarity index 94% rename from test/fixtures/output/java/unirest/application-json.java rename to src/targets/java/unirest/fixtures/application-json.java index 1fd5e3227..39f648631 100644 --- a/test/fixtures/output/java/unirest/application-json.java +++ b/src/targets/java/unirest/fixtures/application-json.java @@ -1,4 +1,4 @@ HttpResponse response = Unirest.post("http://mockbin.com/har") .header("content-type", "application/json") .body("{\"number\":1,\"string\":\"f\\\"oo\",\"arr\":[1,2,3],\"nested\":{\"a\":\"b\"},\"arr_mix\":[1,\"a\",{\"arr_mix_nested\":{}}],\"boolean\":false}") - .asString(); + .asString(); \ No newline at end of file diff --git a/test/fixtures/output/java/unirest/cookies.java b/src/targets/java/unirest/fixtures/cookies.java similarity index 88% rename from test/fixtures/output/java/unirest/cookies.java rename to src/targets/java/unirest/fixtures/cookies.java index ceb408800..065bd772a 100644 --- a/test/fixtures/output/java/unirest/cookies.java +++ b/src/targets/java/unirest/fixtures/cookies.java @@ -1,3 +1,3 @@ HttpResponse response = Unirest.post("http://mockbin.com/har") .header("cookie", "foo=bar; bar=baz") - .asString(); + .asString(); \ No newline at end of file diff --git a/test/fixtures/output/java/unirest/custom-method.java b/src/targets/java/unirest/fixtures/custom-method.java similarity index 85% rename from test/fixtures/output/java/unirest/custom-method.java rename to src/targets/java/unirest/fixtures/custom-method.java index 6ca6d7f29..94233ec3d 100644 --- a/test/fixtures/output/java/unirest/custom-method.java +++ b/src/targets/java/unirest/fixtures/custom-method.java @@ -1,2 +1,2 @@ HttpResponse response = Unirest.customMethod("PROPFIND","http://mockbin.com/har") - .asString(); + .asString(); \ No newline at end of file diff --git a/test/fixtures/output/java/unirest/full.java b/src/targets/java/unirest/fixtures/full.java similarity index 94% rename from test/fixtures/output/java/unirest/full.java rename to src/targets/java/unirest/fixtures/full.java index f6014e56c..9a385a23e 100644 --- a/test/fixtures/output/java/unirest/full.java +++ b/src/targets/java/unirest/fixtures/full.java @@ -3,4 +3,4 @@ .header("accept", "application/json") .header("content-type", "application/x-www-form-urlencoded") .body("foo=bar") - .asString(); + .asString(); \ No newline at end of file diff --git a/test/fixtures/output/java/unirest/headers.java b/src/targets/java/unirest/fixtures/headers.java similarity index 90% rename from test/fixtures/output/java/unirest/headers.java rename to src/targets/java/unirest/fixtures/headers.java index 142cf4e75..749296bfd 100644 --- a/test/fixtures/output/java/unirest/headers.java +++ b/src/targets/java/unirest/fixtures/headers.java @@ -1,4 +1,4 @@ HttpResponse response = Unirest.get("http://mockbin.com/har") .header("accept", "application/json") .header("x-foo", "Bar") - .asString(); + .asString(); \ No newline at end of file diff --git a/test/fixtures/output/java/unirest/https.java b/src/targets/java/unirest/fixtures/https.java similarity index 82% rename from test/fixtures/output/java/unirest/https.java rename to src/targets/java/unirest/fixtures/https.java index 6e8269128..81639f089 100644 --- a/test/fixtures/output/java/unirest/https.java +++ b/src/targets/java/unirest/fixtures/https.java @@ -1,2 +1,2 @@ HttpResponse response = Unirest.get("https://mockbin.com/har") - .asString(); + .asString(); \ No newline at end of file diff --git a/test/fixtures/output/java/unirest/jsonObj-multiline.java b/src/targets/java/unirest/fixtures/jsonObj-multiline.java similarity index 91% rename from test/fixtures/output/java/unirest/jsonObj-multiline.java rename to src/targets/java/unirest/fixtures/jsonObj-multiline.java index 965a9438d..6ef7dae14 100644 --- a/test/fixtures/output/java/unirest/jsonObj-multiline.java +++ b/src/targets/java/unirest/fixtures/jsonObj-multiline.java @@ -1,4 +1,4 @@ HttpResponse response = Unirest.post("http://mockbin.com/har") .header("content-type", "application/json") .body("{\n \"foo\": \"bar\"\n}") - .asString(); + .asString(); \ No newline at end of file diff --git a/test/fixtures/output/java/unirest/jsonObj-null-value.java b/src/targets/java/unirest/fixtures/jsonObj-null-value.java similarity index 90% rename from test/fixtures/output/java/unirest/jsonObj-null-value.java rename to src/targets/java/unirest/fixtures/jsonObj-null-value.java index 87a010192..0e64fda5c 100644 --- a/test/fixtures/output/java/unirest/jsonObj-null-value.java +++ b/src/targets/java/unirest/fixtures/jsonObj-null-value.java @@ -1,4 +1,4 @@ HttpResponse response = Unirest.post("http://mockbin.com/har") .header("content-type", "application/json") .body("{\"foo\":null}") - .asString(); + .asString(); \ No newline at end of file diff --git a/test/fixtures/output/java/unirest/multipart-data.java b/src/targets/java/unirest/fixtures/multipart-data.java similarity index 95% rename from test/fixtures/output/java/unirest/multipart-data.java rename to src/targets/java/unirest/fixtures/multipart-data.java index f5266e32d..a714b7920 100644 --- a/test/fixtures/output/java/unirest/multipart-data.java +++ b/src/targets/java/unirest/fixtures/multipart-data.java @@ -1,4 +1,4 @@ HttpResponse response = Unirest.post("http://mockbin.com/har") .header("content-type", "multipart/form-data; boundary=---011000010111000001101001") .body("-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001--\r\n") - .asString(); + .asString(); \ No newline at end of file diff --git a/test/fixtures/output/java/unirest/multipart-file.java b/src/targets/java/unirest/fixtures/multipart-file.java similarity index 95% rename from test/fixtures/output/java/unirest/multipart-file.java rename to src/targets/java/unirest/fixtures/multipart-file.java index 4b9cc83bf..83ee600f3 100644 --- a/test/fixtures/output/java/unirest/multipart-file.java +++ b/src/targets/java/unirest/fixtures/multipart-file.java @@ -1,4 +1,4 @@ HttpResponse response = Unirest.post("http://mockbin.com/har") .header("content-type", "multipart/form-data; boundary=---011000010111000001101001") .body("-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\n\r\n-----011000010111000001101001--\r\n") - .asString(); + .asString(); \ No newline at end of file diff --git a/test/fixtures/output/java/unirest/multipart-form-data.java b/src/targets/java/unirest/fixtures/multipart-form-data.java similarity index 95% rename from test/fixtures/output/java/unirest/multipart-form-data.java rename to src/targets/java/unirest/fixtures/multipart-form-data.java index ec517f373..f985d98c4 100644 --- a/test/fixtures/output/java/unirest/multipart-form-data.java +++ b/src/targets/java/unirest/fixtures/multipart-form-data.java @@ -1,4 +1,4 @@ HttpResponse response = Unirest.post("http://mockbin.com/har") .header("Content-Type", "multipart/form-data; boundary=---011000010111000001101001") .body("-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"\r\n\r\nbar\r\n-----011000010111000001101001--\r\n") - .asString(); + .asString(); \ No newline at end of file diff --git a/test/fixtures/output/java/unirest/nested.java b/src/targets/java/unirest/fixtures/nested.java similarity index 88% rename from test/fixtures/output/java/unirest/nested.java rename to src/targets/java/unirest/fixtures/nested.java index 7ad3da188..95e6476b7 100644 --- a/test/fixtures/output/java/unirest/nested.java +++ b/src/targets/java/unirest/fixtures/nested.java @@ -1,2 +1,2 @@ HttpResponse response = Unirest.get("http://mockbin.com/har?foo%5Bbar%5D=baz%2Czap&fiz=buz&key=value") - .asString(); + .asString(); \ No newline at end of file diff --git a/test/fixtures/output/java/unirest/query.java b/src/targets/java/unirest/fixtures/query.java similarity index 87% rename from test/fixtures/output/java/unirest/query.java rename to src/targets/java/unirest/fixtures/query.java index cd3424219..3be13cbb2 100644 --- a/test/fixtures/output/java/unirest/query.java +++ b/src/targets/java/unirest/fixtures/query.java @@ -1,2 +1,2 @@ HttpResponse response = Unirest.get("http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value") - .asString(); + .asString(); \ No newline at end of file diff --git a/test/fixtures/output/java/unirest/short.java b/src/targets/java/unirest/fixtures/short.java similarity index 82% rename from test/fixtures/output/java/unirest/short.java rename to src/targets/java/unirest/fixtures/short.java index 994b244e4..883d16efa 100644 --- a/test/fixtures/output/java/unirest/short.java +++ b/src/targets/java/unirest/fixtures/short.java @@ -1,2 +1,2 @@ HttpResponse response = Unirest.get("http://mockbin.com/har") - .asString(); + .asString(); \ No newline at end of file diff --git a/test/fixtures/output/java/unirest/text-plain.java b/src/targets/java/unirest/fixtures/text-plain.java similarity index 89% rename from test/fixtures/output/java/unirest/text-plain.java rename to src/targets/java/unirest/fixtures/text-plain.java index b68fb04d5..180b7164c 100644 --- a/test/fixtures/output/java/unirest/text-plain.java +++ b/src/targets/java/unirest/fixtures/text-plain.java @@ -1,4 +1,4 @@ HttpResponse response = Unirest.post("http://mockbin.com/har") .header("content-type", "text/plain") .body("Hello World") - .asString(); + .asString(); \ No newline at end of file diff --git a/src/targets/javascript/axios.js b/src/targets/javascript/axios.js deleted file mode 100644 index 838eb0d46..000000000 --- a/src/targets/javascript/axios.js +++ /dev/null @@ -1,89 +0,0 @@ -/** - * @description - * HTTP code snippet generator for Javascript & Node.js using Axios. - * - * @author - * @rohit-gohri - * - * for any questions or issues regarding the generated code snippet, please open an issue mentioning the author. - */ -'use strict' - -const util = require('util') -const stringifyObject = require('stringify-object') -const CodeBuilder = require('../../helpers/code-builder') - -module.exports = function (source, options) { - const opts = Object.assign({ - indent: ' ' - }, options) - - const code = new CodeBuilder(opts.indent) - - code.push('import axios from "axios";') - .blank() - - const reqOpts = { - method: source.method, - url: source.url - } - - if (Object.keys(source.queryObj).length) { - reqOpts.params = source.queryObj - } - - if (Object.keys(source.allHeaders).length) { - reqOpts.headers = source.allHeaders - } - - switch (source.postData.mimeType) { - case 'application/x-www-form-urlencoded': - reqOpts.data = source.postData.paramsObj - break - - case 'application/json': - if (source.postData.jsonObj) { - reqOpts.data = source.postData.jsonObj - } - break - - case 'multipart/form-data': - code.push('const form = new FormData();') - - source.postData.params.forEach(function (param) { - code.push( - 'form.append(%s, %s);', - JSON.stringify(param.name), - JSON.stringify(param.value || param.fileName || '') - ) - }) - - code.blank() - - reqOpts.data = '[form]' - break - - default: - if (source.postData.text) { - reqOpts.data = source.postData.text - } - } - - code.push('const options = %s;', stringifyObject(reqOpts, { indent: ' ', inlineCharacterLimit: 80 }).replace('"[form]"', 'form')) - .blank() - - code.push(util.format('axios.request(options).then(%s', 'function (response) {')) - .push(1, 'console.log(response.data);') - .push('}).catch(%s', 'function (error) {') - .push(1, 'console.error(error);') - .push('});') - - return code.join() -} - -module.exports.info = { - key: 'axios', - title: 'Axios', - link: 'https://github.com/axios/axios', - description: 'Promise based HTTP client for the browser and node.js' -} diff --git a/src/targets/javascript/axios/client.ts b/src/targets/javascript/axios/client.ts new file mode 100644 index 000000000..935de0247 --- /dev/null +++ b/src/targets/javascript/axios/client.ts @@ -0,0 +1,94 @@ +/** + * @description + * HTTP code snippet generator for Javascript & Node.js using Axios. + * + * @author + * @rohit-gohri + * + * for any questions or issues regarding the generated code snippet, please open an issue mentioning the author. + */ + +import stringifyObject from 'stringify-object'; + +import { CodeBuilder } from '../../../helpers/code-builder'; +import { Client } from '../../targets'; + +export const axios: Client = { + info: { + key: 'axios', + title: 'Axios', + link: 'https://github.com/axios/axios', + description: 'Promise based HTTP client for the browser and node.js', + }, + convert: ({ allHeaders, method, url, queryObj, postData }, options) => { + const opts = { + indent: ' ', + ...options, + }; + + const { blank, push, join } = new CodeBuilder({ indent: opts.indent }); + + push("import axios from 'axios';"); + blank(); + + const requestOptions: Record = { + method, + url, + }; + + if (Object.keys(queryObj).length) { + requestOptions.params = queryObj; + } + + if (Object.keys(allHeaders).length) { + requestOptions.headers = allHeaders; + } + + switch (postData.mimeType) { + case 'application/x-www-form-urlencoded': + requestOptions.data = postData.paramsObj; + break; + + case 'application/json': + if (postData.jsonObj) { + requestOptions.data = postData.jsonObj; + } + break; + + case 'multipart/form-data': + push('const form = new FormData();'); + + postData.params?.forEach(param => { + push(`form.append('${param.name}', '${param.value || param.fileName || ''}');`); + }); + + blank(); + + requestOptions.data = '[form]'; + break; + + default: + if (postData.text) { + requestOptions.data = postData.text; + } + } + + const optionString = stringifyObject(requestOptions, { + indent: ' ', + inlineCharacterLimit: 80, + }).replace('"[form]"', 'form'); + push(`const options = ${optionString};`); + blank(); + + push('axios'); + push('.request(options)', 1); + push('.then(function (response) {', 1); + push('console.log(response.data);', 2); + push('})', 1); + push('.catch(function (error) {', 1); + push('console.error(error);', 2); + push('});', 1); + + return join(); + }, +}; diff --git a/src/targets/javascript/axios/fixtures/application-form-encoded.js b/src/targets/javascript/axios/fixtures/application-form-encoded.js new file mode 100644 index 000000000..881d2e2e6 --- /dev/null +++ b/src/targets/javascript/axios/fixtures/application-form-encoded.js @@ -0,0 +1,17 @@ +import axios from 'axios'; + +const options = { + method: 'POST', + url: 'http://mockbin.com/har', + headers: {'content-type': 'application/x-www-form-urlencoded'}, + data: {foo: 'bar', hello: 'world'} +}; + +axios + .request(options) + .then(function (response) { + console.log(response.data); + }) + .catch(function (error) { + console.error(error); + }); \ No newline at end of file diff --git a/test/fixtures/output/javascript/axios/application-json.js b/src/targets/javascript/axios/fixtures/application-json.js similarity index 60% rename from test/fixtures/output/javascript/axios/application-json.js rename to src/targets/javascript/axios/fixtures/application-json.js index d84ad11f3..077000c38 100644 --- a/test/fixtures/output/javascript/axios/application-json.js +++ b/src/targets/javascript/axios/fixtures/application-json.js @@ -1,4 +1,4 @@ -import axios from "axios"; +import axios from 'axios'; const options = { method: 'POST', @@ -14,8 +14,11 @@ const options = { } }; -axios.request(options).then(function (response) { - console.log(response.data); -}).catch(function (error) { - console.error(error); -}); +axios + .request(options) + .then(function (response) { + console.log(response.data); + }) + .catch(function (error) { + console.error(error); + }); \ No newline at end of file diff --git a/src/targets/javascript/axios/fixtures/cookies.js b/src/targets/javascript/axios/fixtures/cookies.js new file mode 100644 index 000000000..055f5b75b --- /dev/null +++ b/src/targets/javascript/axios/fixtures/cookies.js @@ -0,0 +1,16 @@ +import axios from 'axios'; + +const options = { + method: 'POST', + url: 'http://mockbin.com/har', + headers: {cookie: 'foo=bar; bar=baz'} +}; + +axios + .request(options) + .then(function (response) { + console.log(response.data); + }) + .catch(function (error) { + console.error(error); + }); \ No newline at end of file diff --git a/src/targets/javascript/axios/fixtures/custom-method.js b/src/targets/javascript/axios/fixtures/custom-method.js new file mode 100644 index 000000000..05539e231 --- /dev/null +++ b/src/targets/javascript/axios/fixtures/custom-method.js @@ -0,0 +1,12 @@ +import axios from 'axios'; + +const options = {method: 'PROPFIND', url: 'http://mockbin.com/har'}; + +axios + .request(options) + .then(function (response) { + console.log(response.data); + }) + .catch(function (error) { + console.error(error); + }); \ No newline at end of file diff --git a/test/fixtures/output/javascript/axios/full.js b/src/targets/javascript/axios/fixtures/full.js similarity index 61% rename from test/fixtures/output/javascript/axios/full.js rename to src/targets/javascript/axios/fixtures/full.js index 61f25dd9c..0f81f5042 100644 --- a/test/fixtures/output/javascript/axios/full.js +++ b/src/targets/javascript/axios/fixtures/full.js @@ -1,4 +1,4 @@ -import axios from "axios"; +import axios from 'axios'; const options = { method: 'POST', @@ -12,8 +12,11 @@ const options = { data: {foo: 'bar'} }; -axios.request(options).then(function (response) { - console.log(response.data); -}).catch(function (error) { - console.error(error); -}); +axios + .request(options) + .then(function (response) { + console.log(response.data); + }) + .catch(function (error) { + console.error(error); + }); \ No newline at end of file diff --git a/src/targets/javascript/axios/fixtures/headers.js b/src/targets/javascript/axios/fixtures/headers.js new file mode 100644 index 000000000..57a48e5f5 --- /dev/null +++ b/src/targets/javascript/axios/fixtures/headers.js @@ -0,0 +1,16 @@ +import axios from 'axios'; + +const options = { + method: 'GET', + url: 'http://mockbin.com/har', + headers: {accept: 'application/json', 'x-foo': 'Bar'} +}; + +axios + .request(options) + .then(function (response) { + console.log(response.data); + }) + .catch(function (error) { + console.error(error); + }); \ No newline at end of file diff --git a/src/targets/javascript/axios/fixtures/https.js b/src/targets/javascript/axios/fixtures/https.js new file mode 100644 index 000000000..df9ac3ee4 --- /dev/null +++ b/src/targets/javascript/axios/fixtures/https.js @@ -0,0 +1,12 @@ +import axios from 'axios'; + +const options = {method: 'GET', url: 'https://mockbin.com/har'}; + +axios + .request(options) + .then(function (response) { + console.log(response.data); + }) + .catch(function (error) { + console.error(error); + }); \ No newline at end of file diff --git a/src/targets/javascript/axios/fixtures/jsonObj-multiline.js b/src/targets/javascript/axios/fixtures/jsonObj-multiline.js new file mode 100644 index 000000000..bd20a22dd --- /dev/null +++ b/src/targets/javascript/axios/fixtures/jsonObj-multiline.js @@ -0,0 +1,17 @@ +import axios from 'axios'; + +const options = { + method: 'POST', + url: 'http://mockbin.com/har', + headers: {'content-type': 'application/json'}, + data: {foo: 'bar'} +}; + +axios + .request(options) + .then(function (response) { + console.log(response.data); + }) + .catch(function (error) { + console.error(error); + }); \ No newline at end of file diff --git a/src/targets/javascript/axios/fixtures/jsonObj-null-value.js b/src/targets/javascript/axios/fixtures/jsonObj-null-value.js new file mode 100644 index 000000000..ec89dbb48 --- /dev/null +++ b/src/targets/javascript/axios/fixtures/jsonObj-null-value.js @@ -0,0 +1,17 @@ +import axios from 'axios'; + +const options = { + method: 'POST', + url: 'http://mockbin.com/har', + headers: {'content-type': 'application/json'}, + data: {foo: null} +}; + +axios + .request(options) + .then(function (response) { + console.log(response.data); + }) + .catch(function (error) { + console.error(error); + }); \ No newline at end of file diff --git a/src/targets/javascript/axios/fixtures/multipart-data.js b/src/targets/javascript/axios/fixtures/multipart-data.js new file mode 100644 index 000000000..91febdd7e --- /dev/null +++ b/src/targets/javascript/axios/fixtures/multipart-data.js @@ -0,0 +1,20 @@ +import axios from 'axios'; + +const form = new FormData(); +form.append('foo', 'Hello World'); + +const options = { + method: 'POST', + url: 'http://mockbin.com/har', + headers: {'content-type': 'multipart/form-data; boundary=---011000010111000001101001'}, + data: '[form]' +}; + +axios + .request(options) + .then(function (response) { + console.log(response.data); + }) + .catch(function (error) { + console.error(error); + }); \ No newline at end of file diff --git a/src/targets/javascript/axios/fixtures/multipart-file.js b/src/targets/javascript/axios/fixtures/multipart-file.js new file mode 100644 index 000000000..4bbb06462 --- /dev/null +++ b/src/targets/javascript/axios/fixtures/multipart-file.js @@ -0,0 +1,20 @@ +import axios from 'axios'; + +const form = new FormData(); +form.append('foo', 'test/fixtures/files/hello.txt'); + +const options = { + method: 'POST', + url: 'http://mockbin.com/har', + headers: {'content-type': 'multipart/form-data; boundary=---011000010111000001101001'}, + data: '[form]' +}; + +axios + .request(options) + .then(function (response) { + console.log(response.data); + }) + .catch(function (error) { + console.error(error); + }); \ No newline at end of file diff --git a/test/fixtures/output/javascript/axios/multipart-form-data.js b/src/targets/javascript/axios/fixtures/multipart-form-data.js similarity index 50% rename from test/fixtures/output/javascript/axios/multipart-form-data.js rename to src/targets/javascript/axios/fixtures/multipart-form-data.js index b000f6353..a12875fa5 100644 --- a/test/fixtures/output/javascript/axios/multipart-form-data.js +++ b/src/targets/javascript/axios/fixtures/multipart-form-data.js @@ -1,7 +1,7 @@ -import axios from "axios"; +import axios from 'axios'; const form = new FormData(); -form.append("foo", "bar"); +form.append('foo', 'bar'); const options = { method: 'POST', @@ -10,8 +10,11 @@ const options = { data: '[form]' }; -axios.request(options).then(function (response) { - console.log(response.data); -}).catch(function (error) { - console.error(error); -}); +axios + .request(options) + .then(function (response) { + console.log(response.data); + }) + .catch(function (error) { + console.error(error); + }); \ No newline at end of file diff --git a/src/targets/javascript/axios/fixtures/nested.js b/src/targets/javascript/axios/fixtures/nested.js new file mode 100644 index 000000000..374a03820 --- /dev/null +++ b/src/targets/javascript/axios/fixtures/nested.js @@ -0,0 +1,16 @@ +import axios from 'axios'; + +const options = { + method: 'GET', + url: 'http://mockbin.com/har', + params: {'foo[bar]': 'baz,zap', fiz: 'buz', key: 'value'} +}; + +axios + .request(options) + .then(function (response) { + console.log(response.data); + }) + .catch(function (error) { + console.error(error); + }); \ No newline at end of file diff --git a/src/targets/javascript/axios/fixtures/query.js b/src/targets/javascript/axios/fixtures/query.js new file mode 100644 index 000000000..638e53932 --- /dev/null +++ b/src/targets/javascript/axios/fixtures/query.js @@ -0,0 +1,16 @@ +import axios from 'axios'; + +const options = { + method: 'GET', + url: 'http://mockbin.com/har', + params: {foo: ['bar', 'baz'], baz: 'abc', key: 'value'} +}; + +axios + .request(options) + .then(function (response) { + console.log(response.data); + }) + .catch(function (error) { + console.error(error); + }); \ No newline at end of file diff --git a/src/targets/javascript/axios/fixtures/short.js b/src/targets/javascript/axios/fixtures/short.js new file mode 100644 index 000000000..784cde912 --- /dev/null +++ b/src/targets/javascript/axios/fixtures/short.js @@ -0,0 +1,12 @@ +import axios from 'axios'; + +const options = {method: 'GET', url: 'http://mockbin.com/har'}; + +axios + .request(options) + .then(function (response) { + console.log(response.data); + }) + .catch(function (error) { + console.error(error); + }); \ No newline at end of file diff --git a/src/targets/javascript/axios/fixtures/text-plain.js b/src/targets/javascript/axios/fixtures/text-plain.js new file mode 100644 index 000000000..985de026c --- /dev/null +++ b/src/targets/javascript/axios/fixtures/text-plain.js @@ -0,0 +1,17 @@ +import axios from 'axios'; + +const options = { + method: 'POST', + url: 'http://mockbin.com/har', + headers: {'content-type': 'text/plain'}, + data: 'Hello World' +}; + +axios + .request(options) + .then(function (response) { + console.log(response.data); + }) + .catch(function (error) { + console.error(error); + }); \ No newline at end of file diff --git a/src/targets/javascript/fetch.js b/src/targets/javascript/fetch.js deleted file mode 100644 index f76e396cb..000000000 --- a/src/targets/javascript/fetch.js +++ /dev/null @@ -1,101 +0,0 @@ -/** - * @description - * HTTP code snippet generator for fetch - * - * @author - * @pmdroid - * - * for any questions or issues regarding the generated code snippet, please open an issue mentioning the author. - */ - -'use strict' - -const CodeBuilder = require('../../helpers/code-builder') - -module.exports = function (source, options) { - const opts = Object.assign( - { - indent: ' ', - credentials: null - }, - options - ) - - const stringifyObject = require('stringify-object') - const code = new CodeBuilder(opts.indent) - - options = { - method: source.method - } - - if (Object.keys(source.allHeaders).length) { - options.headers = source.allHeaders - } - - if (opts.credentials !== null) { - options.credentials = opts.credentials - } - - switch (source.postData.mimeType) { - case 'application/x-www-form-urlencoded': - options.body = source.postData.paramsObj - ? source.postData.paramsObj - : source.postData.text - break - - case 'application/json': - options.body = JSON.stringify(source.postData.jsonObj) - break - - case 'multipart/form-data': - code.push('const form = new FormData();') - - source.postData.params.forEach(function (param) { - code.push( - 'form.append(%s, %s);', - JSON.stringify(param.name), - JSON.stringify(param.value || param.fileName || '') - ) - }) - - code.blank() - break - - default: - if (source.postData.text) { - options.body = source.postData.text - } - } - - code.push('const options = %s;', stringifyObject(options, { - indent: opts.indent, - inlineCharacterLimit: 80, - transform: (object, property, originalResult) => { - if (property === 'body' && source.postData.mimeType === 'application/x-www-form-urlencoded') { - return `new URLSearchParams(${originalResult})` - } - - return originalResult - } - })) - .blank() - - if (source.postData.mimeType === 'multipart/form-data') { - code.push('options.body = form;') - .blank() - } - - code.push("fetch('%s', options)", source.fullUrl) - .push(1, '.then(response => response.json())') - .push(1, '.then(response => console.log(response))') - .push(1, '.catch(err => console.error(err));') - - return code.join() -} - -module.exports.info = { - key: 'fetch', - title: 'fetch', - link: 'https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API/Using_Fetch', - description: 'Perform asynchronous HTTP requests with the Fetch API' -} diff --git a/src/targets/javascript/fetch/client.ts b/src/targets/javascript/fetch/client.ts new file mode 100644 index 000000000..9ecb4639a --- /dev/null +++ b/src/targets/javascript/fetch/client.ts @@ -0,0 +1,99 @@ +/** + * @description + * HTTP code snippet generator for fetch + * + * @author + * @pmdroid + * + * for any questions or issues regarding the generated code snippet, please open an issue mentioning the author. + */ + +import stringifyObject from 'stringify-object'; + +import { CodeBuilder } from '../../../helpers/code-builder'; +import { Client } from '../../targets'; + +interface FetchOptions { + credentials?: Record | null; +} + +export const fetch: Client = { + info: { + key: 'fetch', + title: 'fetch', + link: 'https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API/Using_Fetch', + description: 'Perform asynchronous HTTP requests with the Fetch API', + }, + convert: ({ method, allHeaders, postData, fullUrl }, inputOpts) => { + const opts = { + indent: ' ', + credentials: null, + ...inputOpts, + }; + + const { blank, join, push } = new CodeBuilder({ indent: opts.indent }); + + const options: Record = { + method, + }; + + if (Object.keys(allHeaders).length) { + options.headers = allHeaders; + } + + if (opts.credentials !== null) { + options.credentials = opts.credentials; + } + + switch (postData.mimeType) { + case 'application/x-www-form-urlencoded': + options.body = postData.paramsObj ? postData.paramsObj : postData.text; + break; + + case 'application/json': + options.body = JSON.stringify(postData.jsonObj); + break; + + case 'multipart/form-data': + push('const form = new FormData();'); + + postData.params?.forEach(param => { + push(`form.append('${param.name}', '${param.value || param.fileName || ''}');`); + }); + + blank(); + break; + + default: + if (postData.text) { + options.body = postData.text; + } + } + + push( + `const options = ${stringifyObject(options, { + indent: opts.indent, + inlineCharacterLimit: 80, + transform: (_, property, originalResult) => { + if (property === 'body' && postData.mimeType === 'application/x-www-form-urlencoded') { + return `new URLSearchParams(${originalResult})`; + } + return originalResult; + }, + })};`, + ); + blank(); + + if (postData.mimeType === 'multipart/form-data') { + push('options.body = form;'); + blank(); + } + + push(`fetch('${fullUrl}', options)`); + push('.then(response => response.json())', 1); + push('.then(response => console.log(response))', 1); + push('.catch(err => console.error(err));', 1); + + return join(); + }, +}; diff --git a/test/fixtures/output/javascript/fetch/application-form-encoded.js b/src/targets/javascript/fetch/fixtures/application-form-encoded.js similarity index 88% rename from test/fixtures/output/javascript/fetch/application-form-encoded.js rename to src/targets/javascript/fetch/fixtures/application-form-encoded.js index a710c45c1..211792094 100644 --- a/test/fixtures/output/javascript/fetch/application-form-encoded.js +++ b/src/targets/javascript/fetch/fixtures/application-form-encoded.js @@ -7,4 +7,4 @@ const options = { fetch('http://mockbin.com/har', options) .then(response => response.json()) .then(response => console.log(response)) - .catch(err => console.error(err)); + .catch(err => console.error(err)); \ No newline at end of file diff --git a/test/fixtures/output/javascript/fetch/application-json.js b/src/targets/javascript/fetch/fixtures/application-json.js similarity index 90% rename from test/fixtures/output/javascript/fetch/application-json.js rename to src/targets/javascript/fetch/fixtures/application-json.js index 7aeb5510e..74a903362 100644 --- a/test/fixtures/output/javascript/fetch/application-json.js +++ b/src/targets/javascript/fetch/fixtures/application-json.js @@ -7,4 +7,4 @@ const options = { fetch('http://mockbin.com/har', options) .then(response => response.json()) .then(response => console.log(response)) - .catch(err => console.error(err)); + .catch(err => console.error(err)); \ No newline at end of file diff --git a/test/fixtures/output/javascript/fetch/cookies.js b/src/targets/javascript/fetch/fixtures/cookies.js similarity index 84% rename from test/fixtures/output/javascript/fetch/cookies.js rename to src/targets/javascript/fetch/fixtures/cookies.js index 8cbf70742..83da18088 100644 --- a/test/fixtures/output/javascript/fetch/cookies.js +++ b/src/targets/javascript/fetch/fixtures/cookies.js @@ -3,4 +3,4 @@ const options = {method: 'POST', headers: {cookie: 'foo=bar; bar=baz'}}; fetch('http://mockbin.com/har', options) .then(response => response.json()) .then(response => console.log(response)) - .catch(err => console.error(err)); + .catch(err => console.error(err)); \ No newline at end of file diff --git a/test/fixtures/output/javascript/fetch/custom-method.js b/src/targets/javascript/fetch/fixtures/custom-method.js similarity index 81% rename from test/fixtures/output/javascript/fetch/custom-method.js rename to src/targets/javascript/fetch/fixtures/custom-method.js index 1a12c8405..93ce8f277 100644 --- a/test/fixtures/output/javascript/fetch/custom-method.js +++ b/src/targets/javascript/fetch/fixtures/custom-method.js @@ -3,4 +3,4 @@ const options = {method: 'PROPFIND'}; fetch('http://mockbin.com/har', options) .then(response => response.json()) .then(response => console.log(response)) - .catch(err => console.error(err)); + .catch(err => console.error(err)); \ No newline at end of file diff --git a/test/fixtures/output/javascript/fetch/full.js b/src/targets/javascript/fetch/fixtures/full.js similarity index 91% rename from test/fixtures/output/javascript/fetch/full.js rename to src/targets/javascript/fetch/fixtures/full.js index 99298d460..74fbac0b5 100644 --- a/test/fixtures/output/javascript/fetch/full.js +++ b/src/targets/javascript/fetch/fixtures/full.js @@ -11,4 +11,4 @@ const options = { fetch('http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value', options) .then(response => response.json()) .then(response => console.log(response)) - .catch(err => console.error(err)); + .catch(err => console.error(err)); \ No newline at end of file diff --git a/test/fixtures/output/javascript/fetch/headers.js b/src/targets/javascript/fetch/fixtures/headers.js similarity index 85% rename from test/fixtures/output/javascript/fetch/headers.js rename to src/targets/javascript/fetch/fixtures/headers.js index 583e54cb6..bdb686f69 100644 --- a/test/fixtures/output/javascript/fetch/headers.js +++ b/src/targets/javascript/fetch/fixtures/headers.js @@ -3,4 +3,4 @@ const options = {method: 'GET', headers: {accept: 'application/json', 'x-foo': ' fetch('http://mockbin.com/har', options) .then(response => response.json()) .then(response => console.log(response)) - .catch(err => console.error(err)); + .catch(err => console.error(err)); \ No newline at end of file diff --git a/test/fixtures/output/javascript/fetch/https.js b/src/targets/javascript/fetch/fixtures/https.js similarity index 80% rename from test/fixtures/output/javascript/fetch/https.js rename to src/targets/javascript/fetch/fixtures/https.js index ba9350cc6..5d697e9f1 100644 --- a/test/fixtures/output/javascript/fetch/https.js +++ b/src/targets/javascript/fetch/fixtures/https.js @@ -3,4 +3,4 @@ const options = {method: 'GET'}; fetch('https://mockbin.com/har', options) .then(response => response.json()) .then(response => console.log(response)) - .catch(err => console.error(err)); + .catch(err => console.error(err)); \ No newline at end of file diff --git a/test/fixtures/output/javascript/fetch/jsonObj-multiline.js b/src/targets/javascript/fetch/fixtures/jsonObj-multiline.js similarity index 86% rename from test/fixtures/output/javascript/fetch/jsonObj-multiline.js rename to src/targets/javascript/fetch/fixtures/jsonObj-multiline.js index f35e2be3c..a787d1f13 100644 --- a/test/fixtures/output/javascript/fetch/jsonObj-multiline.js +++ b/src/targets/javascript/fetch/fixtures/jsonObj-multiline.js @@ -7,4 +7,4 @@ const options = { fetch('http://mockbin.com/har', options) .then(response => response.json()) .then(response => console.log(response)) - .catch(err => console.error(err)); + .catch(err => console.error(err)); \ No newline at end of file diff --git a/test/fixtures/output/javascript/fetch/jsonObj-null-value.js b/src/targets/javascript/fetch/fixtures/jsonObj-null-value.js similarity index 86% rename from test/fixtures/output/javascript/fetch/jsonObj-null-value.js rename to src/targets/javascript/fetch/fixtures/jsonObj-null-value.js index e0adc2da4..4eb7d90c3 100644 --- a/test/fixtures/output/javascript/fetch/jsonObj-null-value.js +++ b/src/targets/javascript/fetch/fixtures/jsonObj-null-value.js @@ -7,4 +7,4 @@ const options = { fetch('http://mockbin.com/har', options) .then(response => response.json()) .then(response => console.log(response)) - .catch(err => console.error(err)); + .catch(err => console.error(err)); \ No newline at end of file diff --git a/test/fixtures/output/javascript/fetch/multipart-data.js b/src/targets/javascript/fetch/fixtures/multipart-data.js similarity index 80% rename from test/fixtures/output/javascript/fetch/multipart-data.js rename to src/targets/javascript/fetch/fixtures/multipart-data.js index b469e5f05..4b90c4ba2 100644 --- a/test/fixtures/output/javascript/fetch/multipart-data.js +++ b/src/targets/javascript/fetch/fixtures/multipart-data.js @@ -1,5 +1,5 @@ const form = new FormData(); -form.append("foo", "Hello World"); +form.append('foo', 'Hello World'); const options = { method: 'POST', @@ -11,4 +11,4 @@ options.body = form; fetch('http://mockbin.com/har', options) .then(response => response.json()) .then(response => console.log(response)) - .catch(err => console.error(err)); + .catch(err => console.error(err)); \ No newline at end of file diff --git a/test/fixtures/output/javascript/fetch/multipart-file.js b/src/targets/javascript/fetch/fixtures/multipart-file.js similarity index 77% rename from test/fixtures/output/javascript/fetch/multipart-file.js rename to src/targets/javascript/fetch/fixtures/multipart-file.js index 7fa08db3f..551de3987 100644 --- a/test/fixtures/output/javascript/fetch/multipart-file.js +++ b/src/targets/javascript/fetch/fixtures/multipart-file.js @@ -1,5 +1,5 @@ const form = new FormData(); -form.append("foo", "test/fixtures/files/hello.txt"); +form.append('foo', 'test/fixtures/files/hello.txt'); const options = { method: 'POST', @@ -11,4 +11,4 @@ options.body = form; fetch('http://mockbin.com/har', options) .then(response => response.json()) .then(response => console.log(response)) - .catch(err => console.error(err)); + .catch(err => console.error(err)); \ No newline at end of file diff --git a/test/fixtures/output/javascript/fetch/multipart-form-data.js b/src/targets/javascript/fetch/fixtures/multipart-form-data.js similarity index 82% rename from test/fixtures/output/javascript/fetch/multipart-form-data.js rename to src/targets/javascript/fetch/fixtures/multipart-form-data.js index 28cc96d32..a7e36fcf7 100644 --- a/test/fixtures/output/javascript/fetch/multipart-form-data.js +++ b/src/targets/javascript/fetch/fixtures/multipart-form-data.js @@ -1,5 +1,5 @@ const form = new FormData(); -form.append("foo", "bar"); +form.append('foo', 'bar'); const options = { method: 'POST', @@ -11,4 +11,4 @@ options.body = form; fetch('http://mockbin.com/har', options) .then(response => response.json()) .then(response => console.log(response)) - .catch(err => console.error(err)); + .catch(err => console.error(err)); \ No newline at end of file diff --git a/test/fixtures/output/javascript/fetch/nested.js b/src/targets/javascript/fetch/fixtures/nested.js similarity index 84% rename from test/fixtures/output/javascript/fetch/nested.js rename to src/targets/javascript/fetch/fixtures/nested.js index f4fd92dfa..fd32f71bd 100644 --- a/test/fixtures/output/javascript/fetch/nested.js +++ b/src/targets/javascript/fetch/fixtures/nested.js @@ -3,4 +3,4 @@ const options = {method: 'GET'}; fetch('http://mockbin.com/har?foo%5Bbar%5D=baz%2Czap&fiz=buz&key=value', options) .then(response => response.json()) .then(response => console.log(response)) - .catch(err => console.error(err)); + .catch(err => console.error(err)); \ No newline at end of file diff --git a/test/fixtures/output/javascript/fetch/query.js b/src/targets/javascript/fetch/fixtures/query.js similarity index 83% rename from test/fixtures/output/javascript/fetch/query.js rename to src/targets/javascript/fetch/fixtures/query.js index 8f331fda6..52516382e 100644 --- a/test/fixtures/output/javascript/fetch/query.js +++ b/src/targets/javascript/fetch/fixtures/query.js @@ -3,4 +3,4 @@ const options = {method: 'GET'}; fetch('http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value', options) .then(response => response.json()) .then(response => console.log(response)) - .catch(err => console.error(err)); + .catch(err => console.error(err)); \ No newline at end of file diff --git a/test/fixtures/output/javascript/fetch/short.js b/src/targets/javascript/fetch/fixtures/short.js similarity index 80% rename from test/fixtures/output/javascript/fetch/short.js rename to src/targets/javascript/fetch/fixtures/short.js index 8b0152c24..fa8ac5b2d 100644 --- a/test/fixtures/output/javascript/fetch/short.js +++ b/src/targets/javascript/fetch/fixtures/short.js @@ -3,4 +3,4 @@ const options = {method: 'GET'}; fetch('http://mockbin.com/har', options) .then(response => response.json()) .then(response => console.log(response)) - .catch(err => console.error(err)); + .catch(err => console.error(err)); \ No newline at end of file diff --git a/test/fixtures/output/javascript/fetch/text-plain.js b/src/targets/javascript/fetch/fixtures/text-plain.js similarity index 85% rename from test/fixtures/output/javascript/fetch/text-plain.js rename to src/targets/javascript/fetch/fixtures/text-plain.js index 38ef7081e..cf02fc67d 100644 --- a/test/fixtures/output/javascript/fetch/text-plain.js +++ b/src/targets/javascript/fetch/fixtures/text-plain.js @@ -3,4 +3,4 @@ const options = {method: 'POST', headers: {'content-type': 'text/plain'}, body: fetch('http://mockbin.com/har', options) .then(response => response.json()) .then(response => console.log(response)) - .catch(err => console.error(err)); + .catch(err => console.error(err)); \ No newline at end of file diff --git a/src/targets/javascript/index.js b/src/targets/javascript/index.js deleted file mode 100644 index 195c5f663..000000000 --- a/src/targets/javascript/index.js +++ /dev/null @@ -1,15 +0,0 @@ -'use strict' - -module.exports = { - info: { - key: 'javascript', - title: 'JavaScript', - extname: '.js', - default: 'xhr' - }, - - jquery: require('./jquery'), - fetch: require('./fetch'), - xhr: require('./xhr'), - axios: require('./axios') -} diff --git a/src/targets/javascript/jquery.js b/src/targets/javascript/jquery.js deleted file mode 100644 index 9e662a83a..000000000 --- a/src/targets/javascript/jquery.js +++ /dev/null @@ -1,83 +0,0 @@ -/** - * @description - * HTTP code snippet generator for native XMLHttpRequest - * - * @author - * @AhmadNassri - * - * for any questions or issues regarding the generated code snippet, please open an issue mentioning the author. - */ - -'use strict' - -const CodeBuilder = require('../../helpers/code-builder') -const helpers = require('../../helpers/headers') - -module.exports = function (source, options) { - const opts = Object.assign({ - indent: ' ' - }, options) - - const code = new CodeBuilder(opts.indent) - - const settings = { - async: true, - crossDomain: true, - url: source.fullUrl, - method: source.method, - headers: source.allHeaders - } - - switch (source.postData.mimeType) { - case 'application/x-www-form-urlencoded': - settings.data = source.postData.paramsObj ? source.postData.paramsObj : source.postData.text - break - - case 'application/json': - settings.processData = false - settings.data = source.postData.text - break - - case 'multipart/form-data': - code.push('const form = new FormData();') - - source.postData.params.forEach(function (param) { - code.push('form.append(%s, %s);', JSON.stringify(param.name), JSON.stringify(param.value || param.fileName || '')) - }) - - settings.processData = false - settings.contentType = false - settings.mimeType = 'multipart/form-data' - settings.data = '[form]' - - // remove the contentType header - if (helpers.hasHeader(settings.headers, 'content-type')) { - if (helpers.getHeader(settings.headers, 'content-type').indexOf('boundary')) { - delete settings.headers[helpers.getHeaderName(settings.headers, 'content-type')] - } - } - - code.blank() - break - - default: - if (source.postData.text) { - settings.data = source.postData.text - } - } - - code.push('const settings = ' + JSON.stringify(settings, null, opts.indent).replace('"[form]"', 'form') + ';') - .blank() - .push('$.ajax(settings).done(function (response) {') - .push(1, 'console.log(response);') - .push('});') - - return code.join() -} - -module.exports.info = { - key: 'jquery', - title: 'jQuery', - link: 'http://api.jquery.com/jquery.ajax/', - description: 'Perform an asynchronous HTTP (Ajax) requests with jQuery' -} diff --git a/src/targets/javascript/jquery/client.ts b/src/targets/javascript/jquery/client.ts new file mode 100644 index 000000000..9647b82c2 --- /dev/null +++ b/src/targets/javascript/jquery/client.ts @@ -0,0 +1,94 @@ +/** + * @description + * HTTP code snippet generator for native XMLHttpRequest + * + * @author + * @AhmadNassri + * + * for any questions or issues regarding the generated code snippet, please open an issue mentioning the author. + */ + +import stringifyObject from 'stringify-object'; + +import { CodeBuilder } from '../../../helpers/code-builder'; +import { getHeader, getHeaderName, hasHeader } from '../../../helpers/headers'; +import { Client } from '../../targets'; + +export const jquery: Client = { + info: { + key: 'jquery', + title: 'jQuery', + link: 'http://api.jquery.com/jquery.ajax/', + description: 'Perform an asynchronous HTTP (Ajax) requests with jQuery', + }, + convert: ({ fullUrl, method, allHeaders, postData }, options) => { + const opts = { + indent: ' ', + ...options, + }; + + const { blank, push, join } = new CodeBuilder({ indent: opts.indent }); + + const settings: Record = { + async: true, + crossDomain: true, + url: fullUrl, + method, + headers: allHeaders, + }; + + switch (postData.mimeType) { + case 'application/x-www-form-urlencoded': + settings.data = postData.paramsObj ? postData.paramsObj : postData.text; + break; + + case 'application/json': + settings.processData = false; + settings.data = postData.text; + break; + + case 'multipart/form-data': + push('const form = new FormData();'); + + postData.params?.forEach(param => { + push(`form.append('${param.name}', '${param.value || param.fileName || ''}');`); + }); + + settings.processData = false; + settings.contentType = false; + settings.mimeType = 'multipart/form-data'; + settings.data = '[form]'; + + // remove the contentType header + if (hasHeader(allHeaders, 'content-type')) { + if (getHeader(allHeaders, 'content-type')?.includes('boundary')) { + const headerName = getHeaderName(allHeaders, 'content-type'); + if (headerName) { + delete settings.headers[headerName]; + } + } + } + + blank(); + break; + + default: + if (postData.text) { + settings.data = postData.text; + } + } + + const stringifiedSettings = stringifyObject(settings, { indent: opts.indent }).replace( + "'[form]'", + 'form', + ); + + push(`const settings = ${stringifiedSettings};`); + blank(); + push('$.ajax(settings).done(function (response) {'); + push('console.log(response);', 1); + push('});'); + + return join(); + }, +}; diff --git a/src/targets/javascript/jquery/fixtures/application-form-encoded.js b/src/targets/javascript/jquery/fixtures/application-form-encoded.js new file mode 100644 index 000000000..dd84f07d2 --- /dev/null +++ b/src/targets/javascript/jquery/fixtures/application-form-encoded.js @@ -0,0 +1,17 @@ +const settings = { + async: true, + crossDomain: true, + url: 'http://mockbin.com/har', + method: 'POST', + headers: { + 'content-type': 'application/x-www-form-urlencoded' + }, + data: { + foo: 'bar', + hello: 'world' + } +}; + +$.ajax(settings).done(function (response) { + console.log(response); +}); \ No newline at end of file diff --git a/src/targets/javascript/jquery/fixtures/application-json.js b/src/targets/javascript/jquery/fixtures/application-json.js new file mode 100644 index 000000000..594e5bd4e --- /dev/null +++ b/src/targets/javascript/jquery/fixtures/application-json.js @@ -0,0 +1,15 @@ +const settings = { + async: true, + crossDomain: true, + url: 'http://mockbin.com/har', + method: 'POST', + headers: { + 'content-type': 'application/json' + }, + processData: false, + data: '{"number":1,"string":"f\"oo","arr":[1,2,3],"nested":{"a":"b"},"arr_mix":[1,"a",{"arr_mix_nested":{}}],"boolean":false}' +}; + +$.ajax(settings).done(function (response) { + console.log(response); +}); \ No newline at end of file diff --git a/src/targets/javascript/jquery/fixtures/cookies.js b/src/targets/javascript/jquery/fixtures/cookies.js new file mode 100644 index 000000000..e5a4b87dc --- /dev/null +++ b/src/targets/javascript/jquery/fixtures/cookies.js @@ -0,0 +1,13 @@ +const settings = { + async: true, + crossDomain: true, + url: 'http://mockbin.com/har', + method: 'POST', + headers: { + cookie: 'foo=bar; bar=baz' + } +}; + +$.ajax(settings).done(function (response) { + console.log(response); +}); \ No newline at end of file diff --git a/src/targets/javascript/jquery/fixtures/custom-method.js b/src/targets/javascript/jquery/fixtures/custom-method.js new file mode 100644 index 000000000..b96e43a0c --- /dev/null +++ b/src/targets/javascript/jquery/fixtures/custom-method.js @@ -0,0 +1,11 @@ +const settings = { + async: true, + crossDomain: true, + url: 'http://mockbin.com/har', + method: 'PROPFIND', + headers: {} +}; + +$.ajax(settings).done(function (response) { + console.log(response); +}); \ No newline at end of file diff --git a/src/targets/javascript/jquery/fixtures/full.js b/src/targets/javascript/jquery/fixtures/full.js new file mode 100644 index 000000000..ec1ac6bd7 --- /dev/null +++ b/src/targets/javascript/jquery/fixtures/full.js @@ -0,0 +1,18 @@ +const settings = { + async: true, + crossDomain: true, + url: 'http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value', + method: 'POST', + headers: { + cookie: 'foo=bar; bar=baz', + accept: 'application/json', + 'content-type': 'application/x-www-form-urlencoded' + }, + data: { + foo: 'bar' + } +}; + +$.ajax(settings).done(function (response) { + console.log(response); +}); \ No newline at end of file diff --git a/src/targets/javascript/jquery/fixtures/headers.js b/src/targets/javascript/jquery/fixtures/headers.js new file mode 100644 index 000000000..155e2724e --- /dev/null +++ b/src/targets/javascript/jquery/fixtures/headers.js @@ -0,0 +1,14 @@ +const settings = { + async: true, + crossDomain: true, + url: 'http://mockbin.com/har', + method: 'GET', + headers: { + accept: 'application/json', + 'x-foo': 'Bar' + } +}; + +$.ajax(settings).done(function (response) { + console.log(response); +}); \ No newline at end of file diff --git a/src/targets/javascript/jquery/fixtures/https.js b/src/targets/javascript/jquery/fixtures/https.js new file mode 100644 index 000000000..8700f8781 --- /dev/null +++ b/src/targets/javascript/jquery/fixtures/https.js @@ -0,0 +1,11 @@ +const settings = { + async: true, + crossDomain: true, + url: 'https://mockbin.com/har', + method: 'GET', + headers: {} +}; + +$.ajax(settings).done(function (response) { + console.log(response); +}); \ No newline at end of file diff --git a/src/targets/javascript/jquery/fixtures/jsonObj-multiline.js b/src/targets/javascript/jquery/fixtures/jsonObj-multiline.js new file mode 100644 index 000000000..2a830b2fd --- /dev/null +++ b/src/targets/javascript/jquery/fixtures/jsonObj-multiline.js @@ -0,0 +1,15 @@ +const settings = { + async: true, + crossDomain: true, + url: 'http://mockbin.com/har', + method: 'POST', + headers: { + 'content-type': 'application/json' + }, + processData: false, + data: '{\n "foo": "bar"\n}' +}; + +$.ajax(settings).done(function (response) { + console.log(response); +}); \ No newline at end of file diff --git a/src/targets/javascript/jquery/fixtures/jsonObj-null-value.js b/src/targets/javascript/jquery/fixtures/jsonObj-null-value.js new file mode 100644 index 000000000..967553fca --- /dev/null +++ b/src/targets/javascript/jquery/fixtures/jsonObj-null-value.js @@ -0,0 +1,15 @@ +const settings = { + async: true, + crossDomain: true, + url: 'http://mockbin.com/har', + method: 'POST', + headers: { + 'content-type': 'application/json' + }, + processData: false, + data: '{"foo":null}' +}; + +$.ajax(settings).done(function (response) { + console.log(response); +}); \ No newline at end of file diff --git a/src/targets/javascript/jquery/fixtures/multipart-data.js b/src/targets/javascript/jquery/fixtures/multipart-data.js new file mode 100644 index 000000000..060cd0c7b --- /dev/null +++ b/src/targets/javascript/jquery/fixtures/multipart-data.js @@ -0,0 +1,18 @@ +const form = new FormData(); +form.append('foo', 'Hello World'); + +const settings = { + async: true, + crossDomain: true, + url: 'http://mockbin.com/har', + method: 'POST', + headers: {}, + processData: false, + contentType: false, + mimeType: 'multipart/form-data', + data: form +}; + +$.ajax(settings).done(function (response) { + console.log(response); +}); \ No newline at end of file diff --git a/src/targets/javascript/jquery/fixtures/multipart-file.js b/src/targets/javascript/jquery/fixtures/multipart-file.js new file mode 100644 index 000000000..eb51a1f2f --- /dev/null +++ b/src/targets/javascript/jquery/fixtures/multipart-file.js @@ -0,0 +1,18 @@ +const form = new FormData(); +form.append('foo', 'test/fixtures/files/hello.txt'); + +const settings = { + async: true, + crossDomain: true, + url: 'http://mockbin.com/har', + method: 'POST', + headers: {}, + processData: false, + contentType: false, + mimeType: 'multipart/form-data', + data: form +}; + +$.ajax(settings).done(function (response) { + console.log(response); +}); \ No newline at end of file diff --git a/src/targets/javascript/jquery/fixtures/multipart-form-data.js b/src/targets/javascript/jquery/fixtures/multipart-form-data.js new file mode 100644 index 000000000..fb464d5de --- /dev/null +++ b/src/targets/javascript/jquery/fixtures/multipart-form-data.js @@ -0,0 +1,18 @@ +const form = new FormData(); +form.append('foo', 'bar'); + +const settings = { + async: true, + crossDomain: true, + url: 'http://mockbin.com/har', + method: 'POST', + headers: {}, + processData: false, + contentType: false, + mimeType: 'multipart/form-data', + data: form +}; + +$.ajax(settings).done(function (response) { + console.log(response); +}); \ No newline at end of file diff --git a/src/targets/javascript/jquery/fixtures/nested.js b/src/targets/javascript/jquery/fixtures/nested.js new file mode 100644 index 000000000..4a8ead252 --- /dev/null +++ b/src/targets/javascript/jquery/fixtures/nested.js @@ -0,0 +1,11 @@ +const settings = { + async: true, + crossDomain: true, + url: 'http://mockbin.com/har?foo%5Bbar%5D=baz%2Czap&fiz=buz&key=value', + method: 'GET', + headers: {} +}; + +$.ajax(settings).done(function (response) { + console.log(response); +}); \ No newline at end of file diff --git a/src/targets/javascript/jquery/fixtures/query.js b/src/targets/javascript/jquery/fixtures/query.js new file mode 100644 index 000000000..7acd7fdab --- /dev/null +++ b/src/targets/javascript/jquery/fixtures/query.js @@ -0,0 +1,11 @@ +const settings = { + async: true, + crossDomain: true, + url: 'http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value', + method: 'GET', + headers: {} +}; + +$.ajax(settings).done(function (response) { + console.log(response); +}); \ No newline at end of file diff --git a/src/targets/javascript/jquery/fixtures/short.js b/src/targets/javascript/jquery/fixtures/short.js new file mode 100644 index 000000000..ff48984dc --- /dev/null +++ b/src/targets/javascript/jquery/fixtures/short.js @@ -0,0 +1,11 @@ +const settings = { + async: true, + crossDomain: true, + url: 'http://mockbin.com/har', + method: 'GET', + headers: {} +}; + +$.ajax(settings).done(function (response) { + console.log(response); +}); \ No newline at end of file diff --git a/src/targets/javascript/jquery/fixtures/text-plain.js b/src/targets/javascript/jquery/fixtures/text-plain.js new file mode 100644 index 000000000..a554fa9c3 --- /dev/null +++ b/src/targets/javascript/jquery/fixtures/text-plain.js @@ -0,0 +1,14 @@ +const settings = { + async: true, + crossDomain: true, + url: 'http://mockbin.com/har', + method: 'POST', + headers: { + 'content-type': 'text/plain' + }, + data: 'Hello World' +}; + +$.ajax(settings).done(function (response) { + console.log(response); +}); \ No newline at end of file diff --git a/src/targets/javascript/target.ts b/src/targets/javascript/target.ts new file mode 100644 index 000000000..be851d0cf --- /dev/null +++ b/src/targets/javascript/target.ts @@ -0,0 +1,21 @@ +import { Target } from '../targets'; +import { axios } from './axios/client'; +import { fetch } from './fetch/client'; +import { jquery } from './jquery/client'; +import { xhr } from './xhr/client'; + +export const javascript: Target = { + info: { + key: 'javascript', + title: 'JavaScript', + extname: '.js', + default: 'xhr', + }, + + clientsById: { + xhr, + axios, + fetch, + jquery, + }, +}; diff --git a/src/targets/javascript/xhr.js b/src/targets/javascript/xhr.js deleted file mode 100644 index 2ae503806..000000000 --- a/src/targets/javascript/xhr.js +++ /dev/null @@ -1,82 +0,0 @@ -/** - * @description - * HTTP code snippet generator for native XMLHttpRequest - * - * @author - * @AhmadNassri - * - * for any questions or issues regarding the generated code snippet, please open an issue mentioning the author. - */ - -'use strict' - -const CodeBuilder = require('../../helpers/code-builder') -const helpers = require('../../helpers/headers') - -module.exports = function (source, options) { - const opts = Object.assign({ - indent: ' ', - cors: true - }, options) - - const code = new CodeBuilder(opts.indent) - - switch (source.postData.mimeType) { - case 'application/json': - code.push('const data = JSON.stringify(%s);', JSON.stringify(source.postData.jsonObj, null, opts.indent)) - .push(null) - break - - case 'multipart/form-data': - code.push('const data = new FormData();') - - source.postData.params.forEach(function (param) { - code.push('data.append(%s, %s);', JSON.stringify(param.name), JSON.stringify(param.value || param.fileName || '')) - }) - - // remove the contentType header - if (helpers.hasHeader(source.allHeaders, 'content-type')) { - if (helpers.getHeader(source.allHeaders, 'content-type').indexOf('boundary')) { - delete source.allHeaders[helpers.getHeaderName(source.allHeaders, 'content-type')] - } - } - - code.blank() - break - - default: - code.push('const data = %s;', JSON.stringify(source.postData.text || null)) - .blank() - } - - code.push('const xhr = new XMLHttpRequest();') - - if (opts.cors) { - code.push('xhr.withCredentials = true;') - } - - code.blank() - .push('xhr.addEventListener("readystatechange", function () {') - .push(1, 'if (this.readyState === this.DONE) {') - .push(2, 'console.log(this.responseText);') - .push(1, '}') - .push('});') - .blank() - .push('xhr.open(%s, %s);', JSON.stringify(source.method), JSON.stringify(source.fullUrl)) - - Object.keys(source.allHeaders).forEach(function (key) { - code.push('xhr.setRequestHeader(%s, %s);', JSON.stringify(key), JSON.stringify(source.allHeaders[key])) - }) - - code.blank() - .push('xhr.send(data);') - - return code.join() -} - -module.exports.info = { - key: 'xhr', - title: 'XMLHttpRequest', - link: 'https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest', - description: 'W3C Standard API that provides scripted client functionality' -} diff --git a/src/targets/javascript/xhr/client.test.ts b/src/targets/javascript/xhr/client.test.ts new file mode 100644 index 000000000..a735f724c --- /dev/null +++ b/src/targets/javascript/xhr/client.test.ts @@ -0,0 +1,18 @@ +import request from '../../../fixtures/requests/short.json'; +import { runCustomFixtures } from '../../../fixtures/runCustomFixtures'; +import { Request } from '../../../httpsnippet'; + +runCustomFixtures({ + targetId: 'javascript', + clientId: 'xhr', + tests: [ + { + it: 'should not use cors', + input: request as Request, + options: { + cors: false, + }, + expected: 'cors.js', + }, + ], +}); diff --git a/src/targets/javascript/xhr/client.ts b/src/targets/javascript/xhr/client.ts new file mode 100644 index 000000000..4d05ffd1d --- /dev/null +++ b/src/targets/javascript/xhr/client.ts @@ -0,0 +1,96 @@ +/** + * @description + * HTTP code snippet generator for native XMLHttpRequest + * + * @author + * @AhmadNassri + * + * for any questions or issues regarding the generated code snippet, please open an issue mentioning the author. + */ + +import stringifyObject from 'stringify-object'; + +import { CodeBuilder } from '../../../helpers/code-builder'; +import { getHeader, getHeaderName, hasHeader } from '../../../helpers/headers'; +import { Client } from '../../targets'; + +export interface XhrOptions { + cors?: boolean; +} + +export const xhr: Client = { + info: { + key: 'xhr', + title: 'XMLHttpRequest', + link: 'https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest', + description: 'W3C Standard API that provides scripted client functionality', + }, + convert: ({ postData, allHeaders, method, fullUrl }, options) => { + const opts = { + indent: ' ', + cors: true, + ...options, + }; + + const { blank, push, join } = new CodeBuilder({ indent: opts.indent }); + + switch (postData.mimeType) { + case 'application/json': + push( + `const data = JSON.stringify(${stringifyObject(postData.jsonObj, { + indent: opts.indent, + })});`, + ); + blank(); + break; + + case 'multipart/form-data': + push('const data = new FormData();'); + + postData.params?.forEach(param => { + push(`data.append('${param.name}', '${param.value || param.fileName || ''}');`); + }); + + // remove the contentType header + if (hasHeader(allHeaders, 'content-type')) { + if (getHeader(allHeaders, 'content-type')?.includes('boundary')) { + const headerName = getHeaderName(allHeaders, 'content-type'); + if (headerName) { + delete allHeaders[headerName]; + } + } + } + + blank(); + break; + + default: + push(`const data = ${postData.text ? `'${postData.text}'` : 'null'};`); + blank(); + } + + push('const xhr = new XMLHttpRequest();'); + + if (opts.cors) { + push('xhr.withCredentials = true;'); + } + + blank(); + push("xhr.addEventListener('readystatechange', function () {"); + push('if (this.readyState === this.DONE) {', 1); + push('console.log(this.responseText);', 2); + push('}', 1); + push('});'); + blank(); + push(`xhr.open('${method}', '${fullUrl}');`); + + Object.keys(allHeaders).forEach(key => { + push(`xhr.setRequestHeader('${key}', '${allHeaders[key]}');`); + }); + + blank(); + push('xhr.send(data);'); + + return join(); + }, +}; diff --git a/src/targets/javascript/xhr/fixtures/application-form-encoded.js b/src/targets/javascript/xhr/fixtures/application-form-encoded.js new file mode 100644 index 000000000..faf2554e1 --- /dev/null +++ b/src/targets/javascript/xhr/fixtures/application-form-encoded.js @@ -0,0 +1,15 @@ +const data = 'foo=bar&hello=world'; + +const xhr = new XMLHttpRequest(); +xhr.withCredentials = true; + +xhr.addEventListener('readystatechange', function () { + if (this.readyState === this.DONE) { + console.log(this.responseText); + } +}); + +xhr.open('POST', 'http://mockbin.com/har'); +xhr.setRequestHeader('content-type', 'application/x-www-form-urlencoded'); + +xhr.send(data); \ No newline at end of file diff --git a/src/targets/javascript/xhr/fixtures/application-json.js b/src/targets/javascript/xhr/fixtures/application-json.js new file mode 100644 index 000000000..09eeeb57d --- /dev/null +++ b/src/targets/javascript/xhr/fixtures/application-json.js @@ -0,0 +1,34 @@ +const data = JSON.stringify({ + number: 1, + string: 'f"oo', + arr: [ + 1, + 2, + 3 + ], + nested: { + a: 'b' + }, + arr_mix: [ + 1, + 'a', + { + arr_mix_nested: {} + } + ], + boolean: false +}); + +const xhr = new XMLHttpRequest(); +xhr.withCredentials = true; + +xhr.addEventListener('readystatechange', function () { + if (this.readyState === this.DONE) { + console.log(this.responseText); + } +}); + +xhr.open('POST', 'http://mockbin.com/har'); +xhr.setRequestHeader('content-type', 'application/json'); + +xhr.send(data); \ No newline at end of file diff --git a/test/fixtures/output/javascript/xhr/nested.js b/src/targets/javascript/xhr/fixtures/cookies.js similarity index 50% rename from test/fixtures/output/javascript/xhr/nested.js rename to src/targets/javascript/xhr/fixtures/cookies.js index 6660e830d..355786516 100644 --- a/test/fixtures/output/javascript/xhr/nested.js +++ b/src/targets/javascript/xhr/fixtures/cookies.js @@ -3,12 +3,13 @@ const data = null; const xhr = new XMLHttpRequest(); xhr.withCredentials = true; -xhr.addEventListener("readystatechange", function () { +xhr.addEventListener('readystatechange', function () { if (this.readyState === this.DONE) { console.log(this.responseText); } }); -xhr.open("GET", "http://mockbin.com/har?foo%5Bbar%5D=baz%2Czap&fiz=buz&key=value"); +xhr.open('POST', 'http://mockbin.com/har'); +xhr.setRequestHeader('cookie', 'foo=bar; bar=baz'); -xhr.send(data); +xhr.send(data); \ No newline at end of file diff --git a/src/targets/javascript/xhr/fixtures/cors.js b/src/targets/javascript/xhr/fixtures/cors.js new file mode 100644 index 000000000..ab38d8537 --- /dev/null +++ b/src/targets/javascript/xhr/fixtures/cors.js @@ -0,0 +1,13 @@ +const data = null; + +const xhr = new XMLHttpRequest(); + +xhr.addEventListener('readystatechange', function () { + if (this.readyState === this.DONE) { + console.log(this.responseText); + } +}); + +xhr.open('GET', 'http://mockbin.com/har'); + +xhr.send(data); \ No newline at end of file diff --git a/test/fixtures/output/javascript/xhr/custom-method.js b/src/targets/javascript/xhr/fixtures/custom-method.js similarity index 58% rename from test/fixtures/output/javascript/xhr/custom-method.js rename to src/targets/javascript/xhr/fixtures/custom-method.js index 40c589237..8bb04fdec 100644 --- a/test/fixtures/output/javascript/xhr/custom-method.js +++ b/src/targets/javascript/xhr/fixtures/custom-method.js @@ -3,12 +3,12 @@ const data = null; const xhr = new XMLHttpRequest(); xhr.withCredentials = true; -xhr.addEventListener("readystatechange", function () { +xhr.addEventListener('readystatechange', function () { if (this.readyState === this.DONE) { console.log(this.responseText); } }); -xhr.open("PROPFIND", "http://mockbin.com/har"); +xhr.open('PROPFIND', 'http://mockbin.com/har'); -xhr.send(data); +xhr.send(data); \ No newline at end of file diff --git a/src/targets/javascript/xhr/fixtures/full.js b/src/targets/javascript/xhr/fixtures/full.js new file mode 100644 index 000000000..2d752d9e4 --- /dev/null +++ b/src/targets/javascript/xhr/fixtures/full.js @@ -0,0 +1,17 @@ +const data = 'foo=bar'; + +const xhr = new XMLHttpRequest(); +xhr.withCredentials = true; + +xhr.addEventListener('readystatechange', function () { + if (this.readyState === this.DONE) { + console.log(this.responseText); + } +}); + +xhr.open('POST', 'http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value'); +xhr.setRequestHeader('cookie', 'foo=bar; bar=baz'); +xhr.setRequestHeader('accept', 'application/json'); +xhr.setRequestHeader('content-type', 'application/x-www-form-urlencoded'); + +xhr.send(data); \ No newline at end of file diff --git a/src/targets/javascript/xhr/fixtures/headers.js b/src/targets/javascript/xhr/fixtures/headers.js new file mode 100644 index 000000000..51fa3cb86 --- /dev/null +++ b/src/targets/javascript/xhr/fixtures/headers.js @@ -0,0 +1,16 @@ +const data = null; + +const xhr = new XMLHttpRequest(); +xhr.withCredentials = true; + +xhr.addEventListener('readystatechange', function () { + if (this.readyState === this.DONE) { + console.log(this.responseText); + } +}); + +xhr.open('GET', 'http://mockbin.com/har'); +xhr.setRequestHeader('accept', 'application/json'); +xhr.setRequestHeader('x-foo', 'Bar'); + +xhr.send(data); \ No newline at end of file diff --git a/test/fixtures/output/javascript/xhr/https.js b/src/targets/javascript/xhr/fixtures/https.js similarity index 59% rename from test/fixtures/output/javascript/xhr/https.js rename to src/targets/javascript/xhr/fixtures/https.js index 0d5ce6b2b..b9fae1829 100644 --- a/test/fixtures/output/javascript/xhr/https.js +++ b/src/targets/javascript/xhr/fixtures/https.js @@ -3,12 +3,12 @@ const data = null; const xhr = new XMLHttpRequest(); xhr.withCredentials = true; -xhr.addEventListener("readystatechange", function () { +xhr.addEventListener('readystatechange', function () { if (this.readyState === this.DONE) { console.log(this.responseText); } }); -xhr.open("GET", "https://mockbin.com/har"); +xhr.open('GET', 'https://mockbin.com/har'); -xhr.send(data); +xhr.send(data); \ No newline at end of file diff --git a/src/targets/javascript/xhr/fixtures/jsonObj-multiline.js b/src/targets/javascript/xhr/fixtures/jsonObj-multiline.js new file mode 100644 index 000000000..41b0159e6 --- /dev/null +++ b/src/targets/javascript/xhr/fixtures/jsonObj-multiline.js @@ -0,0 +1,17 @@ +const data = JSON.stringify({ + foo: 'bar' +}); + +const xhr = new XMLHttpRequest(); +xhr.withCredentials = true; + +xhr.addEventListener('readystatechange', function () { + if (this.readyState === this.DONE) { + console.log(this.responseText); + } +}); + +xhr.open('POST', 'http://mockbin.com/har'); +xhr.setRequestHeader('content-type', 'application/json'); + +xhr.send(data); \ No newline at end of file diff --git a/src/targets/javascript/xhr/fixtures/jsonObj-null-value.js b/src/targets/javascript/xhr/fixtures/jsonObj-null-value.js new file mode 100644 index 000000000..7f0a34e34 --- /dev/null +++ b/src/targets/javascript/xhr/fixtures/jsonObj-null-value.js @@ -0,0 +1,17 @@ +const data = JSON.stringify({ + foo: null +}); + +const xhr = new XMLHttpRequest(); +xhr.withCredentials = true; + +xhr.addEventListener('readystatechange', function () { + if (this.readyState === this.DONE) { + console.log(this.responseText); + } +}); + +xhr.open('POST', 'http://mockbin.com/har'); +xhr.setRequestHeader('content-type', 'application/json'); + +xhr.send(data); \ No newline at end of file diff --git a/test/fixtures/output/javascript/xhr/multipart-data.js b/src/targets/javascript/xhr/fixtures/multipart-data.js similarity index 54% rename from test/fixtures/output/javascript/xhr/multipart-data.js rename to src/targets/javascript/xhr/fixtures/multipart-data.js index 5753015f5..f3cbf0686 100644 --- a/test/fixtures/output/javascript/xhr/multipart-data.js +++ b/src/targets/javascript/xhr/fixtures/multipart-data.js @@ -1,15 +1,15 @@ const data = new FormData(); -data.append("foo", "Hello World"); +data.append('foo', 'Hello World'); const xhr = new XMLHttpRequest(); xhr.withCredentials = true; -xhr.addEventListener("readystatechange", function () { +xhr.addEventListener('readystatechange', function () { if (this.readyState === this.DONE) { console.log(this.responseText); } }); -xhr.open("POST", "http://mockbin.com/har"); +xhr.open('POST', 'http://mockbin.com/har'); -xhr.send(data); +xhr.send(data); \ No newline at end of file diff --git a/test/fixtures/output/javascript/xhr/multipart-file.js b/src/targets/javascript/xhr/fixtures/multipart-file.js similarity index 51% rename from test/fixtures/output/javascript/xhr/multipart-file.js rename to src/targets/javascript/xhr/fixtures/multipart-file.js index 44d80da5b..1b13a6ae9 100644 --- a/test/fixtures/output/javascript/xhr/multipart-file.js +++ b/src/targets/javascript/xhr/fixtures/multipart-file.js @@ -1,15 +1,15 @@ const data = new FormData(); -data.append("foo", "test/fixtures/files/hello.txt"); +data.append('foo', 'test/fixtures/files/hello.txt'); const xhr = new XMLHttpRequest(); xhr.withCredentials = true; -xhr.addEventListener("readystatechange", function () { +xhr.addEventListener('readystatechange', function () { if (this.readyState === this.DONE) { console.log(this.responseText); } }); -xhr.open("POST", "http://mockbin.com/har"); +xhr.open('POST', 'http://mockbin.com/har'); -xhr.send(data); +xhr.send(data); \ No newline at end of file diff --git a/test/fixtures/output/javascript/xhr/multipart-form-data.js b/src/targets/javascript/xhr/fixtures/multipart-form-data.js similarity index 55% rename from test/fixtures/output/javascript/xhr/multipart-form-data.js rename to src/targets/javascript/xhr/fixtures/multipart-form-data.js index 32e25edb3..8ef7e219b 100644 --- a/test/fixtures/output/javascript/xhr/multipart-form-data.js +++ b/src/targets/javascript/xhr/fixtures/multipart-form-data.js @@ -1,15 +1,15 @@ const data = new FormData(); -data.append("foo", "bar"); +data.append('foo', 'bar'); const xhr = new XMLHttpRequest(); xhr.withCredentials = true; -xhr.addEventListener("readystatechange", function () { +xhr.addEventListener('readystatechange', function () { if (this.readyState === this.DONE) { console.log(this.responseText); } }); -xhr.open("POST", "http://mockbin.com/har"); +xhr.open('POST', 'http://mockbin.com/har'); -xhr.send(data); +xhr.send(data); \ No newline at end of file diff --git a/src/targets/javascript/xhr/fixtures/nested.js b/src/targets/javascript/xhr/fixtures/nested.js new file mode 100644 index 000000000..b4170a350 --- /dev/null +++ b/src/targets/javascript/xhr/fixtures/nested.js @@ -0,0 +1,14 @@ +const data = null; + +const xhr = new XMLHttpRequest(); +xhr.withCredentials = true; + +xhr.addEventListener('readystatechange', function () { + if (this.readyState === this.DONE) { + console.log(this.responseText); + } +}); + +xhr.open('GET', 'http://mockbin.com/har?foo%5Bbar%5D=baz%2Czap&fiz=buz&key=value'); + +xhr.send(data); \ No newline at end of file diff --git a/test/fixtures/output/javascript/xhr/query.js b/src/targets/javascript/xhr/fixtures/query.js similarity index 53% rename from test/fixtures/output/javascript/xhr/query.js rename to src/targets/javascript/xhr/fixtures/query.js index f620f6b37..5d07b9a2e 100644 --- a/test/fixtures/output/javascript/xhr/query.js +++ b/src/targets/javascript/xhr/fixtures/query.js @@ -3,12 +3,12 @@ const data = null; const xhr = new XMLHttpRequest(); xhr.withCredentials = true; -xhr.addEventListener("readystatechange", function () { +xhr.addEventListener('readystatechange', function () { if (this.readyState === this.DONE) { console.log(this.responseText); } }); -xhr.open("GET", "http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value"); +xhr.open('GET', 'http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value'); -xhr.send(data); +xhr.send(data); \ No newline at end of file diff --git a/test/fixtures/output/javascript/xhr/short.js b/src/targets/javascript/xhr/fixtures/short.js similarity index 59% rename from test/fixtures/output/javascript/xhr/short.js rename to src/targets/javascript/xhr/fixtures/short.js index 0993af510..b71d237cd 100644 --- a/test/fixtures/output/javascript/xhr/short.js +++ b/src/targets/javascript/xhr/fixtures/short.js @@ -3,12 +3,12 @@ const data = null; const xhr = new XMLHttpRequest(); xhr.withCredentials = true; -xhr.addEventListener("readystatechange", function () { +xhr.addEventListener('readystatechange', function () { if (this.readyState === this.DONE) { console.log(this.responseText); } }); -xhr.open("GET", "http://mockbin.com/har"); +xhr.open('GET', 'http://mockbin.com/har'); -xhr.send(data); +xhr.send(data); \ No newline at end of file diff --git a/src/targets/javascript/xhr/fixtures/text-plain.js b/src/targets/javascript/xhr/fixtures/text-plain.js new file mode 100644 index 000000000..a7872edef --- /dev/null +++ b/src/targets/javascript/xhr/fixtures/text-plain.js @@ -0,0 +1,15 @@ +const data = 'Hello World'; + +const xhr = new XMLHttpRequest(); +xhr.withCredentials = true; + +xhr.addEventListener('readystatechange', function () { + if (this.readyState === this.DONE) { + console.log(this.responseText); + } +}); + +xhr.open('POST', 'http://mockbin.com/har'); +xhr.setRequestHeader('content-type', 'text/plain'); + +xhr.send(data); \ No newline at end of file diff --git a/src/targets/kotlin/index.js b/src/targets/kotlin/index.js deleted file mode 100644 index fd9fbd698..000000000 --- a/src/targets/kotlin/index.js +++ /dev/null @@ -1,12 +0,0 @@ -'use strict' - -module.exports = { - info: { - key: 'kotlin', - title: 'Kotlin', - extname: '.kt', - default: 'okhttp' - }, - - okhttp: require('./okhttp') -} diff --git a/src/targets/kotlin/okhttp.js b/src/targets/kotlin/okhttp.js deleted file mode 100644 index 8c1390524..000000000 --- a/src/targets/kotlin/okhttp.js +++ /dev/null @@ -1,78 +0,0 @@ -/** - * @description - * HTTP code snippet generator for Kotlin using OkHttp. - * - * @author - * @seanghay - * - * for any questions or issues regarding the generated code snippet, please open an issue mentioning the author. - */ - -'use strict' - -const CodeBuilder = require('../../helpers/code-builder') - -module.exports = function (source, options) { - const opts = Object.assign({ - indent: ' ' - }, options) - - const code = new CodeBuilder(opts.indent) - - const methods = ['GET', 'POST', 'PUT', 'DELETE', 'PATCH', 'HEAD'] - - const methodsWithBody = ['POST', 'PUT', 'DELETE', 'PATCH'] - - code.push('val client = OkHttpClient()') - .blank() - - if (source.postData.text) { - if (source.postData.boundary) { - code.push('val mediaType = MediaType.parse("%s; boundary=%s")', source.postData.mimeType, source.postData.boundary) - } else { - code.push('val mediaType = MediaType.parse("%s")', source.postData.mimeType) - } - code.push('val body = RequestBody.create(mediaType, %s)', JSON.stringify(source.postData.text)) - } - - code.push('val request = Request.Builder()') - code.push(1, '.url("%s")', source.fullUrl) - if (methods.indexOf(source.method.toUpperCase()) === -1) { - if (source.postData.text) { - code.push(1, '.method("%s", body)', source.method.toUpperCase()) - } else { - code.push(1, '.method("%s", null)', source.method.toUpperCase()) - } - } else if (methodsWithBody.indexOf(source.method.toUpperCase()) >= 0) { - if (source.postData.text) { - code.push(1, '.%s(body)', source.method.toLowerCase()) - } else { - code.push(1, '.%s(null)', source.method.toLowerCase()) - } - } else { - code.push(1, '.%s()', source.method.toLowerCase()) - } - - // Add headers, including the cookies - const headers = Object.keys(source.allHeaders) - - // construct headers - if (headers.length) { - headers.forEach(function (key) { - code.push(1, '.addHeader("%s", "%s")', key, source.allHeaders[key]) - }) - } - - code.push(1, '.build()') - .blank() - .push('val response = client.newCall(request).execute()') - - return code.join() -} - -module.exports.info = { - key: 'okhttp', - title: 'OkHttp', - link: 'http://square.github.io/okhttp/', - description: 'An HTTP Request Client Library' -} diff --git a/src/targets/kotlin/okhttp/client.ts b/src/targets/kotlin/okhttp/client.ts new file mode 100644 index 000000000..d33c94eb0 --- /dev/null +++ b/src/targets/kotlin/okhttp/client.ts @@ -0,0 +1,75 @@ +/** + * @description + * HTTP code snippet generator for Kotlin using OkHttp. + * + * @author + * @seanghay + * + * for any questions or issues regarding the generated code snippet, please open an issue mentioning the author. + */ + +import { CodeBuilder } from '../../../helpers/code-builder'; +import { Client } from '../../targets'; + +export const okhttp: Client = { + info: { + key: 'okhttp', + title: 'OkHttp', + link: 'http://square.github.io/okhttp/', + description: 'An HTTP Request Client Library', + }, + convert: ({ postData, fullUrl, method, allHeaders }, options) => { + const opts = { + indent: ' ', + ...options, + }; + const { blank, join, push } = new CodeBuilder({ indent: opts.indent }); + + const methods = ['GET', 'POST', 'PUT', 'DELETE', 'PATCH', 'HEAD']; + + const methodsWithBody = ['POST', 'PUT', 'DELETE', 'PATCH']; + + push('val client = OkHttpClient()'); + blank(); + + if (postData.text) { + if (postData.boundary) { + push( + `val mediaType = MediaType.parse("${postData.mimeType}; boundary=${postData.boundary}")`, + ); + } else { + push(`val mediaType = MediaType.parse("${postData.mimeType}")`); + } + push(`val body = RequestBody.create(mediaType, ${JSON.stringify(postData.text)})`); + } + + push('val request = Request.Builder()'); + push(`.url("${fullUrl}")`, 1); + if (!methods.includes(method.toUpperCase())) { + if (postData.text) { + push(`.method("${method.toUpperCase()}", body)`, 1); + } else { + push(`.method("${method.toUpperCase()}", null)`, 1); + } + } else if (methodsWithBody.includes(method.toUpperCase())) { + if (postData.text) { + push(`.${method.toLowerCase()}(body)`, 1); + } else { + push(`.${method.toLowerCase()}(null)`, 1); + } + } else { + push(`.${method.toLowerCase()}()`, 1); + } + + // Add headers, including the cookies + Object.keys(allHeaders).forEach(key => { + push(`.addHeader("${key}", "${allHeaders[key]}")`, 1); + }); + + push('.build()', 1); + blank(); + push('val response = client.newCall(request).execute()'); + + return join(); + }, +}; diff --git a/test/fixtures/output/kotlin/okhttp/application-form-encoded.kt b/src/targets/kotlin/okhttp/fixtures/application-form-encoded.kt similarity index 86% rename from test/fixtures/output/kotlin/okhttp/application-form-encoded.kt rename to src/targets/kotlin/okhttp/fixtures/application-form-encoded.kt index 4cf107205..f9c67ad7a 100644 --- a/test/fixtures/output/kotlin/okhttp/application-form-encoded.kt +++ b/src/targets/kotlin/okhttp/fixtures/application-form-encoded.kt @@ -8,4 +8,4 @@ val request = Request.Builder() .addHeader("content-type", "application/x-www-form-urlencoded") .build() -val response = client.newCall(request).execute() +val response = client.newCall(request).execute() \ No newline at end of file diff --git a/test/fixtures/output/kotlin/okhttp/application-json.kt b/src/targets/kotlin/okhttp/fixtures/application-json.kt similarity index 89% rename from test/fixtures/output/kotlin/okhttp/application-json.kt rename to src/targets/kotlin/okhttp/fixtures/application-json.kt index 3775021f2..6313417e0 100644 --- a/test/fixtures/output/kotlin/okhttp/application-json.kt +++ b/src/targets/kotlin/okhttp/fixtures/application-json.kt @@ -8,4 +8,4 @@ val request = Request.Builder() .addHeader("content-type", "application/json") .build() -val response = client.newCall(request).execute() +val response = client.newCall(request).execute() \ No newline at end of file diff --git a/test/fixtures/output/kotlin/okhttp/cookies.kt b/src/targets/kotlin/okhttp/fixtures/cookies.kt similarity index 76% rename from test/fixtures/output/kotlin/okhttp/cookies.kt rename to src/targets/kotlin/okhttp/fixtures/cookies.kt index b20ba0c16..ce5b1a50b 100644 --- a/test/fixtures/output/kotlin/okhttp/cookies.kt +++ b/src/targets/kotlin/okhttp/fixtures/cookies.kt @@ -6,4 +6,4 @@ val request = Request.Builder() .addHeader("cookie", "foo=bar; bar=baz") .build() -val response = client.newCall(request).execute() +val response = client.newCall(request).execute() \ No newline at end of file diff --git a/test/fixtures/output/kotlin/okhttp/custom-method.kt b/src/targets/kotlin/okhttp/fixtures/custom-method.kt similarity index 73% rename from test/fixtures/output/kotlin/okhttp/custom-method.kt rename to src/targets/kotlin/okhttp/fixtures/custom-method.kt index 662995244..5f76a12c3 100644 --- a/test/fixtures/output/kotlin/okhttp/custom-method.kt +++ b/src/targets/kotlin/okhttp/fixtures/custom-method.kt @@ -5,4 +5,4 @@ val request = Request.Builder() .method("PROPFIND", null) .build() -val response = client.newCall(request).execute() +val response = client.newCall(request).execute() \ No newline at end of file diff --git a/test/fixtures/output/kotlin/okhttp/full.kt b/src/targets/kotlin/okhttp/fixtures/full.kt similarity index 89% rename from test/fixtures/output/kotlin/okhttp/full.kt rename to src/targets/kotlin/okhttp/fixtures/full.kt index ad7e8bd5e..25f89f998 100644 --- a/test/fixtures/output/kotlin/okhttp/full.kt +++ b/src/targets/kotlin/okhttp/fixtures/full.kt @@ -10,4 +10,4 @@ val request = Request.Builder() .addHeader("content-type", "application/x-www-form-urlencoded") .build() -val response = client.newCall(request).execute() +val response = client.newCall(request).execute() \ No newline at end of file diff --git a/test/fixtures/output/kotlin/okhttp/headers.kt b/src/targets/kotlin/okhttp/fixtures/headers.kt similarity index 79% rename from test/fixtures/output/kotlin/okhttp/headers.kt rename to src/targets/kotlin/okhttp/fixtures/headers.kt index 780e5800c..00390b005 100644 --- a/test/fixtures/output/kotlin/okhttp/headers.kt +++ b/src/targets/kotlin/okhttp/fixtures/headers.kt @@ -7,4 +7,4 @@ val request = Request.Builder() .addHeader("x-foo", "Bar") .build() -val response = client.newCall(request).execute() +val response = client.newCall(request).execute() \ No newline at end of file diff --git a/test/fixtures/output/kotlin/okhttp/https.kt b/src/targets/kotlin/okhttp/fixtures/https.kt similarity index 70% rename from test/fixtures/output/kotlin/okhttp/https.kt rename to src/targets/kotlin/okhttp/fixtures/https.kt index a2d2244d4..57759a565 100644 --- a/test/fixtures/output/kotlin/okhttp/https.kt +++ b/src/targets/kotlin/okhttp/fixtures/https.kt @@ -5,4 +5,4 @@ val request = Request.Builder() .get() .build() -val response = client.newCall(request).execute() +val response = client.newCall(request).execute() \ No newline at end of file diff --git a/test/fixtures/output/kotlin/okhttp/jsonObj-multiline.kt b/src/targets/kotlin/okhttp/fixtures/jsonObj-multiline.kt similarity index 85% rename from test/fixtures/output/kotlin/okhttp/jsonObj-multiline.kt rename to src/targets/kotlin/okhttp/fixtures/jsonObj-multiline.kt index 15d47ee1e..4389b02f3 100644 --- a/test/fixtures/output/kotlin/okhttp/jsonObj-multiline.kt +++ b/src/targets/kotlin/okhttp/fixtures/jsonObj-multiline.kt @@ -8,4 +8,4 @@ val request = Request.Builder() .addHeader("content-type", "application/json") .build() -val response = client.newCall(request).execute() +val response = client.newCall(request).execute() \ No newline at end of file diff --git a/test/fixtures/output/kotlin/okhttp/jsonObj-null-value.kt b/src/targets/kotlin/okhttp/fixtures/jsonObj-null-value.kt similarity index 85% rename from test/fixtures/output/kotlin/okhttp/jsonObj-null-value.kt rename to src/targets/kotlin/okhttp/fixtures/jsonObj-null-value.kt index b44121533..8686625b4 100644 --- a/test/fixtures/output/kotlin/okhttp/jsonObj-null-value.kt +++ b/src/targets/kotlin/okhttp/fixtures/jsonObj-null-value.kt @@ -8,4 +8,4 @@ val request = Request.Builder() .addHeader("content-type", "application/json") .build() -val response = client.newCall(request).execute() +val response = client.newCall(request).execute() \ No newline at end of file diff --git a/test/fixtures/output/kotlin/okhttp/multipart-data.kt b/src/targets/kotlin/okhttp/fixtures/multipart-data.kt similarity index 91% rename from test/fixtures/output/kotlin/okhttp/multipart-data.kt rename to src/targets/kotlin/okhttp/fixtures/multipart-data.kt index 7e742e811..4036b4eac 100644 --- a/test/fixtures/output/kotlin/okhttp/multipart-data.kt +++ b/src/targets/kotlin/okhttp/fixtures/multipart-data.kt @@ -8,4 +8,4 @@ val request = Request.Builder() .addHeader("content-type", "multipart/form-data; boundary=---011000010111000001101001") .build() -val response = client.newCall(request).execute() +val response = client.newCall(request).execute() \ No newline at end of file diff --git a/test/fixtures/output/kotlin/okhttp/multipart-file.kt b/src/targets/kotlin/okhttp/fixtures/multipart-file.kt similarity index 91% rename from test/fixtures/output/kotlin/okhttp/multipart-file.kt rename to src/targets/kotlin/okhttp/fixtures/multipart-file.kt index 0673c9116..09818129d 100644 --- a/test/fixtures/output/kotlin/okhttp/multipart-file.kt +++ b/src/targets/kotlin/okhttp/fixtures/multipart-file.kt @@ -8,4 +8,4 @@ val request = Request.Builder() .addHeader("content-type", "multipart/form-data; boundary=---011000010111000001101001") .build() -val response = client.newCall(request).execute() +val response = client.newCall(request).execute() \ No newline at end of file diff --git a/test/fixtures/output/kotlin/okhttp/multipart-form-data.kt b/src/targets/kotlin/okhttp/fixtures/multipart-form-data.kt similarity index 90% rename from test/fixtures/output/kotlin/okhttp/multipart-form-data.kt rename to src/targets/kotlin/okhttp/fixtures/multipart-form-data.kt index 4148c7865..f8ce11a57 100644 --- a/test/fixtures/output/kotlin/okhttp/multipart-form-data.kt +++ b/src/targets/kotlin/okhttp/fixtures/multipart-form-data.kt @@ -8,4 +8,4 @@ val request = Request.Builder() .addHeader("Content-Type", "multipart/form-data; boundary=---011000010111000001101001") .build() -val response = client.newCall(request).execute() +val response = client.newCall(request).execute() \ No newline at end of file diff --git a/test/fixtures/output/kotlin/okhttp/nested.kt b/src/targets/kotlin/okhttp/fixtures/nested.kt similarity index 76% rename from test/fixtures/output/kotlin/okhttp/nested.kt rename to src/targets/kotlin/okhttp/fixtures/nested.kt index b7439ff71..5e947bf90 100644 --- a/test/fixtures/output/kotlin/okhttp/nested.kt +++ b/src/targets/kotlin/okhttp/fixtures/nested.kt @@ -5,4 +5,4 @@ val request = Request.Builder() .get() .build() -val response = client.newCall(request).execute() +val response = client.newCall(request).execute() \ No newline at end of file diff --git a/test/fixtures/output/kotlin/okhttp/query.kt b/src/targets/kotlin/okhttp/fixtures/query.kt similarity index 75% rename from test/fixtures/output/kotlin/okhttp/query.kt rename to src/targets/kotlin/okhttp/fixtures/query.kt index 798a81017..fd992a631 100644 --- a/test/fixtures/output/kotlin/okhttp/query.kt +++ b/src/targets/kotlin/okhttp/fixtures/query.kt @@ -5,4 +5,4 @@ val request = Request.Builder() .get() .build() -val response = client.newCall(request).execute() +val response = client.newCall(request).execute() \ No newline at end of file diff --git a/test/fixtures/output/kotlin/okhttp/short.kt b/src/targets/kotlin/okhttp/fixtures/short.kt similarity index 70% rename from test/fixtures/output/kotlin/okhttp/short.kt rename to src/targets/kotlin/okhttp/fixtures/short.kt index e728d71a7..8cf1ead7a 100644 --- a/test/fixtures/output/kotlin/okhttp/short.kt +++ b/src/targets/kotlin/okhttp/fixtures/short.kt @@ -5,4 +5,4 @@ val request = Request.Builder() .get() .build() -val response = client.newCall(request).execute() +val response = client.newCall(request).execute() \ No newline at end of file diff --git a/test/fixtures/output/kotlin/okhttp/text-plain.kt b/src/targets/kotlin/okhttp/fixtures/text-plain.kt similarity index 84% rename from test/fixtures/output/kotlin/okhttp/text-plain.kt rename to src/targets/kotlin/okhttp/fixtures/text-plain.kt index bf85b0fa6..ca6c24edc 100644 --- a/test/fixtures/output/kotlin/okhttp/text-plain.kt +++ b/src/targets/kotlin/okhttp/fixtures/text-plain.kt @@ -8,4 +8,4 @@ val request = Request.Builder() .addHeader("content-type", "text/plain") .build() -val response = client.newCall(request).execute() +val response = client.newCall(request).execute() \ No newline at end of file diff --git a/src/targets/kotlin/target.ts b/src/targets/kotlin/target.ts new file mode 100644 index 000000000..d90548b0f --- /dev/null +++ b/src/targets/kotlin/target.ts @@ -0,0 +1,14 @@ +import { Target } from '../targets'; +import { okhttp } from './okhttp/client'; + +export const kotlin: Target = { + info: { + key: 'kotlin', + title: 'Kotlin', + extname: '.kt', + default: 'okhttp', + }, + clientsById: { + okhttp, + }, +}; diff --git a/src/targets/node/axios.js b/src/targets/node/axios.js deleted file mode 100644 index 92387de8b..000000000 --- a/src/targets/node/axios.js +++ /dev/null @@ -1,73 +0,0 @@ -/** - * @description - * HTTP code snippet generator for Javascript & Node.js using Axios. - * - * @author - * @rohit-gohri - * - * for any questions or issues regarding the generated code snippet, please open an issue mentioning the author. - */ -'use strict' - -const util = require('util') -const stringifyObject = require('stringify-object') -const CodeBuilder = require('../../helpers/code-builder') - -module.exports = function (source, options) { - const opts = Object.assign({ - indent: ' ' - }, options) - - const code = new CodeBuilder(opts.indent) - - code.push('var axios = require("axios").default;') - .blank() - - const reqOpts = { - method: source.method, - url: source.url - } - - if (Object.keys(source.queryObj).length) { - reqOpts.params = source.queryObj - } - - if (Object.keys(source.allHeaders).length) { - reqOpts.headers = source.allHeaders - } - - switch (source.postData.mimeType) { - case 'application/x-www-form-urlencoded': - reqOpts.data = source.postData.paramsObj - break - - case 'application/json': - if (source.postData.jsonObj) { - reqOpts.data = source.postData.jsonObj - } - break - - default: - if (source.postData.text) { - reqOpts.data = source.postData.text - } - } - - code.push('var options = %s;', stringifyObject(reqOpts, { indent: ' ', inlineCharacterLimit: 80 })) - .blank() - - code.push(util.format('axios.request(options).then(%s', 'function (response) {')) - .push(1, 'console.log(response.data);') - .push('}).catch(%s', 'function (error) {') - .push(1, 'console.error(error);') - .push('});') - - return code.join() -} - -module.exports.info = { - key: 'axios', - title: 'Axios', - link: 'https://github.com/axios/axios', - description: 'Promise based HTTP client for the browser and node.js' -} diff --git a/src/targets/node/axios/client.ts b/src/targets/node/axios/client.ts new file mode 100644 index 000000000..447f86d00 --- /dev/null +++ b/src/targets/node/axios/client.ts @@ -0,0 +1,79 @@ +/** + * @description + * HTTP code snippet generator for Javascript & Node.js using Axios. + * + * @author + * @rohit-gohri + * + * for any questions or issues regarding the generated code snippet, please open an issue mentioning the author. + */ + +import stringifyObject from 'stringify-object'; + +import { CodeBuilder } from '../../../helpers/code-builder'; +import { Client } from '../../targets'; + +export const axios: Client = { + info: { + key: 'axios', + title: 'Axios', + link: 'https://github.com/axios/axios', + description: 'Promise based HTTP client for the browser and node.js', + }, + convert: ({ method, url, queryObj, allHeaders, postData }, options) => { + const opts = { + indent: ' ', + ...options, + }; + + const { blank, join, push } = new CodeBuilder({ indent: opts.indent }); + + push("var axios = require('axios').default;"); + blank(); + + const reqOpts: Record = { + method, + url, + }; + + if (Object.keys(queryObj).length) { + reqOpts.params = queryObj; + } + + if (Object.keys(allHeaders).length) { + reqOpts.headers = allHeaders; + } + + switch (postData.mimeType) { + case 'application/x-www-form-urlencoded': + reqOpts.data = postData.paramsObj; + break; + + case 'application/json': + if (postData.jsonObj) { + reqOpts.data = postData.jsonObj; + } + break; + + default: + if (postData.text) { + reqOpts.data = postData.text; + } + } + + const stringifiedOptions = stringifyObject(reqOpts, { indent: ' ', inlineCharacterLimit: 80 }); + push(`var options = ${stringifiedOptions};`); + blank(); + + push('axios'); + push('.request(options)', 1); + push('.then(function (response) {', 1); + push('console.log(response.data);', 2); + push('})', 1); + push('.catch(function (error) {', 1); + push('console.error(error);', 2); + push('});', 1); + + return join(); + }, +}; diff --git a/src/targets/node/axios/fixtures/application-form-encoded.js b/src/targets/node/axios/fixtures/application-form-encoded.js new file mode 100644 index 000000000..f3c3f7b8c --- /dev/null +++ b/src/targets/node/axios/fixtures/application-form-encoded.js @@ -0,0 +1,17 @@ +var axios = require('axios').default; + +var options = { + method: 'POST', + url: 'http://mockbin.com/har', + headers: {'content-type': 'application/x-www-form-urlencoded'}, + data: {foo: 'bar', hello: 'world'} +}; + +axios + .request(options) + .then(function (response) { + console.log(response.data); + }) + .catch(function (error) { + console.error(error); + }); \ No newline at end of file diff --git a/test/fixtures/output/node/axios/application-json.js b/src/targets/node/axios/fixtures/application-json.js similarity index 59% rename from test/fixtures/output/node/axios/application-json.js rename to src/targets/node/axios/fixtures/application-json.js index 277a20c55..21537a2ec 100644 --- a/test/fixtures/output/node/axios/application-json.js +++ b/src/targets/node/axios/fixtures/application-json.js @@ -1,4 +1,4 @@ -var axios = require("axios").default; +var axios = require('axios').default; var options = { method: 'POST', @@ -14,8 +14,11 @@ var options = { } }; -axios.request(options).then(function (response) { - console.log(response.data); -}).catch(function (error) { - console.error(error); -}); +axios + .request(options) + .then(function (response) { + console.log(response.data); + }) + .catch(function (error) { + console.error(error); + }); \ No newline at end of file diff --git a/src/targets/node/axios/fixtures/cookies.js b/src/targets/node/axios/fixtures/cookies.js new file mode 100644 index 000000000..ecd462913 --- /dev/null +++ b/src/targets/node/axios/fixtures/cookies.js @@ -0,0 +1,16 @@ +var axios = require('axios').default; + +var options = { + method: 'POST', + url: 'http://mockbin.com/har', + headers: {cookie: 'foo=bar; bar=baz'} +}; + +axios + .request(options) + .then(function (response) { + console.log(response.data); + }) + .catch(function (error) { + console.error(error); + }); \ No newline at end of file diff --git a/src/targets/node/axios/fixtures/custom-method.js b/src/targets/node/axios/fixtures/custom-method.js new file mode 100644 index 000000000..1c9bdbd9e --- /dev/null +++ b/src/targets/node/axios/fixtures/custom-method.js @@ -0,0 +1,12 @@ +var axios = require('axios').default; + +var options = {method: 'PROPFIND', url: 'http://mockbin.com/har'}; + +axios + .request(options) + .then(function (response) { + console.log(response.data); + }) + .catch(function (error) { + console.error(error); + }); \ No newline at end of file diff --git a/test/fixtures/output/node/axios/full.js b/src/targets/node/axios/fixtures/full.js similarity index 60% rename from test/fixtures/output/node/axios/full.js rename to src/targets/node/axios/fixtures/full.js index 9a5a70ff2..c5ec422f2 100644 --- a/test/fixtures/output/node/axios/full.js +++ b/src/targets/node/axios/fixtures/full.js @@ -1,4 +1,4 @@ -var axios = require("axios").default; +var axios = require('axios').default; var options = { method: 'POST', @@ -12,8 +12,11 @@ var options = { data: {foo: 'bar'} }; -axios.request(options).then(function (response) { - console.log(response.data); -}).catch(function (error) { - console.error(error); -}); +axios + .request(options) + .then(function (response) { + console.log(response.data); + }) + .catch(function (error) { + console.error(error); + }); \ No newline at end of file diff --git a/src/targets/node/axios/fixtures/headers.js b/src/targets/node/axios/fixtures/headers.js new file mode 100644 index 000000000..2cda7bca6 --- /dev/null +++ b/src/targets/node/axios/fixtures/headers.js @@ -0,0 +1,16 @@ +var axios = require('axios').default; + +var options = { + method: 'GET', + url: 'http://mockbin.com/har', + headers: {accept: 'application/json', 'x-foo': 'Bar'} +}; + +axios + .request(options) + .then(function (response) { + console.log(response.data); + }) + .catch(function (error) { + console.error(error); + }); \ No newline at end of file diff --git a/src/targets/node/axios/fixtures/https.js b/src/targets/node/axios/fixtures/https.js new file mode 100644 index 000000000..85222520a --- /dev/null +++ b/src/targets/node/axios/fixtures/https.js @@ -0,0 +1,12 @@ +var axios = require('axios').default; + +var options = {method: 'GET', url: 'https://mockbin.com/har'}; + +axios + .request(options) + .then(function (response) { + console.log(response.data); + }) + .catch(function (error) { + console.error(error); + }); \ No newline at end of file diff --git a/src/targets/node/axios/fixtures/jsonObj-multiline.js b/src/targets/node/axios/fixtures/jsonObj-multiline.js new file mode 100644 index 000000000..0f8421245 --- /dev/null +++ b/src/targets/node/axios/fixtures/jsonObj-multiline.js @@ -0,0 +1,17 @@ +var axios = require('axios').default; + +var options = { + method: 'POST', + url: 'http://mockbin.com/har', + headers: {'content-type': 'application/json'}, + data: {foo: 'bar'} +}; + +axios + .request(options) + .then(function (response) { + console.log(response.data); + }) + .catch(function (error) { + console.error(error); + }); \ No newline at end of file diff --git a/src/targets/node/axios/fixtures/jsonObj-null-value.js b/src/targets/node/axios/fixtures/jsonObj-null-value.js new file mode 100644 index 000000000..b2a5b0079 --- /dev/null +++ b/src/targets/node/axios/fixtures/jsonObj-null-value.js @@ -0,0 +1,17 @@ +var axios = require('axios').default; + +var options = { + method: 'POST', + url: 'http://mockbin.com/har', + headers: {'content-type': 'application/json'}, + data: {foo: null} +}; + +axios + .request(options) + .then(function (response) { + console.log(response.data); + }) + .catch(function (error) { + console.error(error); + }); \ No newline at end of file diff --git a/test/fixtures/output/node/axios/multipart-data.js b/src/targets/node/axios/fixtures/multipart-data.js similarity index 65% rename from test/fixtures/output/node/axios/multipart-data.js rename to src/targets/node/axios/fixtures/multipart-data.js index 691141cb7..f404bd482 100644 --- a/test/fixtures/output/node/axios/multipart-data.js +++ b/src/targets/node/axios/fixtures/multipart-data.js @@ -1,4 +1,4 @@ -var axios = require("axios").default; +var axios = require('axios').default; var options = { method: 'POST', @@ -7,8 +7,11 @@ var options = { data: '-----011000010111000001101001\r\nContent-Disposition: form-data; name="foo"; filename="hello.txt"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001--\r\n' }; -axios.request(options).then(function (response) { - console.log(response.data); -}).catch(function (error) { - console.error(error); -}); +axios + .request(options) + .then(function (response) { + console.log(response.data); + }) + .catch(function (error) { + console.error(error); + }); \ No newline at end of file diff --git a/test/fixtures/output/node/axios/multipart-file.js b/src/targets/node/axios/fixtures/multipart-file.js similarity index 64% rename from test/fixtures/output/node/axios/multipart-file.js rename to src/targets/node/axios/fixtures/multipart-file.js index 41d487c5a..952c3ffe2 100644 --- a/test/fixtures/output/node/axios/multipart-file.js +++ b/src/targets/node/axios/fixtures/multipart-file.js @@ -1,4 +1,4 @@ -var axios = require("axios").default; +var axios = require('axios').default; var options = { method: 'POST', @@ -7,8 +7,11 @@ var options = { data: '-----011000010111000001101001\r\nContent-Disposition: form-data; name="foo"; filename="hello.txt"\r\nContent-Type: text/plain\r\n\r\n\r\n-----011000010111000001101001--\r\n' }; -axios.request(options).then(function (response) { - console.log(response.data); -}).catch(function (error) { - console.error(error); -}); +axios + .request(options) + .then(function (response) { + console.log(response.data); + }) + .catch(function (error) { + console.error(error); + }); \ No newline at end of file diff --git a/test/fixtures/output/node/axios/multipart-form-data.js b/src/targets/node/axios/fixtures/multipart-form-data.js similarity index 61% rename from test/fixtures/output/node/axios/multipart-form-data.js rename to src/targets/node/axios/fixtures/multipart-form-data.js index d0ee89517..fead63ca8 100644 --- a/test/fixtures/output/node/axios/multipart-form-data.js +++ b/src/targets/node/axios/fixtures/multipart-form-data.js @@ -1,4 +1,4 @@ -var axios = require("axios").default; +var axios = require('axios').default; var options = { method: 'POST', @@ -7,8 +7,11 @@ var options = { data: '-----011000010111000001101001\r\nContent-Disposition: form-data; name="foo"\r\n\r\nbar\r\n-----011000010111000001101001--\r\n' }; -axios.request(options).then(function (response) { - console.log(response.data); -}).catch(function (error) { - console.error(error); -}); +axios + .request(options) + .then(function (response) { + console.log(response.data); + }) + .catch(function (error) { + console.error(error); + }); \ No newline at end of file diff --git a/src/targets/node/axios/fixtures/nested.js b/src/targets/node/axios/fixtures/nested.js new file mode 100644 index 000000000..40c90c897 --- /dev/null +++ b/src/targets/node/axios/fixtures/nested.js @@ -0,0 +1,16 @@ +var axios = require('axios').default; + +var options = { + method: 'GET', + url: 'http://mockbin.com/har', + params: {'foo[bar]': 'baz,zap', fiz: 'buz', key: 'value'} +}; + +axios + .request(options) + .then(function (response) { + console.log(response.data); + }) + .catch(function (error) { + console.error(error); + }); \ No newline at end of file diff --git a/src/targets/node/axios/fixtures/query.js b/src/targets/node/axios/fixtures/query.js new file mode 100644 index 000000000..2e179c485 --- /dev/null +++ b/src/targets/node/axios/fixtures/query.js @@ -0,0 +1,16 @@ +var axios = require('axios').default; + +var options = { + method: 'GET', + url: 'http://mockbin.com/har', + params: {foo: ['bar', 'baz'], baz: 'abc', key: 'value'} +}; + +axios + .request(options) + .then(function (response) { + console.log(response.data); + }) + .catch(function (error) { + console.error(error); + }); \ No newline at end of file diff --git a/src/targets/node/axios/fixtures/short.js b/src/targets/node/axios/fixtures/short.js new file mode 100644 index 000000000..0ba525826 --- /dev/null +++ b/src/targets/node/axios/fixtures/short.js @@ -0,0 +1,12 @@ +var axios = require('axios').default; + +var options = {method: 'GET', url: 'http://mockbin.com/har'}; + +axios + .request(options) + .then(function (response) { + console.log(response.data); + }) + .catch(function (error) { + console.error(error); + }); \ No newline at end of file diff --git a/src/targets/node/axios/fixtures/text-plain.js b/src/targets/node/axios/fixtures/text-plain.js new file mode 100644 index 000000000..348ff885c --- /dev/null +++ b/src/targets/node/axios/fixtures/text-plain.js @@ -0,0 +1,17 @@ +var axios = require('axios').default; + +var options = { + method: 'POST', + url: 'http://mockbin.com/har', + headers: {'content-type': 'text/plain'}, + data: 'Hello World' +}; + +axios + .request(options) + .then(function (response) { + console.log(response.data); + }) + .catch(function (error) { + console.error(error); + }); \ No newline at end of file diff --git a/src/targets/node/fetch.js b/src/targets/node/fetch.js deleted file mode 100644 index 971d81774..000000000 --- a/src/targets/node/fetch.js +++ /dev/null @@ -1,118 +0,0 @@ -/** - * @description - * HTTP code snippet generator for Node.js using node-fetch. - * - * @author - * @hirenoble - * - * for any questions or issues regarding the generated code snippet, please open an issue mentioning the author. - */ - -'use strict' - -const stringifyObject = require('stringify-object') -const CodeBuilder = require('../../helpers/code-builder') - -module.exports = function (source, options) { - const opts = Object.assign({ - indent: ' ' - }, options) - - let includeFS = false - const code = new CodeBuilder(opts.indent) - - code.push('const fetch = require(\'node-fetch\');') - const url = source.fullUrl - const reqOpts = { - method: source.method - } - - if (Object.keys(source.headersObj).length) { - reqOpts.headers = source.headersObj - } - - switch (source.postData.mimeType) { - case 'application/x-www-form-urlencoded': - code.unshift('const { URLSearchParams } = require(\'url\');') - code.push('const encodedParams = new URLSearchParams();') - code.blank() - - source.postData.params.forEach(function (param) { - code.push('encodedParams.set(\'' + param.name + '\', \'' + param.value + '\');') - }) - - reqOpts.body = 'encodedParams' - break - - case 'application/json': - if (source.postData.jsonObj) { - reqOpts.body = JSON.stringify(source.postData.jsonObj) - } - break - - case 'multipart/form-data': - code.unshift('const FormData = require(\'form-data\');') - code.push('const formData = new FormData();') - code.blank() - - source.postData.params.forEach(function (param) { - if (!param.fileName && !param.fileName && !param.contentType) { - code.push('formData.append(\'' + param.name + '\', \'' + param.value + '\');') - return - } - - if (param.fileName) { - includeFS = true - code.push('formData.append(\'' + param.name + '\', fs.createReadStream(\'' + param.fileName + '\'));') - } - }) - break - - default: - if (source.postData.text) { - reqOpts.body = source.postData.text - } - } - - // construct cookies argument - if (source.cookies.length) { - let cookies = '' - source.cookies.forEach(function (cookie) { - cookies = cookies + encodeURIComponent(cookie.name) + '=' + encodeURIComponent(cookie.value) + '; ' - }) - if (reqOpts.headers) { - reqOpts.headers.cookie = cookies - } else { - reqOpts.headers = {} - reqOpts.headers.cookie = cookies - } - } - code.blank() - code.push('let url = \'' + url + '\';') - .blank() - code.push('let options = %s;', stringifyObject(reqOpts, { indent: ' ', inlineCharacterLimit: 80 })) - .blank() - - if (includeFS) { - code.unshift('const fs = require(\'fs\');') - } - if (source.postData.mimeType === 'multipart/form-data') { - code.push('options.body = formData;') - .blank() - } - code.push('fetch(url, options)') - .push(1, '.then(res => res.json())') - .push(1, '.then(json => console.log(json))') - .push(1, '.catch(err => console.error(\'error:\' + err));') - - return code.join() - .replace(/'encodedParams'/, 'encodedParams') - .replace(/"fs\.createReadStream\(\\"(.+)\\"\)"/, 'fs.createReadStream("$1")') -} - -module.exports.info = { - key: 'fetch', - title: 'Fetch', - link: 'https://github.com/bitinn/node-fetch', - description: 'Simplified HTTP node-fetch client' -} diff --git a/src/targets/node/fetch/client.ts b/src/targets/node/fetch/client.ts new file mode 100644 index 000000000..8973c0be3 --- /dev/null +++ b/src/targets/node/fetch/client.ts @@ -0,0 +1,121 @@ +/** + * @description + * HTTP code snippet generator for Node.js using node-fetch. + * + * @author + * @hirenoble + * + * for any questions or issues regarding the generated code snippet, please open an issue mentioning the author. + */ + +import stringifyObject from 'stringify-object'; + +import { CodeBuilder } from '../../../helpers/code-builder'; +import { Client } from '../../targets'; + +export const fetch: Client = { + info: { + key: 'fetch', + title: 'Fetch', + link: 'https://github.com/bitinn/node-fetch', + description: 'Simplified HTTP node-fetch client', + }, + convert: ({ method, fullUrl, postData, headersObj, cookies }, options) => { + const opts = { + indent: ' ', + ...options, + }; + + let includeFS = false; + const { blank, push, join, unshift } = new CodeBuilder({ indent: opts.indent }); + + push("const fetch = require('node-fetch');"); + const url = fullUrl; + const reqOpts: Record = { + method, + }; + + if (Object.keys(headersObj).length) { + reqOpts.headers = headersObj; + } + + switch (postData.mimeType) { + case 'application/x-www-form-urlencoded': + unshift("const { URLSearchParams } = require('url');"); + push('const encodedParams = new URLSearchParams();'); + blank(); + + postData.params?.forEach(param => { + push(`encodedParams.set('${param.name}', '${param.value}');`); + }); + + reqOpts.body = 'encodedParams'; + break; + + case 'application/json': + if (postData.jsonObj) { + reqOpts.body = JSON.stringify(postData.jsonObj); + } + break; + + case 'multipart/form-data': + unshift("const FormData = require('form-data');"); + push('const formData = new FormData();'); + blank(); + + postData.params?.forEach(param => { + if (!param.fileName && !param.fileName && !param.contentType) { + push(`formData.append('${param.name}', '${param.value}');`); + return; + } + + if (param.fileName) { + includeFS = true; + push(`formData.append('${param.name}', fs.createReadStream('${param.fileName}'));`); + } + }); + break; + + default: + if (postData.text) { + reqOpts.body = postData.text; + } + } + + // construct cookies argument + if (cookies.length) { + const cookiesString = cookies + .map(cookie => `${encodeURIComponent(cookie.name)}=${encodeURIComponent(cookie.value)}; `) + .join(''); + if (reqOpts.headers) { + reqOpts.headers.cookie = cookiesString; + } else { + reqOpts.headers = {}; + reqOpts.headers.cookie = cookiesString; + } + } + blank(); + push(`let url = '${url}';`); + blank(); + + const stringifiedOptions = stringifyObject(reqOpts, { indent: ' ', inlineCharacterLimit: 80 }); + push(`let options = ${stringifiedOptions};`); + blank(); + + if (includeFS) { + unshift("const fs = require('fs');"); + } + if (postData.mimeType === 'multipart/form-data') { + push('options.body = formData;'); + blank(); + } + push('fetch(url, options)'); + push('.then(res => res.json())', 1); + push('.then(json => console.log(json))', 1); + push(".catch(err => console.error('error:' + err));", 1); + + return join() + .replace(/'encodedParams'/, 'encodedParams') + .replace(/"fs\.createReadStream\(\\"(.+)\\"\)"/, 'fs.createReadStream("$1")'); + }, +}; diff --git a/test/fixtures/output/node/fetch/application-form-encoded.js b/src/targets/node/fetch/fixtures/application-form-encoded.js similarity index 90% rename from test/fixtures/output/node/fetch/application-form-encoded.js rename to src/targets/node/fetch/fixtures/application-form-encoded.js index 8271d9110..c1e9754bd 100644 --- a/test/fixtures/output/node/fetch/application-form-encoded.js +++ b/src/targets/node/fetch/fixtures/application-form-encoded.js @@ -16,4 +16,4 @@ let options = { fetch(url, options) .then(res => res.json()) .then(json => console.log(json)) - .catch(err => console.error('error:' + err)); + .catch(err => console.error('error:' + err)); \ No newline at end of file diff --git a/test/fixtures/output/node/fetch/application-json.js b/src/targets/node/fetch/fixtures/application-json.js similarity index 88% rename from test/fixtures/output/node/fetch/application-json.js rename to src/targets/node/fetch/fixtures/application-json.js index 618d55e99..c880f9af5 100644 --- a/test/fixtures/output/node/fetch/application-json.js +++ b/src/targets/node/fetch/fixtures/application-json.js @@ -11,4 +11,4 @@ let options = { fetch(url, options) .then(res => res.json()) .then(json => console.log(json)) - .catch(err => console.error('error:' + err)); + .catch(err => console.error('error:' + err)); \ No newline at end of file diff --git a/test/fixtures/output/node/fetch/cookies.js b/src/targets/node/fetch/fixtures/cookies.js similarity index 82% rename from test/fixtures/output/node/fetch/cookies.js rename to src/targets/node/fetch/fixtures/cookies.js index b24beaad1..e0e04dcce 100644 --- a/test/fixtures/output/node/fetch/cookies.js +++ b/src/targets/node/fetch/fixtures/cookies.js @@ -7,4 +7,4 @@ let options = {method: 'POST', headers: {cookie: 'foo=bar; bar=baz; '}}; fetch(url, options) .then(res => res.json()) .then(json => console.log(json)) - .catch(err => console.error('error:' + err)); + .catch(err => console.error('error:' + err)); \ No newline at end of file diff --git a/test/fixtures/output/node/fetch/custom-method.js b/src/targets/node/fetch/fixtures/custom-method.js similarity index 80% rename from test/fixtures/output/node/fetch/custom-method.js rename to src/targets/node/fetch/fixtures/custom-method.js index 195f83dc3..f926782dc 100644 --- a/test/fixtures/output/node/fetch/custom-method.js +++ b/src/targets/node/fetch/fixtures/custom-method.js @@ -7,4 +7,4 @@ let options = {method: 'PROPFIND'}; fetch(url, options) .then(res => res.json()) .then(json => console.log(json)) - .catch(err => console.error('error:' + err)); + .catch(err => console.error('error:' + err)); \ No newline at end of file diff --git a/test/fixtures/output/node/fetch/full.js b/src/targets/node/fetch/fixtures/full.js similarity index 91% rename from test/fixtures/output/node/fetch/full.js rename to src/targets/node/fetch/fixtures/full.js index 655e28d78..9d1eb9574 100644 --- a/test/fixtures/output/node/fetch/full.js +++ b/src/targets/node/fetch/fixtures/full.js @@ -19,4 +19,4 @@ let options = { fetch(url, options) .then(res => res.json()) .then(json => console.log(json)) - .catch(err => console.error('error:' + err)); + .catch(err => console.error('error:' + err)); \ No newline at end of file diff --git a/test/fixtures/output/node/fetch/headers.js b/src/targets/node/fetch/fixtures/headers.js similarity index 83% rename from test/fixtures/output/node/fetch/headers.js rename to src/targets/node/fetch/fixtures/headers.js index 7fa29488b..ff5f9e99f 100644 --- a/test/fixtures/output/node/fetch/headers.js +++ b/src/targets/node/fetch/fixtures/headers.js @@ -7,4 +7,4 @@ let options = {method: 'GET', headers: {accept: 'application/json', 'x-foo': 'Ba fetch(url, options) .then(res => res.json()) .then(json => console.log(json)) - .catch(err => console.error('error:' + err)); + .catch(err => console.error('error:' + err)); \ No newline at end of file diff --git a/test/fixtures/output/node/fetch/https.js b/src/targets/node/fetch/fixtures/https.js similarity index 79% rename from test/fixtures/output/node/fetch/https.js rename to src/targets/node/fetch/fixtures/https.js index 608306631..d11af05b3 100644 --- a/test/fixtures/output/node/fetch/https.js +++ b/src/targets/node/fetch/fixtures/https.js @@ -7,4 +7,4 @@ let options = {method: 'GET'}; fetch(url, options) .then(res => res.json()) .then(json => console.log(json)) - .catch(err => console.error('error:' + err)); + .catch(err => console.error('error:' + err)); \ No newline at end of file diff --git a/test/fixtures/output/node/fetch/jsonObj-multiline.js b/src/targets/node/fetch/fixtures/jsonObj-multiline.js similarity index 84% rename from test/fixtures/output/node/fetch/jsonObj-multiline.js rename to src/targets/node/fetch/fixtures/jsonObj-multiline.js index b3bac3894..7c03370e1 100644 --- a/test/fixtures/output/node/fetch/jsonObj-multiline.js +++ b/src/targets/node/fetch/fixtures/jsonObj-multiline.js @@ -11,4 +11,4 @@ let options = { fetch(url, options) .then(res => res.json()) .then(json => console.log(json)) - .catch(err => console.error('error:' + err)); + .catch(err => console.error('error:' + err)); \ No newline at end of file diff --git a/test/fixtures/output/node/fetch/jsonObj-null-value.js b/src/targets/node/fetch/fixtures/jsonObj-null-value.js similarity index 84% rename from test/fixtures/output/node/fetch/jsonObj-null-value.js rename to src/targets/node/fetch/fixtures/jsonObj-null-value.js index d61ec0ec1..4bef31d21 100644 --- a/test/fixtures/output/node/fetch/jsonObj-null-value.js +++ b/src/targets/node/fetch/fixtures/jsonObj-null-value.js @@ -11,4 +11,4 @@ let options = { fetch(url, options) .then(res => res.json()) .then(json => console.log(json)) - .catch(err => console.error('error:' + err)); + .catch(err => console.error('error:' + err)); \ No newline at end of file diff --git a/test/fixtures/output/node/fetch/multipart-data.js b/src/targets/node/fetch/fixtures/multipart-data.js similarity index 90% rename from test/fixtures/output/node/fetch/multipart-data.js rename to src/targets/node/fetch/fixtures/multipart-data.js index fe1b41778..2188ecbf0 100644 --- a/test/fixtures/output/node/fetch/multipart-data.js +++ b/src/targets/node/fetch/fixtures/multipart-data.js @@ -17,4 +17,4 @@ options.body = formData; fetch(url, options) .then(res => res.json()) .then(json => console.log(json)) - .catch(err => console.error('error:' + err)); + .catch(err => console.error('error:' + err)); \ No newline at end of file diff --git a/test/fixtures/output/node/fetch/multipart-file.js b/src/targets/node/fetch/fixtures/multipart-file.js similarity index 91% rename from test/fixtures/output/node/fetch/multipart-file.js rename to src/targets/node/fetch/fixtures/multipart-file.js index 8d5a7657c..daff46620 100644 --- a/test/fixtures/output/node/fetch/multipart-file.js +++ b/src/targets/node/fetch/fixtures/multipart-file.js @@ -17,4 +17,4 @@ options.body = formData; fetch(url, options) .then(res => res.json()) .then(json => console.log(json)) - .catch(err => console.error('error:' + err)); + .catch(err => console.error('error:' + err)); \ No newline at end of file diff --git a/test/fixtures/output/node/fetch/multipart-form-data.js b/src/targets/node/fetch/fixtures/multipart-form-data.js similarity index 89% rename from test/fixtures/output/node/fetch/multipart-form-data.js rename to src/targets/node/fetch/fixtures/multipart-form-data.js index 7b14bfe99..0a5aeaf8d 100644 --- a/test/fixtures/output/node/fetch/multipart-form-data.js +++ b/src/targets/node/fetch/fixtures/multipart-form-data.js @@ -16,4 +16,4 @@ options.body = formData; fetch(url, options) .then(res => res.json()) .then(json => console.log(json)) - .catch(err => console.error('error:' + err)); + .catch(err => console.error('error:' + err)); \ No newline at end of file diff --git a/test/fixtures/output/node/fetch/nested.js b/src/targets/node/fetch/fixtures/nested.js similarity index 82% rename from test/fixtures/output/node/fetch/nested.js rename to src/targets/node/fetch/fixtures/nested.js index 2976da50e..cd000e74a 100644 --- a/test/fixtures/output/node/fetch/nested.js +++ b/src/targets/node/fetch/fixtures/nested.js @@ -7,4 +7,4 @@ let options = {method: 'GET'}; fetch(url, options) .then(res => res.json()) .then(json => console.log(json)) - .catch(err => console.error('error:' + err)); + .catch(err => console.error('error:' + err)); \ No newline at end of file diff --git a/test/fixtures/output/node/fetch/query.js b/src/targets/node/fetch/fixtures/query.js similarity index 82% rename from test/fixtures/output/node/fetch/query.js rename to src/targets/node/fetch/fixtures/query.js index eb6b866d5..2af8b39fd 100644 --- a/test/fixtures/output/node/fetch/query.js +++ b/src/targets/node/fetch/fixtures/query.js @@ -7,4 +7,4 @@ let options = {method: 'GET'}; fetch(url, options) .then(res => res.json()) .then(json => console.log(json)) - .catch(err => console.error('error:' + err)); + .catch(err => console.error('error:' + err)); \ No newline at end of file diff --git a/test/fixtures/output/node/fetch/short.js b/src/targets/node/fetch/fixtures/short.js similarity index 79% rename from test/fixtures/output/node/fetch/short.js rename to src/targets/node/fetch/fixtures/short.js index 4e27d88d6..f4818a35c 100644 --- a/test/fixtures/output/node/fetch/short.js +++ b/src/targets/node/fetch/fixtures/short.js @@ -7,4 +7,4 @@ let options = {method: 'GET'}; fetch(url, options) .then(res => res.json()) .then(json => console.log(json)) - .catch(err => console.error('error:' + err)); + .catch(err => console.error('error:' + err)); \ No newline at end of file diff --git a/test/fixtures/output/node/fetch/text-plain.js b/src/targets/node/fetch/fixtures/text-plain.js similarity index 84% rename from test/fixtures/output/node/fetch/text-plain.js rename to src/targets/node/fetch/fixtures/text-plain.js index 86b86249c..9b8b79d65 100644 --- a/test/fixtures/output/node/fetch/text-plain.js +++ b/src/targets/node/fetch/fixtures/text-plain.js @@ -7,4 +7,4 @@ let options = {method: 'POST', headers: {'content-type': 'text/plain'}, body: 'H fetch(url, options) .then(res => res.json()) .then(json => console.log(json)) - .catch(err => console.error('error:' + err)); + .catch(err => console.error('error:' + err)); \ No newline at end of file diff --git a/src/targets/node/index.js b/src/targets/node/index.js deleted file mode 100644 index 3942f03d5..000000000 --- a/src/targets/node/index.js +++ /dev/null @@ -1,16 +0,0 @@ -'use strict' - -module.exports = { - info: { - key: 'node', - title: 'Node.js', - extname: '.js', - default: 'native' - }, - - native: require('./native'), - request: require('./request'), - unirest: require('./unirest'), - axios: require('./axios'), - fetch: require('./fetch') -} diff --git a/src/targets/node/native.js b/src/targets/node/native.js deleted file mode 100644 index a61e63c29..000000000 --- a/src/targets/node/native.js +++ /dev/null @@ -1,86 +0,0 @@ -/** - * @description - * HTTP code snippet generator for native Node.js. - * - * @author - * @AhmadNassri - * - * for any questions or issues regarding the generated code snippet, please open an issue mentioning the author. - */ - -'use strict' - -const stringifyObject = require('stringify-object') -const CodeBuilder = require('../../helpers/code-builder') - -module.exports = function (source, options) { - const opts = Object.assign({ - indent: ' ' - }, options) - - const code = new CodeBuilder(opts.indent) - - const reqOpts = { - method: source.method, - hostname: source.uriObj.hostname, - port: source.uriObj.port, - path: source.uriObj.path, - headers: source.allHeaders - } - - code.push('const http = require("%s");', source.uriObj.protocol.replace(':', '')) - - code.blank() - .push('const options = %s;', JSON.stringify(reqOpts, null, opts.indent)) - .blank() - .push('const req = http.request(options, function (res) {') - .push(1, 'const chunks = [];') - .blank() - .push(1, 'res.on("data", function (chunk) {') - .push(2, 'chunks.push(chunk);') - .push(1, '});') - .blank() - .push(1, 'res.on("end", function () {') - .push(2, 'const body = Buffer.concat(chunks);') - .push(2, 'console.log(body.toString());') - .push(1, '});') - .push('});') - .blank() - - switch (source.postData.mimeType) { - case 'application/x-www-form-urlencoded': - if (source.postData.paramsObj) { - code.unshift('const qs = require("querystring");') - code.push('req.write(qs.stringify(%s));', stringifyObject(source.postData.paramsObj, { - indent: ' ', - inlineCharacterLimit: 80 - })) - } - break - - case 'application/json': - if (source.postData.jsonObj) { - code.push('req.write(JSON.stringify(%s));', stringifyObject(source.postData.jsonObj, { - indent: ' ', - inlineCharacterLimit: 80 - })) - } - break - - default: - if (source.postData.text) { - code.push('req.write(%s);', JSON.stringify(source.postData.text, null, opts.indent)) - } - } - - code.push('req.end();') - - return code.join() -} - -module.exports.info = { - key: 'native', - title: 'HTTP', - link: 'http://nodejs.org/api/http.html#http_http_request_options_callback', - description: 'Node.js native HTTP interface' -} diff --git a/src/targets/node/native/client.ts b/src/targets/node/native/client.ts new file mode 100644 index 000000000..845ffd39f --- /dev/null +++ b/src/targets/node/native/client.ts @@ -0,0 +1,92 @@ +/** + * @description + * HTTP code snippet generator for native Node.js. + * + * @author + * @AhmadNassri + * + * for any questions or issues regarding the generated code snippet, please open an issue mentioning the author. + */ + +import stringifyObject from 'stringify-object'; + +import { CodeBuilder } from '../../../helpers/code-builder'; +import { Client } from '../../targets'; + +export const native: Client = { + info: { + key: 'native', + title: 'HTTP', + link: 'http://nodejs.org/api/http.html#http_http_request_options_callback', + description: 'Node.js native HTTP interface', + }, + convert: ({ uriObj, method, allHeaders, postData }, options) => { + const opts = { + indent: ' ', + ...options, + }; + const { blank, join, push, unshift } = new CodeBuilder({ indent: opts.indent }); + + const reqOpts = { + method, + hostname: uriObj.hostname, + port: uriObj.port, + path: uriObj.path, + headers: allHeaders, + }; + + // @ts-expect-error TODO seems like a legit error + push(`const http = require('${uriObj.protocol.replace(':', '')}');`); + + blank(); + push(`const options = ${stringifyObject(reqOpts, { indent: opts.indent })};`); + blank(); + push('const req = http.request(options, function (res) {'); + push('const chunks = [];', 1); + blank(); + push("res.on('data', function (chunk) {", 1); + push('chunks.push(chunk);', 2); + push('});', 1); + blank(); + push("res.on('end', function () {", 1); + push('const body = Buffer.concat(chunks);', 2); + push('console.log(body.toString());', 2); + push('});', 1); + push('});'); + blank(); + + switch (postData.mimeType) { + case 'application/x-www-form-urlencoded': + if (postData.paramsObj) { + unshift("const qs = require('querystring');"); + push( + `req.write(qs.stringify(${stringifyObject(postData.paramsObj, { + indent: ' ', + inlineCharacterLimit: 80, + })}));`, + ); + } + break; + + case 'application/json': + if (postData.jsonObj) { + push( + `req.write(JSON.stringify(${stringifyObject(postData.jsonObj, { + indent: ' ', + inlineCharacterLimit: 80, + })}));`, + ); + } + break; + + default: + if (postData.text) { + push(`req.write(${stringifyObject(postData.text, { indent: opts.indent })});`); + } + } + + push('req.end();'); + + return join(); + }, +}; diff --git a/src/targets/node/native/fixtures/application-form-encoded.js b/src/targets/node/native/fixtures/application-form-encoded.js new file mode 100644 index 000000000..6b50a7418 --- /dev/null +++ b/src/targets/node/native/fixtures/application-form-encoded.js @@ -0,0 +1,28 @@ +const qs = require('querystring'); +const http = require('http'); + +const options = { + method: 'POST', + hostname: 'mockbin.com', + port: null, + path: '/har', + headers: { + 'content-type': 'application/x-www-form-urlencoded' + } +}; + +const req = http.request(options, function (res) { + const chunks = []; + + res.on('data', function (chunk) { + chunks.push(chunk); + }); + + res.on('end', function () { + const body = Buffer.concat(chunks); + console.log(body.toString()); + }); +}); + +req.write(qs.stringify({foo: 'bar', hello: 'world'})); +req.end(); \ No newline at end of file diff --git a/test/fixtures/output/node/native/application-json.js b/src/targets/node/native/fixtures/application-json.js similarity index 60% rename from test/fixtures/output/node/native/application-json.js rename to src/targets/node/native/fixtures/application-json.js index 4234fe283..dad3fb2d2 100644 --- a/test/fixtures/output/node/native/application-json.js +++ b/src/targets/node/native/fixtures/application-json.js @@ -1,23 +1,23 @@ -const http = require("http"); +const http = require('http'); const options = { - "method": "POST", - "hostname": "mockbin.com", - "port": null, - "path": "/har", - "headers": { - "content-type": "application/json" + method: 'POST', + hostname: 'mockbin.com', + port: null, + path: '/har', + headers: { + 'content-type': 'application/json' } }; const req = http.request(options, function (res) { const chunks = []; - res.on("data", function (chunk) { + res.on('data', function (chunk) { chunks.push(chunk); }); - res.on("end", function () { + res.on('end', function () { const body = Buffer.concat(chunks); console.log(body.toString()); }); @@ -31,4 +31,4 @@ req.write(JSON.stringify({ arr_mix: [1, 'a', {arr_mix_nested: {}}], boolean: false })); -req.end(); +req.end(); \ No newline at end of file diff --git a/src/targets/node/native/fixtures/cookies.js b/src/targets/node/native/fixtures/cookies.js new file mode 100644 index 000000000..a66ea950f --- /dev/null +++ b/src/targets/node/native/fixtures/cookies.js @@ -0,0 +1,26 @@ +const http = require('http'); + +const options = { + method: 'POST', + hostname: 'mockbin.com', + port: null, + path: '/har', + headers: { + cookie: 'foo=bar; bar=baz' + } +}; + +const req = http.request(options, function (res) { + const chunks = []; + + res.on('data', function (chunk) { + chunks.push(chunk); + }); + + res.on('end', function () { + const body = Buffer.concat(chunks); + console.log(body.toString()); + }); +}); + +req.end(); \ No newline at end of file diff --git a/test/fixtures/output/node/native/custom-method.js b/src/targets/node/native/fixtures/custom-method.js similarity index 50% rename from test/fixtures/output/node/native/custom-method.js rename to src/targets/node/native/fixtures/custom-method.js index 2c44fc9b7..4c15a212c 100644 --- a/test/fixtures/output/node/native/custom-method.js +++ b/src/targets/node/native/fixtures/custom-method.js @@ -1,24 +1,24 @@ -const http = require("http"); +const http = require('http'); const options = { - "method": "PROPFIND", - "hostname": "mockbin.com", - "port": null, - "path": "/har", - "headers": {} + method: 'PROPFIND', + hostname: 'mockbin.com', + port: null, + path: '/har', + headers: {} }; const req = http.request(options, function (res) { const chunks = []; - res.on("data", function (chunk) { + res.on('data', function (chunk) { chunks.push(chunk); }); - res.on("end", function () { + res.on('end', function () { const body = Buffer.concat(chunks); console.log(body.toString()); }); }); -req.end(); +req.end(); \ No newline at end of file diff --git a/src/targets/node/native/fixtures/full.js b/src/targets/node/native/fixtures/full.js new file mode 100644 index 000000000..1d50e0339 --- /dev/null +++ b/src/targets/node/native/fixtures/full.js @@ -0,0 +1,30 @@ +const qs = require('querystring'); +const http = require('http'); + +const options = { + method: 'POST', + hostname: 'mockbin.com', + port: null, + path: '/har?foo=bar&foo=baz&baz=abc&key=value', + headers: { + cookie: 'foo=bar; bar=baz', + accept: 'application/json', + 'content-type': 'application/x-www-form-urlencoded' + } +}; + +const req = http.request(options, function (res) { + const chunks = []; + + res.on('data', function (chunk) { + chunks.push(chunk); + }); + + res.on('end', function () { + const body = Buffer.concat(chunks); + console.log(body.toString()); + }); +}); + +req.write(qs.stringify({foo: 'bar'})); +req.end(); \ No newline at end of file diff --git a/src/targets/node/native/fixtures/headers.js b/src/targets/node/native/fixtures/headers.js new file mode 100644 index 000000000..475642c81 --- /dev/null +++ b/src/targets/node/native/fixtures/headers.js @@ -0,0 +1,27 @@ +const http = require('http'); + +const options = { + method: 'GET', + hostname: 'mockbin.com', + port: null, + path: '/har', + headers: { + accept: 'application/json', + 'x-foo': 'Bar' + } +}; + +const req = http.request(options, function (res) { + const chunks = []; + + res.on('data', function (chunk) { + chunks.push(chunk); + }); + + res.on('end', function () { + const body = Buffer.concat(chunks); + console.log(body.toString()); + }); +}); + +req.end(); \ No newline at end of file diff --git a/test/fixtures/output/node/native/https.js b/src/targets/node/native/fixtures/https.js similarity index 50% rename from test/fixtures/output/node/native/https.js rename to src/targets/node/native/fixtures/https.js index e6f201a23..58c472bdb 100644 --- a/test/fixtures/output/node/native/https.js +++ b/src/targets/node/native/fixtures/https.js @@ -1,24 +1,24 @@ -const http = require("https"); +const http = require('https'); const options = { - "method": "GET", - "hostname": "mockbin.com", - "port": null, - "path": "/har", - "headers": {} + method: 'GET', + hostname: 'mockbin.com', + port: null, + path: '/har', + headers: {} }; const req = http.request(options, function (res) { const chunks = []; - res.on("data", function (chunk) { + res.on('data', function (chunk) { chunks.push(chunk); }); - res.on("end", function () { + res.on('end', function () { const body = Buffer.concat(chunks); console.log(body.toString()); }); }); -req.end(); +req.end(); \ No newline at end of file diff --git a/test/fixtures/output/node/native/jsonObj-multiline.js b/src/targets/node/native/fixtures/jsonObj-multiline.js similarity index 51% rename from test/fixtures/output/node/native/jsonObj-multiline.js rename to src/targets/node/native/fixtures/jsonObj-multiline.js index 2a07d1b18..ea3f503d8 100644 --- a/test/fixtures/output/node/native/jsonObj-multiline.js +++ b/src/targets/node/native/fixtures/jsonObj-multiline.js @@ -1,27 +1,27 @@ -const http = require("http"); +const http = require('http'); const options = { - "method": "POST", - "hostname": "mockbin.com", - "port": null, - "path": "/har", - "headers": { - "content-type": "application/json" + method: 'POST', + hostname: 'mockbin.com', + port: null, + path: '/har', + headers: { + 'content-type': 'application/json' } }; const req = http.request(options, function (res) { const chunks = []; - res.on("data", function (chunk) { + res.on('data', function (chunk) { chunks.push(chunk); }); - res.on("end", function () { + res.on('end', function () { const body = Buffer.concat(chunks); console.log(body.toString()); }); }); req.write(JSON.stringify({foo: 'bar'})); -req.end(); +req.end(); \ No newline at end of file diff --git a/test/fixtures/output/node/native/jsonObj-null-value.js b/src/targets/node/native/fixtures/jsonObj-null-value.js similarity index 51% rename from test/fixtures/output/node/native/jsonObj-null-value.js rename to src/targets/node/native/fixtures/jsonObj-null-value.js index be0dad1a0..f52c2d2b4 100644 --- a/test/fixtures/output/node/native/jsonObj-null-value.js +++ b/src/targets/node/native/fixtures/jsonObj-null-value.js @@ -1,27 +1,27 @@ -const http = require("http"); +const http = require('http'); const options = { - "method": "POST", - "hostname": "mockbin.com", - "port": null, - "path": "/har", - "headers": { - "content-type": "application/json" + method: 'POST', + hostname: 'mockbin.com', + port: null, + path: '/har', + headers: { + 'content-type': 'application/json' } }; const req = http.request(options, function (res) { const chunks = []; - res.on("data", function (chunk) { + res.on('data', function (chunk) { chunks.push(chunk); }); - res.on("end", function () { + res.on('end', function () { const body = Buffer.concat(chunks); console.log(body.toString()); }); }); req.write(JSON.stringify({foo: null})); -req.end(); +req.end(); \ No newline at end of file diff --git a/src/targets/node/native/fixtures/multipart-data.js b/src/targets/node/native/fixtures/multipart-data.js new file mode 100644 index 000000000..6e95d689f --- /dev/null +++ b/src/targets/node/native/fixtures/multipart-data.js @@ -0,0 +1,27 @@ +const http = require('http'); + +const options = { + method: 'POST', + hostname: 'mockbin.com', + port: null, + path: '/har', + headers: { + 'content-type': 'multipart/form-data; boundary=---011000010111000001101001' + } +}; + +const req = http.request(options, function (res) { + const chunks = []; + + res.on('data', function (chunk) { + chunks.push(chunk); + }); + + res.on('end', function () { + const body = Buffer.concat(chunks); + console.log(body.toString()); + }); +}); + +req.write('-----011000010111000001101001\r\nContent-Disposition: form-data; name="foo"; filename="hello.txt"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001--\r\n'); +req.end(); \ No newline at end of file diff --git a/src/targets/node/native/fixtures/multipart-file.js b/src/targets/node/native/fixtures/multipart-file.js new file mode 100644 index 000000000..fdbc2d2f2 --- /dev/null +++ b/src/targets/node/native/fixtures/multipart-file.js @@ -0,0 +1,27 @@ +const http = require('http'); + +const options = { + method: 'POST', + hostname: 'mockbin.com', + port: null, + path: '/har', + headers: { + 'content-type': 'multipart/form-data; boundary=---011000010111000001101001' + } +}; + +const req = http.request(options, function (res) { + const chunks = []; + + res.on('data', function (chunk) { + chunks.push(chunk); + }); + + res.on('end', function () { + const body = Buffer.concat(chunks); + console.log(body.toString()); + }); +}); + +req.write('-----011000010111000001101001\r\nContent-Disposition: form-data; name="foo"; filename="hello.txt"\r\nContent-Type: text/plain\r\n\r\n\r\n-----011000010111000001101001--\r\n'); +req.end(); \ No newline at end of file diff --git a/src/targets/node/native/fixtures/multipart-form-data.js b/src/targets/node/native/fixtures/multipart-form-data.js new file mode 100644 index 000000000..0840ddb99 --- /dev/null +++ b/src/targets/node/native/fixtures/multipart-form-data.js @@ -0,0 +1,27 @@ +const http = require('http'); + +const options = { + method: 'POST', + hostname: 'mockbin.com', + port: null, + path: '/har', + headers: { + 'Content-Type': 'multipart/form-data; boundary=---011000010111000001101001' + } +}; + +const req = http.request(options, function (res) { + const chunks = []; + + res.on('data', function (chunk) { + chunks.push(chunk); + }); + + res.on('end', function () { + const body = Buffer.concat(chunks); + console.log(body.toString()); + }); +}); + +req.write('-----011000010111000001101001\r\nContent-Disposition: form-data; name="foo"\r\n\r\nbar\r\n-----011000010111000001101001--\r\n'); +req.end(); \ No newline at end of file diff --git a/src/targets/node/native/fixtures/nested.js b/src/targets/node/native/fixtures/nested.js new file mode 100644 index 000000000..3557ac643 --- /dev/null +++ b/src/targets/node/native/fixtures/nested.js @@ -0,0 +1,24 @@ +const http = require('http'); + +const options = { + method: 'GET', + hostname: 'mockbin.com', + port: null, + path: '/har?foo%5Bbar%5D=baz%2Czap&fiz=buz&key=value', + headers: {} +}; + +const req = http.request(options, function (res) { + const chunks = []; + + res.on('data', function (chunk) { + chunks.push(chunk); + }); + + res.on('end', function () { + const body = Buffer.concat(chunks); + console.log(body.toString()); + }); +}); + +req.end(); \ No newline at end of file diff --git a/src/targets/node/native/fixtures/query.js b/src/targets/node/native/fixtures/query.js new file mode 100644 index 000000000..61fe238ee --- /dev/null +++ b/src/targets/node/native/fixtures/query.js @@ -0,0 +1,24 @@ +const http = require('http'); + +const options = { + method: 'GET', + hostname: 'mockbin.com', + port: null, + path: '/har?foo=bar&foo=baz&baz=abc&key=value', + headers: {} +}; + +const req = http.request(options, function (res) { + const chunks = []; + + res.on('data', function (chunk) { + chunks.push(chunk); + }); + + res.on('end', function () { + const body = Buffer.concat(chunks); + console.log(body.toString()); + }); +}); + +req.end(); \ No newline at end of file diff --git a/test/fixtures/output/node/native/short.js b/src/targets/node/native/fixtures/short.js similarity index 50% rename from test/fixtures/output/node/native/short.js rename to src/targets/node/native/fixtures/short.js index e661ca8c9..1304503b5 100644 --- a/test/fixtures/output/node/native/short.js +++ b/src/targets/node/native/fixtures/short.js @@ -1,24 +1,24 @@ -const http = require("http"); +const http = require('http'); const options = { - "method": "GET", - "hostname": "mockbin.com", - "port": null, - "path": "/har", - "headers": {} + method: 'GET', + hostname: 'mockbin.com', + port: null, + path: '/har', + headers: {} }; const req = http.request(options, function (res) { const chunks = []; - res.on("data", function (chunk) { + res.on('data', function (chunk) { chunks.push(chunk); }); - res.on("end", function () { + res.on('end', function () { const body = Buffer.concat(chunks); console.log(body.toString()); }); }); -req.end(); +req.end(); \ No newline at end of file diff --git a/src/targets/node/native/fixtures/text-plain.js b/src/targets/node/native/fixtures/text-plain.js new file mode 100644 index 000000000..61a990cad --- /dev/null +++ b/src/targets/node/native/fixtures/text-plain.js @@ -0,0 +1,27 @@ +const http = require('http'); + +const options = { + method: 'POST', + hostname: 'mockbin.com', + port: null, + path: '/har', + headers: { + 'content-type': 'text/plain' + } +}; + +const req = http.request(options, function (res) { + const chunks = []; + + res.on('data', function (chunk) { + chunks.push(chunk); + }); + + res.on('end', function () { + const body = Buffer.concat(chunks); + console.log(body.toString()); + }); +}); + +req.write('Hello World'); +req.end(); \ No newline at end of file diff --git a/src/targets/node/request.js b/src/targets/node/request.js deleted file mode 100644 index 258c736d3..000000000 --- a/src/targets/node/request.js +++ /dev/null @@ -1,126 +0,0 @@ -/** - * @description - * HTTP code snippet generator for Node.js using Request. - * - * @author - * @AhmadNassri - * - * for any questions or issues regarding the generated code snippet, please open an issue mentioning the author. - */ - -'use strict' - -const util = require('util') -const stringifyObject = require('stringify-object') -const CodeBuilder = require('../../helpers/code-builder') - -module.exports = function (source, options) { - const opts = Object.assign({ - indent: ' ' - }, options) - - let includeFS = false - const code = new CodeBuilder(opts.indent) - - code.push("const request = require('request');") - .blank() - - const reqOpts = { - method: source.method, - url: source.url - } - - if (Object.keys(source.queryObj).length) { - reqOpts.qs = source.queryObj - } - - if (Object.keys(source.headersObj).length) { - reqOpts.headers = source.headersObj - } - - switch (source.postData.mimeType) { - case 'application/x-www-form-urlencoded': - reqOpts.form = source.postData.paramsObj - break - - case 'application/json': - if (source.postData.jsonObj) { - reqOpts.body = source.postData.jsonObj - reqOpts.json = true - } - break - - case 'multipart/form-data': - reqOpts.formData = {} - - source.postData.params.forEach(function (param) { - const attachment = {} - - if (!param.fileName && !param.fileName && !param.contentType) { - reqOpts.formData[param.name] = param.value - return - } - - if (param.fileName) { - includeFS = true - - attachment.value = 'fs.createReadStream("' + param.fileName + '")' - } else if (param.value) { - attachment.value = param.value - } - - if (param.fileName) { - attachment.options = { - filename: param.fileName, - contentType: param.contentType ? param.contentType : null - } - } - - reqOpts.formData[param.name] = attachment - }) - break - - default: - if (source.postData.text) { - reqOpts.body = source.postData.text - } - } - - // construct cookies argument - if (source.cookies.length) { - reqOpts.jar = 'JAR' - - code.push('const jar = request.jar();') - - const url = source.url - - source.cookies.forEach(function (cookie) { - code.push("jar.setCookie(request.cookie('%s=%s'), '%s');", encodeURIComponent(cookie.name), encodeURIComponent(cookie.value), url) - }) - code.blank() - } - - if (includeFS) { - code.unshift("const fs = require('fs');") - } - - code.push('const options = %s;', stringifyObject(reqOpts, { indent: ' ', inlineCharacterLimit: 80 })) - .blank() - - code.push(util.format('request(options, %s', 'function (error, response, body) {')) - - .push(1, 'if (error) throw new Error(error);') - .blank() - .push(1, 'console.log(body);') - .push('});') - .blank() - - return code.join().replace('"JAR"', 'jar').replace(/'fs\.createReadStream\("(.+)"\)'/g, "fs.createReadStream('$1')") -} - -module.exports.info = { - key: 'request', - title: 'Request', - link: 'https://github.com/request/request', - description: 'Simplified HTTP request client' -} diff --git a/src/targets/node/request/client.ts b/src/targets/node/request/client.ts new file mode 100644 index 000000000..ad07cbb39 --- /dev/null +++ b/src/targets/node/request/client.ts @@ -0,0 +1,135 @@ +/** + * @description + * HTTP code snippet generator for Node.js using Request. + * + * @author + * @AhmadNassri + * + * for any questions or issues regarding the generated code snippet, please open an issue mentioning the author. + */ + +import stringifyObject from 'stringify-object'; + +import { CodeBuilder } from '../../../helpers/code-builder'; +import { Client } from '../../targets'; + +export const request: Client = { + info: { + key: 'request', + title: 'Request', + link: 'https://github.com/request/request', + description: 'Simplified HTTP request client', + }, + convert: ({ method, url, queryObj, postData, headersObj, cookies }, options) => { + const opts = { + indent: ' ', + ...options, + }; + + let includeFS = false; + const { push, blank, join, unshift } = new CodeBuilder({ indent: opts.indent }); + + push("const request = require('request');"); + blank(); + + const reqOpts: Record = { + method, + url, + }; + + if (Object.keys(queryObj).length) { + reqOpts.qs = queryObj; + } + + if (Object.keys(headersObj).length) { + reqOpts.headers = headersObj; + } + + switch (postData.mimeType) { + case 'application/x-www-form-urlencoded': + reqOpts.form = postData.paramsObj; + break; + + case 'application/json': + if (postData.jsonObj) { + reqOpts.body = postData.jsonObj; + reqOpts.json = true; + } + break; + + case 'multipart/form-data': + reqOpts.formData = {}; + + postData.params?.forEach(param => { + if (!param.fileName && !param.fileName && !param.contentType) { + reqOpts.formData[param.name] = param.value; + return; + } + + let attachment: { + value?: string; + options?: { + filename: string; + contentType: string | null; + }; + } = {}; + + if (param.fileName) { + includeFS = true; + attachment = { + value: `fs.createReadStream(${param.fileName})`, + options: { + filename: param.fileName, + contentType: param.contentType ? param.contentType : null, + }, + }; + } else if (param.value) { + attachment.value = param.value; + } + + reqOpts.formData[param.name] = attachment; + }); + break; + + default: + if (postData.text) { + reqOpts.body = postData.text; + } + } + + // construct cookies argument + if (cookies.length) { + reqOpts.jar = 'JAR'; + + push('const jar = request.jar();'); + + cookies.forEach(cookie => { + push( + `jar.setCookie(request.cookie('${encodeURIComponent(cookie.name)}=${encodeURIComponent( + cookie.value, + )}'), '${url}');`, + ); + }); + blank(); + } + + if (includeFS) { + unshift("const fs = require('fs');"); + } + + push( + `const options = ${stringifyObject(reqOpts, { indent: ' ', inlineCharacterLimit: 80 })};`, + ); + blank(); + + push('request(options, function (error, response, body) {'); + push('if (error) throw new Error(error);', 1); + blank(); + push('console.log(body);', 1); + push('});'); + + return join() + .replace("'JAR'", 'jar') + .replace(/'fs\.createReadStream\((.*)\)'/, "fs.createReadStream('$1')"); + }, +}; diff --git a/test/fixtures/output/node/request/application-form-encoded.js b/src/targets/node/request/fixtures/application-form-encoded.js similarity index 98% rename from test/fixtures/output/node/request/application-form-encoded.js rename to src/targets/node/request/fixtures/application-form-encoded.js index 798c16876..ff6198588 100644 --- a/test/fixtures/output/node/request/application-form-encoded.js +++ b/src/targets/node/request/fixtures/application-form-encoded.js @@ -11,5 +11,4 @@ request(options, function (error, response, body) { if (error) throw new Error(error); console.log(body); -}); - +}); \ No newline at end of file diff --git a/test/fixtures/output/node/request/application-json.js b/src/targets/node/request/fixtures/application-json.js similarity index 98% rename from test/fixtures/output/node/request/application-json.js rename to src/targets/node/request/fixtures/application-json.js index af6ad0db3..17c829eac 100644 --- a/test/fixtures/output/node/request/application-json.js +++ b/src/targets/node/request/fixtures/application-json.js @@ -19,5 +19,4 @@ request(options, function (error, response, body) { if (error) throw new Error(error); console.log(body); -}); - +}); \ No newline at end of file diff --git a/test/fixtures/output/node/request/cookies.js b/src/targets/node/request/fixtures/cookies.js similarity index 95% rename from test/fixtures/output/node/request/cookies.js rename to src/targets/node/request/fixtures/cookies.js index 4d23a4d14..798fe6c48 100644 --- a/test/fixtures/output/node/request/cookies.js +++ b/src/targets/node/request/fixtures/cookies.js @@ -4,11 +4,10 @@ const jar = request.jar(); jar.setCookie(request.cookie('foo=bar'), 'http://mockbin.com/har'); jar.setCookie(request.cookie('bar=baz'), 'http://mockbin.com/har'); -const options = {method: 'POST', url: 'http://mockbin.com/har', jar: 'JAR'}; +const options = {method: 'POST', url: 'http://mockbin.com/har', jar: jar}; request(options, function (error, response, body) { if (error) throw new Error(error); console.log(body); -}); - +}); \ No newline at end of file diff --git a/test/fixtures/output/node/request/custom-method.js b/src/targets/node/request/fixtures/custom-method.js similarity index 97% rename from test/fixtures/output/node/request/custom-method.js rename to src/targets/node/request/fixtures/custom-method.js index 3b2bff046..452c53f67 100644 --- a/test/fixtures/output/node/request/custom-method.js +++ b/src/targets/node/request/fixtures/custom-method.js @@ -6,5 +6,4 @@ request(options, function (error, response, body) { if (error) throw new Error(error); console.log(body); -}); - +}); \ No newline at end of file diff --git a/test/fixtures/output/node/request/full.js b/src/targets/node/request/fixtures/full.js similarity index 96% rename from test/fixtures/output/node/request/full.js rename to src/targets/node/request/fixtures/full.js index 2dd1c8aa8..8a8162c88 100644 --- a/test/fixtures/output/node/request/full.js +++ b/src/targets/node/request/fixtures/full.js @@ -13,12 +13,11 @@ const options = { 'content-type': 'application/x-www-form-urlencoded' }, form: {foo: 'bar'}, - jar: 'JAR' + jar: jar }; request(options, function (error, response, body) { if (error) throw new Error(error); console.log(body); -}); - +}); \ No newline at end of file diff --git a/test/fixtures/output/node/request/headers.js b/src/targets/node/request/fixtures/headers.js similarity index 98% rename from test/fixtures/output/node/request/headers.js rename to src/targets/node/request/fixtures/headers.js index a30e3fb4c..005ddfadb 100644 --- a/test/fixtures/output/node/request/headers.js +++ b/src/targets/node/request/fixtures/headers.js @@ -10,5 +10,4 @@ request(options, function (error, response, body) { if (error) throw new Error(error); console.log(body); -}); - +}); \ No newline at end of file diff --git a/test/fixtures/output/node/request/https.js b/src/targets/node/request/fixtures/https.js similarity index 97% rename from test/fixtures/output/node/request/https.js rename to src/targets/node/request/fixtures/https.js index b5e4390ed..f8ba379aa 100644 --- a/test/fixtures/output/node/request/https.js +++ b/src/targets/node/request/fixtures/https.js @@ -6,5 +6,4 @@ request(options, function (error, response, body) { if (error) throw new Error(error); console.log(body); -}); - +}); \ No newline at end of file diff --git a/test/fixtures/output/node/request/jsonObj-multiline.js b/src/targets/node/request/fixtures/jsonObj-multiline.js similarity index 98% rename from test/fixtures/output/node/request/jsonObj-multiline.js rename to src/targets/node/request/fixtures/jsonObj-multiline.js index b94df9ca5..09ea1773d 100644 --- a/test/fixtures/output/node/request/jsonObj-multiline.js +++ b/src/targets/node/request/fixtures/jsonObj-multiline.js @@ -12,5 +12,4 @@ request(options, function (error, response, body) { if (error) throw new Error(error); console.log(body); -}); - +}); \ No newline at end of file diff --git a/test/fixtures/output/node/request/jsonObj-null-value.js b/src/targets/node/request/fixtures/jsonObj-null-value.js similarity index 98% rename from test/fixtures/output/node/request/jsonObj-null-value.js rename to src/targets/node/request/fixtures/jsonObj-null-value.js index e12f19716..0edefc32c 100644 --- a/test/fixtures/output/node/request/jsonObj-null-value.js +++ b/src/targets/node/request/fixtures/jsonObj-null-value.js @@ -12,5 +12,4 @@ request(options, function (error, response, body) { if (error) throw new Error(error); console.log(body); -}); - +}); \ No newline at end of file diff --git a/test/fixtures/output/node/request/multipart-data.js b/src/targets/node/request/fixtures/multipart-data.js similarity index 98% rename from test/fixtures/output/node/request/multipart-data.js rename to src/targets/node/request/fixtures/multipart-data.js index defd7acbb..e539b607b 100644 --- a/test/fixtures/output/node/request/multipart-data.js +++ b/src/targets/node/request/fixtures/multipart-data.js @@ -17,5 +17,4 @@ request(options, function (error, response, body) { if (error) throw new Error(error); console.log(body); -}); - +}); \ No newline at end of file diff --git a/test/fixtures/output/node/request/multipart-file.js b/src/targets/node/request/fixtures/multipart-file.js similarity index 99% rename from test/fixtures/output/node/request/multipart-file.js rename to src/targets/node/request/fixtures/multipart-file.js index 8cb2864ba..706ca7452 100644 --- a/test/fixtures/output/node/request/multipart-file.js +++ b/src/targets/node/request/fixtures/multipart-file.js @@ -17,5 +17,4 @@ request(options, function (error, response, body) { if (error) throw new Error(error); console.log(body); -}); - +}); \ No newline at end of file diff --git a/test/fixtures/output/node/request/multipart-form-data.js b/src/targets/node/request/fixtures/multipart-form-data.js similarity index 98% rename from test/fixtures/output/node/request/multipart-form-data.js rename to src/targets/node/request/fixtures/multipart-form-data.js index e808b7162..1dfde5653 100644 --- a/test/fixtures/output/node/request/multipart-form-data.js +++ b/src/targets/node/request/fixtures/multipart-form-data.js @@ -11,5 +11,4 @@ request(options, function (error, response, body) { if (error) throw new Error(error); console.log(body); -}); - +}); \ No newline at end of file diff --git a/test/fixtures/output/node/request/nested.js b/src/targets/node/request/fixtures/nested.js similarity index 98% rename from test/fixtures/output/node/request/nested.js rename to src/targets/node/request/fixtures/nested.js index f3b711bd6..3a5456728 100644 --- a/test/fixtures/output/node/request/nested.js +++ b/src/targets/node/request/fixtures/nested.js @@ -10,5 +10,4 @@ request(options, function (error, response, body) { if (error) throw new Error(error); console.log(body); -}); - +}); \ No newline at end of file diff --git a/test/fixtures/output/node/request/query.js b/src/targets/node/request/fixtures/query.js similarity index 98% rename from test/fixtures/output/node/request/query.js rename to src/targets/node/request/fixtures/query.js index 9183840e5..69e6af500 100644 --- a/test/fixtures/output/node/request/query.js +++ b/src/targets/node/request/fixtures/query.js @@ -10,5 +10,4 @@ request(options, function (error, response, body) { if (error) throw new Error(error); console.log(body); -}); - +}); \ No newline at end of file diff --git a/test/fixtures/output/node/request/short.js b/src/targets/node/request/fixtures/short.js similarity index 97% rename from test/fixtures/output/node/request/short.js rename to src/targets/node/request/fixtures/short.js index 4543d8a39..750370dff 100644 --- a/test/fixtures/output/node/request/short.js +++ b/src/targets/node/request/fixtures/short.js @@ -6,5 +6,4 @@ request(options, function (error, response, body) { if (error) throw new Error(error); console.log(body); -}); - +}); \ No newline at end of file diff --git a/test/fixtures/output/node/request/text-plain.js b/src/targets/node/request/fixtures/text-plain.js similarity index 98% rename from test/fixtures/output/node/request/text-plain.js rename to src/targets/node/request/fixtures/text-plain.js index e0bdcacfa..81934bb03 100644 --- a/test/fixtures/output/node/request/text-plain.js +++ b/src/targets/node/request/fixtures/text-plain.js @@ -11,5 +11,4 @@ request(options, function (error, response, body) { if (error) throw new Error(error); console.log(body); -}); - +}); \ No newline at end of file diff --git a/src/targets/node/target.ts b/src/targets/node/target.ts new file mode 100644 index 000000000..14ac41e53 --- /dev/null +++ b/src/targets/node/target.ts @@ -0,0 +1,22 @@ +import { Target } from '../targets'; +import { axios } from './axios/client'; +import { fetch } from './fetch/client'; +import { native } from './native/client'; +import { request } from './request/client'; +import { unirest } from './unirest/client'; + +export const node: Target = { + info: { + key: 'node', + title: 'Node.js', + extname: '.js', + default: 'native', + }, + clientsById: { + native, + request, + unirest, + axios, + fetch, + }, +}; diff --git a/src/targets/node/unirest.js b/src/targets/node/unirest.js deleted file mode 100644 index 3e2c23eb2..000000000 --- a/src/targets/node/unirest.js +++ /dev/null @@ -1,119 +0,0 @@ -/** - * @description - * HTTP code snippet generator for Node.js using Unirest. - * - * @author - * @AhmadNassri - * - * for any questions or issues regarding the generated code snippet, please open an issue mentioning the author. - */ - -'use strict' - -const CodeBuilder = require('../../helpers/code-builder') - -module.exports = function (source, options) { - const opts = Object.assign({ - indent: ' ' - }, options) - - let includeFS = false - const code = new CodeBuilder(opts.indent) - - code.push('const unirest = require("unirest");') - .blank() - .push('const req = unirest("%s", "%s");', source.method, source.url) - .blank() - - if (source.cookies.length) { - code.push('const CookieJar = unirest.jar();') - - source.cookies.forEach(function (cookie) { - code.push('CookieJar.add("%s=%s","%s");', encodeURIComponent(cookie.name), encodeURIComponent(cookie.value), source.url) - }) - - code.push('req.jar(CookieJar);') - .blank() - } - - if (Object.keys(source.queryObj).length) { - code.push('req.query(%s);', JSON.stringify(source.queryObj, null, opts.indent)) - .blank() - } - - if (Object.keys(source.headersObj).length) { - code.push('req.headers(%s);', JSON.stringify(source.headersObj, null, opts.indent)) - .blank() - } - - switch (source.postData.mimeType) { - case 'application/x-www-form-urlencoded': - if (source.postData.paramsObj) { - code.push('req.form(%s);', JSON.stringify(source.postData.paramsObj, null, opts.indent)) - .blank() - } - break - - case 'application/json': - if (source.postData.jsonObj) { - code.push('req.type("json");') - .push('req.send(%s);', JSON.stringify(source.postData.jsonObj, null, opts.indent)) - .blank() - } - break - - case 'multipart/form-data': { - const multipart = [] - - source.postData.params.forEach(function (param) { - const part = {} - - if (param.fileName && !param.value) { - includeFS = true - - part.body = 'fs.createReadStream("' + param.fileName + '")' - } else if (param.value) { - part.body = param.value - } - - if (part.body) { - if (param.contentType) { - part['content-type'] = param.contentType - } - - multipart.push(part) - } - }) - - code.push('req.multipart(%s);', JSON.stringify(multipart, null, opts.indent)) - .blank() - break - } - - default: - if (source.postData.text) { - code.push('req.send(%s);', JSON.stringify(source.postData.text, null, opts.indent)) - .blank() - } - } - - if (includeFS) { - code.unshift('const fs = require("fs");') - } - - code.push('req.end(function (res) {') - .push(1, 'if (res.error) throw new Error(res.error);') - .blank() - .push(1, 'console.log(res.body);') - .push('});') - .blank() - - return code.join().replace(/"fs\.createReadStream\(\\"(.+)\\"\)"/, 'fs.createReadStream("$1")') -} - -module.exports.info = { - key: 'unirest', - title: 'Unirest', - link: 'http://unirest.io/nodejs.html', - description: 'Lightweight HTTP Request Client Library' -} diff --git a/src/targets/node/unirest/client.ts b/src/targets/node/unirest/client.ts new file mode 100644 index 000000000..dbdf5c707 --- /dev/null +++ b/src/targets/node/unirest/client.ts @@ -0,0 +1,126 @@ +/** + * @description + * HTTP code snippet generator for Node.js using Unirest. + * + * @author + * @AhmadNassri + * + * for any questions or issues regarding the generated code snippet, please open an issue mentioning the author. + */ + +import stringifyObject from 'stringify-object'; + +import { CodeBuilder } from '../../../helpers/code-builder'; +import { Client } from '../../targets'; + +export const unirest: Client = { + info: { + key: 'unirest', + title: 'Unirest', + link: 'http://unirest.io/nodejs.html', + description: 'Lightweight HTTP Request Client Library', + }, + convert: ({ method, url, cookies, queryObj, postData, headersObj }, options) => { + const opts = { + indent: ' ', + ...options, + }; + + let includeFS = false; + const { blank, join, push, unshift } = new CodeBuilder({ indent: opts.indent }); + + push("const unirest = require('unirest');"); + blank(); + push(`const req = unirest('${method}', '${url}');`); + blank(); + + if (cookies.length) { + push('const CookieJar = unirest.jar();'); + + cookies.forEach(cookie => { + push( + `CookieJar.add('${encodeURIComponent(cookie.name)}=${encodeURIComponent( + cookie.value, + )}', '${url}');`, + ); + }); + + push('req.jar(CookieJar);'); + blank(); + } + + if (Object.keys(queryObj).length) { + push(`req.query(${stringifyObject(queryObj, { indent: opts.indent })});`); + blank(); + } + + if (Object.keys(headersObj).length) { + push(`req.headers(${stringifyObject(headersObj, { indent: opts.indent })});`); + blank(); + } + + switch (postData.mimeType) { + case 'application/x-www-form-urlencoded': + if (postData.paramsObj) { + push(`req.form(${stringifyObject(postData.paramsObj, { indent: opts.indent })});`); + blank(); + } + break; + + case 'application/json': + if (postData.jsonObj) { + push("req.type('json');"); + push(`req.send(${stringifyObject(postData.jsonObj, { indent: opts.indent })});`); + blank(); + } + break; + + case 'multipart/form-data': { + const multipart: Record[] = []; + + postData.params?.forEach(param => { + const part: Record = {}; + + if (param.fileName && !param.value) { + includeFS = true; + + part.body = `fs.createReadStream('${param.fileName}')`; + } else if (param.value) { + part.body = param.value; + } + + if (part.body) { + if (param.contentType) { + part['content-type'] = param.contentType; + } + + multipart.push(part); + } + }); + + push(`req.multipart(${stringifyObject(multipart, { indent: opts.indent })});`); + blank(); + break; + } + + default: + if (postData.text) { + push(`req.send(${stringifyObject(postData.text, { indent: opts.indent })});`); + blank(); + } + } + + if (includeFS) { + unshift("const fs = require('fs');"); + } + + push('req.end(function (res) {'); + push('if (res.error) throw new Error(res.error);', 1); + blank(); + + push('console.log(res.body);', 1); + push('});'); + + return join().replace(/'fs\.createReadStream\(\\'(.+)\\'\)'/, "fs.createReadStream('$1')"); + }, +}; diff --git a/src/targets/node/unirest/fixtures/application-form-encoded.js b/src/targets/node/unirest/fixtures/application-form-encoded.js new file mode 100644 index 000000000..dcd01a30c --- /dev/null +++ b/src/targets/node/unirest/fixtures/application-form-encoded.js @@ -0,0 +1,18 @@ +const unirest = require('unirest'); + +const req = unirest('POST', 'http://mockbin.com/har'); + +req.headers({ + 'content-type': 'application/x-www-form-urlencoded' +}); + +req.form({ + foo: 'bar', + hello: 'world' +}); + +req.end(function (res) { + if (res.error) throw new Error(res.error); + + console.log(res.body); +}); \ No newline at end of file diff --git a/src/targets/node/unirest/fixtures/application-json.js b/src/targets/node/unirest/fixtures/application-json.js new file mode 100644 index 000000000..a0f82770f --- /dev/null +++ b/src/targets/node/unirest/fixtures/application-json.js @@ -0,0 +1,35 @@ +const unirest = require('unirest'); + +const req = unirest('POST', 'http://mockbin.com/har'); + +req.headers({ + 'content-type': 'application/json' +}); + +req.type('json'); +req.send({ + number: 1, + string: 'f"oo', + arr: [ + 1, + 2, + 3 + ], + nested: { + a: 'b' + }, + arr_mix: [ + 1, + 'a', + { + arr_mix_nested: {} + } + ], + boolean: false +}); + +req.end(function (res) { + if (res.error) throw new Error(res.error); + + console.log(res.body); +}); \ No newline at end of file diff --git a/src/targets/node/unirest/fixtures/cookies.js b/src/targets/node/unirest/fixtures/cookies.js new file mode 100644 index 000000000..a2e8e6cee --- /dev/null +++ b/src/targets/node/unirest/fixtures/cookies.js @@ -0,0 +1,14 @@ +const unirest = require('unirest'); + +const req = unirest('POST', 'http://mockbin.com/har'); + +const CookieJar = unirest.jar(); +CookieJar.add('foo=bar', 'http://mockbin.com/har'); +CookieJar.add('bar=baz', 'http://mockbin.com/har'); +req.jar(CookieJar); + +req.end(function (res) { + if (res.error) throw new Error(res.error); + + console.log(res.body); +}); \ No newline at end of file diff --git a/src/targets/node/unirest/fixtures/custom-method.js b/src/targets/node/unirest/fixtures/custom-method.js new file mode 100644 index 000000000..d2bebcec2 --- /dev/null +++ b/src/targets/node/unirest/fixtures/custom-method.js @@ -0,0 +1,9 @@ +const unirest = require('unirest'); + +const req = unirest('PROPFIND', 'http://mockbin.com/har'); + +req.end(function (res) { + if (res.error) throw new Error(res.error); + + console.log(res.body); +}); \ No newline at end of file diff --git a/src/targets/node/unirest/fixtures/full.js b/src/targets/node/unirest/fixtures/full.js new file mode 100644 index 000000000..4664f1f7d --- /dev/null +++ b/src/targets/node/unirest/fixtures/full.js @@ -0,0 +1,32 @@ +const unirest = require('unirest'); + +const req = unirest('POST', 'http://mockbin.com/har'); + +const CookieJar = unirest.jar(); +CookieJar.add('foo=bar', 'http://mockbin.com/har'); +CookieJar.add('bar=baz', 'http://mockbin.com/har'); +req.jar(CookieJar); + +req.query({ + foo: [ + 'bar', + 'baz' + ], + baz: 'abc', + key: 'value' +}); + +req.headers({ + accept: 'application/json', + 'content-type': 'application/x-www-form-urlencoded' +}); + +req.form({ + foo: 'bar' +}); + +req.end(function (res) { + if (res.error) throw new Error(res.error); + + console.log(res.body); +}); \ No newline at end of file diff --git a/src/targets/node/unirest/fixtures/headers.js b/src/targets/node/unirest/fixtures/headers.js new file mode 100644 index 000000000..36c5fdb28 --- /dev/null +++ b/src/targets/node/unirest/fixtures/headers.js @@ -0,0 +1,14 @@ +const unirest = require('unirest'); + +const req = unirest('GET', 'http://mockbin.com/har'); + +req.headers({ + accept: 'application/json', + 'x-foo': 'Bar' +}); + +req.end(function (res) { + if (res.error) throw new Error(res.error); + + console.log(res.body); +}); \ No newline at end of file diff --git a/test/fixtures/output/node/unirest/https.js b/src/targets/node/unirest/fixtures/https.js similarity index 50% rename from test/fixtures/output/node/unirest/https.js rename to src/targets/node/unirest/fixtures/https.js index 52ae902f6..6a5caaa39 100644 --- a/test/fixtures/output/node/unirest/https.js +++ b/src/targets/node/unirest/fixtures/https.js @@ -1,10 +1,9 @@ -const unirest = require("unirest"); +const unirest = require('unirest'); -const req = unirest("GET", "https://mockbin.com/har"); +const req = unirest('GET', 'https://mockbin.com/har'); req.end(function (res) { if (res.error) throw new Error(res.error); console.log(res.body); -}); - +}); \ No newline at end of file diff --git a/src/targets/node/unirest/fixtures/jsonObj-multiline.js b/src/targets/node/unirest/fixtures/jsonObj-multiline.js new file mode 100644 index 000000000..8c97ec05b --- /dev/null +++ b/src/targets/node/unirest/fixtures/jsonObj-multiline.js @@ -0,0 +1,18 @@ +const unirest = require('unirest'); + +const req = unirest('POST', 'http://mockbin.com/har'); + +req.headers({ + 'content-type': 'application/json' +}); + +req.type('json'); +req.send({ + foo: 'bar' +}); + +req.end(function (res) { + if (res.error) throw new Error(res.error); + + console.log(res.body); +}); \ No newline at end of file diff --git a/src/targets/node/unirest/fixtures/jsonObj-null-value.js b/src/targets/node/unirest/fixtures/jsonObj-null-value.js new file mode 100644 index 000000000..43671d39f --- /dev/null +++ b/src/targets/node/unirest/fixtures/jsonObj-null-value.js @@ -0,0 +1,18 @@ +const unirest = require('unirest'); + +const req = unirest('POST', 'http://mockbin.com/har'); + +req.headers({ + 'content-type': 'application/json' +}); + +req.type('json'); +req.send({ + foo: null +}); + +req.end(function (res) { + if (res.error) throw new Error(res.error); + + console.log(res.body); +}); \ No newline at end of file diff --git a/src/targets/node/unirest/fixtures/multipart-data.js b/src/targets/node/unirest/fixtures/multipart-data.js new file mode 100644 index 000000000..9383b020e --- /dev/null +++ b/src/targets/node/unirest/fixtures/multipart-data.js @@ -0,0 +1,20 @@ +const unirest = require('unirest'); + +const req = unirest('POST', 'http://mockbin.com/har'); + +req.headers({ + 'content-type': 'multipart/form-data; boundary=---011000010111000001101001' +}); + +req.multipart([ + { + body: 'Hello World', + 'content-type': 'text/plain' + } +]); + +req.end(function (res) { + if (res.error) throw new Error(res.error); + + console.log(res.body); +}); \ No newline at end of file diff --git a/src/targets/node/unirest/fixtures/multipart-file.js b/src/targets/node/unirest/fixtures/multipart-file.js new file mode 100644 index 000000000..b0e07c557 --- /dev/null +++ b/src/targets/node/unirest/fixtures/multipart-file.js @@ -0,0 +1,21 @@ +const fs = require('fs'); +const unirest = require('unirest'); + +const req = unirest('POST', 'http://mockbin.com/har'); + +req.headers({ + 'content-type': 'multipart/form-data; boundary=---011000010111000001101001' +}); + +req.multipart([ + { + body: fs.createReadStream('test/fixtures/files/hello.txt'), + 'content-type': 'text/plain' + } +]); + +req.end(function (res) { + if (res.error) throw new Error(res.error); + + console.log(res.body); +}); \ No newline at end of file diff --git a/src/targets/node/unirest/fixtures/multipart-form-data.js b/src/targets/node/unirest/fixtures/multipart-form-data.js new file mode 100644 index 000000000..917274446 --- /dev/null +++ b/src/targets/node/unirest/fixtures/multipart-form-data.js @@ -0,0 +1,19 @@ +const unirest = require('unirest'); + +const req = unirest('POST', 'http://mockbin.com/har'); + +req.headers({ + 'Content-Type': 'multipart/form-data; boundary=---011000010111000001101001' +}); + +req.multipart([ + { + body: 'bar' + } +]); + +req.end(function (res) { + if (res.error) throw new Error(res.error); + + console.log(res.body); +}); \ No newline at end of file diff --git a/src/targets/node/unirest/fixtures/nested.js b/src/targets/node/unirest/fixtures/nested.js new file mode 100644 index 000000000..7cfc5acc6 --- /dev/null +++ b/src/targets/node/unirest/fixtures/nested.js @@ -0,0 +1,15 @@ +const unirest = require('unirest'); + +const req = unirest('GET', 'http://mockbin.com/har'); + +req.query({ + 'foo[bar]': 'baz,zap', + fiz: 'buz', + key: 'value' +}); + +req.end(function (res) { + if (res.error) throw new Error(res.error); + + console.log(res.body); +}); \ No newline at end of file diff --git a/src/targets/node/unirest/fixtures/query.js b/src/targets/node/unirest/fixtures/query.js new file mode 100644 index 000000000..82ff4fef0 --- /dev/null +++ b/src/targets/node/unirest/fixtures/query.js @@ -0,0 +1,18 @@ +const unirest = require('unirest'); + +const req = unirest('GET', 'http://mockbin.com/har'); + +req.query({ + foo: [ + 'bar', + 'baz' + ], + baz: 'abc', + key: 'value' +}); + +req.end(function (res) { + if (res.error) throw new Error(res.error); + + console.log(res.body); +}); \ No newline at end of file diff --git a/test/fixtures/output/node/unirest/short.js b/src/targets/node/unirest/fixtures/short.js similarity index 50% rename from test/fixtures/output/node/unirest/short.js rename to src/targets/node/unirest/fixtures/short.js index 666a38b54..e8c885f60 100644 --- a/test/fixtures/output/node/unirest/short.js +++ b/src/targets/node/unirest/fixtures/short.js @@ -1,10 +1,9 @@ -const unirest = require("unirest"); +const unirest = require('unirest'); -const req = unirest("GET", "http://mockbin.com/har"); +const req = unirest('GET', 'http://mockbin.com/har'); req.end(function (res) { if (res.error) throw new Error(res.error); console.log(res.body); -}); - +}); \ No newline at end of file diff --git a/src/targets/node/unirest/fixtures/text-plain.js b/src/targets/node/unirest/fixtures/text-plain.js new file mode 100644 index 000000000..17d109461 --- /dev/null +++ b/src/targets/node/unirest/fixtures/text-plain.js @@ -0,0 +1,15 @@ +const unirest = require('unirest'); + +const req = unirest('POST', 'http://mockbin.com/har'); + +req.headers({ + 'content-type': 'text/plain' +}); + +req.send('Hello World'); + +req.end(function (res) { + if (res.error) throw new Error(res.error); + + console.log(res.body); +}); \ No newline at end of file diff --git a/src/targets/objc/helpers.js b/src/targets/objc/helpers.js deleted file mode 100644 index 14d136e03..000000000 --- a/src/targets/objc/helpers.js +++ /dev/null @@ -1,79 +0,0 @@ -'use strict' - -const util = require('util') - -module.exports = { - /** - * Create an string of given length filled with blank spaces - * - * @param {number} length Length of the array to return - * @return {string} - */ - blankString: function (length) { - return Array.apply(null, new Array(length)).map(String.prototype.valueOf, ' ').join('') - }, - - /** - * Create a string corresponding to a valid declaration and initialization of an Objective-C object literal. - * - * @param {string} nsClass Class of the litteral - * @param {string} name Desired name of the instance - * @param {Object} parameters Key-value object of parameters to translate to an Objective-C object litearal - * @param {boolean} indent If true, will declare the litteral by indenting each new key/value pair. - * @return {string} A valid Objective-C declaration and initialization of an Objective-C object litteral. - * - * @example - * nsDeclaration('NSDictionary', 'params', {a: 'b', c: 'd'}, true) - * // returns: - * NSDictionary *params = @{ @"a": @"b", - * @"c": @"d" }; - * - * nsDeclaration('NSDictionary', 'params', {a: 'b', c: 'd'}) - * // returns: - * NSDictionary *params = @{ @"a": @"b", @"c": @"d" }; - */ - nsDeclaration: function (nsClass, name, parameters, indent) { - const opening = nsClass + ' *' + name + ' = ' - const literal = this.literalRepresentation(parameters, indent ? opening.length : undefined) - return opening + literal + ';' - }, - - /** - * Create a valid Objective-C string of a literal value according to its type. - * - * @param {*} value Any JavaScript literal - * @return {string} - */ - literalRepresentation: function (value, indentation) { - const join = indentation === undefined ? ', ' : ',\n ' + this.blankString(indentation) - - switch (Object.prototype.toString.call(value)) { - case '[object Number]': - return '@' + value - - case '[object Array]': { - const valuesRepresentation = value.map(function (v) { - return this.literalRepresentation(v) - }.bind(this)) - return '@[ ' + valuesRepresentation.join(join) + ' ]' - } - - case '[object Object]': { - const keyValuePairs = [] - for (const k in value) { - keyValuePairs.push(util.format('@"%s": %s', k, this.literalRepresentation(value[k]))) - } - return '@{ ' + keyValuePairs.join(join) + ' }' - } - - case '[object Boolean]': - return value ? '@YES' : '@NO' - - default: - if (value === null || value === undefined) { - return '' - } - return '@"' + value.toString().replace(/"/g, '\\"') + '"' - } - } -} diff --git a/src/targets/objc/helpers.ts b/src/targets/objc/helpers.ts new file mode 100644 index 000000000..d44a7f281 --- /dev/null +++ b/src/targets/objc/helpers.ts @@ -0,0 +1,65 @@ +/** + * Create a string corresponding to a valid declaration and initialization of an Objective-C object literal. + * + * @param nsClass Class of the litteral + * @param name Desired name of the instance + * @param parameters Key-value object of parameters to translate to an Objective-C object litearal + * @param indent If true, will declare the litteral by indenting each new key/value pair. + * @return A valid Objective-C declaration and initialization of an Objective-C object litteral. + * + * @example + * nsDeclaration('NSDictionary', 'params', {a: 'b', c: 'd'}, true) + * // returns: + * NSDictionary *params = @{ @"a": @"b", + * @"c": @"d" }; + * + * nsDeclaration('NSDictionary', 'params', {a: 'b', c: 'd'}) + * // returns: + * NSDictionary *params = @{ @"a": @"b", @"c": @"d" }; + */ +export const nsDeclaration = ( + nsClass: string, + name: string, + parameters: Record, + indent?: boolean, +) => { + const opening = `${nsClass} *${name} = `; + const literal = literalRepresentation(parameters, indent ? opening.length : undefined); + return `${opening}${literal};`; +}; + +/** + * Create a valid Objective-C string of a literal value according to its type. + * + * @param value Any JavaScript literal + */ +export const literalRepresentation = (value: any, indentation?: number): string => { + const join = indentation === undefined ? ', ' : `,\n ${' '.repeat(indentation)}`; + + switch (Object.prototype.toString.call(value)) { + case '[object Number]': + return `@${value}`; + + case '[object Array]': { + const valuesRepresentation = value.map((value: any) => literalRepresentation(value)); + return `@[ ${valuesRepresentation.join(join)} ]`; + } + + case '[object Object]': { + const keyValuePairs = []; + for (const key in value) { + keyValuePairs.push(`@"${key}": ${literalRepresentation(value[key])}`); + } + return `@{ ${keyValuePairs.join(join)} }`; + } + + case '[object Boolean]': + return value ? '@YES' : '@NO'; + + default: + if (value === null || value === undefined) { + return ''; + } + return `@"${value.toString().replace(/"/g, '\\"')}"`; + } +}; diff --git a/src/targets/objc/index.js b/src/targets/objc/index.js deleted file mode 100644 index 4f7d2550f..000000000 --- a/src/targets/objc/index.js +++ /dev/null @@ -1,12 +0,0 @@ -'use strict' - -module.exports = { - info: { - key: 'objc', - title: 'Objective-C', - extname: '.m', - default: 'nsurlsession' - }, - - nsurlsession: require('./nsurlsession') -} diff --git a/src/targets/objc/nsurlsession.js b/src/targets/objc/nsurlsession.js deleted file mode 100644 index 1f1760003..000000000 --- a/src/targets/objc/nsurlsession.js +++ /dev/null @@ -1,136 +0,0 @@ -/** - * @description - * HTTP code snippet generator for Objective-C using NSURLSession. - * - * @author - * @thibaultCha - * - * for any questions or issues regarding the generated code snippet, please open an issue mentioning the author. - */ - -'use strict' - -const helpers = require('./helpers') -const CodeBuilder = require('../../helpers/code-builder') - -module.exports = function (source, options) { - const opts = Object.assign({ - indent: ' ', - pretty: true, - timeout: '10' - }, options) - - const code = new CodeBuilder(opts.indent) - // Markers for headers to be created as literal objects and later be set on the NSURLRequest if exist - const req = { - hasHeaders: false, - hasBody: false - } - - // We just want to make sure people understand that is the only dependency - code.push('#import ') - - if (Object.keys(source.allHeaders).length) { - req.hasHeaders = true - code.blank() - .push(helpers.nsDeclaration('NSDictionary', 'headers', source.allHeaders, opts.pretty)) - } - - if (source.postData.text || source.postData.jsonObj || source.postData.params) { - req.hasBody = true - - switch (source.postData.mimeType) { - case 'application/x-www-form-urlencoded': - // By appending parameters one by one in the resulting snippet, - // we make it easier for the user to edit it according to his or her needs after pasting. - // The user can just add/remove lines adding/removing body parameters. - code.blank() - .push('NSMutableData *postData = [[NSMutableData alloc] initWithData:[@"%s=%s" dataUsingEncoding:NSUTF8StringEncoding]];', - source.postData.params[0].name, source.postData.params[0].value) - - for (let i = 1, len = source.postData.params.length; i < len; i++) { - code.push('[postData appendData:[@"&%s=%s" dataUsingEncoding:NSUTF8StringEncoding]];', - source.postData.params[i].name, source.postData.params[i].value) - } - break - - case 'application/json': - if (source.postData.jsonObj) { - code.push(helpers.nsDeclaration('NSDictionary', 'parameters', source.postData.jsonObj, opts.pretty)) - .blank() - .push('NSData *postData = [NSJSONSerialization dataWithJSONObject:parameters options:0 error:nil];') - } - break - - case 'multipart/form-data': - // By appending multipart parameters one by one in the resulting snippet, - // we make it easier for the user to edit it according to his or her needs after pasting. - // The user can just edit the parameters NSDictionary or put this part of a snippet in a multipart builder method. - code.push(helpers.nsDeclaration('NSArray', 'parameters', source.postData.params, opts.pretty)) - .push('NSString *boundary = @"%s";', source.postData.boundary) - .blank() - .push('NSError *error;') - .push('NSMutableString *body = [NSMutableString string];') - .push('for (NSDictionary *param in parameters) {') - .push(1, '[body appendFormat:@"--%@\\r\\n", boundary];') - .push(1, 'if (param[@"fileName"]) {') - .push(2, '[body appendFormat:@"Content-Disposition:form-data; name=\\"%@\\"; filename=\\"%@\\"\\r\\n", param[@"name"], param[@"fileName"]];') - .push(2, '[body appendFormat:@"Content-Type: %@\\r\\n\\r\\n", param[@"contentType"]];') - .push(2, '[body appendFormat:@"%@", [NSString stringWithContentsOfFile:param[@"fileName"] encoding:NSUTF8StringEncoding error:&error]];') - .push(2, 'if (error) {') - .push(3, 'NSLog(@"%@", error);') - .push(2, '}') - .push(1, '} else {') - .push(2, '[body appendFormat:@"Content-Disposition:form-data; name=\\"%@\\"\\r\\n\\r\\n", param[@"name"]];') - .push(2, '[body appendFormat:@"%@", param[@"value"]];') - .push(1, '}') - .push('}') - .push('[body appendFormat:@"\\r\\n--%@--\\r\\n", boundary];') - .push('NSData *postData = [body dataUsingEncoding:NSUTF8StringEncoding];') - break - - default: - code.blank() - .push('NSData *postData = [[NSData alloc] initWithData:[@"' + source.postData.text + '" dataUsingEncoding:NSUTF8StringEncoding]];') - } - } - - code.blank() - .push('NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:@"' + source.fullUrl + '"]') - // NSURLRequestUseProtocolCachePolicy is the default policy, let's just always set it to avoid confusion. - .push(' cachePolicy:NSURLRequestUseProtocolCachePolicy') - .push(' timeoutInterval:' + parseInt(opts.timeout, 10).toFixed(1) + '];') - .push('[request setHTTPMethod:@"' + source.method + '"];') - - if (req.hasHeaders) { - code.push('[request setAllHTTPHeaderFields:headers];') - } - - if (req.hasBody) { - code.push('[request setHTTPBody:postData];') - } - - code.blank() - // Retrieving the shared session will be less verbose than creating a new one. - .push('NSURLSession *session = [NSURLSession sharedSession];') - .push('NSURLSessionDataTask *dataTask = [session dataTaskWithRequest:request') - .push(' completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {') - .push(1, ' if (error) {') - .push(2, ' NSLog(@"%@", error);') - .push(1, ' } else {') - // Casting the NSURLResponse to NSHTTPURLResponse so the user can see the status . - .push(2, ' NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *) response;') - .push(2, ' NSLog(@"%@", httpResponse);') - .push(1, ' }') - .push(' }];') - .push('[dataTask resume];') - - return code.join() -} - -module.exports.info = { - key: 'nsurlsession', - title: 'NSURLSession', - link: 'https://developer.apple.com/library/mac/documentation/Foundation/Reference/NSURLSession_class/index.html', - description: 'Foundation\'s NSURLSession request' -} diff --git a/src/targets/objc/nsurlsession/client.test.ts b/src/targets/objc/nsurlsession/client.test.ts new file mode 100644 index 000000000..fb51c072f --- /dev/null +++ b/src/targets/objc/nsurlsession/client.test.ts @@ -0,0 +1,36 @@ +import full from '../../../fixtures/requests/full.json'; +import jsonNullValue from '../../../fixtures/requests/jsonObj-null-value.json'; +import short from '../../../fixtures/requests/short.json'; +import { runCustomFixtures } from '../../../fixtures/runCustomFixtures'; +import { Request } from '../../../httpsnippet'; + +runCustomFixtures({ + targetId: 'objc', + clientId: 'nsurlsession', + tests: [ + { + it: 'should support an indent option', + input: short as Request, + options: { indent: ' ' }, + expected: 'indent-option.m', + }, + { + it: 'should support a timeout option', + input: short as Request, + options: { timeout: 5 }, + expected: 'timeout-option.m', + }, + { + it: 'should support pretty option', + input: full as Request, + options: { pretty: false }, + expected: 'pretty-option.m', + }, + { + it: 'should support json object with null value', + input: jsonNullValue as unknown as Request, + options: { pretty: false }, + expected: 'json-with-null-value.m', + }, + ], +}); diff --git a/src/targets/objc/nsurlsession/client.ts b/src/targets/objc/nsurlsession/client.ts new file mode 100644 index 000000000..7517e5125 --- /dev/null +++ b/src/targets/objc/nsurlsession/client.ts @@ -0,0 +1,176 @@ +/** + * @description + * HTTP code snippet generator for Objective-C using NSURLSession. + * + * @author + * @thibaultCha + * + * for any questions or issues regarding the generated code snippet, please open an issue mentioning the author. + */ + +import { CodeBuilder } from '../../../helpers/code-builder'; +import { Client } from '../../targets'; +import { nsDeclaration } from '../helpers'; + +export interface NsurlsessionOptions { + pretty?: boolean; + timeout?: number; +} + +export const nsurlsession: Client = { + info: { + key: 'nsurlsession', + title: 'NSURLSession', + link: 'https://developer.apple.com/library/mac/documentation/Foundation/Reference/NSURLSession_class/index.html', + description: "Foundation's NSURLSession request", + }, + convert: ({ allHeaders, postData, method, fullUrl }, options) => { + const opts = { + indent: ' ', + pretty: true, + timeout: 10, + ...options, + }; + + const { push, join, blank } = new CodeBuilder({ indent: opts.indent }); + // Markers for headers to be created as literal objects and later be set on the NSURLRequest if exist + const req = { + hasHeaders: false, + hasBody: false, + }; + + // We just want to make sure people understand that is the only dependency + push('#import '); + + if (Object.keys(allHeaders).length) { + req.hasHeaders = true; + blank(); + push(nsDeclaration('NSDictionary', 'headers', allHeaders, opts.pretty)); + } + + if (postData.text || postData.jsonObj || postData.params) { + req.hasBody = true; + + switch (postData.mimeType) { + case 'application/x-www-form-urlencoded': + if (postData.params) { + // By appending parameters one by one in the resulting snippet, + // we make it easier for the user to edit it according to his or her needs after pasting. + // The user can just add/remove lines adding/removing body parameters. + blank(); + + push( + `NSMutableData *postData = [[NSMutableData alloc] initWithData:[@"${postData.params[0].name}=${postData.params[0].value}" dataUsingEncoding:NSUTF8StringEncoding]];`, + ); + + for (let i = 1, len = postData.params.length; i < len; i++) { + push( + `[postData appendData:[@"&${postData.params[i].name}=${postData.params[i].value}" dataUsingEncoding:NSUTF8StringEncoding]];`, + ); + } + } + break; + + case 'application/json': + if (postData.jsonObj) { + push(nsDeclaration('NSDictionary', 'parameters', postData.jsonObj, opts.pretty)); + blank(); + push( + 'NSData *postData = [NSJSONSerialization dataWithJSONObject:parameters options:0 error:nil];', + ); + } + break; + + case 'multipart/form-data': + // By appending multipart parameters one by one in the resulting snippet, + // we make it easier for the user to edit it according to his or her needs after pasting. + // The user can just edit the parameters NSDictionary or put this part of a snippet in a multipart builder method. + push(nsDeclaration('NSArray', 'parameters', postData.params || [], opts.pretty)); + push(`NSString *boundary = @"${postData.boundary}";`); + blank(); + push('NSError *error;'); + push('NSMutableString *body = [NSMutableString string];'); + push('for (NSDictionary *param in parameters) {'); + push('[body appendFormat:@"--%@\\r\\n", boundary];', 1); + push('if (param[@"fileName"]) {', 1); + push( + '[body appendFormat:@"Content-Disposition:form-data; name=\\"%@\\"; filename=\\"%@\\"\\r\\n", param[@"name"], param[@"fileName"]];', + 2, + ); + push('[body appendFormat:@"Content-Type: %@\\r\\n\\r\\n", param[@"contentType"]];', 2); + push( + '[body appendFormat:@"%@", [NSString stringWithContentsOfFile:param[@"fileName"] encoding:NSUTF8StringEncoding error:&error]];', + 2, + ); + push('if (error) {', 2); + push('NSLog(@"%@", error);', 3); + push('}', 2); + push('} else {', 1); + push( + '[body appendFormat:@"Content-Disposition:form-data; name=\\"%@\\"\\r\\n\\r\\n", param[@"name"]];', + 2, + ); + push('[body appendFormat:@"%@", param[@"value"]];', 2); + push('}', 1); + push('}'); + push('[body appendFormat:@"\\r\\n--%@--\\r\\n", boundary];'); + push('NSData *postData = [body dataUsingEncoding:NSUTF8StringEncoding];'); + break; + + default: + blank(); + push( + `NSData *postData = [[NSData alloc] initWithData:[@"${postData.text}" dataUsingEncoding:NSUTF8StringEncoding]];`, + ); + } + } + + blank(); + push( + `NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:@"${fullUrl}"]`, + ); + + // NSURLRequestUseProtocolCachePolicy is the default policy, let's just always set it to avoid confusion. + push( + ' cachePolicy:NSURLRequestUseProtocolCachePolicy', + ); + push( + ` timeoutInterval:${opts.timeout.toFixed( + 1, + )}];`, + ); + push(`[request setHTTPMethod:@"${method}"];`); + + if (req.hasHeaders) { + push('[request setAllHTTPHeaderFields:headers];'); + } + + if (req.hasBody) { + push('[request setHTTPBody:postData];'); + } + + blank(); + + // Retrieving the shared session will be less verbose than creating a new one. + push('NSURLSession *session = [NSURLSession sharedSession];'); + push('NSURLSessionDataTask *dataTask = [session dataTaskWithRequest:request'); + push( + ' completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {', + ); + push(' if (error) {', 1); + push(' NSLog(@"%@", error);', 2); + push(' } else {', 1); + + // Casting the NSURLResponse to NSHTTPURLResponse so the user can see the status . + push( + ' NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *) response;', + 2, + ); + push(' NSLog(@"%@", httpResponse);', 2); + push(' }', 1); + push(' }];'); + push('[dataTask resume];'); + + return join(); + }, +}; diff --git a/test/fixtures/output/objc/nsurlsession/application-form-encoded.m b/src/targets/objc/nsurlsession/fixtures/application-form-encoded.m similarity index 98% rename from test/fixtures/output/objc/nsurlsession/application-form-encoded.m rename to src/targets/objc/nsurlsession/fixtures/application-form-encoded.m index 7ebd26e19..c8b23f0e9 100644 --- a/test/fixtures/output/objc/nsurlsession/application-form-encoded.m +++ b/src/targets/objc/nsurlsession/fixtures/application-form-encoded.m @@ -22,4 +22,4 @@ NSLog(@"%@", httpResponse); } }]; -[dataTask resume]; +[dataTask resume]; \ No newline at end of file diff --git a/test/fixtures/output/objc/nsurlsession/application-json.m b/src/targets/objc/nsurlsession/fixtures/application-json.m similarity index 98% rename from test/fixtures/output/objc/nsurlsession/application-json.m rename to src/targets/objc/nsurlsession/fixtures/application-json.m index 0249be026..749f518b4 100644 --- a/test/fixtures/output/objc/nsurlsession/application-json.m +++ b/src/targets/objc/nsurlsession/fixtures/application-json.m @@ -27,4 +27,4 @@ NSLog(@"%@", httpResponse); } }]; -[dataTask resume]; +[dataTask resume]; \ No newline at end of file diff --git a/test/fixtures/output/objc/nsurlsession/cookies.m b/src/targets/objc/nsurlsession/fixtures/cookies.m similarity index 98% rename from test/fixtures/output/objc/nsurlsession/cookies.m rename to src/targets/objc/nsurlsession/fixtures/cookies.m index 36e10f131..47ff51c53 100644 --- a/test/fixtures/output/objc/nsurlsession/cookies.m +++ b/src/targets/objc/nsurlsession/fixtures/cookies.m @@ -18,4 +18,4 @@ NSLog(@"%@", httpResponse); } }]; -[dataTask resume]; +[dataTask resume]; \ No newline at end of file diff --git a/test/fixtures/output/objc/nsurlsession/custom-method.m b/src/targets/objc/nsurlsession/fixtures/custom-method.m similarity index 98% rename from test/fixtures/output/objc/nsurlsession/custom-method.m rename to src/targets/objc/nsurlsession/fixtures/custom-method.m index 10e9e6752..80b2a5269 100644 --- a/test/fixtures/output/objc/nsurlsession/custom-method.m +++ b/src/targets/objc/nsurlsession/fixtures/custom-method.m @@ -15,4 +15,4 @@ NSLog(@"%@", httpResponse); } }]; -[dataTask resume]; +[dataTask resume]; \ No newline at end of file diff --git a/test/fixtures/output/objc/nsurlsession/full.m b/src/targets/objc/nsurlsession/fixtures/full.m similarity index 98% rename from test/fixtures/output/objc/nsurlsession/full.m rename to src/targets/objc/nsurlsession/fixtures/full.m index 52216b8eb..bff45158d 100644 --- a/test/fixtures/output/objc/nsurlsession/full.m +++ b/src/targets/objc/nsurlsession/fixtures/full.m @@ -23,4 +23,4 @@ NSLog(@"%@", httpResponse); } }]; -[dataTask resume]; +[dataTask resume]; \ No newline at end of file diff --git a/test/fixtures/output/objc/nsurlsession/headers.m b/src/targets/objc/nsurlsession/fixtures/headers.m similarity index 98% rename from test/fixtures/output/objc/nsurlsession/headers.m rename to src/targets/objc/nsurlsession/fixtures/headers.m index 1d226ff5b..83a467db2 100644 --- a/test/fixtures/output/objc/nsurlsession/headers.m +++ b/src/targets/objc/nsurlsession/fixtures/headers.m @@ -19,4 +19,4 @@ NSLog(@"%@", httpResponse); } }]; -[dataTask resume]; +[dataTask resume]; \ No newline at end of file diff --git a/test/fixtures/output/objc/nsurlsession/https.m b/src/targets/objc/nsurlsession/fixtures/https.m similarity index 98% rename from test/fixtures/output/objc/nsurlsession/https.m rename to src/targets/objc/nsurlsession/fixtures/https.m index b5ef41ea9..43b32f8d9 100644 --- a/test/fixtures/output/objc/nsurlsession/https.m +++ b/src/targets/objc/nsurlsession/fixtures/https.m @@ -15,4 +15,4 @@ NSLog(@"%@", httpResponse); } }]; -[dataTask resume]; +[dataTask resume]; \ No newline at end of file diff --git a/src/targets/objc/nsurlsession/fixtures/indent-option.m b/src/targets/objc/nsurlsession/fixtures/indent-option.m new file mode 100644 index 000000000..dca55cd3f --- /dev/null +++ b/src/targets/objc/nsurlsession/fixtures/indent-option.m @@ -0,0 +1,18 @@ +#import + +NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:@"http://mockbin.com/har"] + cachePolicy:NSURLRequestUseProtocolCachePolicy + timeoutInterval:10.0]; +[request setHTTPMethod:@"GET"]; + +NSURLSession *session = [NSURLSession sharedSession]; +NSURLSessionDataTask *dataTask = [session dataTaskWithRequest:request + completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) { + if (error) { + NSLog(@"%@", error); + } else { + NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *) response; + NSLog(@"%@", httpResponse); + } + }]; +[dataTask resume]; \ No newline at end of file diff --git a/src/targets/objc/nsurlsession/fixtures/json-with-null-value.m b/src/targets/objc/nsurlsession/fixtures/json-with-null-value.m new file mode 100644 index 000000000..a0c9162a6 --- /dev/null +++ b/src/targets/objc/nsurlsession/fixtures/json-with-null-value.m @@ -0,0 +1,25 @@ +#import + +NSDictionary *headers = @{ @"content-type": @"application/json" }; +NSDictionary *parameters = @{ @"foo": }; + +NSData *postData = [NSJSONSerialization dataWithJSONObject:parameters options:0 error:nil]; + +NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:@"http://mockbin.com/har"] + cachePolicy:NSURLRequestUseProtocolCachePolicy + timeoutInterval:10.0]; +[request setHTTPMethod:@"POST"]; +[request setAllHTTPHeaderFields:headers]; +[request setHTTPBody:postData]; + +NSURLSession *session = [NSURLSession sharedSession]; +NSURLSessionDataTask *dataTask = [session dataTaskWithRequest:request + completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) { + if (error) { + NSLog(@"%@", error); + } else { + NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *) response; + NSLog(@"%@", httpResponse); + } + }]; +[dataTask resume]; \ No newline at end of file diff --git a/test/fixtures/output/objc/nsurlsession/jsonObj-multiline.m b/src/targets/objc/nsurlsession/fixtures/jsonObj-multiline.m similarity index 98% rename from test/fixtures/output/objc/nsurlsession/jsonObj-multiline.m rename to src/targets/objc/nsurlsession/fixtures/jsonObj-multiline.m index 620fd5713..a54951d81 100644 --- a/test/fixtures/output/objc/nsurlsession/jsonObj-multiline.m +++ b/src/targets/objc/nsurlsession/fixtures/jsonObj-multiline.m @@ -22,4 +22,4 @@ NSLog(@"%@", httpResponse); } }]; -[dataTask resume]; +[dataTask resume]; \ No newline at end of file diff --git a/test/fixtures/output/objc/nsurlsession/jsonObj-null-value.m b/src/targets/objc/nsurlsession/fixtures/jsonObj-null-value.m similarity index 98% rename from test/fixtures/output/objc/nsurlsession/jsonObj-null-value.m rename to src/targets/objc/nsurlsession/fixtures/jsonObj-null-value.m index c13b4275b..a0c9162a6 100644 --- a/test/fixtures/output/objc/nsurlsession/jsonObj-null-value.m +++ b/src/targets/objc/nsurlsession/fixtures/jsonObj-null-value.m @@ -22,4 +22,4 @@ NSLog(@"%@", httpResponse); } }]; -[dataTask resume]; +[dataTask resume]; \ No newline at end of file diff --git a/test/fixtures/output/objc/nsurlsession/multipart-data.m b/src/targets/objc/nsurlsession/fixtures/multipart-data.m similarity index 99% rename from test/fixtures/output/objc/nsurlsession/multipart-data.m rename to src/targets/objc/nsurlsession/fixtures/multipart-data.m index 8b8d0de52..e35ac2217 100644 --- a/test/fixtures/output/objc/nsurlsession/multipart-data.m +++ b/src/targets/objc/nsurlsession/fixtures/multipart-data.m @@ -40,4 +40,4 @@ NSLog(@"%@", httpResponse); } }]; -[dataTask resume]; +[dataTask resume]; \ No newline at end of file diff --git a/test/fixtures/output/objc/nsurlsession/multipart-file.m b/src/targets/objc/nsurlsession/fixtures/multipart-file.m similarity index 99% rename from test/fixtures/output/objc/nsurlsession/multipart-file.m rename to src/targets/objc/nsurlsession/fixtures/multipart-file.m index 0b68070e2..05b802e5f 100644 --- a/test/fixtures/output/objc/nsurlsession/multipart-file.m +++ b/src/targets/objc/nsurlsession/fixtures/multipart-file.m @@ -40,4 +40,4 @@ NSLog(@"%@", httpResponse); } }]; -[dataTask resume]; +[dataTask resume]; \ No newline at end of file diff --git a/test/fixtures/output/objc/nsurlsession/multipart-form-data.m b/src/targets/objc/nsurlsession/fixtures/multipart-form-data.m similarity index 99% rename from test/fixtures/output/objc/nsurlsession/multipart-form-data.m rename to src/targets/objc/nsurlsession/fixtures/multipart-form-data.m index 0790bf768..d5150d914 100644 --- a/test/fixtures/output/objc/nsurlsession/multipart-form-data.m +++ b/src/targets/objc/nsurlsession/fixtures/multipart-form-data.m @@ -40,4 +40,4 @@ NSLog(@"%@", httpResponse); } }]; -[dataTask resume]; +[dataTask resume]; \ No newline at end of file diff --git a/test/fixtures/output/objc/nsurlsession/nested.m b/src/targets/objc/nsurlsession/fixtures/nested.m similarity index 98% rename from test/fixtures/output/objc/nsurlsession/nested.m rename to src/targets/objc/nsurlsession/fixtures/nested.m index b3c64dcf5..233d2f04f 100644 --- a/test/fixtures/output/objc/nsurlsession/nested.m +++ b/src/targets/objc/nsurlsession/fixtures/nested.m @@ -15,4 +15,4 @@ NSLog(@"%@", httpResponse); } }]; -[dataTask resume]; +[dataTask resume]; \ No newline at end of file diff --git a/src/targets/objc/nsurlsession/fixtures/pretty-option.m b/src/targets/objc/nsurlsession/fixtures/pretty-option.m new file mode 100644 index 000000000..80b8ceefa --- /dev/null +++ b/src/targets/objc/nsurlsession/fixtures/pretty-option.m @@ -0,0 +1,24 @@ +#import + +NSDictionary *headers = @{ @"cookie": @"foo=bar; bar=baz", @"accept": @"application/json", @"content-type": @"application/x-www-form-urlencoded" }; + +NSMutableData *postData = [[NSMutableData alloc] initWithData:[@"foo=bar" dataUsingEncoding:NSUTF8StringEncoding]]; + +NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:@"http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value"] + cachePolicy:NSURLRequestUseProtocolCachePolicy + timeoutInterval:10.0]; +[request setHTTPMethod:@"POST"]; +[request setAllHTTPHeaderFields:headers]; +[request setHTTPBody:postData]; + +NSURLSession *session = [NSURLSession sharedSession]; +NSURLSessionDataTask *dataTask = [session dataTaskWithRequest:request + completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) { + if (error) { + NSLog(@"%@", error); + } else { + NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *) response; + NSLog(@"%@", httpResponse); + } + }]; +[dataTask resume]; \ No newline at end of file diff --git a/test/fixtures/output/objc/nsurlsession/query.m b/src/targets/objc/nsurlsession/fixtures/query.m similarity index 98% rename from test/fixtures/output/objc/nsurlsession/query.m rename to src/targets/objc/nsurlsession/fixtures/query.m index 81cadfb31..a83550071 100644 --- a/test/fixtures/output/objc/nsurlsession/query.m +++ b/src/targets/objc/nsurlsession/fixtures/query.m @@ -15,4 +15,4 @@ NSLog(@"%@", httpResponse); } }]; -[dataTask resume]; +[dataTask resume]; \ No newline at end of file diff --git a/test/fixtures/output/objc/nsurlsession/short.m b/src/targets/objc/nsurlsession/fixtures/short.m similarity index 98% rename from test/fixtures/output/objc/nsurlsession/short.m rename to src/targets/objc/nsurlsession/fixtures/short.m index f3309b267..0ff8505e8 100644 --- a/test/fixtures/output/objc/nsurlsession/short.m +++ b/src/targets/objc/nsurlsession/fixtures/short.m @@ -15,4 +15,4 @@ NSLog(@"%@", httpResponse); } }]; -[dataTask resume]; +[dataTask resume]; \ No newline at end of file diff --git a/test/fixtures/output/objc/nsurlsession/text-plain.m b/src/targets/objc/nsurlsession/fixtures/text-plain.m similarity index 98% rename from test/fixtures/output/objc/nsurlsession/text-plain.m rename to src/targets/objc/nsurlsession/fixtures/text-plain.m index 7532a994a..f842e7466 100644 --- a/test/fixtures/output/objc/nsurlsession/text-plain.m +++ b/src/targets/objc/nsurlsession/fixtures/text-plain.m @@ -21,4 +21,4 @@ NSLog(@"%@", httpResponse); } }]; -[dataTask resume]; +[dataTask resume]; \ No newline at end of file diff --git a/src/targets/objc/nsurlsession/fixtures/timeout-option.m b/src/targets/objc/nsurlsession/fixtures/timeout-option.m new file mode 100644 index 000000000..8790362fa --- /dev/null +++ b/src/targets/objc/nsurlsession/fixtures/timeout-option.m @@ -0,0 +1,18 @@ +#import + +NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:@"http://mockbin.com/har"] + cachePolicy:NSURLRequestUseProtocolCachePolicy + timeoutInterval:5.0]; +[request setHTTPMethod:@"GET"]; + +NSURLSession *session = [NSURLSession sharedSession]; +NSURLSessionDataTask *dataTask = [session dataTaskWithRequest:request + completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) { + if (error) { + NSLog(@"%@", error); + } else { + NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *) response; + NSLog(@"%@", httpResponse); + } + }]; +[dataTask resume]; \ No newline at end of file diff --git a/src/targets/objc/target.ts b/src/targets/objc/target.ts new file mode 100644 index 000000000..78b3fe56f --- /dev/null +++ b/src/targets/objc/target.ts @@ -0,0 +1,14 @@ +import { Target } from '../targets'; +import { nsurlsession } from './nsurlsession/client'; + +export const objc: Target = { + info: { + key: 'objc', + title: 'Objective-C', + extname: '.m', + default: 'nsurlsession', + }, + clientsById: { + nsurlsession, + }, +}; diff --git a/src/targets/ocaml/cohttp.js b/src/targets/ocaml/cohttp.js deleted file mode 100644 index 76e2335c3..000000000 --- a/src/targets/ocaml/cohttp.js +++ /dev/null @@ -1,71 +0,0 @@ -/** - * @description - * HTTP code snippet generator for OCaml using CoHTTP. - * - * @author - * @SGrondin - * - * for any questions or issues regarding the generated code snippet, please open an issue mentioning the author. - */ - -'use strict' - -const CodeBuilder = require('../../helpers/code-builder') - -module.exports = function (source, options) { - const opts = Object.assign({ - indent: ' ' - }, options) - - const methods = ['get', 'post', 'head', 'delete', 'patch', 'put', 'options'] - const code = new CodeBuilder(opts.indent) - - code.push('open Cohttp_lwt_unix') - .push('open Cohttp') - .push('open Lwt') - .blank() - .push('let uri = Uri.of_string "%s" in', source.fullUrl) - - // Add headers, including the cookies - const headers = Object.keys(source.allHeaders) - - if (headers.length === 1) { - code.push('let headers = Header.add (Header.init ()) "%s" "%s" in', headers[0], source.allHeaders[headers[0]]) - } else if (headers.length > 1) { - code.push('let headers = Header.add_list (Header.init ()) [') - - headers.forEach(function (key) { - code.push(1, '("%s", "%s");', key, source.allHeaders[key]) - }) - - code.push('] in') - } - - // Add body - if (source.postData.text) { - // Just text - code.push('let body = Cohttp_lwt_body.of_string %s in', JSON.stringify(source.postData.text)) - } - - // Do the request - code.blank() - - code.push('Client.call %s%s%s uri', - headers.length ? '~headers ' : '', - source.postData.text ? '~body ' : '', - (methods.indexOf(source.method.toLowerCase()) >= 0 ? ('`' + source.method.toUpperCase()) : '(Code.method_of_string "' + source.method + '")') - ) - - // Catch result - code.push('>>= fun (res, body_stream) ->') - .push(1, '(* Do stuff with the result *)') - - return code.join() -} - -module.exports.info = { - key: 'cohttp', - title: 'CoHTTP', - link: 'https://github.com/mirage/ocaml-cohttp', - description: 'Cohttp is a very lightweight HTTP server using Lwt or Async for OCaml' -} diff --git a/src/targets/ocaml/cohttp/client.ts b/src/targets/ocaml/cohttp/client.ts new file mode 100644 index 000000000..766961d8c --- /dev/null +++ b/src/targets/ocaml/cohttp/client.ts @@ -0,0 +1,74 @@ +/** + * @description + * HTTP code snippet generator for OCaml using CoHTTP. + * + * @author + * @SGrondin + * + * for any questions or issues regarding the generated code snippet, please open an issue mentioning the author. + */ + +import { CodeBuilder } from '../../../helpers/code-builder'; +import { Client } from '../../targets'; + +export const cohttp: Client = { + info: { + key: 'cohttp', + title: 'CoHTTP', + link: 'https://github.com/mirage/ocaml-cohttp', + description: 'Cohttp is a very lightweight HTTP server using Lwt or Async for OCaml', + }, + convert: ({ fullUrl, allHeaders, postData, method }, options) => { + const opts = { + indent: ' ', + ...options, + }; + + const methods = ['get', 'post', 'head', 'delete', 'patch', 'put', 'options']; + const { push, blank, join } = new CodeBuilder({ indent: opts.indent }); + + push('open Cohttp_lwt_unix'); + push('open Cohttp'); + push('open Lwt'); + blank(); + push(`let uri = Uri.of_string "${fullUrl}" in`); + + // Add headers, including the cookies + const headers = Object.keys(allHeaders); + + if (headers.length === 1) { + push( + `let headers = Header.add (Header.init ()) "${headers[0]}" "${allHeaders[headers[0]]}" in`, + ); + } else if (headers.length > 1) { + push('let headers = Header.add_list (Header.init ()) ['); + headers.forEach(key => { + push(`("${key}", "${allHeaders[key]}");`, 1); + }); + push('] in'); + } + + // Add body + if (postData.text) { + // Just text + push(`let body = Cohttp_lwt_body.of_string ${JSON.stringify(postData.text)} in`); + } + + // Do the request + blank(); + + const h = headers.length ? '~headers ' : ''; + const b = postData.text ? '~body ' : ''; + const m = methods.includes(method.toLowerCase()) + ? `\`${method.toUpperCase()}` + : `(Code.method_of_string "${method}")`; + + push(`Client.call ${h}${b}${m} uri`); + + // Catch result + push('>>= fun (res, body_stream) ->'); + push('(* Do stuff with the result *)', 1); + + return join(); + }, +}; diff --git a/test/fixtures/output/ocaml/cohttp/application-form-encoded.ml b/src/targets/ocaml/cohttp/fixtures/application-form-encoded.ml similarity index 90% rename from test/fixtures/output/ocaml/cohttp/application-form-encoded.ml rename to src/targets/ocaml/cohttp/fixtures/application-form-encoded.ml index 8480d692e..5aa9364c9 100644 --- a/test/fixtures/output/ocaml/cohttp/application-form-encoded.ml +++ b/src/targets/ocaml/cohttp/fixtures/application-form-encoded.ml @@ -8,4 +8,4 @@ let body = Cohttp_lwt_body.of_string "foo=bar&hello=world" in Client.call ~headers ~body `POST uri >>= fun (res, body_stream) -> - (* Do stuff with the result *) + (* Do stuff with the result *) \ No newline at end of file diff --git a/test/fixtures/output/ocaml/cohttp/application-json.ml b/src/targets/ocaml/cohttp/fixtures/application-json.ml similarity index 92% rename from test/fixtures/output/ocaml/cohttp/application-json.ml rename to src/targets/ocaml/cohttp/fixtures/application-json.ml index dda6e550d..c6bd1c4ba 100644 --- a/test/fixtures/output/ocaml/cohttp/application-json.ml +++ b/src/targets/ocaml/cohttp/fixtures/application-json.ml @@ -8,4 +8,4 @@ let body = Cohttp_lwt_body.of_string "{\"number\":1,\"string\":\"f\\\"oo\",\"arr Client.call ~headers ~body `POST uri >>= fun (res, body_stream) -> - (* Do stuff with the result *) + (* Do stuff with the result *) \ No newline at end of file diff --git a/test/fixtures/output/ocaml/cohttp/cookies.ml b/src/targets/ocaml/cohttp/fixtures/cookies.ml similarity index 87% rename from test/fixtures/output/ocaml/cohttp/cookies.ml rename to src/targets/ocaml/cohttp/fixtures/cookies.ml index fdf6dccf3..0ffcc60b9 100644 --- a/test/fixtures/output/ocaml/cohttp/cookies.ml +++ b/src/targets/ocaml/cohttp/fixtures/cookies.ml @@ -7,4 +7,4 @@ let headers = Header.add (Header.init ()) "cookie" "foo=bar; bar=baz" in Client.call ~headers `POST uri >>= fun (res, body_stream) -> - (* Do stuff with the result *) + (* Do stuff with the result *) \ No newline at end of file diff --git a/test/fixtures/output/ocaml/cohttp/custom-method.ml b/src/targets/ocaml/cohttp/fixtures/custom-method.ml similarity index 84% rename from test/fixtures/output/ocaml/cohttp/custom-method.ml rename to src/targets/ocaml/cohttp/fixtures/custom-method.ml index fac0d1263..6a3adb283 100644 --- a/test/fixtures/output/ocaml/cohttp/custom-method.ml +++ b/src/targets/ocaml/cohttp/fixtures/custom-method.ml @@ -6,4 +6,4 @@ let uri = Uri.of_string "http://mockbin.com/har" in Client.call (Code.method_of_string "PROPFIND") uri >>= fun (res, body_stream) -> - (* Do stuff with the result *) + (* Do stuff with the result *) \ No newline at end of file diff --git a/test/fixtures/output/ocaml/cohttp/full.ml b/src/targets/ocaml/cohttp/fixtures/full.ml similarity index 92% rename from test/fixtures/output/ocaml/cohttp/full.ml rename to src/targets/ocaml/cohttp/fixtures/full.ml index c4b1dc04a..80155288b 100644 --- a/test/fixtures/output/ocaml/cohttp/full.ml +++ b/src/targets/ocaml/cohttp/fixtures/full.ml @@ -12,4 +12,4 @@ let body = Cohttp_lwt_body.of_string "foo=bar" in Client.call ~headers ~body `POST uri >>= fun (res, body_stream) -> - (* Do stuff with the result *) + (* Do stuff with the result *) \ No newline at end of file diff --git a/test/fixtures/output/ocaml/cohttp/headers.ml b/src/targets/ocaml/cohttp/fixtures/headers.ml similarity index 88% rename from test/fixtures/output/ocaml/cohttp/headers.ml rename to src/targets/ocaml/cohttp/fixtures/headers.ml index 6755d5a22..a2f3ce534 100644 --- a/test/fixtures/output/ocaml/cohttp/headers.ml +++ b/src/targets/ocaml/cohttp/fixtures/headers.ml @@ -10,4 +10,4 @@ let headers = Header.add_list (Header.init ()) [ Client.call ~headers `GET uri >>= fun (res, body_stream) -> - (* Do stuff with the result *) + (* Do stuff with the result *) \ No newline at end of file diff --git a/test/fixtures/output/ocaml/cohttp/https.ml b/src/targets/ocaml/cohttp/fixtures/https.ml similarity index 81% rename from test/fixtures/output/ocaml/cohttp/https.ml rename to src/targets/ocaml/cohttp/fixtures/https.ml index bb68b33b6..0ce0f1d96 100644 --- a/test/fixtures/output/ocaml/cohttp/https.ml +++ b/src/targets/ocaml/cohttp/fixtures/https.ml @@ -6,4 +6,4 @@ let uri = Uri.of_string "https://mockbin.com/har" in Client.call `GET uri >>= fun (res, body_stream) -> - (* Do stuff with the result *) + (* Do stuff with the result *) \ No newline at end of file diff --git a/test/fixtures/output/ocaml/cohttp/jsonObj-multiline.ml b/src/targets/ocaml/cohttp/fixtures/jsonObj-multiline.ml similarity index 90% rename from test/fixtures/output/ocaml/cohttp/jsonObj-multiline.ml rename to src/targets/ocaml/cohttp/fixtures/jsonObj-multiline.ml index 38dd89522..ddc449ca9 100644 --- a/test/fixtures/output/ocaml/cohttp/jsonObj-multiline.ml +++ b/src/targets/ocaml/cohttp/fixtures/jsonObj-multiline.ml @@ -8,4 +8,4 @@ let body = Cohttp_lwt_body.of_string "{\n \"foo\": \"bar\"\n}" in Client.call ~headers ~body `POST uri >>= fun (res, body_stream) -> - (* Do stuff with the result *) + (* Do stuff with the result *) \ No newline at end of file diff --git a/test/fixtures/output/ocaml/cohttp/jsonObj-null-value.ml b/src/targets/ocaml/cohttp/fixtures/jsonObj-null-value.ml similarity index 90% rename from test/fixtures/output/ocaml/cohttp/jsonObj-null-value.ml rename to src/targets/ocaml/cohttp/fixtures/jsonObj-null-value.ml index 20fbc6a4f..5a545c237 100644 --- a/test/fixtures/output/ocaml/cohttp/jsonObj-null-value.ml +++ b/src/targets/ocaml/cohttp/fixtures/jsonObj-null-value.ml @@ -8,4 +8,4 @@ let body = Cohttp_lwt_body.of_string "{\"foo\":null}" in Client.call ~headers ~body `POST uri >>= fun (res, body_stream) -> - (* Do stuff with the result *) + (* Do stuff with the result *) \ No newline at end of file diff --git a/test/fixtures/output/ocaml/cohttp/multipart-data.ml b/src/targets/ocaml/cohttp/fixtures/multipart-data.ml similarity index 93% rename from test/fixtures/output/ocaml/cohttp/multipart-data.ml rename to src/targets/ocaml/cohttp/fixtures/multipart-data.ml index 3d5b3c062..4fb843543 100644 --- a/test/fixtures/output/ocaml/cohttp/multipart-data.ml +++ b/src/targets/ocaml/cohttp/fixtures/multipart-data.ml @@ -8,4 +8,4 @@ let body = Cohttp_lwt_body.of_string "-----011000010111000001101001\r\nContent-D Client.call ~headers ~body `POST uri >>= fun (res, body_stream) -> - (* Do stuff with the result *) + (* Do stuff with the result *) \ No newline at end of file diff --git a/test/fixtures/output/ocaml/cohttp/multipart-file.ml b/src/targets/ocaml/cohttp/fixtures/multipart-file.ml similarity index 93% rename from test/fixtures/output/ocaml/cohttp/multipart-file.ml rename to src/targets/ocaml/cohttp/fixtures/multipart-file.ml index 96f8794ed..2a5062ef5 100644 --- a/test/fixtures/output/ocaml/cohttp/multipart-file.ml +++ b/src/targets/ocaml/cohttp/fixtures/multipart-file.ml @@ -8,4 +8,4 @@ let body = Cohttp_lwt_body.of_string "-----011000010111000001101001\r\nContent-D Client.call ~headers ~body `POST uri >>= fun (res, body_stream) -> - (* Do stuff with the result *) + (* Do stuff with the result *) \ No newline at end of file diff --git a/test/fixtures/output/ocaml/cohttp/multipart-form-data.ml b/src/targets/ocaml/cohttp/fixtures/multipart-form-data.ml similarity index 93% rename from test/fixtures/output/ocaml/cohttp/multipart-form-data.ml rename to src/targets/ocaml/cohttp/fixtures/multipart-form-data.ml index efc66b71a..31ac505e7 100644 --- a/test/fixtures/output/ocaml/cohttp/multipart-form-data.ml +++ b/src/targets/ocaml/cohttp/fixtures/multipart-form-data.ml @@ -8,4 +8,4 @@ let body = Cohttp_lwt_body.of_string "-----011000010111000001101001\r\nContent-D Client.call ~headers ~body `POST uri >>= fun (res, body_stream) -> - (* Do stuff with the result *) + (* Do stuff with the result *) \ No newline at end of file diff --git a/test/fixtures/output/ocaml/cohttp/nested.ml b/src/targets/ocaml/cohttp/fixtures/nested.ml similarity index 85% rename from test/fixtures/output/ocaml/cohttp/nested.ml rename to src/targets/ocaml/cohttp/fixtures/nested.ml index b9f95ece5..901559c9e 100644 --- a/test/fixtures/output/ocaml/cohttp/nested.ml +++ b/src/targets/ocaml/cohttp/fixtures/nested.ml @@ -6,4 +6,4 @@ let uri = Uri.of_string "http://mockbin.com/har?foo%5Bbar%5D=baz%2Czap&fiz=buz&k Client.call `GET uri >>= fun (res, body_stream) -> - (* Do stuff with the result *) + (* Do stuff with the result *) \ No newline at end of file diff --git a/test/fixtures/output/ocaml/cohttp/query.ml b/src/targets/ocaml/cohttp/fixtures/query.ml similarity index 84% rename from test/fixtures/output/ocaml/cohttp/query.ml rename to src/targets/ocaml/cohttp/fixtures/query.ml index 8634f1ab1..2102889e3 100644 --- a/test/fixtures/output/ocaml/cohttp/query.ml +++ b/src/targets/ocaml/cohttp/fixtures/query.ml @@ -6,4 +6,4 @@ let uri = Uri.of_string "http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=valu Client.call `GET uri >>= fun (res, body_stream) -> - (* Do stuff with the result *) + (* Do stuff with the result *) \ No newline at end of file diff --git a/test/fixtures/output/ocaml/cohttp/short.ml b/src/targets/ocaml/cohttp/fixtures/short.ml similarity index 81% rename from test/fixtures/output/ocaml/cohttp/short.ml rename to src/targets/ocaml/cohttp/fixtures/short.ml index 189bc3f53..9d03caae3 100644 --- a/test/fixtures/output/ocaml/cohttp/short.ml +++ b/src/targets/ocaml/cohttp/fixtures/short.ml @@ -6,4 +6,4 @@ let uri = Uri.of_string "http://mockbin.com/har" in Client.call `GET uri >>= fun (res, body_stream) -> - (* Do stuff with the result *) + (* Do stuff with the result *) \ No newline at end of file diff --git a/test/fixtures/output/ocaml/cohttp/text-plain.ml b/src/targets/ocaml/cohttp/fixtures/text-plain.ml similarity index 89% rename from test/fixtures/output/ocaml/cohttp/text-plain.ml rename to src/targets/ocaml/cohttp/fixtures/text-plain.ml index 28148e744..ce5770510 100644 --- a/test/fixtures/output/ocaml/cohttp/text-plain.ml +++ b/src/targets/ocaml/cohttp/fixtures/text-plain.ml @@ -8,4 +8,4 @@ let body = Cohttp_lwt_body.of_string "Hello World" in Client.call ~headers ~body `POST uri >>= fun (res, body_stream) -> - (* Do stuff with the result *) + (* Do stuff with the result *) \ No newline at end of file diff --git a/src/targets/ocaml/index.js b/src/targets/ocaml/index.js deleted file mode 100644 index 6fe00a888..000000000 --- a/src/targets/ocaml/index.js +++ /dev/null @@ -1,12 +0,0 @@ -'use strict' - -module.exports = { - info: { - key: 'ocaml', - title: 'OCaml', - extname: '.ml', - default: 'cohttp' - }, - - cohttp: require('./cohttp') -} diff --git a/src/targets/ocaml/target.ts b/src/targets/ocaml/target.ts new file mode 100644 index 000000000..305d7718e --- /dev/null +++ b/src/targets/ocaml/target.ts @@ -0,0 +1,14 @@ +import { Target } from '../targets'; +import { cohttp } from './cohttp/client'; + +export const ocaml: Target = { + info: { + key: 'ocaml', + title: 'OCaml', + extname: '.ml', + default: 'cohttp', + }, + clientsById: { + cohttp, + }, +}; diff --git a/src/targets/php/curl.js b/src/targets/php/curl.js deleted file mode 100644 index 1a7b6a8be..000000000 --- a/src/targets/php/curl.js +++ /dev/null @@ -1,138 +0,0 @@ -/** - * @description - * HTTP code snippet generator for PHP using curl-ext. - * - * @author - * @AhmadNassri - * - * for any questions or issues regarding the generated code snippet, please open an issue mentioning the author. - */ - -'use strict' - -const util = require('util') -const CodeBuilder = require('../../helpers/code-builder') - -module.exports = function (source, options) { - const opts = Object.assign({ - closingTag: false, - indent: ' ', - maxRedirects: 10, - namedErrors: false, - noTags: false, - shortTags: false, - timeout: 30 - }, options) - - const code = new CodeBuilder(opts.indent) - - if (!opts.noTags) { - code.push(opts.shortTags ? ' %s,', option.name, option.escape ? JSON.stringify(option.value) : option.value)) - } - }) - - // construct cookies - const cookies = source.cookies.map(function (cookie) { - return encodeURIComponent(cookie.name) + '=' + encodeURIComponent(cookie.value) - }) - - if (cookies.length) { - curlopts.push(util.format('CURLOPT_COOKIE => "%s",', cookies.join('; '))) - } - - // construct cookies - const headers = Object.keys(source.headersObj).sort().map(function (key) { - return util.format('"%s: %s"', key, source.headersObj[key]) - }) - - if (headers.length) { - curlopts.push('CURLOPT_HTTPHEADER => [') - .push(1, headers.join(',\n' + opts.indent + opts.indent)) - .push('],') - } - - code.push(1, curlopts.join()) - .push(']);') - .blank() - .push('$response = curl_exec($curl);') - .push('$err = curl_error($curl);') - .blank() - .push('curl_close($curl);') - .blank() - .push('if ($err) {') - - if (opts.namedErrors) { - code.push(1, 'echo array_flip(get_defined_constants(true)["curl"])[$err];') - } else { - code.push(1, 'echo "cURL Error #:" . $err;') - } - - code.push('} else {') - .push(1, 'echo $response;') - .push('}') - - if (!opts.noTags && opts.closingTag) { - code.blank() - .push('?>') - } - - return code.join() -} - -module.exports.info = { - key: 'curl', - title: 'cURL', - link: 'http://php.net/manual/en/book.curl.php', - description: 'PHP with ext-curl' -} diff --git a/src/targets/php/curl/client.ts b/src/targets/php/curl/client.ts new file mode 100644 index 000000000..13fb9d438 --- /dev/null +++ b/src/targets/php/curl/client.ts @@ -0,0 +1,156 @@ +/** + * @description + * HTTP code snippet generator for PHP using curl-ext. + * + * @author + * @AhmadNassri + * + * for any questions or issues regarding the generated code snippet, please open an issue mentioning the author. + */ + +import { CodeBuilder } from '../../../helpers/code-builder'; +import { Client } from '../../targets'; + +export interface CurlOptions { + closingTag?: boolean; + maxRedirects?: number; + nameErrors?: boolean; + noTags?: boolean; + shortTags?: boolean; + timeout?: number; +} + +export const curl: Client = { + info: { + key: 'curl', + title: 'cURL', + link: 'http://php.net/manual/en/book.curl.php', + description: 'PHP with ext-curl', + }, + convert: ({ uriObj, postData, fullUrl, method, httpVersion, cookies, headersObj }, options) => { + const opts = { + closingTag: false, + indent: ' ', + maxRedirects: 10, + namedErrors: false, + noTags: false, + shortTags: false, + timeout: 30, + ...options, + }; + + const { push, blank, join } = new CodeBuilder({ indent: opts.indent }); + + if (!opts.noTags) { + push(opts.shortTags ? ' { + if (value !== null && value !== undefined) { + curlopts.push(`${name} => ${escape ? JSON.stringify(value) : value},`); + } + }); + + // construct cookies + const curlCookies = cookies.map( + cookie => `${encodeURIComponent(cookie.name)}=${encodeURIComponent(cookie.value)}`, + ); + if (curlCookies.length) { + curlopts.push(`CURLOPT_COOKIE => "${curlCookies.join('; ')}",`); + } + + // construct cookies + const headers = Object.keys(headersObj) + .sort() + .map(key => `"${key}: ${headersObj[key]}"`); + + if (headers.length) { + curlopts.push('CURLOPT_HTTPHEADER => ['); + curlopts.push(headers.join(`,\n${opts.indent}${opts.indent}`), 1); + curlopts.push('],'); + } + + push(curlopts.join(), 1); + push(']);'); + blank(); + push('$response = curl_exec($curl);'); + push('$err = curl_error($curl);'); + blank(); + push('curl_close($curl);'); + blank(); + push('if ($err) {'); + + if (opts.namedErrors) { + push('echo array_flip(get_defined_constants(true)["curl"])[$err];', 1); + } else { + push('echo "cURL Error #:" . $err;', 1); + } + + push('} else {'); + push('echo $response;', 1); + push('}'); + + if (!opts.noTags && opts.closingTag) { + blank(); + push('?>'); + } + + return join(); + }, +}; diff --git a/test/fixtures/output/php/curl/application-form-encoded.php b/src/targets/php/curl/fixtures/application-form-encoded.php similarity index 99% rename from test/fixtures/output/php/curl/application-form-encoded.php rename to src/targets/php/curl/fixtures/application-form-encoded.php index 0892dd3ed..07d461e8e 100644 --- a/test/fixtures/output/php/curl/application-form-encoded.php +++ b/src/targets/php/curl/fixtures/application-form-encoded.php @@ -25,4 +25,4 @@ echo "cURL Error #:" . $err; } else { echo $response; -} +} \ No newline at end of file diff --git a/test/fixtures/output/php/curl/application-json.php b/src/targets/php/curl/fixtures/application-json.php similarity index 99% rename from test/fixtures/output/php/curl/application-json.php rename to src/targets/php/curl/fixtures/application-json.php index 8a0f0c1e4..9179e6296 100644 --- a/test/fixtures/output/php/curl/application-json.php +++ b/src/targets/php/curl/fixtures/application-json.php @@ -25,4 +25,4 @@ echo "cURL Error #:" . $err; } else { echo $response; -} +} \ No newline at end of file diff --git a/test/fixtures/output/php/curl/cookies.php b/src/targets/php/curl/fixtures/cookies.php similarity index 99% rename from test/fixtures/output/php/curl/cookies.php rename to src/targets/php/curl/fixtures/cookies.php index 28104300e..03479db46 100644 --- a/test/fixtures/output/php/curl/cookies.php +++ b/src/targets/php/curl/fixtures/cookies.php @@ -22,4 +22,4 @@ echo "cURL Error #:" . $err; } else { echo $response; -} +} \ No newline at end of file diff --git a/test/fixtures/output/php/curl/custom-method.php b/src/targets/php/curl/fixtures/custom-method.php similarity index 99% rename from test/fixtures/output/php/curl/custom-method.php rename to src/targets/php/curl/fixtures/custom-method.php index 08aa59732..a0a473aeb 100644 --- a/test/fixtures/output/php/curl/custom-method.php +++ b/src/targets/php/curl/fixtures/custom-method.php @@ -21,4 +21,4 @@ echo "cURL Error #:" . $err; } else { echo $response; -} +} \ No newline at end of file diff --git a/test/fixtures/output/php/curl/full.php b/src/targets/php/curl/fixtures/full.php similarity index 99% rename from test/fixtures/output/php/curl/full.php rename to src/targets/php/curl/fixtures/full.php index 6f342b6dd..fef4d120c 100644 --- a/test/fixtures/output/php/curl/full.php +++ b/src/targets/php/curl/fixtures/full.php @@ -27,4 +27,4 @@ echo "cURL Error #:" . $err; } else { echo $response; -} +} \ No newline at end of file diff --git a/test/fixtures/output/php/curl/headers.php b/src/targets/php/curl/fixtures/headers.php similarity index 99% rename from test/fixtures/output/php/curl/headers.php rename to src/targets/php/curl/fixtures/headers.php index 4e8be5acf..59cb2d5fe 100644 --- a/test/fixtures/output/php/curl/headers.php +++ b/src/targets/php/curl/fixtures/headers.php @@ -25,4 +25,4 @@ echo "cURL Error #:" . $err; } else { echo $response; -} +} \ No newline at end of file diff --git a/test/fixtures/output/php/curl/https.php b/src/targets/php/curl/fixtures/https.php similarity index 99% rename from test/fixtures/output/php/curl/https.php rename to src/targets/php/curl/fixtures/https.php index 7d97476ee..43fc2d24f 100644 --- a/test/fixtures/output/php/curl/https.php +++ b/src/targets/php/curl/fixtures/https.php @@ -21,4 +21,4 @@ echo "cURL Error #:" . $err; } else { echo $response; -} +} \ No newline at end of file diff --git a/test/fixtures/output/php/curl/jsonObj-multiline.php b/src/targets/php/curl/fixtures/jsonObj-multiline.php similarity index 99% rename from test/fixtures/output/php/curl/jsonObj-multiline.php rename to src/targets/php/curl/fixtures/jsonObj-multiline.php index 19f772744..8d90e55fe 100644 --- a/test/fixtures/output/php/curl/jsonObj-multiline.php +++ b/src/targets/php/curl/fixtures/jsonObj-multiline.php @@ -25,4 +25,4 @@ echo "cURL Error #:" . $err; } else { echo $response; -} +} \ No newline at end of file diff --git a/test/fixtures/output/php/curl/jsonObj-null-value.php b/src/targets/php/curl/fixtures/jsonObj-null-value.php similarity index 99% rename from test/fixtures/output/php/curl/jsonObj-null-value.php rename to src/targets/php/curl/fixtures/jsonObj-null-value.php index 99a228991..40bb4c775 100644 --- a/test/fixtures/output/php/curl/jsonObj-null-value.php +++ b/src/targets/php/curl/fixtures/jsonObj-null-value.php @@ -25,4 +25,4 @@ echo "cURL Error #:" . $err; } else { echo $response; -} +} \ No newline at end of file diff --git a/test/fixtures/output/php/curl/multipart-data.php b/src/targets/php/curl/fixtures/multipart-data.php similarity index 99% rename from test/fixtures/output/php/curl/multipart-data.php rename to src/targets/php/curl/fixtures/multipart-data.php index d6ce07fe3..2a36d5e03 100644 --- a/test/fixtures/output/php/curl/multipart-data.php +++ b/src/targets/php/curl/fixtures/multipart-data.php @@ -25,4 +25,4 @@ echo "cURL Error #:" . $err; } else { echo $response; -} +} \ No newline at end of file diff --git a/test/fixtures/output/php/curl/multipart-file.php b/src/targets/php/curl/fixtures/multipart-file.php similarity index 99% rename from test/fixtures/output/php/curl/multipart-file.php rename to src/targets/php/curl/fixtures/multipart-file.php index e238b8edf..a6f02e657 100644 --- a/test/fixtures/output/php/curl/multipart-file.php +++ b/src/targets/php/curl/fixtures/multipart-file.php @@ -25,4 +25,4 @@ echo "cURL Error #:" . $err; } else { echo $response; -} +} \ No newline at end of file diff --git a/test/fixtures/output/php/curl/multipart-form-data.php b/src/targets/php/curl/fixtures/multipart-form-data.php similarity index 99% rename from test/fixtures/output/php/curl/multipart-form-data.php rename to src/targets/php/curl/fixtures/multipart-form-data.php index 038aa49c9..0f159fcd6 100644 --- a/test/fixtures/output/php/curl/multipart-form-data.php +++ b/src/targets/php/curl/fixtures/multipart-form-data.php @@ -25,4 +25,4 @@ echo "cURL Error #:" . $err; } else { echo $response; -} +} \ No newline at end of file diff --git a/test/fixtures/output/php/curl/nested.php b/src/targets/php/curl/fixtures/nested.php similarity index 99% rename from test/fixtures/output/php/curl/nested.php rename to src/targets/php/curl/fixtures/nested.php index 9b345abe1..69a0a33b1 100644 --- a/test/fixtures/output/php/curl/nested.php +++ b/src/targets/php/curl/fixtures/nested.php @@ -21,4 +21,4 @@ echo "cURL Error #:" . $err; } else { echo $response; -} +} \ No newline at end of file diff --git a/test/fixtures/output/php/curl/query.php b/src/targets/php/curl/fixtures/query.php similarity index 99% rename from test/fixtures/output/php/curl/query.php rename to src/targets/php/curl/fixtures/query.php index 158e8511b..113951e75 100644 --- a/test/fixtures/output/php/curl/query.php +++ b/src/targets/php/curl/fixtures/query.php @@ -21,4 +21,4 @@ echo "cURL Error #:" . $err; } else { echo $response; -} +} \ No newline at end of file diff --git a/test/fixtures/output/php/curl/short.php b/src/targets/php/curl/fixtures/short.php similarity index 99% rename from test/fixtures/output/php/curl/short.php rename to src/targets/php/curl/fixtures/short.php index 9188e25cc..7b1aa0496 100644 --- a/test/fixtures/output/php/curl/short.php +++ b/src/targets/php/curl/fixtures/short.php @@ -21,4 +21,4 @@ echo "cURL Error #:" . $err; } else { echo $response; -} +} \ No newline at end of file diff --git a/test/fixtures/output/php/curl/text-plain.php b/src/targets/php/curl/fixtures/text-plain.php similarity index 99% rename from test/fixtures/output/php/curl/text-plain.php rename to src/targets/php/curl/fixtures/text-plain.php index 8fbb09dff..df1487033 100644 --- a/test/fixtures/output/php/curl/text-plain.php +++ b/src/targets/php/curl/fixtures/text-plain.php @@ -25,4 +25,4 @@ echo "cURL Error #:" . $err; } else { echo $response; -} +} \ No newline at end of file diff --git a/src/targets/php/helpers.js b/src/targets/php/helpers.js deleted file mode 100644 index 266d72bc5..000000000 --- a/src/targets/php/helpers.js +++ /dev/null @@ -1,86 +0,0 @@ -'use strict' - -const convert = function (obj, indent, lastIndent) { - let i, result - - if (!lastIndent) { - lastIndent = '' - } - - switch (Object.prototype.toString.call(obj)) { - case '[object Null]': - result = 'null' - break - - case '[object Undefined]': - result = 'null' - break - - case '[object String]': - result = "'" + obj.replace(/\\/g, '\\\\').replace(/'/g, "'") + "'" - break - - case '[object Number]': - result = obj.toString() - break - - case '[object Array]': - result = [] - - obj.forEach(function (item) { - result.push(convert(item, indent + indent, indent)) - }) - - result = '[\n' + indent + result.join(',\n' + indent) + '\n' + lastIndent + ']' - break - - case '[object Object]': - result = [] - for (i in obj) { - // eslint-disable-next-line no-prototype-builtins - if (obj.hasOwnProperty(i)) { - result.push(convert(i, indent) + ' => ' + convert(obj[i], indent + indent, indent)) - } - } - result = '[\n' + indent + result.join(',\n' + indent) + '\n' + lastIndent + ']' - break - - default: - result = 'null' - } - - return result -} - -module.exports = { - convert: convert, - methods: [ - 'ACL', - 'BASELINE_CONTROL', - 'CHECKIN', - 'CHECKOUT', - 'CONNECT', - 'COPY', - 'DELETE', - 'GET', - 'HEAD', - 'LABEL', - 'LOCK', - 'MERGE', - 'MKACTIVITY', - 'MKCOL', - 'MKWORKSPACE', - 'MOVE', - 'OPTIONS', - 'POST', - 'PROPFIND', - 'PROPPATCH', - 'PUT', - 'REPORT', - 'TRACE', - 'UNCHECKOUT', - 'UNLOCK', - 'UPDATE', - 'VERSION_CONTROL' - ] -} diff --git a/src/targets/php/helpers.ts b/src/targets/php/helpers.ts new file mode 100644 index 000000000..c58ab2c10 --- /dev/null +++ b/src/targets/php/helpers.ts @@ -0,0 +1,70 @@ +export const convertType = (obj: any[] | any, indent?: string, lastIndent?: string) => { + lastIndent = lastIndent || ''; + indent = indent || ''; + + switch (Object.prototype.toString.call(obj)) { + case '[object Null]': + return 'null'; + + case '[object Undefined]': + return 'null'; + + case '[object String]': + return `'${obj.replace(/\\/g, '\\\\').replace(/'/g, "'")}'`; + + case '[object Number]': + return obj.toString(); + + case '[object Array]': { + const contents = obj + .map((item: any) => convertType(item, `${indent}${indent}`, indent)) + .join(`,\n${indent}`); + return `[\n${indent}${contents}\n${lastIndent}]`; + } + + case '[object Object]': { + const result: string[] = []; + for (const i in obj) { + if (Object.hasOwn(obj, i)) { + result.push( + `${convertType(i, indent)} => ${convertType(obj[i], `${indent}${indent}`, indent)}`, + ); + } + } + return `[\n${indent}${result.join(`,\n${indent}`)}\n${lastIndent}]`; + } + + default: + return 'null'; + } +}; + +export const supportedMethods = [ + 'ACL', + 'BASELINE_CONTROL', + 'CHECKIN', + 'CHECKOUT', + 'CONNECT', + 'COPY', + 'DELETE', + 'GET', + 'HEAD', + 'LABEL', + 'LOCK', + 'MERGE', + 'MKACTIVITY', + 'MKCOL', + 'MKWORKSPACE', + 'MOVE', + 'OPTIONS', + 'POST', + 'PROPFIND', + 'PROPPATCH', + 'PUT', + 'REPORT', + 'TRACE', + 'UNCHECKOUT', + 'UNLOCK', + 'UPDATE', + 'VERSION_CONTROL', +]; diff --git a/src/targets/php/http1.js b/src/targets/php/http1.js deleted file mode 100644 index 97a6422c5..000000000 --- a/src/targets/php/http1.js +++ /dev/null @@ -1,96 +0,0 @@ -/** - * @description - * HTTP code snippet generator for PHP using curl-ext. - * - * @author - * @AhmadNassri - * - * for any questions or issues regarding the generated code snippet, please open an issue mentioning the author. - */ - -'use strict' - -const helpers = require('./helpers') -const CodeBuilder = require('../../helpers/code-builder') - -module.exports = function (source, options) { - const opts = Object.assign({ - closingTag: false, - indent: ' ', - noTags: false, - shortTags: false - }, options) - - const code = new CodeBuilder(opts.indent) - - if (!opts.noTags) { - code.push(opts.shortTags ? 'setUrl(%s);', helpers.convert(source.url)) - - if (~helpers.methods.indexOf(source.method.toUpperCase())) { - code.push('$request->setMethod(HTTP_METH_%s);', source.method.toUpperCase()) - } else { - code.push('$request->setMethod(HttpRequest::HTTP_METH_%s);', source.method.toUpperCase()) - } - - code.blank() - - if (Object.keys(source.queryObj).length) { - code.push('$request->setQueryData(%s);', helpers.convert(source.queryObj, opts.indent)) - .blank() - } - - if (Object.keys(source.headersObj).length) { - code.push('$request->setHeaders(%s);', helpers.convert(source.headersObj, opts.indent)) - .blank() - } - - if (Object.keys(source.cookiesObj).length) { - code.push('$request->setCookies(%s);', helpers.convert(source.cookiesObj, opts.indent)) - .blank() - } - - switch (source.postData.mimeType) { - case 'application/x-www-form-urlencoded': - code.push('$request->setContentType(%s);', helpers.convert(source.postData.mimeType)) - .push('$request->setPostFields(%s);', helpers.convert(source.postData.paramsObj, opts.indent)) - .blank() - break - - default: - if (source.postData.text) { - code.push('$request->setBody(%s);', helpers.convert(source.postData.text)) - .blank() - } - } - - code.push('try {') - .push(1, '$response = $request->send();') - .blank() - .push(1, 'echo $response->getBody();') - .push('} catch (HttpException $ex) {') - .push(1, 'echo $ex;') - .push('}') - - if (!opts.noTags && opts.closingTag) { - code.blank() - .push('?>') - } - - return code.join() -} - -module.exports.info = { - key: 'http1', - title: 'HTTP v1', - link: 'http://php.net/manual/en/book.http.php', - description: 'PHP with pecl/http v1' -} diff --git a/src/targets/php/http1/client.ts b/src/targets/php/http1/client.ts new file mode 100644 index 000000000..35a163701 --- /dev/null +++ b/src/targets/php/http1/client.ts @@ -0,0 +1,103 @@ +/** + * @description + * HTTP code snippet generator for PHP using curl-ext. + * + * @author + * @AhmadNassri + * + * for any questions or issues regarding the generated code snippet, please open an issue mentioning the author. + */ + +import { CodeBuilder } from '../../../helpers/code-builder'; +import { Client } from '../../targets'; +import { convertType, supportedMethods } from '../helpers'; + +export interface Http1Options { + closingTag?: boolean; + noTags?: boolean; + shortTags?: boolean; +} + +export const http1: Client = { + info: { + key: 'http1', + title: 'HTTP v1', + link: 'http://php.net/manual/en/book.http.php', + description: 'PHP with pecl/http v1', + }, + convert: ({ method, url, postData, queryObj, headersObj, cookiesObj }, options) => { + const opts = { + closingTag: false, + indent: ' ', + noTags: false, + shortTags: false, + ...options, + }; + + const { push, blank, join } = new CodeBuilder({ indent: opts.indent }); + + if (!opts.noTags) { + push(opts.shortTags ? 'setUrl(${convertType(url)});`); + + if (supportedMethods.includes(method.toUpperCase())) { + push(`$request->setMethod(HTTP_METH_${method.toUpperCase()});`); + } else { + push(`$request->setMethod(HttpRequest::HTTP_METH_${method.toUpperCase()});`); + } + + blank(); + + if (Object.keys(queryObj).length) { + push(`$request->setQueryData(${convertType(queryObj, opts.indent)});`); + blank(); + } + + if (Object.keys(headersObj).length) { + push(`$request->setHeaders(${convertType(headersObj, opts.indent)});`); + blank(); + } + + if (Object.keys(cookiesObj).length) { + push(`$request->setCookies(${convertType(cookiesObj, opts.indent)});`); + blank(); + } + + switch (postData.mimeType) { + case 'application/x-www-form-urlencoded': + push(`$request->setContentType(${convertType(postData.mimeType)});`); + push(`$request->setPostFields(${convertType(postData.paramsObj, opts.indent)});`); + blank(); + break; + + default: + if (postData.text) { + push(`$request->setBody(${convertType(postData.text)});`); + blank(); + } + } + + push('try {'); + push('$response = $request->send();', 1); + blank(); + push('echo $response->getBody();', 1); + push('} catch (HttpException $ex) {'); + push('echo $ex;', 1); + push('}'); + + if (!opts.noTags && opts.closingTag) { + blank(); + push('?>'); + } + + return join(); + }, +}; diff --git a/test/fixtures/output/php/http1/application-form-encoded.php b/src/targets/php/http1/fixtures/application-form-encoded.php similarity index 99% rename from test/fixtures/output/php/http1/application-form-encoded.php rename to src/targets/php/http1/fixtures/application-form-encoded.php index 44079b8a0..0300fd51b 100644 --- a/test/fixtures/output/php/http1/application-form-encoded.php +++ b/src/targets/php/http1/fixtures/application-form-encoded.php @@ -20,4 +20,4 @@ echo $response->getBody(); } catch (HttpException $ex) { echo $ex; -} +} \ No newline at end of file diff --git a/test/fixtures/output/php/http1/application-json.php b/src/targets/php/http1/fixtures/application-json.php similarity index 99% rename from test/fixtures/output/php/http1/application-json.php rename to src/targets/php/http1/fixtures/application-json.php index 15e736556..c90cfd732 100644 --- a/test/fixtures/output/php/http1/application-json.php +++ b/src/targets/php/http1/fixtures/application-json.php @@ -16,4 +16,4 @@ echo $response->getBody(); } catch (HttpException $ex) { echo $ex; -} +} \ No newline at end of file diff --git a/test/fixtures/output/php/http1/cookies.php b/src/targets/php/http1/fixtures/cookies.php similarity index 99% rename from test/fixtures/output/php/http1/cookies.php rename to src/targets/php/http1/fixtures/cookies.php index 032a4bb4f..305d015de 100644 --- a/test/fixtures/output/php/http1/cookies.php +++ b/src/targets/php/http1/fixtures/cookies.php @@ -15,4 +15,4 @@ echo $response->getBody(); } catch (HttpException $ex) { echo $ex; -} +} \ No newline at end of file diff --git a/test/fixtures/output/php/http1/custom-method.php b/src/targets/php/http1/fixtures/custom-method.php similarity index 99% rename from test/fixtures/output/php/http1/custom-method.php rename to src/targets/php/http1/fixtures/custom-method.php index ba4f9293f..90b954539 100644 --- a/test/fixtures/output/php/http1/custom-method.php +++ b/src/targets/php/http1/fixtures/custom-method.php @@ -10,4 +10,4 @@ echo $response->getBody(); } catch (HttpException $ex) { echo $ex; -} +} \ No newline at end of file diff --git a/test/fixtures/output/php/http1/full.php b/src/targets/php/http1/fixtures/full.php similarity index 99% rename from test/fixtures/output/php/http1/full.php rename to src/targets/php/http1/fixtures/full.php index f94481137..19c2a3fac 100644 --- a/test/fixtures/output/php/http1/full.php +++ b/src/targets/php/http1/fixtures/full.php @@ -34,4 +34,4 @@ echo $response->getBody(); } catch (HttpException $ex) { echo $ex; -} +} \ No newline at end of file diff --git a/test/fixtures/output/php/http1/headers.php b/src/targets/php/http1/fixtures/headers.php similarity index 99% rename from test/fixtures/output/php/http1/headers.php rename to src/targets/php/http1/fixtures/headers.php index 8f819c70f..d84998672 100644 --- a/test/fixtures/output/php/http1/headers.php +++ b/src/targets/php/http1/fixtures/headers.php @@ -15,4 +15,4 @@ echo $response->getBody(); } catch (HttpException $ex) { echo $ex; -} +} \ No newline at end of file diff --git a/test/fixtures/output/php/http1/https.php b/src/targets/php/http1/fixtures/https.php similarity index 99% rename from test/fixtures/output/php/http1/https.php rename to src/targets/php/http1/fixtures/https.php index dadd0653b..30fa129ab 100644 --- a/test/fixtures/output/php/http1/https.php +++ b/src/targets/php/http1/fixtures/https.php @@ -10,4 +10,4 @@ echo $response->getBody(); } catch (HttpException $ex) { echo $ex; -} +} \ No newline at end of file diff --git a/test/fixtures/output/php/http1/jsonObj-multiline.php b/src/targets/php/http1/fixtures/jsonObj-multiline.php similarity index 99% rename from test/fixtures/output/php/http1/jsonObj-multiline.php rename to src/targets/php/http1/fixtures/jsonObj-multiline.php index 88cf3d607..161f6e881 100644 --- a/test/fixtures/output/php/http1/jsonObj-multiline.php +++ b/src/targets/php/http1/fixtures/jsonObj-multiline.php @@ -18,4 +18,4 @@ echo $response->getBody(); } catch (HttpException $ex) { echo $ex; -} +} \ No newline at end of file diff --git a/test/fixtures/output/php/http1/jsonObj-null-value.php b/src/targets/php/http1/fixtures/jsonObj-null-value.php similarity index 99% rename from test/fixtures/output/php/http1/jsonObj-null-value.php rename to src/targets/php/http1/fixtures/jsonObj-null-value.php index 1b359a36e..df2a8d79a 100644 --- a/test/fixtures/output/php/http1/jsonObj-null-value.php +++ b/src/targets/php/http1/fixtures/jsonObj-null-value.php @@ -16,4 +16,4 @@ echo $response->getBody(); } catch (HttpException $ex) { echo $ex; -} +} \ No newline at end of file diff --git a/test/fixtures/output/php/http1/multipart-data.php b/src/targets/php/http1/fixtures/multipart-data.php similarity index 98% rename from test/fixtures/output/php/http1/multipart-data.php rename to src/targets/php/http1/fixtures/multipart-data.php index d93f59b65..9ea486192 100644 --- a/test/fixtures/output/php/http1/multipart-data.php +++ b/src/targets/php/http1/fixtures/multipart-data.php @@ -8,12 +8,12 @@ 'content-type' => 'multipart/form-data; boundary=---011000010111000001101001' ]); -$request->setBody('-----011000010111000001101001 -Content-Disposition: form-data; name="foo"; filename="hello.txt" -Content-Type: text/plain - -Hello World ------011000010111000001101001-- +$request->setBody('-----011000010111000001101001 +Content-Disposition: form-data; name="foo"; filename="hello.txt" +Content-Type: text/plain + +Hello World +-----011000010111000001101001-- '); try { @@ -22,4 +22,4 @@ echo $response->getBody(); } catch (HttpException $ex) { echo $ex; -} +} \ No newline at end of file diff --git a/test/fixtures/output/php/http1/multipart-file.php b/src/targets/php/http1/fixtures/multipart-file.php similarity index 98% rename from test/fixtures/output/php/http1/multipart-file.php rename to src/targets/php/http1/fixtures/multipart-file.php index b76557918..5e12e020b 100644 --- a/test/fixtures/output/php/http1/multipart-file.php +++ b/src/targets/php/http1/fixtures/multipart-file.php @@ -8,12 +8,12 @@ 'content-type' => 'multipart/form-data; boundary=---011000010111000001101001' ]); -$request->setBody('-----011000010111000001101001 -Content-Disposition: form-data; name="foo"; filename="hello.txt" -Content-Type: text/plain - - ------011000010111000001101001-- +$request->setBody('-----011000010111000001101001 +Content-Disposition: form-data; name="foo"; filename="hello.txt" +Content-Type: text/plain + + +-----011000010111000001101001-- '); try { @@ -22,4 +22,4 @@ echo $response->getBody(); } catch (HttpException $ex) { echo $ex; -} +} \ No newline at end of file diff --git a/test/fixtures/output/php/http1/multipart-form-data.php b/src/targets/php/http1/fixtures/multipart-form-data.php similarity index 98% rename from test/fixtures/output/php/http1/multipart-form-data.php rename to src/targets/php/http1/fixtures/multipart-form-data.php index d7227ca78..a5e45a992 100644 --- a/test/fixtures/output/php/http1/multipart-form-data.php +++ b/src/targets/php/http1/fixtures/multipart-form-data.php @@ -8,11 +8,11 @@ 'Content-Type' => 'multipart/form-data; boundary=---011000010111000001101001' ]); -$request->setBody('-----011000010111000001101001 -Content-Disposition: form-data; name="foo" - -bar ------011000010111000001101001-- +$request->setBody('-----011000010111000001101001 +Content-Disposition: form-data; name="foo" + +bar +-----011000010111000001101001-- '); try { @@ -21,4 +21,4 @@ echo $response->getBody(); } catch (HttpException $ex) { echo $ex; -} +} \ No newline at end of file diff --git a/test/fixtures/output/php/http1/nested.php b/src/targets/php/http1/fixtures/nested.php similarity index 99% rename from test/fixtures/output/php/http1/nested.php rename to src/targets/php/http1/fixtures/nested.php index d0963b977..ba0fcf022 100644 --- a/test/fixtures/output/php/http1/nested.php +++ b/src/targets/php/http1/fixtures/nested.php @@ -16,4 +16,4 @@ echo $response->getBody(); } catch (HttpException $ex) { echo $ex; -} +} \ No newline at end of file diff --git a/test/fixtures/output/php/http1/query.php b/src/targets/php/http1/fixtures/query.php similarity index 99% rename from test/fixtures/output/php/http1/query.php rename to src/targets/php/http1/fixtures/query.php index 76b3953c0..6b0f40358 100644 --- a/test/fixtures/output/php/http1/query.php +++ b/src/targets/php/http1/fixtures/query.php @@ -19,4 +19,4 @@ echo $response->getBody(); } catch (HttpException $ex) { echo $ex; -} +} \ No newline at end of file diff --git a/test/fixtures/output/php/http1/short.php b/src/targets/php/http1/fixtures/short.php similarity index 99% rename from test/fixtures/output/php/http1/short.php rename to src/targets/php/http1/fixtures/short.php index 3a7fa9a3c..e1df5852d 100644 --- a/test/fixtures/output/php/http1/short.php +++ b/src/targets/php/http1/fixtures/short.php @@ -10,4 +10,4 @@ echo $response->getBody(); } catch (HttpException $ex) { echo $ex; -} +} \ No newline at end of file diff --git a/test/fixtures/output/php/http1/text-plain.php b/src/targets/php/http1/fixtures/text-plain.php similarity index 99% rename from test/fixtures/output/php/http1/text-plain.php rename to src/targets/php/http1/fixtures/text-plain.php index 102f2fbda..1060f794a 100644 --- a/test/fixtures/output/php/http1/text-plain.php +++ b/src/targets/php/http1/fixtures/text-plain.php @@ -16,4 +16,4 @@ echo $response->getBody(); } catch (HttpException $ex) { echo $ex; -} +} \ No newline at end of file diff --git a/src/targets/php/http2.js b/src/targets/php/http2.js deleted file mode 100644 index b62a12c47..000000000 --- a/src/targets/php/http2.js +++ /dev/null @@ -1,132 +0,0 @@ -/** - * @description - * HTTP code snippet generator for PHP using curl-ext. - * - * @author - * @AhmadNassri - * - * for any questions or issues regarding the generated code snippet, please open an issue mentioning the author. - */ - -'use strict' - -const helpers = require('./helpers') -const headerHelpers = require('../../helpers/headers') -const CodeBuilder = require('../../helpers/code-builder') - -module.exports = function (source, options) { - const opts = Object.assign({ - closingTag: false, - indent: ' ', - noTags: false, - shortTags: false - }, options) - - const code = new CodeBuilder(opts.indent) - let hasBody = false - - if (!opts.noTags) { - code.push(opts.shortTags ? 'append(new http\\QueryString(%s));', helpers.convert(source.postData.paramsObj, opts.indent)) - .blank() - hasBody = true - break - - case 'multipart/form-data': { - const files = [] - const fields = {} - - source.postData.params.forEach(function (param) { - if (param.fileName) { - files.push({ - name: param.name, - type: param.contentType, - file: param.fileName, - data: param.value - }) - } else if (param.value) { - fields[param.name] = param.value - } - }) - - code.push('$body = new http\\Message\\Body;') - .push('$body->addForm(%s, %s);', - Object.keys(fields).length ? helpers.convert(fields, opts.indent) : 'null', - files.length ? helpers.convert(files, opts.indent) : 'null' - ) - - // remove the contentType header - if (headerHelpers.hasHeader(source.headersObj, 'content-type')) { - if (headerHelpers.getHeader(source.headersObj, 'content-type').indexOf('boundary')) { - delete source.headersObj[headerHelpers.getHeaderName(source.headersObj, 'content-type')] - } - } - - code.blank() - - hasBody = true - break - } - - default: - if (source.postData.text) { - code.push('$body = new http\\Message\\Body;') - .push('$body->append(%s);', helpers.convert(source.postData.text)) - .blank() - hasBody = true - } - } - - code.push('$request->setRequestUrl(%s);', helpers.convert(source.url)) - .push('$request->setRequestMethod(%s);', helpers.convert(source.method)) - - if (hasBody) { - code.push('$request->setBody($body);') - .blank() - } - - if (Object.keys(source.queryObj).length) { - code.push('$request->setQuery(new http\\QueryString(%s));', helpers.convert(source.queryObj, opts.indent)) - .blank() - } - - if (Object.keys(source.headersObj).length) { - code.push('$request->setHeaders(%s);', helpers.convert(source.headersObj, opts.indent)) - .blank() - } - - if (Object.keys(source.cookiesObj).length) { - code.blank() - .push('$client->setCookies(%s);', helpers.convert(source.cookiesObj, opts.indent)) - .blank() - } - - code.push('$client->enqueue($request)->send();') - .push('$response = $client->getResponse();') - .blank() - .push('echo $response->getBody();') - - if (!opts.noTags && opts.closingTag) { - code.blank() - .push('?>') - } - - return code.join() -} - -module.exports.info = { - key: 'http2', - title: 'HTTP v2', - link: 'http://devel-m6w6.rhcloud.com/mdref/http', - description: 'PHP with pecl/http v2' -} diff --git a/src/targets/php/http2/client.ts b/src/targets/php/http2/client.ts new file mode 100644 index 000000000..7df35e5f0 --- /dev/null +++ b/src/targets/php/http2/client.ts @@ -0,0 +1,151 @@ +/** + * @description + * HTTP code snippet generator for PHP using curl-ext. + * + * @author + * @AhmadNassri + * + * for any questions or issues regarding the generated code snippet, please open an issue mentioning the author. + */ + +import { CodeBuilder } from '../../../helpers/code-builder'; +import { getHeader, getHeaderName, hasHeader } from '../../../helpers/headers'; +import { Client } from '../../targets'; +import { convertType } from '../helpers'; + +export interface Http2Options { + closingTag?: boolean; + noTags?: boolean; + shortTags?: boolean; +} + +export const http2: Client = { + info: { + key: 'http2', + title: 'HTTP v2', + link: 'http://devel-m6w6.rhcloud.com/mdref/http', + description: 'PHP with pecl/http v2', + }, + convert: ({ postData, headersObj, method, queryObj, cookiesObj, url }, options) => { + const opts = { + closingTag: false, + indent: ' ', + noTags: false, + shortTags: false, + ...options, + }; + + const { push, blank, join } = new CodeBuilder({ indent: opts.indent }); + let hasBody = false; + + if (!opts.noTags) { + push(opts.shortTags ? 'append(new http\\QueryString(${convertType(postData.paramsObj, opts.indent)}));`, + ); + blank(); + hasBody = true; + break; + + case 'multipart/form-data': { + const files: { + name: string; + type: string | undefined; + file: string; + data: string | undefined; + [anything: string]: string | undefined; + }[] = []; + const fields: Record = {}; + postData.params?.forEach(({ name, fileName, value, contentType }) => { + if (fileName) { + files.push({ + name, + type: contentType, + file: fileName, + data: value, + }); + return; + } + if (value) { + fields[name] = value; + } + }); + + const field = Object.keys(fields).length ? convertType(fields, opts.indent) : 'null'; + const formValue = files.length ? convertType(files, opts.indent) : 'null'; + + push('$body = new http\\Message\\Body;'); + push(`$body->addForm(${field}, ${formValue});`); + + // remove the contentType header + if (hasHeader(headersObj, 'content-type')) { + if (getHeader(headersObj, 'content-type')?.indexOf('boundary')) { + const headerName = getHeaderName(headersObj, 'content-type'); + if (headerName) { + delete headersObj[headerName]; + } + } + } + + blank(); + + hasBody = true; + break; + } + + default: + if (postData.text) { + push('$body = new http\\Message\\Body;'); + push(`$body->append(${convertType(postData.text)});`); + blank(); + hasBody = true; + } + } + + push(`$request->setRequestUrl(${convertType(url)});`); + push(`$request->setRequestMethod(${convertType(method)});`); + + if (hasBody) { + push('$request->setBody($body);'); + blank(); + } + + if (Object.keys(queryObj).length) { + push(`$request->setQuery(new http\\QueryString(${convertType(queryObj, opts.indent)}));`); + blank(); + } + + if (Object.keys(headersObj).length) { + push(`$request->setHeaders(${convertType(headersObj, opts.indent)});`); + blank(); + } + + if (Object.keys(cookiesObj).length) { + blank(); + push(`$client->setCookies(${convertType(cookiesObj, opts.indent)});`); + blank(); + } + + push('$client->enqueue($request)->send();'); + push('$response = $client->getResponse();'); + blank(); + push('echo $response->getBody();'); + + if (!opts.noTags && opts.closingTag) { + blank(); + push('?>'); + } + + return join(); + }, +}; diff --git a/test/fixtures/output/php/http2/application-form-encoded.php b/src/targets/php/http2/fixtures/application-form-encoded.php similarity index 94% rename from test/fixtures/output/php/http2/application-form-encoded.php rename to src/targets/php/http2/fixtures/application-form-encoded.php index 97a029089..ee8a801ed 100644 --- a/test/fixtures/output/php/http2/application-form-encoded.php +++ b/src/targets/php/http2/fixtures/application-form-encoded.php @@ -20,4 +20,4 @@ $client->enqueue($request)->send(); $response = $client->getResponse(); -echo $response->getBody(); +echo $response->getBody(); \ No newline at end of file diff --git a/test/fixtures/output/php/http2/application-json.php b/src/targets/php/http2/fixtures/application-json.php similarity index 94% rename from test/fixtures/output/php/http2/application-json.php rename to src/targets/php/http2/fixtures/application-json.php index 908bbaddf..5f4198701 100644 --- a/test/fixtures/output/php/http2/application-json.php +++ b/src/targets/php/http2/fixtures/application-json.php @@ -17,4 +17,4 @@ $client->enqueue($request)->send(); $response = $client->getResponse(); -echo $response->getBody(); +echo $response->getBody(); \ No newline at end of file diff --git a/test/fixtures/output/php/http2/cookies.php b/src/targets/php/http2/fixtures/cookies.php similarity index 91% rename from test/fixtures/output/php/http2/cookies.php rename to src/targets/php/http2/fixtures/cookies.php index bf9a73665..eab8b0cc9 100644 --- a/test/fixtures/output/php/http2/cookies.php +++ b/src/targets/php/http2/fixtures/cookies.php @@ -14,4 +14,4 @@ $client->enqueue($request)->send(); $response = $client->getResponse(); -echo $response->getBody(); +echo $response->getBody(); \ No newline at end of file diff --git a/test/fixtures/output/php/http2/custom-method.php b/src/targets/php/http2/fixtures/custom-method.php similarity index 89% rename from test/fixtures/output/php/http2/custom-method.php rename to src/targets/php/http2/fixtures/custom-method.php index 6d4897297..b9664f2d5 100644 --- a/test/fixtures/output/php/http2/custom-method.php +++ b/src/targets/php/http2/fixtures/custom-method.php @@ -8,4 +8,4 @@ $client->enqueue($request)->send(); $response = $client->getResponse(); -echo $response->getBody(); +echo $response->getBody(); \ No newline at end of file diff --git a/test/fixtures/output/php/http2/full.php b/src/targets/php/http2/fixtures/full.php similarity index 96% rename from test/fixtures/output/php/http2/full.php rename to src/targets/php/http2/fixtures/full.php index d90cfd671..61491f6ba 100644 --- a/test/fixtures/output/php/http2/full.php +++ b/src/targets/php/http2/fixtures/full.php @@ -35,4 +35,4 @@ $client->enqueue($request)->send(); $response = $client->getResponse(); -echo $response->getBody(); +echo $response->getBody(); \ No newline at end of file diff --git a/test/fixtures/output/php/http2/headers.php b/src/targets/php/http2/fixtures/headers.php similarity index 92% rename from test/fixtures/output/php/http2/headers.php rename to src/targets/php/http2/fixtures/headers.php index 712a0275f..8dde62a2a 100644 --- a/test/fixtures/output/php/http2/headers.php +++ b/src/targets/php/http2/fixtures/headers.php @@ -13,4 +13,4 @@ $client->enqueue($request)->send(); $response = $client->getResponse(); -echo $response->getBody(); +echo $response->getBody(); \ No newline at end of file diff --git a/test/fixtures/output/php/http2/https.php b/src/targets/php/http2/fixtures/https.php similarity index 89% rename from test/fixtures/output/php/http2/https.php rename to src/targets/php/http2/fixtures/https.php index 12a233eae..6d18bbdab 100644 --- a/test/fixtures/output/php/http2/https.php +++ b/src/targets/php/http2/fixtures/https.php @@ -8,4 +8,4 @@ $client->enqueue($request)->send(); $response = $client->getResponse(); -echo $response->getBody(); +echo $response->getBody(); \ No newline at end of file diff --git a/test/fixtures/output/php/http2/jsonObj-multiline.php b/src/targets/php/http2/fixtures/jsonObj-multiline.php similarity index 93% rename from test/fixtures/output/php/http2/jsonObj-multiline.php rename to src/targets/php/http2/fixtures/jsonObj-multiline.php index d0ea37380..5b5931d5e 100644 --- a/test/fixtures/output/php/http2/jsonObj-multiline.php +++ b/src/targets/php/http2/fixtures/jsonObj-multiline.php @@ -19,4 +19,4 @@ $client->enqueue($request)->send(); $response = $client->getResponse(); -echo $response->getBody(); +echo $response->getBody(); \ No newline at end of file diff --git a/test/fixtures/output/php/http2/jsonObj-null-value.php b/src/targets/php/http2/fixtures/jsonObj-null-value.php similarity index 93% rename from test/fixtures/output/php/http2/jsonObj-null-value.php rename to src/targets/php/http2/fixtures/jsonObj-null-value.php index 70f50a59c..81b169cdf 100644 --- a/test/fixtures/output/php/http2/jsonObj-null-value.php +++ b/src/targets/php/http2/fixtures/jsonObj-null-value.php @@ -17,4 +17,4 @@ $client->enqueue($request)->send(); $response = $client->getResponse(); -echo $response->getBody(); +echo $response->getBody(); \ No newline at end of file diff --git a/test/fixtures/output/php/http2/multipart-data.php b/src/targets/php/http2/fixtures/multipart-data.php similarity index 94% rename from test/fixtures/output/php/http2/multipart-data.php rename to src/targets/php/http2/fixtures/multipart-data.php index b2cc65dfb..b8d02cb09 100644 --- a/test/fixtures/output/php/http2/multipart-data.php +++ b/src/targets/php/http2/fixtures/multipart-data.php @@ -20,4 +20,4 @@ $client->enqueue($request)->send(); $response = $client->getResponse(); -echo $response->getBody(); +echo $response->getBody(); \ No newline at end of file diff --git a/test/fixtures/output/php/http2/multipart-file.php b/src/targets/php/http2/fixtures/multipart-file.php similarity index 94% rename from test/fixtures/output/php/http2/multipart-file.php rename to src/targets/php/http2/fixtures/multipart-file.php index ff5d55333..c2c896e87 100644 --- a/test/fixtures/output/php/http2/multipart-file.php +++ b/src/targets/php/http2/fixtures/multipart-file.php @@ -20,4 +20,4 @@ $client->enqueue($request)->send(); $response = $client->getResponse(); -echo $response->getBody(); +echo $response->getBody(); \ No newline at end of file diff --git a/test/fixtures/output/php/http2/multipart-form-data.php b/src/targets/php/http2/fixtures/multipart-form-data.php similarity index 92% rename from test/fixtures/output/php/http2/multipart-form-data.php rename to src/targets/php/http2/fixtures/multipart-form-data.php index e76639d9d..f931658c6 100644 --- a/test/fixtures/output/php/http2/multipart-form-data.php +++ b/src/targets/php/http2/fixtures/multipart-form-data.php @@ -15,4 +15,4 @@ $client->enqueue($request)->send(); $response = $client->getResponse(); -echo $response->getBody(); +echo $response->getBody(); \ No newline at end of file diff --git a/test/fixtures/output/php/http2/nested.php b/src/targets/php/http2/fixtures/nested.php similarity index 92% rename from test/fixtures/output/php/http2/nested.php rename to src/targets/php/http2/fixtures/nested.php index c240f5c06..84d52597d 100644 --- a/test/fixtures/output/php/http2/nested.php +++ b/src/targets/php/http2/fixtures/nested.php @@ -14,4 +14,4 @@ $client->enqueue($request)->send(); $response = $client->getResponse(); -echo $response->getBody(); +echo $response->getBody(); \ No newline at end of file diff --git a/test/fixtures/output/php/http2/query.php b/src/targets/php/http2/fixtures/query.php similarity index 92% rename from test/fixtures/output/php/http2/query.php rename to src/targets/php/http2/fixtures/query.php index fd2b45025..9d1daa824 100644 --- a/test/fixtures/output/php/http2/query.php +++ b/src/targets/php/http2/fixtures/query.php @@ -17,4 +17,4 @@ $client->enqueue($request)->send(); $response = $client->getResponse(); -echo $response->getBody(); +echo $response->getBody(); \ No newline at end of file diff --git a/test/fixtures/output/php/http2/short.php b/src/targets/php/http2/fixtures/short.php similarity index 89% rename from test/fixtures/output/php/http2/short.php rename to src/targets/php/http2/fixtures/short.php index 1f4dba9a7..fec8c19dc 100644 --- a/test/fixtures/output/php/http2/short.php +++ b/src/targets/php/http2/fixtures/short.php @@ -8,4 +8,4 @@ $client->enqueue($request)->send(); $response = $client->getResponse(); -echo $response->getBody(); +echo $response->getBody(); \ No newline at end of file diff --git a/test/fixtures/output/php/http2/text-plain.php b/src/targets/php/http2/fixtures/text-plain.php similarity index 93% rename from test/fixtures/output/php/http2/text-plain.php rename to src/targets/php/http2/fixtures/text-plain.php index 1669d62a5..8d647880c 100644 --- a/test/fixtures/output/php/http2/text-plain.php +++ b/src/targets/php/http2/fixtures/text-plain.php @@ -17,4 +17,4 @@ $client->enqueue($request)->send(); $response = $client->getResponse(); -echo $response->getBody(); +echo $response->getBody(); \ No newline at end of file diff --git a/src/targets/php/index.js b/src/targets/php/index.js deleted file mode 100644 index 39f6bfa1a..000000000 --- a/src/targets/php/index.js +++ /dev/null @@ -1,14 +0,0 @@ -'use strict' - -module.exports = { - info: { - key: 'php', - title: 'PHP', - extname: '.php', - default: 'curl' - }, - - curl: require('./curl'), - http1: require('./http1'), - http2: require('./http2') -} diff --git a/src/targets/php/target.ts b/src/targets/php/target.ts new file mode 100644 index 000000000..67ff01719 --- /dev/null +++ b/src/targets/php/target.ts @@ -0,0 +1,18 @@ +import { Target } from '../targets'; +import { curl } from './curl/client'; +import { http1 } from './http1/client'; +import { http2 } from './http2/client'; + +export const php: Target = { + info: { + key: 'php', + title: 'PHP', + extname: '.php', + default: 'curl', + }, + clientsById: { + curl, + http1, + http2, + }, +}; diff --git a/src/targets/powershell/common.js b/src/targets/powershell/common.js deleted file mode 100644 index e6c53a538..000000000 --- a/src/targets/powershell/common.js +++ /dev/null @@ -1,55 +0,0 @@ -'use strict' - -const CodeBuilder = require('../../helpers/code-builder') -const helpers = require('../../helpers/headers') - -module.exports = function (command) { - return function (source, options) { - const code = new CodeBuilder() - const methods = ['GET', 'POST', 'PUT', 'DELETE', 'PATCH', 'HEAD', 'OPTIONS'] - - if (methods.indexOf(source.method.toUpperCase()) === -1) { - return 'Method not supported' - } - - const commandOptions = [] - - // Add headers, including the cookies - const headers = Object.keys(source.headersObj) - - // construct headers - if (headers.length) { - code.push('$headers=@{}') - headers.forEach(function (key) { - if (key !== 'connection') { // Not allowed - code.push('$headers.Add("%s", "%s")', key, source.headersObj[key]) - } - }) - commandOptions.push('-Headers $headers') - } - - // construct cookies - if (source.cookies.length) { - code.push('$session = New-Object Microsoft.PowerShell.Commands.WebRequestSession') - - source.cookies.forEach(function (cookie) { - code.push('$cookie = New-Object System.Net.Cookie') - - code.push("$cookie.Name = '%s'", cookie.name) - code.push("$cookie.Value = '%s'", cookie.value) - code.push("$cookie.Domain = '%s'", source.uriObj.host) - - code.push('$session.Cookies.Add($cookie)') - }) - commandOptions.push('-WebSession $session') - } - - if (source.postData.text) { - commandOptions.push("-ContentType '" + helpers.getHeader(source.allHeaders, 'content-type') + "'") - commandOptions.push("-Body '" + source.postData.text + "'") - } - - code.push("$response = %s -Uri '%s' -Method %s %s", command, source.fullUrl, source.method, commandOptions.join(' ')) - return code.join() - } -} diff --git a/src/targets/powershell/common.ts b/src/targets/powershell/common.ts new file mode 100644 index 000000000..cb1252d97 --- /dev/null +++ b/src/targets/powershell/common.ts @@ -0,0 +1,66 @@ +import { CodeBuilder } from '../../helpers/code-builder'; +import { getHeader } from '../../helpers/headers'; +import { Converter } from '../targets'; + +export type PowershellCommand = 'Invoke-RestMethod' | 'Invoke-WebRequest'; + +export const generatePowershellConvert = (command: PowershellCommand) => { + const convert: Converter = ({ + method, + headersObj, + cookies, + uriObj, + fullUrl, + postData, + allHeaders, + }) => { + const { push, join } = new CodeBuilder(); + const methods = ['GET', 'POST', 'PUT', 'DELETE', 'PATCH', 'HEAD', 'OPTIONS']; + + if (!methods.includes(method.toUpperCase())) { + return 'Method not supported'; + } + + const commandOptions = []; + + // Add headers, including the cookies + const headers = Object.keys(headersObj); + + // construct headers + if (headers.length) { + push('$headers=@{}'); + headers.forEach(key => { + if (key !== 'connection') { + // Not allowed + push(`$headers.Add("${key}", "${headersObj[key]}")`); + } + }); + commandOptions.push('-Headers $headers'); + } + + // construct cookies + if (cookies.length) { + push('$session = New-Object Microsoft.PowerShell.Commands.WebRequestSession'); + + cookies.forEach(cookie => { + push('$cookie = New-Object System.Net.Cookie'); + + push(`$cookie.Name = '${cookie.name}'`); + push(`$cookie.Value = '${cookie.value}'`); + push(`$cookie.Domain = '${uriObj.host}'`); + + push('$session.Cookies.Add($cookie)'); + }); + commandOptions.push('-WebSession $session'); + } + + if (postData.text) { + commandOptions.push(`-ContentType '${getHeader(allHeaders, 'content-type')}'`); + commandOptions.push(`-Body '${postData.text}'`); + } + + push(`$response = ${command} -Uri '${fullUrl}' -Method ${method} ${commandOptions.join(' ')}`); + return join(); + }; + return convert; +}; diff --git a/src/targets/powershell/index.js b/src/targets/powershell/index.js deleted file mode 100644 index a68ec35d9..000000000 --- a/src/targets/powershell/index.js +++ /dev/null @@ -1,13 +0,0 @@ -'use strict' - -module.exports = { - info: { - key: 'powershell', - title: 'Powershell', - extname: '.ps1', - default: 'webrequest' - }, - - webrequest: require('./webrequest'), - restmethod: require('./restmethod') -} diff --git a/src/targets/powershell/restmethod.js b/src/targets/powershell/restmethod.js deleted file mode 100644 index 366e449ab..000000000 --- a/src/targets/powershell/restmethod.js +++ /dev/null @@ -1,10 +0,0 @@ -'use strict' - -module.exports = require('./common')('Invoke-RestMethod') - -module.exports.info = { - key: 'restmethod', - title: 'Invoke-RestMethod', - link: 'https://docs.microsoft.com/en-us/powershell/module/Microsoft.PowerShell.Utility/Invoke-RestMethod', - description: 'Powershell Invoke-RestMethod client' -} diff --git a/src/targets/powershell/restmethod/client.ts b/src/targets/powershell/restmethod/client.ts new file mode 100644 index 000000000..9f87dc2bf --- /dev/null +++ b/src/targets/powershell/restmethod/client.ts @@ -0,0 +1,12 @@ +import { Client } from '../../targets'; +import { generatePowershellConvert } from '../common'; + +export const restmethod: Client = { + info: { + key: 'restmethod', + title: 'Invoke-RestMethod', + link: 'https://docs.microsoft.com/en-us/powershell/module/Microsoft.PowerShell.Utility/Invoke-RestMethod', + description: 'Powershell Invoke-RestMethod client', + }, + convert: generatePowershellConvert('Invoke-RestMethod'), +}; diff --git a/test/fixtures/output/powershell/restmethod/application-form-encoded.ps1 b/src/targets/powershell/restmethod/fixtures/application-form-encoded.ps1 similarity index 83% rename from test/fixtures/output/powershell/restmethod/application-form-encoded.ps1 rename to src/targets/powershell/restmethod/fixtures/application-form-encoded.ps1 index 5cb545216..d705a1099 100644 --- a/test/fixtures/output/powershell/restmethod/application-form-encoded.ps1 +++ b/src/targets/powershell/restmethod/fixtures/application-form-encoded.ps1 @@ -1,3 +1,3 @@ $headers=@{} $headers.Add("content-type", "application/x-www-form-urlencoded") -$response = Invoke-RestMethod -Uri 'http://mockbin.com/har' -Method POST -Headers $headers -ContentType 'application/x-www-form-urlencoded' -Body 'foo=bar&hello=world' +$response = Invoke-RestMethod -Uri 'http://mockbin.com/har' -Method POST -Headers $headers -ContentType 'application/x-www-form-urlencoded' -Body 'foo=bar&hello=world' \ No newline at end of file diff --git a/test/fixtures/output/powershell/restmethod/application-json.ps1 b/src/targets/powershell/restmethod/fixtures/application-json.ps1 similarity index 81% rename from test/fixtures/output/powershell/restmethod/application-json.ps1 rename to src/targets/powershell/restmethod/fixtures/application-json.ps1 index 326ca27b8..4c3de3ee5 100644 --- a/test/fixtures/output/powershell/restmethod/application-json.ps1 +++ b/src/targets/powershell/restmethod/fixtures/application-json.ps1 @@ -1,3 +1,3 @@ $headers=@{} $headers.Add("content-type", "application/json") -$response = Invoke-RestMethod -Uri 'http://mockbin.com/har' -Method POST -Headers $headers -ContentType 'application/json' -Body '{"number":1,"string":"f\"oo","arr":[1,2,3],"nested":{"a":"b"},"arr_mix":[1,"a",{"arr_mix_nested":{}}],"boolean":false}' +$response = Invoke-RestMethod -Uri 'http://mockbin.com/har' -Method POST -Headers $headers -ContentType 'application/json' -Body '{"number":1,"string":"f\"oo","arr":[1,2,3],"nested":{"a":"b"},"arr_mix":[1,"a",{"arr_mix_nested":{}}],"boolean":false}' \ No newline at end of file diff --git a/test/fixtures/output/powershell/restmethod/cookies.ps1 b/src/targets/powershell/restmethod/fixtures/cookies.ps1 similarity index 93% rename from test/fixtures/output/powershell/restmethod/cookies.ps1 rename to src/targets/powershell/restmethod/fixtures/cookies.ps1 index 378e1a56e..3b6bea174 100644 --- a/test/fixtures/output/powershell/restmethod/cookies.ps1 +++ b/src/targets/powershell/restmethod/fixtures/cookies.ps1 @@ -9,4 +9,4 @@ $cookie.Name = 'bar' $cookie.Value = 'baz' $cookie.Domain = 'mockbin.com' $session.Cookies.Add($cookie) -$response = Invoke-RestMethod -Uri 'http://mockbin.com/har' -Method POST -WebSession $session +$response = Invoke-RestMethod -Uri 'http://mockbin.com/har' -Method POST -WebSession $session \ No newline at end of file diff --git a/src/targets/powershell/restmethod/fixtures/custom-method.ps1 b/src/targets/powershell/restmethod/fixtures/custom-method.ps1 new file mode 100644 index 000000000..8eb41a680 --- /dev/null +++ b/src/targets/powershell/restmethod/fixtures/custom-method.ps1 @@ -0,0 +1 @@ +Method not supported \ No newline at end of file diff --git a/test/fixtures/output/powershell/restmethod/full.ps1 b/src/targets/powershell/restmethod/fixtures/full.ps1 similarity index 97% rename from test/fixtures/output/powershell/restmethod/full.ps1 rename to src/targets/powershell/restmethod/fixtures/full.ps1 index 1872466c9..302053654 100644 --- a/test/fixtures/output/powershell/restmethod/full.ps1 +++ b/src/targets/powershell/restmethod/fixtures/full.ps1 @@ -12,4 +12,4 @@ $cookie.Name = 'bar' $cookie.Value = 'baz' $cookie.Domain = 'mockbin.com' $session.Cookies.Add($cookie) -$response = Invoke-RestMethod -Uri 'http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value' -Method POST -Headers $headers -WebSession $session -ContentType 'application/x-www-form-urlencoded' -Body 'foo=bar' +$response = Invoke-RestMethod -Uri 'http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value' -Method POST -Headers $headers -WebSession $session -ContentType 'application/x-www-form-urlencoded' -Body 'foo=bar' \ No newline at end of file diff --git a/test/fixtures/output/powershell/restmethod/headers.ps1 b/src/targets/powershell/restmethod/fixtures/headers.ps1 similarity index 85% rename from test/fixtures/output/powershell/restmethod/headers.ps1 rename to src/targets/powershell/restmethod/fixtures/headers.ps1 index 7b2d92926..011f4352b 100644 --- a/test/fixtures/output/powershell/restmethod/headers.ps1 +++ b/src/targets/powershell/restmethod/fixtures/headers.ps1 @@ -1,4 +1,4 @@ $headers=@{} $headers.Add("accept", "application/json") $headers.Add("x-foo", "Bar") -$response = Invoke-RestMethod -Uri 'http://mockbin.com/har' -Method GET -Headers $headers +$response = Invoke-RestMethod -Uri 'http://mockbin.com/har' -Method GET -Headers $headers \ No newline at end of file diff --git a/test/fixtures/output/powershell/restmethod/https.ps1 b/src/targets/powershell/restmethod/fixtures/https.ps1 similarity index 86% rename from test/fixtures/output/powershell/restmethod/https.ps1 rename to src/targets/powershell/restmethod/fixtures/https.ps1 index 4498c2faf..cc1267c50 100644 --- a/test/fixtures/output/powershell/restmethod/https.ps1 +++ b/src/targets/powershell/restmethod/fixtures/https.ps1 @@ -1 +1 @@ -$response = Invoke-RestMethod -Uri 'https://mockbin.com/har' -Method GET +$response = Invoke-RestMethod -Uri 'https://mockbin.com/har' -Method GET \ No newline at end of file diff --git a/test/fixtures/output/powershell/restmethod/jsonObj-multiline.ps1 b/src/targets/powershell/restmethod/fixtures/jsonObj-multiline.ps1 similarity index 98% rename from test/fixtures/output/powershell/restmethod/jsonObj-multiline.ps1 rename to src/targets/powershell/restmethod/fixtures/jsonObj-multiline.ps1 index 32218032f..3fc13dbbb 100644 --- a/test/fixtures/output/powershell/restmethod/jsonObj-multiline.ps1 +++ b/src/targets/powershell/restmethod/fixtures/jsonObj-multiline.ps1 @@ -2,4 +2,4 @@ $headers=@{} $headers.Add("content-type", "application/json") $response = Invoke-RestMethod -Uri 'http://mockbin.com/har' -Method POST -Headers $headers -ContentType 'application/json' -Body '{ "foo": "bar" -}' +}' \ No newline at end of file diff --git a/test/fixtures/output/powershell/restmethod/jsonObj-null-value.ps1 b/src/targets/powershell/restmethod/fixtures/jsonObj-null-value.ps1 similarity index 92% rename from test/fixtures/output/powershell/restmethod/jsonObj-null-value.ps1 rename to src/targets/powershell/restmethod/fixtures/jsonObj-null-value.ps1 index 68c52ea5b..d697c60d3 100644 --- a/test/fixtures/output/powershell/restmethod/jsonObj-null-value.ps1 +++ b/src/targets/powershell/restmethod/fixtures/jsonObj-null-value.ps1 @@ -1,3 +1,3 @@ $headers=@{} $headers.Add("content-type", "application/json") -$response = Invoke-RestMethod -Uri 'http://mockbin.com/har' -Method POST -Headers $headers -ContentType 'application/json' -Body '{"foo":null}' +$response = Invoke-RestMethod -Uri 'http://mockbin.com/har' -Method POST -Headers $headers -ContentType 'application/json' -Body '{"foo":null}' \ No newline at end of file diff --git a/test/fixtures/output/powershell/restmethod/multipart-data.ps1 b/src/targets/powershell/restmethod/fixtures/multipart-data.ps1 similarity index 98% rename from test/fixtures/output/powershell/restmethod/multipart-data.ps1 rename to src/targets/powershell/restmethod/fixtures/multipart-data.ps1 index 9324af570..86f8b61b5 100644 --- a/test/fixtures/output/powershell/restmethod/multipart-data.ps1 +++ b/src/targets/powershell/restmethod/fixtures/multipart-data.ps1 @@ -1,9 +1,9 @@ $headers=@{} $headers.Add("content-type", "multipart/form-data; boundary=---011000010111000001101001") -$response = Invoke-RestMethod -Uri 'http://mockbin.com/har' -Method POST -Headers $headers -ContentType 'multipart/form-data; boundary=---011000010111000001101001' -Body '-----011000010111000001101001 -Content-Disposition: form-data; name="foo"; filename="hello.txt" -Content-Type: text/plain - -Hello World ------011000010111000001101001-- -' +$response = Invoke-RestMethod -Uri 'http://mockbin.com/har' -Method POST -Headers $headers -ContentType 'multipart/form-data; boundary=---011000010111000001101001' -Body '-----011000010111000001101001 +Content-Disposition: form-data; name="foo"; filename="hello.txt" +Content-Type: text/plain + +Hello World +-----011000010111000001101001-- +' \ No newline at end of file diff --git a/test/fixtures/output/powershell/restmethod/multipart-file.ps1 b/src/targets/powershell/restmethod/fixtures/multipart-file.ps1 similarity index 98% rename from test/fixtures/output/powershell/restmethod/multipart-file.ps1 rename to src/targets/powershell/restmethod/fixtures/multipart-file.ps1 index e1329cb24..4ca013335 100644 --- a/test/fixtures/output/powershell/restmethod/multipart-file.ps1 +++ b/src/targets/powershell/restmethod/fixtures/multipart-file.ps1 @@ -1,9 +1,9 @@ $headers=@{} $headers.Add("content-type", "multipart/form-data; boundary=---011000010111000001101001") -$response = Invoke-RestMethod -Uri 'http://mockbin.com/har' -Method POST -Headers $headers -ContentType 'multipart/form-data; boundary=---011000010111000001101001' -Body '-----011000010111000001101001 -Content-Disposition: form-data; name="foo"; filename="hello.txt" -Content-Type: text/plain - - ------011000010111000001101001-- -' +$response = Invoke-RestMethod -Uri 'http://mockbin.com/har' -Method POST -Headers $headers -ContentType 'multipart/form-data; boundary=---011000010111000001101001' -Body '-----011000010111000001101001 +Content-Disposition: form-data; name="foo"; filename="hello.txt" +Content-Type: text/plain + + +-----011000010111000001101001-- +' \ No newline at end of file diff --git a/test/fixtures/output/powershell/restmethod/multipart-form-data.ps1 b/src/targets/powershell/restmethod/fixtures/multipart-form-data.ps1 similarity index 98% rename from test/fixtures/output/powershell/restmethod/multipart-form-data.ps1 rename to src/targets/powershell/restmethod/fixtures/multipart-form-data.ps1 index bb78bfb10..3dd279d19 100644 --- a/test/fixtures/output/powershell/restmethod/multipart-form-data.ps1 +++ b/src/targets/powershell/restmethod/fixtures/multipart-form-data.ps1 @@ -1,8 +1,8 @@ $headers=@{} $headers.Add("Content-Type", "multipart/form-data; boundary=---011000010111000001101001") -$response = Invoke-RestMethod -Uri 'http://mockbin.com/har' -Method POST -Headers $headers -ContentType 'multipart/form-data; boundary=---011000010111000001101001' -Body '-----011000010111000001101001 -Content-Disposition: form-data; name="foo" - -bar ------011000010111000001101001-- -' +$response = Invoke-RestMethod -Uri 'http://mockbin.com/har' -Method POST -Headers $headers -ContentType 'multipart/form-data; boundary=---011000010111000001101001' -Body '-----011000010111000001101001 +Content-Disposition: form-data; name="foo" + +bar +-----011000010111000001101001-- +' \ No newline at end of file diff --git a/test/fixtures/output/powershell/restmethod/nested.ps1 b/src/targets/powershell/restmethod/fixtures/nested.ps1 similarity index 56% rename from test/fixtures/output/powershell/restmethod/nested.ps1 rename to src/targets/powershell/restmethod/fixtures/nested.ps1 index 2fb02991f..cd2b5a97e 100644 --- a/test/fixtures/output/powershell/restmethod/nested.ps1 +++ b/src/targets/powershell/restmethod/fixtures/nested.ps1 @@ -1 +1 @@ -$response = Invoke-RestMethod -Uri 'http://mockbin.com/har?foo%5Bbar%5D=baz%2Czap&fiz=buz&key=value' -Method GET +$response = Invoke-RestMethod -Uri 'http://mockbin.com/har?foo%5Bbar%5D=baz%2Czap&fiz=buz&key=value' -Method GET \ No newline at end of file diff --git a/test/fixtures/output/powershell/restmethod/query.ps1 b/src/targets/powershell/restmethod/fixtures/query.ps1 similarity index 59% rename from test/fixtures/output/powershell/restmethod/query.ps1 rename to src/targets/powershell/restmethod/fixtures/query.ps1 index 8f6a1d5d4..19690a8e7 100644 --- a/test/fixtures/output/powershell/restmethod/query.ps1 +++ b/src/targets/powershell/restmethod/fixtures/query.ps1 @@ -1 +1 @@ -$response = Invoke-RestMethod -Uri 'http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value' -Method GET +$response = Invoke-RestMethod -Uri 'http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value' -Method GET \ No newline at end of file diff --git a/test/fixtures/output/powershell/restmethod/short.ps1 b/src/targets/powershell/restmethod/fixtures/short.ps1 similarity index 87% rename from test/fixtures/output/powershell/restmethod/short.ps1 rename to src/targets/powershell/restmethod/fixtures/short.ps1 index f4d4884b3..8c3a6d296 100644 --- a/test/fixtures/output/powershell/restmethod/short.ps1 +++ b/src/targets/powershell/restmethod/fixtures/short.ps1 @@ -1 +1 @@ -$response = Invoke-RestMethod -Uri 'http://mockbin.com/har' -Method GET +$response = Invoke-RestMethod -Uri 'http://mockbin.com/har' -Method GET \ No newline at end of file diff --git a/test/fixtures/output/powershell/restmethod/text-plain.ps1 b/src/targets/powershell/restmethod/fixtures/text-plain.ps1 similarity index 95% rename from test/fixtures/output/powershell/restmethod/text-plain.ps1 rename to src/targets/powershell/restmethod/fixtures/text-plain.ps1 index ccfdf4925..88f78ecc9 100644 --- a/test/fixtures/output/powershell/restmethod/text-plain.ps1 +++ b/src/targets/powershell/restmethod/fixtures/text-plain.ps1 @@ -1,3 +1,3 @@ $headers=@{} $headers.Add("content-type", "text/plain") -$response = Invoke-RestMethod -Uri 'http://mockbin.com/har' -Method POST -Headers $headers -ContentType 'text/plain' -Body 'Hello World' +$response = Invoke-RestMethod -Uri 'http://mockbin.com/har' -Method POST -Headers $headers -ContentType 'text/plain' -Body 'Hello World' \ No newline at end of file diff --git a/src/targets/powershell/target.ts b/src/targets/powershell/target.ts new file mode 100644 index 000000000..9625ac729 --- /dev/null +++ b/src/targets/powershell/target.ts @@ -0,0 +1,16 @@ +import { Target } from '../targets'; +import { restmethod } from './restmethod/client'; +import { webrequest } from './webrequest/client'; + +export const powershell: Target = { + info: { + key: 'powershell', + title: 'Powershell', + extname: '.ps1', + default: 'webrequest', + }, + clientsById: { + webrequest, + restmethod, + }, +}; diff --git a/src/targets/powershell/webrequest.js b/src/targets/powershell/webrequest.js deleted file mode 100644 index 9888eb64e..000000000 --- a/src/targets/powershell/webrequest.js +++ /dev/null @@ -1,10 +0,0 @@ -'use strict' - -module.exports = require('./common')('Invoke-WebRequest') - -module.exports.info = { - key: 'webrequest', - title: 'Invoke-WebRequest', - link: 'https://docs.microsoft.com/en-us/powershell/module/Microsoft.PowerShell.Utility/Invoke-WebRequest', - description: 'Powershell Invoke-WebRequest client' -} diff --git a/src/targets/powershell/webrequest/client.ts b/src/targets/powershell/webrequest/client.ts new file mode 100644 index 000000000..1cacb5103 --- /dev/null +++ b/src/targets/powershell/webrequest/client.ts @@ -0,0 +1,12 @@ +import { Client } from '../../targets'; +import { generatePowershellConvert } from '../common'; + +export const webrequest: Client = { + info: { + key: 'webrequest', + title: 'Invoke-WebRequest', + link: 'https://docs.microsoft.com/en-us/powershell/module/Microsoft.PowerShell.Utility/Invoke-WebRequest', + description: 'Powershell Invoke-WebRequest client', + }, + convert: generatePowershellConvert('Invoke-WebRequest'), +}; diff --git a/test/fixtures/output/powershell/webrequest/application-form-encoded.ps1 b/src/targets/powershell/webrequest/fixtures/application-form-encoded.ps1 similarity index 83% rename from test/fixtures/output/powershell/webrequest/application-form-encoded.ps1 rename to src/targets/powershell/webrequest/fixtures/application-form-encoded.ps1 index 9ea45de5c..523cc2cb8 100644 --- a/test/fixtures/output/powershell/webrequest/application-form-encoded.ps1 +++ b/src/targets/powershell/webrequest/fixtures/application-form-encoded.ps1 @@ -1,3 +1,3 @@ $headers=@{} $headers.Add("content-type", "application/x-www-form-urlencoded") -$response = Invoke-WebRequest -Uri 'http://mockbin.com/har' -Method POST -Headers $headers -ContentType 'application/x-www-form-urlencoded' -Body 'foo=bar&hello=world' +$response = Invoke-WebRequest -Uri 'http://mockbin.com/har' -Method POST -Headers $headers -ContentType 'application/x-www-form-urlencoded' -Body 'foo=bar&hello=world' \ No newline at end of file diff --git a/test/fixtures/output/powershell/webrequest/application-json.ps1 b/src/targets/powershell/webrequest/fixtures/application-json.ps1 similarity index 81% rename from test/fixtures/output/powershell/webrequest/application-json.ps1 rename to src/targets/powershell/webrequest/fixtures/application-json.ps1 index 786292da3..c036e408f 100644 --- a/test/fixtures/output/powershell/webrequest/application-json.ps1 +++ b/src/targets/powershell/webrequest/fixtures/application-json.ps1 @@ -1,3 +1,3 @@ $headers=@{} $headers.Add("content-type", "application/json") -$response = Invoke-WebRequest -Uri 'http://mockbin.com/har' -Method POST -Headers $headers -ContentType 'application/json' -Body '{"number":1,"string":"f\"oo","arr":[1,2,3],"nested":{"a":"b"},"arr_mix":[1,"a",{"arr_mix_nested":{}}],"boolean":false}' +$response = Invoke-WebRequest -Uri 'http://mockbin.com/har' -Method POST -Headers $headers -ContentType 'application/json' -Body '{"number":1,"string":"f\"oo","arr":[1,2,3],"nested":{"a":"b"},"arr_mix":[1,"a",{"arr_mix_nested":{}}],"boolean":false}' \ No newline at end of file diff --git a/test/fixtures/output/powershell/webrequest/cookies.ps1 b/src/targets/powershell/webrequest/fixtures/cookies.ps1 similarity index 93% rename from test/fixtures/output/powershell/webrequest/cookies.ps1 rename to src/targets/powershell/webrequest/fixtures/cookies.ps1 index b1fe95a6d..f3548b1a6 100644 --- a/test/fixtures/output/powershell/webrequest/cookies.ps1 +++ b/src/targets/powershell/webrequest/fixtures/cookies.ps1 @@ -9,4 +9,4 @@ $cookie.Name = 'bar' $cookie.Value = 'baz' $cookie.Domain = 'mockbin.com' $session.Cookies.Add($cookie) -$response = Invoke-WebRequest -Uri 'http://mockbin.com/har' -Method POST -WebSession $session +$response = Invoke-WebRequest -Uri 'http://mockbin.com/har' -Method POST -WebSession $session \ No newline at end of file diff --git a/src/targets/powershell/webrequest/fixtures/custom-method.ps1 b/src/targets/powershell/webrequest/fixtures/custom-method.ps1 new file mode 100644 index 000000000..8eb41a680 --- /dev/null +++ b/src/targets/powershell/webrequest/fixtures/custom-method.ps1 @@ -0,0 +1 @@ +Method not supported \ No newline at end of file diff --git a/test/fixtures/output/powershell/webrequest/full.ps1 b/src/targets/powershell/webrequest/fixtures/full.ps1 similarity index 97% rename from test/fixtures/output/powershell/webrequest/full.ps1 rename to src/targets/powershell/webrequest/fixtures/full.ps1 index 42e308f7f..ac25ee6e4 100644 --- a/test/fixtures/output/powershell/webrequest/full.ps1 +++ b/src/targets/powershell/webrequest/fixtures/full.ps1 @@ -12,4 +12,4 @@ $cookie.Name = 'bar' $cookie.Value = 'baz' $cookie.Domain = 'mockbin.com' $session.Cookies.Add($cookie) -$response = Invoke-WebRequest -Uri 'http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value' -Method POST -Headers $headers -WebSession $session -ContentType 'application/x-www-form-urlencoded' -Body 'foo=bar' +$response = Invoke-WebRequest -Uri 'http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value' -Method POST -Headers $headers -WebSession $session -ContentType 'application/x-www-form-urlencoded' -Body 'foo=bar' \ No newline at end of file diff --git a/test/fixtures/output/powershell/webrequest/headers.ps1 b/src/targets/powershell/webrequest/fixtures/headers.ps1 similarity index 85% rename from test/fixtures/output/powershell/webrequest/headers.ps1 rename to src/targets/powershell/webrequest/fixtures/headers.ps1 index a6a817e6d..12070b195 100644 --- a/test/fixtures/output/powershell/webrequest/headers.ps1 +++ b/src/targets/powershell/webrequest/fixtures/headers.ps1 @@ -1,4 +1,4 @@ $headers=@{} $headers.Add("accept", "application/json") $headers.Add("x-foo", "Bar") -$response = Invoke-WebRequest -Uri 'http://mockbin.com/har' -Method GET -Headers $headers +$response = Invoke-WebRequest -Uri 'http://mockbin.com/har' -Method GET -Headers $headers \ No newline at end of file diff --git a/test/fixtures/output/powershell/webrequest/https.ps1 b/src/targets/powershell/webrequest/fixtures/https.ps1 similarity index 86% rename from test/fixtures/output/powershell/webrequest/https.ps1 rename to src/targets/powershell/webrequest/fixtures/https.ps1 index 876300c1d..58eeeb544 100644 --- a/test/fixtures/output/powershell/webrequest/https.ps1 +++ b/src/targets/powershell/webrequest/fixtures/https.ps1 @@ -1 +1 @@ -$response = Invoke-WebRequest -Uri 'https://mockbin.com/har' -Method GET +$response = Invoke-WebRequest -Uri 'https://mockbin.com/har' -Method GET \ No newline at end of file diff --git a/test/fixtures/output/powershell/webrequest/jsonObj-multiline.ps1 b/src/targets/powershell/webrequest/fixtures/jsonObj-multiline.ps1 similarity index 98% rename from test/fixtures/output/powershell/webrequest/jsonObj-multiline.ps1 rename to src/targets/powershell/webrequest/fixtures/jsonObj-multiline.ps1 index 6548f2007..52ccee8f8 100644 --- a/test/fixtures/output/powershell/webrequest/jsonObj-multiline.ps1 +++ b/src/targets/powershell/webrequest/fixtures/jsonObj-multiline.ps1 @@ -2,4 +2,4 @@ $headers=@{} $headers.Add("content-type", "application/json") $response = Invoke-WebRequest -Uri 'http://mockbin.com/har' -Method POST -Headers $headers -ContentType 'application/json' -Body '{ "foo": "bar" -}' +}' \ No newline at end of file diff --git a/test/fixtures/output/powershell/webrequest/jsonObj-null-value.ps1 b/src/targets/powershell/webrequest/fixtures/jsonObj-null-value.ps1 similarity index 92% rename from test/fixtures/output/powershell/webrequest/jsonObj-null-value.ps1 rename to src/targets/powershell/webrequest/fixtures/jsonObj-null-value.ps1 index 1ee9a4f01..a97cbb849 100644 --- a/test/fixtures/output/powershell/webrequest/jsonObj-null-value.ps1 +++ b/src/targets/powershell/webrequest/fixtures/jsonObj-null-value.ps1 @@ -1,3 +1,3 @@ $headers=@{} $headers.Add("content-type", "application/json") -$response = Invoke-WebRequest -Uri 'http://mockbin.com/har' -Method POST -Headers $headers -ContentType 'application/json' -Body '{"foo":null}' +$response = Invoke-WebRequest -Uri 'http://mockbin.com/har' -Method POST -Headers $headers -ContentType 'application/json' -Body '{"foo":null}' \ No newline at end of file diff --git a/test/fixtures/output/powershell/webrequest/multipart-data.ps1 b/src/targets/powershell/webrequest/fixtures/multipart-data.ps1 similarity index 98% rename from test/fixtures/output/powershell/webrequest/multipart-data.ps1 rename to src/targets/powershell/webrequest/fixtures/multipart-data.ps1 index 64a05c86b..74920571a 100644 --- a/test/fixtures/output/powershell/webrequest/multipart-data.ps1 +++ b/src/targets/powershell/webrequest/fixtures/multipart-data.ps1 @@ -1,9 +1,9 @@ $headers=@{} $headers.Add("content-type", "multipart/form-data; boundary=---011000010111000001101001") -$response = Invoke-WebRequest -Uri 'http://mockbin.com/har' -Method POST -Headers $headers -ContentType 'multipart/form-data; boundary=---011000010111000001101001' -Body '-----011000010111000001101001 -Content-Disposition: form-data; name="foo"; filename="hello.txt" -Content-Type: text/plain - -Hello World ------011000010111000001101001-- -' +$response = Invoke-WebRequest -Uri 'http://mockbin.com/har' -Method POST -Headers $headers -ContentType 'multipart/form-data; boundary=---011000010111000001101001' -Body '-----011000010111000001101001 +Content-Disposition: form-data; name="foo"; filename="hello.txt" +Content-Type: text/plain + +Hello World +-----011000010111000001101001-- +' \ No newline at end of file diff --git a/test/fixtures/output/powershell/webrequest/multipart-file.ps1 b/src/targets/powershell/webrequest/fixtures/multipart-file.ps1 similarity index 98% rename from test/fixtures/output/powershell/webrequest/multipart-file.ps1 rename to src/targets/powershell/webrequest/fixtures/multipart-file.ps1 index c1dc54b57..e7abdaf61 100644 --- a/test/fixtures/output/powershell/webrequest/multipart-file.ps1 +++ b/src/targets/powershell/webrequest/fixtures/multipart-file.ps1 @@ -1,9 +1,9 @@ $headers=@{} $headers.Add("content-type", "multipart/form-data; boundary=---011000010111000001101001") -$response = Invoke-WebRequest -Uri 'http://mockbin.com/har' -Method POST -Headers $headers -ContentType 'multipart/form-data; boundary=---011000010111000001101001' -Body '-----011000010111000001101001 -Content-Disposition: form-data; name="foo"; filename="hello.txt" -Content-Type: text/plain - - ------011000010111000001101001-- -' +$response = Invoke-WebRequest -Uri 'http://mockbin.com/har' -Method POST -Headers $headers -ContentType 'multipart/form-data; boundary=---011000010111000001101001' -Body '-----011000010111000001101001 +Content-Disposition: form-data; name="foo"; filename="hello.txt" +Content-Type: text/plain + + +-----011000010111000001101001-- +' \ No newline at end of file diff --git a/test/fixtures/output/powershell/webrequest/multipart-form-data.ps1 b/src/targets/powershell/webrequest/fixtures/multipart-form-data.ps1 similarity index 98% rename from test/fixtures/output/powershell/webrequest/multipart-form-data.ps1 rename to src/targets/powershell/webrequest/fixtures/multipart-form-data.ps1 index 91f16b8db..d9722a0ab 100644 --- a/test/fixtures/output/powershell/webrequest/multipart-form-data.ps1 +++ b/src/targets/powershell/webrequest/fixtures/multipart-form-data.ps1 @@ -1,8 +1,8 @@ $headers=@{} $headers.Add("Content-Type", "multipart/form-data; boundary=---011000010111000001101001") -$response = Invoke-WebRequest -Uri 'http://mockbin.com/har' -Method POST -Headers $headers -ContentType 'multipart/form-data; boundary=---011000010111000001101001' -Body '-----011000010111000001101001 -Content-Disposition: form-data; name="foo" - -bar ------011000010111000001101001-- -' +$response = Invoke-WebRequest -Uri 'http://mockbin.com/har' -Method POST -Headers $headers -ContentType 'multipart/form-data; boundary=---011000010111000001101001' -Body '-----011000010111000001101001 +Content-Disposition: form-data; name="foo" + +bar +-----011000010111000001101001-- +' \ No newline at end of file diff --git a/test/fixtures/output/powershell/webrequest/nested.ps1 b/src/targets/powershell/webrequest/fixtures/nested.ps1 similarity index 56% rename from test/fixtures/output/powershell/webrequest/nested.ps1 rename to src/targets/powershell/webrequest/fixtures/nested.ps1 index d05d97730..afd5485a5 100644 --- a/test/fixtures/output/powershell/webrequest/nested.ps1 +++ b/src/targets/powershell/webrequest/fixtures/nested.ps1 @@ -1 +1 @@ -$response = Invoke-WebRequest -Uri 'http://mockbin.com/har?foo%5Bbar%5D=baz%2Czap&fiz=buz&key=value' -Method GET +$response = Invoke-WebRequest -Uri 'http://mockbin.com/har?foo%5Bbar%5D=baz%2Czap&fiz=buz&key=value' -Method GET \ No newline at end of file diff --git a/test/fixtures/output/powershell/webrequest/query.ps1 b/src/targets/powershell/webrequest/fixtures/query.ps1 similarity index 59% rename from test/fixtures/output/powershell/webrequest/query.ps1 rename to src/targets/powershell/webrequest/fixtures/query.ps1 index 98e69ebca..2c4afc8c8 100644 --- a/test/fixtures/output/powershell/webrequest/query.ps1 +++ b/src/targets/powershell/webrequest/fixtures/query.ps1 @@ -1 +1 @@ -$response = Invoke-WebRequest -Uri 'http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value' -Method GET +$response = Invoke-WebRequest -Uri 'http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value' -Method GET \ No newline at end of file diff --git a/test/fixtures/output/powershell/webrequest/short.ps1 b/src/targets/powershell/webrequest/fixtures/short.ps1 similarity index 87% rename from test/fixtures/output/powershell/webrequest/short.ps1 rename to src/targets/powershell/webrequest/fixtures/short.ps1 index 2a225b88d..a324b08b7 100644 --- a/test/fixtures/output/powershell/webrequest/short.ps1 +++ b/src/targets/powershell/webrequest/fixtures/short.ps1 @@ -1 +1 @@ -$response = Invoke-WebRequest -Uri 'http://mockbin.com/har' -Method GET +$response = Invoke-WebRequest -Uri 'http://mockbin.com/har' -Method GET \ No newline at end of file diff --git a/test/fixtures/output/powershell/webrequest/text-plain.ps1 b/src/targets/powershell/webrequest/fixtures/text-plain.ps1 similarity index 95% rename from test/fixtures/output/powershell/webrequest/text-plain.ps1 rename to src/targets/powershell/webrequest/fixtures/text-plain.ps1 index 876683ae6..7bc1f9ac1 100644 --- a/test/fixtures/output/powershell/webrequest/text-plain.ps1 +++ b/src/targets/powershell/webrequest/fixtures/text-plain.ps1 @@ -1,3 +1,3 @@ $headers=@{} $headers.Add("content-type", "text/plain") -$response = Invoke-WebRequest -Uri 'http://mockbin.com/har' -Method POST -Headers $headers -ContentType 'text/plain' -Body 'Hello World' +$response = Invoke-WebRequest -Uri 'http://mockbin.com/har' -Method POST -Headers $headers -ContentType 'text/plain' -Body 'Hello World' \ No newline at end of file diff --git a/src/targets/python/helpers.js b/src/targets/python/helpers.js deleted file mode 100644 index e6ef5564f..000000000 --- a/src/targets/python/helpers.js +++ /dev/null @@ -1,81 +0,0 @@ -'use strict' - -const util = require('util') - -/** - * Create an string of given length filled with blank spaces - * - * @param {number} length Length of the array to return - * @param {string} str String to pad out with - */ -function buildString (length, str) { - return Array.apply(null, new Array(length)).map(String.prototype.valueOf, str).join('') -} - -/** - * Create a string corresponding to a Dictionary or Array literal representation with pretty option - * and indentation. - */ -function concatValues (concatType, values, pretty, indentation, indentLevel) { - const currentIndent = buildString(indentLevel, indentation) - const closingBraceIndent = buildString(indentLevel - 1, indentation) - const join = pretty ? ',\n' + currentIndent : ', ' - const openingBrace = concatType === 'object' ? '{' : '[' - const closingBrace = concatType === 'object' ? '}' : ']' - - if (pretty) { - return openingBrace + '\n' + currentIndent + values.join(join) + '\n' + closingBraceIndent + closingBrace - } else { - return openingBrace + values.join(join) + closingBrace - } -} - -module.exports = { - /** - * Create a valid Python string of a literal value according to its type. - * - * @param {*} value Any JavaScript literal - * @param {Object} opts Target options - * @return {string} - */ - literalRepresentation: function (value, opts, indentLevel) { - indentLevel = indentLevel === undefined ? 1 : indentLevel + 1 - - switch (Object.prototype.toString.call(value)) { - case '[object Number]': - return value - - case '[object Array]': { - let pretty = false - const valuesRepresentation = value.map(function (v) { - // Switch to prettify if the value is a dictionary with multiple keys - if (Object.prototype.toString.call(v) === '[object Object]') { - pretty = Object.keys(v).length > 1 - } - return this.literalRepresentation(v, opts, indentLevel) - }.bind(this)) - return concatValues('array', valuesRepresentation, pretty, opts.indent, indentLevel) - } - - case '[object Object]': { - const keyValuePairs = [] - for (const k in value) { - keyValuePairs.push(util.format('"%s": %s', k, this.literalRepresentation(value[k], opts, indentLevel))) - } - return concatValues('object', keyValuePairs, opts.pretty && keyValuePairs.length > 1, opts.indent, indentLevel) - } - - case '[object Null]': - return 'None' - - case '[object Boolean]': - return value ? 'True' : 'False' - - default: - if (value === null || value === undefined) { - return '' - } - return '"' + value.toString().replace(/"/g, '\\"') + '"' - } - } -} diff --git a/src/targets/python/helpers.ts b/src/targets/python/helpers.ts new file mode 100644 index 000000000..0d49e0784 --- /dev/null +++ b/src/targets/python/helpers.ts @@ -0,0 +1,92 @@ +/** + * Create an string of given length filled with blank spaces + * + * @param length Length of the array to return + * @param str String to pad out with + */ +function buildString(length: number, str: string) { + return str.repeat(length); +} + +/** + * Create a string corresponding to a Dictionary or Array literal representation with pretty option + * and indentation. + */ +function concatValues( + concatType: 'array' | 'object', + values: any, + pretty: boolean, + indentation: string, + indentLevel: number, +) { + const currentIndent = buildString(indentLevel, indentation); + const closingBraceIndent = buildString(indentLevel - 1, indentation); + const join = pretty ? `,\n${currentIndent}` : ', '; + const openingBrace = concatType === 'object' ? '{' : '['; + const closingBrace = concatType === 'object' ? '}' : ']'; + + if (pretty) { + return `${openingBrace}\n${currentIndent}${values.join( + join, + )}\n${closingBraceIndent}${closingBrace}`; + } + return openingBrace + values.join(join) + closingBrace; +} + +/** + * Create a valid Python string of a literal value according to its type. + * + * @param {*} value Any JavaScript literal + * @param {Object} opts Target options + * @return {string} + */ +export const literalRepresentation = ( + value: any, + opts: Record, + indentLevel?: number, +): any => { + indentLevel = indentLevel === undefined ? 1 : indentLevel + 1; + + switch (Object.prototype.toString.call(value)) { + case '[object Number]': + return value; + + case '[object Array]': { + let pretty = false; + const valuesRepresentation: any = (value as any[]).map(v => { + // Switch to prettify if the value is a dictionary with multiple keys + if (Object.prototype.toString.call(v) === '[object Object]') { + pretty = Object.keys(v).length > 1; + } + return literalRepresentation(v, opts, indentLevel); + }); + return concatValues('array', valuesRepresentation, pretty, opts.indent, indentLevel); + } + + case '[object Object]': { + const keyValuePairs = []; + for (const key in value) { + keyValuePairs.push(`"${key}": ${literalRepresentation(value[key], opts, indentLevel)}`); + } + return concatValues( + 'object', + keyValuePairs, + opts.pretty && keyValuePairs.length > 1, + opts.indent, + indentLevel, + ); + } + + case '[object Null]': + return 'None'; + + case '[object Boolean]': + return value ? 'True' : 'False'; + + default: + if (value === null || value === undefined) { + return ''; + } + return `"${value.toString().replace(/"/g, '\\"')}"`; + } +}; diff --git a/src/targets/python/index.js b/src/targets/python/index.js deleted file mode 100644 index 38f5ee736..000000000 --- a/src/targets/python/index.js +++ /dev/null @@ -1,13 +0,0 @@ -'use strict' - -module.exports = { - info: { - key: 'python', - title: 'Python', - extname: '.py', - default: 'python3' - }, - - python3: require('./python3'), - requests: require('./requests') -} diff --git a/src/targets/python/python3.js b/src/targets/python/python3.js deleted file mode 100644 index a843b9398..000000000 --- a/src/targets/python/python3.js +++ /dev/null @@ -1,91 +0,0 @@ -/** - * @description - * HTTP code snippet generator for native Python3. - * - * @author - * @montanaflynn - * - * for any questions or issues regarding the generated code snippet, please open an issue mentioning the author. - */ - -'use strict' - -const CodeBuilder = require('../../helpers/code-builder') - -module.exports = function (source, options) { - const code = new CodeBuilder() - // Start Request - code.push('import http.client') - .blank() - - // Check which protocol to be used for the client connection - const protocol = source.uriObj.protocol - if (protocol === 'https:') { - code.push('conn = http.client.HTTPSConnection("%s")', source.uriObj.host) - .blank() - } else { - code.push('conn = http.client.HTTPConnection("%s")', source.uriObj.host) - .blank() - } - - // Create payload string if it exists - const payload = JSON.stringify(source.postData.text) - if (payload) { - code.push('payload = %s', payload) - .blank() - } - - // Create Headers - const headers = source.allHeaders - const headerCount = Object.keys(headers).length - if (headerCount === 1) { - for (const header in headers) { - code.push('headers = { \'%s\': "%s" }', header, headers[header]) - .blank() - } - } else if (headerCount > 1) { - let count = 1 - - code.push('headers = {') - - for (const header in headers) { - if (count++ !== headerCount) { - code.push(' \'%s\': "%s",', header, headers[header]) - } else { - code.push(' \'%s\': "%s"', header, headers[header]) - } - } - - code.push(' }') - .blank() - } - - // Make Request - const method = source.method - const path = source.uriObj.path - if (payload && headerCount) { - code.push('conn.request("%s", "%s", payload, headers)', method, path) - } else if (payload && !headerCount) { - code.push('conn.request("%s", "%s", payload)', method, path) - } else if (!payload && headerCount) { - code.push('conn.request("%s", "%s", headers=headers)', method, path) - } else { - code.push('conn.request("%s", "%s")', method, path) - } - - // Get Response - code.blank() - .push('res = conn.getresponse()') - .push('data = res.read()') - .blank() - .push('print(data.decode("utf-8"))') - - return code.join() -} - -module.exports.info = { - key: 'python3', - title: 'http.client', - link: 'https://docs.python.org/3/library/http.client.html', - description: 'Python3 HTTP Client' -} diff --git a/src/targets/python/python3/client.ts b/src/targets/python/python3/client.ts new file mode 100644 index 000000000..f63d79961 --- /dev/null +++ b/src/targets/python/python3/client.ts @@ -0,0 +1,88 @@ +/** + * @description + * HTTP code snippet generator for native Python3. + * + * @author + * @montanaflynn + * + * for any questions or issues regarding the generated code snippet, please open an issue mentioning the author. + */ + +import { CodeBuilder } from '../../../helpers/code-builder'; +import { Client } from '../../targets'; + +export const python3: Client = { + info: { + key: 'python3', + title: 'http.client', + link: 'https://docs.python.org/3/library/http.client.html', + description: 'Python3 HTTP Client', + }, + convert: ({ uriObj: { path, protocol, host }, postData, allHeaders, method }) => { + const { push, blank, join } = new CodeBuilder(); + // Start Request + push('import http.client'); + blank(); + + // Check which protocol to be used for the client connection + if (protocol === 'https:') { + push(`conn = http.client.HTTPSConnection("${host}")`); + blank(); + } else { + push(`conn = http.client.HTTPConnection("${host}")`); + blank(); + } + + // Create payload string if it exists + const payload = JSON.stringify(postData.text); + if (payload) { + push(`payload = ${payload}`); + blank(); + } + + // Create Headers + const headers = allHeaders; + const headerCount = Object.keys(headers).length; + if (headerCount === 1) { + for (const header in headers) { + push(`headers = { '${header}': "${headers[header]}" }`); + blank(); + } + } else if (headerCount > 1) { + let count = 1; + + push('headers = {'); + + for (const header in headers) { + if (count++ !== headerCount) { + push(` '${header}': "${headers[header]}",`); + } else { + push(` '${header}': "${headers[header]}"`); + } + } + + push(' }'); + blank(); + } + + // Make Request + if (payload && headerCount) { + push(`conn.request("${method}", "${path}", payload, headers)`); + } else if (payload && !headerCount) { + push(`conn.request("${method}", "${path}", payload)`); + } else if (!payload && headerCount) { + push(`conn.request("${method}", "${path}", headers=headers)`); + } else { + push(`conn.request("${method}", "${path}")`); + } + + // Get Response + blank(); + push('res = conn.getresponse()'); + push('data = res.read()'); + blank(); + push('print(data.decode("utf-8"))'); + + return join(); + }, +}; diff --git a/test/fixtures/output/python/python3/application-form-encoded.py b/src/targets/python/python3/fixtures/application-form-encoded.py similarity index 90% rename from test/fixtures/output/python/python3/application-form-encoded.py rename to src/targets/python/python3/fixtures/application-form-encoded.py index e7857cbff..07bd696f6 100644 --- a/test/fixtures/output/python/python3/application-form-encoded.py +++ b/src/targets/python/python3/fixtures/application-form-encoded.py @@ -11,4 +11,4 @@ res = conn.getresponse() data = res.read() -print(data.decode("utf-8")) +print(data.decode("utf-8")) \ No newline at end of file diff --git a/test/fixtures/output/python/python3/application-json.py b/src/targets/python/python3/fixtures/application-json.py similarity index 92% rename from test/fixtures/output/python/python3/application-json.py rename to src/targets/python/python3/fixtures/application-json.py index ce36a23d8..9a201f9ff 100644 --- a/test/fixtures/output/python/python3/application-json.py +++ b/src/targets/python/python3/fixtures/application-json.py @@ -11,4 +11,4 @@ res = conn.getresponse() data = res.read() -print(data.decode("utf-8")) +print(data.decode("utf-8")) \ No newline at end of file diff --git a/test/fixtures/output/python/python3/cookies.py b/src/targets/python/python3/fixtures/cookies.py similarity index 87% rename from test/fixtures/output/python/python3/cookies.py rename to src/targets/python/python3/fixtures/cookies.py index 46530ca7a..c106f9744 100644 --- a/test/fixtures/output/python/python3/cookies.py +++ b/src/targets/python/python3/fixtures/cookies.py @@ -9,4 +9,4 @@ res = conn.getresponse() data = res.read() -print(data.decode("utf-8")) +print(data.decode("utf-8")) \ No newline at end of file diff --git a/test/fixtures/output/python/python3/custom-method.py b/src/targets/python/python3/fixtures/custom-method.py similarity index 84% rename from test/fixtures/output/python/python3/custom-method.py rename to src/targets/python/python3/fixtures/custom-method.py index 0f510e377..58e37de82 100644 --- a/test/fixtures/output/python/python3/custom-method.py +++ b/src/targets/python/python3/fixtures/custom-method.py @@ -7,4 +7,4 @@ res = conn.getresponse() data = res.read() -print(data.decode("utf-8")) +print(data.decode("utf-8")) \ No newline at end of file diff --git a/test/fixtures/output/python/python3/full.py b/src/targets/python/python3/fixtures/full.py similarity index 92% rename from test/fixtures/output/python/python3/full.py rename to src/targets/python/python3/fixtures/full.py index 6329ea984..4efb485a0 100644 --- a/test/fixtures/output/python/python3/full.py +++ b/src/targets/python/python3/fixtures/full.py @@ -15,4 +15,4 @@ res = conn.getresponse() data = res.read() -print(data.decode("utf-8")) +print(data.decode("utf-8")) \ No newline at end of file diff --git a/test/fixtures/output/python/python3/headers.py b/src/targets/python/python3/fixtures/headers.py similarity index 89% rename from test/fixtures/output/python/python3/headers.py rename to src/targets/python/python3/fixtures/headers.py index fc2004476..94010bc66 100644 --- a/test/fixtures/output/python/python3/headers.py +++ b/src/targets/python/python3/fixtures/headers.py @@ -12,4 +12,4 @@ res = conn.getresponse() data = res.read() -print(data.decode("utf-8")) +print(data.decode("utf-8")) \ No newline at end of file diff --git a/test/fixtures/output/python/python3/https.py b/src/targets/python/python3/fixtures/https.py similarity index 83% rename from test/fixtures/output/python/python3/https.py rename to src/targets/python/python3/fixtures/https.py index f9df79d35..b24a52399 100644 --- a/test/fixtures/output/python/python3/https.py +++ b/src/targets/python/python3/fixtures/https.py @@ -7,4 +7,4 @@ res = conn.getresponse() data = res.read() -print(data.decode("utf-8")) +print(data.decode("utf-8")) \ No newline at end of file diff --git a/test/fixtures/output/python/python3/jsonObj-multiline.py b/src/targets/python/python3/fixtures/jsonObj-multiline.py similarity index 89% rename from test/fixtures/output/python/python3/jsonObj-multiline.py rename to src/targets/python/python3/fixtures/jsonObj-multiline.py index e6975ea61..73f95dd19 100644 --- a/test/fixtures/output/python/python3/jsonObj-multiline.py +++ b/src/targets/python/python3/fixtures/jsonObj-multiline.py @@ -11,4 +11,4 @@ res = conn.getresponse() data = res.read() -print(data.decode("utf-8")) +print(data.decode("utf-8")) \ No newline at end of file diff --git a/test/fixtures/output/python/python3/jsonObj-null-value.py b/src/targets/python/python3/fixtures/jsonObj-null-value.py similarity index 89% rename from test/fixtures/output/python/python3/jsonObj-null-value.py rename to src/targets/python/python3/fixtures/jsonObj-null-value.py index 99249bf2e..9ead3701b 100644 --- a/test/fixtures/output/python/python3/jsonObj-null-value.py +++ b/src/targets/python/python3/fixtures/jsonObj-null-value.py @@ -11,4 +11,4 @@ res = conn.getresponse() data = res.read() -print(data.decode("utf-8")) +print(data.decode("utf-8")) \ No newline at end of file diff --git a/test/fixtures/output/python/python3/multipart-data.py b/src/targets/python/python3/fixtures/multipart-data.py similarity index 94% rename from test/fixtures/output/python/python3/multipart-data.py rename to src/targets/python/python3/fixtures/multipart-data.py index 7ed5b404e..4e17c4a64 100644 --- a/test/fixtures/output/python/python3/multipart-data.py +++ b/src/targets/python/python3/fixtures/multipart-data.py @@ -11,4 +11,4 @@ res = conn.getresponse() data = res.read() -print(data.decode("utf-8")) +print(data.decode("utf-8")) \ No newline at end of file diff --git a/test/fixtures/output/python/python3/multipart-file.py b/src/targets/python/python3/fixtures/multipart-file.py similarity index 94% rename from test/fixtures/output/python/python3/multipart-file.py rename to src/targets/python/python3/fixtures/multipart-file.py index 681ec08c2..6b05a3aee 100644 --- a/test/fixtures/output/python/python3/multipart-file.py +++ b/src/targets/python/python3/fixtures/multipart-file.py @@ -11,4 +11,4 @@ res = conn.getresponse() data = res.read() -print(data.decode("utf-8")) +print(data.decode("utf-8")) \ No newline at end of file diff --git a/test/fixtures/output/python/python3/multipart-form-data.py b/src/targets/python/python3/fixtures/multipart-form-data.py similarity index 93% rename from test/fixtures/output/python/python3/multipart-form-data.py rename to src/targets/python/python3/fixtures/multipart-form-data.py index d5f5c0254..72e7d8460 100644 --- a/test/fixtures/output/python/python3/multipart-form-data.py +++ b/src/targets/python/python3/fixtures/multipart-form-data.py @@ -11,4 +11,4 @@ res = conn.getresponse() data = res.read() -print(data.decode("utf-8")) +print(data.decode("utf-8")) \ No newline at end of file diff --git a/test/fixtures/output/python/python3/nested.py b/src/targets/python/python3/fixtures/nested.py similarity index 86% rename from test/fixtures/output/python/python3/nested.py rename to src/targets/python/python3/fixtures/nested.py index 75c6f9a2c..c09f2aa65 100644 --- a/test/fixtures/output/python/python3/nested.py +++ b/src/targets/python/python3/fixtures/nested.py @@ -7,4 +7,4 @@ res = conn.getresponse() data = res.read() -print(data.decode("utf-8")) +print(data.decode("utf-8")) \ No newline at end of file diff --git a/test/fixtures/output/python/python3/query.py b/src/targets/python/python3/fixtures/query.py similarity index 86% rename from test/fixtures/output/python/python3/query.py rename to src/targets/python/python3/fixtures/query.py index d882e3b42..9dd86f476 100644 --- a/test/fixtures/output/python/python3/query.py +++ b/src/targets/python/python3/fixtures/query.py @@ -7,4 +7,4 @@ res = conn.getresponse() data = res.read() -print(data.decode("utf-8")) +print(data.decode("utf-8")) \ No newline at end of file diff --git a/test/fixtures/output/python/python3/short.py b/src/targets/python/python3/fixtures/short.py similarity index 83% rename from test/fixtures/output/python/python3/short.py rename to src/targets/python/python3/fixtures/short.py index e8e657f80..6156f8f01 100644 --- a/test/fixtures/output/python/python3/short.py +++ b/src/targets/python/python3/fixtures/short.py @@ -7,4 +7,4 @@ res = conn.getresponse() data = res.read() -print(data.decode("utf-8")) +print(data.decode("utf-8")) \ No newline at end of file diff --git a/test/fixtures/output/python/python3/text-plain.py b/src/targets/python/python3/fixtures/text-plain.py similarity index 89% rename from test/fixtures/output/python/python3/text-plain.py rename to src/targets/python/python3/fixtures/text-plain.py index f00466b98..fd4d40acb 100644 --- a/test/fixtures/output/python/python3/text-plain.py +++ b/src/targets/python/python3/fixtures/text-plain.py @@ -11,4 +11,4 @@ res = conn.getresponse() data = res.read() -print(data.decode("utf-8")) +print(data.decode("utf-8")) \ No newline at end of file diff --git a/src/targets/python/requests.js b/src/targets/python/requests.js deleted file mode 100644 index 3dc0ac9b1..000000000 --- a/src/targets/python/requests.js +++ /dev/null @@ -1,126 +0,0 @@ -/** - * @description - * HTTP code snippet generator for Python using Requests - * - * @author - * @montanaflynn - * - * for any questions or issues regarding the generated code snippet, please open an issue mentioning the author. - */ - -'use strict' - -const util = require('util') -const CodeBuilder = require('../../helpers/code-builder') -const helpers = require('./helpers') - -module.exports = function (source, options) { - const opts = Object.assign({ - indent: ' ', - pretty: true - }, options) - - // Start snippet - const code = new CodeBuilder(opts.indent) - - // Import requests - code.push('import requests') - .blank() - - // Set URL - code.push('url = "%s"', source.url) - .blank() - - // Construct query string - let qs - if (Object.keys(source.queryObj).length) { - qs = 'querystring = ' + JSON.stringify(source.queryObj) - - code.push(qs) - .blank() - } - - // Construct payload - let hasPayload = false - let jsonPayload = false - switch (source.postData.mimeType) { - case 'application/json': - if (source.postData.jsonObj) { - code.push('payload = %s', helpers.literalRepresentation(source.postData.jsonObj, opts)) - jsonPayload = true - hasPayload = true - } - break - - default: { - const payload = JSON.stringify(source.postData.text) - if (payload) { - code.push('payload = %s', payload) - hasPayload = true - } - } - } - - // Construct headers - const headers = source.allHeaders - const headerCount = Object.keys(headers).length - - if (headerCount === 1) { - for (const header in headers) { - code.push('headers = {"%s": "%s"}', header, headers[header]) - .blank() - } - } else if (headerCount > 1) { - let count = 1 - - code.push('headers = {') - - for (const header in headers) { - if (count++ !== headerCount) { - code.push(1, '"%s": "%s",', header, headers[header]) - } else { - code.push(1, '"%s": "%s"', header, headers[header]) - } - } - - code.push('}') - .blank() - } - - // Construct request - const method = source.method - let request = util.format('response = requests.request("%s", url', method) - - if (hasPayload) { - if (jsonPayload) { - request += ', json=payload' - } else { - request += ', data=payload' - } - } - - if (headerCount > 0) { - request += ', headers=headers' - } - - if (qs) { - request += ', params=querystring' - } - - request += ')' - - code.push(request) - .blank() - - // Print response - .push('print(response.text)') - - return code.join() -} - -module.exports.info = { - key: 'requests', - title: 'Requests', - link: 'http://docs.python-requests.org/en/latest/api/#requests.request', - description: 'Requests HTTP library' -} diff --git a/src/targets/python/requests/client.test.ts b/src/targets/python/requests/client.test.ts new file mode 100644 index 000000000..21f5c6a16 --- /dev/null +++ b/src/targets/python/requests/client.test.ts @@ -0,0 +1,17 @@ +import { runCustomFixtures } from '../../../fixtures/runCustomFixtures'; +import { Request } from '../../../httpsnippet'; + +runCustomFixtures({ + targetId: 'python', + clientId: 'requests', + tests: [ + { + expected: 'query-params.py', + options: { + showBoilerplate: false, + }, + input: { method: 'GET', url: 'http://mockbin.com/har?param=value' } as Request, + it: "should support query parameters provided in HAR's url", + }, + ], +}); diff --git a/src/targets/python/requests/client.ts b/src/targets/python/requests/client.ts new file mode 100644 index 000000000..6e4bbfcf4 --- /dev/null +++ b/src/targets/python/requests/client.ts @@ -0,0 +1,128 @@ +/** + * @description + * HTTP code snippet generator for Python using Requests + * + * @author + * @montanaflynn + * + * for any questions or issues regarding the generated code snippet, please open an issue mentioning the author. + */ + +import { CodeBuilder } from '../../../helpers/code-builder'; +import { Client } from '../../targets'; +import { literalRepresentation } from '../helpers'; + +export interface RequestsOptions { + pretty?: true; +} + +export const requests: Client = { + info: { + key: 'requests', + title: 'Requests', + link: 'http://docs.python-requests.org/en/latest/api/#requests.request', + description: 'Requests HTTP library', + }, + convert: ({ queryObj, url, postData, allHeaders, method }, options) => { + const opts = { + indent: ' ', + pretty: true, + ...options, + }; + // Start snippet + const { push, blank, join } = new CodeBuilder({ indent: opts.indent }); + + // Import requests + push('import requests'); + blank(); + + // Set URL + push(`url = "${url}"`); + blank(); + + // Construct query string + let qs; + if (Object.keys(queryObj).length) { + qs = `querystring = ${JSON.stringify(queryObj)}`; + + push(qs); + blank(); + } + + // Construct payload + let hasPayload = false; + let jsonPayload = false; + switch (postData.mimeType) { + case 'application/json': + if (postData.jsonObj) { + push(`payload = ${literalRepresentation(postData.jsonObj, opts)}`); + jsonPayload = true; + hasPayload = true; + } + break; + + default: { + const payload = JSON.stringify(postData.text); + if (payload) { + push(`payload = ${payload}`); + hasPayload = true; + } + } + } + + // Construct headers + const headers = allHeaders; + const headerCount = Object.keys(headers).length; + + if (headerCount === 1) { + for (const header in headers) { + push(`headers = {"${header}": "${headers[header]}"}`); + blank(); + } + } else if (headerCount > 1) { + let count = 1; + + push('headers = {'); + + for (const header in headers) { + if (count++ !== headerCount) { + push(`"${header}": "${headers[header]}",`, 1); + } else { + push(`"${header}": "${headers[header]}"`, 1); + } + } + + push('}'); + blank(); + } + + // Construct request + let request = `response = requests.request("${method}", url`; + + if (hasPayload) { + if (jsonPayload) { + request += ', json=payload'; + } else { + request += ', data=payload'; + } + } + + if (headerCount > 0) { + request += ', headers=headers'; + } + + if (qs) { + request += ', params=querystring'; + } + + request += ')'; + + push(request); + blank(); + + // Print response + push('print(response.text)'); + + return join(); + }, +}; diff --git a/test/fixtures/output/python/requests/application-form-encoded.py b/src/targets/python/requests/fixtures/application-form-encoded.py similarity index 91% rename from test/fixtures/output/python/requests/application-form-encoded.py rename to src/targets/python/requests/fixtures/application-form-encoded.py index 308126b0e..ab7b9ed61 100644 --- a/test/fixtures/output/python/requests/application-form-encoded.py +++ b/src/targets/python/requests/fixtures/application-form-encoded.py @@ -7,4 +7,4 @@ response = requests.request("POST", url, data=payload, headers=headers) -print(response.text) +print(response.text) \ No newline at end of file diff --git a/test/fixtures/output/python/requests/application-json.py b/src/targets/python/requests/fixtures/application-json.py similarity index 94% rename from test/fixtures/output/python/requests/application-json.py rename to src/targets/python/requests/fixtures/application-json.py index cfb2c4830..397470f61 100644 --- a/test/fixtures/output/python/requests/application-json.py +++ b/src/targets/python/requests/fixtures/application-json.py @@ -14,4 +14,4 @@ response = requests.request("POST", url, json=payload, headers=headers) -print(response.text) +print(response.text) \ No newline at end of file diff --git a/test/fixtures/output/python/requests/cookies.py b/src/targets/python/requests/fixtures/cookies.py similarity index 87% rename from test/fixtures/output/python/requests/cookies.py rename to src/targets/python/requests/fixtures/cookies.py index 3387a1d8f..e0ab91047 100644 --- a/test/fixtures/output/python/requests/cookies.py +++ b/src/targets/python/requests/fixtures/cookies.py @@ -6,4 +6,4 @@ response = requests.request("POST", url, headers=headers) -print(response.text) +print(response.text) \ No newline at end of file diff --git a/test/fixtures/output/python/requests/custom-method.py b/src/targets/python/requests/fixtures/custom-method.py similarity index 81% rename from test/fixtures/output/python/requests/custom-method.py rename to src/targets/python/requests/fixtures/custom-method.py index 8a848a56d..f0f8856af 100644 --- a/test/fixtures/output/python/requests/custom-method.py +++ b/src/targets/python/requests/fixtures/custom-method.py @@ -4,4 +4,4 @@ response = requests.request("PROPFIND", url) -print(response.text) +print(response.text) \ No newline at end of file diff --git a/test/fixtures/output/python/requests/full.py b/src/targets/python/requests/fixtures/full.py similarity index 94% rename from test/fixtures/output/python/requests/full.py rename to src/targets/python/requests/fixtures/full.py index 82b97e3c9..2f72eca02 100644 --- a/test/fixtures/output/python/requests/full.py +++ b/src/targets/python/requests/fixtures/full.py @@ -13,4 +13,4 @@ response = requests.request("POST", url, data=payload, headers=headers, params=querystring) -print(response.text) +print(response.text) \ No newline at end of file diff --git a/test/fixtures/output/python/requests/headers.py b/src/targets/python/requests/fixtures/headers.py similarity index 89% rename from test/fixtures/output/python/requests/headers.py rename to src/targets/python/requests/fixtures/headers.py index ae2b4d047..b5ff811b6 100644 --- a/test/fixtures/output/python/requests/headers.py +++ b/src/targets/python/requests/fixtures/headers.py @@ -9,4 +9,4 @@ response = requests.request("GET", url, headers=headers) -print(response.text) +print(response.text) \ No newline at end of file diff --git a/test/fixtures/output/python/requests/https.py b/src/targets/python/requests/fixtures/https.py similarity index 81% rename from test/fixtures/output/python/requests/https.py rename to src/targets/python/requests/fixtures/https.py index af4660bfb..165a204c9 100644 --- a/test/fixtures/output/python/requests/https.py +++ b/src/targets/python/requests/fixtures/https.py @@ -4,4 +4,4 @@ response = requests.request("GET", url) -print(response.text) +print(response.text) \ No newline at end of file diff --git a/test/fixtures/output/python/requests/jsonObj-multiline.py b/src/targets/python/requests/fixtures/jsonObj-multiline.py similarity index 90% rename from test/fixtures/output/python/requests/jsonObj-multiline.py rename to src/targets/python/requests/fixtures/jsonObj-multiline.py index 60eb971ac..10e343a85 100644 --- a/test/fixtures/output/python/requests/jsonObj-multiline.py +++ b/src/targets/python/requests/fixtures/jsonObj-multiline.py @@ -7,4 +7,4 @@ response = requests.request("POST", url, json=payload, headers=headers) -print(response.text) +print(response.text) \ No newline at end of file diff --git a/test/fixtures/output/python/requests/jsonObj-null-value.py b/src/targets/python/requests/fixtures/jsonObj-null-value.py similarity index 90% rename from test/fixtures/output/python/requests/jsonObj-null-value.py rename to src/targets/python/requests/fixtures/jsonObj-null-value.py index 9a9f79937..504ff83c7 100644 --- a/test/fixtures/output/python/requests/jsonObj-null-value.py +++ b/src/targets/python/requests/fixtures/jsonObj-null-value.py @@ -7,4 +7,4 @@ response = requests.request("POST", url, json=payload, headers=headers) -print(response.text) +print(response.text) \ No newline at end of file diff --git a/test/fixtures/output/python/requests/multipart-data.py b/src/targets/python/requests/fixtures/multipart-data.py similarity index 95% rename from test/fixtures/output/python/requests/multipart-data.py rename to src/targets/python/requests/fixtures/multipart-data.py index 9760d47b5..c0c621921 100644 --- a/test/fixtures/output/python/requests/multipart-data.py +++ b/src/targets/python/requests/fixtures/multipart-data.py @@ -7,4 +7,4 @@ response = requests.request("POST", url, data=payload, headers=headers) -print(response.text) +print(response.text) \ No newline at end of file diff --git a/test/fixtures/output/python/requests/multipart-file.py b/src/targets/python/requests/fixtures/multipart-file.py similarity index 95% rename from test/fixtures/output/python/requests/multipart-file.py rename to src/targets/python/requests/fixtures/multipart-file.py index be3bde71a..769ceccb2 100644 --- a/test/fixtures/output/python/requests/multipart-file.py +++ b/src/targets/python/requests/fixtures/multipart-file.py @@ -7,4 +7,4 @@ response = requests.request("POST", url, data=payload, headers=headers) -print(response.text) +print(response.text) \ No newline at end of file diff --git a/test/fixtures/output/python/requests/multipart-form-data.py b/src/targets/python/requests/fixtures/multipart-form-data.py similarity index 94% rename from test/fixtures/output/python/requests/multipart-form-data.py rename to src/targets/python/requests/fixtures/multipart-form-data.py index 978e19b03..4c0dea2db 100644 --- a/test/fixtures/output/python/requests/multipart-form-data.py +++ b/src/targets/python/requests/fixtures/multipart-form-data.py @@ -7,4 +7,4 @@ response = requests.request("POST", url, data=payload, headers=headers) -print(response.text) +print(response.text) \ No newline at end of file diff --git a/test/fixtures/output/python/requests/nested.py b/src/targets/python/requests/fixtures/nested.py similarity index 89% rename from test/fixtures/output/python/requests/nested.py rename to src/targets/python/requests/fixtures/nested.py index affab7a79..bf9a464e9 100644 --- a/test/fixtures/output/python/requests/nested.py +++ b/src/targets/python/requests/fixtures/nested.py @@ -6,4 +6,4 @@ response = requests.request("GET", url, params=querystring) -print(response.text) +print(response.text) \ No newline at end of file diff --git a/src/targets/python/requests/fixtures/query-params.py b/src/targets/python/requests/fixtures/query-params.py new file mode 100644 index 000000000..093b87e72 --- /dev/null +++ b/src/targets/python/requests/fixtures/query-params.py @@ -0,0 +1,9 @@ +import requests + +url = "http://mockbin.com/har" + +querystring = {"param":"value"} + +response = requests.request("GET", url, params=querystring) + +print(response.text) \ No newline at end of file diff --git a/test/fixtures/output/python/requests/query.py b/src/targets/python/requests/fixtures/query.py similarity index 89% rename from test/fixtures/output/python/requests/query.py rename to src/targets/python/requests/fixtures/query.py index 8ba063238..d9cd231ab 100644 --- a/test/fixtures/output/python/requests/query.py +++ b/src/targets/python/requests/fixtures/query.py @@ -6,4 +6,4 @@ response = requests.request("GET", url, params=querystring) -print(response.text) +print(response.text) \ No newline at end of file diff --git a/test/fixtures/output/python/requests/short.py b/src/targets/python/requests/fixtures/short.py similarity index 81% rename from test/fixtures/output/python/requests/short.py rename to src/targets/python/requests/fixtures/short.py index 58f057e8b..280e10b76 100644 --- a/test/fixtures/output/python/requests/short.py +++ b/src/targets/python/requests/fixtures/short.py @@ -4,4 +4,4 @@ response = requests.request("GET", url) -print(response.text) +print(response.text) \ No newline at end of file diff --git a/test/fixtures/output/python/requests/text-plain.py b/src/targets/python/requests/fixtures/text-plain.py similarity index 89% rename from test/fixtures/output/python/requests/text-plain.py rename to src/targets/python/requests/fixtures/text-plain.py index fda6ebba1..078087d75 100644 --- a/test/fixtures/output/python/requests/text-plain.py +++ b/src/targets/python/requests/fixtures/text-plain.py @@ -7,4 +7,4 @@ response = requests.request("POST", url, data=payload, headers=headers) -print(response.text) +print(response.text) \ No newline at end of file diff --git a/src/targets/python/target.ts b/src/targets/python/target.ts new file mode 100644 index 000000000..8187dada0 --- /dev/null +++ b/src/targets/python/target.ts @@ -0,0 +1,16 @@ +import { Target } from '../targets'; +import { python3 } from './python3/client'; +import { requests } from './requests/client'; + +export const python: Target = { + info: { + key: 'python', + title: 'Python', + extname: '.py', + default: 'python3', + }, + clientsById: { + python3, + requests, + }, +}; diff --git a/src/targets/r/httr.js b/src/targets/r/httr.js deleted file mode 100644 index db68df270..000000000 --- a/src/targets/r/httr.js +++ /dev/null @@ -1,152 +0,0 @@ -/** - * @description - * HTTP code snippet generator for R using httr - * - * @author - * @gabrielakoreeda - * - * for any questions or issues regarding the generated code snippet, please open an issue mentioning the author. - */ - -'use strict' - -const util = require('util') -const CodeBuilder = require('../../helpers/code-builder') - -module.exports = function (source, options) { - // Start snippet - const code = new CodeBuilder() - - // Import httr - code.push('library(httr)') - .blank() - - // Set URL - code.push('url <- "%s"', source.url) - .blank() - - // Construct query string - const qs = source.queryObj - const queryCount = Object.keys(qs).length - delete source.queryObj.key - - if (source.queryString.length === 1) { - code.push('queryString <- list(%s = "%s")', Object.keys(qs), Object.values(qs).toString()) - .blank() - } else if (source.queryString.length > 1) { - let count = 1 - - code.push('queryString <- list(') - - for (const query in qs) { - if (count++ !== queryCount - 1) { - code.push(' %s = "%s",', query, qs[query].toString()) - } else { - code.push(' %s = "%s"', query, qs[query].toString()) - } - } - - code.push(')') - .blank() - } - - // Construct payload - const payload = JSON.stringify(source.postData.text) - - if (payload) { - code.push('payload <- %s', payload) - .blank() - } - - // Define encode - if (source.postData.text || source.postData.jsonObj || source.postData.params) { - switch (source.postData.mimeType) { - case 'application/x-www-form-urlencoded': - code.push('encode <- "form"') - .blank() - break - - case 'application/json': - code.push('encode <- "json"') - .blank() - break - - case 'multipart/form-data': - code.push('encode <- "multipart"') - .blank() - break - - default: - code.push('encode <- "raw"') - .blank() - break - } - } - - // Construct headers - const headers = source.allHeaders - let headerCount = Object.keys(headers).length - let header = '' - let cookies - let accept - - for (const head in headers) { - if (head.toLowerCase() === 'accept') { - accept = ', accept("' + headers[head] + '")' - headerCount = headerCount - 1 - } else if (head.toLowerCase() === 'cookie') { - cookies = ', set_cookies(`' + headers[head].replace(/;/g, '", `').replace(/` /g, '`').replace(/=/g, '` = "') + '")' - headerCount = headerCount - 1 - } else if (head.toLowerCase() !== 'content-type') { - header = header + head.replace('-', '_') + " = '" + headers[head] - if (headerCount > 1) { header = header + "', " } - } - } - - // Construct request - const method = source.method - let request = util.format('response <- VERB("%s", url', method) - - if (payload) { - request += ', body = payload' - } - - if (header !== '') { - request += ', add_headers(' + header + "')" - } - - if (source.queryString.length) { - request += ', query = queryString' - } - - request += ', content_type("' + source.postData.mimeType + '")' - - if (typeof accept !== 'undefined') { - request += accept - } - - if (typeof cookies !== 'undefined') { - request += cookies - } - - if (source.postData.text || source.postData.jsonObj || source.postData.params) { - request += ', encode = encode' - } - - request += ')' - - code.push(request) - .blank() - - // Print response - .push('content(response, "text")') - - return code.join() -} - -module.exports.info = { - key: 'httr', - title: 'httr', - link: 'https://cran.r-project.org/web/packages/httr/vignettes/quickstart.html', - description: 'httr: Tools for Working with URLs and HTTP' -} diff --git a/src/targets/r/httr/client.ts b/src/targets/r/httr/client.ts new file mode 100644 index 000000000..0092ad591 --- /dev/null +++ b/src/targets/r/httr/client.ts @@ -0,0 +1,155 @@ +/** + * @description + * HTTP code snippet generator for R using httr + * + * @author + * @gabrielakoreeda + * + * for any questions or issues regarding the generated code snippet, please open an issue mentioning the author. + */ + +import { CodeBuilder } from '../../../helpers/code-builder'; +import { Client } from '../../targets'; + +export const httr: Client = { + info: { + key: 'httr', + title: 'httr', + link: 'https://cran.r-project.org/web/packages/httr/vignettes/quickstart.html', + description: 'httr: Tools for Working with URLs and HTTP', + }, + convert: ({ url, queryObj, queryString, postData, allHeaders, method }) => { + // Start snippet + const { push, blank, join } = new CodeBuilder(); + + // Import httr + push('library(httr)'); + blank(); + + // Set URL + push(`url <- "${url}"`); + blank(); + + // Construct query string + const qs = queryObj; + const queryCount = Object.keys(qs).length; + delete queryObj.key; + + if (queryString.length === 1) { + push(`queryString <- list(${Object.keys(qs)} = "${Object.values(qs).toString()}")`); + blank(); + } else if (queryString.length > 1) { + let count = 1; + + push('queryString <- list('); + + for (const query in qs) { + if (count++ !== queryCount - 1) { + push(` ${query} = "${qs[query].toString()}",`); + } else { + push(` ${query} = "${qs[query].toString()}"`); + } + } + + push(')'); + blank(); + } + + // Construct payload + const payload = JSON.stringify(postData.text); + + if (payload) { + push(`payload <- ${payload}`); + blank(); + } + + // Define encode + if (postData.text || postData.jsonObj || postData.params) { + switch (postData.mimeType) { + case 'application/x-www-form-urlencoded': + push('encode <- "form"'); + blank(); + break; + + case 'application/json': + push('encode <- "json"'); + blank(); + break; + + case 'multipart/form-data': + push('encode <- "multipart"'); + blank(); + break; + + default: + push('encode <- "raw"'); + blank(); + break; + } + } + + // Construct headers + const headers = allHeaders; + let headerCount = Object.keys(headers).length; + let header = ''; + let cookies; + let accept; + + for (const head in headers) { + if (head.toLowerCase() === 'accept') { + accept = `, accept("${headers[head]}")`; + headerCount -= 1; + } else if (head.toLowerCase() === 'cookie') { + cookies = `, set_cookies(\`${String(headers[head]) + .replace(/;/g, '", `') + .replace(/` /g, '`') + .replace(/[=]/g, '` = "')}")`; + headerCount -= 1; + } else if (head.toLowerCase() !== 'content-type') { + header = `${header + head.replace('-', '_')} = '${headers[head]}`; + if (headerCount > 1) { + header = `${header}', `; + } + } + } + + // Construct request + let request = `response <- VERB("${method}", url`; + + if (payload) { + request += ', body = payload'; + } + + if (header !== '') { + request += `, add_headers(${header}')`; + } + + if (queryString.length) { + request += ', query = queryString'; + } + + request += `, content_type("${postData.mimeType}")`; + + if (typeof accept !== 'undefined') { + request += accept; + } + + if (typeof cookies !== 'undefined') { + request += cookies; + } + + if (postData.text || postData.jsonObj || postData.params) { + request += ', encode = encode'; + } + + request += ')'; + + push(request); + + blank(); + // Print response + push('content(response, "text")'); + + return join(); + }, +}; diff --git a/test/fixtures/output/r/httr/application-form-encoded.r b/src/targets/r/httr/fixtures/application-form-encoded.r similarity index 89% rename from test/fixtures/output/r/httr/application-form-encoded.r rename to src/targets/r/httr/fixtures/application-form-encoded.r index 147ce2fe4..549ed931b 100644 --- a/test/fixtures/output/r/httr/application-form-encoded.r +++ b/src/targets/r/httr/fixtures/application-form-encoded.r @@ -8,4 +8,4 @@ encode <- "form" response <- VERB("POST", url, body = payload, content_type("application/x-www-form-urlencoded"), encode = encode) -content(response, "text") +content(response, "text") \ No newline at end of file diff --git a/test/fixtures/output/r/httr/application-json.r b/src/targets/r/httr/fixtures/application-json.r similarity index 92% rename from test/fixtures/output/r/httr/application-json.r rename to src/targets/r/httr/fixtures/application-json.r index 7fc78099a..f7e2ccddd 100644 --- a/test/fixtures/output/r/httr/application-json.r +++ b/src/targets/r/httr/fixtures/application-json.r @@ -8,4 +8,4 @@ encode <- "json" response <- VERB("POST", url, body = payload, content_type("application/json"), encode = encode) -content(response, "text") +content(response, "text") \ No newline at end of file diff --git a/test/fixtures/output/r/httr/cookies.r b/src/targets/r/httr/fixtures/cookies.r similarity index 86% rename from test/fixtures/output/r/httr/cookies.r rename to src/targets/r/httr/fixtures/cookies.r index c323359bb..ba5bcfc56 100644 --- a/test/fixtures/output/r/httr/cookies.r +++ b/src/targets/r/httr/fixtures/cookies.r @@ -4,4 +4,4 @@ url <- "http://mockbin.com/har" response <- VERB("POST", url, content_type("application/octet-stream"), set_cookies(`foo` = "bar", `bar` = "baz")) -content(response, "text") +content(response, "text") \ No newline at end of file diff --git a/test/fixtures/output/r/httr/custom-method.r b/src/targets/r/httr/fixtures/custom-method.r similarity index 82% rename from test/fixtures/output/r/httr/custom-method.r rename to src/targets/r/httr/fixtures/custom-method.r index 08b4d307a..610134d74 100644 --- a/test/fixtures/output/r/httr/custom-method.r +++ b/src/targets/r/httr/fixtures/custom-method.r @@ -4,4 +4,4 @@ url <- "http://mockbin.com/har" response <- VERB("PROPFIND", url, content_type("application/octet-stream")) -content(response, "text") +content(response, "text") \ No newline at end of file diff --git a/test/fixtures/output/r/httr/full.r b/src/targets/r/httr/fixtures/full.r similarity index 93% rename from test/fixtures/output/r/httr/full.r rename to src/targets/r/httr/fixtures/full.r index 420ef6c6c..5152904ff 100644 --- a/test/fixtures/output/r/httr/full.r +++ b/src/targets/r/httr/fixtures/full.r @@ -13,4 +13,4 @@ encode <- "form" response <- VERB("POST", url, body = payload, query = queryString, content_type("application/x-www-form-urlencoded"), accept("application/json"), set_cookies(`foo` = "bar", `bar` = "baz"), encode = encode) -content(response, "text") +content(response, "text") \ No newline at end of file diff --git a/test/fixtures/output/r/httr/headers.r b/src/targets/r/httr/fixtures/headers.r similarity index 87% rename from test/fixtures/output/r/httr/headers.r rename to src/targets/r/httr/fixtures/headers.r index 26a20cbdb..249b5cd16 100644 --- a/test/fixtures/output/r/httr/headers.r +++ b/src/targets/r/httr/fixtures/headers.r @@ -4,4 +4,4 @@ url <- "http://mockbin.com/har" response <- VERB("GET", url, add_headers(x_foo = 'Bar'), content_type("application/octet-stream"), accept("application/json")) -content(response, "text") +content(response, "text") \ No newline at end of file diff --git a/test/fixtures/output/r/httr/https.r b/src/targets/r/httr/fixtures/https.r similarity index 82% rename from test/fixtures/output/r/httr/https.r rename to src/targets/r/httr/fixtures/https.r index 60068e474..7886ed2eb 100644 --- a/test/fixtures/output/r/httr/https.r +++ b/src/targets/r/httr/fixtures/https.r @@ -4,4 +4,4 @@ url <- "https://mockbin.com/har" response <- VERB("GET", url, content_type("application/octet-stream")) -content(response, "text") +content(response, "text") \ No newline at end of file diff --git a/test/fixtures/output/r/httr/jsonObj-multiline.r b/src/targets/r/httr/fixtures/jsonObj-multiline.r similarity index 88% rename from test/fixtures/output/r/httr/jsonObj-multiline.r rename to src/targets/r/httr/fixtures/jsonObj-multiline.r index 551d8af11..cb714b92e 100644 --- a/test/fixtures/output/r/httr/jsonObj-multiline.r +++ b/src/targets/r/httr/fixtures/jsonObj-multiline.r @@ -8,4 +8,4 @@ encode <- "json" response <- VERB("POST", url, body = payload, content_type("application/json"), encode = encode) -content(response, "text") +content(response, "text") \ No newline at end of file diff --git a/test/fixtures/output/r/httr/jsonObj-null-value.r b/src/targets/r/httr/fixtures/jsonObj-null-value.r similarity index 88% rename from test/fixtures/output/r/httr/jsonObj-null-value.r rename to src/targets/r/httr/fixtures/jsonObj-null-value.r index cb53d1806..fcb80c76f 100644 --- a/test/fixtures/output/r/httr/jsonObj-null-value.r +++ b/src/targets/r/httr/fixtures/jsonObj-null-value.r @@ -8,4 +8,4 @@ encode <- "json" response <- VERB("POST", url, body = payload, content_type("application/json"), encode = encode) -content(response, "text") +content(response, "text") \ No newline at end of file diff --git a/test/fixtures/output/r/httr/multipart-data.r b/src/targets/r/httr/fixtures/multipart-data.r similarity index 93% rename from test/fixtures/output/r/httr/multipart-data.r rename to src/targets/r/httr/fixtures/multipart-data.r index e35ffebd7..f52d23e02 100644 --- a/test/fixtures/output/r/httr/multipart-data.r +++ b/src/targets/r/httr/fixtures/multipart-data.r @@ -8,4 +8,4 @@ encode <- "multipart" response <- VERB("POST", url, body = payload, content_type("multipart/form-data"), encode = encode) -content(response, "text") +content(response, "text") \ No newline at end of file diff --git a/test/fixtures/output/r/httr/multipart-file.r b/src/targets/r/httr/fixtures/multipart-file.r similarity index 93% rename from test/fixtures/output/r/httr/multipart-file.r rename to src/targets/r/httr/fixtures/multipart-file.r index 55c044270..7cdad26ce 100644 --- a/test/fixtures/output/r/httr/multipart-file.r +++ b/src/targets/r/httr/fixtures/multipart-file.r @@ -8,4 +8,4 @@ encode <- "multipart" response <- VERB("POST", url, body = payload, content_type("multipart/form-data"), encode = encode) -content(response, "text") +content(response, "text") \ No newline at end of file diff --git a/test/fixtures/output/r/httr/multipart-form-data.r b/src/targets/r/httr/fixtures/multipart-form-data.r similarity index 92% rename from test/fixtures/output/r/httr/multipart-form-data.r rename to src/targets/r/httr/fixtures/multipart-form-data.r index 5cd514d1b..b9544b63c 100644 --- a/test/fixtures/output/r/httr/multipart-form-data.r +++ b/src/targets/r/httr/fixtures/multipart-form-data.r @@ -8,4 +8,4 @@ encode <- "multipart" response <- VERB("POST", url, body = payload, content_type("multipart/form-data"), encode = encode) -content(response, "text") +content(response, "text") \ No newline at end of file diff --git a/test/fixtures/output/r/httr/nested.r b/src/targets/r/httr/fixtures/nested.r similarity index 88% rename from test/fixtures/output/r/httr/nested.r rename to src/targets/r/httr/fixtures/nested.r index 669352cf7..78d21ecce 100644 --- a/test/fixtures/output/r/httr/nested.r +++ b/src/targets/r/httr/fixtures/nested.r @@ -9,4 +9,4 @@ queryString <- list( response <- VERB("GET", url, query = queryString, content_type("application/octet-stream")) -content(response, "text") +content(response, "text") \ No newline at end of file diff --git a/test/fixtures/output/r/httr/query.r b/src/targets/r/httr/fixtures/query.r similarity index 88% rename from test/fixtures/output/r/httr/query.r rename to src/targets/r/httr/fixtures/query.r index 20f4145e7..ea7270150 100644 --- a/test/fixtures/output/r/httr/query.r +++ b/src/targets/r/httr/fixtures/query.r @@ -9,4 +9,4 @@ queryString <- list( response <- VERB("GET", url, query = queryString, content_type("application/octet-stream")) -content(response, "text") +content(response, "text") \ No newline at end of file diff --git a/test/fixtures/output/r/httr/short.r b/src/targets/r/httr/fixtures/short.r similarity index 82% rename from test/fixtures/output/r/httr/short.r rename to src/targets/r/httr/fixtures/short.r index be664c5ef..b546cefc0 100644 --- a/test/fixtures/output/r/httr/short.r +++ b/src/targets/r/httr/fixtures/short.r @@ -4,4 +4,4 @@ url <- "http://mockbin.com/har" response <- VERB("GET", url, content_type("application/octet-stream")) -content(response, "text") +content(response, "text") \ No newline at end of file diff --git a/test/fixtures/output/r/httr/text-plain.r b/src/targets/r/httr/fixtures/text-plain.r similarity index 87% rename from test/fixtures/output/r/httr/text-plain.r rename to src/targets/r/httr/fixtures/text-plain.r index 4d86dce50..4b4215966 100644 --- a/test/fixtures/output/r/httr/text-plain.r +++ b/src/targets/r/httr/fixtures/text-plain.r @@ -8,4 +8,4 @@ encode <- "raw" response <- VERB("POST", url, body = payload, content_type("text/plain"), encode = encode) -content(response, "text") +content(response, "text") \ No newline at end of file diff --git a/src/targets/r/index.js b/src/targets/r/index.js deleted file mode 100644 index 3b4fec208..000000000 --- a/src/targets/r/index.js +++ /dev/null @@ -1,12 +0,0 @@ -'use strict' - -module.exports = { - info: { - key: 'r', - title: 'R', - extname: '.r', - default: 'httr' - }, - - httr: require('./httr') -} diff --git a/src/targets/r/target.ts b/src/targets/r/target.ts new file mode 100644 index 000000000..5f9b58c3e --- /dev/null +++ b/src/targets/r/target.ts @@ -0,0 +1,14 @@ +import { Target } from '../targets'; +import { httr } from './httr/client'; + +export const r: Target = { + info: { + key: 'r', + title: 'R', + extname: '.r', + default: 'httr', + }, + clientsById: { + httr, + }, +}; diff --git a/src/targets/ruby/index.js b/src/targets/ruby/index.js deleted file mode 100644 index 1118a1b80..000000000 --- a/src/targets/ruby/index.js +++ /dev/null @@ -1,12 +0,0 @@ -'use strict' - -module.exports = { - info: { - key: 'ruby', - title: 'Ruby', - extname: '.rb', - default: 'native' - }, - - native: require('./native') -} diff --git a/src/targets/ruby/native.js b/src/targets/ruby/native.js deleted file mode 100644 index df96b9e30..000000000 --- a/src/targets/ruby/native.js +++ /dev/null @@ -1,66 +0,0 @@ -'use strict' - -const CodeBuilder = require('../../helpers/code-builder') - -module.exports = function (source, options) { - const code = new CodeBuilder() - - code.push('require \'uri\'') - .push('require \'net/http\'') - - if (source.uriObj.protocol === 'https:') { - code.push('require \'openssl\'') - } - - code.blank() - - // To support custom methods we check for the supported methods - // and if doesn't exist then we build a custom class for it - const method = source.method.toUpperCase() - const methods = ['GET', 'POST', 'HEAD', 'DELETE', 'PATCH', 'PUT', 'OPTIONS', 'COPY', 'LOCK', 'UNLOCK', 'MOVE', 'TRACE'] - const capMethod = method.charAt(0) + method.substring(1).toLowerCase() - if (methods.indexOf(method) < 0) { - code.push('class Net::HTTP::%s < Net::HTTPRequest', capMethod) - .push(' METHOD = \'%s\'', method.toUpperCase()) - .push(' REQUEST_HAS_BODY = \'%s\'', source.postData.text ? 'true' : 'false') - .push(' RESPONSE_HAS_BODY = true') - .push('end') - .blank() - } - - code.push('url = URI("%s")', source.fullUrl) - .blank() - .push('http = Net::HTTP.new(url.host, url.port)') - - if (source.uriObj.protocol === 'https:') { - code.push('http.use_ssl = true') - .push('http.verify_mode = OpenSSL::SSL::VERIFY_NONE') - } - - code.blank() - .push('request = Net::HTTP::%s.new(url)', capMethod) - - const headers = Object.keys(source.allHeaders) - if (headers.length) { - headers.forEach(function (key) { - code.push('request["%s"] = \'%s\'', key, source.allHeaders[key]) - }) - } - - if (source.postData.text) { - code.push('request.body = %s', JSON.stringify(source.postData.text)) - } - - code.blank() - .push('response = http.request(request)') - .push('puts response.read_body') - - return code.join() -} - -module.exports.info = { - key: 'native', - title: 'net::http', - link: 'http://ruby-doc.org/stdlib-2.2.1/libdoc/net/http/rdoc/Net/HTTP.html', - description: 'Ruby HTTP client' -} diff --git a/src/targets/ruby/native/client.ts b/src/targets/ruby/native/client.ts new file mode 100644 index 000000000..c830a593f --- /dev/null +++ b/src/targets/ruby/native/client.ts @@ -0,0 +1,79 @@ +import { CodeBuilder } from '../../../helpers/code-builder'; +import { Client } from '../../targets'; + +export const native: Client = { + info: { + key: 'native', + title: 'net::http', + link: 'http://ruby-doc.org/stdlib-2.2.1/libdoc/net/http/rdoc/Net/HTTP.html', + description: 'Ruby HTTP client', + }, + convert: ({ uriObj, method: rawMethod, fullUrl, postData, allHeaders }) => { + const { push, blank, join } = new CodeBuilder(); + + push("require 'uri'"); + push("require 'net/http'"); + + if (uriObj.protocol === 'https:') { + push("require 'openssl'"); + } + + blank(); + + // To support custom methods we check for the supported methods + // and if doesn't exist then we build a custom class for it + const method = rawMethod.toUpperCase(); + const methods = [ + 'GET', + 'POST', + 'HEAD', + 'DELETE', + 'PATCH', + 'PUT', + 'OPTIONS', + 'COPY', + 'LOCK', + 'UNLOCK', + 'MOVE', + 'TRACE', + ]; + const capMethod = method.charAt(0) + method.substring(1).toLowerCase(); + if (!methods.includes(method)) { + push(`class Net::HTTP::${capMethod} < Net::HTTPRequest`); + push(` METHOD = '${method.toUpperCase()}'`); + push(` REQUEST_HAS_BODY = '${postData.text ? 'true' : 'false'}'`); + push(' RESPONSE_HAS_BODY = true'); + push('end'); + blank(); + } + + push(`url = URI("${fullUrl}")`); + blank(); + push('http = Net::HTTP.new(url.host, url.port)'); + + if (uriObj.protocol === 'https:') { + push('http.use_ssl = true'); + push('http.verify_mode = OpenSSL::SSL::VERIFY_NONE'); + } + + blank(); + push(`request = Net::HTTP::${capMethod}.new(url)`); + + const headers = Object.keys(allHeaders); + if (headers.length) { + headers.forEach(key => { + push(`request["${key}"] = '${allHeaders[key]}'`); + }); + } + + if (postData.text) { + push(`request.body = ${JSON.stringify(postData.text)}`); + } + + blank(); + push('response = http.request(request)'); + push('puts response.read_body'); + + return join(); + }, +}; diff --git a/test/fixtures/output/ruby/native/application-form-encoded.rb b/src/targets/ruby/native/fixtures/application-form-encoded.rb similarity index 92% rename from test/fixtures/output/ruby/native/application-form-encoded.rb rename to src/targets/ruby/native/fixtures/application-form-encoded.rb index b22b26b52..ba9ac8716 100644 --- a/test/fixtures/output/ruby/native/application-form-encoded.rb +++ b/src/targets/ruby/native/fixtures/application-form-encoded.rb @@ -10,4 +10,4 @@ request.body = "foo=bar&hello=world" response = http.request(request) -puts response.read_body +puts response.read_body \ No newline at end of file diff --git a/test/fixtures/output/ruby/native/application-json.rb b/src/targets/ruby/native/fixtures/application-json.rb similarity index 94% rename from test/fixtures/output/ruby/native/application-json.rb rename to src/targets/ruby/native/fixtures/application-json.rb index 78c310fa8..82f950409 100644 --- a/test/fixtures/output/ruby/native/application-json.rb +++ b/src/targets/ruby/native/fixtures/application-json.rb @@ -10,4 +10,4 @@ request.body = "{\"number\":1,\"string\":\"f\\\"oo\",\"arr\":[1,2,3],\"nested\":{\"a\":\"b\"},\"arr_mix\":[1,\"a\",{\"arr_mix_nested\":{}}],\"boolean\":false}" response = http.request(request) -puts response.read_body +puts response.read_body \ No newline at end of file diff --git a/test/fixtures/output/ruby/native/cookies.rb b/src/targets/ruby/native/fixtures/cookies.rb similarity index 90% rename from test/fixtures/output/ruby/native/cookies.rb rename to src/targets/ruby/native/fixtures/cookies.rb index 3283fafca..5ed288446 100644 --- a/test/fixtures/output/ruby/native/cookies.rb +++ b/src/targets/ruby/native/fixtures/cookies.rb @@ -9,4 +9,4 @@ request["cookie"] = 'foo=bar; bar=baz' response = http.request(request) -puts response.read_body +puts response.read_body \ No newline at end of file diff --git a/test/fixtures/output/ruby/native/custom-method.rb b/src/targets/ruby/native/fixtures/custom-method.rb similarity index 92% rename from test/fixtures/output/ruby/native/custom-method.rb rename to src/targets/ruby/native/fixtures/custom-method.rb index d3d4566e7..5a18031c2 100644 --- a/test/fixtures/output/ruby/native/custom-method.rb +++ b/src/targets/ruby/native/fixtures/custom-method.rb @@ -14,4 +14,4 @@ class Net::HTTP::Propfind < Net::HTTPRequest request = Net::HTTP::Propfind.new(url) response = http.request(request) -puts response.read_body +puts response.read_body \ No newline at end of file diff --git a/test/fixtures/output/ruby/native/full.rb b/src/targets/ruby/native/fixtures/full.rb similarity index 94% rename from test/fixtures/output/ruby/native/full.rb rename to src/targets/ruby/native/fixtures/full.rb index 992c58642..864167700 100644 --- a/test/fixtures/output/ruby/native/full.rb +++ b/src/targets/ruby/native/fixtures/full.rb @@ -12,4 +12,4 @@ request.body = "foo=bar" response = http.request(request) -puts response.read_body +puts response.read_body \ No newline at end of file diff --git a/test/fixtures/output/ruby/native/headers.rb b/src/targets/ruby/native/fixtures/headers.rb similarity index 91% rename from test/fixtures/output/ruby/native/headers.rb rename to src/targets/ruby/native/fixtures/headers.rb index f2a4dba9a..37ba37528 100644 --- a/test/fixtures/output/ruby/native/headers.rb +++ b/src/targets/ruby/native/fixtures/headers.rb @@ -10,4 +10,4 @@ request["x-foo"] = 'Bar' response = http.request(request) -puts response.read_body +puts response.read_body \ No newline at end of file diff --git a/test/fixtures/output/ruby/native/https.rb b/src/targets/ruby/native/fixtures/https.rb similarity index 91% rename from test/fixtures/output/ruby/native/https.rb rename to src/targets/ruby/native/fixtures/https.rb index 8d645dd3e..34bd14508 100644 --- a/test/fixtures/output/ruby/native/https.rb +++ b/src/targets/ruby/native/fixtures/https.rb @@ -11,4 +11,4 @@ request = Net::HTTP::Get.new(url) response = http.request(request) -puts response.read_body +puts response.read_body \ No newline at end of file diff --git a/test/fixtures/output/ruby/native/jsonObj-multiline.rb b/src/targets/ruby/native/fixtures/jsonObj-multiline.rb similarity index 91% rename from test/fixtures/output/ruby/native/jsonObj-multiline.rb rename to src/targets/ruby/native/fixtures/jsonObj-multiline.rb index 1cb042417..75bbadab2 100644 --- a/test/fixtures/output/ruby/native/jsonObj-multiline.rb +++ b/src/targets/ruby/native/fixtures/jsonObj-multiline.rb @@ -10,4 +10,4 @@ request.body = "{\n \"foo\": \"bar\"\n}" response = http.request(request) -puts response.read_body +puts response.read_body \ No newline at end of file diff --git a/test/fixtures/output/ruby/native/jsonObj-null-value.rb b/src/targets/ruby/native/fixtures/jsonObj-null-value.rb similarity index 91% rename from test/fixtures/output/ruby/native/jsonObj-null-value.rb rename to src/targets/ruby/native/fixtures/jsonObj-null-value.rb index b73ffff47..66640ad1e 100644 --- a/test/fixtures/output/ruby/native/jsonObj-null-value.rb +++ b/src/targets/ruby/native/fixtures/jsonObj-null-value.rb @@ -10,4 +10,4 @@ request.body = "{\"foo\":null}" response = http.request(request) -puts response.read_body +puts response.read_body \ No newline at end of file diff --git a/test/fixtures/output/ruby/native/multipart-data.rb b/src/targets/ruby/native/fixtures/multipart-data.rb similarity index 95% rename from test/fixtures/output/ruby/native/multipart-data.rb rename to src/targets/ruby/native/fixtures/multipart-data.rb index 4b5613fde..33b9b450f 100644 --- a/test/fixtures/output/ruby/native/multipart-data.rb +++ b/src/targets/ruby/native/fixtures/multipart-data.rb @@ -10,4 +10,4 @@ request.body = "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001--\r\n" response = http.request(request) -puts response.read_body +puts response.read_body \ No newline at end of file diff --git a/test/fixtures/output/ruby/native/multipart-file.rb b/src/targets/ruby/native/fixtures/multipart-file.rb similarity index 95% rename from test/fixtures/output/ruby/native/multipart-file.rb rename to src/targets/ruby/native/fixtures/multipart-file.rb index bbf6c8845..6bcc16a5b 100644 --- a/test/fixtures/output/ruby/native/multipart-file.rb +++ b/src/targets/ruby/native/fixtures/multipart-file.rb @@ -10,4 +10,4 @@ request.body = "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\n\r\n-----011000010111000001101001--\r\n" response = http.request(request) -puts response.read_body +puts response.read_body \ No newline at end of file diff --git a/test/fixtures/output/ruby/native/multipart-form-data.rb b/src/targets/ruby/native/fixtures/multipart-form-data.rb similarity index 94% rename from test/fixtures/output/ruby/native/multipart-form-data.rb rename to src/targets/ruby/native/fixtures/multipart-form-data.rb index e7800b288..743994310 100644 --- a/test/fixtures/output/ruby/native/multipart-form-data.rb +++ b/src/targets/ruby/native/fixtures/multipart-form-data.rb @@ -10,4 +10,4 @@ request.body = "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"\r\n\r\nbar\r\n-----011000010111000001101001--\r\n" response = http.request(request) -puts response.read_body +puts response.read_body \ No newline at end of file diff --git a/test/fixtures/output/ruby/native/nested.rb b/src/targets/ruby/native/fixtures/nested.rb similarity index 90% rename from test/fixtures/output/ruby/native/nested.rb rename to src/targets/ruby/native/fixtures/nested.rb index 9a12a21dc..d0bbd40ce 100644 --- a/test/fixtures/output/ruby/native/nested.rb +++ b/src/targets/ruby/native/fixtures/nested.rb @@ -8,4 +8,4 @@ request = Net::HTTP::Get.new(url) response = http.request(request) -puts response.read_body +puts response.read_body \ No newline at end of file diff --git a/test/fixtures/output/ruby/native/query.rb b/src/targets/ruby/native/fixtures/query.rb similarity index 89% rename from test/fixtures/output/ruby/native/query.rb rename to src/targets/ruby/native/fixtures/query.rb index ef6881c28..fd065018a 100644 --- a/test/fixtures/output/ruby/native/query.rb +++ b/src/targets/ruby/native/fixtures/query.rb @@ -8,4 +8,4 @@ request = Net::HTTP::Get.new(url) response = http.request(request) -puts response.read_body +puts response.read_body \ No newline at end of file diff --git a/test/fixtures/output/ruby/native/short.rb b/src/targets/ruby/native/fixtures/short.rb similarity index 88% rename from test/fixtures/output/ruby/native/short.rb rename to src/targets/ruby/native/fixtures/short.rb index 7761eb998..94e62e52f 100644 --- a/test/fixtures/output/ruby/native/short.rb +++ b/src/targets/ruby/native/fixtures/short.rb @@ -8,4 +8,4 @@ request = Net::HTTP::Get.new(url) response = http.request(request) -puts response.read_body +puts response.read_body \ No newline at end of file diff --git a/test/fixtures/output/ruby/native/text-plain.rb b/src/targets/ruby/native/fixtures/text-plain.rb similarity index 91% rename from test/fixtures/output/ruby/native/text-plain.rb rename to src/targets/ruby/native/fixtures/text-plain.rb index 813c15ac1..60da9df55 100644 --- a/test/fixtures/output/ruby/native/text-plain.rb +++ b/src/targets/ruby/native/fixtures/text-plain.rb @@ -10,4 +10,4 @@ request.body = "Hello World" response = http.request(request) -puts response.read_body +puts response.read_body \ No newline at end of file diff --git a/src/targets/ruby/target.ts b/src/targets/ruby/target.ts new file mode 100644 index 000000000..7d2e51411 --- /dev/null +++ b/src/targets/ruby/target.ts @@ -0,0 +1,14 @@ +import { Target } from '../targets'; +import { native } from './native/client'; + +export const ruby: Target = { + info: { + key: 'ruby', + title: 'Ruby', + extname: '.rb', + default: 'native', + }, + clientsById: { + native, + }, +}; diff --git a/src/targets/shell/curl.js b/src/targets/shell/curl.js deleted file mode 100644 index 3cde6bb5a..000000000 --- a/src/targets/shell/curl.js +++ /dev/null @@ -1,118 +0,0 @@ -/** - * @description - * HTTP code snippet generator for the Shell using cURL. - * - * @author - * @AhmadNassri - * - * for any questions or issues regarding the generated code snippet, please open an issue mentioning the author. - */ - -'use strict' - -const util = require('util') -const helpers = require('../../helpers/shell') -const headerHelpers = require('../../helpers/headers') -const CodeBuilder = require('../../helpers/code-builder') - -module.exports = function (source, options) { - const opts = Object.assign({ - indent: ' ', - short: false, - binary: false, - globOff: false - }, options) - - const code = new CodeBuilder(opts.indent, opts.indent !== false ? ' \\\n' + opts.indent : ' ') - - const globOption = opts.short ? '-g' : '--globoff' - const requestOption = opts.short ? '-X' : '--request' - let formattedUrl = helpers.quote(source.fullUrl) - - code.push('curl %s %s', requestOption, source.method) - if (opts.globOff) { - formattedUrl = unescape(formattedUrl) - code.push(globOption) - } - code.push(util.format('%s%s', opts.short ? '' : '--url ', formattedUrl)) - - if (source.httpVersion === 'HTTP/1.0') { - code.push(opts.short ? '-0' : '--http1.0') - } - - // if multipart form data, we want to remove the boundary - if (source.postData.mimeType === 'multipart/form-data') { - const contentTypeHeaderName = headerHelpers.getHeaderName(source.headersObj, 'content-type') - const contentTypeHeader = source.headersObj[contentTypeHeaderName] - - if (contentTypeHeaderName && contentTypeHeader) { - // remove the leading semi colon and boundary - // up to the next semi colon or the end of string - const noBoundary = contentTypeHeader.replace(/; boundary.+?(?=(;|$))/, '') - - // replace the content-type header with no boundary in both headersObj and allHeaders - source.headersObj[contentTypeHeaderName] = noBoundary - source.allHeaders[contentTypeHeaderName] = noBoundary - } - } - - // construct headers - Object.keys(source.headersObj).sort().forEach(function (key) { - const header = util.format('%s: %s', key, source.headersObj[key]) - code.push('%s %s', opts.short ? '-H' : '--header', helpers.quote(header)) - }) - - if (source.allHeaders.cookie) { - code.push('%s %s', opts.short ? '-b' : '--cookie', helpers.quote(source.allHeaders.cookie)) - } - - // construct post params - switch (source.postData.mimeType) { - case 'multipart/form-data': - source.postData.params.forEach(function (param) { - let post = '' - if (param.fileName) { - post = util.format('%s=@%s', param.name, param.fileName) - } else { - post = util.format('%s=%s', param.name, param.value) - } - - code.push('%s %s', opts.short ? '-F' : '--form', helpers.quote(post)) - }) - break - - case 'application/x-www-form-urlencoded': - if (source.postData.params) { - source.postData.params.forEach(function (param) { - code.push( - '%s %s', opts.binary ? '--data-binary' : (opts.short ? '-d' : '--data'), - helpers.quote(util.format('%s=%s', param.name, param.value)) - ) - }) - } else { - code.push( - '%s %s', opts.binary ? '--data-binary' : (opts.short ? '-d' : '--data'), - helpers.quote(source.postData.text) - ) - } - break - - default: - // raw request body - if (source.postData.text) { - code.push( - '%s %s', opts.binary ? '--data-binary' : (opts.short ? '-d' : '--data'), - helpers.quote(source.postData.text) - ) - } - } - - return code.join() -} - -module.exports.info = { - key: 'curl', - title: 'cURL', - link: 'http://curl.haxx.se/', - description: 'cURL is a command line tool and library for transferring data with URL syntax' -} diff --git a/src/targets/shell/curl/client.test.ts b/src/targets/shell/curl/client.test.ts new file mode 100644 index 000000000..1142a34e1 --- /dev/null +++ b/src/targets/shell/curl/client.test.ts @@ -0,0 +1,75 @@ +import full from '../../../fixtures/requests/full.json'; +import nested from '../../../fixtures/requests/nested.json'; +import { runCustomFixtures } from '../../../fixtures/runCustomFixtures'; +import { Request } from '../../../httpsnippet'; + +runCustomFixtures({ + targetId: 'shell', + clientId: 'curl', + tests: [ + { + it: 'should use short options', + input: full as Request, + options: { short: true, indent: false }, + expected: 'short-options.sh', + }, + { + it: 'should use binary option', + input: full as Request, + options: { + short: true, + indent: false, + binary: true, + }, + expected: 'binary-option.sh', + }, + { + it: 'should use short globoff option', + input: nested as Request, + options: { + short: true, + indent: false, + globOff: true, + }, + expected: 'globoff-option.sh', + }, + { + it: 'should use long globoff option', + input: nested as Request, + options: { + indent: false, + globOff: true, + }, + expected: 'long-globoff-option.sh', + }, + { + it: 'should not de-glob when globoff is false', + input: nested as Request, + options: { + indent: false, + globOff: false, + }, + expected: 'dont-deglob.sh', + }, + { + it: 'should use --http1.0 for HTTP/1.0', + input: { + method: 'GET', + url: 'http://mockbin.com/request', + httpVersion: 'HTTP/1.0', + } as Request, + options: { + indent: false, + }, + expected: 'http10.sh', + }, + { + it: 'should use custom indentation', + input: full as Request, + options: { + indent: '@', + }, + expected: 'custom-indentation.sh', + }, + ], +}); diff --git a/src/targets/shell/curl/client.ts b/src/targets/shell/curl/client.ts new file mode 100644 index 000000000..1ad861c23 --- /dev/null +++ b/src/targets/shell/curl/client.ts @@ -0,0 +1,134 @@ +/** + * @description + * HTTP code snippet generator for the Shell using cURL. + * + * @author + * @AhmadNassri + * + * for any questions or issues regarding the generated code snippet, please open an issue mentioning the author. + */ + +import { CodeBuilder } from '../../../helpers/code-builder'; +import { getHeaderName } from '../../../helpers/headers'; +import { quote } from '../../../helpers/shell'; +import { Client } from '../../targets'; + +export interface CurlOptions { + short?: boolean; + binary?: boolean; + globOff?: boolean; + indent?: string | false; +} + +export const curl: Client = { + info: { + key: 'curl', + title: 'cURL', + link: 'http://curl.haxx.se/', + description: 'cURL is a command line tool and library for transferring data with URL syntax', + }, + convert: ({ fullUrl, method, httpVersion, headersObj, allHeaders, postData }, options) => { + const opts = { + indent: ' ', + short: false, + binary: false, + globOff: false, + ...options, + }; + const { push, join } = new CodeBuilder({ + ...(typeof opts.indent === 'string' ? { indent: opts.indent } : {}), + join: opts.indent !== false ? ` \\\n${opts.indent}` : ' ', + }); + + const globOption = opts.short ? '-g' : '--globoff'; + const requestOption = opts.short ? '-X' : '--request'; + let formattedUrl = quote(fullUrl); + + push(`curl ${requestOption} ${method}`); + if (opts.globOff) { + formattedUrl = unescape(formattedUrl); + push(globOption); + } + push(`${opts.short ? '' : '--url '}${formattedUrl}`); + + if (httpVersion === 'HTTP/1.0') { + push(opts.short ? '-0' : '--http1.0'); + } + + // if multipart form data, we want to remove the boundary + if (postData.mimeType === 'multipart/form-data') { + const contentTypeHeaderName = getHeaderName(headersObj, 'content-type'); + if (contentTypeHeaderName) { + const contentTypeHeader = headersObj[contentTypeHeaderName]; + if (contentTypeHeaderName && contentTypeHeader) { + // remove the leading semi colon and boundary + // up to the next semi colon or the end of string + // @ts-expect-error it is a reality that the headersObj can have values which are string arrays. This is a genuine bug that this case isn't handled or tested. It is, however tested in `reducer.test.ts`. Go check that out to see more. + const noBoundary = contentTypeHeader.replace(/; boundary.+?(?=(;|$))/, ''); + + // replace the content-type header with no boundary in both headersObj and allHeaders + headersObj[contentTypeHeaderName] = noBoundary; + allHeaders[contentTypeHeaderName] = noBoundary; + } + } + } + + // construct headers + Object.keys(headersObj) + .sort() + .forEach(key => { + const header = `${key}: ${headersObj[key]}`; + push(`${opts.short ? '-H' : '--header'} ${quote(header)}`); + }); + + if (allHeaders.cookie) { + push(`${opts.short ? '-b' : '--cookie'} ${quote(allHeaders.cookie as string)}`); + } + + // construct post params + switch (postData.mimeType) { + case 'multipart/form-data': + postData.params?.forEach(param => { + let post = ''; + if (param.fileName) { + post = `${param.name}=@${param.fileName}`; + } else { + post = `${param.name}=${param.value}`; + } + + push(`${opts.short ? '-F' : '--form'} ${quote(post)}`); + }); + break; + + case 'application/x-www-form-urlencoded': + if (postData.params) { + postData.params.forEach(param => { + push( + `${opts.binary ? '--data-binary' : opts.short ? '-d' : '--data'} ${quote( + `${param.name}=${param.value}`, + )}`, + ); + }); + } else { + push( + `${opts.binary ? '--data-binary' : opts.short ? '-d' : '--data'} ${quote( + postData.text, + )}`, + ); + } + break; + + default: + // raw request body + if (postData.text) { + push( + `${opts.binary ? '--data-binary' : opts.short ? '-d' : '--data'} ${quote( + postData.text, + )}`, + ); + } + } + + return join(); + }, +}; diff --git a/test/fixtures/output/shell/curl/application-form-encoded.sh b/src/targets/shell/curl/fixtures/application-form-encoded.sh similarity index 86% rename from test/fixtures/output/shell/curl/application-form-encoded.sh rename to src/targets/shell/curl/fixtures/application-form-encoded.sh index c1bc4fb32..8137bcc05 100644 --- a/test/fixtures/output/shell/curl/application-form-encoded.sh +++ b/src/targets/shell/curl/fixtures/application-form-encoded.sh @@ -2,4 +2,4 @@ curl --request POST \ --url http://mockbin.com/har \ --header 'content-type: application/x-www-form-urlencoded' \ --data foo=bar \ - --data hello=world + --data hello=world \ No newline at end of file diff --git a/test/fixtures/output/shell/curl/application-json.sh b/src/targets/shell/curl/fixtures/application-json.sh similarity index 99% rename from test/fixtures/output/shell/curl/application-json.sh rename to src/targets/shell/curl/fixtures/application-json.sh index f7b19eb9f..d09c1c58a 100644 --- a/test/fixtures/output/shell/curl/application-json.sh +++ b/src/targets/shell/curl/fixtures/application-json.sh @@ -1,4 +1,4 @@ curl --request POST \ --url http://mockbin.com/har \ --header 'content-type: application/json' \ - --data '{"number":1,"string":"f\"oo","arr":[1,2,3],"nested":{"a":"b"},"arr_mix":[1,"a",{"arr_mix_nested":{}}],"boolean":false}' + --data '{"number":1,"string":"f\"oo","arr":[1,2,3],"nested":{"a":"b"},"arr_mix":[1,"a",{"arr_mix_nested":{}}],"boolean":false}' \ No newline at end of file diff --git a/src/targets/shell/curl/fixtures/binary-option.sh b/src/targets/shell/curl/fixtures/binary-option.sh new file mode 100644 index 000000000..131982247 --- /dev/null +++ b/src/targets/shell/curl/fixtures/binary-option.sh @@ -0,0 +1 @@ +curl -X POST 'http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value' -H 'accept: application/json' -H 'content-type: application/x-www-form-urlencoded' -b 'foo=bar; bar=baz' --data-binary foo=bar \ No newline at end of file diff --git a/test/fixtures/output/shell/curl/cookies.sh b/src/targets/shell/curl/fixtures/cookies.sh similarity index 64% rename from test/fixtures/output/shell/curl/cookies.sh rename to src/targets/shell/curl/fixtures/cookies.sh index 74c6eb12a..b4982e19e 100644 --- a/test/fixtures/output/shell/curl/cookies.sh +++ b/src/targets/shell/curl/fixtures/cookies.sh @@ -1,3 +1,3 @@ curl --request POST \ --url http://mockbin.com/har \ - --cookie 'foo=bar; bar=baz' + --cookie 'foo=bar; bar=baz' \ No newline at end of file diff --git a/src/targets/shell/curl/fixtures/custom-indentation.sh b/src/targets/shell/curl/fixtures/custom-indentation.sh new file mode 100644 index 000000000..fea12a989 --- /dev/null +++ b/src/targets/shell/curl/fixtures/custom-indentation.sh @@ -0,0 +1,6 @@ +curl --request POST \ +@--url 'http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value' \ +@--header 'accept: application/json' \ +@--header 'content-type: application/x-www-form-urlencoded' \ +@--cookie 'foo=bar; bar=baz' \ +@--data foo=bar \ No newline at end of file diff --git a/src/targets/shell/curl/fixtures/custom-method.sh b/src/targets/shell/curl/fixtures/custom-method.sh new file mode 100644 index 000000000..0a966fabc --- /dev/null +++ b/src/targets/shell/curl/fixtures/custom-method.sh @@ -0,0 +1,2 @@ +curl --request PROPFIND \ + --url http://mockbin.com/har \ No newline at end of file diff --git a/src/targets/shell/curl/fixtures/dont-deglob.sh b/src/targets/shell/curl/fixtures/dont-deglob.sh new file mode 100644 index 000000000..049ebdba3 --- /dev/null +++ b/src/targets/shell/curl/fixtures/dont-deglob.sh @@ -0,0 +1 @@ +curl --request GET --url 'http://mockbin.com/har?foo%5Bbar%5D=baz%2Czap&fiz=buz&key=value' \ No newline at end of file diff --git a/test/fixtures/output/shell/curl/full.sh b/src/targets/shell/curl/fixtures/full.sh similarity index 93% rename from test/fixtures/output/shell/curl/full.sh rename to src/targets/shell/curl/fixtures/full.sh index 9d9c396dd..8c56d9807 100644 --- a/test/fixtures/output/shell/curl/full.sh +++ b/src/targets/shell/curl/fixtures/full.sh @@ -3,4 +3,4 @@ curl --request POST \ --header 'accept: application/json' \ --header 'content-type: application/x-www-form-urlencoded' \ --cookie 'foo=bar; bar=baz' \ - --data foo=bar + --data foo=bar \ No newline at end of file diff --git a/src/targets/shell/curl/fixtures/globoff-option.sh b/src/targets/shell/curl/fixtures/globoff-option.sh new file mode 100644 index 000000000..5f20115b8 --- /dev/null +++ b/src/targets/shell/curl/fixtures/globoff-option.sh @@ -0,0 +1 @@ +curl -X GET -g 'http://mockbin.com/har?foo[bar]=baz,zap&fiz=buz&key=value' \ No newline at end of file diff --git a/test/fixtures/output/shell/curl/headers.sh b/src/targets/shell/curl/fixtures/headers.sh similarity index 79% rename from test/fixtures/output/shell/curl/headers.sh rename to src/targets/shell/curl/fixtures/headers.sh index c41513681..df3fc4313 100644 --- a/test/fixtures/output/shell/curl/headers.sh +++ b/src/targets/shell/curl/fixtures/headers.sh @@ -1,4 +1,4 @@ curl --request GET \ --url http://mockbin.com/har \ --header 'accept: application/json' \ - --header 'x-foo: Bar' + --header 'x-foo: Bar' \ No newline at end of file diff --git a/test/fixtures/output/shell/curl/http1.sh b/src/targets/shell/curl/fixtures/http1.sh similarity index 83% rename from test/fixtures/output/shell/curl/http1.sh rename to src/targets/shell/curl/fixtures/http1.sh index 2dbff472f..f647b4aa8 100644 --- a/test/fixtures/output/shell/curl/http1.sh +++ b/src/targets/shell/curl/fixtures/http1.sh @@ -1,3 +1,3 @@ curl --request GET \ --url "http://mockbin.com/request" \ - --http1.0 + --http1.0 \ No newline at end of file diff --git a/src/targets/shell/curl/fixtures/http10.sh b/src/targets/shell/curl/fixtures/http10.sh new file mode 100644 index 000000000..18287814e --- /dev/null +++ b/src/targets/shell/curl/fixtures/http10.sh @@ -0,0 +1 @@ +curl --request GET --url http://mockbin.com/request --http1.0 \ No newline at end of file diff --git a/src/targets/shell/curl/fixtures/https.sh b/src/targets/shell/curl/fixtures/https.sh new file mode 100644 index 000000000..030623abb --- /dev/null +++ b/src/targets/shell/curl/fixtures/https.sh @@ -0,0 +1,2 @@ +curl --request GET \ + --url https://mockbin.com/har \ No newline at end of file diff --git a/test/fixtures/output/shell/curl/jsonObj-multiline.sh b/src/targets/shell/curl/fixtures/jsonObj-multiline.sh similarity index 97% rename from test/fixtures/output/shell/curl/jsonObj-multiline.sh rename to src/targets/shell/curl/fixtures/jsonObj-multiline.sh index c60fa4d49..5e8c2e4d9 100644 --- a/test/fixtures/output/shell/curl/jsonObj-multiline.sh +++ b/src/targets/shell/curl/fixtures/jsonObj-multiline.sh @@ -3,4 +3,4 @@ curl --request POST \ --header 'content-type: application/json' \ --data '{ "foo": "bar" -}' +}' \ No newline at end of file diff --git a/test/fixtures/output/shell/curl/jsonObj-null-value.sh b/src/targets/shell/curl/fixtures/jsonObj-null-value.sh similarity index 80% rename from test/fixtures/output/shell/curl/jsonObj-null-value.sh rename to src/targets/shell/curl/fixtures/jsonObj-null-value.sh index 51152e664..5d168aa24 100644 --- a/test/fixtures/output/shell/curl/jsonObj-null-value.sh +++ b/src/targets/shell/curl/fixtures/jsonObj-null-value.sh @@ -1,4 +1,4 @@ curl --request POST \ --url http://mockbin.com/har \ --header 'content-type: application/json' \ - --data '{"foo":null}' + --data '{"foo":null}' \ No newline at end of file diff --git a/src/targets/shell/curl/fixtures/long-globoff-option.sh b/src/targets/shell/curl/fixtures/long-globoff-option.sh new file mode 100644 index 000000000..4d8afd706 --- /dev/null +++ b/src/targets/shell/curl/fixtures/long-globoff-option.sh @@ -0,0 +1 @@ +curl --request GET --globoff --url 'http://mockbin.com/har?foo[bar]=baz,zap&fiz=buz&key=value' \ No newline at end of file diff --git a/test/fixtures/output/shell/curl/multipart-data.sh b/src/targets/shell/curl/fixtures/multipart-data.sh similarity index 81% rename from test/fixtures/output/shell/curl/multipart-data.sh rename to src/targets/shell/curl/fixtures/multipart-data.sh index 216ae2365..033e8bdcc 100644 --- a/test/fixtures/output/shell/curl/multipart-data.sh +++ b/src/targets/shell/curl/fixtures/multipart-data.sh @@ -1,4 +1,4 @@ curl --request POST \ --url http://mockbin.com/har \ --header 'content-type: multipart/form-data' \ - --form foo=@hello.txt + --form foo=@hello.txt \ No newline at end of file diff --git a/test/fixtures/output/shell/curl/multipart-file.sh b/src/targets/shell/curl/fixtures/multipart-file.sh similarity index 70% rename from test/fixtures/output/shell/curl/multipart-file.sh rename to src/targets/shell/curl/fixtures/multipart-file.sh index 9f18a585b..41ec82632 100644 --- a/test/fixtures/output/shell/curl/multipart-file.sh +++ b/src/targets/shell/curl/fixtures/multipart-file.sh @@ -1,4 +1,4 @@ curl --request POST \ --url http://mockbin.com/har \ --header 'content-type: multipart/form-data' \ - --form foo=@test/fixtures/files/hello.txt + --form foo=@test/fixtures/files/hello.txt \ No newline at end of file diff --git a/test/fixtures/output/shell/curl/multipart-form-data.sh b/src/targets/shell/curl/fixtures/multipart-form-data.sh similarity index 85% rename from test/fixtures/output/shell/curl/multipart-form-data.sh rename to src/targets/shell/curl/fixtures/multipart-form-data.sh index fd5d2d16a..538c02a7e 100644 --- a/test/fixtures/output/shell/curl/multipart-form-data.sh +++ b/src/targets/shell/curl/fixtures/multipart-form-data.sh @@ -1,4 +1,4 @@ curl --request POST \ --url http://mockbin.com/har \ --header 'Content-Type: multipart/form-data' \ - --form foo=bar + --form foo=bar \ No newline at end of file diff --git a/test/fixtures/output/shell/curl/nested.sh b/src/targets/shell/curl/fixtures/nested.sh similarity index 89% rename from test/fixtures/output/shell/curl/nested.sh rename to src/targets/shell/curl/fixtures/nested.sh index 8c9149622..2126d58f9 100644 --- a/test/fixtures/output/shell/curl/nested.sh +++ b/src/targets/shell/curl/fixtures/nested.sh @@ -1,2 +1,2 @@ curl --request GET \ - --url 'http://mockbin.com/har?foo%5Bbar%5D=baz%2Czap&fiz=buz&key=value' + --url 'http://mockbin.com/har?foo%5Bbar%5D=baz%2Czap&fiz=buz&key=value' \ No newline at end of file diff --git a/test/fixtures/output/shell/curl/query.sh b/src/targets/shell/curl/fixtures/query.sh similarity index 96% rename from test/fixtures/output/shell/curl/query.sh rename to src/targets/shell/curl/fixtures/query.sh index 488bd4a18..c0e604ed8 100644 --- a/test/fixtures/output/shell/curl/query.sh +++ b/src/targets/shell/curl/fixtures/query.sh @@ -1,2 +1,2 @@ curl --request GET \ - --url 'http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value' + --url 'http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value' \ No newline at end of file diff --git a/src/targets/shell/curl/fixtures/short-options.sh b/src/targets/shell/curl/fixtures/short-options.sh new file mode 100644 index 000000000..ec2534571 --- /dev/null +++ b/src/targets/shell/curl/fixtures/short-options.sh @@ -0,0 +1 @@ +curl -X POST 'http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value' -H 'accept: application/json' -H 'content-type: application/x-www-form-urlencoded' -b 'foo=bar; bar=baz' -d foo=bar \ No newline at end of file diff --git a/src/targets/shell/curl/fixtures/short.sh b/src/targets/shell/curl/fixtures/short.sh new file mode 100644 index 000000000..60eb2f0ed --- /dev/null +++ b/src/targets/shell/curl/fixtures/short.sh @@ -0,0 +1,2 @@ +curl --request GET \ + --url http://mockbin.com/har \ No newline at end of file diff --git a/test/fixtures/output/shell/curl/text-plain.sh b/src/targets/shell/curl/fixtures/text-plain.sh similarity index 80% rename from test/fixtures/output/shell/curl/text-plain.sh rename to src/targets/shell/curl/fixtures/text-plain.sh index 511b8f24f..b8e0d908a 100644 --- a/test/fixtures/output/shell/curl/text-plain.sh +++ b/src/targets/shell/curl/fixtures/text-plain.sh @@ -1,4 +1,4 @@ curl --request POST \ --url http://mockbin.com/har \ --header 'content-type: text/plain' \ - --data 'Hello World' + --data 'Hello World' \ No newline at end of file diff --git a/src/targets/shell/httpie.js b/src/targets/shell/httpie.js deleted file mode 100644 index 40b0338a3..000000000 --- a/src/targets/shell/httpie.js +++ /dev/null @@ -1,123 +0,0 @@ -/** - * @description - * HTTP code snippet generator for the Shell using HTTPie. - * - * @author - * @AhmadNassri - * - * for any questions or issues regarding the generated code snippet, please open an issue mentioning the author. - */ - -'use strict' - -const util = require('util') -const shell = require('../../helpers/shell') -const CodeBuilder = require('../../helpers/code-builder') - -module.exports = function (source, options) { - const opts = Object.assign({ - body: false, - cert: false, - headers: false, - indent: ' ', - pretty: false, - print: false, - queryParams: false, - short: false, - style: false, - timeout: false, - verbose: false, - verify: false - }, options) - - const code = new CodeBuilder(opts.indent, opts.indent !== false ? ' \\\n' + opts.indent : ' ') - - let raw = false - const flags = [] - - if (opts.headers) { - flags.push(opts.short ? '-h' : '--headers') - } - - if (opts.body) { - flags.push(opts.short ? '-b' : '--body') - } - - if (opts.verbose) { - flags.push(opts.short ? '-v' : '--verbose') - } - - if (opts.print) { - flags.push(util.format('%s=%s', opts.short ? '-p' : '--print', opts.print)) - } - - if (opts.verify) { - flags.push(util.format('--verify=%s', opts.verify)) - } - - if (opts.cert) { - flags.push(util.format('--cert=%s', opts.cert)) - } - - if (opts.pretty) { - flags.push(util.format('--pretty=%s', opts.pretty)) - } - - if (opts.style) { - flags.push(util.format('--style=%s', opts.pretty)) - } - - if (opts.timeout) { - flags.push(util.format('--timeout=%s', opts.timeout)) - } - - // construct query params - if (opts.queryParams) { - const queryStringKeys = Object.keys(source.queryObj) - - queryStringKeys.forEach(function (name) { - const value = source.queryObj[name] - - if (Array.isArray(value)) { - value.forEach(function (val) { - code.push('%s==%s', name, shell.quote(val)) - }) - } else { - code.push('%s==%s', name, shell.quote(value)) - } - }) - } - - // construct headers - Object.keys(source.allHeaders).sort().forEach(function (key) { - code.push('%s:%s', key, shell.quote(source.allHeaders[key])) - }) - - if (source.postData.mimeType === 'application/x-www-form-urlencoded') { - // construct post params - if (source.postData.params && source.postData.params.length) { - flags.push(opts.short ? '-f' : '--form') - - source.postData.params.forEach(function (param) { - code.push('%s=%s', param.name, shell.quote(param.value)) - }) - } - } else { - raw = true - } - - code.unshift('http %s%s %s', flags.length ? flags.join(' ') + ' ' : '', source.method, shell.quote(opts.queryParams ? source.url : source.fullUrl)) - - if (raw && source.postData.text) { - code.unshift('echo %s | ', shell.quote(source.postData.text)) - } - - return code.join() -} - -module.exports.info = { - key: 'httpie', - title: 'HTTPie', - link: 'http://httpie.org/', - description: 'a CLI, cURL-like tool for humans' -} diff --git a/src/targets/shell/httpie/client.test.ts b/src/targets/shell/httpie/client.test.ts new file mode 100644 index 000000000..a33e9e937 --- /dev/null +++ b/src/targets/shell/httpie/client.test.ts @@ -0,0 +1,72 @@ +import applicationFormEncoded from '../../../fixtures/requests/application-form-encoded.json'; +import full from '../../../fixtures/requests/full.json'; +import query from '../../../fixtures/requests/query.json'; +import short from '../../../fixtures/requests/short.json'; +import { runCustomFixtures } from '../../../fixtures/runCustomFixtures'; +import { Request } from '../../../httpsnippet'; + +runCustomFixtures({ + targetId: 'shell', + clientId: 'httpie', + tests: [ + { + it: 'should ask for verbose output', + input: short as Request, + options: { indent: false, verbose: true }, + expected: 'verbose-output.sh', + }, + { + it: 'should use short flags', + input: short as Request, + options: { + body: true, + cert: 'foo', + headers: true, + indent: false, + pretty: 'x', + print: 'x', + short: true, + style: 'x', + timeout: 1, + verbose: true, + verify: 'x', + }, + expected: 'short-flags.sh', + }, + { + it: 'should use long flags', + input: short as Request, + options: { + body: true, + cert: 'foo', + headers: true, + indent: false, + pretty: 'x', + print: 'x', + style: 'x', + timeout: 1, + verbose: true, + verify: 'x', + }, + expected: 'long-flags.sh', + }, + { + it: 'should use custom indentation', + input: full as Request, + options: { indent: '@' }, + expected: 'custom-indentation.sh', + }, + { + it: 'should use queryString parameters', + input: query as unknown as Request, + options: { indent: false, queryParams: true }, + expected: 'querystring-parameters.sh', + }, + { + it: 'should build parameterized output of post data', + input: applicationFormEncoded as Request, + options: { short: true, indent: false, queryParams: true }, + expected: 'build-parameters.sh', + }, + ], +}); diff --git a/src/targets/shell/httpie/client.ts b/src/targets/shell/httpie/client.ts new file mode 100644 index 000000000..ff8915951 --- /dev/null +++ b/src/targets/shell/httpie/client.ts @@ -0,0 +1,144 @@ +/** + * @description + * HTTP code snippet generator for the Shell using HTTPie. + * + * @author + * @AhmadNassri + * + * for any questions or issues regarding the generated code snippet, please open an issue mentioning the author. + */ + +import { CodeBuilder } from '../../../helpers/code-builder'; +import { quote } from '../../../helpers/shell'; +import { Client } from '../../targets'; + +export interface HttpieOptions { + body?: boolean; + cert?: boolean; + headers?: boolean; + pretty?: boolean; + print?: boolean; + queryParams?: boolean; + short?: boolean; + style?: boolean; + timeout?: boolean; + verbose?: boolean; + verify?: boolean; +} + +export const httpie: Client = { + info: { + key: 'httpie', + title: 'HTTPie', + link: 'http://httpie.org/', + description: 'a CLI, cURL-like tool for humans', + }, + convert: ({ allHeaders, postData, queryObj, fullUrl, method, url }, options) => { + const opts = { + body: false, + cert: false, + headers: false, + indent: ' ', + pretty: false, + print: false, + queryParams: false, + short: false, + style: false, + timeout: false, + verbose: false, + verify: false, + ...options, + }; + + const { push, join, unshift } = new CodeBuilder({ + indent: opts.indent, + // @ts-expect-error SEEMS LEGIT + join: opts.indent !== false ? ` \\\n${opts.indent}` : ' ', + }); + + let raw = false; + const flags = []; + + if (opts.headers) { + flags.push(opts.short ? '-h' : '--headers'); + } + + if (opts.body) { + flags.push(opts.short ? '-b' : '--body'); + } + + if (opts.verbose) { + flags.push(opts.short ? '-v' : '--verbose'); + } + + if (opts.print) { + flags.push(`${opts.short ? '-p' : '--print'}=${opts.print}`); + } + + if (opts.verify) { + flags.push(`--verify=${opts.verify}`); + } + + if (opts.cert) { + flags.push(`--cert=${opts.cert}`); + } + + if (opts.pretty) { + flags.push(`--pretty=${opts.pretty}`); + } + + if (opts.style) { + flags.push(`--style=${opts.pretty}`); + } + + if (opts.timeout) { + flags.push(`--timeout=${opts.timeout}`); + } + + // construct query params + if (opts.queryParams) { + Object.keys(queryObj).forEach(name => { + const value = queryObj[name]; + + if (Array.isArray(value)) { + value.forEach(val => { + push(`${name}==${quote(val)}`); + }); + } else { + push(`${name}==${quote(value)}`); + } + }); + } + + // construct headers + Object.keys(allHeaders) + .sort() + .forEach(key => { + push(`${key}:${quote(allHeaders[key] as string)}`); + }); + + if (postData.mimeType === 'application/x-www-form-urlencoded') { + // construct post params + if (postData.params && postData.params.length) { + flags.push(opts.short ? '-f' : '--form'); + + postData.params.forEach(param => { + push(`${param.name}=${quote(param.value)}`); + }); + } + } else { + raw = true; + } + + const cliFlags = flags.length ? `${flags.join(' ')} ` : ''; + url = quote(opts.queryParams ? url : fullUrl); + unshift(`http ${cliFlags}${method} ${url}`); + + if (raw && postData.text) { + const postDataText = quote(postData.text); + unshift(`echo ${postDataText} | `); + } + + return join(); + }, +}; diff --git a/test/fixtures/output/shell/httpie/application-form-encoded.sh b/src/targets/shell/httpie/fixtures/application-form-encoded.sh similarity index 88% rename from test/fixtures/output/shell/httpie/application-form-encoded.sh rename to src/targets/shell/httpie/fixtures/application-form-encoded.sh index e7bb5a320..615fb9e12 100644 --- a/test/fixtures/output/shell/httpie/application-form-encoded.sh +++ b/src/targets/shell/httpie/fixtures/application-form-encoded.sh @@ -1,4 +1,4 @@ http --form POST http://mockbin.com/har \ content-type:application/x-www-form-urlencoded \ foo=bar \ - hello=world + hello=world \ No newline at end of file diff --git a/test/fixtures/output/shell/httpie/application-json.sh b/src/targets/shell/httpie/fixtures/application-json.sh similarity index 84% rename from test/fixtures/output/shell/httpie/application-json.sh rename to src/targets/shell/httpie/fixtures/application-json.sh index 073a2583c..832592c93 100644 --- a/test/fixtures/output/shell/httpie/application-json.sh +++ b/src/targets/shell/httpie/fixtures/application-json.sh @@ -1,3 +1,3 @@ echo '{"number":1,"string":"f\"oo","arr":[1,2,3],"nested":{"a":"b"},"arr_mix":[1,"a",{"arr_mix_nested":{}}],"boolean":false}' | \ http POST http://mockbin.com/har \ - content-type:application/json + content-type:application/json \ No newline at end of file diff --git a/src/targets/shell/httpie/fixtures/build-parameters.sh b/src/targets/shell/httpie/fixtures/build-parameters.sh new file mode 100644 index 000000000..11336f6fa --- /dev/null +++ b/src/targets/shell/httpie/fixtures/build-parameters.sh @@ -0,0 +1 @@ +http -f POST http://mockbin.com/har content-type:application/x-www-form-urlencoded foo=bar hello=world \ No newline at end of file diff --git a/test/fixtures/output/shell/httpie/cookies.sh b/src/targets/shell/httpie/fixtures/cookies.sh similarity index 55% rename from test/fixtures/output/shell/httpie/cookies.sh rename to src/targets/shell/httpie/fixtures/cookies.sh index 791a3f58a..0ce062ae2 100644 --- a/test/fixtures/output/shell/httpie/cookies.sh +++ b/src/targets/shell/httpie/fixtures/cookies.sh @@ -1,2 +1,2 @@ http POST http://mockbin.com/har \ - cookie:'foo=bar; bar=baz' + cookie:'foo=bar; bar=baz' \ No newline at end of file diff --git a/src/targets/shell/httpie/fixtures/custom-indentation.sh b/src/targets/shell/httpie/fixtures/custom-indentation.sh new file mode 100644 index 000000000..4cb4dc414 --- /dev/null +++ b/src/targets/shell/httpie/fixtures/custom-indentation.sh @@ -0,0 +1,5 @@ +http --form POST 'http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value' \ +@accept:application/json \ +@content-type:application/x-www-form-urlencoded \ +@cookie:'foo=bar; bar=baz' \ +@foo=bar \ No newline at end of file diff --git a/src/targets/shell/httpie/fixtures/custom-method.sh b/src/targets/shell/httpie/fixtures/custom-method.sh new file mode 100644 index 000000000..91784bf75 --- /dev/null +++ b/src/targets/shell/httpie/fixtures/custom-method.sh @@ -0,0 +1 @@ +http PROPFIND http://mockbin.com/har \ No newline at end of file diff --git a/test/fixtures/output/shell/httpie/full.sh b/src/targets/shell/httpie/fixtures/full.sh similarity index 94% rename from test/fixtures/output/shell/httpie/full.sh rename to src/targets/shell/httpie/fixtures/full.sh index ede01f420..f5a2a8e45 100644 --- a/test/fixtures/output/shell/httpie/full.sh +++ b/src/targets/shell/httpie/fixtures/full.sh @@ -2,4 +2,4 @@ http --form POST 'http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value' \ accept:application/json \ content-type:application/x-www-form-urlencoded \ cookie:'foo=bar; bar=baz' \ - foo=bar + foo=bar \ No newline at end of file diff --git a/test/fixtures/output/shell/httpie/headers.sh b/src/targets/shell/httpie/fixtures/headers.sh similarity index 83% rename from test/fixtures/output/shell/httpie/headers.sh rename to src/targets/shell/httpie/fixtures/headers.sh index 427ae7840..289a8a7ec 100644 --- a/test/fixtures/output/shell/httpie/headers.sh +++ b/src/targets/shell/httpie/fixtures/headers.sh @@ -1,3 +1,3 @@ http GET http://mockbin.com/har \ accept:application/json \ - x-foo:Bar + x-foo:Bar \ No newline at end of file diff --git a/src/targets/shell/httpie/fixtures/https.sh b/src/targets/shell/httpie/fixtures/https.sh new file mode 100644 index 000000000..e8557f14b --- /dev/null +++ b/src/targets/shell/httpie/fixtures/https.sh @@ -0,0 +1 @@ +http GET https://mockbin.com/har \ No newline at end of file diff --git a/test/fixtures/output/shell/httpie/jsonObj-multiline.sh b/src/targets/shell/httpie/fixtures/jsonObj-multiline.sh similarity index 68% rename from test/fixtures/output/shell/httpie/jsonObj-multiline.sh rename to src/targets/shell/httpie/fixtures/jsonObj-multiline.sh index a3a721773..dac87b339 100644 --- a/test/fixtures/output/shell/httpie/jsonObj-multiline.sh +++ b/src/targets/shell/httpie/fixtures/jsonObj-multiline.sh @@ -2,4 +2,4 @@ echo '{ "foo": "bar" }' | \ http POST http://mockbin.com/har \ - content-type:application/json + content-type:application/json \ No newline at end of file diff --git a/test/fixtures/output/shell/httpie/jsonObj-null-value.sh b/src/targets/shell/httpie/fixtures/jsonObj-null-value.sh similarity index 65% rename from test/fixtures/output/shell/httpie/jsonObj-null-value.sh rename to src/targets/shell/httpie/fixtures/jsonObj-null-value.sh index a2fd31358..a0db4646a 100644 --- a/test/fixtures/output/shell/httpie/jsonObj-null-value.sh +++ b/src/targets/shell/httpie/fixtures/jsonObj-null-value.sh @@ -1,3 +1,3 @@ echo '{"foo":null}' | \ http POST http://mockbin.com/har \ - content-type:application/json + content-type:application/json \ No newline at end of file diff --git a/src/targets/shell/httpie/fixtures/long-flags.sh b/src/targets/shell/httpie/fixtures/long-flags.sh new file mode 100644 index 000000000..f5cec2613 --- /dev/null +++ b/src/targets/shell/httpie/fixtures/long-flags.sh @@ -0,0 +1 @@ +http --headers --body --verbose --print=x --verify=x --cert=foo --pretty=x --style=x --timeout=1 GET http://mockbin.com/har \ No newline at end of file diff --git a/test/fixtures/output/shell/httpie/multipart-data.sh b/src/targets/shell/httpie/fixtures/multipart-data.sh similarity index 94% rename from test/fixtures/output/shell/httpie/multipart-data.sh rename to src/targets/shell/httpie/fixtures/multipart-data.sh index 64b17a1f4..8b3ac0a24 100644 --- a/test/fixtures/output/shell/httpie/multipart-data.sh +++ b/src/targets/shell/httpie/fixtures/multipart-data.sh @@ -1,9 +1,9 @@ -echo '-----011000010111000001101001 -Content-Disposition: form-data; name="foo"; filename="hello.txt" -Content-Type: text/plain - -Hello World ------011000010111000001101001-- +echo '-----011000010111000001101001 +Content-Disposition: form-data; name="foo"; filename="hello.txt" +Content-Type: text/plain + +Hello World +-----011000010111000001101001-- ' | \ http POST http://mockbin.com/har \ - content-type:'multipart/form-data; boundary=---011000010111000001101001' + content-type:'multipart/form-data; boundary=---011000010111000001101001' \ No newline at end of file diff --git a/test/fixtures/output/shell/httpie/multipart-file.sh b/src/targets/shell/httpie/fixtures/multipart-file.sh similarity index 94% rename from test/fixtures/output/shell/httpie/multipart-file.sh rename to src/targets/shell/httpie/fixtures/multipart-file.sh index 25b7ede3e..1fbfb2e7e 100644 --- a/test/fixtures/output/shell/httpie/multipart-file.sh +++ b/src/targets/shell/httpie/fixtures/multipart-file.sh @@ -1,9 +1,9 @@ -echo '-----011000010111000001101001 -Content-Disposition: form-data; name="foo"; filename="hello.txt" -Content-Type: text/plain - - ------011000010111000001101001-- +echo '-----011000010111000001101001 +Content-Disposition: form-data; name="foo"; filename="hello.txt" +Content-Type: text/plain + + +-----011000010111000001101001-- ' | \ http POST http://mockbin.com/har \ - content-type:'multipart/form-data; boundary=---011000010111000001101001' + content-type:'multipart/form-data; boundary=---011000010111000001101001' \ No newline at end of file diff --git a/test/fixtures/output/shell/httpie/multipart-form-data.sh b/src/targets/shell/httpie/fixtures/multipart-form-data.sh similarity index 93% rename from test/fixtures/output/shell/httpie/multipart-form-data.sh rename to src/targets/shell/httpie/fixtures/multipart-form-data.sh index 28e8af7d4..ac4606de3 100644 --- a/test/fixtures/output/shell/httpie/multipart-form-data.sh +++ b/src/targets/shell/httpie/fixtures/multipart-form-data.sh @@ -1,8 +1,8 @@ -echo '-----011000010111000001101001 -Content-Disposition: form-data; name="foo" - -bar ------011000010111000001101001-- +echo '-----011000010111000001101001 +Content-Disposition: form-data; name="foo" + +bar +-----011000010111000001101001-- ' | \ http POST http://mockbin.com/har \ - Content-Type:'multipart/form-data; boundary=---011000010111000001101001' + Content-Type:'multipart/form-data; boundary=---011000010111000001101001' \ No newline at end of file diff --git a/test/fixtures/output/shell/httpie/nested.sh b/src/targets/shell/httpie/fixtures/nested.sh similarity index 85% rename from test/fixtures/output/shell/httpie/nested.sh rename to src/targets/shell/httpie/fixtures/nested.sh index 261890e50..1e07f2691 100644 --- a/test/fixtures/output/shell/httpie/nested.sh +++ b/src/targets/shell/httpie/fixtures/nested.sh @@ -1 +1 @@ -http GET 'http://mockbin.com/har?foo%5Bbar%5D=baz%2Czap&fiz=buz&key=value' +http GET 'http://mockbin.com/har?foo%5Bbar%5D=baz%2Czap&fiz=buz&key=value' \ No newline at end of file diff --git a/test/fixtures/output/shell/httpie/query.sh b/src/targets/shell/httpie/fixtures/query.sh similarity index 94% rename from test/fixtures/output/shell/httpie/query.sh rename to src/targets/shell/httpie/fixtures/query.sh index a38d1af26..45f51a389 100644 --- a/test/fixtures/output/shell/httpie/query.sh +++ b/src/targets/shell/httpie/fixtures/query.sh @@ -1 +1 @@ -http GET 'http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value' +http GET 'http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value' \ No newline at end of file diff --git a/src/targets/shell/httpie/fixtures/querystring-parameters.sh b/src/targets/shell/httpie/fixtures/querystring-parameters.sh new file mode 100644 index 000000000..edbb5b6b0 --- /dev/null +++ b/src/targets/shell/httpie/fixtures/querystring-parameters.sh @@ -0,0 +1 @@ +http GET http://mockbin.com/har foo==bar foo==baz baz==abc key==value \ No newline at end of file diff --git a/src/targets/shell/httpie/fixtures/short-flags.sh b/src/targets/shell/httpie/fixtures/short-flags.sh new file mode 100644 index 000000000..74ddb247d --- /dev/null +++ b/src/targets/shell/httpie/fixtures/short-flags.sh @@ -0,0 +1 @@ +http -h -b -v -p=x --verify=x --cert=foo --pretty=x --style=x --timeout=1 GET http://mockbin.com/har \ No newline at end of file diff --git a/src/targets/shell/httpie/fixtures/short.sh b/src/targets/shell/httpie/fixtures/short.sh new file mode 100644 index 000000000..980a82ea2 --- /dev/null +++ b/src/targets/shell/httpie/fixtures/short.sh @@ -0,0 +1 @@ +http GET http://mockbin.com/har \ No newline at end of file diff --git a/test/fixtures/output/shell/httpie/text-plain.sh b/src/targets/shell/httpie/fixtures/text-plain.sh similarity index 70% rename from test/fixtures/output/shell/httpie/text-plain.sh rename to src/targets/shell/httpie/fixtures/text-plain.sh index ac5657d34..5612e1daf 100644 --- a/test/fixtures/output/shell/httpie/text-plain.sh +++ b/src/targets/shell/httpie/fixtures/text-plain.sh @@ -1,3 +1,3 @@ echo 'Hello World' | \ http POST http://mockbin.com/har \ - content-type:text/plain + content-type:text/plain \ No newline at end of file diff --git a/src/targets/shell/httpie/fixtures/verbose-output.sh b/src/targets/shell/httpie/fixtures/verbose-output.sh new file mode 100644 index 000000000..d5def82f9 --- /dev/null +++ b/src/targets/shell/httpie/fixtures/verbose-output.sh @@ -0,0 +1 @@ +http --verbose GET http://mockbin.com/har \ No newline at end of file diff --git a/src/targets/shell/index.js b/src/targets/shell/index.js deleted file mode 100644 index 0f5fc05f0..000000000 --- a/src/targets/shell/index.js +++ /dev/null @@ -1,14 +0,0 @@ -'use strict' - -module.exports = { - info: { - key: 'shell', - title: 'Shell', - extname: '.sh', - default: 'curl' - }, - - curl: require('./curl'), - httpie: require('./httpie'), - wget: require('./wget') -} diff --git a/src/targets/shell/target.ts b/src/targets/shell/target.ts new file mode 100644 index 000000000..c71e512d9 --- /dev/null +++ b/src/targets/shell/target.ts @@ -0,0 +1,18 @@ +import { Target } from '../targets'; +import { curl } from './curl/client'; +import { httpie } from './httpie/client'; +import { wget } from './wget/client'; + +export const shell: Target = { + info: { + key: 'shell', + title: 'Shell', + extname: '.sh', + default: 'curl', + }, + clientsById: { + curl, + httpie, + wget, + }, +}; diff --git a/src/targets/shell/wget.js b/src/targets/shell/wget.js deleted file mode 100644 index a453cc855..000000000 --- a/src/targets/shell/wget.js +++ /dev/null @@ -1,54 +0,0 @@ -/** - * @description - * HTTP code snippet generator for the Shell using Wget. - * - * @author - * @AhmadNassri - * - * for any questions or issues regarding the generated code snippet, please open an issue mentioning the author. - */ - -'use strict' - -const util = require('util') -const helpers = require('../../helpers/shell') -const CodeBuilder = require('../../helpers/code-builder') - -module.exports = function (source, options) { - const opts = Object.assign({ - indent: ' ', - short: false, - verbose: false - }, options) - - const code = new CodeBuilder(opts.indent, opts.indent !== false ? ' \\\n' + opts.indent : ' ') - - if (opts.verbose) { - code.push('wget %s', opts.short ? '-v' : '--verbose') - } else { - code.push('wget %s', opts.short ? '-q' : '--quiet') - } - - code.push('--method %s', helpers.quote(source.method)) - - Object.keys(source.allHeaders).forEach(function (key) { - const header = util.format('%s: %s', key, source.allHeaders[key]) - code.push('--header %s', helpers.quote(header)) - }) - - if (source.postData.text) { - code.push('--body-data ' + helpers.escape(helpers.quote(source.postData.text))) - } - - code.push(opts.short ? '-O' : '--output-document') - .push('- %s', helpers.quote(source.fullUrl)) - - return code.join() -} - -module.exports.info = { - key: 'wget', - title: 'Wget', - link: 'https://www.gnu.org/software/wget/', - description: 'a free software package for retrieving files using HTTP, HTTPS' -} diff --git a/src/targets/shell/wget/client.test.ts b/src/targets/shell/wget/client.test.ts new file mode 100644 index 000000000..0b5a66029 --- /dev/null +++ b/src/targets/shell/wget/client.test.ts @@ -0,0 +1,35 @@ +import full from '../../../fixtures/requests/full.json'; +import short from '../../../fixtures/requests/short.json'; +import { runCustomFixtures } from '../../../fixtures/runCustomFixtures'; +import { Request } from '../../../httpsnippet'; + +runCustomFixtures({ + targetId: 'shell', + clientId: 'wget', + tests: [ + { + it: 'should use short options', + input: full as Request, + options: { short: true, indent: false }, + expected: 'short-options.sh', + }, + { + it: 'should ask for -v output', + input: short as Request, + options: { short: true, indent: false, verbose: true }, + expected: 'v-output.sh', + }, + { + it: 'should ask for --verbose output', + input: short as Request, + options: { short: false, indent: false, verbose: true }, + expected: 'verbose-output.sh', + }, + { + it: 'should use custom indentation', + input: full as Request, + options: { indent: '@' }, + expected: 'custom-indentation.sh', + }, + ], +}); diff --git a/src/targets/shell/wget/client.ts b/src/targets/shell/wget/client.ts new file mode 100644 index 000000000..874fdc261 --- /dev/null +++ b/src/targets/shell/wget/client.ts @@ -0,0 +1,63 @@ +/** + * @description + * HTTP code snippet generator for the Shell using Wget. + * + * @author + * @AhmadNassri + * + * for any questions or issues regarding the generated code snippet, please open an issue mentioning the author. + */ + +import { CodeBuilder } from '../../../helpers/code-builder'; +import { escape, quote } from '../../../helpers/shell'; +import { Client } from '../../targets'; + +export interface WgetOptions { + short?: boolean; + verbose?: boolean; +} + +export const wget: Client = { + info: { + key: 'wget', + title: 'Wget', + link: 'https://www.gnu.org/software/wget/', + description: 'a free software package for retrieving files using HTTP, HTTPS', + }, + convert: ({ method, postData, allHeaders, fullUrl }, options) => { + const opts = { + indent: ' ', + short: false, + verbose: false, + ...options, + }; + + const { push, join } = new CodeBuilder({ + indent: opts.indent, + // @ts-expect-error SEEMS LEGIT + join: opts.indent !== false ? ` \\\n${opts.indent}` : ' ', + }); + + if (opts.verbose) { + push(`wget ${opts.short ? '-v' : '--verbose'}`); + } else { + push(`wget ${opts.short ? '-q' : '--quiet'}`); + } + + push(`--method ${quote(method)}`); + + Object.keys(allHeaders).forEach(key => { + const header = `${key}: ${allHeaders[key]}`; + push(`--header ${quote(header)}`); + }); + + if (postData.text) { + push(`--body-data ${escape(quote(postData.text))}`); + } + + push(opts.short ? '-O' : '--output-document'); + push(`- ${quote(fullUrl)}`); + + return join(); + }, +}; diff --git a/test/fixtures/output/shell/wget/application-form-encoded.sh b/src/targets/shell/wget/fixtures/application-form-encoded.sh similarity index 85% rename from test/fixtures/output/shell/wget/application-form-encoded.sh rename to src/targets/shell/wget/fixtures/application-form-encoded.sh index a7f1ab106..6115531d7 100644 --- a/test/fixtures/output/shell/wget/application-form-encoded.sh +++ b/src/targets/shell/wget/fixtures/application-form-encoded.sh @@ -3,4 +3,4 @@ wget --quiet \ --header 'content-type: application/x-www-form-urlencoded' \ --body-data 'foo=bar&hello=world' \ --output-document \ - - http://mockbin.com/har + - http://mockbin.com/har \ No newline at end of file diff --git a/test/fixtures/output/shell/wget/application-json.sh b/src/targets/shell/wget/fixtures/application-json.sh similarity index 89% rename from test/fixtures/output/shell/wget/application-json.sh rename to src/targets/shell/wget/fixtures/application-json.sh index c89593c15..852eb5cfe 100644 --- a/test/fixtures/output/shell/wget/application-json.sh +++ b/src/targets/shell/wget/fixtures/application-json.sh @@ -3,4 +3,4 @@ wget --quiet \ --header 'content-type: application/json' \ --body-data '{"number":1,"string":"f\"oo","arr":[1,2,3],"nested":{"a":"b"},"arr_mix":[1,"a",{"arr_mix_nested":{}}],"boolean":false}' \ --output-document \ - - http://mockbin.com/har + - http://mockbin.com/har \ No newline at end of file diff --git a/test/fixtures/output/shell/wget/cookies.sh b/src/targets/shell/wget/fixtures/cookies.sh similarity index 77% rename from test/fixtures/output/shell/wget/cookies.sh rename to src/targets/shell/wget/fixtures/cookies.sh index 797c6baca..b33fe2c20 100644 --- a/test/fixtures/output/shell/wget/cookies.sh +++ b/src/targets/shell/wget/fixtures/cookies.sh @@ -2,4 +2,4 @@ wget --quiet \ --method POST \ --header 'cookie: foo=bar; bar=baz' \ --output-document \ - - http://mockbin.com/har + - http://mockbin.com/har \ No newline at end of file diff --git a/src/targets/shell/wget/fixtures/custom-indentation.sh b/src/targets/shell/wget/fixtures/custom-indentation.sh new file mode 100644 index 000000000..f3ab61c19 --- /dev/null +++ b/src/targets/shell/wget/fixtures/custom-indentation.sh @@ -0,0 +1,8 @@ +wget --quiet \ +@--method POST \ +@--header 'cookie: foo=bar; bar=baz' \ +@--header 'accept: application/json' \ +@--header 'content-type: application/x-www-form-urlencoded' \ +@--body-data foo=bar \ +@--output-document \ +@- 'http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value' \ No newline at end of file diff --git a/test/fixtures/output/shell/wget/custom-method.sh b/src/targets/shell/wget/fixtures/custom-method.sh similarity index 68% rename from test/fixtures/output/shell/wget/custom-method.sh rename to src/targets/shell/wget/fixtures/custom-method.sh index 3faea5fe1..44f90c675 100644 --- a/test/fixtures/output/shell/wget/custom-method.sh +++ b/src/targets/shell/wget/fixtures/custom-method.sh @@ -1,4 +1,4 @@ wget --quiet \ --method PROPFIND \ --output-document \ - - http://mockbin.com/har + - http://mockbin.com/har \ No newline at end of file diff --git a/test/fixtures/output/shell/wget/full.sh b/src/targets/shell/wget/fixtures/full.sh similarity index 77% rename from test/fixtures/output/shell/wget/full.sh rename to src/targets/shell/wget/fixtures/full.sh index e15037a97..5cdf08afb 100644 --- a/test/fixtures/output/shell/wget/full.sh +++ b/src/targets/shell/wget/fixtures/full.sh @@ -5,4 +5,4 @@ wget --quiet \ --header 'content-type: application/x-www-form-urlencoded' \ --body-data foo=bar \ --output-document \ - - 'http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value' + - 'http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value' \ No newline at end of file diff --git a/test/fixtures/output/shell/wget/headers.sh b/src/targets/shell/wget/fixtures/headers.sh similarity index 81% rename from test/fixtures/output/shell/wget/headers.sh rename to src/targets/shell/wget/fixtures/headers.sh index e39f0904d..43b75f51c 100644 --- a/test/fixtures/output/shell/wget/headers.sh +++ b/src/targets/shell/wget/fixtures/headers.sh @@ -3,4 +3,4 @@ wget --quiet \ --header 'accept: application/json' \ --header 'x-foo: Bar' \ --output-document \ - - http://mockbin.com/har + - http://mockbin.com/har \ No newline at end of file diff --git a/test/fixtures/output/shell/wget/https.sh b/src/targets/shell/wget/fixtures/https.sh similarity index 65% rename from test/fixtures/output/shell/wget/https.sh rename to src/targets/shell/wget/fixtures/https.sh index 590a3f02a..51cc181b3 100644 --- a/test/fixtures/output/shell/wget/https.sh +++ b/src/targets/shell/wget/fixtures/https.sh @@ -1,4 +1,4 @@ wget --quiet \ --method GET \ --output-document \ - - https://mockbin.com/har + - https://mockbin.com/har \ No newline at end of file diff --git a/test/fixtures/output/shell/wget/jsonObj-multiline.sh b/src/targets/shell/wget/fixtures/jsonObj-multiline.sh similarity index 83% rename from test/fixtures/output/shell/wget/jsonObj-multiline.sh rename to src/targets/shell/wget/fixtures/jsonObj-multiline.sh index ffc919c9c..58e56ed81 100644 --- a/test/fixtures/output/shell/wget/jsonObj-multiline.sh +++ b/src/targets/shell/wget/fixtures/jsonObj-multiline.sh @@ -3,4 +3,4 @@ wget --quiet \ --header 'content-type: application/json' \ --body-data '{\n "foo": "bar"\n}' \ --output-document \ - - http://mockbin.com/har + - http://mockbin.com/har \ No newline at end of file diff --git a/test/fixtures/output/shell/wget/jsonObj-null-value.sh b/src/targets/shell/wget/fixtures/jsonObj-null-value.sh similarity index 83% rename from test/fixtures/output/shell/wget/jsonObj-null-value.sh rename to src/targets/shell/wget/fixtures/jsonObj-null-value.sh index cec705118..b79a9018e 100644 --- a/test/fixtures/output/shell/wget/jsonObj-null-value.sh +++ b/src/targets/shell/wget/fixtures/jsonObj-null-value.sh @@ -3,4 +3,4 @@ wget --quiet \ --header 'content-type: application/json' \ --body-data '{"foo":null}' \ --output-document \ - - http://mockbin.com/har + - http://mockbin.com/har \ No newline at end of file diff --git a/test/fixtures/output/shell/wget/multipart-data.sh b/src/targets/shell/wget/fixtures/multipart-data.sh similarity index 92% rename from test/fixtures/output/shell/wget/multipart-data.sh rename to src/targets/shell/wget/fixtures/multipart-data.sh index 77cf09f86..4fdb3d17b 100644 --- a/test/fixtures/output/shell/wget/multipart-data.sh +++ b/src/targets/shell/wget/fixtures/multipart-data.sh @@ -3,4 +3,4 @@ wget --quiet \ --header 'content-type: multipart/form-data; boundary=---011000010111000001101001' \ --body-data '-----011000010111000001101001\r\nContent-Disposition: form-data; name="foo"; filename="hello.txt"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001--\r\n' \ --output-document \ - - http://mockbin.com/har + - http://mockbin.com/har \ No newline at end of file diff --git a/test/fixtures/output/shell/wget/multipart-file.sh b/src/targets/shell/wget/fixtures/multipart-file.sh similarity index 92% rename from test/fixtures/output/shell/wget/multipart-file.sh rename to src/targets/shell/wget/fixtures/multipart-file.sh index cc997764f..4ca96b226 100644 --- a/test/fixtures/output/shell/wget/multipart-file.sh +++ b/src/targets/shell/wget/fixtures/multipart-file.sh @@ -3,4 +3,4 @@ wget --quiet \ --header 'content-type: multipart/form-data; boundary=---011000010111000001101001' \ --body-data '-----011000010111000001101001\r\nContent-Disposition: form-data; name="foo"; filename="hello.txt"\r\nContent-Type: text/plain\r\n\r\n\r\n-----011000010111000001101001--\r\n' \ --output-document \ - - http://mockbin.com/har + - http://mockbin.com/har \ No newline at end of file diff --git a/test/fixtures/output/shell/wget/multipart-form-data.sh b/src/targets/shell/wget/fixtures/multipart-form-data.sh similarity index 91% rename from test/fixtures/output/shell/wget/multipart-form-data.sh rename to src/targets/shell/wget/fixtures/multipart-form-data.sh index 6b1cd3b45..2704c5a97 100644 --- a/test/fixtures/output/shell/wget/multipart-form-data.sh +++ b/src/targets/shell/wget/fixtures/multipart-form-data.sh @@ -3,4 +3,4 @@ wget --quiet \ --header 'Content-Type: multipart/form-data; boundary=---011000010111000001101001' \ --body-data '-----011000010111000001101001\r\nContent-Disposition: form-data; name="foo"\r\n\r\nbar\r\n-----011000010111000001101001--\r\n' \ --output-document \ - - http://mockbin.com/har + - http://mockbin.com/har \ No newline at end of file diff --git a/test/fixtures/output/shell/wget/nested.sh b/src/targets/shell/wget/fixtures/nested.sh similarity index 95% rename from test/fixtures/output/shell/wget/nested.sh rename to src/targets/shell/wget/fixtures/nested.sh index ce9cdfe68..6c2c988cc 100644 --- a/test/fixtures/output/shell/wget/nested.sh +++ b/src/targets/shell/wget/fixtures/nested.sh @@ -1,4 +1,4 @@ wget --quiet \ --method GET \ --output-document \ - - 'http://mockbin.com/har?foo%5Bbar%5D=baz%2Czap&fiz=buz&key=value' + - 'http://mockbin.com/har?foo%5Bbar%5D=baz%2Czap&fiz=buz&key=value' \ No newline at end of file diff --git a/src/targets/shell/wget/fixtures/query.sh b/src/targets/shell/wget/fixtures/query.sh new file mode 100644 index 000000000..68944ac34 --- /dev/null +++ b/src/targets/shell/wget/fixtures/query.sh @@ -0,0 +1,4 @@ +wget --quiet \ + --method GET \ + --output-document \ + - 'http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value' \ No newline at end of file diff --git a/src/targets/shell/wget/fixtures/short-options.sh b/src/targets/shell/wget/fixtures/short-options.sh new file mode 100644 index 000000000..6987ea266 --- /dev/null +++ b/src/targets/shell/wget/fixtures/short-options.sh @@ -0,0 +1 @@ +wget -q --method POST --header 'cookie: foo=bar; bar=baz' --header 'accept: application/json' --header 'content-type: application/x-www-form-urlencoded' --body-data foo=bar -O - 'http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value' \ No newline at end of file diff --git a/test/fixtures/output/shell/wget/short.sh b/src/targets/shell/wget/fixtures/short.sh similarity index 66% rename from test/fixtures/output/shell/wget/short.sh rename to src/targets/shell/wget/fixtures/short.sh index e2101d85f..11869fb9c 100644 --- a/test/fixtures/output/shell/wget/short.sh +++ b/src/targets/shell/wget/fixtures/short.sh @@ -1,4 +1,4 @@ wget --quiet \ --method GET \ --output-document \ - - http://mockbin.com/har + - http://mockbin.com/har \ No newline at end of file diff --git a/test/fixtures/output/shell/wget/text-plain.sh b/src/targets/shell/wget/fixtures/text-plain.sh similarity index 82% rename from test/fixtures/output/shell/wget/text-plain.sh rename to src/targets/shell/wget/fixtures/text-plain.sh index 754ac9fd0..22bb59a29 100644 --- a/test/fixtures/output/shell/wget/text-plain.sh +++ b/src/targets/shell/wget/fixtures/text-plain.sh @@ -3,4 +3,4 @@ wget --quiet \ --header 'content-type: text/plain' \ --body-data 'Hello World' \ --output-document \ - - http://mockbin.com/har + - http://mockbin.com/har \ No newline at end of file diff --git a/src/targets/shell/wget/fixtures/v-output.sh b/src/targets/shell/wget/fixtures/v-output.sh new file mode 100644 index 000000000..30888ee5e --- /dev/null +++ b/src/targets/shell/wget/fixtures/v-output.sh @@ -0,0 +1 @@ +wget -v --method GET -O - http://mockbin.com/har \ No newline at end of file diff --git a/src/targets/shell/wget/fixtures/verbose-output.sh b/src/targets/shell/wget/fixtures/verbose-output.sh new file mode 100644 index 000000000..f2d01a4e4 --- /dev/null +++ b/src/targets/shell/wget/fixtures/verbose-output.sh @@ -0,0 +1 @@ +wget --verbose --method GET --output-document - http://mockbin.com/har \ No newline at end of file diff --git a/src/targets/swift/helpers.js b/src/targets/swift/helpers.js deleted file mode 100644 index 62a212127..000000000 --- a/src/targets/swift/helpers.js +++ /dev/null @@ -1,90 +0,0 @@ -'use strict' - -const util = require('util') - -/** - * Create an string of given length filled with blank spaces - * - * @param {number} length Length of the array to return - * @param {string} str String to pad out with - * @return {string} - */ -function buildString (length, str) { - return Array.apply(null, new Array(length)).map(String.prototype.valueOf, str).join('') -} - -/** - * Create a string corresponding to a Dictionary or Array literal representation with pretty option - * and indentation. - */ -function concatArray (arr, pretty, indentation, indentLevel) { - const currentIndent = buildString(indentLevel, indentation) - const closingBraceIndent = buildString(indentLevel - 1, indentation) - const join = pretty ? ',\n' + currentIndent : ', ' - - if (pretty) { - return '[\n' + currentIndent + arr.join(join) + '\n' + closingBraceIndent + ']' - } else { - return '[' + arr.join(join) + ']' - } -} - -module.exports = { - /** - * Create a string corresponding to a valid declaration and initialization of a Swift array or dictionary literal - * - * @param {string} name Desired name of the instance - * @param {Object} parameters Key-value object of parameters to translate to a Swift object litearal - * @param {Object} opts Target options - * @return {string} - */ - literalDeclaration: function (name, parameters, opts) { - return util.format('let %s = %s', name, this.literalRepresentation(parameters, opts)) - }, - - /** - * Create a valid Swift string of a literal value according to its type. - * - * @param {*} value Any JavaScript literal - * @param {Object} opts Target options - * @return {string} - */ - literalRepresentation: function (value, opts, indentLevel) { - indentLevel = indentLevel === undefined ? 1 : indentLevel + 1 - - switch (Object.prototype.toString.call(value)) { - case '[object Number]': - return value - - case '[object Array]': { - // Don't prettify arrays nto not take too much space - let pretty = false - const valuesRepresentation = value.map(function (v) { - // Switch to prettify if the value is a dictionary with multiple keys - if (Object.prototype.toString.call(v) === '[object Object]') { - pretty = Object.keys(v).length > 1 - } - return this.literalRepresentation(v, opts, indentLevel) - }.bind(this)) - return concatArray(valuesRepresentation, pretty, opts.indent, indentLevel) - } - - case '[object Object]': { - const keyValuePairs = [] - for (const k in value) { - keyValuePairs.push(util.format('"%s": %s', k, this.literalRepresentation(value[k], opts, indentLevel))) - } - return concatArray(keyValuePairs, opts.pretty && keyValuePairs.length > 1, opts.indent, indentLevel) - } - - case '[object Boolean]': - return value.toString() - - default: - if (value === null || value === undefined) { - return '' - } - return '"' + value.toString().replace(/"/g, '\\"') + '"' - } - } -} diff --git a/src/targets/swift/helpers.ts b/src/targets/swift/helpers.ts new file mode 100644 index 000000000..998e248e4 --- /dev/null +++ b/src/targets/swift/helpers.ts @@ -0,0 +1,89 @@ +/** + * Create an string of given length filled with blank spaces + * + * @param length Length of the array to return + * @param str String to pad out with + */ +const buildString = (length: number, str: string) => str.repeat(length); + +/** + * Create a string corresponding to a Dictionary or Array literal representation with pretty option and indentation. + */ +const concatArray = (arr: T[], pretty: boolean, indentation: string, indentLevel: number) => { + const currentIndent = buildString(indentLevel, indentation); + const closingBraceIndent = buildString(indentLevel - 1, indentation); + const join = pretty ? `,\n${currentIndent}` : ', '; + + if (pretty) { + return `[\n${currentIndent}${arr.join(join)}\n${closingBraceIndent}]`; + } + return `[${arr.join(join)}]`; +}; + +/** + * Create a string corresponding to a valid declaration and initialization of a Swift array or dictionary literal + * + * @param name Desired name of the instance + * @param parameters Key-value object of parameters to translate to a Swift object litearal + * @param opts Target options + * @return {string} + */ +export const literalDeclaration = (name: string, parameters: T, opts: U) => + `let ${name} = ${literalRepresentation(parameters, opts)}`; + +/** + * Create a valid Swift string of a literal value according to its type. + * + * @param value Any JavaScript literal + * @param opts Target options + */ +export const literalRepresentation = ( + value: T, + opts: U, + indentLevel?: number, +): number | string => { + indentLevel = indentLevel === undefined ? 1 : indentLevel + 1; + + switch (Object.prototype.toString.call(value)) { + case '[object Number]': + return value as unknown as number; + + case '[object Array]': { + // Don't prettify arrays nto not take too much space + let pretty = false; + const valuesRepresentation = (value as unknown as any[]).map((v: any) => { + // Switch to prettify if the value is a dictionary with multiple keys + if (Object.prototype.toString.call(v) === '[object Object]') { + pretty = Object.keys(v).length > 1; + } + return literalRepresentation(v, opts, indentLevel); + }); + // @ts-expect-error needs better types + return concatArray(valuesRepresentation, pretty, opts.indent, indentLevel); + } + + case '[object Object]': { + const keyValuePairs = []; + for (const key in value) { + keyValuePairs.push(`"${key}": ${literalRepresentation(value[key], opts, indentLevel)}`); + } + return concatArray( + keyValuePairs, + // @ts-expect-error needs better types + opts.pretty && keyValuePairs.length > 1, + // @ts-expect-error needs better types + opts.indent, + indentLevel, + ); + } + + case '[object Boolean]': + return (value as unknown as boolean).toString(); + + default: + if (value === null || value === undefined) { + return ''; + } + return `"${(value as any).toString().replace(/"/g, '\\"')}"`; + } +}; diff --git a/src/targets/swift/index.js b/src/targets/swift/index.js deleted file mode 100644 index fba4dfea2..000000000 --- a/src/targets/swift/index.js +++ /dev/null @@ -1,12 +0,0 @@ -'use strict' - -module.exports = { - info: { - key: 'swift', - title: 'Swift', - extname: '.swift', - default: 'nsurlsession' - }, - - nsurlsession: require('./nsurlsession') -} diff --git a/src/targets/swift/nsurlsession.js b/src/targets/swift/nsurlsession.js deleted file mode 100644 index d3b48a72e..000000000 --- a/src/targets/swift/nsurlsession.js +++ /dev/null @@ -1,138 +0,0 @@ -/** - * @description - * HTTP code snippet generator for Swift using NSURLSession. - * - * @author - * @thibaultCha - * - * for any questions or issues regarding the generated code snippet, please open an issue mentioning the author. - */ - -'use strict' - -const helpers = require('./helpers') -const CodeBuilder = require('../../helpers/code-builder') - -module.exports = function (source, options) { - const opts = Object.assign({ - indent: ' ', - pretty: true, - timeout: '10' - }, options) - - const code = new CodeBuilder(opts.indent) - - // Markers for headers to be created as litteral objects and later be set on the NSURLRequest if exist - const req = { - hasHeaders: false, - hasBody: false - } - - // We just want to make sure people understand that is the only dependency - code.push('import Foundation') - - if (Object.keys(source.allHeaders).length) { - req.hasHeaders = true - code.blank() - .push(helpers.literalDeclaration('headers', source.allHeaders, opts)) - } - - if (source.postData.text || source.postData.jsonObj || source.postData.params) { - req.hasBody = true - - switch (source.postData.mimeType) { - case 'application/x-www-form-urlencoded': - // By appending parameters one by one in the resulting snippet, - // we make it easier for the user to edit it according to his or her needs after pasting. - // The user can just add/remove lines adding/removing body parameters. - code.blank() - .push('let postData = NSMutableData(data: "%s=%s".data(using: String.Encoding.utf8)!)', source.postData.params[0].name, source.postData.params[0].value) - for (let i = 1, len = source.postData.params.length; i < len; i++) { - code.push('postData.append("&%s=%s".data(using: String.Encoding.utf8)!)', source.postData.params[i].name, source.postData.params[i].value) - } - break - - case 'application/json': - if (source.postData.jsonObj) { - code.push(helpers.literalDeclaration('parameters', source.postData.jsonObj, opts), 'as [String : Any]') - .blank() - .push('let postData = JSONSerialization.data(withJSONObject: parameters, options: [])') - } - break - - case 'multipart/form-data': - /** - * By appending multipart parameters one by one in the resulting snippet, - * we make it easier for the user to edit it according to his or her needs after pasting. - * The user can just edit the parameters NSDictionary or put this part of a snippet in a multipart builder method. - */ - code.push(helpers.literalDeclaration('parameters', source.postData.params, opts)) - .blank() - .push('let boundary = "%s"', source.postData.boundary) - .blank() - .push('var body = ""') - .push('var error: NSError? = nil') - .push('for param in parameters {') - .push(1, 'let paramName = param["name"]!') - .push(1, 'body += "--\\(boundary)\\r\\n"') - .push(1, 'body += "Content-Disposition:form-data; name=\\"\\(paramName)\\""') - .push(1, 'if let filename = param["fileName"] {') - .push(2, 'let contentType = param["content-type"]!') - .push(2, 'let fileContent = String(contentsOfFile: filename, encoding: String.Encoding.utf8)') - .push(2, 'if (error != nil) {') - .push(3, 'print(error)') - .push(2, '}') - .push(2, 'body += "; filename=\\"\\(filename)\\"\\r\\n"') - .push(2, 'body += "Content-Type: \\(contentType)\\r\\n\\r\\n"') - .push(2, 'body += fileContent') - .push(1, '} else if let paramValue = param["value"] {') - .push(2, 'body += "\\r\\n\\r\\n\\(paramValue)"') - .push(1, '}') - .push('}') - break - - default: - code.blank() - .push('let postData = NSData(data: "%s".data(using: String.Encoding.utf8)!)', source.postData.text) - } - } - - code.blank() - // NSURLRequestUseProtocolCachePolicy is the default policy, let's just always set it to avoid confusion. - .push('let request = NSMutableURLRequest(url: NSURL(string: "%s")! as URL,', source.fullUrl) - .push(' cachePolicy: .useProtocolCachePolicy,') - .push(' timeoutInterval: %s)', parseInt(opts.timeout, 10).toFixed(1)) - .push('request.httpMethod = "%s"', source.method) - - if (req.hasHeaders) { - code.push('request.allHTTPHeaderFields = headers') - } - - if (req.hasBody) { - code.push('request.httpBody = postData as Data') - } - - code.blank() - // Retrieving the shared session will be less verbose than creating a new one. - .push('let session = URLSession.shared') - .push('let dataTask = session.dataTask(with: request as URLRequest, completionHandler: { (data, response, error) -> Void in') - .push(1, 'if (error != nil) {') - .push(2, 'print(error)') - .push(1, '} else {') - // Casting the NSURLResponse to NSHTTPURLResponse so the user can see the status . - .push(2, 'let httpResponse = response as? HTTPURLResponse') - .push(2, 'print(httpResponse)') - .push(1, '}') - .push('})') - .blank() - .push('dataTask.resume()') - - return code.join() -} - -module.exports.info = { - key: 'nsurlsession', - title: 'NSURLSession', - link: 'https://developer.apple.com/library/mac/documentation/Foundation/Reference/NSURLSession_class/index.html', - description: 'Foundation\'s NSURLSession request' -} diff --git a/src/targets/swift/nsurlsession/client.test.ts b/src/targets/swift/nsurlsession/client.test.ts new file mode 100644 index 000000000..dee40fac6 --- /dev/null +++ b/src/targets/swift/nsurlsession/client.test.ts @@ -0,0 +1,44 @@ +import full from '../../../fixtures/requests/full.json'; +import jsonNullValue from '../../../fixtures/requests/jsonObj-null-value.json'; +import short from '../../../fixtures/requests/short.json'; +import { runCustomFixtures } from '../../../fixtures/runCustomFixtures'; +import { Request } from '../../../httpsnippet'; + +runCustomFixtures({ + targetId: 'swift', + clientId: 'nsurlsession', + tests: [ + { + it: 'should support an indent option', + input: short as Request, + options: { + indent: ' ', + }, + expected: 'indent-option.swift', + }, + { + it: 'should support a timeout option', + input: short as Request, + options: { + timeout: 5, + }, + expected: 'timeout-option.swift', + }, + { + it: 'should support pretty option', + input: full as Request, + options: { + pretty: false, + }, + expected: 'pretty-option.swift', + }, + { + it: 'should support json object with null value', + input: jsonNullValue as unknown as Request, + options: { + pretty: false, + }, + expected: 'json-null-value.swift', + }, + ], +}); diff --git a/src/targets/swift/nsurlsession/client.ts b/src/targets/swift/nsurlsession/client.ts new file mode 100644 index 000000000..e5081a4ef --- /dev/null +++ b/src/targets/swift/nsurlsession/client.ts @@ -0,0 +1,165 @@ +/** + * @description + * HTTP code snippet generator for Swift using NSURLSession. + * + * @author + * @thibaultCha + * + * for any questions or issues regarding the generated code snippet, please open an issue mentioning the author. + */ + +import { CodeBuilder } from '../../../helpers/code-builder'; +import { Client } from '../../targets'; +import { literalDeclaration } from '../helpers'; + +export interface NsurlsessionOptions { + pretty?: boolean; + timeout?: number | string; +} + +export const nsurlsession: Client = { + info: { + key: 'nsurlsession', + title: 'NSURLSession', + link: 'https://developer.apple.com/library/mac/documentation/Foundation/Reference/NSURLSession_class/index.html', + description: "Foundation's NSURLSession request", + }, + convert: ({ allHeaders, postData, fullUrl, method }, options) => { + const opts = { + indent: ' ', + pretty: true, + timeout: '10', + ...options, + }; + + const { push, blank, join } = new CodeBuilder({ indent: opts.indent }); + + // Markers for headers to be created as litteral objects and later be set on the NSURLRequest if exist + const req = { + hasHeaders: false, + hasBody: false, + }; + + // We just want to make sure people understand that is the only dependency + push('import Foundation'); + + if (Object.keys(allHeaders).length) { + req.hasHeaders = true; + blank(); + push(literalDeclaration('headers', allHeaders, opts)); + } + + if (postData.text || postData.jsonObj || postData.params) { + req.hasBody = true; + + switch (postData.mimeType) { + case 'application/x-www-form-urlencoded': + // By appending parameters one by one in the resulting snippet, + // we make it easier for the user to edit it according to his or her needs after pasting. + // The user can just add/remove lines adding/removing body parameters. + blank(); + if (postData.params) { + push( + `let postData = NSMutableData(data: "${postData.params[0].name}=${postData.params[0].value}".data(using: String.Encoding.utf8)!)`, + ); + for (let i = 1, len = postData.params.length; i < len; i++) { + push( + `postData.append("&${postData.params[i].name}=${postData.params[i].value}".data(using: String.Encoding.utf8)!)`, + ); + } + } + break; + + case 'application/json': + if (postData.jsonObj) { + push(`${literalDeclaration('parameters', postData.jsonObj, opts)} as [String : Any]`); + blank(); + + push('let postData = JSONSerialization.data(withJSONObject: parameters, options: [])'); + } + break; + + case 'multipart/form-data': + /** + * By appending multipart parameters one by one in the resulting snippet, + * we make it easier for the user to edit it according to his or her needs after pasting. + * The user can just edit the parameters NSDictionary or put this part of a snippet in a multipart builder method. + */ + + push(literalDeclaration('parameters', postData.params, opts)); + blank(); + push(`let boundary = "${postData.boundary}"`); + blank(); + push('var body = ""'); + push('var error: NSError? = nil'); + push('for param in parameters {'); + push('let paramName = param["name"]!', 1); + push('body += "--\\(boundary)\\r\\n"', 1); + push('body += "Content-Disposition:form-data; name=\\"\\(paramName)\\""', 1); + push('if let filename = param["fileName"] {', 1); + push('let contentType = param["content-type"]!', 2); + push( + 'let fileContent = String(contentsOfFile: filename, encoding: String.Encoding.utf8)', + 2, + ); + push('if (error != nil) {', 2); + push('print(error)', 3); + push('}', 2); + push('body += "; filename=\\"\\(filename)\\"\\r\\n"', 2); + push('body += "Content-Type: \\(contentType)\\r\\n\\r\\n"', 2); + push('body += fileContent', 2); + push('} else if let paramValue = param["value"] {', 1); + push('body += "\\r\\n\\r\\n\\(paramValue)"', 2); + push('}', 1); + push('}'); + break; + + default: + blank(); + push( + `let postData = NSData(data: "${postData.text}".data(using: String.Encoding.utf8)!)`, + ); + } + } + + blank(); + + // NSURLRequestUseProtocolCachePolicy is the default policy, let's just always set it to avoid confusion. + push(`let request = NSMutableURLRequest(url: NSURL(string: "${fullUrl}")! as URL,`); + push(' cachePolicy: .useProtocolCachePolicy,'); + push( + // @ts-expect-error needs better types + ` timeoutInterval: ${parseInt(opts.timeout, 10).toFixed( + 1, + )})`, + ); + push(`request.httpMethod = "${method}"`); + + if (req.hasHeaders) { + push('request.allHTTPHeaderFields = headers'); + } + + if (req.hasBody) { + push('request.httpBody = postData as Data'); + } + + blank(); + // Retrieving the shared session will be less verbose than creating a new one. + + push('let session = URLSession.shared'); + push( + 'let dataTask = session.dataTask(with: request as URLRequest, completionHandler: { (data, response, error) -> Void in', + ); + push('if (error != nil) {', 1); + push('print(error)', 2); + push('} else {', 1); // Casting the NSURLResponse to NSHTTPURLResponse so the user can see the status . + push('let httpResponse = response as? HTTPURLResponse', 2); + push('print(httpResponse)', 2); + push('}', 1); + push('})'); + blank(); + push('dataTask.resume()'); + + return join(); + }, +}; diff --git a/test/fixtures/output/swift/nsurlsession/application-form-encoded.swift b/src/targets/swift/nsurlsession/fixtures/application-form-encoded.swift similarity index 97% rename from test/fixtures/output/swift/nsurlsession/application-form-encoded.swift rename to src/targets/swift/nsurlsession/fixtures/application-form-encoded.swift index d60979ddd..faec905c2 100644 --- a/test/fixtures/output/swift/nsurlsession/application-form-encoded.swift +++ b/src/targets/swift/nsurlsession/fixtures/application-form-encoded.swift @@ -22,4 +22,4 @@ let dataTask = session.dataTask(with: request as URLRequest, completionHandler: } }) -dataTask.resume() +dataTask.resume() \ No newline at end of file diff --git a/test/fixtures/output/swift/nsurlsession/application-json.swift b/src/targets/swift/nsurlsession/fixtures/application-json.swift similarity index 98% rename from test/fixtures/output/swift/nsurlsession/application-json.swift rename to src/targets/swift/nsurlsession/fixtures/application-json.swift index 93825f49b..0b5a1d75b 100644 --- a/test/fixtures/output/swift/nsurlsession/application-json.swift +++ b/src/targets/swift/nsurlsession/fixtures/application-json.swift @@ -29,4 +29,4 @@ let dataTask = session.dataTask(with: request as URLRequest, completionHandler: } }) -dataTask.resume() +dataTask.resume() \ No newline at end of file diff --git a/test/fixtures/output/swift/nsurlsession/cookies.swift b/src/targets/swift/nsurlsession/fixtures/cookies.swift similarity index 97% rename from test/fixtures/output/swift/nsurlsession/cookies.swift rename to src/targets/swift/nsurlsession/fixtures/cookies.swift index 3f1202d46..c35c52ddf 100644 --- a/test/fixtures/output/swift/nsurlsession/cookies.swift +++ b/src/targets/swift/nsurlsession/fixtures/cookies.swift @@ -18,4 +18,4 @@ let dataTask = session.dataTask(with: request as URLRequest, completionHandler: } }) -dataTask.resume() +dataTask.resume() \ No newline at end of file diff --git a/test/fixtures/output/swift/nsurlsession/custom-method.swift b/src/targets/swift/nsurlsession/fixtures/custom-method.swift similarity index 96% rename from test/fixtures/output/swift/nsurlsession/custom-method.swift rename to src/targets/swift/nsurlsession/fixtures/custom-method.swift index 597a5f8ac..b84c1104f 100644 --- a/test/fixtures/output/swift/nsurlsession/custom-method.swift +++ b/src/targets/swift/nsurlsession/fixtures/custom-method.swift @@ -15,4 +15,4 @@ let dataTask = session.dataTask(with: request as URLRequest, completionHandler: } }) -dataTask.resume() +dataTask.resume() \ No newline at end of file diff --git a/test/fixtures/output/swift/nsurlsession/full.swift b/src/targets/swift/nsurlsession/fixtures/full.swift similarity index 98% rename from test/fixtures/output/swift/nsurlsession/full.swift rename to src/targets/swift/nsurlsession/fixtures/full.swift index 1d4784ec3..cdf154618 100644 --- a/test/fixtures/output/swift/nsurlsession/full.swift +++ b/src/targets/swift/nsurlsession/fixtures/full.swift @@ -25,4 +25,4 @@ let dataTask = session.dataTask(with: request as URLRequest, completionHandler: } }) -dataTask.resume() +dataTask.resume() \ No newline at end of file diff --git a/test/fixtures/output/swift/nsurlsession/headers.swift b/src/targets/swift/nsurlsession/fixtures/headers.swift similarity index 97% rename from test/fixtures/output/swift/nsurlsession/headers.swift rename to src/targets/swift/nsurlsession/fixtures/headers.swift index 8902e1ace..c22addf34 100644 --- a/test/fixtures/output/swift/nsurlsession/headers.swift +++ b/src/targets/swift/nsurlsession/fixtures/headers.swift @@ -21,4 +21,4 @@ let dataTask = session.dataTask(with: request as URLRequest, completionHandler: } }) -dataTask.resume() +dataTask.resume() \ No newline at end of file diff --git a/test/fixtures/output/swift/nsurlsession/https.swift b/src/targets/swift/nsurlsession/fixtures/https.swift similarity index 96% rename from test/fixtures/output/swift/nsurlsession/https.swift rename to src/targets/swift/nsurlsession/fixtures/https.swift index 8a4313cb4..8414005f0 100644 --- a/test/fixtures/output/swift/nsurlsession/https.swift +++ b/src/targets/swift/nsurlsession/fixtures/https.swift @@ -15,4 +15,4 @@ let dataTask = session.dataTask(with: request as URLRequest, completionHandler: } }) -dataTask.resume() +dataTask.resume() \ No newline at end of file diff --git a/src/targets/swift/nsurlsession/fixtures/indent-option.swift b/src/targets/swift/nsurlsession/fixtures/indent-option.swift new file mode 100644 index 000000000..6d5de0be6 --- /dev/null +++ b/src/targets/swift/nsurlsession/fixtures/indent-option.swift @@ -0,0 +1,18 @@ +import Foundation + +let request = NSMutableURLRequest(url: NSURL(string: "http://mockbin.com/har")! as URL, + cachePolicy: .useProtocolCachePolicy, + timeoutInterval: 10.0) +request.httpMethod = "GET" + +let session = URLSession.shared +let dataTask = session.dataTask(with: request as URLRequest, completionHandler: { (data, response, error) -> Void in + if (error != nil) { + print(error) + } else { + let httpResponse = response as? HTTPURLResponse + print(httpResponse) + } +}) + +dataTask.resume() \ No newline at end of file diff --git a/src/targets/swift/nsurlsession/fixtures/json-null-value.swift b/src/targets/swift/nsurlsession/fixtures/json-null-value.swift new file mode 100644 index 000000000..64652ed1f --- /dev/null +++ b/src/targets/swift/nsurlsession/fixtures/json-null-value.swift @@ -0,0 +1,25 @@ +import Foundation + +let headers = ["content-type": "application/json"] +let parameters = ["foo": ] as [String : Any] + +let postData = JSONSerialization.data(withJSONObject: parameters, options: []) + +let request = NSMutableURLRequest(url: NSURL(string: "http://mockbin.com/har")! as URL, + cachePolicy: .useProtocolCachePolicy, + timeoutInterval: 10.0) +request.httpMethod = "POST" +request.allHTTPHeaderFields = headers +request.httpBody = postData as Data + +let session = URLSession.shared +let dataTask = session.dataTask(with: request as URLRequest, completionHandler: { (data, response, error) -> Void in + if (error != nil) { + print(error) + } else { + let httpResponse = response as? HTTPURLResponse + print(httpResponse) + } +}) + +dataTask.resume() \ No newline at end of file diff --git a/test/fixtures/output/swift/nsurlsession/jsonObj-multiline.swift b/src/targets/swift/nsurlsession/fixtures/jsonObj-multiline.swift similarity index 97% rename from test/fixtures/output/swift/nsurlsession/jsonObj-multiline.swift rename to src/targets/swift/nsurlsession/fixtures/jsonObj-multiline.swift index 3d978adbe..a077fd52d 100644 --- a/test/fixtures/output/swift/nsurlsession/jsonObj-multiline.swift +++ b/src/targets/swift/nsurlsession/fixtures/jsonObj-multiline.swift @@ -22,4 +22,4 @@ let dataTask = session.dataTask(with: request as URLRequest, completionHandler: } }) -dataTask.resume() +dataTask.resume() \ No newline at end of file diff --git a/test/fixtures/output/swift/nsurlsession/jsonObj-null-value.swift b/src/targets/swift/nsurlsession/fixtures/jsonObj-null-value.swift similarity index 97% rename from test/fixtures/output/swift/nsurlsession/jsonObj-null-value.swift rename to src/targets/swift/nsurlsession/fixtures/jsonObj-null-value.swift index a9b5aeeaa..64652ed1f 100644 --- a/test/fixtures/output/swift/nsurlsession/jsonObj-null-value.swift +++ b/src/targets/swift/nsurlsession/fixtures/jsonObj-null-value.swift @@ -22,4 +22,4 @@ let dataTask = session.dataTask(with: request as URLRequest, completionHandler: } }) -dataTask.resume() +dataTask.resume() \ No newline at end of file diff --git a/test/fixtures/output/swift/nsurlsession/multipart-data.swift b/src/targets/swift/nsurlsession/fixtures/multipart-data.swift similarity index 98% rename from test/fixtures/output/swift/nsurlsession/multipart-data.swift rename to src/targets/swift/nsurlsession/fixtures/multipart-data.swift index 0bcf1a3d6..274aa6345 100644 --- a/test/fixtures/output/swift/nsurlsession/multipart-data.swift +++ b/src/targets/swift/nsurlsession/fixtures/multipart-data.swift @@ -49,4 +49,4 @@ let dataTask = session.dataTask(with: request as URLRequest, completionHandler: } }) -dataTask.resume() +dataTask.resume() \ No newline at end of file diff --git a/test/fixtures/output/swift/nsurlsession/multipart-file.swift b/src/targets/swift/nsurlsession/fixtures/multipart-file.swift similarity index 98% rename from test/fixtures/output/swift/nsurlsession/multipart-file.swift rename to src/targets/swift/nsurlsession/fixtures/multipart-file.swift index 294461216..44413eac4 100644 --- a/test/fixtures/output/swift/nsurlsession/multipart-file.swift +++ b/src/targets/swift/nsurlsession/fixtures/multipart-file.swift @@ -48,4 +48,4 @@ let dataTask = session.dataTask(with: request as URLRequest, completionHandler: } }) -dataTask.resume() +dataTask.resume() \ No newline at end of file diff --git a/test/fixtures/output/swift/nsurlsession/multipart-form-data.swift b/src/targets/swift/nsurlsession/fixtures/multipart-form-data.swift similarity index 98% rename from test/fixtures/output/swift/nsurlsession/multipart-form-data.swift rename to src/targets/swift/nsurlsession/fixtures/multipart-form-data.swift index 3e2975b5d..a6409eec1 100644 --- a/test/fixtures/output/swift/nsurlsession/multipart-form-data.swift +++ b/src/targets/swift/nsurlsession/fixtures/multipart-form-data.swift @@ -47,4 +47,4 @@ let dataTask = session.dataTask(with: request as URLRequest, completionHandler: } }) -dataTask.resume() +dataTask.resume() \ No newline at end of file diff --git a/test/fixtures/output/swift/nsurlsession/nested.swift b/src/targets/swift/nsurlsession/fixtures/nested.swift similarity index 97% rename from test/fixtures/output/swift/nsurlsession/nested.swift rename to src/targets/swift/nsurlsession/fixtures/nested.swift index 21415b678..bb68637db 100644 --- a/test/fixtures/output/swift/nsurlsession/nested.swift +++ b/src/targets/swift/nsurlsession/fixtures/nested.swift @@ -15,4 +15,4 @@ let dataTask = session.dataTask(with: request as URLRequest, completionHandler: } }) -dataTask.resume() +dataTask.resume() \ No newline at end of file diff --git a/src/targets/swift/nsurlsession/fixtures/pretty-option.swift b/src/targets/swift/nsurlsession/fixtures/pretty-option.swift new file mode 100644 index 000000000..0bd99bbd2 --- /dev/null +++ b/src/targets/swift/nsurlsession/fixtures/pretty-option.swift @@ -0,0 +1,24 @@ +import Foundation + +let headers = ["cookie": "foo=bar; bar=baz", "accept": "application/json", "content-type": "application/x-www-form-urlencoded"] + +let postData = NSMutableData(data: "foo=bar".data(using: String.Encoding.utf8)!) + +let request = NSMutableURLRequest(url: NSURL(string: "http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value")! as URL, + cachePolicy: .useProtocolCachePolicy, + timeoutInterval: 10.0) +request.httpMethod = "POST" +request.allHTTPHeaderFields = headers +request.httpBody = postData as Data + +let session = URLSession.shared +let dataTask = session.dataTask(with: request as URLRequest, completionHandler: { (data, response, error) -> Void in + if (error != nil) { + print(error) + } else { + let httpResponse = response as? HTTPURLResponse + print(httpResponse) + } +}) + +dataTask.resume() \ No newline at end of file diff --git a/test/fixtures/output/swift/nsurlsession/query.swift b/src/targets/swift/nsurlsession/fixtures/query.swift similarity index 97% rename from test/fixtures/output/swift/nsurlsession/query.swift rename to src/targets/swift/nsurlsession/fixtures/query.swift index 8325525e2..0027e93e9 100644 --- a/test/fixtures/output/swift/nsurlsession/query.swift +++ b/src/targets/swift/nsurlsession/fixtures/query.swift @@ -15,4 +15,4 @@ let dataTask = session.dataTask(with: request as URLRequest, completionHandler: } }) -dataTask.resume() +dataTask.resume() \ No newline at end of file diff --git a/test/fixtures/output/swift/nsurlsession/short.swift b/src/targets/swift/nsurlsession/fixtures/short.swift similarity index 96% rename from test/fixtures/output/swift/nsurlsession/short.swift rename to src/targets/swift/nsurlsession/fixtures/short.swift index 1f4cd26a8..ac704739a 100644 --- a/test/fixtures/output/swift/nsurlsession/short.swift +++ b/src/targets/swift/nsurlsession/fixtures/short.swift @@ -15,4 +15,4 @@ let dataTask = session.dataTask(with: request as URLRequest, completionHandler: } }) -dataTask.resume() +dataTask.resume() \ No newline at end of file diff --git a/test/fixtures/output/swift/nsurlsession/text-plain.swift b/src/targets/swift/nsurlsession/fixtures/text-plain.swift similarity index 97% rename from test/fixtures/output/swift/nsurlsession/text-plain.swift rename to src/targets/swift/nsurlsession/fixtures/text-plain.swift index 910b4ac2c..701a26755 100644 --- a/test/fixtures/output/swift/nsurlsession/text-plain.swift +++ b/src/targets/swift/nsurlsession/fixtures/text-plain.swift @@ -21,4 +21,4 @@ let dataTask = session.dataTask(with: request as URLRequest, completionHandler: } }) -dataTask.resume() +dataTask.resume() \ No newline at end of file diff --git a/src/targets/swift/nsurlsession/fixtures/timeout-option.swift b/src/targets/swift/nsurlsession/fixtures/timeout-option.swift new file mode 100644 index 000000000..030360a1f --- /dev/null +++ b/src/targets/swift/nsurlsession/fixtures/timeout-option.swift @@ -0,0 +1,18 @@ +import Foundation + +let request = NSMutableURLRequest(url: NSURL(string: "http://mockbin.com/har")! as URL, + cachePolicy: .useProtocolCachePolicy, + timeoutInterval: 5.0) +request.httpMethod = "GET" + +let session = URLSession.shared +let dataTask = session.dataTask(with: request as URLRequest, completionHandler: { (data, response, error) -> Void in + if (error != nil) { + print(error) + } else { + let httpResponse = response as? HTTPURLResponse + print(httpResponse) + } +}) + +dataTask.resume() \ No newline at end of file diff --git a/src/targets/swift/target.ts b/src/targets/swift/target.ts new file mode 100644 index 000000000..b875e0e4a --- /dev/null +++ b/src/targets/swift/target.ts @@ -0,0 +1,14 @@ +import { Target } from '../targets'; +import { nsurlsession } from './nsurlsession/client'; + +export const swift: Target = { + info: { + key: 'swift', + title: 'Swift', + extname: '.swift', + default: 'nsurlsession', + }, + clientsById: { + nsurlsession, + }, +}; diff --git a/src/targets/targets.test.ts b/src/targets/targets.test.ts new file mode 100644 index 000000000..42516844c --- /dev/null +++ b/src/targets/targets.test.ts @@ -0,0 +1,239 @@ +import { readdirSync, readFileSync } from 'fs'; +import path from 'path'; + +import { availableTargets, extname } from '../helpers/utils'; +import { HTTPSnippet, Request } from '../httpsnippet'; +import { ClientId, isClient, isTarget, TargetId } from './targets'; + +const expectedBasePath = ['src', 'fixtures', 'requests']; + +const inputFileNames = readdirSync(path.join(...expectedBasePath), 'utf-8'); + +const fixtures: [string, Request][] = inputFileNames.map(inputFileName => [ + inputFileName.replace('.json', ''), + JSON.parse(readFileSync(path.join(...expectedBasePath, inputFileName)).toString()), +]); + +/** useful for debuggin, only run a particular set of targets */ +const targetFilter: TargetId[] = [ + // put your targetId: + // 'node', +]; + +/** useful for debuggin, only run a particular set of targets */ +const clientFilter: ClientId[] = [ + // put your clientId here: + // 'unirest', +]; + +/** useful for debuggin, only run a particular set of fixtures */ +const fixtureFilter: string[] = [ + // put the name of the fixture file you want to isolate (excluding `.json`): + // 'multipart-file', +]; + +const testFilter = + (property: keyof T, list: T[keyof T][]) => + (item: T) => + list.length > 0 ? list.includes(item[property]) : true; + +availableTargets() + .filter(testFilter('key', targetFilter)) + .forEach(({ key: targetId, title, extname: fixtureExtension, clients }) => { + describe(`${title} Request Validation`, () => { + clients.filter(testFilter('key', clientFilter)).forEach(({ key: clientId }) => { + fixtures.filter(testFilter(0, fixtureFilter)).forEach(([fixture, request]) => { + const basePath = path.join( + 'src', + 'targets', + targetId, + clientId, + 'fixtures', + `${fixture}${extname(targetId)}`, + ); + try { + const expected = readFileSync(basePath).toString(); + if (expected === '') { + console.log(`known missing test for ${targetId}:${clientId} "${fixture}"`); + return; + } + + it(`${clientId} request should match fixture for "${fixture}.json"`, () => { + const { convert } = new HTTPSnippet(request); + const result = convert(targetId, clientId); //? + + expect(result).toStrictEqual(expected); + }); + } catch (error) { + throw new Error( + `Missing a test file for ${targetId}:${clientId} for the ${fixture} fixture.\nExpected to find the output fixture: \`/src/targets/${targetId}/${clientId}/fixtures/${fixture}${fixtureExtension}\``, + ); + } + }); + }); + }); + }); + +describe('isTarget', () => { + it("should throw if you don't provide an object", () => { + // @ts-expect-error intentionally incorrect + expect(() => isTarget(null)).toThrow( + 'you tried to add a target which is not an object, got type: "null"', + ); + // @ts-expect-error intentionally incorrect + expect(() => isTarget(undefined)).toThrow( + 'you tried to add a target which is not an object, got type: "undefined"', + ); + // @ts-expect-error intentionally incorrect + expect(() => isTarget([])).toThrow( + 'you tried to add a target which is not an object, got type: "array"', + ); + }); + + it('validates required fields', () => { + // @ts-expect-error intentionally incorrect + expect(() => isTarget({})).toThrow('targets must contain an `info` object'); + // @ts-expect-error intentionally incorrect + expect(() => isTarget({ info: {} })).toThrow( + 'targets must have an `info` object with the property `key`', + ); + // @ts-expect-error intentionally incorrect + expect(() => isTarget({ info: { key: '' } })).toThrow('target key must be a unique string'); + // @ts-expect-error intentionally incorrect + expect(() => isTarget({ info: { key: null } })).toThrow('target key must be a unique string'); + // @ts-expect-error intentionally incorrect + expect(() => isTarget({ info: { key: undefined } })).toThrow( + 'target key must be a unique string', + ); + // @ts-expect-error intentionally incorrect + expect(() => isTarget({ info: { key: 'c' } })).toThrow( + 'a target already exists with this key, `c`', + ); + // @ts-expect-error intentionally incorrect + expect(() => isTarget({ info: { key: 'z' } })).toThrow( + 'targets must have an `info` object with the property `title`', + ); + // @ts-expect-error intentionally incorrect + expect(() => isTarget({ info: { key: 'z', title: '' } })).toThrow( + 'target title must be a non-zero-length string', + ); + // @ts-expect-error intentionally incorrect + expect(() => isTarget({ info: { key: 'z', title: null } })).toThrow( + 'target title must be a non-zero-length string', + ); + // @ts-expect-error intentionally incorrect + expect(() => isTarget({ info: { key: 'z', title: undefined } })).toThrow( + 'target title must be a non-zero-length string', + ); + // @ts-expect-error intentionally incorrect + expect(() => isTarget({ info: { key: 'z', title: 't' } })).toThrow( + 'targets must have an `info` object with the property `extname`', + ); + // @ts-expect-error intentionally incorrect + expect(() => isTarget({ info: { key: 'z', title: 't', extname: '' } })).toThrow( + 'No clients provided in target z. You must provide the property `clientsById` containg your clients.', + ); + expect(() => + // @ts-expect-error intentionally incorrect + isTarget({ info: { key: 'z', title: 't', extname: '' }, clientsById: {} }), + ).toThrow( + 'No clients provided in target z. You must provide the property `clientsById` containg your clients.', + ); + expect(() => + // @ts-expect-error intentionally incorrect + isTarget({ info: { key: 'z', title: 't', extname: '' }, clientsById: null }), + ).toThrow( + 'No clients provided in target z. You must provide the property `clientsById` containg your clients.', + ); + expect(() => + // @ts-expect-error intentionally incorrect + isTarget({ info: { key: 'z', title: 't', extname: '' }, clientsById: undefined }), + ).toThrow( + 'No clients provided in target z. You must provide the property `clientsById` containg your clients.', + ); + expect(() => + // @ts-expect-error intentionally incorrect + isTarget({ info: { key: 'z', title: 't', extname: '' }, clientsById: { a: {} } }), + ).toThrow('targets must have an `info` object with the property `default`'); + expect(() => + isTarget({ + // @ts-expect-error intentionally incorrect + info: { key: 'z', title: 't', extname: '', default: 'b' }, + // @ts-expect-error intentionally incorrect + clientsById: { a: {} }, + }), + ).toThrow( + 'target z is configured with a default client b, but no such client was found in the property `clientsById` (found ["a"])', + ); + + expect( + isTarget({ + info: { key: 'z' as TargetId, title: 't', extname: null, default: 'a' }, + clientsById: { + a: { + info: { + key: 'a', + title: 'a', + description: '', + link: '', + }, + convert: () => '', + }, + }, + }), + ).toBeTruthy(); + }); +}); + +describe('isClient', () => { + it('validates the client', () => { + // @ts-expect-error intentionally incorrect + expect(() => isClient(null)).toThrow('clients must be objects'); + // @ts-expect-error intentionally incorrect + expect(() => isClient(undefined)).toThrow('clients must be objects'); + // @ts-expect-error intentionally incorrect + expect(() => isClient({})).toThrow('targets client must contain an `info` object'); + // @ts-expect-error intentionally incorrect + expect(() => isClient({ info: '' })).toThrow( + 'targets client must have an `info` object with property `key`', + ); + // @ts-expect-error intentionally incorrect + expect(() => isClient({ info: { key: undefined } })).toThrow( + 'client.info.key must contain an identifier unique to this target', + ); + // @ts-expect-error intentionally incorrect + expect(() => isClient({ info: { key: null } })).toThrow( + 'client.info.key must contain an identifier unique to this target', + ); + // @ts-expect-error intentionally incorrect + expect(() => isClient({ info: { key: '' } })).toThrow( + 'client.info.key must contain an identifier unique to this target', + ); + // @ts-expect-error intentionally incorrect + expect(() => isClient({ info: { key: 'a' } })).toThrow( + 'targets client must have an `info` object with property `title`', + ); + // @ts-expect-error intentionally incorrect + expect(() => isClient({ info: { key: 'a', title: '' } })).toThrow( + 'targets client must have an `info` object with property `description`', + ); + // @ts-expect-error intentionally incorrect + expect(() => isClient({ info: { key: 'a', description: '', title: '' } })).toThrow( + 'targets client must have an `info` object with property `link`', + ); + // @ts-expect-error intentionally incorrect + expect(() => isClient({ info: { key: 'a', title: '', link: '', description: '' } })).toThrow( + 'targets client must have a `convert` property containing a conversion function', + ); + expect(() => + // @ts-expect-error intentionally incorrect + isClient({ info: { key: 'a', title: '', link: '', description: '' }, convert: '' }), + ).toThrow('targets client must have a `convert` property containing a conversion function'); + expect( + isClient({ + info: { key: 'a', title: '', link: '', description: '' }, + convert: () => '', + }), + ).toBeTruthy(); + }); +}); diff --git a/src/targets/targets.ts b/src/targets/targets.ts new file mode 100644 index 000000000..b931c593f --- /dev/null +++ b/src/targets/targets.ts @@ -0,0 +1,204 @@ +import { Merge } from 'type-fest'; + +import { CodeBuilderOptions } from '../helpers/code-builder'; +import { Request } from '../httpsnippet'; +import { c } from './c/target'; +import { clojure } from './clojure/target'; +import { csharp } from './csharp/target'; +import { go } from './go/target'; +import { http } from './http/target'; +import { java } from './java/target'; +import { javascript } from './javascript/target'; +import { kotlin } from './kotlin/target'; +import { node } from './node/target'; +import { objc } from './objc/target'; +import { ocaml } from './ocaml/target'; +import { php } from './php/target'; +import { powershell } from './powershell/target'; +import { python } from './python/target'; +import { r } from './r/target'; +import { ruby } from './ruby/target'; +import { shell } from './shell/target'; +import { swift } from './swift/target'; + +export type TargetId = keyof typeof targets; + +export type ClientId = string; + +export interface ClientInfo { + key: ClientId; + title: string; + link: string; + description: string; +} + +export type Converter> = ( + request: Request, + options?: Merge, +) => string; + +export interface Client = Record> { + info: ClientInfo; + convert: Converter; +} + +export type Extension = `.${string}` | null; + +export interface TargetInfo { + key: TargetId; + title: string; + extname: Extension; + default: string; +} + +export interface Target { + info: TargetInfo; + clientsById: Record; +} + +export const targets = { + c, + clojure, + csharp, + go, + http, + java, + javascript, + kotlin, + node, + objc, + ocaml, + php, + powershell, + python, + r, + ruby, + shell, + swift, +}; + +export const isTarget = (target: Target): target is Target => { + if (typeof target !== 'object' || target === null || Array.isArray(target)) { + const got = target === null ? 'null' : Array.isArray(target) ? 'array' : typeof target; + throw new Error(`you tried to add a target which is not an object, got type: "${got}"`); + } + + if (!Object.hasOwn(target, 'info')) { + throw new Error('targets must contain an `info` object'); + } + + if (!Object.hasOwn(target.info, 'key')) { + throw new Error('targets must have an `info` object with the property `key`'); + } + + if (!target.info.key) { + throw new Error('target key must be a unique string'); + } + + if (Object.hasOwn(targets, target.info.key)) { + throw new Error(`a target already exists with this key, \`${target.info.key}\``); + } + + if (!Object.hasOwn(target.info, 'title')) { + throw new Error('targets must have an `info` object with the property `title`'); + } + + if (!target.info.title) { + throw new Error('target title must be a non-zero-length string'); + } + + if (!Object.hasOwn(target.info, 'extname')) { + throw new Error('targets must have an `info` object with the property `extname`'); + } + + if ( + !Object.hasOwn(target, 'clientsById') || + !target.clientsById || + Object.keys(target.clientsById).length === 0 + ) { + throw new Error( + `No clients provided in target ${target.info.key}. You must provide the property \`clientsById\` containg your clients.`, + ); + } + + if (!Object.hasOwn(target.info, 'default')) { + throw new Error('targets must have an `info` object with the property `default`'); + } + + if (!Object.hasOwn(target.clientsById, target.info.default)) { + throw new Error( + `target ${target.info.key} is configured with a default client ${ + target.info.default + }, but no such client was found in the property \`clientsById\` (found ${JSON.stringify( + Object.keys(target.clientsById), + )})`, + ); + } + + Object.values(target.clientsById).forEach(isClient); + + return true; +}; + +export const addTarget = (target: Target) => { + if (!isTarget(target)) { + return; + } + targets[target.info.key] = target; +}; + +export const isClient = (client: Client): client is Client => { + if (!client) { + throw new Error('clients must be objects'); + } + + if (!Object.hasOwn(client, 'info')) { + throw new Error('targets client must contain an `info` object'); + } + + if (!Object.hasOwn(client.info, 'key')) { + throw new Error('targets client must have an `info` object with property `key`'); + } + + if (!client.info.key) { + throw new Error('client.info.key must contain an identifier unique to this target'); + } + + if (!Object.hasOwn(client.info, 'title')) { + throw new Error('targets client must have an `info` object with property `title`'); + } + + if (!Object.hasOwn(client.info, 'description')) { + throw new Error('targets client must have an `info` object with property `description`'); + } + + if (!Object.hasOwn(client.info, 'link')) { + throw new Error('targets client must have an `info` object with property `link`'); + } + + if (!Object.hasOwn(client, 'convert') || typeof client.convert !== 'function') { + throw new Error( + 'targets client must have a `convert` property containing a conversion function', + ); + } + + return true; +}; + +export const addTargetClient = (targetId: TargetId, client: Client) => { + if (!isClient(client)) { + return; + } + + if (!Object.hasOwn(targets, targetId)) { + throw new Error(`Sorry, but no ${targetId} target exists to add clients to`); + } + + if (Object.hasOwn(targets[targetId], client.info.key)) { + throw new Error( + `the target ${targetId} already has a client with the key ${client.info.key}, please use a different key`, + ); + } + + targets[targetId].clientsById[client.info.key] = client; +}; diff --git a/test/fixtures/cli.json b/test/fixtures/cli.json deleted file mode 100644 index 70cbcd19c..000000000 --- a/test/fixtures/cli.json +++ /dev/null @@ -1,25 +0,0 @@ -[ - { - "run": "node %s", - "target":"node", - "clients": [ - "native" - ] - }, - - { - "run": "php %s", - "target": "php", - "clients": [ - "curl" - ] - }, - - { - "run": "python3 %s", - "target": "python", - "clients": [ - "python3" - ] - } -] diff --git a/test/fixtures/curl/http1.json b/test/fixtures/curl/http1.json deleted file mode 100644 index db0c3d8ce..000000000 --- a/test/fixtures/curl/http1.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "method": "GET", - "url": "http://mockbin.com/request", - "httpVersion": "HTTP/1.0" -} diff --git a/test/fixtures/curl/index.js b/test/fixtures/curl/index.js deleted file mode 100644 index 0d8e0250c..000000000 --- a/test/fixtures/curl/index.js +++ /dev/null @@ -1,3 +0,0 @@ -'use strict'; - -module.exports = require('require-directory')(module); diff --git a/test/fixtures/customTarget.js b/test/fixtures/customTarget.js deleted file mode 100644 index 9a6e11c41..000000000 --- a/test/fixtures/customTarget.js +++ /dev/null @@ -1,12 +0,0 @@ -'use strict' - -module.exports = { - info: { - key: 'js-variant', - title: 'JavaScript Variant', - extname: '.js', - default: 'request' - }, - - request: require('../../src/targets/node/request') -} diff --git a/test/fixtures/files/hello.txt b/test/fixtures/files/hello.txt deleted file mode 100644 index 557db03de..000000000 --- a/test/fixtures/files/hello.txt +++ /dev/null @@ -1 +0,0 @@ -Hello World diff --git a/test/fixtures/har.json b/test/fixtures/har.json deleted file mode 100644 index a48c0715a..000000000 --- a/test/fixtures/har.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "log": { - "version": "1.2", - "creator": { - "name": "HTTPSnippet", - "version": "1.0.0" - }, - "entries": [ - { - "request": { - "method": "GET", - "url": "http://mockbin.com/har" - } - }, - { - "request": { - "method": "POST", - "url": "http://mockbin.com/har" - } - } - ] - } -} diff --git a/test/fixtures/index.js b/test/fixtures/index.js deleted file mode 100644 index da75cf83d..000000000 --- a/test/fixtures/index.js +++ /dev/null @@ -1,3 +0,0 @@ -'use strict' - -module.exports = require('require-directory')(module, {exclude: /output/}) diff --git a/test/fixtures/mimetypes.json b/test/fixtures/mimetypes.json deleted file mode 100644 index eb292c8d2..000000000 --- a/test/fixtures/mimetypes.json +++ /dev/null @@ -1,74 +0,0 @@ -{ - "multipart/mixed": { - "method": "POST", - "url": "http://mockbin.com/har", - "postData": { - "mimeType": "multipart/mixed" - } - }, - - "multipart/related": { - "method": "POST", - "url": "http://mockbin.com/har", - "postData": { - "mimeType": "multipart/related" - } - }, - - "multipart/form-data": { - "method": "POST", - "url": "http://mockbin.com/har", - "postData": { - "mimeType": "multipart/form-data" - } - }, - - "multipart/alternative": { - "method": "POST", - "url": "http://mockbin.com/har", - "postData": { - "mimeType": "multipart/alternative" - } - }, - - "application/x-www-form-urlencoded": { - "method": "POST", - "url": "http://mockbin.com/har", - "postData": { - "mimeType": "application/x-www-form-urlencoded" - } - }, - - "text/json": { - "method": "POST", - "url": "http://mockbin.com/har", - "postData": { - "mimeType": "text/json" - } - }, - - "text/x-json": { - "method": "POST", - "url": "http://mockbin.com/har", - "postData": { - "mimeType": "text/x-json" - } - }, - - "application/x-json": { - "method": "POST", - "url": "http://mockbin.com/har", - "postData": { - "mimeType": "application/x-json" - } - }, - - "invalid-json": { - "method": "POST", - "url": "http://mockbin.com/har", - "postData": { - "mimeType": "application/json", - "text": "foo/bar" - } - } -} diff --git a/test/fixtures/output/clojure/clj_http/custom-method.clj b/test/fixtures/output/clojure/clj_http/custom-method.clj deleted file mode 100644 index 5e5237a54..000000000 --- a/test/fixtures/output/clojure/clj_http/custom-method.clj +++ /dev/null @@ -1 +0,0 @@ -Method not supported diff --git a/test/fixtures/output/clojure/clj_http/text-plain.clj b/test/fixtures/output/clojure/clj_http/text-plain.clj deleted file mode 100644 index 206f5245d..000000000 --- a/test/fixtures/output/clojure/clj_http/text-plain.clj +++ /dev/null @@ -1,3 +0,0 @@ -(require '[clj-http.client :as client]) - -(client/post "http://mockbin.com/har" {:body "Hello World"}) diff --git a/test/fixtures/output/csharp/restsharp/custom-method.cs b/test/fixtures/output/csharp/restsharp/custom-method.cs deleted file mode 100644 index 5e5237a54..000000000 --- a/test/fixtures/output/csharp/restsharp/custom-method.cs +++ /dev/null @@ -1 +0,0 @@ -Method not supported diff --git a/test/fixtures/output/javascript/axios/application-form-encoded.js b/test/fixtures/output/javascript/axios/application-form-encoded.js deleted file mode 100644 index db254b59f..000000000 --- a/test/fixtures/output/javascript/axios/application-form-encoded.js +++ /dev/null @@ -1,14 +0,0 @@ -import axios from "axios"; - -const options = { - method: 'POST', - url: 'http://mockbin.com/har', - headers: {'content-type': 'application/x-www-form-urlencoded'}, - data: {foo: 'bar', hello: 'world'} -}; - -axios.request(options).then(function (response) { - console.log(response.data); -}).catch(function (error) { - console.error(error); -}); diff --git a/test/fixtures/output/javascript/axios/cookies.js b/test/fixtures/output/javascript/axios/cookies.js deleted file mode 100644 index ef57ed14b..000000000 --- a/test/fixtures/output/javascript/axios/cookies.js +++ /dev/null @@ -1,13 +0,0 @@ -import axios from "axios"; - -const options = { - method: 'POST', - url: 'http://mockbin.com/har', - headers: {cookie: 'foo=bar; bar=baz'} -}; - -axios.request(options).then(function (response) { - console.log(response.data); -}).catch(function (error) { - console.error(error); -}); diff --git a/test/fixtures/output/javascript/axios/custom-method.js b/test/fixtures/output/javascript/axios/custom-method.js deleted file mode 100644 index c6b75135b..000000000 --- a/test/fixtures/output/javascript/axios/custom-method.js +++ /dev/null @@ -1,9 +0,0 @@ -import axios from "axios"; - -const options = {method: 'PROPFIND', url: 'http://mockbin.com/har'}; - -axios.request(options).then(function (response) { - console.log(response.data); -}).catch(function (error) { - console.error(error); -}); diff --git a/test/fixtures/output/javascript/axios/headers.js b/test/fixtures/output/javascript/axios/headers.js deleted file mode 100644 index 1db8b5b72..000000000 --- a/test/fixtures/output/javascript/axios/headers.js +++ /dev/null @@ -1,13 +0,0 @@ -import axios from "axios"; - -const options = { - method: 'GET', - url: 'http://mockbin.com/har', - headers: {accept: 'application/json', 'x-foo': 'Bar'} -}; - -axios.request(options).then(function (response) { - console.log(response.data); -}).catch(function (error) { - console.error(error); -}); diff --git a/test/fixtures/output/javascript/axios/https.js b/test/fixtures/output/javascript/axios/https.js deleted file mode 100644 index 342998c5a..000000000 --- a/test/fixtures/output/javascript/axios/https.js +++ /dev/null @@ -1,9 +0,0 @@ -import axios from "axios"; - -const options = {method: 'GET', url: 'https://mockbin.com/har'}; - -axios.request(options).then(function (response) { - console.log(response.data); -}).catch(function (error) { - console.error(error); -}); diff --git a/test/fixtures/output/javascript/axios/jsonObj-multiline.js b/test/fixtures/output/javascript/axios/jsonObj-multiline.js deleted file mode 100644 index 82196992f..000000000 --- a/test/fixtures/output/javascript/axios/jsonObj-multiline.js +++ /dev/null @@ -1,14 +0,0 @@ -import axios from "axios"; - -const options = { - method: 'POST', - url: 'http://mockbin.com/har', - headers: {'content-type': 'application/json'}, - data: {foo: 'bar'} -}; - -axios.request(options).then(function (response) { - console.log(response.data); -}).catch(function (error) { - console.error(error); -}); diff --git a/test/fixtures/output/javascript/axios/jsonObj-null-value.js b/test/fixtures/output/javascript/axios/jsonObj-null-value.js deleted file mode 100644 index eb4da09bb..000000000 --- a/test/fixtures/output/javascript/axios/jsonObj-null-value.js +++ /dev/null @@ -1,14 +0,0 @@ -import axios from "axios"; - -const options = { - method: 'POST', - url: 'http://mockbin.com/har', - headers: {'content-type': 'application/json'}, - data: {foo: null} -}; - -axios.request(options).then(function (response) { - console.log(response.data); -}).catch(function (error) { - console.error(error); -}); diff --git a/test/fixtures/output/javascript/axios/multipart-data.js b/test/fixtures/output/javascript/axios/multipart-data.js deleted file mode 100644 index 5890ea396..000000000 --- a/test/fixtures/output/javascript/axios/multipart-data.js +++ /dev/null @@ -1,17 +0,0 @@ -import axios from "axios"; - -const form = new FormData(); -form.append("foo", "Hello World"); - -const options = { - method: 'POST', - url: 'http://mockbin.com/har', - headers: {'content-type': 'multipart/form-data; boundary=---011000010111000001101001'}, - data: '[form]' -}; - -axios.request(options).then(function (response) { - console.log(response.data); -}).catch(function (error) { - console.error(error); -}); diff --git a/test/fixtures/output/javascript/axios/multipart-file.js b/test/fixtures/output/javascript/axios/multipart-file.js deleted file mode 100644 index 5bc048bdb..000000000 --- a/test/fixtures/output/javascript/axios/multipart-file.js +++ /dev/null @@ -1,17 +0,0 @@ -import axios from "axios"; - -const form = new FormData(); -form.append("foo", "test/fixtures/files/hello.txt"); - -const options = { - method: 'POST', - url: 'http://mockbin.com/har', - headers: {'content-type': 'multipart/form-data; boundary=---011000010111000001101001'}, - data: '[form]' -}; - -axios.request(options).then(function (response) { - console.log(response.data); -}).catch(function (error) { - console.error(error); -}); diff --git a/test/fixtures/output/javascript/axios/nested.js b/test/fixtures/output/javascript/axios/nested.js deleted file mode 100644 index 00c3fd556..000000000 --- a/test/fixtures/output/javascript/axios/nested.js +++ /dev/null @@ -1,13 +0,0 @@ -import axios from "axios"; - -const options = { - method: 'GET', - url: 'http://mockbin.com/har', - params: {'foo[bar]': 'baz,zap', fiz: 'buz', key: 'value'} -}; - -axios.request(options).then(function (response) { - console.log(response.data); -}).catch(function (error) { - console.error(error); -}); diff --git a/test/fixtures/output/javascript/axios/query.js b/test/fixtures/output/javascript/axios/query.js deleted file mode 100644 index 1de276679..000000000 --- a/test/fixtures/output/javascript/axios/query.js +++ /dev/null @@ -1,13 +0,0 @@ -import axios from "axios"; - -const options = { - method: 'GET', - url: 'http://mockbin.com/har', - params: {foo: ['bar', 'baz'], baz: 'abc', key: 'value'} -}; - -axios.request(options).then(function (response) { - console.log(response.data); -}).catch(function (error) { - console.error(error); -}); diff --git a/test/fixtures/output/javascript/axios/short.js b/test/fixtures/output/javascript/axios/short.js deleted file mode 100644 index d35c630a9..000000000 --- a/test/fixtures/output/javascript/axios/short.js +++ /dev/null @@ -1,9 +0,0 @@ -import axios from "axios"; - -const options = {method: 'GET', url: 'http://mockbin.com/har'}; - -axios.request(options).then(function (response) { - console.log(response.data); -}).catch(function (error) { - console.error(error); -}); diff --git a/test/fixtures/output/javascript/axios/text-plain.js b/test/fixtures/output/javascript/axios/text-plain.js deleted file mode 100644 index a199f3570..000000000 --- a/test/fixtures/output/javascript/axios/text-plain.js +++ /dev/null @@ -1,14 +0,0 @@ -import axios from "axios"; - -const options = { - method: 'POST', - url: 'http://mockbin.com/har', - headers: {'content-type': 'text/plain'}, - data: 'Hello World' -}; - -axios.request(options).then(function (response) { - console.log(response.data); -}).catch(function (error) { - console.error(error); -}); diff --git a/test/fixtures/output/javascript/jquery/application-form-encoded.js b/test/fixtures/output/javascript/jquery/application-form-encoded.js deleted file mode 100644 index 9ecf72e80..000000000 --- a/test/fixtures/output/javascript/jquery/application-form-encoded.js +++ /dev/null @@ -1,17 +0,0 @@ -const settings = { - "async": true, - "crossDomain": true, - "url": "http://mockbin.com/har", - "method": "POST", - "headers": { - "content-type": "application/x-www-form-urlencoded" - }, - "data": { - "foo": "bar", - "hello": "world" - } -}; - -$.ajax(settings).done(function (response) { - console.log(response); -}); diff --git a/test/fixtures/output/javascript/jquery/application-json.js b/test/fixtures/output/javascript/jquery/application-json.js deleted file mode 100644 index 5b02a22f0..000000000 --- a/test/fixtures/output/javascript/jquery/application-json.js +++ /dev/null @@ -1,15 +0,0 @@ -const settings = { - "async": true, - "crossDomain": true, - "url": "http://mockbin.com/har", - "method": "POST", - "headers": { - "content-type": "application/json" - }, - "processData": false, - "data": "{\"number\":1,\"string\":\"f\\\"oo\",\"arr\":[1,2,3],\"nested\":{\"a\":\"b\"},\"arr_mix\":[1,\"a\",{\"arr_mix_nested\":{}}],\"boolean\":false}" -}; - -$.ajax(settings).done(function (response) { - console.log(response); -}); diff --git a/test/fixtures/output/javascript/jquery/cookies.js b/test/fixtures/output/javascript/jquery/cookies.js deleted file mode 100644 index 653f10d0c..000000000 --- a/test/fixtures/output/javascript/jquery/cookies.js +++ /dev/null @@ -1,13 +0,0 @@ -const settings = { - "async": true, - "crossDomain": true, - "url": "http://mockbin.com/har", - "method": "POST", - "headers": { - "cookie": "foo=bar; bar=baz" - } -}; - -$.ajax(settings).done(function (response) { - console.log(response); -}); diff --git a/test/fixtures/output/javascript/jquery/custom-method.js b/test/fixtures/output/javascript/jquery/custom-method.js deleted file mode 100644 index 521c2fc00..000000000 --- a/test/fixtures/output/javascript/jquery/custom-method.js +++ /dev/null @@ -1,11 +0,0 @@ -const settings = { - "async": true, - "crossDomain": true, - "url": "http://mockbin.com/har", - "method": "PROPFIND", - "headers": {} -}; - -$.ajax(settings).done(function (response) { - console.log(response); -}); diff --git a/test/fixtures/output/javascript/jquery/full.js b/test/fixtures/output/javascript/jquery/full.js deleted file mode 100644 index 36fb5b1f9..000000000 --- a/test/fixtures/output/javascript/jquery/full.js +++ /dev/null @@ -1,18 +0,0 @@ -const settings = { - "async": true, - "crossDomain": true, - "url": "http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value", - "method": "POST", - "headers": { - "cookie": "foo=bar; bar=baz", - "accept": "application/json", - "content-type": "application/x-www-form-urlencoded" - }, - "data": { - "foo": "bar" - } -}; - -$.ajax(settings).done(function (response) { - console.log(response); -}); diff --git a/test/fixtures/output/javascript/jquery/headers.js b/test/fixtures/output/javascript/jquery/headers.js deleted file mode 100644 index 17652fa25..000000000 --- a/test/fixtures/output/javascript/jquery/headers.js +++ /dev/null @@ -1,14 +0,0 @@ -const settings = { - "async": true, - "crossDomain": true, - "url": "http://mockbin.com/har", - "method": "GET", - "headers": { - "accept": "application/json", - "x-foo": "Bar" - } -}; - -$.ajax(settings).done(function (response) { - console.log(response); -}); diff --git a/test/fixtures/output/javascript/jquery/https.js b/test/fixtures/output/javascript/jquery/https.js deleted file mode 100644 index 09fe852d6..000000000 --- a/test/fixtures/output/javascript/jquery/https.js +++ /dev/null @@ -1,11 +0,0 @@ -const settings = { - "async": true, - "crossDomain": true, - "url": "https://mockbin.com/har", - "method": "GET", - "headers": {} -}; - -$.ajax(settings).done(function (response) { - console.log(response); -}); diff --git a/test/fixtures/output/javascript/jquery/jsonObj-multiline.js b/test/fixtures/output/javascript/jquery/jsonObj-multiline.js deleted file mode 100644 index f7060b4b5..000000000 --- a/test/fixtures/output/javascript/jquery/jsonObj-multiline.js +++ /dev/null @@ -1,15 +0,0 @@ -const settings = { - "async": true, - "crossDomain": true, - "url": "http://mockbin.com/har", - "method": "POST", - "headers": { - "content-type": "application/json" - }, - "processData": false, - "data": "{\n \"foo\": \"bar\"\n}" -}; - -$.ajax(settings).done(function (response) { - console.log(response); -}); diff --git a/test/fixtures/output/javascript/jquery/jsonObj-null-value.js b/test/fixtures/output/javascript/jquery/jsonObj-null-value.js deleted file mode 100644 index afa5f175a..000000000 --- a/test/fixtures/output/javascript/jquery/jsonObj-null-value.js +++ /dev/null @@ -1,15 +0,0 @@ -const settings = { - "async": true, - "crossDomain": true, - "url": "http://mockbin.com/har", - "method": "POST", - "headers": { - "content-type": "application/json" - }, - "processData": false, - "data": "{\"foo\":null}" -}; - -$.ajax(settings).done(function (response) { - console.log(response); -}); diff --git a/test/fixtures/output/javascript/jquery/multipart-data.js b/test/fixtures/output/javascript/jquery/multipart-data.js deleted file mode 100644 index 74f9b9752..000000000 --- a/test/fixtures/output/javascript/jquery/multipart-data.js +++ /dev/null @@ -1,18 +0,0 @@ -const form = new FormData(); -form.append("foo", "Hello World"); - -const settings = { - "async": true, - "crossDomain": true, - "url": "http://mockbin.com/har", - "method": "POST", - "headers": {}, - "processData": false, - "contentType": false, - "mimeType": "multipart/form-data", - "data": form -}; - -$.ajax(settings).done(function (response) { - console.log(response); -}); diff --git a/test/fixtures/output/javascript/jquery/multipart-file.js b/test/fixtures/output/javascript/jquery/multipart-file.js deleted file mode 100644 index 8c1a50404..000000000 --- a/test/fixtures/output/javascript/jquery/multipart-file.js +++ /dev/null @@ -1,18 +0,0 @@ -const form = new FormData(); -form.append("foo", "test/fixtures/files/hello.txt"); - -const settings = { - "async": true, - "crossDomain": true, - "url": "http://mockbin.com/har", - "method": "POST", - "headers": {}, - "processData": false, - "contentType": false, - "mimeType": "multipart/form-data", - "data": form -}; - -$.ajax(settings).done(function (response) { - console.log(response); -}); diff --git a/test/fixtures/output/javascript/jquery/multipart-form-data.js b/test/fixtures/output/javascript/jquery/multipart-form-data.js deleted file mode 100644 index fc2f25e0b..000000000 --- a/test/fixtures/output/javascript/jquery/multipart-form-data.js +++ /dev/null @@ -1,18 +0,0 @@ -const form = new FormData(); -form.append("foo", "bar"); - -const settings = { - "async": true, - "crossDomain": true, - "url": "http://mockbin.com/har", - "method": "POST", - "headers": {}, - "processData": false, - "contentType": false, - "mimeType": "multipart/form-data", - "data": form -}; - -$.ajax(settings).done(function (response) { - console.log(response); -}); diff --git a/test/fixtures/output/javascript/jquery/nested.js b/test/fixtures/output/javascript/jquery/nested.js deleted file mode 100644 index 20ea35d73..000000000 --- a/test/fixtures/output/javascript/jquery/nested.js +++ /dev/null @@ -1,11 +0,0 @@ -const settings = { - "async": true, - "crossDomain": true, - "url": "http://mockbin.com/har?foo%5Bbar%5D=baz%2Czap&fiz=buz&key=value", - "method": "GET", - "headers": {} -}; - -$.ajax(settings).done(function (response) { - console.log(response); -}); diff --git a/test/fixtures/output/javascript/jquery/query.js b/test/fixtures/output/javascript/jquery/query.js deleted file mode 100644 index 58baea69e..000000000 --- a/test/fixtures/output/javascript/jquery/query.js +++ /dev/null @@ -1,11 +0,0 @@ -const settings = { - "async": true, - "crossDomain": true, - "url": "http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value", - "method": "GET", - "headers": {} -}; - -$.ajax(settings).done(function (response) { - console.log(response); -}); diff --git a/test/fixtures/output/javascript/jquery/short.js b/test/fixtures/output/javascript/jquery/short.js deleted file mode 100644 index c87b2c8cf..000000000 --- a/test/fixtures/output/javascript/jquery/short.js +++ /dev/null @@ -1,11 +0,0 @@ -const settings = { - "async": true, - "crossDomain": true, - "url": "http://mockbin.com/har", - "method": "GET", - "headers": {} -}; - -$.ajax(settings).done(function (response) { - console.log(response); -}); diff --git a/test/fixtures/output/javascript/jquery/text-plain.js b/test/fixtures/output/javascript/jquery/text-plain.js deleted file mode 100644 index 160075d2f..000000000 --- a/test/fixtures/output/javascript/jquery/text-plain.js +++ /dev/null @@ -1,14 +0,0 @@ -const settings = { - "async": true, - "crossDomain": true, - "url": "http://mockbin.com/har", - "method": "POST", - "headers": { - "content-type": "text/plain" - }, - "data": "Hello World" -}; - -$.ajax(settings).done(function (response) { - console.log(response); -}); diff --git a/test/fixtures/output/javascript/xhr/application-form-encoded.js b/test/fixtures/output/javascript/xhr/application-form-encoded.js deleted file mode 100644 index c6b2cdecc..000000000 --- a/test/fixtures/output/javascript/xhr/application-form-encoded.js +++ /dev/null @@ -1,15 +0,0 @@ -const data = "foo=bar&hello=world"; - -const xhr = new XMLHttpRequest(); -xhr.withCredentials = true; - -xhr.addEventListener("readystatechange", function () { - if (this.readyState === this.DONE) { - console.log(this.responseText); - } -}); - -xhr.open("POST", "http://mockbin.com/har"); -xhr.setRequestHeader("content-type", "application/x-www-form-urlencoded"); - -xhr.send(data); diff --git a/test/fixtures/output/javascript/xhr/application-json.js b/test/fixtures/output/javascript/xhr/application-json.js deleted file mode 100644 index 853be4a3c..000000000 --- a/test/fixtures/output/javascript/xhr/application-json.js +++ /dev/null @@ -1,34 +0,0 @@ -const data = JSON.stringify({ - "number": 1, - "string": "f\"oo", - "arr": [ - 1, - 2, - 3 - ], - "nested": { - "a": "b" - }, - "arr_mix": [ - 1, - "a", - { - "arr_mix_nested": {} - } - ], - "boolean": false -}); - -const xhr = new XMLHttpRequest(); -xhr.withCredentials = true; - -xhr.addEventListener("readystatechange", function () { - if (this.readyState === this.DONE) { - console.log(this.responseText); - } -}); - -xhr.open("POST", "http://mockbin.com/har"); -xhr.setRequestHeader("content-type", "application/json"); - -xhr.send(data); diff --git a/test/fixtures/output/javascript/xhr/cookies.js b/test/fixtures/output/javascript/xhr/cookies.js deleted file mode 100644 index dbce36082..000000000 --- a/test/fixtures/output/javascript/xhr/cookies.js +++ /dev/null @@ -1,15 +0,0 @@ -const data = null; - -const xhr = new XMLHttpRequest(); -xhr.withCredentials = true; - -xhr.addEventListener("readystatechange", function () { - if (this.readyState === this.DONE) { - console.log(this.responseText); - } -}); - -xhr.open("POST", "http://mockbin.com/har"); -xhr.setRequestHeader("cookie", "foo=bar; bar=baz"); - -xhr.send(data); diff --git a/test/fixtures/output/javascript/xhr/full.js b/test/fixtures/output/javascript/xhr/full.js deleted file mode 100644 index a32dd52bc..000000000 --- a/test/fixtures/output/javascript/xhr/full.js +++ /dev/null @@ -1,17 +0,0 @@ -const data = "foo=bar"; - -const xhr = new XMLHttpRequest(); -xhr.withCredentials = true; - -xhr.addEventListener("readystatechange", function () { - if (this.readyState === this.DONE) { - console.log(this.responseText); - } -}); - -xhr.open("POST", "http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value"); -xhr.setRequestHeader("cookie", "foo=bar; bar=baz"); -xhr.setRequestHeader("accept", "application/json"); -xhr.setRequestHeader("content-type", "application/x-www-form-urlencoded"); - -xhr.send(data); diff --git a/test/fixtures/output/javascript/xhr/headers.js b/test/fixtures/output/javascript/xhr/headers.js deleted file mode 100644 index 511c4ab52..000000000 --- a/test/fixtures/output/javascript/xhr/headers.js +++ /dev/null @@ -1,16 +0,0 @@ -const data = null; - -const xhr = new XMLHttpRequest(); -xhr.withCredentials = true; - -xhr.addEventListener("readystatechange", function () { - if (this.readyState === this.DONE) { - console.log(this.responseText); - } -}); - -xhr.open("GET", "http://mockbin.com/har"); -xhr.setRequestHeader("accept", "application/json"); -xhr.setRequestHeader("x-foo", "Bar"); - -xhr.send(data); diff --git a/test/fixtures/output/javascript/xhr/jsonObj-multiline.js b/test/fixtures/output/javascript/xhr/jsonObj-multiline.js deleted file mode 100644 index b0bfbe099..000000000 --- a/test/fixtures/output/javascript/xhr/jsonObj-multiline.js +++ /dev/null @@ -1,17 +0,0 @@ -const data = JSON.stringify({ - "foo": "bar" -}); - -const xhr = new XMLHttpRequest(); -xhr.withCredentials = true; - -xhr.addEventListener("readystatechange", function () { - if (this.readyState === this.DONE) { - console.log(this.responseText); - } -}); - -xhr.open("POST", "http://mockbin.com/har"); -xhr.setRequestHeader("content-type", "application/json"); - -xhr.send(data); diff --git a/test/fixtures/output/javascript/xhr/jsonObj-null-value.js b/test/fixtures/output/javascript/xhr/jsonObj-null-value.js deleted file mode 100644 index d6948dcf9..000000000 --- a/test/fixtures/output/javascript/xhr/jsonObj-null-value.js +++ /dev/null @@ -1,17 +0,0 @@ -const data = JSON.stringify({ - "foo": null -}); - -const xhr = new XMLHttpRequest(); -xhr.withCredentials = true; - -xhr.addEventListener("readystatechange", function () { - if (this.readyState === this.DONE) { - console.log(this.responseText); - } -}); - -xhr.open("POST", "http://mockbin.com/har"); -xhr.setRequestHeader("content-type", "application/json"); - -xhr.send(data); diff --git a/test/fixtures/output/javascript/xhr/text-plain.js b/test/fixtures/output/javascript/xhr/text-plain.js deleted file mode 100644 index 495fc0e4a..000000000 --- a/test/fixtures/output/javascript/xhr/text-plain.js +++ /dev/null @@ -1,15 +0,0 @@ -const data = "Hello World"; - -const xhr = new XMLHttpRequest(); -xhr.withCredentials = true; - -xhr.addEventListener("readystatechange", function () { - if (this.readyState === this.DONE) { - console.log(this.responseText); - } -}); - -xhr.open("POST", "http://mockbin.com/har"); -xhr.setRequestHeader("content-type", "text/plain"); - -xhr.send(data); diff --git a/test/fixtures/output/node/axios/application-form-encoded.js b/test/fixtures/output/node/axios/application-form-encoded.js deleted file mode 100644 index 1d35a60cb..000000000 --- a/test/fixtures/output/node/axios/application-form-encoded.js +++ /dev/null @@ -1,14 +0,0 @@ -var axios = require("axios").default; - -var options = { - method: 'POST', - url: 'http://mockbin.com/har', - headers: {'content-type': 'application/x-www-form-urlencoded'}, - data: {foo: 'bar', hello: 'world'} -}; - -axios.request(options).then(function (response) { - console.log(response.data); -}).catch(function (error) { - console.error(error); -}); diff --git a/test/fixtures/output/node/axios/cookies.js b/test/fixtures/output/node/axios/cookies.js deleted file mode 100644 index 4011d2cd4..000000000 --- a/test/fixtures/output/node/axios/cookies.js +++ /dev/null @@ -1,13 +0,0 @@ -var axios = require("axios").default; - -var options = { - method: 'POST', - url: 'http://mockbin.com/har', - headers: {cookie: 'foo=bar; bar=baz'} -}; - -axios.request(options).then(function (response) { - console.log(response.data); -}).catch(function (error) { - console.error(error); -}); diff --git a/test/fixtures/output/node/axios/custom-method.js b/test/fixtures/output/node/axios/custom-method.js deleted file mode 100644 index 931f34d14..000000000 --- a/test/fixtures/output/node/axios/custom-method.js +++ /dev/null @@ -1,9 +0,0 @@ -var axios = require("axios").default; - -var options = {method: 'PROPFIND', url: 'http://mockbin.com/har'}; - -axios.request(options).then(function (response) { - console.log(response.data); -}).catch(function (error) { - console.error(error); -}); diff --git a/test/fixtures/output/node/axios/headers.js b/test/fixtures/output/node/axios/headers.js deleted file mode 100644 index 2dbe470d1..000000000 --- a/test/fixtures/output/node/axios/headers.js +++ /dev/null @@ -1,13 +0,0 @@ -var axios = require("axios").default; - -var options = { - method: 'GET', - url: 'http://mockbin.com/har', - headers: {accept: 'application/json', 'x-foo': 'Bar'} -}; - -axios.request(options).then(function (response) { - console.log(response.data); -}).catch(function (error) { - console.error(error); -}); diff --git a/test/fixtures/output/node/axios/https.js b/test/fixtures/output/node/axios/https.js deleted file mode 100644 index 9c4782877..000000000 --- a/test/fixtures/output/node/axios/https.js +++ /dev/null @@ -1,9 +0,0 @@ -var axios = require("axios").default; - -var options = {method: 'GET', url: 'https://mockbin.com/har'}; - -axios.request(options).then(function (response) { - console.log(response.data); -}).catch(function (error) { - console.error(error); -}); diff --git a/test/fixtures/output/node/axios/jsonObj-multiline.js b/test/fixtures/output/node/axios/jsonObj-multiline.js deleted file mode 100644 index d31f23370..000000000 --- a/test/fixtures/output/node/axios/jsonObj-multiline.js +++ /dev/null @@ -1,14 +0,0 @@ -var axios = require("axios").default; - -var options = { - method: 'POST', - url: 'http://mockbin.com/har', - headers: {'content-type': 'application/json'}, - data: {foo: 'bar'} -}; - -axios.request(options).then(function (response) { - console.log(response.data); -}).catch(function (error) { - console.error(error); -}); diff --git a/test/fixtures/output/node/axios/jsonObj-null-value.js b/test/fixtures/output/node/axios/jsonObj-null-value.js deleted file mode 100644 index 04efe1d9f..000000000 --- a/test/fixtures/output/node/axios/jsonObj-null-value.js +++ /dev/null @@ -1,14 +0,0 @@ -var axios = require("axios").default; - -var options = { - method: 'POST', - url: 'http://mockbin.com/har', - headers: {'content-type': 'application/json'}, - data: {foo: null} -}; - -axios.request(options).then(function (response) { - console.log(response.data); -}).catch(function (error) { - console.error(error); -}); diff --git a/test/fixtures/output/node/axios/nested.js b/test/fixtures/output/node/axios/nested.js deleted file mode 100644 index eda2acbd2..000000000 --- a/test/fixtures/output/node/axios/nested.js +++ /dev/null @@ -1,13 +0,0 @@ -var axios = require("axios").default; - -var options = { - method: 'GET', - url: 'http://mockbin.com/har', - params: {'foo[bar]': 'baz,zap', fiz: 'buz', key: 'value'} -}; - -axios.request(options).then(function (response) { - console.log(response.data); -}).catch(function (error) { - console.error(error); -}); diff --git a/test/fixtures/output/node/axios/query.js b/test/fixtures/output/node/axios/query.js deleted file mode 100644 index d190362c2..000000000 --- a/test/fixtures/output/node/axios/query.js +++ /dev/null @@ -1,13 +0,0 @@ -var axios = require("axios").default; - -var options = { - method: 'GET', - url: 'http://mockbin.com/har', - params: {foo: ['bar', 'baz'], baz: 'abc', key: 'value'} -}; - -axios.request(options).then(function (response) { - console.log(response.data); -}).catch(function (error) { - console.error(error); -}); diff --git a/test/fixtures/output/node/axios/short.js b/test/fixtures/output/node/axios/short.js deleted file mode 100644 index e2f516913..000000000 --- a/test/fixtures/output/node/axios/short.js +++ /dev/null @@ -1,9 +0,0 @@ -var axios = require("axios").default; - -var options = {method: 'GET', url: 'http://mockbin.com/har'}; - -axios.request(options).then(function (response) { - console.log(response.data); -}).catch(function (error) { - console.error(error); -}); diff --git a/test/fixtures/output/node/axios/text-plain.js b/test/fixtures/output/node/axios/text-plain.js deleted file mode 100644 index 3e46d3922..000000000 --- a/test/fixtures/output/node/axios/text-plain.js +++ /dev/null @@ -1,14 +0,0 @@ -var axios = require("axios").default; - -var options = { - method: 'POST', - url: 'http://mockbin.com/har', - headers: {'content-type': 'text/plain'}, - data: 'Hello World' -}; - -axios.request(options).then(function (response) { - console.log(response.data); -}).catch(function (error) { - console.error(error); -}); diff --git a/test/fixtures/output/node/native/application-form-encoded.js b/test/fixtures/output/node/native/application-form-encoded.js deleted file mode 100644 index bcd87872b..000000000 --- a/test/fixtures/output/node/native/application-form-encoded.js +++ /dev/null @@ -1,28 +0,0 @@ -const qs = require("querystring"); -const http = require("http"); - -const options = { - "method": "POST", - "hostname": "mockbin.com", - "port": null, - "path": "/har", - "headers": { - "content-type": "application/x-www-form-urlencoded" - } -}; - -const req = http.request(options, function (res) { - const chunks = []; - - res.on("data", function (chunk) { - chunks.push(chunk); - }); - - res.on("end", function () { - const body = Buffer.concat(chunks); - console.log(body.toString()); - }); -}); - -req.write(qs.stringify({foo: 'bar', hello: 'world'})); -req.end(); diff --git a/test/fixtures/output/node/native/cookies.js b/test/fixtures/output/node/native/cookies.js deleted file mode 100644 index 56936f0eb..000000000 --- a/test/fixtures/output/node/native/cookies.js +++ /dev/null @@ -1,26 +0,0 @@ -const http = require("http"); - -const options = { - "method": "POST", - "hostname": "mockbin.com", - "port": null, - "path": "/har", - "headers": { - "cookie": "foo=bar; bar=baz" - } -}; - -const req = http.request(options, function (res) { - const chunks = []; - - res.on("data", function (chunk) { - chunks.push(chunk); - }); - - res.on("end", function () { - const body = Buffer.concat(chunks); - console.log(body.toString()); - }); -}); - -req.end(); diff --git a/test/fixtures/output/node/native/full.js b/test/fixtures/output/node/native/full.js deleted file mode 100644 index af89775d9..000000000 --- a/test/fixtures/output/node/native/full.js +++ /dev/null @@ -1,30 +0,0 @@ -const qs = require("querystring"); -const http = require("http"); - -const options = { - "method": "POST", - "hostname": "mockbin.com", - "port": null, - "path": "/har?foo=bar&foo=baz&baz=abc&key=value", - "headers": { - "cookie": "foo=bar; bar=baz", - "accept": "application/json", - "content-type": "application/x-www-form-urlencoded" - } -}; - -const req = http.request(options, function (res) { - const chunks = []; - - res.on("data", function (chunk) { - chunks.push(chunk); - }); - - res.on("end", function () { - const body = Buffer.concat(chunks); - console.log(body.toString()); - }); -}); - -req.write(qs.stringify({foo: 'bar'})); -req.end(); diff --git a/test/fixtures/output/node/native/headers.js b/test/fixtures/output/node/native/headers.js deleted file mode 100644 index a36dfc9c1..000000000 --- a/test/fixtures/output/node/native/headers.js +++ /dev/null @@ -1,27 +0,0 @@ -const http = require("http"); - -const options = { - "method": "GET", - "hostname": "mockbin.com", - "port": null, - "path": "/har", - "headers": { - "accept": "application/json", - "x-foo": "Bar" - } -}; - -const req = http.request(options, function (res) { - const chunks = []; - - res.on("data", function (chunk) { - chunks.push(chunk); - }); - - res.on("end", function () { - const body = Buffer.concat(chunks); - console.log(body.toString()); - }); -}); - -req.end(); diff --git a/test/fixtures/output/node/native/multipart-data.js b/test/fixtures/output/node/native/multipart-data.js deleted file mode 100644 index 54e204013..000000000 --- a/test/fixtures/output/node/native/multipart-data.js +++ /dev/null @@ -1,27 +0,0 @@ -const http = require("http"); - -const options = { - "method": "POST", - "hostname": "mockbin.com", - "port": null, - "path": "/har", - "headers": { - "content-type": "multipart/form-data; boundary=---011000010111000001101001" - } -}; - -const req = http.request(options, function (res) { - const chunks = []; - - res.on("data", function (chunk) { - chunks.push(chunk); - }); - - res.on("end", function () { - const body = Buffer.concat(chunks); - console.log(body.toString()); - }); -}); - -req.write("-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001--\r\n"); -req.end(); diff --git a/test/fixtures/output/node/native/multipart-file.js b/test/fixtures/output/node/native/multipart-file.js deleted file mode 100644 index 23fa91116..000000000 --- a/test/fixtures/output/node/native/multipart-file.js +++ /dev/null @@ -1,27 +0,0 @@ -const http = require("http"); - -const options = { - "method": "POST", - "hostname": "mockbin.com", - "port": null, - "path": "/har", - "headers": { - "content-type": "multipart/form-data; boundary=---011000010111000001101001" - } -}; - -const req = http.request(options, function (res) { - const chunks = []; - - res.on("data", function (chunk) { - chunks.push(chunk); - }); - - res.on("end", function () { - const body = Buffer.concat(chunks); - console.log(body.toString()); - }); -}); - -req.write("-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\n\r\n-----011000010111000001101001--\r\n"); -req.end(); diff --git a/test/fixtures/output/node/native/multipart-form-data.js b/test/fixtures/output/node/native/multipart-form-data.js deleted file mode 100644 index dfde8da81..000000000 --- a/test/fixtures/output/node/native/multipart-form-data.js +++ /dev/null @@ -1,27 +0,0 @@ -const http = require("http"); - -const options = { - "method": "POST", - "hostname": "mockbin.com", - "port": null, - "path": "/har", - "headers": { - "Content-Type": "multipart/form-data; boundary=---011000010111000001101001" - } -}; - -const req = http.request(options, function (res) { - const chunks = []; - - res.on("data", function (chunk) { - chunks.push(chunk); - }); - - res.on("end", function () { - const body = Buffer.concat(chunks); - console.log(body.toString()); - }); -}); - -req.write("-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"\r\n\r\nbar\r\n-----011000010111000001101001--\r\n"); -req.end(); diff --git a/test/fixtures/output/node/native/nested.js b/test/fixtures/output/node/native/nested.js deleted file mode 100644 index f5a048696..000000000 --- a/test/fixtures/output/node/native/nested.js +++ /dev/null @@ -1,24 +0,0 @@ -const http = require("http"); - -const options = { - "method": "GET", - "hostname": "mockbin.com", - "port": null, - "path": "/har?foo%5Bbar%5D=baz%2Czap&fiz=buz&key=value", - "headers": {} -}; - -const req = http.request(options, function (res) { - const chunks = []; - - res.on("data", function (chunk) { - chunks.push(chunk); - }); - - res.on("end", function () { - const body = Buffer.concat(chunks); - console.log(body.toString()); - }); -}); - -req.end(); diff --git a/test/fixtures/output/node/native/query.js b/test/fixtures/output/node/native/query.js deleted file mode 100644 index c88b3a85a..000000000 --- a/test/fixtures/output/node/native/query.js +++ /dev/null @@ -1,24 +0,0 @@ -const http = require("http"); - -const options = { - "method": "GET", - "hostname": "mockbin.com", - "port": null, - "path": "/har?foo=bar&foo=baz&baz=abc&key=value", - "headers": {} -}; - -const req = http.request(options, function (res) { - const chunks = []; - - res.on("data", function (chunk) { - chunks.push(chunk); - }); - - res.on("end", function () { - const body = Buffer.concat(chunks); - console.log(body.toString()); - }); -}); - -req.end(); diff --git a/test/fixtures/output/node/native/text-plain.js b/test/fixtures/output/node/native/text-plain.js deleted file mode 100644 index 3f737b843..000000000 --- a/test/fixtures/output/node/native/text-plain.js +++ /dev/null @@ -1,27 +0,0 @@ -const http = require("http"); - -const options = { - "method": "POST", - "hostname": "mockbin.com", - "port": null, - "path": "/har", - "headers": { - "content-type": "text/plain" - } -}; - -const req = http.request(options, function (res) { - const chunks = []; - - res.on("data", function (chunk) { - chunks.push(chunk); - }); - - res.on("end", function () { - const body = Buffer.concat(chunks); - console.log(body.toString()); - }); -}); - -req.write("Hello World"); -req.end(); diff --git a/test/fixtures/output/node/unirest/application-form-encoded.js b/test/fixtures/output/node/unirest/application-form-encoded.js deleted file mode 100644 index b8d2d15c8..000000000 --- a/test/fixtures/output/node/unirest/application-form-encoded.js +++ /dev/null @@ -1,19 +0,0 @@ -const unirest = require("unirest"); - -const req = unirest("POST", "http://mockbin.com/har"); - -req.headers({ - "content-type": "application/x-www-form-urlencoded" -}); - -req.form({ - "foo": "bar", - "hello": "world" -}); - -req.end(function (res) { - if (res.error) throw new Error(res.error); - - console.log(res.body); -}); - diff --git a/test/fixtures/output/node/unirest/application-json.js b/test/fixtures/output/node/unirest/application-json.js deleted file mode 100644 index c9ec7c013..000000000 --- a/test/fixtures/output/node/unirest/application-json.js +++ /dev/null @@ -1,36 +0,0 @@ -const unirest = require("unirest"); - -const req = unirest("POST", "http://mockbin.com/har"); - -req.headers({ - "content-type": "application/json" -}); - -req.type("json"); -req.send({ - "number": 1, - "string": "f\"oo", - "arr": [ - 1, - 2, - 3 - ], - "nested": { - "a": "b" - }, - "arr_mix": [ - 1, - "a", - { - "arr_mix_nested": {} - } - ], - "boolean": false -}); - -req.end(function (res) { - if (res.error) throw new Error(res.error); - - console.log(res.body); -}); - diff --git a/test/fixtures/output/node/unirest/cookies.js b/test/fixtures/output/node/unirest/cookies.js deleted file mode 100644 index f14403091..000000000 --- a/test/fixtures/output/node/unirest/cookies.js +++ /dev/null @@ -1,15 +0,0 @@ -const unirest = require("unirest"); - -const req = unirest("POST", "http://mockbin.com/har"); - -const CookieJar = unirest.jar(); -CookieJar.add("foo=bar","http://mockbin.com/har"); -CookieJar.add("bar=baz","http://mockbin.com/har"); -req.jar(CookieJar); - -req.end(function (res) { - if (res.error) throw new Error(res.error); - - console.log(res.body); -}); - diff --git a/test/fixtures/output/node/unirest/custom-method.js b/test/fixtures/output/node/unirest/custom-method.js deleted file mode 100644 index a2a931df2..000000000 --- a/test/fixtures/output/node/unirest/custom-method.js +++ /dev/null @@ -1,10 +0,0 @@ -const unirest = require("unirest"); - -const req = unirest("PROPFIND", "http://mockbin.com/har"); - -req.end(function (res) { - if (res.error) throw new Error(res.error); - - console.log(res.body); -}); - diff --git a/test/fixtures/output/node/unirest/full.js b/test/fixtures/output/node/unirest/full.js deleted file mode 100644 index 2c638e450..000000000 --- a/test/fixtures/output/node/unirest/full.js +++ /dev/null @@ -1,33 +0,0 @@ -const unirest = require("unirest"); - -const req = unirest("POST", "http://mockbin.com/har"); - -const CookieJar = unirest.jar(); -CookieJar.add("foo=bar","http://mockbin.com/har"); -CookieJar.add("bar=baz","http://mockbin.com/har"); -req.jar(CookieJar); - -req.query({ - "foo": [ - "bar", - "baz" - ], - "baz": "abc", - "key": "value" -}); - -req.headers({ - "accept": "application/json", - "content-type": "application/x-www-form-urlencoded" -}); - -req.form({ - "foo": "bar" -}); - -req.end(function (res) { - if (res.error) throw new Error(res.error); - - console.log(res.body); -}); - diff --git a/test/fixtures/output/node/unirest/headers.js b/test/fixtures/output/node/unirest/headers.js deleted file mode 100644 index a9e1939b2..000000000 --- a/test/fixtures/output/node/unirest/headers.js +++ /dev/null @@ -1,15 +0,0 @@ -const unirest = require("unirest"); - -const req = unirest("GET", "http://mockbin.com/har"); - -req.headers({ - "accept": "application/json", - "x-foo": "Bar" -}); - -req.end(function (res) { - if (res.error) throw new Error(res.error); - - console.log(res.body); -}); - diff --git a/test/fixtures/output/node/unirest/jsonObj-multiline.js b/test/fixtures/output/node/unirest/jsonObj-multiline.js deleted file mode 100644 index 2044cfe6b..000000000 --- a/test/fixtures/output/node/unirest/jsonObj-multiline.js +++ /dev/null @@ -1,19 +0,0 @@ -const unirest = require("unirest"); - -const req = unirest("POST", "http://mockbin.com/har"); - -req.headers({ - "content-type": "application/json" -}); - -req.type("json"); -req.send({ - "foo": "bar" -}); - -req.end(function (res) { - if (res.error) throw new Error(res.error); - - console.log(res.body); -}); - diff --git a/test/fixtures/output/node/unirest/jsonObj-null-value.js b/test/fixtures/output/node/unirest/jsonObj-null-value.js deleted file mode 100644 index 73ae28654..000000000 --- a/test/fixtures/output/node/unirest/jsonObj-null-value.js +++ /dev/null @@ -1,19 +0,0 @@ -const unirest = require("unirest"); - -const req = unirest("POST", "http://mockbin.com/har"); - -req.headers({ - "content-type": "application/json" -}); - -req.type("json"); -req.send({ - "foo": null -}); - -req.end(function (res) { - if (res.error) throw new Error(res.error); - - console.log(res.body); -}); - diff --git a/test/fixtures/output/node/unirest/multipart-data.js b/test/fixtures/output/node/unirest/multipart-data.js deleted file mode 100644 index dafb13368..000000000 --- a/test/fixtures/output/node/unirest/multipart-data.js +++ /dev/null @@ -1,21 +0,0 @@ -const unirest = require("unirest"); - -const req = unirest("POST", "http://mockbin.com/har"); - -req.headers({ - "content-type": "multipart/form-data; boundary=---011000010111000001101001" -}); - -req.multipart([ - { - "body": "Hello World", - "content-type": "text/plain" - } -]); - -req.end(function (res) { - if (res.error) throw new Error(res.error); - - console.log(res.body); -}); - diff --git a/test/fixtures/output/node/unirest/multipart-file.js b/test/fixtures/output/node/unirest/multipart-file.js deleted file mode 100644 index d18272287..000000000 --- a/test/fixtures/output/node/unirest/multipart-file.js +++ /dev/null @@ -1,22 +0,0 @@ -const fs = require("fs"); -const unirest = require("unirest"); - -const req = unirest("POST", "http://mockbin.com/har"); - -req.headers({ - "content-type": "multipart/form-data; boundary=---011000010111000001101001" -}); - -req.multipart([ - { - "body": fs.createReadStream("test/fixtures/files/hello.txt"), - "content-type": "text/plain" - } -]); - -req.end(function (res) { - if (res.error) throw new Error(res.error); - - console.log(res.body); -}); - diff --git a/test/fixtures/output/node/unirest/multipart-form-data.js b/test/fixtures/output/node/unirest/multipart-form-data.js deleted file mode 100644 index ada44268c..000000000 --- a/test/fixtures/output/node/unirest/multipart-form-data.js +++ /dev/null @@ -1,20 +0,0 @@ -const unirest = require("unirest"); - -const req = unirest("POST", "http://mockbin.com/har"); - -req.headers({ - "Content-Type": "multipart/form-data; boundary=---011000010111000001101001" -}); - -req.multipart([ - { - "body": "bar" - } -]); - -req.end(function (res) { - if (res.error) throw new Error(res.error); - - console.log(res.body); -}); - diff --git a/test/fixtures/output/node/unirest/nested.js b/test/fixtures/output/node/unirest/nested.js deleted file mode 100644 index 5df42aa0f..000000000 --- a/test/fixtures/output/node/unirest/nested.js +++ /dev/null @@ -1,16 +0,0 @@ -const unirest = require("unirest"); - -const req = unirest("GET", "http://mockbin.com/har"); - -req.query({ - "foo[bar]": "baz,zap", - "fiz": "buz", - "key": "value" -}); - -req.end(function (res) { - if (res.error) throw new Error(res.error); - - console.log(res.body); -}); - diff --git a/test/fixtures/output/node/unirest/query.js b/test/fixtures/output/node/unirest/query.js deleted file mode 100644 index 2fc6e74d8..000000000 --- a/test/fixtures/output/node/unirest/query.js +++ /dev/null @@ -1,19 +0,0 @@ -const unirest = require("unirest"); - -const req = unirest("GET", "http://mockbin.com/har"); - -req.query({ - "foo": [ - "bar", - "baz" - ], - "baz": "abc", - "key": "value" -}); - -req.end(function (res) { - if (res.error) throw new Error(res.error); - - console.log(res.body); -}); - diff --git a/test/fixtures/output/node/unirest/text-plain.js b/test/fixtures/output/node/unirest/text-plain.js deleted file mode 100644 index aa25d2db1..000000000 --- a/test/fixtures/output/node/unirest/text-plain.js +++ /dev/null @@ -1,16 +0,0 @@ -const unirest = require("unirest"); - -const req = unirest("POST", "http://mockbin.com/har"); - -req.headers({ - "content-type": "text/plain" -}); - -req.send("Hello World"); - -req.end(function (res) { - if (res.error) throw new Error(res.error); - - console.log(res.body); -}); - diff --git a/test/fixtures/output/powershell/restmethod/custom-method.ps1 b/test/fixtures/output/powershell/restmethod/custom-method.ps1 deleted file mode 100644 index 5e5237a54..000000000 --- a/test/fixtures/output/powershell/restmethod/custom-method.ps1 +++ /dev/null @@ -1 +0,0 @@ -Method not supported diff --git a/test/fixtures/output/powershell/webrequest/custom-method.ps1 b/test/fixtures/output/powershell/webrequest/custom-method.ps1 deleted file mode 100644 index 5e5237a54..000000000 --- a/test/fixtures/output/powershell/webrequest/custom-method.ps1 +++ /dev/null @@ -1 +0,0 @@ -Method not supported diff --git a/test/fixtures/output/shell/curl/custom-method.sh b/test/fixtures/output/shell/curl/custom-method.sh deleted file mode 100644 index e6cef28d8..000000000 --- a/test/fixtures/output/shell/curl/custom-method.sh +++ /dev/null @@ -1,2 +0,0 @@ -curl --request PROPFIND \ - --url http://mockbin.com/har diff --git a/test/fixtures/output/shell/curl/https.sh b/test/fixtures/output/shell/curl/https.sh deleted file mode 100644 index 8acb41f99..000000000 --- a/test/fixtures/output/shell/curl/https.sh +++ /dev/null @@ -1,2 +0,0 @@ -curl --request GET \ - --url https://mockbin.com/har diff --git a/test/fixtures/output/shell/curl/short.sh b/test/fixtures/output/shell/curl/short.sh deleted file mode 100644 index ffe0460d8..000000000 --- a/test/fixtures/output/shell/curl/short.sh +++ /dev/null @@ -1,2 +0,0 @@ -curl --request GET \ - --url http://mockbin.com/har diff --git a/test/fixtures/output/shell/httpie/custom-method.sh b/test/fixtures/output/shell/httpie/custom-method.sh deleted file mode 100644 index 296e12b74..000000000 --- a/test/fixtures/output/shell/httpie/custom-method.sh +++ /dev/null @@ -1 +0,0 @@ -http PROPFIND http://mockbin.com/har diff --git a/test/fixtures/output/shell/httpie/https.sh b/test/fixtures/output/shell/httpie/https.sh deleted file mode 100644 index 97035e11f..000000000 --- a/test/fixtures/output/shell/httpie/https.sh +++ /dev/null @@ -1 +0,0 @@ -http GET https://mockbin.com/har diff --git a/test/fixtures/output/shell/httpie/short.sh b/test/fixtures/output/shell/httpie/short.sh deleted file mode 100644 index bb18e9d36..000000000 --- a/test/fixtures/output/shell/httpie/short.sh +++ /dev/null @@ -1 +0,0 @@ -http GET http://mockbin.com/har diff --git a/test/fixtures/output/shell/wget/query.sh b/test/fixtures/output/shell/wget/query.sh deleted file mode 100644 index 4b1097e18..000000000 --- a/test/fixtures/output/shell/wget/query.sh +++ /dev/null @@ -1,4 +0,0 @@ -wget --quiet \ - --method GET \ - --output-document \ - - 'http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value' diff --git a/test/fixtures/requests/index.js b/test/fixtures/requests/index.js deleted file mode 100644 index 0d8e0250c..000000000 --- a/test/fixtures/requests/index.js +++ /dev/null @@ -1,3 +0,0 @@ -'use strict'; - -module.exports = require('require-directory')(module); diff --git a/test/headers.js b/test/headers.js deleted file mode 100644 index bc7b48c99..000000000 --- a/test/headers.js +++ /dev/null @@ -1,41 +0,0 @@ -'use strict' - -const helpers = require('../src/helpers/headers') -const should = require('should') - -const headers = { - 'Content-Type': 'multipart/form-data; boundary=---011000010111000001101001', - accept: 'application/json' -} - -describe('Headers', function () { - describe('#getHeader', () => { - it('should get a header', () => { - helpers.getHeader(headers, 'content-type').should.eql('multipart/form-data; boundary=---011000010111000001101001') - helpers.getHeader(headers, 'content-TYPE').should.eql('multipart/form-data; boundary=---011000010111000001101001') - helpers.getHeader(headers, 'Accept').should.eql('application/json') - - should.not.exist(helpers.getHeader(headers, 'authorization')) - }) - }) - - describe('#getHeaderName', () => { - it('should get a header name', () => { - helpers.getHeaderName(headers, 'content-type').should.eql('Content-Type') - helpers.getHeaderName(headers, 'content-TYPE').should.eql('Content-Type') - helpers.getHeaderName(headers, 'Accept').should.eql('accept') - - should.not.exist(helpers.getHeaderName(headers, 'authorization')) - }) - }) - - describe('#hasHeader', () => { - it('should return if a header is present', () => { - helpers.hasHeader(headers, 'content-type').should.be.true() - helpers.hasHeader(headers, 'content-TYPE').should.be.true() - helpers.hasHeader(headers, 'Accept').should.be.true() - - helpers.hasHeader(headers, 'authorization').should.be.false() - }) - }) -}) diff --git a/test/index.js b/test/index.js deleted file mode 100644 index d35bda61b..000000000 --- a/test/index.js +++ /dev/null @@ -1,231 +0,0 @@ -'use strict' - -const fixtures = require('./fixtures') -const HTTPSnippet = require('../src') - -const should = require('should') - -describe('HTTPSnippet', function () { - it('should return false if no matching target', function (done) { - const snippet = new HTTPSnippet(fixtures.requests.short) - - snippet.convert(null).should.eql(false) - - done() - }) - - it('should fail validation', function (done) { - let snippet; - - /* eslint-disable no-extra-parens */ - (function () { - snippet = new HTTPSnippet({ yolo: 'foo' }) - }).should.throw(Error) - - should.not.exist(snippet) - - done() - }) - - it('should parse HAR file with multiple entries', function (done) { - const snippet = new HTTPSnippet(fixtures.har) - - snippet.should.have.property('requests').and.be.an.Array() - snippet.requests.length.should.equal(2) - - const results = snippet.convert('shell') - - results.should.be.an.Array() - results.length.should.equal(2) - - done() - }) - - it('should convert multipart/mixed to multipart/form-data', function (done) { - const req = new HTTPSnippet(fixtures.mimetypes['multipart/mixed']).requests[0] - - req.postData.mimeType.should.eql('multipart/form-data') - - done() - }) - - it('should convert multipart/related to multipart/form-data', function (done) { - const req = new HTTPSnippet(fixtures.mimetypes['multipart/related']).requests[0] - - req.postData.mimeType.should.eql('multipart/form-data') - - done() - }) - - it('should convert multipart/alternative to multipart/form-data', function (done) { - const req = new HTTPSnippet(fixtures.mimetypes['multipart/alternative']).requests[0] - - req.postData.mimeType.should.eql('multipart/form-data') - - done() - }) - - it('should convert text/json to application/json', function (done) { - const req = new HTTPSnippet(fixtures.mimetypes['text/json']).requests[0] - - req.postData.mimeType.should.eql('application/json') - - done() - }) - - it('should convert text/x-json to application/json', function (done) { - const req = new HTTPSnippet(fixtures.mimetypes['text/x-json']).requests[0] - - req.postData.mimeType.should.eql('application/json') - - done() - }) - - it('should convert application/x-json to application/json', function (done) { - const req = new HTTPSnippet(fixtures.mimetypes['application/x-json']).requests[0] - - req.postData.mimeType.should.eql('application/json') - - done() - }) - - it('should gracefully fallback if not able to parse JSON', function (done) { - const req = new HTTPSnippet(fixtures.mimetypes['invalid-json']).requests[0] - - req.postData.mimeType.should.eql('text/plain') - - done() - }) - - it('should set postData.text = empty string when postData.params === undefined in application/x-www-form-urlencoded', function (done) { - const req = new HTTPSnippet(fixtures.mimetypes['application/x-www-form-urlencoded']).requests[0] - - req.postData.text.should.eql('') - - done() - }) - - it('should add "uriObj" to source object', function (done) { - const req = new HTTPSnippet(fixtures.requests.query).requests[0] - - req.uriObj.should.be.an.Object() - - should.config.checkProtoEql = false - req.uriObj.should.be.eql({ - auth: null, - hash: null, - host: 'mockbin.com', - hostname: 'mockbin.com', - href: 'http://mockbin.com/har?key=value', - path: '/har?foo=bar&foo=baz&baz=abc&key=value', - pathname: '/har', - port: null, - protocol: 'http:', - query: { - baz: 'abc', - key: 'value', - foo: [ - 'bar', - 'baz' - ] - }, - search: 'foo=bar&foo=baz&baz=abc&key=value', - slashes: true - }) - - done() - }) - - it('should add "queryObj" to source object', function (done) { - const req = new HTTPSnippet(fixtures.requests.query).requests[0] - - req.queryObj.should.be.an.Object() - req.queryObj.should.eql({ - baz: 'abc', - key: 'value', - foo: [ - 'bar', - 'baz' - ] - }) - - done() - }) - - it('should add "headersObj" to source object', function (done) { - const req = new HTTPSnippet(fixtures.requests.headers).requests[0] - - req.headersObj.should.be.an.Object() - req.headersObj.should.eql({ - accept: 'application/json', - 'x-foo': 'Bar' - }) - - done() - }) - - it('should add "headersObj" to source object case insensitive when HTTP/1.0', function (done) { - const fixture = Object.assign({}, fixtures.requests.headers) - fixture.httpVersion = 'HTTP/1.1' - fixture.headers = fixture.headers.concat({ - name: 'Kong-Admin-Token', - value: 'Hunter1' - }) - - const req = new HTTPSnippet(fixture).requests[0] - req.headersObj.should.be.an.Object() - req.headersObj.should.eql({ - 'Kong-Admin-Token': 'Hunter1', - accept: 'application/json', - 'x-foo': 'Bar' - }) - - done() - }) - - it('should add "headersObj" to source object in lowercase when HTTP/2.x', function (done) { - const fixture = Object.assign({}, fixtures.requests.headers) - fixture.httpVersion = 'HTTP/2' - fixture.headers = fixture.headers.concat({ - name: 'Kong-Admin-Token', - value: 'Hunter1' - }) - - const req = new HTTPSnippet(fixture).requests[0] - req.headersObj.should.be.an.Object() - req.headersObj.should.eql({ - 'kong-admin-token': 'Hunter1', - accept: 'application/json', - 'x-foo': 'Bar' - }) - - done() - }) - - it('should modify orignal url to strip query string', function (done) { - const req = new HTTPSnippet(fixtures.requests.query).requests[0] - - req.url.should.be.a.String() - req.url.should.eql('http://mockbin.com/har') - - done() - }) - - it('should add "fullUrl" to source object', function (done) { - const req = new HTTPSnippet(fixtures.requests.query).requests[0] - - req.fullUrl.should.be.a.String() - req.fullUrl.should.eql('http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value') - - done() - }) - - it('should fix "path" property of "uriObj" to match queryString', function (done) { - const req = new HTTPSnippet(fixtures.requests.query).requests[0] - - req.uriObj.path.should.be.a.String() - req.uriObj.path.should.eql('/har?foo=bar&foo=baz&baz=abc&key=value') - - done() - }) -}) diff --git a/test/reducer.js b/test/reducer.js deleted file mode 100644 index 73f130e76..000000000 --- a/test/reducer.js +++ /dev/null @@ -1,37 +0,0 @@ -'use strict' - -const reducer = require('../src/helpers/reducer') - -require('should') - -describe('Reducer', function () { - it('should convert array object pair to key-value object', function (done) { - const query = [ - { name: 'key', value: 'value' }, - { name: 'foo', value: 'bar' } - ] - - const obj = query.reduce(reducer, {}) - - obj.should.be.an.Object() - obj.should.eql({ key: 'value', foo: 'bar' }) - - done() - }) - - it('should convert multi-dimensional arrays to key=[array] object', function (done) { - const query = [ - { name: 'key', value: 'value' }, - { name: 'foo', value: 'bar1' }, - { name: 'foo', value: 'bar2' }, - { name: 'foo', value: 'bar3' } - ] - - const obj = query.reduce(reducer, {}) - - obj.should.be.an.Object() - obj.should.eql({ key: 'value', foo: ['bar1', 'bar2', 'bar3'] }) - - done() - }) -}) diff --git a/test/requests.js b/test/requests.js deleted file mode 100644 index dd52ff9cd..000000000 --- a/test/requests.js +++ /dev/null @@ -1,77 +0,0 @@ -/* global describe, it */ - -'use strict' - -const fixtures = require('./fixtures') -const HTTPSnippet = require('../src') -const targets = require('../src/targets') -const shell = require('child_process') -const util = require('util') - -require('should') - -const base = './test/fixtures/output/' -const requests = [ - 'application-form-encoded', - 'application-json', - 'cookies', - 'custom-method', - 'headers', - 'https', - 'multipart-data', - 'multipart-form-data', - 'short' -] - -// test all the things! -fixtures.cli.forEach(function (cli) { - describe(targets[cli.target].info.title + ' Request Validation', function () { - cli.clients.forEach(function (client) { - requests.forEach(function (request) { - it(client + ' request should match mock for ' + request, function (done) { - let stdout = '' - const fixture = cli.target + '/' + client + '/' + request + HTTPSnippet.extname(cli.target) - const command = util.format(cli.run, base + fixture) - - const ls = shell.exec(command) - - ls.stdout.on('data', function (data) { - stdout += data - }) - - ls.on('exit', function (code) { - let har - try { - har = JSON.parse(stdout) - } catch (err) { - err.should.be.null() - } - - // Clone the fixture we're testing against to another object because for multipart/form-data cases we're - // deleting the header, and if we don't clone the fixture to another object, that deleted header will cause - // other tests to fail because it's missing where other tests are expecting it. - const fixture = JSON.parse(JSON.stringify(fixtures.requests[request])) - - // make an exception for multipart/form-data - if (fixture.headers) { - fixture.headers.forEach(function (header, index) { - if (header.name.toLowerCase() === 'content-type' && header.value === 'multipart/form-data') { - delete fixture.headers[index] - } - }) - } - - har.should.have.property('log') - har.log.should.have.property('entries').and.be.Array() - har.log.entries[0].should.have.property('request') - // BUG: Mockbin returns http url even when request is for https url - if (request !== 'https') { - har.log.entries[0].request.should.containDeep(fixture) - } - done() - }) - }) - }) - }) - }) -}) diff --git a/test/targets.js b/test/targets.js deleted file mode 100644 index 58d77e3f3..000000000 --- a/test/targets.js +++ /dev/null @@ -1,222 +0,0 @@ -'use strict' - -const fixtures = require('./fixtures') -const fs = require('fs') -const glob = require('glob') -const HTTPSnippet = require('../src') -const path = require('path') -const should = require('should') -const targets = require('../src/targets') - -const base = './test/fixtures/output/' - -// read all output files -const output = glob.sync('**/*', { cwd: base, nodir: true }).reduce(function (obj, name) { - obj[name] = fs.readFileSync(base + name) - return obj -}, {}) - -const clearInfo = function (key) { - return !~['info', 'index'].indexOf(key) -} - -const itShouldHaveTests = function (target, client) { - it(target + ' should have tests', function (done) { - fs.readdir(path.join(__dirname, 'targets', target), function (err, files) { - should.not.exist(err) - files.length.should.be.above(0) - files.should.containEql(client + '.js') - done() - }) - }) -} - -const itShouldHaveInfo = function (name, obj) { - it(name + ' should have info method', function () { - obj.should.have.property('info').and.be.an.Object() - obj.info.key.should.equal(name).and.be.a.String() - obj.info.title.should.be.a.String() - }) -} - -// TODO: investigate issues with these fixtures -const skipMe = { - clojure: { - clj_http: ['jsonObj-null-value', 'jsonObj-multiline'] - }, - '*': { - '*': [] - } -} - -const itShouldHaveRequestTestOutputFixture = function (request, target, client) { - const fixture = target + '/' + client + '/' + request + HTTPSnippet.extname(target) - - it('should have output test for ' + request, function () { - if (skipMe[target] && - skipMe[target][client] && - skipMe[target][client].indexOf(request) > -1) { - this.skip() - } - - Object.keys(output).indexOf(fixture).should.be.greaterThan(-1, 'Missing ' + fixture + ' fixture file for target: ' + target + '. Snippet tests will be skipped.') - }) -} - -const itShouldGenerateOutput = function (request, path, target, client) { - const fixture = path + request + HTTPSnippet.extname(target) - - it('should generate ' + request + ' snippet', function () { - if (Object.keys(output).indexOf(fixture) === -1 || - ((skipMe[target] && - skipMe[target][client] && - skipMe[target][client].indexOf(request) > -1) || - skipMe['*']['*'].indexOf(request) > -1)) { - this.skip() - } - - const instance = new HTTPSnippet(fixtures.requests[request]) - - // `form-data` sets the line break as `\r\n`, but we can't easily replicate that in our fixtures so let's convert - // it to a standard line break instead. - const result = instance.convert(target, client).replace(/\r\n/g, '\n').trim() - - result.should.be.a.String() - result.should.equal(output[fixture].toString().trim()) - }) -} - -describe('Available Targets', function () { - HTTPSnippet.availableTargets().forEach(function (target) { - it('available-targets.json should include ' + target.title, function () { - fixtures['available-targets'].should.containEql(target) - }) - }) -}) - -describe('Custom targets', function () { - describe('Adding a custom target', function () { - it('should throw if the target does has no info object', function () { - (function () { - HTTPSnippet.addTarget({}) - }).should.throw(Error) - }) - - it('should throw if the target does not have a properly constructed info object', function () { - (function () { - HTTPSnippet.addTarget({ info: { key: '' } }) - }).should.throw(Error) - }) - - it('should throw if the target already exists', function () { - (function () { - HTTPSnippet.addTarget(targets.node) - }).should.throw(Error) - }) - - it('should throw if the target has no client', function () { - (function () { - HTTPSnippet.addTarget({ - info: targets.node.info - }) - }).should.throw(Error) - }) - - it('should add and convert for a new custom target', function () { - const customTarget = require('./fixtures/customTarget') - - HTTPSnippet.addTarget(customTarget) - const target = HTTPSnippet.availableTargets().find(function (target) { return target.key === customTarget.info.key }) - const client = target.clients.find(function (client) { return client.key === customTarget.info.default }) - client.should.be.an.Object() - - Object.keys(fixtures.requests).filter(clearInfo).forEach(function (request) { - // Re-using the `request` module fixtures and framework since we copied it to create a custom client. - itShouldGenerateOutput(request, 'node/request/', customTarget.info.key, customTarget.info.default) - }) - }) - }) - - describe('Adding a custom client target', function () { - let customClient - - beforeEach(function () { - // Re-using the existing request client instead of mocking out something completely new. - customClient = { - ...targets.node.request, - info: { - key: 'axios-test', - title: 'Axios', - link: 'https://www.npmjs.com/package/axios', - description: 'Promise based HTTP client for the browser and node.js' - } - } - }) - - it('should throw if client already exists', function () { - (function () { - HTTPSnippet.addTargetClient('node', { ...customClient, info: { ...customClient.info, key: 'axios' } }) - }).should.throw(Error) - }) - - it("should throw if the client's target does not exist", function () { - (function () { - HTTPSnippet.addTargetClient('node.js', customClient) - }).should.throw(Error) - }) - - it('should throw if the client does has no info object', function () { - (function () { - HTTPSnippet.addTargetClient('node', {}) - }).should.throw(Error) - }) - - it('should throw if the target does not have a properly constructed info object', function () { - (function () { - HTTPSnippet.addTargetClient('node', { info: { key: '' } }) - }).should.throw(Error) - }) - - it('should add and convert for a new custom client target', function () { - HTTPSnippet.addTargetClient('node', customClient) - - const target = HTTPSnippet.availableTargets().find(function (target) { return target.key === 'node' }) - const client = target.clients.find(function (client) { return client.key === customClient.info.key }) - client.should.be.an.Object() - - Object.keys(fixtures.requests).filter(clearInfo).forEach(function (request) { - // Re-using the `request` module fixtures and framework since we copied it to create a custom client target. - itShouldGenerateOutput(request, 'node/request/', 'node', customClient.info.key) - }) - }) - }) -}) - -// test all the things! -describe('Targets', function () { - Object.keys(targets).forEach(function (target) { - describe(targets[target].info.title, function () { - itShouldHaveInfo(target, targets[target]) - - Object.keys(targets[target]).filter(clearInfo).forEach(function (client) { - describe(client, function () { - itShouldHaveInfo(client, targets[target][client]) - - itShouldHaveTests(target, client) - - const test = require(path.join(__dirname, 'targets', target, client)) - - test(HTTPSnippet, fixtures) - - describe('snippets', function () { - Object.keys(fixtures.requests).filter(clearInfo).forEach(function (request) { - itShouldHaveRequestTestOutputFixture(request, target, client) - - itShouldGenerateOutput(request, target + '/' + client + '/', target, client) - }) - }) - }) - }) - }) - }) -}) diff --git a/test/targets/c/libcurl.js b/test/targets/c/libcurl.js deleted file mode 100644 index 9ad8c1790..000000000 --- a/test/targets/c/libcurl.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict' - -require('should') - -module.exports = function (snippet, fixtures) {} diff --git a/test/targets/clojure/clj_http.js b/test/targets/clojure/clj_http.js deleted file mode 100644 index 9ad8c1790..000000000 --- a/test/targets/clojure/clj_http.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict' - -require('should') - -module.exports = function (snippet, fixtures) {} diff --git a/test/targets/csharp/httpclient.js b/test/targets/csharp/httpclient.js deleted file mode 100644 index 9ad8c1790..000000000 --- a/test/targets/csharp/httpclient.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict' - -require('should') - -module.exports = function (snippet, fixtures) {} diff --git a/test/targets/csharp/restsharp.js b/test/targets/csharp/restsharp.js deleted file mode 100644 index 9ad8c1790..000000000 --- a/test/targets/csharp/restsharp.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict' - -require('should') - -module.exports = function (snippet, fixtures) {} diff --git a/test/targets/go/native.js b/test/targets/go/native.js deleted file mode 100644 index 5137eccb8..000000000 --- a/test/targets/go/native.js +++ /dev/null @@ -1,137 +0,0 @@ -'use strict' - -require('should') - -module.exports = function (HTTPSnippet, fixtures) { - it('should support false boilerplate option', function () { - const result = new HTTPSnippet(fixtures.requests.full).convert('go', 'native', { - showBoilerplate: false - }) - - result.should.be.a.String() - result.should.eql('url := "http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value"\n\npayload := strings.NewReader("foo=bar")\n\nreq, _ := http.NewRequest("POST", url, payload)\n\nreq.Header.Add("cookie", "foo=bar; bar=baz")\nreq.Header.Add("accept", "application/json")\nreq.Header.Add("content-type", "application/x-www-form-urlencoded")\n\nres, _ := http.DefaultClient.Do(req)\n\ndefer res.Body.Close()\nbody, _ := ioutil.ReadAll(res.Body)\n\nfmt.Println(res)\nfmt.Println(string(body))') - }) - - it('should support checkErrors option', function () { - const result = new HTTPSnippet(fixtures.requests.full).convert('go', 'native', { - checkErrors: true - }) - - result.should.be.a.String() - result.should.eql(`package main - -import ( -\t"fmt" -\t"strings" -\t"net/http" -\t"io/ioutil" -) - -func main() { - -\turl := "http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value" - -\tpayload := strings.NewReader("foo=bar") - -\treq, err := http.NewRequest("POST", url, payload) - -\tif err != nil { -\t\tpanic(err) -\t} -\treq.Header.Add("cookie", "foo=bar; bar=baz") -\treq.Header.Add("accept", "application/json") -\treq.Header.Add("content-type", "application/x-www-form-urlencoded") - -\tres, err := http.DefaultClient.Do(req) -\tif err != nil { -\t\tpanic(err) -\t} - -\tdefer res.Body.Close() -\tbody, err := ioutil.ReadAll(res.Body) -\tif err != nil { -\t\tpanic(err) -\t} - -\tfmt.Println(res) -\tfmt.Println(string(body)) - -}`) - }) - - it('should support printBody option', function () { - const result = new HTTPSnippet(fixtures.requests.full).convert('go', 'native', { - printBody: false - }) - - result.should.be.a.String() - result.should.eql(`package main - -import ( -\t"fmt" -\t"strings" -\t"net/http" -) - -func main() { - -\turl := "http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value" - -\tpayload := strings.NewReader("foo=bar") - -\treq, _ := http.NewRequest("POST", url, payload) - -\treq.Header.Add("cookie", "foo=bar; bar=baz") -\treq.Header.Add("accept", "application/json") -\treq.Header.Add("content-type", "application/x-www-form-urlencoded") - -\tres, _ := http.DefaultClient.Do(req) - -\tfmt.Println(res) - -}`) - }) - - it('should support timeout option', function () { - const result = new HTTPSnippet(fixtures.requests.full).convert('go', 'native', { - timeout: 30 - }) - - result.should.be.a.String() - result.should.eql(`package main - -import ( -\t"fmt" -\t"time" -\t"strings" -\t"net/http" -\t"io/ioutil" -) - -func main() { - -\tclient := http.Client{ -\t\tTimeout: time.Duration(30 * time.Second), -\t} - -\turl := "http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value" - -\tpayload := strings.NewReader("foo=bar") - -\treq, _ := http.NewRequest("POST", url, payload) - -\treq.Header.Add("cookie", "foo=bar; bar=baz") -\treq.Header.Add("accept", "application/json") -\treq.Header.Add("content-type", "application/x-www-form-urlencoded") - -\tres, _ := client.Do(req) - -\tdefer res.Body.Close() -\tbody, _ := ioutil.ReadAll(res.Body) - -\tfmt.Println(res) -\tfmt.Println(string(body)) - -}`) - }) -} diff --git a/test/targets/http/1.1.js b/test/targets/http/1.1.js deleted file mode 100644 index 9ad8c1790..000000000 --- a/test/targets/http/1.1.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict' - -require('should') - -module.exports = function (snippet, fixtures) {} diff --git a/test/targets/java/asynchttp.js b/test/targets/java/asynchttp.js deleted file mode 100644 index 9ad8c1790..000000000 --- a/test/targets/java/asynchttp.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict' - -require('should') - -module.exports = function (snippet, fixtures) {} diff --git a/test/targets/java/nethttp.js b/test/targets/java/nethttp.js deleted file mode 100644 index 9ad8c1790..000000000 --- a/test/targets/java/nethttp.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict' - -require('should') - -module.exports = function (snippet, fixtures) {} diff --git a/test/targets/java/okhttp.js b/test/targets/java/okhttp.js deleted file mode 100644 index 9ad8c1790..000000000 --- a/test/targets/java/okhttp.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict' - -require('should') - -module.exports = function (snippet, fixtures) {} diff --git a/test/targets/java/unirest.js b/test/targets/java/unirest.js deleted file mode 100644 index 9ad8c1790..000000000 --- a/test/targets/java/unirest.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict' - -require('should') - -module.exports = function (snippet, fixtures) {} diff --git a/test/targets/javascript/axios.js b/test/targets/javascript/axios.js deleted file mode 100644 index b77cc77e7..000000000 --- a/test/targets/javascript/axios.js +++ /dev/null @@ -1,3 +0,0 @@ -'use strict' - -module.exports = function (snippet, fixtures) {} diff --git a/test/targets/javascript/fetch.js b/test/targets/javascript/fetch.js deleted file mode 100644 index b77cc77e7..000000000 --- a/test/targets/javascript/fetch.js +++ /dev/null @@ -1,3 +0,0 @@ -'use strict' - -module.exports = function (snippet, fixtures) {} diff --git a/test/targets/javascript/jquery.js b/test/targets/javascript/jquery.js deleted file mode 100644 index b77cc77e7..000000000 --- a/test/targets/javascript/jquery.js +++ /dev/null @@ -1,3 +0,0 @@ -'use strict' - -module.exports = function (snippet, fixtures) {} diff --git a/test/targets/javascript/xhr.js b/test/targets/javascript/xhr.js deleted file mode 100644 index fd522aec6..000000000 --- a/test/targets/javascript/xhr.js +++ /dev/null @@ -1,14 +0,0 @@ -'use strict' - -require('should') - -module.exports = function (HTTPSnippet, fixtures) { - it('should not use cors', function () { - const result = new HTTPSnippet(fixtures.requests.short).convert('javascript', 'xhr', { - cors: false - }) - - result.should.be.a.String() - result.replace(/\n/g, '').should.eql('const data = null;const xhr = new XMLHttpRequest();xhr.addEventListener("readystatechange", function () { if (this.readyState === this.DONE) { console.log(this.responseText); }});xhr.open("GET", "http://mockbin.com/har");xhr.send(data);') - }) -} diff --git a/test/targets/kotlin/okhttp.js b/test/targets/kotlin/okhttp.js deleted file mode 100644 index 9ad8c1790..000000000 --- a/test/targets/kotlin/okhttp.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict' - -require('should') - -module.exports = function (snippet, fixtures) {} diff --git a/test/targets/node/axios.js b/test/targets/node/axios.js deleted file mode 100644 index b77cc77e7..000000000 --- a/test/targets/node/axios.js +++ /dev/null @@ -1,3 +0,0 @@ -'use strict' - -module.exports = function (snippet, fixtures) {} diff --git a/test/targets/node/fetch.js b/test/targets/node/fetch.js deleted file mode 100644 index b77cc77e7..000000000 --- a/test/targets/node/fetch.js +++ /dev/null @@ -1,3 +0,0 @@ -'use strict' - -module.exports = function (snippet, fixtures) {} diff --git a/test/targets/node/native.js b/test/targets/node/native.js deleted file mode 100644 index b77cc77e7..000000000 --- a/test/targets/node/native.js +++ /dev/null @@ -1,3 +0,0 @@ -'use strict' - -module.exports = function (snippet, fixtures) {} diff --git a/test/targets/node/request.js b/test/targets/node/request.js deleted file mode 100644 index b77cc77e7..000000000 --- a/test/targets/node/request.js +++ /dev/null @@ -1,3 +0,0 @@ -'use strict' - -module.exports = function (snippet, fixtures) {} diff --git a/test/targets/node/unirest.js b/test/targets/node/unirest.js deleted file mode 100644 index b77cc77e7..000000000 --- a/test/targets/node/unirest.js +++ /dev/null @@ -1,3 +0,0 @@ -'use strict' - -module.exports = function (snippet, fixtures) {} diff --git a/test/targets/objc/nsurlsession.js b/test/targets/objc/nsurlsession.js deleted file mode 100644 index 87f4781b2..000000000 --- a/test/targets/objc/nsurlsession.js +++ /dev/null @@ -1,41 +0,0 @@ -'use strict' - -require('should') - -module.exports = function (HTTPSnippet, fixtures) { - it('should support an indent option', function () { - const result = new HTTPSnippet(fixtures.requests.short).convert('objc', { - indent: ' ' - }) - - result.should.be.a.String() - result.replace(/\n/g, '').should.eql('#import NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:@"http://mockbin.com/har"] cachePolicy:NSURLRequestUseProtocolCachePolicy timeoutInterval:10.0];[request setHTTPMethod:@"GET"];NSURLSession *session = [NSURLSession sharedSession];NSURLSessionDataTask *dataTask = [session dataTaskWithRequest:request completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) { if (error) { NSLog(@"%@", error); } else { NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *) response; NSLog(@"%@", httpResponse); } }];[dataTask resume];') - }) - - it('should support a timeout option', function () { - const result = new HTTPSnippet(fixtures.requests.short).convert('objc', { - timeout: 5 - }) - - result.should.be.a.String() - result.replace(/\n/g, '').should.eql('#import NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:@"http://mockbin.com/har"] cachePolicy:NSURLRequestUseProtocolCachePolicy timeoutInterval:5.0];[request setHTTPMethod:@"GET"];NSURLSession *session = [NSURLSession sharedSession];NSURLSessionDataTask *dataTask = [session dataTaskWithRequest:request completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) { if (error) { NSLog(@"%@", error); } else { NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *) response; NSLog(@"%@", httpResponse); } }];[dataTask resume];') - }) - - it('should support pretty option', function () { - const result = new HTTPSnippet(fixtures.requests.full).convert('objc', { - pretty: false - }) - - result.should.be.a.String() - result.replace(/\n/g, '').should.eql('#import NSDictionary *headers = @{ @"cookie": @"foo=bar; bar=baz", @"accept": @"application/json", @"content-type": @"application/x-www-form-urlencoded" };NSMutableData *postData = [[NSMutableData alloc] initWithData:[@"foo=bar" dataUsingEncoding:NSUTF8StringEncoding]];NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:@"http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value"] cachePolicy:NSURLRequestUseProtocolCachePolicy timeoutInterval:10.0];[request setHTTPMethod:@"POST"];[request setAllHTTPHeaderFields:headers];[request setHTTPBody:postData];NSURLSession *session = [NSURLSession sharedSession];NSURLSessionDataTask *dataTask = [session dataTaskWithRequest:request completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) { if (error) { NSLog(@"%@", error); } else { NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *) response; NSLog(@"%@", httpResponse); } }];[dataTask resume];') - }) - - it('should support json object with null value', function () { - const result = new HTTPSnippet(fixtures.requests['jsonObj-null-value']).convert('objc', { - pretty: false - }) - - result.should.be.a.String() - result.replace(/\n/g, '').should.eql('#import NSDictionary *headers = @{ @"content-type": @"application/json" };NSDictionary *parameters = @{ @"foo": };NSData *postData = [NSJSONSerialization dataWithJSONObject:parameters options:0 error:nil];NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:@"http://mockbin.com/har"] cachePolicy:NSURLRequestUseProtocolCachePolicy timeoutInterval:10.0];[request setHTTPMethod:@"POST"];[request setAllHTTPHeaderFields:headers];[request setHTTPBody:postData];NSURLSession *session = [NSURLSession sharedSession];NSURLSessionDataTask *dataTask = [session dataTaskWithRequest:request completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) { if (error) { NSLog(@"%@", error); } else { NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *) response; NSLog(@"%@", httpResponse); } }];[dataTask resume];') - }) -} diff --git a/test/targets/ocaml/cohttp.js b/test/targets/ocaml/cohttp.js deleted file mode 100644 index b77cc77e7..000000000 --- a/test/targets/ocaml/cohttp.js +++ /dev/null @@ -1,3 +0,0 @@ -'use strict' - -module.exports = function (snippet, fixtures) {} diff --git a/test/targets/php/curl.js b/test/targets/php/curl.js deleted file mode 100644 index b77cc77e7..000000000 --- a/test/targets/php/curl.js +++ /dev/null @@ -1,3 +0,0 @@ -'use strict' - -module.exports = function (snippet, fixtures) {} diff --git a/test/targets/php/http1.js b/test/targets/php/http1.js deleted file mode 100644 index b77cc77e7..000000000 --- a/test/targets/php/http1.js +++ /dev/null @@ -1,3 +0,0 @@ -'use strict' - -module.exports = function (snippet, fixtures) {} diff --git a/test/targets/php/http2.js b/test/targets/php/http2.js deleted file mode 100644 index b77cc77e7..000000000 --- a/test/targets/php/http2.js +++ /dev/null @@ -1,3 +0,0 @@ -'use strict' - -module.exports = function (snippet, fixtures) {} diff --git a/test/targets/powershell/restmethod.js b/test/targets/powershell/restmethod.js deleted file mode 100644 index 9f9e7ae77..000000000 --- a/test/targets/powershell/restmethod.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict' - -require('should') - -module.exports = function (HTTPSnippet, fixtures) {} diff --git a/test/targets/powershell/webrequest.js b/test/targets/powershell/webrequest.js deleted file mode 100644 index 9f9e7ae77..000000000 --- a/test/targets/powershell/webrequest.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict' - -require('should') - -module.exports = function (HTTPSnippet, fixtures) {} diff --git a/test/targets/python/python3.js b/test/targets/python/python3.js deleted file mode 100644 index 9ad8c1790..000000000 --- a/test/targets/python/python3.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict' - -require('should') - -module.exports = function (snippet, fixtures) {} diff --git a/test/targets/python/requests.js b/test/targets/python/requests.js deleted file mode 100644 index d85783c08..000000000 --- a/test/targets/python/requests.js +++ /dev/null @@ -1,22 +0,0 @@ -'use strict' - -require('should') - -module.exports = function (HTTPSnippet) { - it('should support query parameters provided in HAR\'s url', function () { - const result = new HTTPSnippet({ method: 'GET', url: 'http://mockbin.com/har?param=value' }).convert('python', 'requests', { - showBoilerplate: false - }) - - result.should.be.a.String() - result.should.eql(`import requests - -url = "http://mockbin.com/har" - -querystring = {"param":"value"} - -response = requests.request("GET", url, params=querystring) - -print(response.text)`) - }) -} diff --git a/test/targets/r/httr.js b/test/targets/r/httr.js deleted file mode 100644 index 9ad8c1790..000000000 --- a/test/targets/r/httr.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict' - -require('should') - -module.exports = function (snippet, fixtures) {} diff --git a/test/targets/ruby/native.js b/test/targets/ruby/native.js deleted file mode 100644 index b77cc77e7..000000000 --- a/test/targets/ruby/native.js +++ /dev/null @@ -1,3 +0,0 @@ -'use strict' - -module.exports = function (snippet, fixtures) {} diff --git a/test/targets/shell/curl.js b/test/targets/shell/curl.js deleted file mode 100644 index 9435639b0..000000000 --- a/test/targets/shell/curl.js +++ /dev/null @@ -1,75 +0,0 @@ -'use strict' - -require('should') - -module.exports = function (HTTPSnippet, fixtures) { - it('should use short options', function () { - const result = new HTTPSnippet(fixtures.requests.full).convert('shell', 'curl', { - short: true, - indent: false - }) - - result.should.be.a.String() - result.should.eql("curl -X POST 'http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value' -H 'accept: application/json' -H 'content-type: application/x-www-form-urlencoded' -b 'foo=bar; bar=baz' -d foo=bar") - }) - - it('should use binary option', function () { - const result = new HTTPSnippet(fixtures.requests.full).convert('shell', 'curl', { - short: true, - indent: false, - binary: true - }) - - result.should.be.a.String() - result.should.eql("curl -X POST 'http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value' -H 'accept: application/json' -H 'content-type: application/x-www-form-urlencoded' -b 'foo=bar; bar=baz' --data-binary foo=bar") - }) - - it('should use short globoff option', function () { - const result = new HTTPSnippet(fixtures.requests.nested).convert('shell', 'curl', { - short: true, - indent: false, - globOff: true - }) - - result.should.be.a.String() - result.should.eql("curl -X GET -g 'http://mockbin.com/har?foo[bar]=baz,zap&fiz=buz&key=value'") - }) - - it('should use long globoff option', function () { - const result = new HTTPSnippet(fixtures.requests.nested).convert('shell', 'curl', { - indent: false, - globOff: true - }) - - result.should.be.a.String() - result.should.eql("curl --request GET --globoff --url 'http://mockbin.com/har?foo[bar]=baz,zap&fiz=buz&key=value'") - }) - - it('should not de-glob when globoff is false', function () { - const result = new HTTPSnippet(fixtures.requests.nested).convert('shell', 'curl', { - indent: false, - globOff: false - }) - - result.should.be.a.String() - result.should.eql("curl --request GET --url 'http://mockbin.com/har?foo%5Bbar%5D=baz%2Czap&fiz=buz&key=value'") - }) - - it('should use --http1.0 for HTTP/1.0', function () { - const result = new HTTPSnippet(fixtures.curl.http1).convert('shell', 'curl', { - indent: false - }) - - result.should.be.a.String() - result.should.eql('curl --request GET --url http://mockbin.com/request --http1.0') - }) - - it('should use custom indentation', function () { - const result = new HTTPSnippet(fixtures.requests.full).convert('shell', 'curl', { - indent: '@' - }) - - result.should.be.a.String() - result.replace(/\\\n/g, '').should.eql("curl --request POST @--url 'http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value' @--header 'accept: application/json' @--header 'content-type: application/x-www-form-urlencoded' @--cookie 'foo=bar; bar=baz' @--data foo=bar") - }) -} diff --git a/test/targets/shell/httpie.js b/test/targets/shell/httpie.js deleted file mode 100644 index 1d11e0518..000000000 --- a/test/targets/shell/httpie.js +++ /dev/null @@ -1,92 +0,0 @@ -'use strict' - -require('should') - -module.exports = function (HTTPSnippet, fixtures) { - it('should ask for verbose output', function () { - const result = new HTTPSnippet(fixtures.requests.short).convert('shell', 'httpie', { - indent: false, - verbose: true - }) - - result.should.be.a.String() - result.should.eql('http --verbose GET http://mockbin.com/har') - }) - - it('should use short flags', function () { - const result = new HTTPSnippet(fixtures.requests.short).convert('shell', 'httpie', { - body: true, - cert: 'foo', - headers: true, - indent: false, - pretty: 'x', - print: 'x', - short: true, - style: 'x', - timeout: 1, - verbose: true, - verify: 'x' - }) - - result.should.be.a.String() - result.should.eql('http -h -b -v -p=x --verify=x --cert=foo --pretty=x --style=x --timeout=1 GET http://mockbin.com/har') - }) - - it('should use long flags', function () { - const result = new HTTPSnippet(fixtures.requests.short).convert('shell', 'httpie', { - body: true, - cert: 'foo', - headers: true, - indent: false, - pretty: 'x', - print: 'x', - style: 'x', - timeout: 1, - verbose: true, - verify: 'x' - }) - - result.should.be.a.String() - result.should.eql('http --headers --body --verbose --print=x --verify=x --cert=foo --pretty=x --style=x --timeout=1 GET http://mockbin.com/har') - }) - - it('should use custom indentation', function () { - const result = new HTTPSnippet(fixtures.requests.full).convert('shell', 'httpie', { - indent: '@' - }) - - result.should.be.a.String() - result.replace(/\\\n/g, '').should.eql("http --form POST 'http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value' @accept:application/json @content-type:application/x-www-form-urlencoded @cookie:'foo=bar; bar=baz' @foo=bar") - }) - - it('should use queryString parameters', function () { - const result = new HTTPSnippet(fixtures.requests.query).convert('shell', 'httpie', { - indent: false, - queryParams: true - }) - - result.should.be.a.String() - result.replace(/\\\n/g, '').should.eql('http GET http://mockbin.com/har foo==bar foo==baz baz==abc key==value') - }) - - it('should build parameterized output of query string', function () { - const result = new HTTPSnippet(fixtures.requests.query).convert('shell', 'httpie', { - indent: false, - queryParams: true - }) - - result.should.be.a.String() - result.replace(/\\\n/g, '').should.eql('http GET http://mockbin.com/har foo==bar foo==baz baz==abc key==value') - }) - - it('should build parameterized output of post data', function () { - const result = new HTTPSnippet(fixtures.requests['application-form-encoded']).convert('shell', 'httpie', { - short: true, - indent: false, - queryParams: true - }) - - result.should.be.a.String() - result.replace(/\\\n/g, '').should.eql('http -f POST http://mockbin.com/har content-type:application/x-www-form-urlencoded foo=bar hello=world') - }) -} diff --git a/test/targets/shell/wget.js b/test/targets/shell/wget.js deleted file mode 100644 index 7570628c6..000000000 --- a/test/targets/shell/wget.js +++ /dev/null @@ -1,46 +0,0 @@ -'use strict' - -require('should') - -module.exports = function (HTTPSnippet, fixtures) { - it('should use short options', function () { - const result = new HTTPSnippet(fixtures.requests.full).convert('shell', 'wget', { - short: true, - indent: false - }) - - result.should.be.a.String() - result.should.eql("wget -q --method POST --header 'cookie: foo=bar; bar=baz' --header 'accept: application/json' --header 'content-type: application/x-www-form-urlencoded' --body-data foo=bar -O - 'http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value'") - }) - - it('should ask for -v output', function () { - const result = new HTTPSnippet(fixtures.requests.short).convert('shell', 'wget', { - short: true, - indent: false, - verbose: true - }) - - result.should.be.a.String() - result.should.eql('wget -v --method GET -O - http://mockbin.com/har') - }) - - it('should ask for --verbose output', function () { - const result = new HTTPSnippet(fixtures.requests.short).convert('shell', 'wget', { - short: false, - indent: false, - verbose: true - }) - - result.should.be.a.String() - result.should.eql('wget --verbose --method GET --output-document - http://mockbin.com/har') - }) - - it('should use custom indentation', function () { - const result = new HTTPSnippet(fixtures.requests.full).convert('shell', 'wget', { - indent: '@' - }) - - result.should.be.a.String() - result.replace(/\\\n/g, '').should.eql("wget --quiet @--method POST @--header 'cookie: foo=bar; bar=baz' @--header 'accept: application/json' @--header 'content-type: application/x-www-form-urlencoded' @--body-data foo=bar @--output-document @- 'http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value'") - }) -} diff --git a/test/targets/swift/nsurlsession.js b/test/targets/swift/nsurlsession.js deleted file mode 100644 index 7cbad68e3..000000000 --- a/test/targets/swift/nsurlsession.js +++ /dev/null @@ -1,41 +0,0 @@ -'use strict' - -require('should') - -module.exports = function (HTTPSnippet, fixtures) { - it('should support an indent option', function () { - const result = new HTTPSnippet(fixtures.requests.short).convert('swift', { - indent: ' ' - }) - - result.should.be.a.String() - result.replace(/\n/g, '').should.eql('import Foundationlet request = NSMutableURLRequest(url: NSURL(string: "http://mockbin.com/har")! as URL, cachePolicy: .useProtocolCachePolicy, timeoutInterval: 10.0)request.httpMethod = "GET"let session = URLSession.sharedlet dataTask = session.dataTask(with: request as URLRequest, completionHandler: { (data, response, error) -> Void in if (error != nil) { print(error) } else { let httpResponse = response as? HTTPURLResponse print(httpResponse) }})dataTask.resume()') - }) - - it('should support a timeout option', function () { - const result = new HTTPSnippet(fixtures.requests.short).convert('swift', { - timeout: 5 - }) - - result.should.be.a.String() - result.replace(/\n/g, '').should.eql('import Foundationlet request = NSMutableURLRequest(url: NSURL(string: "http://mockbin.com/har")! as URL, cachePolicy: .useProtocolCachePolicy, timeoutInterval: 5.0)request.httpMethod = "GET"let session = URLSession.sharedlet dataTask = session.dataTask(with: request as URLRequest, completionHandler: { (data, response, error) -> Void in if (error != nil) { print(error) } else { let httpResponse = response as? HTTPURLResponse print(httpResponse) }})dataTask.resume()') - }) - - it('should support pretty option', function () { - const result = new HTTPSnippet(fixtures.requests.full).convert('swift', { - pretty: false - }) - - result.should.be.a.String() - result.replace(/\n/g, '').should.eql('import Foundationlet headers = ["cookie": "foo=bar; bar=baz", "accept": "application/json", "content-type": "application/x-www-form-urlencoded"]let postData = NSMutableData(data: "foo=bar".data(using: String.Encoding.utf8)!)let request = NSMutableURLRequest(url: NSURL(string: "http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value")! as URL, cachePolicy: .useProtocolCachePolicy, timeoutInterval: 10.0)request.httpMethod = "POST"request.allHTTPHeaderFields = headersrequest.httpBody = postData as Datalet session = URLSession.sharedlet dataTask = session.dataTask(with: request as URLRequest, completionHandler: { (data, response, error) -> Void in if (error != nil) { print(error) } else { let httpResponse = response as? HTTPURLResponse print(httpResponse) }})dataTask.resume()') - }) - - it('should support json object with null value', function () { - const result = new HTTPSnippet(fixtures.requests['jsonObj-null-value']).convert('swift', { - pretty: false - }) - - result.should.be.a.String() - result.replace(/\n/g, '').should.eql('import Foundationlet headers = ["content-type": "application/json"]let parameters = ["foo": ] as [String : Any]let postData = JSONSerialization.data(withJSONObject: parameters, options: [])let request = NSMutableURLRequest(url: NSURL(string: "http://mockbin.com/har")! as URL, cachePolicy: .useProtocolCachePolicy, timeoutInterval: 10.0)request.httpMethod = "POST"request.allHTTPHeaderFields = headersrequest.httpBody = postData as Datalet session = URLSession.sharedlet dataTask = session.dataTask(with: request as URLRequest, completionHandler: { (data, response, error) -> Void in if (error != nil) { print(error) } else { let httpResponse = response as? HTTPURLResponse print(httpResponse) }})dataTask.resume()') - }) -} diff --git a/tsconfig.build.json b/tsconfig.build.json new file mode 100644 index 000000000..76d4df1a3 --- /dev/null +++ b/tsconfig.build.json @@ -0,0 +1,14 @@ +{ + "compilerOptions": { + "outDir": "dist", + "rootDir": ".", + "allowJs": true, + "resolveJsonModule": true, + "strict": true, + "esModuleInterop": true, + "downlevelIteration": true, + "lib": ["ESNext"] + }, + "include": ["src", "package.json"], + "exclude": ["dist", "**/*.test.ts"] +} diff --git a/tsconfig.json b/tsconfig.json new file mode 100644 index 000000000..2178989ae --- /dev/null +++ b/tsconfig.json @@ -0,0 +1,9 @@ +{ + "extends": "./tsconfig.build.json", + "compilerOptions": { + "rootDir": ".", + "types": ["node", "jest"] + }, + "exclude": ["dist"], + "include": ["jest.config.js", ".prettierrc.js", ".eslintrc.js", "src"] +} From c7eae4c35d806d7bbe5b389a47f0d57e5d0a5e58 Mon Sep 17 00:00:00 2001 From: Jon Ursenbach Date: Fri, 13 May 2022 12:13:01 -0700 Subject: [PATCH 02/12] fix: case where if `postData.params` is missing some targets crash (#258) Co-authored-by: Dimitri Mitropoulos --- .../multipart-form-data-no-params.json | 26 +++++++++++++++++ .../fixtures/multipart-form-data-no-params.c | 10 +++++++ src/targets/clojure/clj_http/client.ts | 26 +++++++++-------- .../multipart-form-data-no-params.clj | 3 ++ .../fixtures/multipart-form-data-no-params.cs | 12 ++++++++ .../fixtures/multipart-form-data-no-params.cs | 4 +++ .../fixtures/multipart-form-data-no-params.go | 25 +++++++++++++++++ .../fixtures/multipart-form-data-no-params | 4 +++ .../multipart-form-data-no-params.java | 9 ++++++ .../multipart-form-data-no-params.java | 7 +++++ .../multipart-form-data-no-params.java | 9 ++++++ .../multipart-form-data-no-params.java | 3 ++ src/targets/javascript/axios/client.ts | 6 +++- .../fixtures/multipart-form-data-no-params.js | 16 +++++++++++ src/targets/javascript/fetch/client.ts | 8 ++++-- .../fixtures/multipart-form-data-no-params.js | 6 ++++ src/targets/javascript/jquery/client.ts | 6 +++- .../fixtures/multipart-form-data-no-params.js | 13 +++++++++ src/targets/javascript/xhr/client.ts | 6 +++- .../fixtures/multipart-form-data-no-params.js | 13 +++++++++ .../fixtures/multipart-form-data-no-params.kt | 9 ++++++ .../fixtures/multipart-form-data-no-params.js | 16 +++++++++++ src/targets/node/fetch/client.ts | 8 ++++-- .../fixtures/multipart-form-data-no-params.js | 10 +++++++ .../fixtures/multipart-form-data-no-params.js | 26 +++++++++++++++++ src/targets/node/request/client.ts | 6 +++- .../fixtures/multipart-form-data-no-params.js | 13 +++++++++ src/targets/node/unirest/client.ts | 6 +++- .../fixtures/multipart-form-data-no-params.js | 13 +++++++++ .../fixtures/multipart-form-data-no-params.m | 21 ++++++++++++++ .../fixtures/multipart-form-data-no-params.ml | 10 +++++++ .../multipart-form-data-no-params.php | 28 +++++++++++++++++++ .../multipart-form-data-no-params.php | 17 +++++++++++ src/targets/php/http2/client.ts | 6 +++- .../multipart-form-data-no-params.php | 15 ++++++++++ .../multipart-form-data-no-params.ps1 | 3 ++ .../multipart-form-data-no-params.ps1 | 3 ++ .../fixtures/multipart-form-data-no-params.py | 14 ++++++++++ .../fixtures/multipart-form-data-no-params.py | 10 +++++++ .../fixtures/multipart-form-data-no-params.r | 9 ++++++ .../fixtures/multipart-form-data-no-params.rb | 12 ++++++++ .../fixtures/multipart-form-data-no-params.sh | 3 ++ .../fixtures/multipart-form-data-no-params.sh | 2 ++ .../fixtures/multipart-form-data-no-params.sh | 5 ++++ .../multipart-form-data-no-params.swift | 21 ++++++++++++++ 45 files changed, 476 insertions(+), 22 deletions(-) create mode 100644 src/fixtures/requests/multipart-form-data-no-params.json create mode 100644 src/targets/c/libcurl/fixtures/multipart-form-data-no-params.c create mode 100644 src/targets/clojure/clj_http/fixtures/multipart-form-data-no-params.clj create mode 100644 src/targets/csharp/httpclient/fixtures/multipart-form-data-no-params.cs create mode 100644 src/targets/csharp/restsharp/fixtures/multipart-form-data-no-params.cs create mode 100644 src/targets/go/native/fixtures/multipart-form-data-no-params.go create mode 100644 src/targets/http/http1.1/fixtures/multipart-form-data-no-params create mode 100644 src/targets/java/asynchttp/fixtures/multipart-form-data-no-params.java create mode 100644 src/targets/java/nethttp/fixtures/multipart-form-data-no-params.java create mode 100644 src/targets/java/okhttp/fixtures/multipart-form-data-no-params.java create mode 100644 src/targets/java/unirest/fixtures/multipart-form-data-no-params.java create mode 100644 src/targets/javascript/axios/fixtures/multipart-form-data-no-params.js create mode 100644 src/targets/javascript/fetch/fixtures/multipart-form-data-no-params.js create mode 100644 src/targets/javascript/jquery/fixtures/multipart-form-data-no-params.js create mode 100644 src/targets/javascript/xhr/fixtures/multipart-form-data-no-params.js create mode 100644 src/targets/kotlin/okhttp/fixtures/multipart-form-data-no-params.kt create mode 100644 src/targets/node/axios/fixtures/multipart-form-data-no-params.js create mode 100644 src/targets/node/fetch/fixtures/multipart-form-data-no-params.js create mode 100644 src/targets/node/native/fixtures/multipart-form-data-no-params.js create mode 100644 src/targets/node/request/fixtures/multipart-form-data-no-params.js create mode 100644 src/targets/node/unirest/fixtures/multipart-form-data-no-params.js create mode 100644 src/targets/objc/nsurlsession/fixtures/multipart-form-data-no-params.m create mode 100644 src/targets/ocaml/cohttp/fixtures/multipart-form-data-no-params.ml create mode 100644 src/targets/php/curl/fixtures/multipart-form-data-no-params.php create mode 100644 src/targets/php/http1/fixtures/multipart-form-data-no-params.php create mode 100644 src/targets/php/http2/fixtures/multipart-form-data-no-params.php create mode 100644 src/targets/powershell/restmethod/fixtures/multipart-form-data-no-params.ps1 create mode 100644 src/targets/powershell/webrequest/fixtures/multipart-form-data-no-params.ps1 create mode 100644 src/targets/python/python3/fixtures/multipart-form-data-no-params.py create mode 100644 src/targets/python/requests/fixtures/multipart-form-data-no-params.py create mode 100644 src/targets/r/httr/fixtures/multipart-form-data-no-params.r create mode 100644 src/targets/ruby/native/fixtures/multipart-form-data-no-params.rb create mode 100644 src/targets/shell/curl/fixtures/multipart-form-data-no-params.sh create mode 100644 src/targets/shell/httpie/fixtures/multipart-form-data-no-params.sh create mode 100644 src/targets/shell/wget/fixtures/multipart-form-data-no-params.sh create mode 100644 src/targets/swift/nsurlsession/fixtures/multipart-form-data-no-params.swift diff --git a/src/fixtures/requests/multipart-form-data-no-params.json b/src/fixtures/requests/multipart-form-data-no-params.json new file mode 100644 index 000000000..f6ae205ba --- /dev/null +++ b/src/fixtures/requests/multipart-form-data-no-params.json @@ -0,0 +1,26 @@ +{ + "log": { + "version": "1.2", + "creator": { + "name": "HTTPSnippet", + "version": "1.0.0" + }, + "entries": [ + { + "request": { + "method": "POST", + "url": "http://mockbin.com/har", + "headers": [ + { + "name": "Content-Type", + "value": "multipart/form-data" + } + ], + "postData": { + "mimeType": "multipart/form-data" + } + } + } + ] + } +} diff --git a/src/targets/c/libcurl/fixtures/multipart-form-data-no-params.c b/src/targets/c/libcurl/fixtures/multipart-form-data-no-params.c new file mode 100644 index 000000000..6d57c9fc2 --- /dev/null +++ b/src/targets/c/libcurl/fixtures/multipart-form-data-no-params.c @@ -0,0 +1,10 @@ +CURL *hnd = curl_easy_init(); + +curl_easy_setopt(hnd, CURLOPT_CUSTOMREQUEST, "POST"); +curl_easy_setopt(hnd, CURLOPT_URL, "http://mockbin.com/har"); + +struct curl_slist *headers = NULL; +headers = curl_slist_append(headers, "Content-Type: multipart/form-data"); +curl_easy_setopt(hnd, CURLOPT_HTTPHEADER, headers); + +CURLcode ret = curl_easy_perform(hnd); \ No newline at end of file diff --git a/src/targets/clojure/clj_http/client.ts b/src/targets/clojure/clj_http/client.ts index 9476fd804..3bc56ab18 100644 --- a/src/targets/clojure/clj_http/client.ts +++ b/src/targets/clojure/clj_http/client.ts @@ -144,22 +144,24 @@ export const clj_http: Client = { break; case 'multipart/form-data': { - params.multipart = postData.params?.map(param => { - if (param.fileName && !param.value) { + if (postData.params) { + params.multipart = postData.params.map(param => { + if (param.fileName && !param.value) { + return { + name: param.name, + content: new File(param.fileName), + }; + } return { name: param.name, - content: new File(param.fileName), + content: param.value, }; + }); + + const header = getHeaderName(params.headers, 'content-type'); + if (header) { + delete params.headers[header]; } - return { - name: param.name, - content: param.value, - }; - }); - - const header = getHeaderName(params.headers, 'content-type'); - if (header) { - delete params.headers[header]; } break; } diff --git a/src/targets/clojure/clj_http/fixtures/multipart-form-data-no-params.clj b/src/targets/clojure/clj_http/fixtures/multipart-form-data-no-params.clj new file mode 100644 index 000000000..b6f28b726 --- /dev/null +++ b/src/targets/clojure/clj_http/fixtures/multipart-form-data-no-params.clj @@ -0,0 +1,3 @@ +(require '[clj-http.client :as client]) + +(client/post "http://mockbin.com/har" {:headers {:Content-Type "multipart/form-data"}}) \ No newline at end of file diff --git a/src/targets/csharp/httpclient/fixtures/multipart-form-data-no-params.cs b/src/targets/csharp/httpclient/fixtures/multipart-form-data-no-params.cs new file mode 100644 index 000000000..b9cd19c88 --- /dev/null +++ b/src/targets/csharp/httpclient/fixtures/multipart-form-data-no-params.cs @@ -0,0 +1,12 @@ +var client = new HttpClient(); +var request = new HttpRequestMessage +{ + Method = HttpMethod.Post, + RequestUri = new Uri("http://mockbin.com/har"), +}; +using (var response = await client.SendAsync(request)) +{ + response.EnsureSuccessStatusCode(); + var body = await response.Content.ReadAsStringAsync(); + Console.WriteLine(body); +} \ No newline at end of file diff --git a/src/targets/csharp/restsharp/fixtures/multipart-form-data-no-params.cs b/src/targets/csharp/restsharp/fixtures/multipart-form-data-no-params.cs new file mode 100644 index 000000000..be2fcac1f --- /dev/null +++ b/src/targets/csharp/restsharp/fixtures/multipart-form-data-no-params.cs @@ -0,0 +1,4 @@ +var client = new RestClient("http://mockbin.com/har"); +var request = new RestRequest(Method.POST); +request.AddHeader("Content-Type", "multipart/form-data"); +IRestResponse response = client.Execute(request); \ No newline at end of file diff --git a/src/targets/go/native/fixtures/multipart-form-data-no-params.go b/src/targets/go/native/fixtures/multipart-form-data-no-params.go new file mode 100644 index 000000000..b7c22a909 --- /dev/null +++ b/src/targets/go/native/fixtures/multipart-form-data-no-params.go @@ -0,0 +1,25 @@ +package main + +import ( + "fmt" + "net/http" + "io/ioutil" +) + +func main() { + + url := "http://mockbin.com/har" + + req, _ := http.NewRequest("POST", url, nil) + + req.Header.Add("Content-Type", "multipart/form-data") + + res, _ := http.DefaultClient.Do(req) + + defer res.Body.Close() + body, _ := ioutil.ReadAll(res.Body) + + fmt.Println(res) + fmt.Println(string(body)) + +} \ No newline at end of file diff --git a/src/targets/http/http1.1/fixtures/multipart-form-data-no-params b/src/targets/http/http1.1/fixtures/multipart-form-data-no-params new file mode 100644 index 000000000..81934c3db --- /dev/null +++ b/src/targets/http/http1.1/fixtures/multipart-form-data-no-params @@ -0,0 +1,4 @@ +POST /har HTTP/1.1 +Content-Type: multipart/form-data +Host: mockbin.com + diff --git a/src/targets/java/asynchttp/fixtures/multipart-form-data-no-params.java b/src/targets/java/asynchttp/fixtures/multipart-form-data-no-params.java new file mode 100644 index 000000000..44c459093 --- /dev/null +++ b/src/targets/java/asynchttp/fixtures/multipart-form-data-no-params.java @@ -0,0 +1,9 @@ +AsyncHttpClient client = new DefaultAsyncHttpClient(); +client.prepare("POST", "http://mockbin.com/har") + .setHeader("Content-Type", "multipart/form-data") + .execute() + .toCompletableFuture() + .thenAccept(System.out::println) + .join(); + +client.close(); \ No newline at end of file diff --git a/src/targets/java/nethttp/fixtures/multipart-form-data-no-params.java b/src/targets/java/nethttp/fixtures/multipart-form-data-no-params.java new file mode 100644 index 000000000..94f3a6582 --- /dev/null +++ b/src/targets/java/nethttp/fixtures/multipart-form-data-no-params.java @@ -0,0 +1,7 @@ +HttpRequest request = HttpRequest.newBuilder() + .uri(URI.create("http://mockbin.com/har")) + .header("Content-Type", "multipart/form-data") + .method("POST", HttpRequest.BodyPublishers.noBody()) + .build(); +HttpResponse response = HttpClient.newHttpClient().send(request, HttpResponse.BodyHandlers.ofString()); +System.out.println(response.body()); \ No newline at end of file diff --git a/src/targets/java/okhttp/fixtures/multipart-form-data-no-params.java b/src/targets/java/okhttp/fixtures/multipart-form-data-no-params.java new file mode 100644 index 000000000..d3901497e --- /dev/null +++ b/src/targets/java/okhttp/fixtures/multipart-form-data-no-params.java @@ -0,0 +1,9 @@ +OkHttpClient client = new OkHttpClient(); + +Request request = new Request.Builder() + .url("http://mockbin.com/har") + .post(null) + .addHeader("Content-Type", "multipart/form-data") + .build(); + +Response response = client.newCall(request).execute(); \ No newline at end of file diff --git a/src/targets/java/unirest/fixtures/multipart-form-data-no-params.java b/src/targets/java/unirest/fixtures/multipart-form-data-no-params.java new file mode 100644 index 000000000..08680d6b3 --- /dev/null +++ b/src/targets/java/unirest/fixtures/multipart-form-data-no-params.java @@ -0,0 +1,3 @@ +HttpResponse response = Unirest.post("http://mockbin.com/har") + .header("Content-Type", "multipart/form-data") + .asString(); \ No newline at end of file diff --git a/src/targets/javascript/axios/client.ts b/src/targets/javascript/axios/client.ts index 935de0247..a8110889a 100644 --- a/src/targets/javascript/axios/client.ts +++ b/src/targets/javascript/axios/client.ts @@ -56,9 +56,13 @@ export const axios: Client = { break; case 'multipart/form-data': + if (!postData.params) { + break; + } + push('const form = new FormData();'); - postData.params?.forEach(param => { + postData.params.forEach(param => { push(`form.append('${param.name}', '${param.value || param.fileName || ''}');`); }); diff --git a/src/targets/javascript/axios/fixtures/multipart-form-data-no-params.js b/src/targets/javascript/axios/fixtures/multipart-form-data-no-params.js new file mode 100644 index 000000000..08fb94f61 --- /dev/null +++ b/src/targets/javascript/axios/fixtures/multipart-form-data-no-params.js @@ -0,0 +1,16 @@ +import axios from 'axios'; + +const options = { + method: 'POST', + url: 'http://mockbin.com/har', + headers: {'Content-Type': 'multipart/form-data'} +}; + +axios + .request(options) + .then(function (response) { + console.log(response.data); + }) + .catch(function (error) { + console.error(error); + }); \ No newline at end of file diff --git a/src/targets/javascript/fetch/client.ts b/src/targets/javascript/fetch/client.ts index 9ecb4639a..a054ee304 100644 --- a/src/targets/javascript/fetch/client.ts +++ b/src/targets/javascript/fetch/client.ts @@ -55,9 +55,13 @@ export const fetch: Client = { break; case 'multipart/form-data': + if (!postData.params) { + break; + } + push('const form = new FormData();'); - postData.params?.forEach(param => { + postData.params.forEach(param => { push(`form.append('${param.name}', '${param.value || param.fileName || ''}');`); }); @@ -84,7 +88,7 @@ export const fetch: Client = { ); blank(); - if (postData.mimeType === 'multipart/form-data') { + if (postData.params && postData.mimeType === 'multipart/form-data') { push('options.body = form;'); blank(); } diff --git a/src/targets/javascript/fetch/fixtures/multipart-form-data-no-params.js b/src/targets/javascript/fetch/fixtures/multipart-form-data-no-params.js new file mode 100644 index 000000000..840435d9c --- /dev/null +++ b/src/targets/javascript/fetch/fixtures/multipart-form-data-no-params.js @@ -0,0 +1,6 @@ +const options = {method: 'POST', headers: {'Content-Type': 'multipart/form-data'}}; + +fetch('http://mockbin.com/har', options) + .then(response => response.json()) + .then(response => console.log(response)) + .catch(err => console.error(err)); \ No newline at end of file diff --git a/src/targets/javascript/jquery/client.ts b/src/targets/javascript/jquery/client.ts index 9647b82c2..9df94fba7 100644 --- a/src/targets/javascript/jquery/client.ts +++ b/src/targets/javascript/jquery/client.ts @@ -48,9 +48,13 @@ export const jquery: Client = { break; case 'multipart/form-data': + if (!postData.params) { + break; + } + push('const form = new FormData();'); - postData.params?.forEach(param => { + postData.params.forEach(param => { push(`form.append('${param.name}', '${param.value || param.fileName || ''}');`); }); diff --git a/src/targets/javascript/jquery/fixtures/multipart-form-data-no-params.js b/src/targets/javascript/jquery/fixtures/multipart-form-data-no-params.js new file mode 100644 index 000000000..2b67d0fc9 --- /dev/null +++ b/src/targets/javascript/jquery/fixtures/multipart-form-data-no-params.js @@ -0,0 +1,13 @@ +const settings = { + async: true, + crossDomain: true, + url: 'http://mockbin.com/har', + method: 'POST', + headers: { + 'Content-Type': 'multipart/form-data' + } +}; + +$.ajax(settings).done(function (response) { + console.log(response); +}); \ No newline at end of file diff --git a/src/targets/javascript/xhr/client.ts b/src/targets/javascript/xhr/client.ts index 4d05ffd1d..7ea5039fc 100644 --- a/src/targets/javascript/xhr/client.ts +++ b/src/targets/javascript/xhr/client.ts @@ -45,9 +45,13 @@ export const xhr: Client = { break; case 'multipart/form-data': + if (!postData.params) { + break; + } + push('const data = new FormData();'); - postData.params?.forEach(param => { + postData.params.forEach(param => { push(`data.append('${param.name}', '${param.value || param.fileName || ''}');`); }); diff --git a/src/targets/javascript/xhr/fixtures/multipart-form-data-no-params.js b/src/targets/javascript/xhr/fixtures/multipart-form-data-no-params.js new file mode 100644 index 000000000..c0e0ab8e6 --- /dev/null +++ b/src/targets/javascript/xhr/fixtures/multipart-form-data-no-params.js @@ -0,0 +1,13 @@ +const xhr = new XMLHttpRequest(); +xhr.withCredentials = true; + +xhr.addEventListener('readystatechange', function () { + if (this.readyState === this.DONE) { + console.log(this.responseText); + } +}); + +xhr.open('POST', 'http://mockbin.com/har'); +xhr.setRequestHeader('Content-Type', 'multipart/form-data'); + +xhr.send(data); \ No newline at end of file diff --git a/src/targets/kotlin/okhttp/fixtures/multipart-form-data-no-params.kt b/src/targets/kotlin/okhttp/fixtures/multipart-form-data-no-params.kt new file mode 100644 index 000000000..55b816139 --- /dev/null +++ b/src/targets/kotlin/okhttp/fixtures/multipart-form-data-no-params.kt @@ -0,0 +1,9 @@ +val client = OkHttpClient() + +val request = Request.Builder() + .url("http://mockbin.com/har") + .post(null) + .addHeader("Content-Type", "multipart/form-data") + .build() + +val response = client.newCall(request).execute() \ No newline at end of file diff --git a/src/targets/node/axios/fixtures/multipart-form-data-no-params.js b/src/targets/node/axios/fixtures/multipart-form-data-no-params.js new file mode 100644 index 000000000..32c6883c9 --- /dev/null +++ b/src/targets/node/axios/fixtures/multipart-form-data-no-params.js @@ -0,0 +1,16 @@ +var axios = require('axios').default; + +var options = { + method: 'POST', + url: 'http://mockbin.com/har', + headers: {'Content-Type': 'multipart/form-data'} +}; + +axios + .request(options) + .then(function (response) { + console.log(response.data); + }) + .catch(function (error) { + console.error(error); + }); \ No newline at end of file diff --git a/src/targets/node/fetch/client.ts b/src/targets/node/fetch/client.ts index 8973c0be3..d4ce1b5f1 100644 --- a/src/targets/node/fetch/client.ts +++ b/src/targets/node/fetch/client.ts @@ -59,11 +59,15 @@ export const fetch: Client = { break; case 'multipart/form-data': + if (!postData.params) { + break; + } + unshift("const FormData = require('form-data');"); push('const formData = new FormData();'); blank(); - postData.params?.forEach(param => { + postData.params.forEach(param => { if (!param.fileName && !param.fileName && !param.contentType) { push(`formData.append('${param.name}', '${param.value}');`); return; @@ -105,7 +109,7 @@ export const fetch: Client = { if (includeFS) { unshift("const fs = require('fs');"); } - if (postData.mimeType === 'multipart/form-data') { + if (postData.params && postData.mimeType === 'multipart/form-data') { push('options.body = formData;'); blank(); } diff --git a/src/targets/node/fetch/fixtures/multipart-form-data-no-params.js b/src/targets/node/fetch/fixtures/multipart-form-data-no-params.js new file mode 100644 index 000000000..8088a629e --- /dev/null +++ b/src/targets/node/fetch/fixtures/multipart-form-data-no-params.js @@ -0,0 +1,10 @@ +const fetch = require('node-fetch'); + +let url = 'http://mockbin.com/har'; + +let options = {method: 'POST', headers: {'Content-Type': 'multipart/form-data'}}; + +fetch(url, options) + .then(res => res.json()) + .then(json => console.log(json)) + .catch(err => console.error('error:' + err)); \ No newline at end of file diff --git a/src/targets/node/native/fixtures/multipart-form-data-no-params.js b/src/targets/node/native/fixtures/multipart-form-data-no-params.js new file mode 100644 index 000000000..e9d8deee4 --- /dev/null +++ b/src/targets/node/native/fixtures/multipart-form-data-no-params.js @@ -0,0 +1,26 @@ +const http = require('http'); + +const options = { + method: 'POST', + hostname: 'mockbin.com', + port: null, + path: '/har', + headers: { + 'Content-Type': 'multipart/form-data' + } +}; + +const req = http.request(options, function (res) { + const chunks = []; + + res.on('data', function (chunk) { + chunks.push(chunk); + }); + + res.on('end', function () { + const body = Buffer.concat(chunks); + console.log(body.toString()); + }); +}); + +req.end(); \ No newline at end of file diff --git a/src/targets/node/request/client.ts b/src/targets/node/request/client.ts index ad07cbb39..9afc5ae4a 100644 --- a/src/targets/node/request/client.ts +++ b/src/targets/node/request/client.ts @@ -58,9 +58,13 @@ export const request: Client = { break; case 'multipart/form-data': + if (!postData.params) { + break; + } + reqOpts.formData = {}; - postData.params?.forEach(param => { + postData.params.forEach(param => { if (!param.fileName && !param.fileName && !param.contentType) { reqOpts.formData[param.name] = param.value; return; diff --git a/src/targets/node/request/fixtures/multipart-form-data-no-params.js b/src/targets/node/request/fixtures/multipart-form-data-no-params.js new file mode 100644 index 000000000..5fcf59634 --- /dev/null +++ b/src/targets/node/request/fixtures/multipart-form-data-no-params.js @@ -0,0 +1,13 @@ +const request = require('request'); + +const options = { + method: 'POST', + url: 'http://mockbin.com/har', + headers: {'Content-Type': 'multipart/form-data'} +}; + +request(options, function (error, response, body) { + if (error) throw new Error(error); + + console.log(body); +}); \ No newline at end of file diff --git a/src/targets/node/unirest/client.ts b/src/targets/node/unirest/client.ts index dbdf5c707..e17540156 100644 --- a/src/targets/node/unirest/client.ts +++ b/src/targets/node/unirest/client.ts @@ -76,9 +76,13 @@ export const unirest: Client = { break; case 'multipart/form-data': { + if (!postData.params) { + break; + } + const multipart: Record[] = []; - postData.params?.forEach(param => { + postData.params.forEach(param => { const part: Record = {}; if (param.fileName && !param.value) { diff --git a/src/targets/node/unirest/fixtures/multipart-form-data-no-params.js b/src/targets/node/unirest/fixtures/multipart-form-data-no-params.js new file mode 100644 index 000000000..38d715450 --- /dev/null +++ b/src/targets/node/unirest/fixtures/multipart-form-data-no-params.js @@ -0,0 +1,13 @@ +const unirest = require('unirest'); + +const req = unirest('POST', 'http://mockbin.com/har'); + +req.headers({ + 'Content-Type': 'multipart/form-data' +}); + +req.end(function (res) { + if (res.error) throw new Error(res.error); + + console.log(res.body); +}); \ No newline at end of file diff --git a/src/targets/objc/nsurlsession/fixtures/multipart-form-data-no-params.m b/src/targets/objc/nsurlsession/fixtures/multipart-form-data-no-params.m new file mode 100644 index 000000000..f4301e92c --- /dev/null +++ b/src/targets/objc/nsurlsession/fixtures/multipart-form-data-no-params.m @@ -0,0 +1,21 @@ +#import + +NSDictionary *headers = @{ @"Content-Type": @"multipart/form-data" }; + +NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:@"http://mockbin.com/har"] + cachePolicy:NSURLRequestUseProtocolCachePolicy + timeoutInterval:10.0]; +[request setHTTPMethod:@"POST"]; +[request setAllHTTPHeaderFields:headers]; + +NSURLSession *session = [NSURLSession sharedSession]; +NSURLSessionDataTask *dataTask = [session dataTaskWithRequest:request + completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) { + if (error) { + NSLog(@"%@", error); + } else { + NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *) response; + NSLog(@"%@", httpResponse); + } + }]; +[dataTask resume]; \ No newline at end of file diff --git a/src/targets/ocaml/cohttp/fixtures/multipart-form-data-no-params.ml b/src/targets/ocaml/cohttp/fixtures/multipart-form-data-no-params.ml new file mode 100644 index 000000000..d41875284 --- /dev/null +++ b/src/targets/ocaml/cohttp/fixtures/multipart-form-data-no-params.ml @@ -0,0 +1,10 @@ +open Cohttp_lwt_unix +open Cohttp +open Lwt + +let uri = Uri.of_string "http://mockbin.com/har" in +let headers = Header.add (Header.init ()) "Content-Type" "multipart/form-data" in + +Client.call ~headers `POST uri +>>= fun (res, body_stream) -> + (* Do stuff with the result *) \ No newline at end of file diff --git a/src/targets/php/curl/fixtures/multipart-form-data-no-params.php b/src/targets/php/curl/fixtures/multipart-form-data-no-params.php new file mode 100644 index 000000000..234b29787 --- /dev/null +++ b/src/targets/php/curl/fixtures/multipart-form-data-no-params.php @@ -0,0 +1,28 @@ + "http://mockbin.com/har", + CURLOPT_RETURNTRANSFER => true, + CURLOPT_ENCODING => "", + CURLOPT_MAXREDIRS => 10, + CURLOPT_TIMEOUT => 30, + CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1, + CURLOPT_CUSTOMREQUEST => "POST", + CURLOPT_POSTFIELDS => "", + CURLOPT_HTTPHEADER => [ + "Content-Type: multipart/form-data" + ], +]); + +$response = curl_exec($curl); +$err = curl_error($curl); + +curl_close($curl); + +if ($err) { + echo "cURL Error #:" . $err; +} else { + echo $response; +} \ No newline at end of file diff --git a/src/targets/php/http1/fixtures/multipart-form-data-no-params.php b/src/targets/php/http1/fixtures/multipart-form-data-no-params.php new file mode 100644 index 000000000..956ab702c --- /dev/null +++ b/src/targets/php/http1/fixtures/multipart-form-data-no-params.php @@ -0,0 +1,17 @@ +setUrl('http://mockbin.com/har'); +$request->setMethod(HTTP_METH_POST); + +$request->setHeaders([ + 'Content-Type' => 'multipart/form-data' +]); + +try { + $response = $request->send(); + + echo $response->getBody(); +} catch (HttpException $ex) { + echo $ex; +} \ No newline at end of file diff --git a/src/targets/php/http2/client.ts b/src/targets/php/http2/client.ts index 7df35e5f0..afd9f451c 100644 --- a/src/targets/php/http2/client.ts +++ b/src/targets/php/http2/client.ts @@ -58,6 +58,10 @@ export const http2: Client = { break; case 'multipart/form-data': { + if (!postData.params) { + break; + } + const files: { name: string; type: string | undefined; @@ -66,7 +70,7 @@ export const http2: Client = { [anything: string]: string | undefined; }[] = []; const fields: Record = {}; - postData.params?.forEach(({ name, fileName, value, contentType }) => { + postData.params.forEach(({ name, fileName, value, contentType }) => { if (fileName) { files.push({ name, diff --git a/src/targets/php/http2/fixtures/multipart-form-data-no-params.php b/src/targets/php/http2/fixtures/multipart-form-data-no-params.php new file mode 100644 index 000000000..082a20ac2 --- /dev/null +++ b/src/targets/php/http2/fixtures/multipart-form-data-no-params.php @@ -0,0 +1,15 @@ +setRequestUrl('http://mockbin.com/har'); +$request->setRequestMethod('POST'); +$request->setHeaders([ + 'Content-Type' => 'multipart/form-data' +]); + +$client->enqueue($request)->send(); +$response = $client->getResponse(); + +echo $response->getBody(); \ No newline at end of file diff --git a/src/targets/powershell/restmethod/fixtures/multipart-form-data-no-params.ps1 b/src/targets/powershell/restmethod/fixtures/multipart-form-data-no-params.ps1 new file mode 100644 index 000000000..0f979422e --- /dev/null +++ b/src/targets/powershell/restmethod/fixtures/multipart-form-data-no-params.ps1 @@ -0,0 +1,3 @@ +$headers=@{} +$headers.Add("Content-Type", "multipart/form-data") +$response = Invoke-RestMethod -Uri 'http://mockbin.com/har' -Method POST -Headers $headers \ No newline at end of file diff --git a/src/targets/powershell/webrequest/fixtures/multipart-form-data-no-params.ps1 b/src/targets/powershell/webrequest/fixtures/multipart-form-data-no-params.ps1 new file mode 100644 index 000000000..1df1c96dd --- /dev/null +++ b/src/targets/powershell/webrequest/fixtures/multipart-form-data-no-params.ps1 @@ -0,0 +1,3 @@ +$headers=@{} +$headers.Add("Content-Type", "multipart/form-data") +$response = Invoke-WebRequest -Uri 'http://mockbin.com/har' -Method POST -Headers $headers \ No newline at end of file diff --git a/src/targets/python/python3/fixtures/multipart-form-data-no-params.py b/src/targets/python/python3/fixtures/multipart-form-data-no-params.py new file mode 100644 index 000000000..a8ed7946d --- /dev/null +++ b/src/targets/python/python3/fixtures/multipart-form-data-no-params.py @@ -0,0 +1,14 @@ +import http.client + +conn = http.client.HTTPConnection("mockbin.com") + +payload = "" + +headers = { 'Content-Type': "multipart/form-data" } + +conn.request("POST", "/har", payload, headers) + +res = conn.getresponse() +data = res.read() + +print(data.decode("utf-8")) \ No newline at end of file diff --git a/src/targets/python/requests/fixtures/multipart-form-data-no-params.py b/src/targets/python/requests/fixtures/multipart-form-data-no-params.py new file mode 100644 index 000000000..084127252 --- /dev/null +++ b/src/targets/python/requests/fixtures/multipart-form-data-no-params.py @@ -0,0 +1,10 @@ +import requests + +url = "http://mockbin.com/har" + +payload = "" +headers = {"Content-Type": "multipart/form-data"} + +response = requests.request("POST", url, data=payload, headers=headers) + +print(response.text) \ No newline at end of file diff --git a/src/targets/r/httr/fixtures/multipart-form-data-no-params.r b/src/targets/r/httr/fixtures/multipart-form-data-no-params.r new file mode 100644 index 000000000..eb6b37fb6 --- /dev/null +++ b/src/targets/r/httr/fixtures/multipart-form-data-no-params.r @@ -0,0 +1,9 @@ +library(httr) + +url <- "http://mockbin.com/har" + +payload <- "" + +response <- VERB("POST", url, body = payload, content_type("multipart/form-data")) + +content(response, "text") \ No newline at end of file diff --git a/src/targets/ruby/native/fixtures/multipart-form-data-no-params.rb b/src/targets/ruby/native/fixtures/multipart-form-data-no-params.rb new file mode 100644 index 000000000..5457fe917 --- /dev/null +++ b/src/targets/ruby/native/fixtures/multipart-form-data-no-params.rb @@ -0,0 +1,12 @@ +require 'uri' +require 'net/http' + +url = URI("http://mockbin.com/har") + +http = Net::HTTP.new(url.host, url.port) + +request = Net::HTTP::Post.new(url) +request["Content-Type"] = 'multipart/form-data' + +response = http.request(request) +puts response.read_body \ No newline at end of file diff --git a/src/targets/shell/curl/fixtures/multipart-form-data-no-params.sh b/src/targets/shell/curl/fixtures/multipart-form-data-no-params.sh new file mode 100644 index 000000000..2fb284489 --- /dev/null +++ b/src/targets/shell/curl/fixtures/multipart-form-data-no-params.sh @@ -0,0 +1,3 @@ +curl --request POST \ + --url http://mockbin.com/har \ + --header 'Content-Type: multipart/form-data' \ No newline at end of file diff --git a/src/targets/shell/httpie/fixtures/multipart-form-data-no-params.sh b/src/targets/shell/httpie/fixtures/multipart-form-data-no-params.sh new file mode 100644 index 000000000..e0a0b1d3b --- /dev/null +++ b/src/targets/shell/httpie/fixtures/multipart-form-data-no-params.sh @@ -0,0 +1,2 @@ +http POST http://mockbin.com/har \ + Content-Type:multipart/form-data \ No newline at end of file diff --git a/src/targets/shell/wget/fixtures/multipart-form-data-no-params.sh b/src/targets/shell/wget/fixtures/multipart-form-data-no-params.sh new file mode 100644 index 000000000..ae1959d36 --- /dev/null +++ b/src/targets/shell/wget/fixtures/multipart-form-data-no-params.sh @@ -0,0 +1,5 @@ +wget --quiet \ + --method POST \ + --header 'Content-Type: multipart/form-data' \ + --output-document \ + - http://mockbin.com/har \ No newline at end of file diff --git a/src/targets/swift/nsurlsession/fixtures/multipart-form-data-no-params.swift b/src/targets/swift/nsurlsession/fixtures/multipart-form-data-no-params.swift new file mode 100644 index 000000000..1204be991 --- /dev/null +++ b/src/targets/swift/nsurlsession/fixtures/multipart-form-data-no-params.swift @@ -0,0 +1,21 @@ +import Foundation + +let headers = ["Content-Type": "multipart/form-data"] + +let request = NSMutableURLRequest(url: NSURL(string: "http://mockbin.com/har")! as URL, + cachePolicy: .useProtocolCachePolicy, + timeoutInterval: 10.0) +request.httpMethod = "POST" +request.allHTTPHeaderFields = headers + +let session = URLSession.shared +let dataTask = session.dataTask(with: request as URLRequest, completionHandler: { (data, response, error) -> Void in + if (error != nil) { + print(error) + } else { + let httpResponse = response as? HTTPURLResponse + print(httpResponse) + } +}) + +dataTask.resume() \ No newline at end of file From 998e4038bc812edc37a9fec8b599fa044a6cd01d Mon Sep 17 00:00:00 2001 From: Jon Ursenbach Date: Fri, 13 May 2022 12:15:23 -0700 Subject: [PATCH 03/12] fix: compatibility issues on node 14 with `Object.hasOwn()` (#252) --- src/targets/php/helpers.ts | 2 +- src/targets/targets.ts | 32 ++++++++++++++++---------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/targets/php/helpers.ts b/src/targets/php/helpers.ts index c58ab2c10..b86099f72 100644 --- a/src/targets/php/helpers.ts +++ b/src/targets/php/helpers.ts @@ -25,7 +25,7 @@ export const convertType = (obj: any[] | any, indent?: string, lastIndent?: stri case '[object Object]': { const result: string[] = []; for (const i in obj) { - if (Object.hasOwn(obj, i)) { + if (Object.prototype.hasOwnProperty.call(obj, i)) { result.push( `${convertType(i, indent)} => ${convertType(obj[i], `${indent}${indent}`, indent)}`, ); diff --git a/src/targets/targets.ts b/src/targets/targets.ts index b931c593f..19966c2d7 100644 --- a/src/targets/targets.ts +++ b/src/targets/targets.ts @@ -83,11 +83,11 @@ export const isTarget = (target: Target): target is Target => { throw new Error(`you tried to add a target which is not an object, got type: "${got}"`); } - if (!Object.hasOwn(target, 'info')) { + if (!Object.prototype.hasOwnProperty.call(target, 'info')) { throw new Error('targets must contain an `info` object'); } - if (!Object.hasOwn(target.info, 'key')) { + if (!Object.prototype.hasOwnProperty.call(target.info, 'key')) { throw new Error('targets must have an `info` object with the property `key`'); } @@ -95,11 +95,11 @@ export const isTarget = (target: Target): target is Target => { throw new Error('target key must be a unique string'); } - if (Object.hasOwn(targets, target.info.key)) { + if (Object.prototype.hasOwnProperty.call(targets, target.info.key)) { throw new Error(`a target already exists with this key, \`${target.info.key}\``); } - if (!Object.hasOwn(target.info, 'title')) { + if (!Object.prototype.hasOwnProperty.call(target.info, 'title')) { throw new Error('targets must have an `info` object with the property `title`'); } @@ -107,12 +107,12 @@ export const isTarget = (target: Target): target is Target => { throw new Error('target title must be a non-zero-length string'); } - if (!Object.hasOwn(target.info, 'extname')) { + if (!Object.prototype.hasOwnProperty.call(target.info, 'extname')) { throw new Error('targets must have an `info` object with the property `extname`'); } if ( - !Object.hasOwn(target, 'clientsById') || + !Object.prototype.hasOwnProperty.call(target, 'clientsById') || !target.clientsById || Object.keys(target.clientsById).length === 0 ) { @@ -121,11 +121,11 @@ export const isTarget = (target: Target): target is Target => { ); } - if (!Object.hasOwn(target.info, 'default')) { + if (!Object.prototype.hasOwnProperty.call(target.info, 'default')) { throw new Error('targets must have an `info` object with the property `default`'); } - if (!Object.hasOwn(target.clientsById, target.info.default)) { + if (!Object.prototype.hasOwnProperty.call(target.clientsById, target.info.default)) { throw new Error( `target ${target.info.key} is configured with a default client ${ target.info.default @@ -152,11 +152,11 @@ export const isClient = (client: Client): client is Client => { throw new Error('clients must be objects'); } - if (!Object.hasOwn(client, 'info')) { + if (!Object.prototype.hasOwnProperty.call(client, 'info')) { throw new Error('targets client must contain an `info` object'); } - if (!Object.hasOwn(client.info, 'key')) { + if (!Object.prototype.hasOwnProperty.call(client.info, 'key')) { throw new Error('targets client must have an `info` object with property `key`'); } @@ -164,19 +164,19 @@ export const isClient = (client: Client): client is Client => { throw new Error('client.info.key must contain an identifier unique to this target'); } - if (!Object.hasOwn(client.info, 'title')) { + if (!Object.prototype.hasOwnProperty.call(client.info, 'title')) { throw new Error('targets client must have an `info` object with property `title`'); } - if (!Object.hasOwn(client.info, 'description')) { + if (!Object.prototype.hasOwnProperty.call(client.info, 'description')) { throw new Error('targets client must have an `info` object with property `description`'); } - if (!Object.hasOwn(client.info, 'link')) { + if (!Object.prototype.hasOwnProperty.call(client.info, 'link')) { throw new Error('targets client must have an `info` object with property `link`'); } - if (!Object.hasOwn(client, 'convert') || typeof client.convert !== 'function') { + if (!Object.prototype.hasOwnProperty.call(client, 'convert') || typeof client.convert !== 'function') { throw new Error( 'targets client must have a `convert` property containing a conversion function', ); @@ -190,11 +190,11 @@ export const addTargetClient = (targetId: TargetId, client: Client) => { return; } - if (!Object.hasOwn(targets, targetId)) { + if (!Object.prototype.hasOwnProperty.call(targets, targetId)) { throw new Error(`Sorry, but no ${targetId} target exists to add clients to`); } - if (Object.hasOwn(targets[targetId], client.info.key)) { + if (Object.prototype.hasOwnProperty.call(targets[targetId], client.info.key)) { throw new Error( `the target ${targetId} already has a client with the key ${client.info.key}, please use a different key`, ); From f64080d7d5057b2df9d4223839e001ca8009afa5 Mon Sep 17 00:00:00 2001 From: Jon Ursenbach Date: Fri, 13 May 2022 12:18:59 -0700 Subject: [PATCH 04/12] fix: typo in the httpie `style` option not being correctly applied (#254) Co-authored-by: Dimitri Mitropoulos --- src/targets/shell/httpie/client.test.ts | 12 ++++++------ src/targets/shell/httpie/client.ts | 2 +- src/targets/shell/httpie/fixtures/long-flags.sh | 2 +- src/targets/shell/httpie/fixtures/short-flags.sh | 2 +- src/targets/targets.ts | 5 ++++- 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/targets/shell/httpie/client.test.ts b/src/targets/shell/httpie/client.test.ts index a33e9e937..82e2c8970 100644 --- a/src/targets/shell/httpie/client.test.ts +++ b/src/targets/shell/httpie/client.test.ts @@ -24,12 +24,12 @@ runCustomFixtures({ headers: true, indent: false, pretty: 'x', - print: 'x', + print: 'y', short: true, - style: 'x', + style: 'z', timeout: 1, verbose: true, - verify: 'x', + verify: 'v', }, expected: 'short-flags.sh', }, @@ -42,11 +42,11 @@ runCustomFixtures({ headers: true, indent: false, pretty: 'x', - print: 'x', - style: 'x', + print: 'y', + style: 'z', timeout: 1, verbose: true, - verify: 'x', + verify: 'v', }, expected: 'long-flags.sh', }, diff --git a/src/targets/shell/httpie/client.ts b/src/targets/shell/httpie/client.ts index ff8915951..bafaab632 100644 --- a/src/targets/shell/httpie/client.ts +++ b/src/targets/shell/httpie/client.ts @@ -88,7 +88,7 @@ export const httpie: Client = { } if (opts.style) { - flags.push(`--style=${opts.pretty}`); + flags.push(`--style=${opts.style}`); } if (opts.timeout) { diff --git a/src/targets/shell/httpie/fixtures/long-flags.sh b/src/targets/shell/httpie/fixtures/long-flags.sh index f5cec2613..85982d81a 100644 --- a/src/targets/shell/httpie/fixtures/long-flags.sh +++ b/src/targets/shell/httpie/fixtures/long-flags.sh @@ -1 +1 @@ -http --headers --body --verbose --print=x --verify=x --cert=foo --pretty=x --style=x --timeout=1 GET http://mockbin.com/har \ No newline at end of file +http --headers --body --verbose --print=y --verify=v --cert=foo --pretty=x --style=z --timeout=1 GET http://mockbin.com/har \ No newline at end of file diff --git a/src/targets/shell/httpie/fixtures/short-flags.sh b/src/targets/shell/httpie/fixtures/short-flags.sh index 74ddb247d..6fa3d3054 100644 --- a/src/targets/shell/httpie/fixtures/short-flags.sh +++ b/src/targets/shell/httpie/fixtures/short-flags.sh @@ -1 +1 @@ -http -h -b -v -p=x --verify=x --cert=foo --pretty=x --style=x --timeout=1 GET http://mockbin.com/har \ No newline at end of file +http -h -b -v -p=y --verify=v --cert=foo --pretty=x --style=z --timeout=1 GET http://mockbin.com/har \ No newline at end of file diff --git a/src/targets/targets.ts b/src/targets/targets.ts index 19966c2d7..c2215d5ec 100644 --- a/src/targets/targets.ts +++ b/src/targets/targets.ts @@ -176,7 +176,10 @@ export const isClient = (client: Client): client is Client => { throw new Error('targets client must have an `info` object with property `link`'); } - if (!Object.prototype.hasOwnProperty.call(client, 'convert') || typeof client.convert !== 'function') { + if ( + !Object.prototype.hasOwnProperty.call(client, 'convert') || + typeof client.convert !== 'function' + ) { throw new Error( 'targets client must have a `convert` property containing a conversion function', ); From cd4bb4c4290c068cdfefb571dd85e268540e8bd6 Mon Sep 17 00:00:00 2001 From: Jon Ursenbach Date: Thu, 19 May 2022 16:31:37 -0700 Subject: [PATCH 05/12] fix: axios targets not sending `x-www-form-urlencoded` properly (#255) Co-authored-by: Dimitri Mitropoulos --- src/helpers/code-builder.test.ts | 21 +++++++++++++++ src/helpers/code-builder.ts | 22 ++++++++++++++-- src/targets/javascript/axios/client.ts | 15 +++++++++-- .../fixtures/application-form-encoded.js | 6 ++++- src/targets/javascript/axios/fixtures/full.js | 5 +++- src/targets/node/axios/client.ts | 26 ++++++++++++++----- .../fixtures/application-form-encoded.js | 11 +++++--- .../node/axios/fixtures/application-json.js | 4 +-- src/targets/node/axios/fixtures/cookies.js | 4 +-- .../node/axios/fixtures/custom-method.js | 4 +-- src/targets/node/axios/fixtures/full.js | 10 ++++--- src/targets/node/axios/fixtures/headers.js | 4 +-- src/targets/node/axios/fixtures/https.js | 4 +-- .../node/axios/fixtures/jsonObj-multiline.js | 4 +-- .../node/axios/fixtures/jsonObj-null-value.js | 4 +-- .../node/axios/fixtures/multipart-data.js | 4 +-- .../node/axios/fixtures/multipart-file.js | 4 +-- .../fixtures/multipart-form-data-no-params.js | 4 +-- .../axios/fixtures/multipart-form-data.js | 4 +-- src/targets/node/axios/fixtures/nested.js | 4 +-- src/targets/node/axios/fixtures/query.js | 4 +-- src/targets/node/axios/fixtures/short.js | 4 +-- src/targets/node/axios/fixtures/text-plain.js | 4 +-- src/targets/node/unirest/client.ts | 9 +++++-- 24 files changed, 135 insertions(+), 50 deletions(-) diff --git a/src/helpers/code-builder.test.ts b/src/helpers/code-builder.test.ts index 0873da4c2..c0e1e9835 100644 --- a/src/helpers/code-builder.test.ts +++ b/src/helpers/code-builder.test.ts @@ -18,4 +18,25 @@ describe('codeBuilder', () => { expect(result).toBe(`${indent.repeat(2)}${line}`); }); }); + + describe('addPostProcessor', () => { + it('replaces accordingly with one replacer', () => { + const indent = '\t'; + const { join, addPostProcessor, push } = new CodeBuilder({ indent }); + push('console.log("hello world")'); + addPostProcessor(code => code.replace(/console/, 'REPLACED')); + + expect(join()).toBe('REPLACED.log("hello world")'); + }); + + it('replaces accordingly with multiple replacers', () => { + const indent = '\t'; + const { join, addPostProcessor, push } = new CodeBuilder({ indent }); + push('console.log("hello world")'); + addPostProcessor(code => code.replace(/world/, 'nurse!!')); + addPostProcessor(code => code.toUpperCase()); + + expect(join()).toBe('CONSOLE.LOG("HELLO NURSE!!")'); + }); + }); }); diff --git a/src/helpers/code-builder.ts b/src/helpers/code-builder.ts index 65e5917ea..fe75ea52c 100644 --- a/src/helpers/code-builder.ts +++ b/src/helpers/code-builder.ts @@ -1,6 +1,8 @@ const DEFAULT_INDENTATION_CHARACTER = ''; const DEFAULT_LINE_JOIN = '\n'; +export type PostProcessor = (unreplacedCode: string) => string; + export interface CodeBuilderOptions { /** * Desired indentation character for aggregated lines of code @@ -16,6 +18,7 @@ export interface CodeBuilderOptions { } export class CodeBuilder { + postProcessors: PostProcessor[] = []; code: string[] = []; indentationCharacter: string = DEFAULT_INDENTATION_CHARACTER; lineJoin = DEFAULT_LINE_JOIN; @@ -61,7 +64,22 @@ export class CodeBuilder { }; /** - * Concatenate all current lines using the given lineJoin + * Concatenate all current lines using the given lineJoin, then apply any replacers that may have been added + */ + join = () => { + const unreplacedCode = this.code.join(this.lineJoin); + const replacedOutput = this.postProcessors.reduce( + (accumulator, replacer) => replacer(accumulator), + unreplacedCode, + ); + return replacedOutput; + }; + + /** + * Often when writing modules you may wish to add a literal tag or bit of metadata that you wish to transform after other processing as a final step. + * To do so, you can provide a PostProcessor function and it will be run automatically for you when you call `join()` later on. */ - join = () => this.code.join(this.lineJoin); + addPostProcessor = (postProcessor: PostProcessor) => { + this.postProcessors = [...this.postProcessors, postProcessor]; + }; } diff --git a/src/targets/javascript/axios/client.ts b/src/targets/javascript/axios/client.ts index a8110889a..17808cc6c 100644 --- a/src/targets/javascript/axios/client.ts +++ b/src/targets/javascript/axios/client.ts @@ -26,7 +26,7 @@ export const axios: Client = { ...options, }; - const { blank, push, join } = new CodeBuilder({ indent: opts.indent }); + const { blank, push, join, addPostProcessor } = new CodeBuilder({ indent: opts.indent }); push("import axios from 'axios';"); blank(); @@ -46,7 +46,18 @@ export const axios: Client = { switch (postData.mimeType) { case 'application/x-www-form-urlencoded': - requestOptions.data = postData.paramsObj; + if (postData.params) { + push('const encodedParams = new URLSearchParams();'); + postData.params.forEach(param => { + push(`encodedParams.set('${param.name}', '${param.value}');`); + }); + + blank(); + + requestOptions.data = 'encodedParams,'; + addPostProcessor(code => code.replace(/'encodedParams,'/, 'encodedParams,')); + } + break; case 'application/json': diff --git a/src/targets/javascript/axios/fixtures/application-form-encoded.js b/src/targets/javascript/axios/fixtures/application-form-encoded.js index 881d2e2e6..66f566a49 100644 --- a/src/targets/javascript/axios/fixtures/application-form-encoded.js +++ b/src/targets/javascript/axios/fixtures/application-form-encoded.js @@ -1,10 +1,14 @@ import axios from 'axios'; +const encodedParams = new URLSearchParams(); +encodedParams.set('foo', 'bar'); +encodedParams.set('hello', 'world'); + const options = { method: 'POST', url: 'http://mockbin.com/har', headers: {'content-type': 'application/x-www-form-urlencoded'}, - data: {foo: 'bar', hello: 'world'} + data: encodedParams, }; axios diff --git a/src/targets/javascript/axios/fixtures/full.js b/src/targets/javascript/axios/fixtures/full.js index 0f81f5042..a3e41e89b 100644 --- a/src/targets/javascript/axios/fixtures/full.js +++ b/src/targets/javascript/axios/fixtures/full.js @@ -1,5 +1,8 @@ import axios from 'axios'; +const encodedParams = new URLSearchParams(); +encodedParams.set('foo', 'bar'); + const options = { method: 'POST', url: 'http://mockbin.com/har', @@ -9,7 +12,7 @@ const options = { accept: 'application/json', 'content-type': 'application/x-www-form-urlencoded' }, - data: {foo: 'bar'} + data: encodedParams, }; axios diff --git a/src/targets/node/axios/client.ts b/src/targets/node/axios/client.ts index 447f86d00..213232861 100644 --- a/src/targets/node/axios/client.ts +++ b/src/targets/node/axios/client.ts @@ -25,11 +25,9 @@ export const axios: Client = { indent: ' ', ...options, }; + const { blank, join, push, addPostProcessor } = new CodeBuilder({ indent: opts.indent }); - const { blank, join, push } = new CodeBuilder({ indent: opts.indent }); - - push("var axios = require('axios').default;"); - blank(); + push("const axios = require('axios').default;"); const reqOpts: Record = { method, @@ -46,23 +44,39 @@ export const axios: Client = { switch (postData.mimeType) { case 'application/x-www-form-urlencoded': - reqOpts.data = postData.paramsObj; + if (postData.params) { + push("const { URLSearchParams } = require('url');"); + blank(); + + push('const encodedParams = new URLSearchParams();'); + postData.params.forEach(param => { + push(`encodedParams.set('${param.name}', '${param.value}');`); + }); + + blank(); + + reqOpts.data = 'encodedParams,'; + addPostProcessor(code => code.replace(/'encodedParams,'/, 'encodedParams,')); + } + break; case 'application/json': + blank(); if (postData.jsonObj) { reqOpts.data = postData.jsonObj; } break; default: + blank(); if (postData.text) { reqOpts.data = postData.text; } } const stringifiedOptions = stringifyObject(reqOpts, { indent: ' ', inlineCharacterLimit: 80 }); - push(`var options = ${stringifiedOptions};`); + push(`const options = ${stringifiedOptions};`); blank(); push('axios'); diff --git a/src/targets/node/axios/fixtures/application-form-encoded.js b/src/targets/node/axios/fixtures/application-form-encoded.js index f3c3f7b8c..6b51a1ce0 100644 --- a/src/targets/node/axios/fixtures/application-form-encoded.js +++ b/src/targets/node/axios/fixtures/application-form-encoded.js @@ -1,10 +1,15 @@ -var axios = require('axios').default; +const axios = require('axios').default; +const { URLSearchParams } = require('url'); -var options = { +const encodedParams = new URLSearchParams(); +encodedParams.set('foo', 'bar'); +encodedParams.set('hello', 'world'); + +const options = { method: 'POST', url: 'http://mockbin.com/har', headers: {'content-type': 'application/x-www-form-urlencoded'}, - data: {foo: 'bar', hello: 'world'} + data: encodedParams, }; axios diff --git a/src/targets/node/axios/fixtures/application-json.js b/src/targets/node/axios/fixtures/application-json.js index 21537a2ec..0a462fc3e 100644 --- a/src/targets/node/axios/fixtures/application-json.js +++ b/src/targets/node/axios/fixtures/application-json.js @@ -1,6 +1,6 @@ -var axios = require('axios').default; +const axios = require('axios').default; -var options = { +const options = { method: 'POST', url: 'http://mockbin.com/har', headers: {'content-type': 'application/json'}, diff --git a/src/targets/node/axios/fixtures/cookies.js b/src/targets/node/axios/fixtures/cookies.js index ecd462913..43f63b7e2 100644 --- a/src/targets/node/axios/fixtures/cookies.js +++ b/src/targets/node/axios/fixtures/cookies.js @@ -1,6 +1,6 @@ -var axios = require('axios').default; +const axios = require('axios').default; -var options = { +const options = { method: 'POST', url: 'http://mockbin.com/har', headers: {cookie: 'foo=bar; bar=baz'} diff --git a/src/targets/node/axios/fixtures/custom-method.js b/src/targets/node/axios/fixtures/custom-method.js index 1c9bdbd9e..3b6ca61ec 100644 --- a/src/targets/node/axios/fixtures/custom-method.js +++ b/src/targets/node/axios/fixtures/custom-method.js @@ -1,6 +1,6 @@ -var axios = require('axios').default; +const axios = require('axios').default; -var options = {method: 'PROPFIND', url: 'http://mockbin.com/har'}; +const options = {method: 'PROPFIND', url: 'http://mockbin.com/har'}; axios .request(options) diff --git a/src/targets/node/axios/fixtures/full.js b/src/targets/node/axios/fixtures/full.js index c5ec422f2..7471de767 100644 --- a/src/targets/node/axios/fixtures/full.js +++ b/src/targets/node/axios/fixtures/full.js @@ -1,6 +1,10 @@ -var axios = require('axios').default; +const axios = require('axios').default; +const { URLSearchParams } = require('url'); -var options = { +const encodedParams = new URLSearchParams(); +encodedParams.set('foo', 'bar'); + +const options = { method: 'POST', url: 'http://mockbin.com/har', params: {foo: ['bar', 'baz'], baz: 'abc', key: 'value'}, @@ -9,7 +13,7 @@ var options = { accept: 'application/json', 'content-type': 'application/x-www-form-urlencoded' }, - data: {foo: 'bar'} + data: encodedParams, }; axios diff --git a/src/targets/node/axios/fixtures/headers.js b/src/targets/node/axios/fixtures/headers.js index 2cda7bca6..3f1b28fac 100644 --- a/src/targets/node/axios/fixtures/headers.js +++ b/src/targets/node/axios/fixtures/headers.js @@ -1,6 +1,6 @@ -var axios = require('axios').default; +const axios = require('axios').default; -var options = { +const options = { method: 'GET', url: 'http://mockbin.com/har', headers: {accept: 'application/json', 'x-foo': 'Bar'} diff --git a/src/targets/node/axios/fixtures/https.js b/src/targets/node/axios/fixtures/https.js index 85222520a..f05beced1 100644 --- a/src/targets/node/axios/fixtures/https.js +++ b/src/targets/node/axios/fixtures/https.js @@ -1,6 +1,6 @@ -var axios = require('axios').default; +const axios = require('axios').default; -var options = {method: 'GET', url: 'https://mockbin.com/har'}; +const options = {method: 'GET', url: 'https://mockbin.com/har'}; axios .request(options) diff --git a/src/targets/node/axios/fixtures/jsonObj-multiline.js b/src/targets/node/axios/fixtures/jsonObj-multiline.js index 0f8421245..a2a30ca50 100644 --- a/src/targets/node/axios/fixtures/jsonObj-multiline.js +++ b/src/targets/node/axios/fixtures/jsonObj-multiline.js @@ -1,6 +1,6 @@ -var axios = require('axios').default; +const axios = require('axios').default; -var options = { +const options = { method: 'POST', url: 'http://mockbin.com/har', headers: {'content-type': 'application/json'}, diff --git a/src/targets/node/axios/fixtures/jsonObj-null-value.js b/src/targets/node/axios/fixtures/jsonObj-null-value.js index b2a5b0079..0deead901 100644 --- a/src/targets/node/axios/fixtures/jsonObj-null-value.js +++ b/src/targets/node/axios/fixtures/jsonObj-null-value.js @@ -1,6 +1,6 @@ -var axios = require('axios').default; +const axios = require('axios').default; -var options = { +const options = { method: 'POST', url: 'http://mockbin.com/har', headers: {'content-type': 'application/json'}, diff --git a/src/targets/node/axios/fixtures/multipart-data.js b/src/targets/node/axios/fixtures/multipart-data.js index f404bd482..8be5db4f0 100644 --- a/src/targets/node/axios/fixtures/multipart-data.js +++ b/src/targets/node/axios/fixtures/multipart-data.js @@ -1,6 +1,6 @@ -var axios = require('axios').default; +const axios = require('axios').default; -var options = { +const options = { method: 'POST', url: 'http://mockbin.com/har', headers: {'content-type': 'multipart/form-data; boundary=---011000010111000001101001'}, diff --git a/src/targets/node/axios/fixtures/multipart-file.js b/src/targets/node/axios/fixtures/multipart-file.js index 952c3ffe2..2d5fd9285 100644 --- a/src/targets/node/axios/fixtures/multipart-file.js +++ b/src/targets/node/axios/fixtures/multipart-file.js @@ -1,6 +1,6 @@ -var axios = require('axios').default; +const axios = require('axios').default; -var options = { +const options = { method: 'POST', url: 'http://mockbin.com/har', headers: {'content-type': 'multipart/form-data; boundary=---011000010111000001101001'}, diff --git a/src/targets/node/axios/fixtures/multipart-form-data-no-params.js b/src/targets/node/axios/fixtures/multipart-form-data-no-params.js index 32c6883c9..b6f7276f6 100644 --- a/src/targets/node/axios/fixtures/multipart-form-data-no-params.js +++ b/src/targets/node/axios/fixtures/multipart-form-data-no-params.js @@ -1,6 +1,6 @@ -var axios = require('axios').default; +const axios = require('axios').default; -var options = { +const options = { method: 'POST', url: 'http://mockbin.com/har', headers: {'Content-Type': 'multipart/form-data'} diff --git a/src/targets/node/axios/fixtures/multipart-form-data.js b/src/targets/node/axios/fixtures/multipart-form-data.js index fead63ca8..3b8d90ebc 100644 --- a/src/targets/node/axios/fixtures/multipart-form-data.js +++ b/src/targets/node/axios/fixtures/multipart-form-data.js @@ -1,6 +1,6 @@ -var axios = require('axios').default; +const axios = require('axios').default; -var options = { +const options = { method: 'POST', url: 'http://mockbin.com/har', headers: {'Content-Type': 'multipart/form-data; boundary=---011000010111000001101001'}, diff --git a/src/targets/node/axios/fixtures/nested.js b/src/targets/node/axios/fixtures/nested.js index 40c90c897..9ff992693 100644 --- a/src/targets/node/axios/fixtures/nested.js +++ b/src/targets/node/axios/fixtures/nested.js @@ -1,6 +1,6 @@ -var axios = require('axios').default; +const axios = require('axios').default; -var options = { +const options = { method: 'GET', url: 'http://mockbin.com/har', params: {'foo[bar]': 'baz,zap', fiz: 'buz', key: 'value'} diff --git a/src/targets/node/axios/fixtures/query.js b/src/targets/node/axios/fixtures/query.js index 2e179c485..cd407160a 100644 --- a/src/targets/node/axios/fixtures/query.js +++ b/src/targets/node/axios/fixtures/query.js @@ -1,6 +1,6 @@ -var axios = require('axios').default; +const axios = require('axios').default; -var options = { +const options = { method: 'GET', url: 'http://mockbin.com/har', params: {foo: ['bar', 'baz'], baz: 'abc', key: 'value'} diff --git a/src/targets/node/axios/fixtures/short.js b/src/targets/node/axios/fixtures/short.js index 0ba525826..0a6ddec2e 100644 --- a/src/targets/node/axios/fixtures/short.js +++ b/src/targets/node/axios/fixtures/short.js @@ -1,6 +1,6 @@ -var axios = require('axios').default; +const axios = require('axios').default; -var options = {method: 'GET', url: 'http://mockbin.com/har'}; +const options = {method: 'GET', url: 'http://mockbin.com/har'}; axios .request(options) diff --git a/src/targets/node/axios/fixtures/text-plain.js b/src/targets/node/axios/fixtures/text-plain.js index 348ff885c..fcc8f3266 100644 --- a/src/targets/node/axios/fixtures/text-plain.js +++ b/src/targets/node/axios/fixtures/text-plain.js @@ -1,6 +1,6 @@ -var axios = require('axios').default; +const axios = require('axios').default; -var options = { +const options = { method: 'POST', url: 'http://mockbin.com/har', headers: {'content-type': 'text/plain'}, diff --git a/src/targets/node/unirest/client.ts b/src/targets/node/unirest/client.ts index e17540156..65e58aa37 100644 --- a/src/targets/node/unirest/client.ts +++ b/src/targets/node/unirest/client.ts @@ -27,7 +27,9 @@ export const unirest: Client = { }; let includeFS = false; - const { blank, join, push, unshift } = new CodeBuilder({ indent: opts.indent }); + const { addPostProcessor, blank, join, push, unshift } = new CodeBuilder({ + indent: opts.indent, + }); push("const unirest = require('unirest');"); blank(); @@ -89,6 +91,9 @@ export const unirest: Client = { includeFS = true; part.body = `fs.createReadStream('${param.fileName}')`; + addPostProcessor(code => + code.replace(/'fs\.createReadStream\(\\'(.+)\\'\)'/, "fs.createReadStream('$1')"), + ); } else if (param.value) { part.body = param.value; } @@ -125,6 +130,6 @@ export const unirest: Client = { push('console.log(res.body);', 1); push('});'); - return join().replace(/'fs\.createReadStream\(\\'(.+)\\'\)'/, "fs.createReadStream('$1')"); + return join(); }, }; From 62d158df9a03bfd4af89a00ec6dbb15fce848ab3 Mon Sep 17 00:00:00 2001 From: Jon Ursenbach Date: Thu, 19 May 2022 16:34:28 -0700 Subject: [PATCH 06/12] feat: addition of a PHP target for Guzzle (#253) Co-authored-by: Dimitri Mitropoulos --- src/helpers/__snapshots__/utils.test.ts.snap | 6 + src/targets/php/guzzle/client.ts | 163 ++++++++++++++++++ .../fixtures/application-form-encoded.php | 15 ++ .../php/guzzle/fixtures/application-json.php | 12 ++ src/targets/php/guzzle/fixtures/cookies.php | 11 ++ .../php/guzzle/fixtures/custom-method.php | 7 + src/targets/php/guzzle/fixtures/full.php | 16 ++ src/targets/php/guzzle/fixtures/headers.php | 12 ++ src/targets/php/guzzle/fixtures/https.php | 7 + .../php/guzzle/fixtures/jsonObj-multiline.php | 14 ++ .../guzzle/fixtures/jsonObj-null-value.php | 12 ++ .../php/guzzle/fixtures/multipart-data.php | 18 ++ .../php/guzzle/fixtures/multipart-file.php | 18 ++ .../multipart-form-data-no-params.php | 11 ++ .../guzzle/fixtures/multipart-form-data.php | 14 ++ src/targets/php/guzzle/fixtures/nested.php | 7 + src/targets/php/guzzle/fixtures/query.php | 7 + src/targets/php/guzzle/fixtures/short.php | 7 + .../php/guzzle/fixtures/text-plain.php | 12 ++ src/targets/php/target.ts | 2 + 20 files changed, 371 insertions(+) create mode 100644 src/targets/php/guzzle/client.ts create mode 100644 src/targets/php/guzzle/fixtures/application-form-encoded.php create mode 100644 src/targets/php/guzzle/fixtures/application-json.php create mode 100644 src/targets/php/guzzle/fixtures/cookies.php create mode 100644 src/targets/php/guzzle/fixtures/custom-method.php create mode 100644 src/targets/php/guzzle/fixtures/full.php create mode 100644 src/targets/php/guzzle/fixtures/headers.php create mode 100644 src/targets/php/guzzle/fixtures/https.php create mode 100644 src/targets/php/guzzle/fixtures/jsonObj-multiline.php create mode 100644 src/targets/php/guzzle/fixtures/jsonObj-null-value.php create mode 100644 src/targets/php/guzzle/fixtures/multipart-data.php create mode 100644 src/targets/php/guzzle/fixtures/multipart-file.php create mode 100644 src/targets/php/guzzle/fixtures/multipart-form-data-no-params.php create mode 100644 src/targets/php/guzzle/fixtures/multipart-form-data.php create mode 100644 src/targets/php/guzzle/fixtures/nested.php create mode 100644 src/targets/php/guzzle/fixtures/query.php create mode 100644 src/targets/php/guzzle/fixtures/short.php create mode 100644 src/targets/php/guzzle/fixtures/text-plain.php diff --git a/src/helpers/__snapshots__/utils.test.ts.snap b/src/helpers/__snapshots__/utils.test.ts.snap index 1b0b9e58b..7abba1405 100644 --- a/src/helpers/__snapshots__/utils.test.ts.snap +++ b/src/helpers/__snapshots__/utils.test.ts.snap @@ -230,6 +230,12 @@ Array [ "link": "http://php.net/manual/en/book.curl.php", "title": "cURL", }, + Object { + "description": "PHP with Guzzle", + "key": "guzzle", + "link": "http://docs.guzzlephp.org/en/stable/", + "title": "Guzzle", + }, Object { "description": "PHP with pecl/http v1", "key": "http1", diff --git a/src/targets/php/guzzle/client.ts b/src/targets/php/guzzle/client.ts new file mode 100644 index 000000000..f95433015 --- /dev/null +++ b/src/targets/php/guzzle/client.ts @@ -0,0 +1,163 @@ +/** + * @description + * HTTP code snippet generator for PHP using Guzzle. + * + * @author @RobertoArruda + * @author @erunion + * + * for any questions or issues regarding the generated code snippet, please open an issue mentioning the author. + */ + +import { CodeBuilder } from '../../../helpers/code-builder'; +import { getHeader, getHeaderName, hasHeader } from '../../../helpers/headers'; +import { Client } from '../../targets'; +import { convertType } from '../helpers'; + +export interface GuzzleOptions { + closingTag?: boolean; + indent?: string; + noTags?: boolean; + shortTags?: boolean; +} + +export const guzzle: Client = { + info: { + key: 'guzzle', + title: 'Guzzle', + link: 'http://docs.guzzlephp.org/en/stable/', + description: 'PHP with Guzzle', + }, + convert: ({ postData, fullUrl, method, cookies, headersObj }, options) => { + const opts = { + closingTag: false, + indent: ' ', + noTags: false, + shortTags: false, + ...options, + }; + + const { push, blank, join } = new CodeBuilder({ indent: opts.indent }); + const { + code: requestCode, + push: requestPush, + join: requestJoin, + } = new CodeBuilder({ indent: opts.indent }); + + if (!opts.noTags) { + push(opts.shortTags ? ' ${convertType( + postData.paramsObj, + opts.indent + opts.indent, + opts.indent, + )},`, + 1, + ); + break; + + case 'multipart/form-data': { + type MultipartField = { + name: string; + filename?: string; + contents: string | undefined; + headers?: Record; + }; + + const fields: MultipartField[] = []; + + if (postData.params) { + postData.params.forEach(function (param) { + if (param.fileName) { + const field: MultipartField = { + name: param.name, + filename: param.fileName, + contents: param.value, + }; + + if (param.contentType) { + field.headers = { 'Content-Type': param.contentType }; + } + + fields.push(field); + } else if (param.value) { + fields.push({ + name: param.name, + contents: param.value, + }); + } + }); + } + + if (fields.length) { + requestPush( + `'multipart' => ${convertType(fields, opts.indent + opts.indent, opts.indent)}`, + 1, + ); + + // Guzzle adds its own boundary for multipart requests. + if (hasHeader(headersObj, 'content-type')) { + if (getHeader(headersObj, 'content-type')?.indexOf('boundary')) { + const headerName = getHeaderName(headersObj, 'content-type'); + if (headerName) { + delete headersObj[headerName]; + } + } + } + } + break; + } + + default: + if (postData.text) { + requestPush(`'body' => ${convertType(postData.text)},`, 1); + } + } + + // construct headers + const headers = Object.keys(headersObj) + .sort() + .map(function (key) { + return `${opts.indent}${opts.indent}'${key}' => '${headersObj[key]}',`; + }); + + // construct cookies + const cookieString = cookies + .map(cookie => `${encodeURIComponent(cookie.name)}=${encodeURIComponent(cookie.value)}`) + .join('; '); + if (cookieString.length) { + headers.push(`${opts.indent}${opts.indent}'cookie' => '${cookieString}',`); + } + + if (headers.length) { + requestPush("'headers' => [", 1); + requestPush(headers.join('\n')); + requestPush('],', 1); + } + + push('$client = new \\GuzzleHttp\\Client();'); + blank(); + + if (requestCode.length) { + push(`$response = $client->request('${method}', '${fullUrl}', [`); + push(requestJoin()); + push(']);'); + } else { + push(`$response = $client->request('${method}', '${fullUrl}');`); + } + + blank(); + push('echo $response->getBody();'); + + if (!opts.noTags && opts.closingTag) { + blank(); + push('?>'); + } + + return join(); + }, +}; diff --git a/src/targets/php/guzzle/fixtures/application-form-encoded.php b/src/targets/php/guzzle/fixtures/application-form-encoded.php new file mode 100644 index 000000000..a75557086 --- /dev/null +++ b/src/targets/php/guzzle/fixtures/application-form-encoded.php @@ -0,0 +1,15 @@ +request('POST', 'http://mockbin.com/har', [ + 'form_params' => [ + 'foo' => 'bar', + 'hello' => 'world' + ], + 'headers' => [ + 'content-type' => 'application/x-www-form-urlencoded', + ], +]); + +echo $response->getBody(); \ No newline at end of file diff --git a/src/targets/php/guzzle/fixtures/application-json.php b/src/targets/php/guzzle/fixtures/application-json.php new file mode 100644 index 000000000..9d3b919af --- /dev/null +++ b/src/targets/php/guzzle/fixtures/application-json.php @@ -0,0 +1,12 @@ +request('POST', 'http://mockbin.com/har', [ + 'body' => '{"number":1,"string":"f\\"oo","arr":[1,2,3],"nested":{"a":"b"},"arr_mix":[1,"a",{"arr_mix_nested":{}}],"boolean":false}', + 'headers' => [ + 'content-type' => 'application/json', + ], +]); + +echo $response->getBody(); \ No newline at end of file diff --git a/src/targets/php/guzzle/fixtures/cookies.php b/src/targets/php/guzzle/fixtures/cookies.php new file mode 100644 index 000000000..3457528e2 --- /dev/null +++ b/src/targets/php/guzzle/fixtures/cookies.php @@ -0,0 +1,11 @@ +request('POST', 'http://mockbin.com/har', [ + 'headers' => [ + 'cookie' => 'foo=bar; bar=baz', + ], +]); + +echo $response->getBody(); \ No newline at end of file diff --git a/src/targets/php/guzzle/fixtures/custom-method.php b/src/targets/php/guzzle/fixtures/custom-method.php new file mode 100644 index 000000000..c6a3c1746 --- /dev/null +++ b/src/targets/php/guzzle/fixtures/custom-method.php @@ -0,0 +1,7 @@ +request('PROPFIND', 'http://mockbin.com/har'); + +echo $response->getBody(); \ No newline at end of file diff --git a/src/targets/php/guzzle/fixtures/full.php b/src/targets/php/guzzle/fixtures/full.php new file mode 100644 index 000000000..d472ec4e6 --- /dev/null +++ b/src/targets/php/guzzle/fixtures/full.php @@ -0,0 +1,16 @@ +request('POST', 'http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value', [ + 'form_params' => [ + 'foo' => 'bar' + ], + 'headers' => [ + 'accept' => 'application/json', + 'content-type' => 'application/x-www-form-urlencoded', + 'cookie' => 'foo=bar; bar=baz', + ], +]); + +echo $response->getBody(); \ No newline at end of file diff --git a/src/targets/php/guzzle/fixtures/headers.php b/src/targets/php/guzzle/fixtures/headers.php new file mode 100644 index 000000000..4def889e1 --- /dev/null +++ b/src/targets/php/guzzle/fixtures/headers.php @@ -0,0 +1,12 @@ +request('GET', 'http://mockbin.com/har', [ + 'headers' => [ + 'accept' => 'application/json', + 'x-foo' => 'Bar', + ], +]); + +echo $response->getBody(); \ No newline at end of file diff --git a/src/targets/php/guzzle/fixtures/https.php b/src/targets/php/guzzle/fixtures/https.php new file mode 100644 index 000000000..ce2d9a6ac --- /dev/null +++ b/src/targets/php/guzzle/fixtures/https.php @@ -0,0 +1,7 @@ +request('GET', 'https://mockbin.com/har'); + +echo $response->getBody(); \ No newline at end of file diff --git a/src/targets/php/guzzle/fixtures/jsonObj-multiline.php b/src/targets/php/guzzle/fixtures/jsonObj-multiline.php new file mode 100644 index 000000000..7b3ba0844 --- /dev/null +++ b/src/targets/php/guzzle/fixtures/jsonObj-multiline.php @@ -0,0 +1,14 @@ +request('POST', 'http://mockbin.com/har', [ + 'body' => '{ + "foo": "bar" +}', + 'headers' => [ + 'content-type' => 'application/json', + ], +]); + +echo $response->getBody(); \ No newline at end of file diff --git a/src/targets/php/guzzle/fixtures/jsonObj-null-value.php b/src/targets/php/guzzle/fixtures/jsonObj-null-value.php new file mode 100644 index 000000000..f75a5fbe2 --- /dev/null +++ b/src/targets/php/guzzle/fixtures/jsonObj-null-value.php @@ -0,0 +1,12 @@ +request('POST', 'http://mockbin.com/har', [ + 'body' => '{"foo":null}', + 'headers' => [ + 'content-type' => 'application/json', + ], +]); + +echo $response->getBody(); \ No newline at end of file diff --git a/src/targets/php/guzzle/fixtures/multipart-data.php b/src/targets/php/guzzle/fixtures/multipart-data.php new file mode 100644 index 000000000..cc19fe550 --- /dev/null +++ b/src/targets/php/guzzle/fixtures/multipart-data.php @@ -0,0 +1,18 @@ +request('POST', 'http://mockbin.com/har', [ + 'multipart' => [ + [ + 'name' => 'foo', + 'filename' => 'hello.txt', + 'contents' => 'Hello World', + 'headers' => [ + 'Content-Type' => 'text/plain' + ] + ] + ] +]); + +echo $response->getBody(); \ No newline at end of file diff --git a/src/targets/php/guzzle/fixtures/multipart-file.php b/src/targets/php/guzzle/fixtures/multipart-file.php new file mode 100644 index 000000000..ba3fb9617 --- /dev/null +++ b/src/targets/php/guzzle/fixtures/multipart-file.php @@ -0,0 +1,18 @@ +request('POST', 'http://mockbin.com/har', [ + 'multipart' => [ + [ + 'name' => 'foo', + 'filename' => 'test/fixtures/files/hello.txt', + 'contents' => null, + 'headers' => [ + 'Content-Type' => 'text/plain' + ] + ] + ] +]); + +echo $response->getBody(); \ No newline at end of file diff --git a/src/targets/php/guzzle/fixtures/multipart-form-data-no-params.php b/src/targets/php/guzzle/fixtures/multipart-form-data-no-params.php new file mode 100644 index 000000000..7af4780d6 --- /dev/null +++ b/src/targets/php/guzzle/fixtures/multipart-form-data-no-params.php @@ -0,0 +1,11 @@ +request('POST', 'http://mockbin.com/har', [ + 'headers' => [ + 'Content-Type' => 'multipart/form-data', + ], +]); + +echo $response->getBody(); \ No newline at end of file diff --git a/src/targets/php/guzzle/fixtures/multipart-form-data.php b/src/targets/php/guzzle/fixtures/multipart-form-data.php new file mode 100644 index 000000000..cb6ed3cfc --- /dev/null +++ b/src/targets/php/guzzle/fixtures/multipart-form-data.php @@ -0,0 +1,14 @@ +request('POST', 'http://mockbin.com/har', [ + 'multipart' => [ + [ + 'name' => 'foo', + 'contents' => 'bar' + ] + ] +]); + +echo $response->getBody(); \ No newline at end of file diff --git a/src/targets/php/guzzle/fixtures/nested.php b/src/targets/php/guzzle/fixtures/nested.php new file mode 100644 index 000000000..00429e831 --- /dev/null +++ b/src/targets/php/guzzle/fixtures/nested.php @@ -0,0 +1,7 @@ +request('GET', 'http://mockbin.com/har?foo%5Bbar%5D=baz%2Czap&fiz=buz&key=value'); + +echo $response->getBody(); \ No newline at end of file diff --git a/src/targets/php/guzzle/fixtures/query.php b/src/targets/php/guzzle/fixtures/query.php new file mode 100644 index 000000000..7232b94da --- /dev/null +++ b/src/targets/php/guzzle/fixtures/query.php @@ -0,0 +1,7 @@ +request('GET', 'http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value'); + +echo $response->getBody(); \ No newline at end of file diff --git a/src/targets/php/guzzle/fixtures/short.php b/src/targets/php/guzzle/fixtures/short.php new file mode 100644 index 000000000..70b60e246 --- /dev/null +++ b/src/targets/php/guzzle/fixtures/short.php @@ -0,0 +1,7 @@ +request('GET', 'http://mockbin.com/har'); + +echo $response->getBody(); \ No newline at end of file diff --git a/src/targets/php/guzzle/fixtures/text-plain.php b/src/targets/php/guzzle/fixtures/text-plain.php new file mode 100644 index 000000000..d27c6745c --- /dev/null +++ b/src/targets/php/guzzle/fixtures/text-plain.php @@ -0,0 +1,12 @@ +request('POST', 'http://mockbin.com/har', [ + 'body' => 'Hello World', + 'headers' => [ + 'content-type' => 'text/plain', + ], +]); + +echo $response->getBody(); \ No newline at end of file diff --git a/src/targets/php/target.ts b/src/targets/php/target.ts index 67ff01719..3ec1bcff7 100644 --- a/src/targets/php/target.ts +++ b/src/targets/php/target.ts @@ -1,5 +1,6 @@ import { Target } from '../targets'; import { curl } from './curl/client'; +import { guzzle } from './guzzle/client'; import { http1 } from './http1/client'; import { http2 } from './http2/client'; @@ -12,6 +13,7 @@ export const php: Target = { }, clientsById: { curl, + guzzle, http1, http2, }, From 0e0728a498029d1510403b8c19aebaf455f7ac3e Mon Sep 17 00:00:00 2001 From: Filipe Freire Date: Fri, 20 May 2022 14:12:39 +0100 Subject: [PATCH 07/12] Add Github Build Workflow (#250) (#251) * Add Github Build Workflow (#250) * Edit job name * Replace install with ci on GH workflow * Add matrix with major node versions (14, 16, 18) * Disable fail-fast * Remove node v14 from build GH action --- .github/workflows/build.yml | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 000000000..5bb54258e --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,33 @@ +name: Build + +on: + push: + workflow_dispatch: + +jobs: + build: + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + node-version: [16, 18] + steps: + - name: Checkout branch + uses: actions/checkout@v3 + + - name: Setup Node + uses: actions/setup-node@v3 + with: + node-version: ${{ matrix.node-version }} + + - name: Install + run: npm ci + + - name: Test + run: npm run test + + - name: Lint + run: npm run lint + + - name: Build + run: npm run build From 411844f16d452d041e741f5c8fb5e3927699a8c4 Mon Sep 17 00:00:00 2001 From: Jon Ursenbach Date: Mon, 23 May 2022 15:08:47 -0700 Subject: [PATCH 08/12] feat: native upload support in python `requests` snippets (#259) Co-authored-by: Dimitri Mitropoulos --- src/fixtures/requests/multipart-data.json | 4 ++ .../c/libcurl/fixtures/multipart-data.c | 2 +- .../clj_http/fixtures/multipart-data.clj | 3 +- .../httpclient/fixtures/multipart-data.cs | 10 ++++ .../restsharp/fixtures/multipart-data.cs | 2 +- .../go/native/fixtures/multipart-data.go | 2 +- .../http/http1.1/fixtures/multipart-data | 6 +- .../asynchttp/fixtures/multipart-data.java | 2 +- .../java/nethttp/fixtures/multipart-data.java | 2 +- .../java/okhttp/fixtures/multipart-data.java | 2 +- .../java/unirest/fixtures/multipart-data.java | 2 +- .../axios/fixtures/multipart-data.js | 1 + .../fetch/fixtures/multipart-data.js | 1 + .../jquery/fixtures/multipart-data.js | 1 + .../javascript/xhr/fixtures/multipart-data.js | 1 + .../kotlin/okhttp/fixtures/multipart-data.kt | 2 +- .../node/axios/fixtures/multipart-data.js | 2 +- .../node/fetch/fixtures/multipart-data.js | 1 + .../node/native/fixtures/multipart-data.js | 2 +- .../node/request/fixtures/multipart-data.js | 3 +- .../node/unirest/fixtures/multipart-data.js | 3 + .../nsurlsession/fixtures/multipart-data.m | 3 +- .../ocaml/cohttp/fixtures/multipart-data.ml | 2 +- .../php/curl/fixtures/multipart-data.php | 2 +- .../php/guzzle/fixtures/multipart-data.php | 4 ++ .../php/http1/fixtures/multipart-data.php | 4 ++ .../php/http2/fixtures/multipart-data.php | 4 +- .../restmethod/fixtures/multipart-data.ps1 | 4 ++ .../webrequest/fixtures/multipart-data.ps1 | 4 ++ .../python/python3/fixtures/multipart-data.py | 2 +- src/targets/python/requests/client.ts | 57 ++++++++++++++++++- .../requests/fixtures/multipart-data.py | 6 +- .../requests/fixtures/multipart-file.py | 5 +- .../fixtures/multipart-form-data-no-params.py | 3 +- src/targets/r/httr/fixtures/multipart-data.r | 2 +- .../ruby/native/fixtures/multipart-data.rb | 2 +- .../shell/curl/fixtures/multipart-data.sh | 3 +- .../shell/httpie/fixtures/multipart-data.sh | 4 ++ .../shell/wget/fixtures/multipart-data.sh | 2 +- .../fixtures/multipart-data.swift | 4 ++ 40 files changed, 138 insertions(+), 33 deletions(-) diff --git a/src/fixtures/requests/multipart-data.json b/src/fixtures/requests/multipart-data.json index fb9098fdb..fab81e200 100644 --- a/src/fixtures/requests/multipart-data.json +++ b/src/fixtures/requests/multipart-data.json @@ -15,6 +15,10 @@ "value": "Hello World", "fileName": "hello.txt", "contentType": "text/plain" + }, + { + "name": "bar", + "value": "Bonjour le monde" } ] } diff --git a/src/targets/c/libcurl/fixtures/multipart-data.c b/src/targets/c/libcurl/fixtures/multipart-data.c index ffb4c4277..da668ed2f 100644 --- a/src/targets/c/libcurl/fixtures/multipart-data.c +++ b/src/targets/c/libcurl/fixtures/multipart-data.c @@ -7,6 +7,6 @@ struct curl_slist *headers = NULL; headers = curl_slist_append(headers, "content-type: multipart/form-data; boundary=---011000010111000001101001"); curl_easy_setopt(hnd, CURLOPT_HTTPHEADER, headers); -curl_easy_setopt(hnd, CURLOPT_POSTFIELDS, "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001--\r\n"); +curl_easy_setopt(hnd, CURLOPT_POSTFIELDS, "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"bar\"\r\n\r\nBonjour le monde\r\n-----011000010111000001101001--\r\n"); CURLcode ret = curl_easy_perform(hnd); \ No newline at end of file diff --git a/src/targets/clojure/clj_http/fixtures/multipart-data.clj b/src/targets/clojure/clj_http/fixtures/multipart-data.clj index 4f6136046..2760399b9 100644 --- a/src/targets/clojure/clj_http/fixtures/multipart-data.clj +++ b/src/targets/clojure/clj_http/fixtures/multipart-data.clj @@ -1,4 +1,5 @@ (require '[clj-http.client :as client]) (client/post "http://mockbin.com/har" {:multipart [{:name "foo" - :content "Hello World"}]}) \ No newline at end of file + :content "Hello World"} {:name "bar" + :content "Bonjour le monde"}]}) \ No newline at end of file diff --git a/src/targets/csharp/httpclient/fixtures/multipart-data.cs b/src/targets/csharp/httpclient/fixtures/multipart-data.cs index fc01aae51..bb9f85811 100644 --- a/src/targets/csharp/httpclient/fixtures/multipart-data.cs +++ b/src/targets/csharp/httpclient/fixtures/multipart-data.cs @@ -17,6 +17,16 @@ } } }, + new StringContent("Bonjour le monde") + { + Headers = + { + ContentDisposition = new ContentDispositionHeaderValue("form-data") + { + Name = "bar", + } + } + }, }, }; using (var response = await client.SendAsync(request)) diff --git a/src/targets/csharp/restsharp/fixtures/multipart-data.cs b/src/targets/csharp/restsharp/fixtures/multipart-data.cs index be9d00858..7c95fe632 100644 --- a/src/targets/csharp/restsharp/fixtures/multipart-data.cs +++ b/src/targets/csharp/restsharp/fixtures/multipart-data.cs @@ -1,5 +1,5 @@ var client = new RestClient("http://mockbin.com/har"); var request = new RestRequest(Method.POST); request.AddHeader("content-type", "multipart/form-data; boundary=---011000010111000001101001"); -request.AddParameter("multipart/form-data; boundary=---011000010111000001101001", "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001--\r\n", ParameterType.RequestBody); +request.AddParameter("multipart/form-data; boundary=---011000010111000001101001", "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"bar\"\r\n\r\nBonjour le monde\r\n-----011000010111000001101001--\r\n", ParameterType.RequestBody); IRestResponse response = client.Execute(request); \ No newline at end of file diff --git a/src/targets/go/native/fixtures/multipart-data.go b/src/targets/go/native/fixtures/multipart-data.go index 331e29100..0afcfce13 100644 --- a/src/targets/go/native/fixtures/multipart-data.go +++ b/src/targets/go/native/fixtures/multipart-data.go @@ -11,7 +11,7 @@ func main() { url := "http://mockbin.com/har" - payload := strings.NewReader("-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001--\r\n") + payload := strings.NewReader("-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"bar\"\r\n\r\nBonjour le monde\r\n-----011000010111000001101001--\r\n") req, _ := http.NewRequest("POST", url, payload) diff --git a/src/targets/http/http1.1/fixtures/multipart-data b/src/targets/http/http1.1/fixtures/multipart-data index ba6df27f0..75a8fe3e6 100644 --- a/src/targets/http/http1.1/fixtures/multipart-data +++ b/src/targets/http/http1.1/fixtures/multipart-data @@ -1,11 +1,15 @@ POST /har HTTP/1.1 Content-Type: multipart/form-data; boundary=---011000010111000001101001 Host: mockbin.com -Content-Length: 171 +Content-Length: 266 -----011000010111000001101001 Content-Disposition: form-data; name="foo"; filename="hello.txt" Content-Type: text/plain Hello World +-----011000010111000001101001 +Content-Disposition: form-data; name="bar" + +Bonjour le monde -----011000010111000001101001-- diff --git a/src/targets/java/asynchttp/fixtures/multipart-data.java b/src/targets/java/asynchttp/fixtures/multipart-data.java index 0b5a2bdb1..bdf980ac8 100644 --- a/src/targets/java/asynchttp/fixtures/multipart-data.java +++ b/src/targets/java/asynchttp/fixtures/multipart-data.java @@ -1,7 +1,7 @@ AsyncHttpClient client = new DefaultAsyncHttpClient(); client.prepare("POST", "http://mockbin.com/har") .setHeader("content-type", "multipart/form-data; boundary=---011000010111000001101001") - .setBody("-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001--\r\n") + .setBody("-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"bar\"\r\n\r\nBonjour le monde\r\n-----011000010111000001101001--\r\n") .execute() .toCompletableFuture() .thenAccept(System.out::println) diff --git a/src/targets/java/nethttp/fixtures/multipart-data.java b/src/targets/java/nethttp/fixtures/multipart-data.java index 4f0e49963..0e91fa802 100644 --- a/src/targets/java/nethttp/fixtures/multipart-data.java +++ b/src/targets/java/nethttp/fixtures/multipart-data.java @@ -1,7 +1,7 @@ HttpRequest request = HttpRequest.newBuilder() .uri(URI.create("http://mockbin.com/har")) .header("content-type", "multipart/form-data; boundary=---011000010111000001101001") - .method("POST", HttpRequest.BodyPublishers.ofString("-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001--\r\n")) + .method("POST", HttpRequest.BodyPublishers.ofString("-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"bar\"\r\n\r\nBonjour le monde\r\n-----011000010111000001101001--\r\n")) .build(); HttpResponse response = HttpClient.newHttpClient().send(request, HttpResponse.BodyHandlers.ofString()); System.out.println(response.body()); \ No newline at end of file diff --git a/src/targets/java/okhttp/fixtures/multipart-data.java b/src/targets/java/okhttp/fixtures/multipart-data.java index 143ffa10f..ddf5bbf50 100644 --- a/src/targets/java/okhttp/fixtures/multipart-data.java +++ b/src/targets/java/okhttp/fixtures/multipart-data.java @@ -1,7 +1,7 @@ OkHttpClient client = new OkHttpClient(); MediaType mediaType = MediaType.parse("multipart/form-data; boundary=---011000010111000001101001"); -RequestBody body = RequestBody.create(mediaType, "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001--\r\n"); +RequestBody body = RequestBody.create(mediaType, "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"bar\"\r\n\r\nBonjour le monde\r\n-----011000010111000001101001--\r\n"); Request request = new Request.Builder() .url("http://mockbin.com/har") .post(body) diff --git a/src/targets/java/unirest/fixtures/multipart-data.java b/src/targets/java/unirest/fixtures/multipart-data.java index a714b7920..e3974806f 100644 --- a/src/targets/java/unirest/fixtures/multipart-data.java +++ b/src/targets/java/unirest/fixtures/multipart-data.java @@ -1,4 +1,4 @@ HttpResponse response = Unirest.post("http://mockbin.com/har") .header("content-type", "multipart/form-data; boundary=---011000010111000001101001") - .body("-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001--\r\n") + .body("-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"bar\"\r\n\r\nBonjour le monde\r\n-----011000010111000001101001--\r\n") .asString(); \ No newline at end of file diff --git a/src/targets/javascript/axios/fixtures/multipart-data.js b/src/targets/javascript/axios/fixtures/multipart-data.js index 91febdd7e..2a649a2ad 100644 --- a/src/targets/javascript/axios/fixtures/multipart-data.js +++ b/src/targets/javascript/axios/fixtures/multipart-data.js @@ -2,6 +2,7 @@ import axios from 'axios'; const form = new FormData(); form.append('foo', 'Hello World'); +form.append('bar', 'Bonjour le monde'); const options = { method: 'POST', diff --git a/src/targets/javascript/fetch/fixtures/multipart-data.js b/src/targets/javascript/fetch/fixtures/multipart-data.js index 4b90c4ba2..7e67c6366 100644 --- a/src/targets/javascript/fetch/fixtures/multipart-data.js +++ b/src/targets/javascript/fetch/fixtures/multipart-data.js @@ -1,5 +1,6 @@ const form = new FormData(); form.append('foo', 'Hello World'); +form.append('bar', 'Bonjour le monde'); const options = { method: 'POST', diff --git a/src/targets/javascript/jquery/fixtures/multipart-data.js b/src/targets/javascript/jquery/fixtures/multipart-data.js index 060cd0c7b..c8c181bd0 100644 --- a/src/targets/javascript/jquery/fixtures/multipart-data.js +++ b/src/targets/javascript/jquery/fixtures/multipart-data.js @@ -1,5 +1,6 @@ const form = new FormData(); form.append('foo', 'Hello World'); +form.append('bar', 'Bonjour le monde'); const settings = { async: true, diff --git a/src/targets/javascript/xhr/fixtures/multipart-data.js b/src/targets/javascript/xhr/fixtures/multipart-data.js index f3cbf0686..c0267ce62 100644 --- a/src/targets/javascript/xhr/fixtures/multipart-data.js +++ b/src/targets/javascript/xhr/fixtures/multipart-data.js @@ -1,5 +1,6 @@ const data = new FormData(); data.append('foo', 'Hello World'); +data.append('bar', 'Bonjour le monde'); const xhr = new XMLHttpRequest(); xhr.withCredentials = true; diff --git a/src/targets/kotlin/okhttp/fixtures/multipart-data.kt b/src/targets/kotlin/okhttp/fixtures/multipart-data.kt index 4036b4eac..894182a4c 100644 --- a/src/targets/kotlin/okhttp/fixtures/multipart-data.kt +++ b/src/targets/kotlin/okhttp/fixtures/multipart-data.kt @@ -1,7 +1,7 @@ val client = OkHttpClient() val mediaType = MediaType.parse("multipart/form-data; boundary=---011000010111000001101001") -val body = RequestBody.create(mediaType, "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001--\r\n") +val body = RequestBody.create(mediaType, "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"bar\"\r\n\r\nBonjour le monde\r\n-----011000010111000001101001--\r\n") val request = Request.Builder() .url("http://mockbin.com/har") .post(body) diff --git a/src/targets/node/axios/fixtures/multipart-data.js b/src/targets/node/axios/fixtures/multipart-data.js index 8be5db4f0..f8d47ff31 100644 --- a/src/targets/node/axios/fixtures/multipart-data.js +++ b/src/targets/node/axios/fixtures/multipart-data.js @@ -4,7 +4,7 @@ const options = { method: 'POST', url: 'http://mockbin.com/har', headers: {'content-type': 'multipart/form-data; boundary=---011000010111000001101001'}, - data: '-----011000010111000001101001\r\nContent-Disposition: form-data; name="foo"; filename="hello.txt"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001--\r\n' + data: '-----011000010111000001101001\r\nContent-Disposition: form-data; name="foo"; filename="hello.txt"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001\r\nContent-Disposition: form-data; name="bar"\r\n\r\nBonjour le monde\r\n-----011000010111000001101001--\r\n' }; axios diff --git a/src/targets/node/fetch/fixtures/multipart-data.js b/src/targets/node/fetch/fixtures/multipart-data.js index 2188ecbf0..72896cb02 100644 --- a/src/targets/node/fetch/fixtures/multipart-data.js +++ b/src/targets/node/fetch/fixtures/multipart-data.js @@ -4,6 +4,7 @@ const fetch = require('node-fetch'); const formData = new FormData(); formData.append('foo', fs.createReadStream('hello.txt')); +formData.append('bar', 'Bonjour le monde'); let url = 'http://mockbin.com/har'; diff --git a/src/targets/node/native/fixtures/multipart-data.js b/src/targets/node/native/fixtures/multipart-data.js index 6e95d689f..2006bc081 100644 --- a/src/targets/node/native/fixtures/multipart-data.js +++ b/src/targets/node/native/fixtures/multipart-data.js @@ -23,5 +23,5 @@ const req = http.request(options, function (res) { }); }); -req.write('-----011000010111000001101001\r\nContent-Disposition: form-data; name="foo"; filename="hello.txt"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001--\r\n'); +req.write('-----011000010111000001101001\r\nContent-Disposition: form-data; name="foo"; filename="hello.txt"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001\r\nContent-Disposition: form-data; name="bar"\r\n\r\nBonjour le monde\r\n-----011000010111000001101001--\r\n'); req.end(); \ No newline at end of file diff --git a/src/targets/node/request/fixtures/multipart-data.js b/src/targets/node/request/fixtures/multipart-data.js index e539b607b..ac4998c40 100644 --- a/src/targets/node/request/fixtures/multipart-data.js +++ b/src/targets/node/request/fixtures/multipart-data.js @@ -9,7 +9,8 @@ const options = { foo: { value: fs.createReadStream('hello.txt'), options: {filename: 'hello.txt', contentType: 'text/plain'} - } + }, + bar: 'Bonjour le monde' } }; diff --git a/src/targets/node/unirest/fixtures/multipart-data.js b/src/targets/node/unirest/fixtures/multipart-data.js index 9383b020e..8da614854 100644 --- a/src/targets/node/unirest/fixtures/multipart-data.js +++ b/src/targets/node/unirest/fixtures/multipart-data.js @@ -10,6 +10,9 @@ req.multipart([ { body: 'Hello World', 'content-type': 'text/plain' + }, + { + body: 'Bonjour le monde' } ]); diff --git a/src/targets/objc/nsurlsession/fixtures/multipart-data.m b/src/targets/objc/nsurlsession/fixtures/multipart-data.m index e35ac2217..904d0ecfc 100644 --- a/src/targets/objc/nsurlsession/fixtures/multipart-data.m +++ b/src/targets/objc/nsurlsession/fixtures/multipart-data.m @@ -1,7 +1,8 @@ #import NSDictionary *headers = @{ @"content-type": @"multipart/form-data; boundary=---011000010111000001101001" }; -NSArray *parameters = @[ @{ @"name": @"foo", @"value": @"Hello World", @"fileName": @"hello.txt", @"contentType": @"text/plain" } ]; +NSArray *parameters = @[ @{ @"name": @"foo", @"value": @"Hello World", @"fileName": @"hello.txt", @"contentType": @"text/plain" }, + @{ @"name": @"bar", @"value": @"Bonjour le monde" } ]; NSString *boundary = @"---011000010111000001101001"; NSError *error; diff --git a/src/targets/ocaml/cohttp/fixtures/multipart-data.ml b/src/targets/ocaml/cohttp/fixtures/multipart-data.ml index 4fb843543..0ebb9d0dd 100644 --- a/src/targets/ocaml/cohttp/fixtures/multipart-data.ml +++ b/src/targets/ocaml/cohttp/fixtures/multipart-data.ml @@ -4,7 +4,7 @@ open Lwt let uri = Uri.of_string "http://mockbin.com/har" in let headers = Header.add (Header.init ()) "content-type" "multipart/form-data; boundary=---011000010111000001101001" in -let body = Cohttp_lwt_body.of_string "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001--\r\n" in +let body = Cohttp_lwt_body.of_string "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"bar\"\r\n\r\nBonjour le monde\r\n-----011000010111000001101001--\r\n" in Client.call ~headers ~body `POST uri >>= fun (res, body_stream) -> diff --git a/src/targets/php/curl/fixtures/multipart-data.php b/src/targets/php/curl/fixtures/multipart-data.php index 2a36d5e03..661b8671e 100644 --- a/src/targets/php/curl/fixtures/multipart-data.php +++ b/src/targets/php/curl/fixtures/multipart-data.php @@ -10,7 +10,7 @@ CURLOPT_TIMEOUT => 30, CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1, CURLOPT_CUSTOMREQUEST => "POST", - CURLOPT_POSTFIELDS => "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001--\r\n", + CURLOPT_POSTFIELDS => "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"bar\"\r\n\r\nBonjour le monde\r\n-----011000010111000001101001--\r\n", CURLOPT_HTTPHEADER => [ "content-type: multipart/form-data; boundary=---011000010111000001101001" ], diff --git a/src/targets/php/guzzle/fixtures/multipart-data.php b/src/targets/php/guzzle/fixtures/multipart-data.php index cc19fe550..af1c122a5 100644 --- a/src/targets/php/guzzle/fixtures/multipart-data.php +++ b/src/targets/php/guzzle/fixtures/multipart-data.php @@ -11,6 +11,10 @@ 'headers' => [ 'Content-Type' => 'text/plain' ] + ], + [ + 'name' => 'bar', + 'contents' => 'Bonjour le monde' ] ] ]); diff --git a/src/targets/php/http1/fixtures/multipart-data.php b/src/targets/php/http1/fixtures/multipart-data.php index 9ea486192..f62adf62f 100644 --- a/src/targets/php/http1/fixtures/multipart-data.php +++ b/src/targets/php/http1/fixtures/multipart-data.php @@ -13,6 +13,10 @@ Content-Type: text/plain Hello World +-----011000010111000001101001 +Content-Disposition: form-data; name="bar" + +Bonjour le monde -----011000010111000001101001-- '); diff --git a/src/targets/php/http2/fixtures/multipart-data.php b/src/targets/php/http2/fixtures/multipart-data.php index b8d02cb09..315f0d682 100644 --- a/src/targets/php/http2/fixtures/multipart-data.php +++ b/src/targets/php/http2/fixtures/multipart-data.php @@ -4,7 +4,9 @@ $request = new http\Client\Request; $body = new http\Message\Body; -$body->addForm(null, [ +$body->addForm([ + 'bar' => 'Bonjour le monde' +], [ [ 'name' => 'foo', 'type' => 'text/plain', diff --git a/src/targets/powershell/restmethod/fixtures/multipart-data.ps1 b/src/targets/powershell/restmethod/fixtures/multipart-data.ps1 index 86f8b61b5..4e4d4dcb3 100644 --- a/src/targets/powershell/restmethod/fixtures/multipart-data.ps1 +++ b/src/targets/powershell/restmethod/fixtures/multipart-data.ps1 @@ -5,5 +5,9 @@ Content-Disposition: form-data; name="foo"; filename="hello.txt" Content-Type: text/plain Hello World +-----011000010111000001101001 +Content-Disposition: form-data; name="bar" + +Bonjour le monde -----011000010111000001101001-- ' \ No newline at end of file diff --git a/src/targets/powershell/webrequest/fixtures/multipart-data.ps1 b/src/targets/powershell/webrequest/fixtures/multipart-data.ps1 index 74920571a..be49601e1 100644 --- a/src/targets/powershell/webrequest/fixtures/multipart-data.ps1 +++ b/src/targets/powershell/webrequest/fixtures/multipart-data.ps1 @@ -5,5 +5,9 @@ Content-Disposition: form-data; name="foo"; filename="hello.txt" Content-Type: text/plain Hello World +-----011000010111000001101001 +Content-Disposition: form-data; name="bar" + +Bonjour le monde -----011000010111000001101001-- ' \ No newline at end of file diff --git a/src/targets/python/python3/fixtures/multipart-data.py b/src/targets/python/python3/fixtures/multipart-data.py index 4e17c4a64..f9267cc12 100644 --- a/src/targets/python/python3/fixtures/multipart-data.py +++ b/src/targets/python/python3/fixtures/multipart-data.py @@ -2,7 +2,7 @@ conn = http.client.HTTPConnection("mockbin.com") -payload = "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001--\r\n" +payload = "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"bar\"\r\n\r\nBonjour le monde\r\n-----011000010111000001101001--\r\n" headers = { 'content-type': "multipart/form-data; boundary=---011000010111000001101001" } diff --git a/src/targets/python/requests/client.ts b/src/targets/python/requests/client.ts index 6e4bbfcf4..d4766fbe7 100644 --- a/src/targets/python/requests/client.ts +++ b/src/targets/python/requests/client.ts @@ -9,6 +9,7 @@ */ import { CodeBuilder } from '../../../helpers/code-builder'; +import { getHeaderName } from '../../../helpers/headers'; import { Client } from '../../targets'; import { literalRepresentation } from '../helpers'; @@ -49,7 +50,13 @@ export const requests: Client = { blank(); } + const headers = allHeaders; + // Construct payload + let payload: Record = {}; + const files: Record = {}; + + let hasFiles = false; let hasPayload = false; let jsonPayload = false; switch (postData.mimeType) { @@ -61,6 +68,43 @@ export const requests: Client = { } break; + case 'multipart/form-data': + if (!postData.params) { + break; + } + + payload = {}; + postData.params.forEach(p => { + if (p.fileName) { + files[p.name] = `open('${p.fileName}', 'rb')`; + hasFiles = true; + } else { + payload[p.name] = p.value; + hasPayload = true; + } + }); + + if (hasFiles) { + push(`files = ${literalRepresentation(files, opts)}`); + + if (hasPayload) { + push(`payload = ${literalRepresentation(payload, opts)}`); + } + + // The requests library will only automatically add a `multipart/form-data` header if there are files being sent. If we're **only** sending form data we still need to send the boundary ourselves. + const headerName = getHeaderName(headers, 'content-type'); + if (headerName) { + delete headers[headerName]; + } + } else { + const nonFilePayload = JSON.stringify(postData.text); + if (nonFilePayload) { + push(`payload = ${nonFilePayload}`); + hasPayload = true; + } + } + break; + default: { const payload = JSON.stringify(postData.text); if (payload) { @@ -71,10 +115,12 @@ export const requests: Client = { } // Construct headers - const headers = allHeaders; const headerCount = Object.keys(headers).length; - if (headerCount === 1) { + if (headerCount === 0 && (hasPayload || hasFiles)) { + // If we don't have any heads but we do have a payload we should put a blank line here between that payload consturction and our execution of the requests library. + blank(); + } else if (headerCount === 1) { for (const header in headers) { push(`headers = {"${header}": "${headers[header]}"}`); blank(); @@ -85,11 +131,12 @@ export const requests: Client = { push('headers = {'); for (const header in headers) { - if (count++ !== headerCount) { + if (count !== headerCount) { push(`"${header}": "${headers[header]}",`, 1); } else { push(`"${header}": "${headers[header]}"`, 1); } + count += 1; } push('}'); @@ -107,6 +154,10 @@ export const requests: Client = { } } + if (hasFiles) { + request += ', files=files'; + } + if (headerCount > 0) { request += ', headers=headers'; } diff --git a/src/targets/python/requests/fixtures/multipart-data.py b/src/targets/python/requests/fixtures/multipart-data.py index c0c621921..dced9156f 100644 --- a/src/targets/python/requests/fixtures/multipart-data.py +++ b/src/targets/python/requests/fixtures/multipart-data.py @@ -2,9 +2,9 @@ url = "http://mockbin.com/har" -payload = "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001--\r\n" -headers = {"content-type": "multipart/form-data; boundary=---011000010111000001101001"} +files = {"foo": "open('hello.txt', 'rb')"} +payload = {"bar": "Bonjour le monde"} -response = requests.request("POST", url, data=payload, headers=headers) +response = requests.request("POST", url, data=payload, files=files) print(response.text) \ No newline at end of file diff --git a/src/targets/python/requests/fixtures/multipart-file.py b/src/targets/python/requests/fixtures/multipart-file.py index 769ceccb2..118c6891e 100644 --- a/src/targets/python/requests/fixtures/multipart-file.py +++ b/src/targets/python/requests/fixtures/multipart-file.py @@ -2,9 +2,8 @@ url = "http://mockbin.com/har" -payload = "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\n\r\n-----011000010111000001101001--\r\n" -headers = {"content-type": "multipart/form-data; boundary=---011000010111000001101001"} +files = {"foo": "open('test/fixtures/files/hello.txt', 'rb')"} -response = requests.request("POST", url, data=payload, headers=headers) +response = requests.request("POST", url, files=files) print(response.text) \ No newline at end of file diff --git a/src/targets/python/requests/fixtures/multipart-form-data-no-params.py b/src/targets/python/requests/fixtures/multipart-form-data-no-params.py index 084127252..6ac8dd5f7 100644 --- a/src/targets/python/requests/fixtures/multipart-form-data-no-params.py +++ b/src/targets/python/requests/fixtures/multipart-form-data-no-params.py @@ -2,9 +2,8 @@ url = "http://mockbin.com/har" -payload = "" headers = {"Content-Type": "multipart/form-data"} -response = requests.request("POST", url, data=payload, headers=headers) +response = requests.request("POST", url, headers=headers) print(response.text) \ No newline at end of file diff --git a/src/targets/r/httr/fixtures/multipart-data.r b/src/targets/r/httr/fixtures/multipart-data.r index f52d23e02..ec9a85c01 100644 --- a/src/targets/r/httr/fixtures/multipart-data.r +++ b/src/targets/r/httr/fixtures/multipart-data.r @@ -2,7 +2,7 @@ library(httr) url <- "http://mockbin.com/har" -payload <- "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001--\r\n" +payload <- "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"bar\"\r\n\r\nBonjour le monde\r\n-----011000010111000001101001--\r\n" encode <- "multipart" diff --git a/src/targets/ruby/native/fixtures/multipart-data.rb b/src/targets/ruby/native/fixtures/multipart-data.rb index 33b9b450f..89db5b97b 100644 --- a/src/targets/ruby/native/fixtures/multipart-data.rb +++ b/src/targets/ruby/native/fixtures/multipart-data.rb @@ -7,7 +7,7 @@ request = Net::HTTP::Post.new(url) request["content-type"] = 'multipart/form-data; boundary=---011000010111000001101001' -request.body = "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001--\r\n" +request.body = "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"bar\"\r\n\r\nBonjour le monde\r\n-----011000010111000001101001--\r\n" response = http.request(request) puts response.read_body \ No newline at end of file diff --git a/src/targets/shell/curl/fixtures/multipart-data.sh b/src/targets/shell/curl/fixtures/multipart-data.sh index 033e8bdcc..b5fbe520b 100644 --- a/src/targets/shell/curl/fixtures/multipart-data.sh +++ b/src/targets/shell/curl/fixtures/multipart-data.sh @@ -1,4 +1,5 @@ curl --request POST \ --url http://mockbin.com/har \ --header 'content-type: multipart/form-data' \ - --form foo=@hello.txt \ No newline at end of file + --form foo=@hello.txt \ + --form 'bar=Bonjour le monde' \ No newline at end of file diff --git a/src/targets/shell/httpie/fixtures/multipart-data.sh b/src/targets/shell/httpie/fixtures/multipart-data.sh index 8b3ac0a24..0e7d4a0cd 100644 --- a/src/targets/shell/httpie/fixtures/multipart-data.sh +++ b/src/targets/shell/httpie/fixtures/multipart-data.sh @@ -3,6 +3,10 @@ Content-Disposition: form-data; name="foo"; filename="hello.txt" Content-Type: text/plain Hello World +-----011000010111000001101001 +Content-Disposition: form-data; name="bar" + +Bonjour le monde -----011000010111000001101001-- ' | \ http POST http://mockbin.com/har \ diff --git a/src/targets/shell/wget/fixtures/multipart-data.sh b/src/targets/shell/wget/fixtures/multipart-data.sh index 4fdb3d17b..0f1afbe98 100644 --- a/src/targets/shell/wget/fixtures/multipart-data.sh +++ b/src/targets/shell/wget/fixtures/multipart-data.sh @@ -1,6 +1,6 @@ wget --quiet \ --method POST \ --header 'content-type: multipart/form-data; boundary=---011000010111000001101001' \ - --body-data '-----011000010111000001101001\r\nContent-Disposition: form-data; name="foo"; filename="hello.txt"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001--\r\n' \ + --body-data '-----011000010111000001101001\r\nContent-Disposition: form-data; name="foo"; filename="hello.txt"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001\r\nContent-Disposition: form-data; name="bar"\r\n\r\nBonjour le monde\r\n-----011000010111000001101001--\r\n' \ --output-document \ - http://mockbin.com/har \ No newline at end of file diff --git a/src/targets/swift/nsurlsession/fixtures/multipart-data.swift b/src/targets/swift/nsurlsession/fixtures/multipart-data.swift index 274aa6345..37ccdc374 100644 --- a/src/targets/swift/nsurlsession/fixtures/multipart-data.swift +++ b/src/targets/swift/nsurlsession/fixtures/multipart-data.swift @@ -7,6 +7,10 @@ let parameters = [ "value": "Hello World", "fileName": "hello.txt", "contentType": "text/plain" + ], + [ + "name": "bar", + "value": "Bonjour le monde" ] ] From 3119335be9ea6702255795de341709880f9c7371 Mon Sep 17 00:00:00 2001 From: Jon Ursenbach Date: Mon, 23 May 2022 15:13:52 -0700 Subject: [PATCH 09/12] fix: `multipart/form-data` header issues with node/js fetch targets (#257) Co-authored-by: Dimitri Mitropoulos --- src/targets/javascript/fetch/client.ts | 13 +++++++++++++ .../javascript/fetch/fixtures/multipart-data.js | 5 +---- .../javascript/fetch/fixtures/multipart-file.js | 5 +---- .../fetch/fixtures/multipart-form-data.js | 5 +---- src/targets/node/fetch/client.ts | 13 +++++++++++++ src/targets/node/fetch/fixtures/multipart-data.js | 5 +---- src/targets/node/fetch/fixtures/multipart-file.js | 5 +---- .../node/fetch/fixtures/multipart-form-data.js | 5 +---- 8 files changed, 32 insertions(+), 24 deletions(-) diff --git a/src/targets/javascript/fetch/client.ts b/src/targets/javascript/fetch/client.ts index a054ee304..fad08f456 100644 --- a/src/targets/javascript/fetch/client.ts +++ b/src/targets/javascript/fetch/client.ts @@ -11,6 +11,7 @@ import stringifyObject from 'stringify-object'; import { CodeBuilder } from '../../../helpers/code-builder'; +import { getHeaderName } from '../../../helpers/headers'; import { Client } from '../../targets'; interface FetchOptions { @@ -59,6 +60,13 @@ export const fetch: Client = { break; } + // The FormData API automatically adds a `Content-Type` header for `multipart/form-data` content and if we add our own here data won't be correctly transmitted. + // eslint-disable-next-line no-case-declarations -- We're only using `contentTypeHeader` within this block. + const contentTypeHeader = getHeaderName(allHeaders, 'content-type'); + if (contentTypeHeader) { + delete allHeaders[contentTypeHeader]; + } + push('const form = new FormData();'); postData.params.forEach(param => { @@ -74,6 +82,11 @@ export const fetch: Client = { } } + // If we ultimately don't have any headers to send then we shouldn't add an empty object into the request options. + if (options.headers && !Object.keys(options.headers).length) { + delete options.headers; + } + push( `const options = ${stringifyObject(options, { indent: opts.indent, diff --git a/src/targets/javascript/fetch/fixtures/multipart-data.js b/src/targets/javascript/fetch/fixtures/multipart-data.js index 7e67c6366..ac1ed4326 100644 --- a/src/targets/javascript/fetch/fixtures/multipart-data.js +++ b/src/targets/javascript/fetch/fixtures/multipart-data.js @@ -2,10 +2,7 @@ const form = new FormData(); form.append('foo', 'Hello World'); form.append('bar', 'Bonjour le monde'); -const options = { - method: 'POST', - headers: {'content-type': 'multipart/form-data; boundary=---011000010111000001101001'} -}; +const options = {method: 'POST'}; options.body = form; diff --git a/src/targets/javascript/fetch/fixtures/multipart-file.js b/src/targets/javascript/fetch/fixtures/multipart-file.js index 551de3987..1922280fb 100644 --- a/src/targets/javascript/fetch/fixtures/multipart-file.js +++ b/src/targets/javascript/fetch/fixtures/multipart-file.js @@ -1,10 +1,7 @@ const form = new FormData(); form.append('foo', 'test/fixtures/files/hello.txt'); -const options = { - method: 'POST', - headers: {'content-type': 'multipart/form-data; boundary=---011000010111000001101001'} -}; +const options = {method: 'POST'}; options.body = form; diff --git a/src/targets/javascript/fetch/fixtures/multipart-form-data.js b/src/targets/javascript/fetch/fixtures/multipart-form-data.js index a7e36fcf7..80531865d 100644 --- a/src/targets/javascript/fetch/fixtures/multipart-form-data.js +++ b/src/targets/javascript/fetch/fixtures/multipart-form-data.js @@ -1,10 +1,7 @@ const form = new FormData(); form.append('foo', 'bar'); -const options = { - method: 'POST', - headers: {'Content-Type': 'multipart/form-data; boundary=---011000010111000001101001'} -}; +const options = {method: 'POST'}; options.body = form; diff --git a/src/targets/node/fetch/client.ts b/src/targets/node/fetch/client.ts index d4ce1b5f1..952a85f7a 100644 --- a/src/targets/node/fetch/client.ts +++ b/src/targets/node/fetch/client.ts @@ -11,6 +11,7 @@ import stringifyObject from 'stringify-object'; import { CodeBuilder } from '../../../helpers/code-builder'; +import { getHeaderName } from '../../../helpers/headers'; import { Client } from '../../targets'; export const fetch: Client = { @@ -63,6 +64,13 @@ export const fetch: Client = { break; } + // The `form-data` module automatically adds a `Content-Type` header for `multipart/form-data` content and if we add our own here data won't be correctly transmitted. + // eslint-disable-next-line no-case-declarations -- We're only using `contentTypeHeader` within this block. + const contentTypeHeader = getHeaderName(headersObj, 'content-type'); + if (contentTypeHeader) { + delete headersObj[contentTypeHeader]; + } + unshift("const FormData = require('form-data');"); push('const formData = new FormData();'); blank(); @@ -102,6 +110,11 @@ export const fetch: Client = { push(`let url = '${url}';`); blank(); + // If we ultimately don't have any headers to send then we shouldn't add an empty object into the request options. + if (reqOpts.headers && !Object.keys(reqOpts.headers).length) { + delete reqOpts.headers; + } + const stringifiedOptions = stringifyObject(reqOpts, { indent: ' ', inlineCharacterLimit: 80 }); push(`let options = ${stringifiedOptions};`); blank(); diff --git a/src/targets/node/fetch/fixtures/multipart-data.js b/src/targets/node/fetch/fixtures/multipart-data.js index 72896cb02..7cf27d53f 100644 --- a/src/targets/node/fetch/fixtures/multipart-data.js +++ b/src/targets/node/fetch/fixtures/multipart-data.js @@ -8,10 +8,7 @@ formData.append('bar', 'Bonjour le monde'); let url = 'http://mockbin.com/har'; -let options = { - method: 'POST', - headers: {'content-type': 'multipart/form-data; boundary=---011000010111000001101001'} -}; +let options = {method: 'POST'}; options.body = formData; diff --git a/src/targets/node/fetch/fixtures/multipart-file.js b/src/targets/node/fetch/fixtures/multipart-file.js index daff46620..3a150787f 100644 --- a/src/targets/node/fetch/fixtures/multipart-file.js +++ b/src/targets/node/fetch/fixtures/multipart-file.js @@ -7,10 +7,7 @@ formData.append('foo', fs.createReadStream('test/fixtures/files/hello.txt')); let url = 'http://mockbin.com/har'; -let options = { - method: 'POST', - headers: {'content-type': 'multipart/form-data; boundary=---011000010111000001101001'} -}; +let options = {method: 'POST'}; options.body = formData; diff --git a/src/targets/node/fetch/fixtures/multipart-form-data.js b/src/targets/node/fetch/fixtures/multipart-form-data.js index 0a5aeaf8d..1388c4d3b 100644 --- a/src/targets/node/fetch/fixtures/multipart-form-data.js +++ b/src/targets/node/fetch/fixtures/multipart-form-data.js @@ -6,10 +6,7 @@ formData.append('foo', 'bar'); let url = 'http://mockbin.com/har'; -let options = { - method: 'POST', - headers: {'Content-Type': 'multipart/form-data; boundary=---011000010111000001101001'} -}; +let options = {method: 'POST'}; options.body = formData; From 5e8f161c7befeddc881c5b9fa0fc9382882bb919 Mon Sep 17 00:00:00 2001 From: Jon Ursenbach Date: Mon, 23 May 2022 15:18:14 -0700 Subject: [PATCH 10/12] fix: headers not being properly applied to R httr snippets (#263) Co-authored-by: Dimitri Mitropoulos --- src/fixtures/requests/headers.json | 4 ++++ src/targets/c/libcurl/fixtures/headers.c | 1 + .../clojure/clj_http/fixtures/headers.clj | 3 ++- .../csharp/httpclient/fixtures/headers.cs | 1 + .../csharp/restsharp/fixtures/headers.cs | 1 + src/targets/go/native/fixtures/headers.go | 1 + src/targets/http/http1.1/fixtures/headers | 1 + .../java/asynchttp/fixtures/headers.java | 1 + .../java/nethttp/fixtures/headers.java | 1 + src/targets/java/okhttp/fixtures/headers.java | 1 + .../java/unirest/fixtures/headers.java | 1 + .../javascript/axios/fixtures/headers.js | 2 +- .../javascript/fetch/fixtures/headers.js | 5 ++++- .../javascript/jquery/fixtures/headers.js | 3 ++- .../javascript/xhr/fixtures/headers.js | 1 + src/targets/kotlin/okhttp/fixtures/headers.kt | 1 + src/targets/node/axios/fixtures/headers.js | 2 +- src/targets/node/fetch/fixtures/headers.js | 5 ++++- src/targets/node/native/fixtures/headers.js | 3 ++- src/targets/node/request/fixtures/headers.js | 2 +- src/targets/node/unirest/fixtures/headers.js | 3 ++- .../objc/nsurlsession/fixtures/headers.m | 3 ++- src/targets/ocaml/cohttp/fixtures/headers.ml | 1 + src/targets/php/curl/fixtures/headers.php | 1 + src/targets/php/guzzle/fixtures/headers.php | 1 + src/targets/php/http1/fixtures/headers.php | 3 ++- src/targets/php/http2/fixtures/headers.php | 3 ++- .../restmethod/fixtures/headers.ps1 | 1 + .../webrequest/fixtures/headers.ps1 | 1 + .../python/python3/fixtures/headers.py | 3 ++- .../python/requests/fixtures/headers.py | 3 ++- src/targets/r/httr/client.ts | 21 +++++++------------ src/targets/r/httr/fixtures/headers.r | 2 +- src/targets/ruby/native/fixtures/headers.rb | 1 + src/targets/shell/curl/fixtures/headers.sh | 1 + src/targets/shell/httpie/fixtures/headers.sh | 1 + src/targets/shell/wget/fixtures/headers.sh | 1 + .../swift/nsurlsession/fixtures/headers.swift | 3 ++- 38 files changed, 63 insertions(+), 30 deletions(-) diff --git a/src/fixtures/requests/headers.json b/src/fixtures/requests/headers.json index 6f41b3820..a00f2907d 100644 --- a/src/fixtures/requests/headers.json +++ b/src/fixtures/requests/headers.json @@ -9,6 +9,10 @@ { "name": "x-foo", "value": "Bar" + }, + { + "name": "x-bar", + "value": "Foo" } ] } diff --git a/src/targets/c/libcurl/fixtures/headers.c b/src/targets/c/libcurl/fixtures/headers.c index befd745b6..3d74ce4e8 100644 --- a/src/targets/c/libcurl/fixtures/headers.c +++ b/src/targets/c/libcurl/fixtures/headers.c @@ -6,6 +6,7 @@ curl_easy_setopt(hnd, CURLOPT_URL, "http://mockbin.com/har"); struct curl_slist *headers = NULL; headers = curl_slist_append(headers, "accept: application/json"); headers = curl_slist_append(headers, "x-foo: Bar"); +headers = curl_slist_append(headers, "x-bar: Foo"); curl_easy_setopt(hnd, CURLOPT_HTTPHEADER, headers); CURLcode ret = curl_easy_perform(hnd); \ No newline at end of file diff --git a/src/targets/clojure/clj_http/fixtures/headers.clj b/src/targets/clojure/clj_http/fixtures/headers.clj index 6cd592f28..8686c3156 100644 --- a/src/targets/clojure/clj_http/fixtures/headers.clj +++ b/src/targets/clojure/clj_http/fixtures/headers.clj @@ -1,4 +1,5 @@ (require '[clj-http.client :as client]) -(client/get "http://mockbin.com/har" {:headers {:x-foo "Bar"} +(client/get "http://mockbin.com/har" {:headers {:x-foo "Bar" + :x-bar "Foo"} :accept :json}) \ No newline at end of file diff --git a/src/targets/csharp/httpclient/fixtures/headers.cs b/src/targets/csharp/httpclient/fixtures/headers.cs index cfbf19332..844d61da6 100644 --- a/src/targets/csharp/httpclient/fixtures/headers.cs +++ b/src/targets/csharp/httpclient/fixtures/headers.cs @@ -7,6 +7,7 @@ { { "accept", "application/json" }, { "x-foo", "Bar" }, + { "x-bar", "Foo" }, }, }; using (var response = await client.SendAsync(request)) diff --git a/src/targets/csharp/restsharp/fixtures/headers.cs b/src/targets/csharp/restsharp/fixtures/headers.cs index 4f6b54d8c..a25f1ae4c 100644 --- a/src/targets/csharp/restsharp/fixtures/headers.cs +++ b/src/targets/csharp/restsharp/fixtures/headers.cs @@ -2,4 +2,5 @@ var request = new RestRequest(Method.GET); request.AddHeader("accept", "application/json"); request.AddHeader("x-foo", "Bar"); +request.AddHeader("x-bar", "Foo"); IRestResponse response = client.Execute(request); \ No newline at end of file diff --git a/src/targets/go/native/fixtures/headers.go b/src/targets/go/native/fixtures/headers.go index 3ea6084ef..5b05a2314 100644 --- a/src/targets/go/native/fixtures/headers.go +++ b/src/targets/go/native/fixtures/headers.go @@ -14,6 +14,7 @@ func main() { req.Header.Add("accept", "application/json") req.Header.Add("x-foo", "Bar") + req.Header.Add("x-bar", "Foo") res, _ := http.DefaultClient.Do(req) diff --git a/src/targets/http/http1.1/fixtures/headers b/src/targets/http/http1.1/fixtures/headers index f84932e91..c2d0a0f39 100644 --- a/src/targets/http/http1.1/fixtures/headers +++ b/src/targets/http/http1.1/fixtures/headers @@ -1,5 +1,6 @@ GET /har HTTP/1.1 Accept: application/json X-Foo: Bar +X-Bar: Foo Host: mockbin.com diff --git a/src/targets/java/asynchttp/fixtures/headers.java b/src/targets/java/asynchttp/fixtures/headers.java index 3bdbeaf36..52e505eef 100644 --- a/src/targets/java/asynchttp/fixtures/headers.java +++ b/src/targets/java/asynchttp/fixtures/headers.java @@ -2,6 +2,7 @@ client.prepare("GET", "http://mockbin.com/har") .setHeader("accept", "application/json") .setHeader("x-foo", "Bar") + .setHeader("x-bar", "Foo") .execute() .toCompletableFuture() .thenAccept(System.out::println) diff --git a/src/targets/java/nethttp/fixtures/headers.java b/src/targets/java/nethttp/fixtures/headers.java index 433de1cdf..148f9c157 100644 --- a/src/targets/java/nethttp/fixtures/headers.java +++ b/src/targets/java/nethttp/fixtures/headers.java @@ -2,6 +2,7 @@ .uri(URI.create("http://mockbin.com/har")) .header("accept", "application/json") .header("x-foo", "Bar") + .header("x-bar", "Foo") .method("GET", HttpRequest.BodyPublishers.noBody()) .build(); HttpResponse response = HttpClient.newHttpClient().send(request, HttpResponse.BodyHandlers.ofString()); diff --git a/src/targets/java/okhttp/fixtures/headers.java b/src/targets/java/okhttp/fixtures/headers.java index 7188ec87e..2489f1964 100644 --- a/src/targets/java/okhttp/fixtures/headers.java +++ b/src/targets/java/okhttp/fixtures/headers.java @@ -5,6 +5,7 @@ .get() .addHeader("accept", "application/json") .addHeader("x-foo", "Bar") + .addHeader("x-bar", "Foo") .build(); Response response = client.newCall(request).execute(); \ No newline at end of file diff --git a/src/targets/java/unirest/fixtures/headers.java b/src/targets/java/unirest/fixtures/headers.java index 749296bfd..880528e33 100644 --- a/src/targets/java/unirest/fixtures/headers.java +++ b/src/targets/java/unirest/fixtures/headers.java @@ -1,4 +1,5 @@ HttpResponse response = Unirest.get("http://mockbin.com/har") .header("accept", "application/json") .header("x-foo", "Bar") + .header("x-bar", "Foo") .asString(); \ No newline at end of file diff --git a/src/targets/javascript/axios/fixtures/headers.js b/src/targets/javascript/axios/fixtures/headers.js index 57a48e5f5..058693545 100644 --- a/src/targets/javascript/axios/fixtures/headers.js +++ b/src/targets/javascript/axios/fixtures/headers.js @@ -3,7 +3,7 @@ import axios from 'axios'; const options = { method: 'GET', url: 'http://mockbin.com/har', - headers: {accept: 'application/json', 'x-foo': 'Bar'} + headers: {accept: 'application/json', 'x-foo': 'Bar', 'x-bar': 'Foo'} }; axios diff --git a/src/targets/javascript/fetch/fixtures/headers.js b/src/targets/javascript/fetch/fixtures/headers.js index bdb686f69..901f47451 100644 --- a/src/targets/javascript/fetch/fixtures/headers.js +++ b/src/targets/javascript/fetch/fixtures/headers.js @@ -1,4 +1,7 @@ -const options = {method: 'GET', headers: {accept: 'application/json', 'x-foo': 'Bar'}}; +const options = { + method: 'GET', + headers: {accept: 'application/json', 'x-foo': 'Bar', 'x-bar': 'Foo'} +}; fetch('http://mockbin.com/har', options) .then(response => response.json()) diff --git a/src/targets/javascript/jquery/fixtures/headers.js b/src/targets/javascript/jquery/fixtures/headers.js index 155e2724e..0230ebc05 100644 --- a/src/targets/javascript/jquery/fixtures/headers.js +++ b/src/targets/javascript/jquery/fixtures/headers.js @@ -5,7 +5,8 @@ const settings = { method: 'GET', headers: { accept: 'application/json', - 'x-foo': 'Bar' + 'x-foo': 'Bar', + 'x-bar': 'Foo' } }; diff --git a/src/targets/javascript/xhr/fixtures/headers.js b/src/targets/javascript/xhr/fixtures/headers.js index 51fa3cb86..e4f00e4aa 100644 --- a/src/targets/javascript/xhr/fixtures/headers.js +++ b/src/targets/javascript/xhr/fixtures/headers.js @@ -12,5 +12,6 @@ xhr.addEventListener('readystatechange', function () { xhr.open('GET', 'http://mockbin.com/har'); xhr.setRequestHeader('accept', 'application/json'); xhr.setRequestHeader('x-foo', 'Bar'); +xhr.setRequestHeader('x-bar', 'Foo'); xhr.send(data); \ No newline at end of file diff --git a/src/targets/kotlin/okhttp/fixtures/headers.kt b/src/targets/kotlin/okhttp/fixtures/headers.kt index 00390b005..67986cd60 100644 --- a/src/targets/kotlin/okhttp/fixtures/headers.kt +++ b/src/targets/kotlin/okhttp/fixtures/headers.kt @@ -5,6 +5,7 @@ val request = Request.Builder() .get() .addHeader("accept", "application/json") .addHeader("x-foo", "Bar") + .addHeader("x-bar", "Foo") .build() val response = client.newCall(request).execute() \ No newline at end of file diff --git a/src/targets/node/axios/fixtures/headers.js b/src/targets/node/axios/fixtures/headers.js index 3f1b28fac..0e971abc5 100644 --- a/src/targets/node/axios/fixtures/headers.js +++ b/src/targets/node/axios/fixtures/headers.js @@ -3,7 +3,7 @@ const axios = require('axios').default; const options = { method: 'GET', url: 'http://mockbin.com/har', - headers: {accept: 'application/json', 'x-foo': 'Bar'} + headers: {accept: 'application/json', 'x-foo': 'Bar', 'x-bar': 'Foo'} }; axios diff --git a/src/targets/node/fetch/fixtures/headers.js b/src/targets/node/fetch/fixtures/headers.js index ff5f9e99f..ad11c3b27 100644 --- a/src/targets/node/fetch/fixtures/headers.js +++ b/src/targets/node/fetch/fixtures/headers.js @@ -2,7 +2,10 @@ const fetch = require('node-fetch'); let url = 'http://mockbin.com/har'; -let options = {method: 'GET', headers: {accept: 'application/json', 'x-foo': 'Bar'}}; +let options = { + method: 'GET', + headers: {accept: 'application/json', 'x-foo': 'Bar', 'x-bar': 'Foo'} +}; fetch(url, options) .then(res => res.json()) diff --git a/src/targets/node/native/fixtures/headers.js b/src/targets/node/native/fixtures/headers.js index 475642c81..12ef4e695 100644 --- a/src/targets/node/native/fixtures/headers.js +++ b/src/targets/node/native/fixtures/headers.js @@ -7,7 +7,8 @@ const options = { path: '/har', headers: { accept: 'application/json', - 'x-foo': 'Bar' + 'x-foo': 'Bar', + 'x-bar': 'Foo' } }; diff --git a/src/targets/node/request/fixtures/headers.js b/src/targets/node/request/fixtures/headers.js index 005ddfadb..aba252086 100644 --- a/src/targets/node/request/fixtures/headers.js +++ b/src/targets/node/request/fixtures/headers.js @@ -3,7 +3,7 @@ const request = require('request'); const options = { method: 'GET', url: 'http://mockbin.com/har', - headers: {accept: 'application/json', 'x-foo': 'Bar'} + headers: {accept: 'application/json', 'x-foo': 'Bar', 'x-bar': 'Foo'} }; request(options, function (error, response, body) { diff --git a/src/targets/node/unirest/fixtures/headers.js b/src/targets/node/unirest/fixtures/headers.js index 36c5fdb28..f2f267747 100644 --- a/src/targets/node/unirest/fixtures/headers.js +++ b/src/targets/node/unirest/fixtures/headers.js @@ -4,7 +4,8 @@ const req = unirest('GET', 'http://mockbin.com/har'); req.headers({ accept: 'application/json', - 'x-foo': 'Bar' + 'x-foo': 'Bar', + 'x-bar': 'Foo' }); req.end(function (res) { diff --git a/src/targets/objc/nsurlsession/fixtures/headers.m b/src/targets/objc/nsurlsession/fixtures/headers.m index 83a467db2..a8c9bb5d1 100644 --- a/src/targets/objc/nsurlsession/fixtures/headers.m +++ b/src/targets/objc/nsurlsession/fixtures/headers.m @@ -1,7 +1,8 @@ #import NSDictionary *headers = @{ @"accept": @"application/json", - @"x-foo": @"Bar" }; + @"x-foo": @"Bar", + @"x-bar": @"Foo" }; NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:@"http://mockbin.com/har"] cachePolicy:NSURLRequestUseProtocolCachePolicy diff --git a/src/targets/ocaml/cohttp/fixtures/headers.ml b/src/targets/ocaml/cohttp/fixtures/headers.ml index a2f3ce534..3ac0292b9 100644 --- a/src/targets/ocaml/cohttp/fixtures/headers.ml +++ b/src/targets/ocaml/cohttp/fixtures/headers.ml @@ -6,6 +6,7 @@ let uri = Uri.of_string "http://mockbin.com/har" in let headers = Header.add_list (Header.init ()) [ ("accept", "application/json"); ("x-foo", "Bar"); + ("x-bar", "Foo"); ] in Client.call ~headers `GET uri diff --git a/src/targets/php/curl/fixtures/headers.php b/src/targets/php/curl/fixtures/headers.php index 59cb2d5fe..0afa8ce9b 100644 --- a/src/targets/php/curl/fixtures/headers.php +++ b/src/targets/php/curl/fixtures/headers.php @@ -12,6 +12,7 @@ CURLOPT_CUSTOMREQUEST => "GET", CURLOPT_HTTPHEADER => [ "accept: application/json", + "x-bar: Foo", "x-foo: Bar" ], ]); diff --git a/src/targets/php/guzzle/fixtures/headers.php b/src/targets/php/guzzle/fixtures/headers.php index 4def889e1..31439d7bd 100644 --- a/src/targets/php/guzzle/fixtures/headers.php +++ b/src/targets/php/guzzle/fixtures/headers.php @@ -5,6 +5,7 @@ $response = $client->request('GET', 'http://mockbin.com/har', [ 'headers' => [ 'accept' => 'application/json', + 'x-bar' => 'Foo', 'x-foo' => 'Bar', ], ]); diff --git a/src/targets/php/http1/fixtures/headers.php b/src/targets/php/http1/fixtures/headers.php index d84998672..78b53ea50 100644 --- a/src/targets/php/http1/fixtures/headers.php +++ b/src/targets/php/http1/fixtures/headers.php @@ -6,7 +6,8 @@ $request->setHeaders([ 'accept' => 'application/json', - 'x-foo' => 'Bar' + 'x-foo' => 'Bar', + 'x-bar' => 'Foo' ]); try { diff --git a/src/targets/php/http2/fixtures/headers.php b/src/targets/php/http2/fixtures/headers.php index 8dde62a2a..40979ed95 100644 --- a/src/targets/php/http2/fixtures/headers.php +++ b/src/targets/php/http2/fixtures/headers.php @@ -7,7 +7,8 @@ $request->setRequestMethod('GET'); $request->setHeaders([ 'accept' => 'application/json', - 'x-foo' => 'Bar' + 'x-foo' => 'Bar', + 'x-bar' => 'Foo' ]); $client->enqueue($request)->send(); diff --git a/src/targets/powershell/restmethod/fixtures/headers.ps1 b/src/targets/powershell/restmethod/fixtures/headers.ps1 index 011f4352b..938c9d938 100644 --- a/src/targets/powershell/restmethod/fixtures/headers.ps1 +++ b/src/targets/powershell/restmethod/fixtures/headers.ps1 @@ -1,4 +1,5 @@ $headers=@{} $headers.Add("accept", "application/json") $headers.Add("x-foo", "Bar") +$headers.Add("x-bar", "Foo") $response = Invoke-RestMethod -Uri 'http://mockbin.com/har' -Method GET -Headers $headers \ No newline at end of file diff --git a/src/targets/powershell/webrequest/fixtures/headers.ps1 b/src/targets/powershell/webrequest/fixtures/headers.ps1 index 12070b195..e7f1c0ca3 100644 --- a/src/targets/powershell/webrequest/fixtures/headers.ps1 +++ b/src/targets/powershell/webrequest/fixtures/headers.ps1 @@ -1,4 +1,5 @@ $headers=@{} $headers.Add("accept", "application/json") $headers.Add("x-foo", "Bar") +$headers.Add("x-bar", "Foo") $response = Invoke-WebRequest -Uri 'http://mockbin.com/har' -Method GET -Headers $headers \ No newline at end of file diff --git a/src/targets/python/python3/fixtures/headers.py b/src/targets/python/python3/fixtures/headers.py index 94010bc66..36ab3fc05 100644 --- a/src/targets/python/python3/fixtures/headers.py +++ b/src/targets/python/python3/fixtures/headers.py @@ -4,7 +4,8 @@ headers = { 'accept': "application/json", - 'x-foo': "Bar" + 'x-foo': "Bar", + 'x-bar': "Foo" } conn.request("GET", "/har", headers=headers) diff --git a/src/targets/python/requests/fixtures/headers.py b/src/targets/python/requests/fixtures/headers.py index b5ff811b6..fa09d6f59 100644 --- a/src/targets/python/requests/fixtures/headers.py +++ b/src/targets/python/requests/fixtures/headers.py @@ -4,7 +4,8 @@ headers = { "accept": "application/json", - "x-foo": "Bar" + "x-foo": "Bar", + "x-bar": "Foo" } response = requests.request("GET", url, headers=headers) diff --git a/src/targets/r/httr/client.ts b/src/targets/r/httr/client.ts index 0092ad591..9d3cdbdbe 100644 --- a/src/targets/r/httr/client.ts +++ b/src/targets/r/httr/client.ts @@ -89,27 +89,20 @@ export const httr: Client = { } // Construct headers - const headers = allHeaders; - let headerCount = Object.keys(headers).length; - let header = ''; + const headers = []; let cookies; let accept; - for (const head in headers) { + for (const head in allHeaders) { if (head.toLowerCase() === 'accept') { - accept = `, accept("${headers[head]}")`; - headerCount -= 1; + accept = `, accept("${allHeaders[head]}")`; } else if (head.toLowerCase() === 'cookie') { - cookies = `, set_cookies(\`${String(headers[head]) + cookies = `, set_cookies(\`${String(allHeaders[head]) .replace(/;/g, '", `') .replace(/` /g, '`') .replace(/[=]/g, '` = "')}")`; - headerCount -= 1; } else if (head.toLowerCase() !== 'content-type') { - header = `${header + head.replace('-', '_')} = '${headers[head]}`; - if (headerCount > 1) { - header = `${header}', `; - } + headers.push(`'${head}' = '${allHeaders[head]}'`); } } @@ -120,8 +113,8 @@ export const httr: Client = { request += ', body = payload'; } - if (header !== '') { - request += `, add_headers(${header}')`; + if (headers.length) { + request += `, add_headers(${headers.join(', ')})`; } if (queryString.length) { diff --git a/src/targets/r/httr/fixtures/headers.r b/src/targets/r/httr/fixtures/headers.r index 249b5cd16..9b5b4ec14 100644 --- a/src/targets/r/httr/fixtures/headers.r +++ b/src/targets/r/httr/fixtures/headers.r @@ -2,6 +2,6 @@ library(httr) url <- "http://mockbin.com/har" -response <- VERB("GET", url, add_headers(x_foo = 'Bar'), content_type("application/octet-stream"), accept("application/json")) +response <- VERB("GET", url, add_headers('x-foo' = 'Bar', 'x-bar' = 'Foo'), content_type("application/octet-stream"), accept("application/json")) content(response, "text") \ No newline at end of file diff --git a/src/targets/ruby/native/fixtures/headers.rb b/src/targets/ruby/native/fixtures/headers.rb index 37ba37528..9df47d4e0 100644 --- a/src/targets/ruby/native/fixtures/headers.rb +++ b/src/targets/ruby/native/fixtures/headers.rb @@ -8,6 +8,7 @@ request = Net::HTTP::Get.new(url) request["accept"] = 'application/json' request["x-foo"] = 'Bar' +request["x-bar"] = 'Foo' response = http.request(request) puts response.read_body \ No newline at end of file diff --git a/src/targets/shell/curl/fixtures/headers.sh b/src/targets/shell/curl/fixtures/headers.sh index df3fc4313..04db84c9b 100644 --- a/src/targets/shell/curl/fixtures/headers.sh +++ b/src/targets/shell/curl/fixtures/headers.sh @@ -1,4 +1,5 @@ curl --request GET \ --url http://mockbin.com/har \ --header 'accept: application/json' \ + --header 'x-bar: Foo' \ --header 'x-foo: Bar' \ No newline at end of file diff --git a/src/targets/shell/httpie/fixtures/headers.sh b/src/targets/shell/httpie/fixtures/headers.sh index 289a8a7ec..961f3f8b5 100644 --- a/src/targets/shell/httpie/fixtures/headers.sh +++ b/src/targets/shell/httpie/fixtures/headers.sh @@ -1,3 +1,4 @@ http GET http://mockbin.com/har \ accept:application/json \ + x-bar:Foo \ x-foo:Bar \ No newline at end of file diff --git a/src/targets/shell/wget/fixtures/headers.sh b/src/targets/shell/wget/fixtures/headers.sh index 43b75f51c..d279ce120 100644 --- a/src/targets/shell/wget/fixtures/headers.sh +++ b/src/targets/shell/wget/fixtures/headers.sh @@ -2,5 +2,6 @@ wget --quiet \ --method GET \ --header 'accept: application/json' \ --header 'x-foo: Bar' \ + --header 'x-bar: Foo' \ --output-document \ - http://mockbin.com/har \ No newline at end of file diff --git a/src/targets/swift/nsurlsession/fixtures/headers.swift b/src/targets/swift/nsurlsession/fixtures/headers.swift index c22addf34..362c94009 100644 --- a/src/targets/swift/nsurlsession/fixtures/headers.swift +++ b/src/targets/swift/nsurlsession/fixtures/headers.swift @@ -2,7 +2,8 @@ import Foundation let headers = [ "accept": "application/json", - "x-foo": "Bar" + "x-foo": "Bar", + "x-bar": "Foo" ] let request = NSMutableURLRequest(url: NSURL(string: "http://mockbin.com/har")! as URL, From 8ca977170438fd0f3191fdf757f890b80659fb97 Mon Sep 17 00:00:00 2001 From: Filipe Freire Date: Tue, 24 May 2022 16:07:34 +0100 Subject: [PATCH 11/12] Fix build workflow dispatch rules (#265) --- .github/workflows/build.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5bb54258e..e9674d67e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,6 +2,12 @@ name: Build on: push: + branches: + - master + pull_request: + types: + - opened + - synchronize workflow_dispatch: jobs: From 97731b1e042614113b5f832b1d0aa918d7214c34 Mon Sep 17 00:00:00 2001 From: Filipe Freire Date: Thu, 26 May 2022 21:30:33 +0100 Subject: [PATCH 12/12] Chore: Remove travis links (#266) * Remove travis links * Update README.md Co-authored-by: Dimitri Mitropoulos --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index dfcec37b4..e2a0b5d96 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Relies on the popular [HAR](http://www.softwareishard.com/blog/har-12-spec/#requ See it in action on companion service: [APIembed](https://apiembed.com/) -[![Build Status][travis-image]][travis-url] [![Downloads][npm-downloads]][npm-url] +[![Build](https://github.com/Kong/httpsnippet/actions/workflows/build.yml/badge.svg)](https://github.com/Kong/httpsnippet/actions/workflows/build.yml) [![Downloads][npm-downloads]][npm-url] ## Install @@ -211,8 +211,6 @@ Moreover, if your pull request contains JavaScript patches or features, you must Editor preferences are available in the [editor config](.editorconfig) for easy use in common text editors. Read more and download plugins at . [license-url]: https://github.com/Kong/httpsnippet/blob/master/LICENSE -[travis-url]: https://travis-ci.org/Kong/httpsnippet -[travis-image]: https://api.travis-ci.org/Kong/httpsnippet.svg?branch=master [npm-url]: https://www.npmjs.com/package/httpsnippet [npm-license]: https://img.shields.io/npm/l/httpsnippet.svg?style=flat-square [npm-version]: https://img.shields.io/npm/v/httpsnippet.svg?style=flat-square