Improve Curl imports

plugins/importer-curl/src/index.ts

@@ -184,7 +184,7 @@ export function importCommand(parseEntries: ParseEntry[], workspaceId: string) {
   urlParameters =
     search?.split('&').map((p) => {
       const v = splitOnce(p, '=');
-      return { name: v[0] ?? '', value: v[1] ?? '' };
+      return { name: v[0] ?? '', value: v[1] ?? '', enabled: true };
     }) ?? [];
 
   url = baseUrl ?? urlArg;
@@ -212,11 +212,13 @@ export function importCommand(parseEntries: ParseEntry[], workspaceId: string) {
       return {
         name: (name ?? '').trim().replace(/;$/, ''),
         value: '',
+        enabled: true,
       };
     }
     return {
       name: (name ?? '').trim(),
       value: value.trim(),
+      enabled: true,
     };
   });
 
@@ -243,6 +245,7 @@ export function importCommand(parseEntries: ParseEntry[], workspaceId: string) {
     headers.push({
       name: 'Cookie',
       value: cookieHeaderValue,
+      enabled: true,
     });
   }
 
@@ -286,12 +289,17 @@ export function importCommand(parseEntries: ParseEntry[], workspaceId: string) {
   ) {
     bodyType = mimeType ?? 'application/x-www-form-urlencoded';
     body = {
-      params: dataParameters.map((parameter) => ({
+      form: dataParameters.map((parameter) => ({
         ...parameter,
         name: decodeURIComponent(parameter.name || ''),
         value: decodeURIComponent(parameter.value || ''),
       })),
     };
+    headers.push({
+      name: 'Content-Type',
+      value: 'application/x-www-form-urlencoded',
+      enabled: true,
+    });
   } else if (dataParameters.length > 0) {
     bodyType =
       mimeType === 'application/json' || mimeType === 'text/xml' || mimeType === 'text/plain'
@@ -307,13 +315,20 @@ export function importCommand(parseEntries: ParseEntry[], workspaceId: string) {
     body = {
       form: formDataParams,
     };
+    if (mimeType == null) {
+      headers.push({
+        name: 'Content-Type',
+        value: 'multipart/form-data',
+        enabled: true,
+      });
+    }
   }
 
   // Method
   let method = getPairValue(pairsByName, '', ['X', 'request']).toUpperCase();
 
   if (method === '' && body) {
-    method = 'text' in body || 'params' in body ? 'POST' : 'GET';
+    method = 'text' in body || 'form' in body ? 'POST' : 'GET';
   }
 
   const request: ExportResources['httpRequests'][0] = {
@@ -342,6 +357,7 @@ const pairsToDataParameters = (keyedPairs: PairsByName) => {
     value: string;
     contentType?: string;
     filePath?: string;
+    enabled?: boolean;
   }[] = [];
 
   for (const flagName of DATA_FLAGS) {
@@ -361,11 +377,13 @@ const pairsToDataParameters = (keyedPairs: PairsByName) => {
           name: name ?? '',
           value: '',
           filePath: p.slice(1),
+          enabled: true,
         });
       } else {
         dataParameters.push({
           name: name ?? '',
           value: flagName === 'data-urlencode' ? encodeURIComponent(value ?? '') : value ?? '',
+          enabled: true,
         });
       }
     }

plugins/importer-curl/tests/index.test.ts

@@ -122,6 +122,13 @@ describe('importer-curl', () => {
           baseRequest({
             method: 'POST',
             url: 'https://yaak.app',
+            headers: [
+              {
+                name: 'Content-Type',
+                value: 'multipart/form-data',
+                enabled: true,
+              },
+            ],
             bodyType: 'multipart/form-data',
             body: {
               form: [
@@ -145,11 +152,18 @@ describe('importer-curl', () => {
             method: 'POST',
             url: 'https://yaak.app',
             bodyType: 'application/x-www-form-urlencoded',
+            headers: [
+              {
+                name: 'Content-Type',
+                value: 'application/x-www-form-urlencoded',
+                enabled: true,
+              },
+            ],
             body: {
-              params: [
-                { name: 'a', value: '' },
-                { name: 'b', value: '' },
-                { name: 'c', value: 'ccc' },
+              form: [
+                { name: 'a', value: '', enabled: true },
+                { name: 'b', value: '', enabled: true },
+                { name: 'c', value: 'ccc', enabled: true },
               ],
             },
           }),
@@ -168,7 +182,7 @@ describe('importer-curl', () => {
           baseRequest({
             method: 'POST',
             url: 'https://yaak.app',
-            headers: [{ name: 'Content-Type', value: 'text/plain' }],
+            headers: [{ name: 'Content-Type', value: 'text/plain', enabled: true }],
             bodyType: 'text/plain',
             body: { text: 'a&b&c=ccc' },
           }),
@@ -189,7 +203,7 @@ describe('importer-curl', () => {
           baseRequest({
             method: 'POST',
             url: 'https://yaak.app',
-            headers: [{ name: 'Content-Type', value: 'application/json' }],
+            headers: [{ name: 'Content-Type', value: 'application/json', enabled: true }],
             bodyType: 'application/json',
             body: { text: '{\n  "foo":"bar"\n}' },
           }),
@@ -208,10 +222,10 @@ describe('importer-curl', () => {
           baseRequest({
             url: 'https://yaak.app',
             headers: [
-              { name: 'Name', value: '' },
-              { name: 'Foo', value: 'bar' },
-              { name: 'AAA', value: 'bbb' },
-              { name: '', value: 'ccc' },
+              { name: 'Name', value: '', enabled: true },
+              { name: 'Foo', value: 'bar', enabled: true },
+              { name: 'AAA', value: 'bbb', enabled: true },
+              { name: '', value: 'ccc', enabled: true },
             ],
           }),
         ],
@@ -262,7 +276,7 @@ describe('importer-curl', () => {
         httpRequests: [
           baseRequest({
             url: 'https://yaak.app',
-            headers: [{ name: 'Cookie', value: 'foo=bar' }],
+            headers: [{ name: 'Cookie', value: 'foo=bar', enabled: true }],
           }),
         ],
       },
@@ -277,8 +291,8 @@ describe('importer-curl', () => {
           baseRequest({
             url: 'https://yaak.app',
             urlParameters: [
-              { name: 'foo', value: 'bar' },
-              { name: 'baz', value: 'a%20a' },
+              { name: 'foo', value: 'bar', enabled: true },
+              { name: 'baz', value: 'a%20a', enabled: true },
             ],
           }),
         ],