Drop Morphic in favour of Schema.

effect-app · May 16, 2021 · 77116fd · 77116fd
1 parent 6eb5083
commit 77116fd
Show file tree

Hide file tree

Showing 20 changed files with 44 additions and 1,913 deletions.
diff --git a/.vscode/common-imports.code-snippets b/.vscode/common-imports.code-snippets
@@ -37,17 +37,10 @@
     "Model": {
         "prefix": "+MO",
         "body": [
-            "import * as MO from \"@effect-ts-demo/core/ext/Model\""
+            "import * as MO from \"@effect-ts-demo/core/ext/Schema\""
         ],
         "description": "Schema as MO"
     },
-    "Morphic": {
-        "prefix": "+MOR",
-        "body": [
-            "import * as MO from \"@effect-ts-demo/core/ext/Morphic\""
-        ],
-        "description": "Morphic as MO"
-    },
     "Effect": {
         "prefix": "+T",
         "body": [

diff --git a/.vscode/morphic.code-snippets b/.vscode/morphic.code-snippets
diff --git a/apps/api/Tasks/shared.ts b/apps/api/Tasks/shared.ts
@@ -4,7 +4,6 @@ import { NotLoggedInError } from "@effect-ts-demo/infra/errors"
 import { UserSVC } from "@effect-ts-demo/infra/services"
 import { TaskList, UserId } from "@effect-ts-demo/todo-types/"
 import * as T from "@effect-ts/core/Effect"
-import { AType, M } from "@effect-ts/morphic"
 import { SchemaAny } from "@effect-ts/schema"
 import { Chunk } from "@effect-ts/system/Collections/Immutable/Chunk"
 
@@ -27,14 +26,6 @@ export const getLoggedInUser = T.gen(function* ($) {
   )
 })
 
-export function makeHandler<
-  TReq extends M<{}, any, any>,
-  TRes extends M<{}, any, any>
->(_: { Request: TReq; Response: TRes }) {
-  // TODO: Prevent over providing, although strict encoding removes it already.
-  return <R, E>(h: (r: AType<TReq>) => T.Effect<R, E, AType<TRes>>) => h
-}
-
 export function handle<
   TReq extends { Model: SchemaAny },
   TRes extends { Model: SchemaAny } | SchemaAny = typeof S.Void

diff --git a/apps/api/package.json b/apps/api/package.json
@@ -11,7 +11,6 @@
         "@effect-ts/core": "^0.39.0",
         "@effect-ts/express": "^0.19.0",
         "@effect-ts/monocle": "^0.32.0",
-        "@effect-ts/morphic": "^0.35.0",
         "@effect-ts/node": "^0.24.0",
         "@effect-ts/schema": "^0.7.1",
         "body-parser": "^1.19.0",

diff --git a/apps/frontend/package.json b/apps/frontend/package.json
@@ -10,7 +10,6 @@
         "@effect-ts-demo/todo-types": "*",
         "@effect-ts/core": "^0.39.0",
         "@effect-ts/monocle": "^0.32.0",
-        "@effect-ts/morphic": "^0.35.0",
         "@effect-ts/react": "^0.2.0",
         "@effect-ts/schema": "^0.7.1",
         "@emotion/react": "^11.4.0",

diff --git a/packages/atlas-plutus/package.json b/packages/atlas-plutus/package.json
@@ -12,6 +12,7 @@
         "lint": "eslint . --ext .ts,.tsx"
     },
     "dependencies": {
+        "@effect-ts/morphic": "^0.35.0",
         "redoc-express": "^1.0.0"
     }
 }
diff --git a/packages/client/fetch.ts b/packages/client/fetch.ts
@@ -11,9 +11,6 @@ import * as S from "@effect-ts-demo/core/ext/Schema"
 import * as H from "@effect-ts-demo/core/http/http-client"
 import { pipe } from "@effect-ts/core"
 import { flow } from "@effect-ts/core/Function"
-import { M } from "@effect-ts/morphic"
-import { Decode, decode, Errors } from "@effect-ts/morphic/Decoder"
-import * as MO from "@effect-ts/morphic/Encoder"
 import { Path } from "path-parser"
 
 import { getConfig } from "./config"
@@ -28,7 +25,6 @@ export class ResponseError {
   constructor(public readonly error: unknown) {}
 }
 
-export const mapResponseError = T.mapError((err: Errors) => new ResponseError(err))
 export const mapResponseErrorS = T.mapError((err: unknown) => new ResponseError(err))
 
 export function fetchApi(method: H.Method, path: string, body?: unknown) {
@@ -44,21 +40,6 @@ export function fetchApi(method: H.Method, path: string, body?: unknown) {
   )
 }
 
-type Encode<A, E> = MO.Encoder<A, E>["encode"]
-
-export function fetchApi2<RequestA, RequestE, ResponseA>(
-  encodeRequest: Encode<RequestA, RequestE>,
-  decodeResponse: Decode<ResponseA>
-) {
-  const decodeRes = flow(decodeResponse, mapResponseError)
-  return (method: H.Method, path: string) => (req: RequestA) =>
-    pipe(
-      encodeRequest(req),
-      T.chain((r) => fetchApi(method, path, r)),
-      T.chain(decodeRes)
-    )
-}
-
 type ComputeUnlessClass<T> = T extends { new (...args: any[]): any } ? T : Compute<T>
 
 export function fetchApi2S<RequestA, RequestE, ResponseA>(
@@ -79,23 +60,6 @@ export function fetchApi2S<RequestA, RequestE, ResponseA>(
     )
 }
 
-export function fetchApi3<RequestA, RequestE, ResponseE, ResponseA>(
-  {
-    Request,
-    Response,
-  }: {
-    // eslint-disable-next-line @typescript-eslint/ban-types
-    Request: M<{}, RequestE, RequestA>
-    // eslint-disable-next-line @typescript-eslint/ban-types
-    Response: M<{}, ResponseE, ResponseA>
-  },
-  method: H.Method = "POST"
-) {
-  const encodeRequest = MO.encode(Request)
-  const decodeResponse = decode(Response)
-  return (path: string) => fetchApi2(encodeRequest, decodeResponse)(method, path)
-}
-
 // TODO: validate headers vs path vs body vs query?
 export function fetchApi3S<RequestA, RequestE, ResponseE = unknown, ResponseA = void>({
   Request,

diff --git a/packages/client/package.json b/packages/client/package.json
@@ -8,7 +8,6 @@
         "@effect-ts-demo/todo-types": "*",
         "@effect-ts/core": "^0.39.0",
         "@effect-ts/monocle": "^0.32.0",
-        "@effect-ts/morphic": "^0.35.0",
         "cross-fetch": "^3.1.4",
         "path-parser": "^6.1.0"
     },

diff --git a/packages/core/ext/Morphic/array.ts b/packages/core/ext/Morphic/array.ts
diff --git a/packages/core/ext/Morphic/index.ts b/packages/core/ext/Morphic/index.ts