Fix compilation errors.

Author: patroza

apps/frontend/Todo.ts

@@ -2,6 +2,7 @@ import * as A from "@effect-ts-demo/core/ext/Array"
 import {
   array,
   constructor,
+  identity,
   Model,
   literal,
   NonEmptyString,
@@ -15,10 +16,13 @@ import {
   These,
   union,
   reasonableString,
+  parseStringE,
+  leafE,
+  ReasonableString,
 } from "@effect-ts-demo/core/ext/Schema"
 import * as Todo from "@effect-ts-demo/todo-client/Tasks"
 import { TaskId, TaskListId } from "@effect-ts-demo/todo-client/Tasks"
-import { constant, flow, identity, pipe } from "@effect-ts/core/Function"
+import { constant, flow, pipe, identity as ident } from "@effect-ts/core/Function"
 import * as O from "@effect-ts/core/Option"
 import * as ORD from "@effect-ts/core/Ord"
 import { Lens } from "@effect-ts/monocle"
@@ -151,8 +155,12 @@ const isOrder = (u: any): u is Order & NonEmptyString => u in orders
 export const Order = nonEmptyString[">>>"](
   pipe(
     identity(isOrder),
-    parser((x) => (isOrder(x) ? These.succeed(x) : These.fail("not order"))),
-    constructor((x) => (isOrder(x) ? These.succeed(x) : These.fail("not order")))
+    parser((x) =>
+      isOrder(x) ? These.succeed(x) : These.fail(leafE(parseStringE("not order")))
+    ),
+    constructor((x) =>
+      isOrder(x) ? These.succeed(x) : These.fail(leafE(parseStringE("not order")))
+    )
   )
 ) // TODO
 
@@ -162,8 +170,12 @@ const isOrderDir = (u: any): u is OrderDir & NonEmptyString => u in orders
 export const OrderDir = nonEmptyString[">>>"](
   pipe(
     identity(isOrderDir),
-    parser((x) => (isOrderDir(x) ? These.succeed(x) : These.fail("not order"))),
-    constructor((x) => (isOrderDir(x) ? These.succeed(x) : These.fail("not order")))
+    parser((x) =>
+      isOrderDir(x) ? These.succeed(x) : These.fail(leafE(parseStringE("not order")))
+    ),
+    constructor((x) =>
+      isOrderDir(x) ? These.succeed(x) : These.fail(leafE(parseStringE("not order")))
+    )
   )
 ) // TODO
 
@@ -188,10 +200,10 @@ export function filterByCategory(category: TaskView | string) {
       return A.filter((t: Todo.Task) => t.listId === "inbox")
     }
     case "all": {
-      return identity
+      return ident
     }
     default:
-      return A.filter((t: Todo.Task) => t.listId === category)
+      return A.filter((t: Todo.Task) => t.listId === (category as any))
   }
 }
 
@@ -207,8 +219,8 @@ function isSameDay(today: Date) {
 
 export const emptyTasks = [] as readonly Todo.Task[]
 
-export const Category = nonEmptyString
-export type Category = NonEmptyString
+export const Category = reasonableString
+export type Category = ReasonableString
 
 export * from "@effect-ts-demo/todo-types"
 export * from "@effect-ts-demo/todo-types/Task"

apps/frontend/features/Tasks/FolderList/FolderList.tsx

@@ -55,7 +55,7 @@ function TLG(g: Todo.TaskListGroup) {
                     >
                       <TaskListEntry
                         {...l}
-                        title={("| -- " + l.title) as S.NonEmptyString}
+                        title={("| -- " + l.title) as S.ReasonableString}
                       />
                     </Box>
                   )}

apps/frontend/features/Tasks/FolderList/index.tsx

@@ -57,14 +57,14 @@ const FolderListView = ({ category }: { category: O.Option<Todo.Category> }) =>
           A.map(
             ({ slug, tasks }) =>
               new TaskListView({
-                title: toUpperCaseFirst(slug) as S.NonEmptyString,
+                title: toUpperCaseFirst(slug) as S.ReasonableString,
                 slug,
                 count: tasks.length,
               })
           )
         ),
         new TaskListView({
-          title: "Tasks" as S.NonEmptyString,
+          title: "Tasks" as S.ReasonableString,
           slug: "tasks",
           count: unfilteredTasks["|>"](filterByCategory("inbox")).length,
         }),

apps/frontend/features/Tasks/TaskList/index.tsx

@@ -21,7 +21,14 @@ import { TodoClient } from "@/index"
 import { Todo } from "@/index"
 import { renderIf_, toUpperCaseFirst } from "@/utils"
 
-import { useGetTask, useMe, useModifyMe, useNewTask, useTasks } from "../data"
+import {
+  parseRSunsafe,
+  useGetTask,
+  useMe,
+  useModifyMe,
+  useNewTask,
+  useTasks,
+} from "../data"
 import { useRouting } from "../routing"
 
 import TaskList from "./TaskList"
