Update with latest libs (#16)

* Prepare lib update

* api fixed

* Drop libs submodule

* all fixed

* all fixed

* all fixed

.vscode/model.code-snippets

@@ -10,31 +10,31 @@
     "GetRequest": {
         "prefix": "gr",
         "body": [
-            "export default class Request extends Get(\"/$1\")<Request>()({$2}) {}",
+            "export class Request extends Get(\"/$1\")<Request>()({$2}) {}",
             ""
         ],
         "description": "Defines a GetRequest signature"
     },
     "DeleteRequest": {
         "prefix": "dr",
         "body": [
-            "export default class Request extends Delete(\"/$1\")<Request>()({$2}) {}",
+            "export class Request extends Delete(\"/$1\")<Request>()({$2}) {}",
             ""
         ],
         "description": "Defines a DeleteRequest signature"
     },
     "PatchRequest": {
         "prefix": "par",
         "body": [
-            "export default class Request extends Patch(\"/$1\")<Request>()({$2}) {}",
+            "export class Request extends Patch(\"/$1\")<Request>()({$2}) {}",
             ""
         ],
         "description": "Defines a PatchRequest signature"
     },
     "PutRequest": {
         "prefix": "pur",
         "body": [
-            "export default class Request extends Put(\"/$1\")<Request>()({$2}) {}",
+            "export class Request extends Put(\"/$1\")<Request>()({$2}) {}",
             ""
         ],
         "description": "Defines a PutRequest signature"

README.md

@@ -20,9 +20,7 @@ TODO: Implement a Layer to demo replacing for example the persistence mechanism.
 ## Getting Started
 
 From repo root:
-- `git submodule update --init --recursive`
 - `yarn`
-- `yarn libs-fix` - this installs some npm bins to libs, do **not** run `yarn` inside the libs folder!
 - `yarn dev`
 - visit `http://localhost:3133`
 - for api docs, visit: `http://localhost:3330/docs` or `http://localhost:3330/swagger`
@@ -34,16 +32,6 @@ Interesting bits are in:
 
 You can interact via the included frontend project, the docs or swagger endpoint, Postman (by importing api/openapi.json), or go wild with `curl` if that's your thing ;-)
 
-### A word on the libs submodule
-
-While not ideal, I like developing the sample app and the libraries in tandem,
-as such the easiest way to do this is not to have to deploy to NPM and update the packages every time the libs change.
-I've tried many different setups, but the current one seems to tick most of the boxes (always a compromise).
-The trick now is to have the libs node_modules/.bin installed (linked to root node_modules), but not the actual packages.
-You have been warned :) Duplicate effect-ts packages etc will ruin your day!
-
-Once the libs stabilise, we can switch to published npm packages.
-
 ### Postman
 
 1. import [openapi.json](apps/api/openapi.json)

apps/api/Me/_routes.ts

@@ -1,6 +1,6 @@
 import * as A from "@effect-ts/core/Collections/Immutable/Array"
 import * as T from "@effect-ts/core/Effect"
-import * as R from "@effect-ts-app/infra/express/schema/routing"
+import * as R from "@effect-ts-app/infra/express/routing"
 
 import { demandLoggedIn } from "@/middleware"
 

apps/api/TaskLists/_routes.ts

@@ -1,6 +1,6 @@
 import * as A from "@effect-ts/core/Collections/Immutable/Array"
 import * as T from "@effect-ts/core/Effect"
-import * as R from "@effect-ts-app/infra/express/schema/routing"
+import * as R from "@effect-ts-app/infra/express/routing"
 
 import { demandLoggedIn } from "@/middleware"
 

apps/api/Tasks/Create.test.ts

@@ -2,9 +2,10 @@
 import * as T from "@effect-ts/core/Effect"
 import * as Test from "@effect-ts/jest/Test"
 import * as O from "@effect-ts-app/core/Option"
+import { ReasonableString } from "@effect-ts-app/core/Schema"
 import { TaskAudits, TaskEvents } from "@effect-ts-demo/todo-types/Task"
 
-import { reasonableStringUnsafe, testUser } from "@/test.helpers"
+import { testUser } from "@/test.helpers"
 
 import { createTask_ } from "./Create"
 
@@ -18,7 +19,7 @@ it("returns domain events", () =>
       listId: "inbox",
       myDay: O.none,
       isFavorite: false,
-      title: reasonableStringUnsafe("Test task"),
+      title: ReasonableString.unsafe("Test task"),
     })
 
     expect(events).toEqual([
@@ -32,7 +33,7 @@ it("adds an Audit on creation", () =>
       listId: "inbox",
       myDay: O.none,
       isFavorite: false,
-      title: reasonableStringUnsafe("Test task"),
+      title: ReasonableString.unsafe("Test task"),
     })
 
     expect(task.auditLog[0]).toEqual(

apps/api/Tasks/Create.ts

@@ -29,7 +29,7 @@ export default handle(Tasks.Create)((input) =>
   })
 )
 
