@readme/httpsnippet 8.1.4 → 10.0.0

package/dist/helpers/reducer.d.ts

@@ -4,4 +4,4 @@ declare const reducer: <T extends {
     value: string;
 }>(accumulator: ReducedHelperObject, pair: T) => ReducedHelperObject;
 
-export { ReducedHelperObject, reducer };
+export { type ReducedHelperObject, reducer };

package/dist/{index-09744b29.d.ts → index-BTuTGf5t.d.ts}

@@ -117,8 +117,8 @@ declare class HTTPSnippet {
     requests: Request[];
     options: HTTPSnippetOptions;
     constructor(input: HarEntry | HarRequest, opts?: HTTPSnippetOptions);
-    init(): Promise<this>;
-    prepare(harRequest: HarRequest, options: HTTPSnippetOptions): Promise<{
+    init(): this;
+    prepare(harRequest: HarRequest, options: HTTPSnippetOptions): {
         allHeaders: {
             [x: string]: string | string[];
         };
@@ -157,8 +157,8 @@ declare class HTTPSnippet {
         cookiesObj: ReducedHelperObject;
         headersObj: ReducedHelperObject;
         queryObj: ReducedHelperObject;
-    }>;
-    convert(targetId: TargetId, clientId?: ClientId, options?: any): Promise<string | false | string[]>;
+    };
+    convert(targetId: TargetId, clientId?: ClientId, options?: any): false | string[];
 }
 
-export { ClientId as C, Extension as E, HarRequest as H, RequestExtras as R, TargetId as T, ClientInfo as a, Converter as b, Client as c, ClientPlugin as d, TargetInfo as e, Target as f, addTarget as g, isClient as h, isTarget as i, addClientPlugin as j, addTargetClient as k, Request as l, HTTPSnippetOptions as m, HTTPSnippet as n, availableTargets as o, extname as p, targets as t };
+export { type ClientId as C, type Extension as E, type HarRequest as H, type RequestExtras as R, type TargetId as T, type ClientInfo as a, type Converter as b, type Client as c, type ClientPlugin as d, type TargetInfo as e, type Target as f, addTarget as g, isClient as h, isTarget as i, addClientPlugin as j, addTargetClient as k, type Request as l, type HTTPSnippetOptions as m, HTTPSnippet as n, availableTargets as o, extname as p, targets as t };

package/dist/{index-d5b13104.d.ts → index-C-fCLOHv.d.cts}

@@ -117,8 +117,8 @@ declare class HTTPSnippet {
     requests: Request[];
     options: HTTPSnippetOptions;
     constructor(input: HarEntry | HarRequest, opts?: HTTPSnippetOptions);
-    init(): Promise<this>;
-    prepare(harRequest: HarRequest, options: HTTPSnippetOptions): Promise<{
+    init(): this;
+    prepare(harRequest: HarRequest, options: HTTPSnippetOptions): {
         allHeaders: {
             [x: string]: string | string[];
         };
@@ -157,8 +157,8 @@ declare class HTTPSnippet {
         cookiesObj: ReducedHelperObject;
         headersObj: ReducedHelperObject;
         queryObj: ReducedHelperObject;
-    }>;
-    convert(targetId: TargetId, clientId?: ClientId, options?: any): Promise<string | false | string[]>;
+    };
+    convert(targetId: TargetId, clientId?: ClientId, options?: any): false | string[];
 }
 
-export { ClientId as C, Extension as E, HarRequest as H, RequestExtras as R, TargetId as T, ClientInfo as a, Converter as b, Client as c, ClientPlugin as d, TargetInfo as e, Target as f, addTarget as g, isClient as h, isTarget as i, addClientPlugin as j, addTargetClient as k, Request as l, HTTPSnippetOptions as m, HTTPSnippet as n, availableTargets as o, extname as p, targets as t };
+export { type ClientId as C, type Extension as E, type HarRequest as H, type RequestExtras as R, type TargetId as T, type ClientInfo as a, type Converter as b, type Client as c, type ClientPlugin as d, type TargetInfo as e, type Target as f, addTarget as g, isClient as h, isTarget as i, addClientPlugin as j, addTargetClient as k, type Request as l, type HTTPSnippetOptions as m, HTTPSnippet as n, availableTargets as o, extname as p, targets as t };

package/dist/index.cjs

@@ -1,13 +1,11 @@
 'use strict';
 
 var url = require('url');
-var formDataToString = require('formdata-to-string');
 var qs = require('qs');
 var stringifyObject9 = require('stringify-object');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
-var formDataToString__default = /*#__PURE__*/_interopDefault(formDataToString);
 var stringifyObject9__default = /*#__PURE__*/_interopDefault(stringifyObject9);
 
 // src/index.ts
@@ -3034,11 +3032,11 @@ ${indent}` : " "
         postData.params?.forEach((param) => {
           let post = "";
           if (param.fileName) {
-            post = `${param.name}=@${param.fileName}`;
+            post = `${param.name}='@${param.fileName}'`;
           } else {
-            post = `${param.name}=${param.value}`;
+            post = quote(`${param.name}=${param.value}`);
           }
-          push(`${arg("form")} ${quote(post)}`);
+          push(`${arg("form")} ${post}`);
         });
         break;
       case "application/x-www-form-urlencoded":
@@ -3048,7 +3046,7 @@ ${indent}` : " "
             const encoded = encodeURIComponent(param.name);
             const needsEncoding = encoded !== unencoded;
             const name = needsEncoding ? encoded : unencoded;
-            const flag = binary ? "--data-binary" : `--data${needsEncoding ? "-urlencode" : ""}`;
+            const flag = binary ? "--data-binary" : needsEncoding ? "--data-urlencode" : arg("data");
             push(`${flag} ${quote(`${name}=${param.value}`)}`);
           });
         } else {
@@ -3574,10 +3572,9 @@ var HTTPSnippet = class {
       ];
     }
   }