@@ -81,7 +88,9 @@ const TaskListView = memo(function ({
       ? category === "tasks"
         ? meResult.value.right.inboxOrder
         : A.findFirstMap_(meResult.value.right.lists, (l) =>
-            l._tag === "TaskList" && l.id === category ? O.some(l.order) : O.none
+            l._tag === "TaskList" && l.id === (category as any)
+              ? O.some(l.order)
+              : O.none
           )["|>"](O.getOrElse(() => []))
       : []
     const tasks = unfilteredTasks["|>"](Todo.filterByCategory(category))
@@ -116,7 +125,9 @@ const TaskListView = memo(function ({
           ? { inboxOrder: order }
           : {
               lists: A.map_(r.lists, (l) =>
-                l.id === category && l._tag === "TaskList" ? { ...l, order } : l
+                l.id === (category as any) && l._tag === "TaskList"
+                  ? { ...l, order }
+                  : l
               ),
             }),
       }))
@@ -166,7 +177,7 @@ const TaskListView = memo(function ({
             fullWidth
             placeholder="Add a Task"
             disabled={addTask.loading}
-            onChange={addTask}
+            onChange={flow(parseRSunsafe, addTask)}
           />
         </Box>
       </>

apps/frontend/features/Tasks/data.ts

@@ -77,16 +77,16 @@ export function useTasks() {
 }
 
 const newTask =
-  (v: Todo.TaskView | S.NonEmptyString, listId: Todo.TaskListIdU = "inbox") =>
-  (newTitle: S.NonEmptyString) =>
+  (v: Todo.TaskView | S.ReasonableString, listId: Todo.TaskListIdU = "inbox") =>
+  (newTitle: S.ReasonableString) =>
     TodoClient.TasksClient.CreateTask({
       title: newTitle,
       isFavorite: v === "important",
       myDay: v === "my-day" ? O.some(new Date()) : O.none,
       listId,
     })
 export function useNewTask(
-  v: Todo.TaskView | S.NonEmptyString,
+  v: Todo.TaskView | S.ReasonableString,
   listId?: Todo.TaskListId
 ) {
   return useFetch(newTask(v, listId))
@@ -224,7 +224,8 @@ export function useTaskCommandsResolved(t: Todo.Task) {
   }
 }
 
-const parseNES = Parser.for(S.nonEmptyString)["|>"](S.condemnFail)
+export const parseRS = Parser.for(S.reasonableString)["|>"](S.condemnFail)
+export const parseRSunsafe = Parser.for(S.reasonableString)["|>"](S.unsafe)
 
 export function useTaskCommands(id: Todo.TaskId) {
   const modifyTasks = useModifyTasks()
@@ -263,7 +264,7 @@ export function useTaskCommands(id: Todo.TaskId) {
     function updateStepTitle(t: Todo.Task) {
       return (s: Todo.Step) =>
         flow(
-          parseNES,
+          parseRS,
           T.map((stepTitle) => t["|>"](Todo.Task.updateStep(s, stepTitle))),
           T.chain(updateAndRefreshTask)
         )
@@ -287,7 +288,7 @@ export function useTaskCommands(id: Todo.TaskId) {
 
     function addNewTaskStep(t: Todo.Task) {
       return flow(
-        parseNES,
+        parseRS,
         T.map((title) => t["|>"](Todo.Task.addStep(title))),
         T.chain(updateAndRefreshTask)
       )
@@ -303,7 +304,7 @@ export function useTaskCommands(id: Todo.TaskId) {
 
     function setTitle(t: Todo.Task) {
       return flow(
-        parseNES,
+        parseRS,
         T.map((v) => t["|>"](Todo.Task.lens["|>"](Lens.prop("title")).set(v))),
         T.chain(updateAndRefreshTask)
       )
@@ -321,7 +322,7 @@ export function useTaskCommands(id: Todo.TaskId) {
       return (note: string | null) =>
         pipe(
           EO.fromNullable(note),
-          EO.chainEffect(parseNES),
+          EO.chainEffect(parseRS),
           T.chain((note) => updateAndRefreshTask({ id: t.id, note }))
         )
     }

packages/core/ext/Schema/_api/string.ts

@@ -28,7 +28,8 @@ export interface ReasonableStringBrand {
   readonly ReasonableString: unique symbol
 }
 
-export type ReasonableString = S.NonEmptyString & ReasonableStringBrand
+// TODO: Evaluate if it makes sense to inherit the others too.
+export type ReasonableString = TextString & LongString & ReasonableStringBrand
 
 export const reasonableStringFromString = pipe(
   makeConstrainedFromString<ReasonableString>(1, 256 - 1),
@@ -45,7 +46,8 @@ export interface LongStringBrand {
   readonly LongString: unique symbol
 }
 
-export type LongString = S.NonEmptyString & LongStringBrand
+// TODO: Evaluate if it makes sense to inherit the others too.
+export type LongString = TextString & LongStringBrand
 
 export const longStringFromString = pipe(
   makeConstrainedFromString<LongString>(1, 2048 - 1),