-export function createTask_(user: User, input: Tasks.Create.default) {
+export function createTask_(user: User, input: Tasks.Create.CreateTaskRequest) {
   const task = User.createTask._(user, input)
 
   return tuple(

apps/api/Tasks/Search.external.test.ts

@@ -3,9 +3,9 @@ import * as T from "@effect-ts/core/Effect"
 import * as L from "@effect-ts/core/Effect/Layer"
 import * as Test from "@effect-ts/jest/Test"
 import * as HF from "@effect-ts-app/core/http/http-client-fetch"
+import { PositiveInt } from "@effect-ts-app/core/Schema"
 import { LiveApiConfig } from "@effect-ts-demo/todo-client/config"
 import { searchWithFields } from "@effect-ts-demo/todo-client/Tasks/_custom"
-import { positiveIntUnsafe } from "@effect-ts-demo/todo-client/test.helpers"
 import fetch from "cross-fetch"
 
 import { managedServer } from "@/test.setup"
@@ -36,7 +36,7 @@ it("works with partial call", () =>
   T.gen(function* ($) {
     const req = {
       $select: ["id", "title"] as const,
-      $skip: positiveIntUnsafe(10),
+      $skip: PositiveInt.unsafe(10),
       $count: true,
     }
 

apps/api/Tasks/Update.test.ts

@@ -2,11 +2,12 @@
 import * as T from "@effect-ts/core/Effect"
 import * as Test from "@effect-ts/jest/Test"
 import * as O from "@effect-ts-app/core/Option"
+import { LongString, ReasonableString } from "@effect-ts-app/core/Schema"
 import { User } from "@effect-ts-demo/todo-types/"
 import { TaskAudits } from "@effect-ts-demo/todo-types/Task"
 import { Attachment } from "@effect-ts-demo/todo-types/Task/shared"
 
-import { longStringUnsafe, reasonableStringUnsafe, testUser } from "@/test.helpers"
+import { testUser } from "@/test.helpers"
 
 import { updateTask } from "./Update"
 
@@ -15,14 +16,14 @@ const { it } = Test.runtime()
 const user = testUser()
 const initialTask = user["|>"](
   User.createTask({
-    title: reasonableStringUnsafe("hi"),
+    title: ReasonableString.unsafe("hi"),
   })
 )
 
 it("changes the provided props", () =>
   T.succeedWith(() => {
     const [task, events] = initialTask["|>"](
-      updateTask({ title: reasonableStringUnsafe("ho") }, user.id)
+      updateTask({ title: ReasonableString.unsafe("ho") }, user.id)
     )
 
     expect(task.title).not.toBe(initialTask.title)
@@ -72,9 +73,9 @@ it("adds reminder to user", () =>
 it("adds an Audit on file attachment added", () =>
   T.succeedWith(() => {
     const a = new Attachment({
-      fileName: reasonableStringUnsafe("abc.gif"),
-      url: longStringUnsafe("http://alabalbla/balbla/abc.gif"),
-      mimetype: reasonableStringUnsafe("application/gif"),
+      fileName: ReasonableString.unsafe("abc.gif"),
+      url: LongString.unsafe("http://alabalbla/balbla/abc.gif"),
+      mimetype: ReasonableString.unsafe("application/gif"),
     })
 
     const [task, events] = initialTask["|>"](

apps/api/Tasks/_routes.ts

@@ -1,6 +1,6 @@
 import * as A from "@effect-ts/core/Collections/Immutable/Array"
 import * as T from "@effect-ts/core/Effect"
-import * as R from "@effect-ts-app/infra/express/schema/routing"
+import * as R from "@effect-ts-app/infra/express/routing"
 
 import { demandLoggedIn } from "@/middleware"