-  async init() {
+  init() {
     this.initCalled = true;
-    const promises = [];
-    this.entries.forEach(({ request: request2 }) => {
+    this.requests = this.entries.map(({ request: request2 }) => {
       const req = {
         bodySize: 0,
         headersSize: 0,
@@ -3593,12 +3590,11 @@ var HTTPSnippet = class {
       if (req.postData && !req.postData.mimeType) {
         req.postData.mimeType = "application/octet-stream";
       }
-      promises.push(this.prepare(req, this.options));
+      return this.prepare(req, this.options);
     });
-    this.requests = await Promise.all(promises);
     return this;
   }
-  async prepare(harRequest, options) {
+  prepare(harRequest, options) {
     const request2 = {
       ...harRequest,
       fullUrl: "",
@@ -3647,21 +3643,34 @@ var HTTPSnippet = class {
         request2.postData.text = "";
         request2.postData.mimeType = "multipart/form-data";
         if (request2.postData?.params) {
-          const form = new FormData();
-          request2.postData?.params.forEach((param) => {
+          const boundary = "---011000010111000001101001";
+          const carriage = `${boundary}--`;
+          const rn = "\r\n";
+          const escape2 = (str) => str.replace(/\n/g, "%0A").replace(/\r/g, "%0D").replace(/"/g, "%22");
+          const normalizeLinefeeds = (value) => value.replace(/\r?\n|\r/g, "\r\n");
+          const payload = [`--${boundary}`];
+          request2.postData?.params.forEach((param, i) => {
             const name = param.name;
             const value = param.value || "";
             const filename = param.fileName || null;
-            const contentType = param.contentType || "";
+            const contentType = param.contentType || "application/octet-stream";
             if (filename) {
-              form.append(name, new Blob([value], { type: contentType }), filename);
+              payload.push(
+                `Content-Disposition: form-data; name="${escape2(normalizeLinefeeds(name))}"; filename="${filename}"`
+              );
+              payload.push(`Content-Type: ${contentType}`);
             } else {
-              form.append(name, value);
+              payload.push(`Content-Disposition: form-data; name="${escape2(normalizeLinefeeds(name))}"`);
+            }
+            payload.push("");
+            payload.push(normalizeLinefeeds(value));
+            if (i !== request2.postData.params.length - 1) {
+              payload.push(`--${boundary}`);
             }
           });
-          const boundary = "---011000010111000001101001";
+          payload.push(`--${carriage}`);
           request2.postData.boundary = boundary;
-          request2.postData.text = await formDataToString__default.default(form, { boundary });
+          request2.postData.text = payload.join(rn);
           const contentTypeHeader = getHeaderName(request2.headersObj, "content-type") || "content-type";
           request2.headersObj[contentTypeHeader] = `multipart/form-data; boundary=${boundary}`;
         }
@@ -3731,9 +3740,9 @@ var HTTPSnippet = class {
       uriObj
     };
   }
-  async convert(targetId, clientId, options) {
+  convert(targetId, clientId, options) {
     if (!this.initCalled) {
-      await this.init();
+      this.init();
     }
     if (!options && clientId) {
       options = clientId;
@@ -3744,9 +3753,10 @@ var HTTPSnippet = class {
     }
     const { convert } = target.clientsById[clientId || target.info.default];
     const results = this.requests.map((request2) => convert(request2, options));
-    return results.length === 1 ? results[0] : results;
+    return results;
   }
 };
+/*! formdata-polyfill. MIT License. Jimmy Wärting <https://jimmy.warting.se/opensource> */
 
 exports.HTTPSnippet = HTTPSnippet;
 exports.addClientPlugin = addClientPlugin;