From 24fabc8b7be6a70030d12a16f675556799520484 Mon Sep 17 00:00:00 2001 From: Andrew Bastin Date: Fri, 7 Jan 2022 23:46:20 +0530 Subject: [PATCH] feat: correct typing and rename newopenapi importer to openapi --- .../helpers/import-export/import/importers.ts | 4 ++-- .../import-export/import/{newopenapi.ts => openapi.ts} | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) rename packages/hoppscotch-app/helpers/import-export/import/{newopenapi.ts => openapi.ts} (99%) diff --git a/packages/hoppscotch-app/helpers/import-export/import/importers.ts b/packages/hoppscotch-app/helpers/import-export/import/importers.ts index 69ee495ed..90bed3887 100644 --- a/packages/hoppscotch-app/helpers/import-export/import/importers.ts +++ b/packages/hoppscotch-app/helpers/import-export/import/importers.ts @@ -1,7 +1,7 @@ import HoppRESTCollImporter from "./hopp" -import NewOpenAPIImporter from "./newopenapi" +import OpenAPIImporter from "./openapi" export const RESTCollectionImporters = [ HoppRESTCollImporter, - NewOpenAPIImporter, + OpenAPIImporter, ] as const diff --git a/packages/hoppscotch-app/helpers/import-export/import/newopenapi.ts b/packages/hoppscotch-app/helpers/import-export/import/openapi.ts similarity index 99% rename from packages/hoppscotch-app/helpers/import-export/import/newopenapi.ts rename to packages/hoppscotch-app/helpers/import-export/import/openapi.ts index 8c2871ddd..2299dda1d 100644 --- a/packages/hoppscotch-app/helpers/import-export/import/newopenapi.ts +++ b/packages/hoppscotch-app/helpers/import-export/import/openapi.ts @@ -557,20 +557,20 @@ const convertPathToHoppReqs = ( const convertOpenApiDocToHopp = ( doc: OpenAPI.Document -): TE.TaskEither> => { +): TE.TaskEither[]> => { const name = doc.info.title const paths = Object.entries(doc.paths ?? {}) .map(([pathName, pathObj]) => convertPathToHoppReqs(doc, pathName, pathObj)) .flat() - return TE.of( + return TE.of([ makeCollection({ name, folders: [], requests: paths, - }) - ) + }), + ]) } export default defineImporter({