feat: upgrading us to upstream (#108)

* Total Overhaul (but with all the same fixtures!) (#248)

see Kong#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

* fix: case where if `postData.params` is missing some targets crash (#258)

Co-authored-by: Dimitri Mitropoulos <dimitrimitropoulos@gmail.com>

* fix: compatibility issues on node 14 with `Object.hasOwn()` (#252)

* fix: typo in the httpie `style` option not being correctly applied (#254)

Co-authored-by: Dimitri Mitropoulos <dimitrimitropoulos@gmail.com>

* fix: axios targets not sending `x-www-form-urlencoded` properly (#255)

Co-authored-by: Dimitri Mitropoulos <dimitrimitropoulos@gmail.com>

* feat: addition of a PHP target for Guzzle (#253)

Co-authored-by: Dimitri Mitropoulos <dimitrimitropoulos@gmail.com>

* 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

* feat: native upload support in python `requests` snippets (#259)

Co-authored-by: Dimitri Mitropoulos <dimitrimitropoulos@gmail.com>

* fix: `multipart/form-data` header issues with node/js fetch targets (#257)

Co-authored-by: Dimitri Mitropoulos <dimitrimitropoulos@gmail.com>

* fix: headers not being properly applied to R httr snippets (#263)

Co-authored-by: Dimitri Mitropoulos <dimitrimitropoulos@gmail.com>

* Fix build workflow dispatch rules (#265)

* Chore: Remove travis links (#266)

* Remove travis links

* Update README.md

Co-authored-by: Dimitri Mitropoulos <dimitrimitropoulos@gmail.com>

* fix: issue where query strings in R wouldn't be properly concatenated (#269)

* fix: issue where query strings in R wouldn't be properly concatenated

* adds (and respects) indent options to httr, plus double looping fix

now, indent is respected, and also avoiding running Object.keys twice per run since we can just run it once with .entries

Co-authored-by: Dimitri Mitropoulos <dimitrimitropoulos@gmail.com>

* add header namesspace to prevent header errors (#247)

* add header namesspace to prevent header errors

* update fixtures

Co-authored-by: Dimitri Mitropoulos <dimitrimitropoulos@gmail.com>

* fix: stop implicitly coercing warning in Swift snippet generator (#195)

* swift/nsurlsession adds `as Any` to print for error

* adds OVERWRITE_EVERYTHING to ease fixture snapshot resetting

* updates fixtures

Co-authored-by: Dimitri Mitropoulos <dimitrimitropoulos@gmail.com>

* fix: clj-http handling of literal null JSON bodies (#283)

Co-authored-by: Sergey Zakharchenko <szakharchenko@digital-loggers.com>

* fix: prevent crash in Swift/Objc with checking length of input body post params (#192)

Co-authored-by: Dimitri Mitropoulos <dimitrimitropoulos@gmail.com>

* fix: cUrl target should encode x-www-form-urlencoded post data params (#198)

Co-authored-by: Dimitri Mitropoulos <dimitrimitropoulos@gmail.com>

* fix: linting issues

* fix: reverting package-lock changes

* chore: removing unused fixtures

* fix: removing unnecessary typing

Co-authored-by: Dimitri Mitropoulos <dimitrimitropoulos@gmail.com>
Co-authored-by: Filipe Freire <livrofubia@gmail.com>
Co-authored-by: Davis Martin <davis.martin@procore.com>
Co-authored-by: iraj taghlidi <785830+irajtaghlidi@users.noreply.github.com>
Co-authored-by: Sergey Zakharchenko <szakharchenko@digital-loggers.com>
Co-authored-by: Julien Giovaresco <dev@giovaresco.fr>

Author: 7 people

src/fixtures/runCustomFixtures.ts

@@ -3,6 +3,7 @@
 import type { HTTPSnippetOptions, Request } from '..';
 import type { ClientId, TargetId } from '../targets/targets';
 
+import { writeFileSync } from 'fs';
 import { readFile } from 'fs/promises';
 import path from 'path';
 
@@ -24,15 +25,18 @@ export interface CustomFixture {
 export const runCustomFixtures = ({ targetId, clientId, tests }: CustomFixture) => {
   describe(`custom fixtures for ${targetId}:${clientId}`, () => {
     tests.forEach(({ it: title, expected: fixtureFile, options, input: request }) => {
+      const opts: HTTPSnippetOptions = {};
+      if (options.harIsAlreadyEncoded) {
+        opts.harIsAlreadyEncoded = options.harIsAlreadyEncoded;
+      }
+
+      const result = new HTTPSnippet(request, opts).convert(targetId, clientId, options);
+      const filePath = path.join(__dirname, '..', 'targets', targetId, clientId, 'fixtures', fixtureFile);
+      if (process.env.OVERWRITE_EVERYTHING) {
+        writeFileSync(filePath, String(result));
+      }
+
       it(title, async () => {
-        const opts: HTTPSnippetOptions = {};
-        // eslint-disable-next-line jest/no-if
-        if (options.harIsAlreadyEncoded) {
-          opts.harIsAlreadyEncoded = options.harIsAlreadyEncoded;
-        }
-
-        const result = new HTTPSnippet(request, opts).convert(targetId, clientId, options);
-        const filePath = path.join(__dirname, '..', 'targets', targetId, clientId, 'fixtures', fixtureFile);
         const buffer = await readFile(filePath);
         const fixture = String(buffer);
 

src/helpers/code-builder.ts

@@ -32,7 +32,7 @@ export class CodeBuilder {
    */
   constructor({ indent, join }: CodeBuilderOptions = {}) {
     this.indentationCharacter = indent || DEFAULT_INDENTATION_CHARACTER;
-    this.lineJoin = join || DEFAULT_LINE_JOIN;
+    this.lineJoin = join ?? DEFAULT_LINE_JOIN;
   }
 
   /**

src/targets/clojure/clj_http/client.ts

@@ -9,7 +9,6 @@
  */
 
 import type { Client } from '../../targets';
-import type { Param } from 'har-format';
 import { CodeBuilder } from '../../../helpers/code-builder';
 import { getHeader, getHeaderName } from '../../../helpers/headers';
 
@@ -33,17 +32,32 @@ class File {
   toString = () => `(clojure.java.io/file "${this.path}")`;
 }
 
-const jsType = (x?: any) => (typeof x !== 'undefined' ? x.constructor.name.toLowerCase() : null);
+const jsType = (input?: any) => {
+  if (input === undefined) {
+    return null;
+  }
+
+  if (input === null) {
+    return 'null';
+  }
 
-const objEmpty = (x?: any) => (jsType(x) === 'object' ? Object.keys(x).length === 0 : false);
+  return input.constructor.name.toLowerCase();
+};
+
+const objEmpty = (input?: any) => {
+  if (jsType(input) === 'object') {
+    return Object.keys(input).length === 0;
+  }
+  return false;
+};
 
-const filterEmpty = (m: Record<string, any>) => {
-  Object.keys(m)
-    .filter(x => objEmpty(m[x]))
+const filterEmpty = (input: Record<string, any>) => {
+  Object.keys(input)
+    .filter(x => objEmpty(input[x]))
     .forEach(x => {
-      delete m[x];
+      delete input[x];
     });
-  return m;
+  return input;
 };
 
 const padBlock = (padSize: number, input: string) => {
@@ -146,7 +160,7 @@ export const clj_http: Client = {
 
       case 'multipart/form-data': {
         if (postData.params) {
-          params.multipart = postData.params.map((param: Param) => {
+          params.multipart = postData.params.map(param => {
             if (param.fileName && !param.value) {
               return {
                 name: param.name,

src/targets/clojure/clj_http/fixtures/jsonObj-null-value.clj

@@ -1 +1,4 @@
-<MISSING>
+(require '[clj-http.client :as client])
+
+(client/post "https://httpbin.org/anything" {:content-type :json
+                                             :form-params {:foo nil}})

src/targets/csharp/httpclient/client.ts

@@ -1,6 +1,5 @@
 import type { Request } from '../../..';
 import type { Client } from '../../targets';
-import type { Param } from 'har-format';
 import { CodeBuilder } from '../../../helpers/code-builder';
 import { getHeader } from '../../../helpers/headers';
 
@@ -49,6 +48,7 @@ export const httpclient: Client = {
 
     const { push, join } = new CodeBuilder({ indent: opts.indent });
 
+    push('using System.Net.Http.Headers;');
     let clienthandler = '';
     const cookies = Boolean(allHeaders.cookie);
     const decompressionMethods = getDecompressionMethods(allHeaders);
@@ -113,7 +113,7 @@ export const httpclient: Client = {
         case 'application/x-www-form-urlencoded':
           push('Content = new FormUrlEncodedContent(new Dictionary<string, string>', 1);
           push('{', 1);
-          postData.params?.forEach((param: Param) => {
+          postData.params?.forEach(param => {
             push(`{ "${param.name}", "${param.value}" },`, 2);
           });
           push('}),', 1);
@@ -122,7 +122,7 @@ export const httpclient: Client = {
         case 'multipart/form-data':
           push('Content = new MultipartFormDataContent', 1);
           push('{', 1);
-          postData.params?.forEach((param: Param) => {
+          postData.params?.forEach(param => {
             push(`new StringContent(${JSON.stringify(param.value || '')})`, 2);
             push('{', 2);
             push('Headers =', 3);

src/targets/csharp/httpclient/fixtures/application-form-encoded.cs

@@ -1,3 +1,4 @@
+using System.Net.Http.Headers;
 var client = new HttpClient();
 var request = new HttpRequestMessage
 {

src/targets/csharp/httpclient/fixtures/application-json.cs

@@ -1,3 +1,4 @@
+using System.Net.Http.Headers;
 var client = new HttpClient();
 var request = new HttpRequestMessage
 {

src/targets/csharp/httpclient/fixtures/cookies.cs

@@ -1,3 +1,4 @@
+using System.Net.Http.Headers;
 var clientHandler = new HttpClientHandler
 {
     UseCookies = false,

src/targets/csharp/httpclient/fixtures/custom-method.cs

@@ -1,3 +1,4 @@
+using System.Net.Http.Headers;
 var client = new HttpClient();
 var request = new HttpRequestMessage
 {

src/targets/csharp/httpclient/fixtures/full.cs

@@ -1,3 +1,4 @@
+using System.Net.Http.Headers;
 var clientHandler = new HttpClientHandler
 {
     UseCookies = false,