refactor: move collection data structures and utility functions to hopp/data

packages/hoppscotch-app/helpers/import-export/export/hopp.ts

@@ -1,10 +1,9 @@
-import { HoppRESTRequest } from "@hoppscotch/data"
+import { HoppRESTRequest, HoppCollection } from "@hoppscotch/data"
 import { pipe } from "fp-ts/function"
 import * as TE from "fp-ts/TaskEither"
 import { HoppExporter } from "."
-import { Collection } from "~/newstore/collections"
 
-const exporter: HoppExporter<Collection<HoppRESTRequest>> = (content) =>
+const exporter: HoppExporter<HoppCollection<HoppRESTRequest>> = (content) =>
   pipe(content, JSON.stringify, TE.right)
 
 export default exporter

packages/hoppscotch-app/helpers/import-export/export/index.ts

@@ -1,6 +1,5 @@
 import * as TE from "fp-ts/TaskEither"
-import { HoppRESTRequest } from "@hoppscotch/data"
-import { Collection } from "~/newstore/collections"
+import { HoppRESTRequest, HoppCollection } from "@hoppscotch/data"
 
 export type HoppExporter<T> = (content: T) => TE.TaskEither<string, string>
 
@@ -10,7 +9,7 @@ export type HoppExporterDefintion<T> = {
 }
 
 export const RESTCollectionExporters: HoppExporterDefintion<
-  Collection<HoppRESTRequest>
+  HoppCollection<HoppRESTRequest>
 >[] = [
   {
     name: "Hoppscotch REST Collection JSON",

packages/hoppscotch-app/helpers/import-export/import/gist.ts

@@ -3,13 +3,14 @@ import * as TE from "fp-ts/TaskEither"
 import * as TO from "fp-ts/TaskOption"
 import * as O from "fp-ts/Option"
 import axios from "axios"
-import { HoppRESTRequest } from "@hoppscotch/data"
+import { HoppRESTRequest, HoppCollection } from "@hoppscotch/data"
 import { step } from "../steps"
 import { defineImporter, IMPORTER_INVALID_FILE_FORMAT } from "."
-import { Collection } from "~/newstore/collections"
 
 // TODO: Add validation to output
-const fetchGist = (url: string): TO.TaskOption<Collection<HoppRESTRequest>> =>
+const fetchGist = (
+  url: string
+): TO.TaskOption<HoppCollection<HoppRESTRequest>> =>
   pipe(
     TO.tryCatch(() =>
       axios.get(`https://api.github.com/gists/${url.split("/").pop()}`, {

packages/hoppscotch-app/helpers/import-export/import/hopp.ts

@@ -1,9 +1,9 @@
 import { pipe } from "fp-ts/function"
 import * as TE from "fp-ts/TaskEither"
 import * as E from "fp-ts/Either"
+import { translateToNewRESTCollection } from "@hoppscotch/data"
 import { step } from "../steps"
 import { defineImporter, IMPORTER_INVALID_FILE_FORMAT } from "."
-import { translateToNewRESTCollection } from "~/newstore/collections"
 
 export default defineImporter({
   name: "import.from_json",

packages/hoppscotch-app/helpers/import-export/import/insomnia.ts

@@ -8,6 +8,8 @@ import {
   HoppRESTRequest,
   knownContentTypes,
   makeRESTRequest,
+  HoppCollection,
+  makeCollection,
 } from "@hoppscotch/data"
 import * as A from "fp-ts/Array"
 import * as S from "fp-ts/string"
@@ -15,7 +17,6 @@ import * as TO from "fp-ts/TaskOption"
 import * as TE from "fp-ts/TaskEither"
 import { step } from "../steps"
 import { defineImporter, IMPORTER_INVALID_FILE_FORMAT } from "."
-import { Collection, makeCollection } from "~/newstore/collections"
 
 // TODO: Insomnia allows custom prefixes for Bearer token auth, Hoppscotch doesn't. We just ignore the prefix for now
 
@@ -194,7 +195,7 @@ const getHoppRequest = (req: InsomniaRequestResource): HoppRESTRequest =>
 const getHoppFolder = (
   folderRes: InsomniaFolderResource,
   resources: InsomniaResource[]
-): Collection<HoppRESTRequest> =>
+): HoppCollection<HoppRESTRequest> =>
   makeCollection({
     name: folderRes.name ?? "",
     folders: getFoldersIn(folderRes, resources).map((f) =>

packages/hoppscotch-app/helpers/import-export/import/openapi.ts

@@ -15,6 +15,8 @@ import {
   HoppRESTRequest,
   knownContentTypes,
   makeRESTRequest,
+  HoppCollection,
+  makeCollection,
 } from "@hoppscotch/data"
 import { pipe, flow } from "fp-ts/function"
 import * as A from "fp-ts/Array"
@@ -24,7 +26,6 @@ import * as TE from "fp-ts/TaskEither"
 import * as RA from "fp-ts/ReadonlyArray"
 import { step } from "../steps"
 import { defineImporter, IMPORTER_INVALID_FILE_FORMAT } from "."
-import { Collection, makeCollection } from "~/newstore/collections"
 
 const OPENAPI_DEREF_ERROR = "openapi/deref_error" as const
 
@@ -558,7 +559,7 @@ const convertPathToHoppReqs = (
 
 const convertOpenApiDocToHopp = (
   doc: OpenAPI.Document
-): TE.TaskEither<never, Collection<HoppRESTRequest>[]> => {
+): TE.TaskEither<never, HoppCollection<HoppRESTRequest>[]> => {
   const name = doc.info.title
 
   const paths = Object.entries(doc.paths ?? {})

packages/hoppscotch-app/helpers/import-export/import/postman.ts

@@ -14,6 +14,8 @@ import {
   HoppRESTReqBody,
   HoppRESTRequest,
   makeRESTRequest,
+  HoppCollection,
+  makeCollection,
 } from "@hoppscotch/data"
 import { pipe, flow } from "fp-ts/function"
 import * as S from "fp-ts/string"
@@ -22,7 +24,6 @@ import * as O from "fp-ts/Option"
 import * as TE from "fp-ts/TaskEither"
 import { step } from "../steps"
 import { defineImporter, IMPORTER_INVALID_FILE_FORMAT } from "."
-import { Collection, makeCollection } from "~/newstore/collections"
 
 const safeParseJSON = (jsonStr: string) => O.tryCatch(() => JSON.parse(jsonStr))
 
@@ -226,7 +227,7 @@ const getHoppRequest = (item: Item): HoppRESTRequest => {
   })
 }
 
-const getHoppFolder = (ig: ItemGroup<Item>): Collection<HoppRESTRequest> =>
+const getHoppFolder = (ig: ItemGroup<Item>): HoppCollection<HoppRESTRequest> =>
   makeCollection({
     name: ig.name,
     folders: pipe(