Effect 2.2.2 and Schema 0.61.2

Schema parse renamed to decodeUnknown.
evoluhq · Jan 26, 2024 · f1d76d3 · f1d76d3 · vercel · Jan 26, 2024
1 parent f6e0339
commit f1d76d3
Show file tree

Hide file tree

Showing 23 changed files with 766 additions and 772 deletions.
diff --git a/.changeset/modern-beds-tickle.md b/.changeset/modern-beds-tickle.md
@@ -0,0 +1,8 @@
+---
+"@evolu/common": patch
+"@evolu/server": patch
+---
+
+Effect 2.2.2 and Schema 0.61.2
+
+Schema parse renamed to decodeUnknown.
diff --git a/apps/native/App.tsx b/apps/native/App.tsx
@@ -122,7 +122,7 @@ const OwnerActions: FC = () => {
   const [isMnemonicShown, setIsMnemonicShown] = useState(false);
   const [isRestoreShown, setIsRestoreShown] = useState(false);
   const [mnemonic, setMnemonic] = useState("");
-  const parsedMnemonic = S.parseEither(NonEmptyString1000)(mnemonic);
+  const parsedMnemonic = S.decodeUnknownEither(NonEmptyString1000)(mnemonic);
 
   const handleMnemonicInputEndEditing = (): void => {
     Either.match(parsedMnemonic, {
@@ -210,7 +210,7 @@ const Todos: FC = () => {
   const { create } = useEvolu<Database>();
 
   const [text, setText] = useState("");
-  const newTodoTitle = S.parseEither(NonEmptyString1000)(text);
+  const newTodoTitle = S.decodeUnknownEither(NonEmptyString1000)(text);
   const handleTextInputEndEditing = (): void => {
     Either.match(newTodoTitle, {
       onLeft: Function.constVoid,
@@ -334,7 +334,7 @@ const TodoCategories: FC = () => {
   const { rows } = useQuery(todoCategories);
 
   const [text, setText] = useState("");
-  const newTodoTitle = S.parseEither(NonEmptyString50)(text);
+  const newTodoTitle = S.decodeUnknownEither(NonEmptyString50)(text);
   const handleTextInputEndEditing = (): void => {
     Either.match(newTodoTitle, {
       onLeft: Function.constVoid,

diff --git a/apps/native/package.json b/apps/native/package.json
@@ -11,12 +11,12 @@
     "clean": "rm -rf .turbo .expo node_modules dist"
   },
   "dependencies": {
-    "@effect/schema": "^0.60.7",
+    "@effect/schema": "^0.61.2",
     "@evolu/react-native": "workspace:*",
     "@react-native-community/netinfo": "9.3.10",
     "buffer": "^6.0.3",
     "crypto-browserify": "^3.12.0",
-    "effect": "2.2.0",
+    "effect": "2.2.2",
     "events": "^3.3.0",
     "expo": "^49.0.21",
     "expo-sqlite": "~11.3.3",

diff --git a/apps/web/components/NextJsExample.tsx b/apps/web/components/NextJsExample.tsx
@@ -85,11 +85,11 @@ const createFixtures = (): Promise<void> =>
     if (todos.row || categories.row) return;
 
     const { id: notUrgentCategoryId } = evolu.create("todoCategory", {
-      name: S.parseSync(NonEmptyString50)("Not Urgent"),
+      name: S.decodeSync(NonEmptyString50)("Not Urgent"),
     });
 
     evolu.create("todo", {
-      title: S.parseSync(NonEmptyString1000)("Try React Suspense"),
+      title: S.decodeSync(NonEmptyString1000)("Try React Suspense"),
       categoryId: notUrgentCategoryId,
     });
   });
@@ -417,13 +417,13 @@ const Button: FC<{
 };
 
 const prompt = <From extends string, To>(
-  schema: S.Schema<From, To>,
+  schema: S.Schema<never, From, To>,
   message: string,
   onSuccess: (value: To) => void,
 ): void => {
   const value = window.prompt(message);
   if (value == null) return; // on cancel
-  const a = S.parseEither(schema)(value);
+  const a = S.decodeUnknownEither(schema)(value);
   if (a._tag === "Left") {
     alert(formatError(a.left));
     return;

diff --git a/apps/web/package.json b/apps/web/package.json
@@ -10,11 +10,11 @@
     "clean": "rm -rf .turbo .next node_modules"
   },
   "dependencies": {
-    "@effect/schema": "^0.60.7",
+    "@effect/schema": "^0.61.2",
     "@evolu/common": "workspace:*",
     "@evolu/react": "workspace:*",
     "clsx": "^2.1.0",
-    "effect": "2.2.0",
+    "effect": "2.2.2",
     "next": "14.1.0",
     "nextra": "^2.13.2",
     "nextra-theme-docs": "^2.13.2",

diff --git a/apps/web/pages/docs/quickstart.mdx b/apps/web/pages/docs/quickstart.mdx
@@ -56,7 +56,7 @@ It has to be parsed with the `NonEmptyString1000` schema. Isn't that beautiful?
 import * as S from "@effect/schema/Schema";
 import { NonEmptyString1000 } from "@evolu/react";
 
-S.parse(NonEmptyString1000)(title);
+S.decode(NonEmptyString1000)(title);
 ```
 
 Learn more about [Schema](https://github.com/effect-ts/schema).

diff --git a/apps/web/pages/index.mdx b/apps/web/pages/index.mdx
@@ -86,7 +86,7 @@ const { rows } = useQuery(allTodos);
 // Create a todo.
 const { create } = useEvolu<Database>();
 create("todo", {
-  title: S.parseSync(NonEmptyString1000)("Learn Effect"),
+  title: S.decodeSync(NonEmptyString1000)("Learn Effect"),
 });
 
 // Update a todo.

diff --git a/examples/electron-app/src/Example.tsx b/examples/electron-app/src/Example.tsx
@@ -80,11 +80,11 @@ const createFixtures = (): Promise<void> =>
     if (todos.row || categories.row) return;
 
     const { id: notUrgentCategoryId } = evolu.create("todoCategory", {
-      name: S.parseSync(NonEmptyString50)("Not Urgent"),
+      name: S.decodeSync(NonEmptyString50)("Not Urgent"),
     });
 
     evolu.create("todo", {
-      title: S.parseSync(NonEmptyString1000)("Try React Suspense"),
+      title: S.decodeSync(NonEmptyString1000)("Try React Suspense"),
       categoryId: notUrgentCategoryId,
     });
   });
@@ -412,13 +412,13 @@ const Button: FC<{
 };
 
 const prompt = <From extends string, To>(
-  schema: S.Schema<From, To>,
+  schema: S.Schema<never, From, To>,
   message: string,
   onSuccess: (value: To) => void,
 ): void => {
   const value = window.prompt(message);
   if (value == null) return; // on cancel
-  const a = S.parseEither(schema)(value);
+  const a = S.decodeUnknownEither(schema)(value);
   if (a._tag === "Left") {
     alert(formatError(a.left));
     return;

diff --git a/examples/nextjs/app/page.tsx b/examples/nextjs/app/page.tsx
@@ -82,11 +82,11 @@ const createFixtures = (): Promise<void> =>
     if (todos.row || categories.row) return;
 
     const { id: notUrgentCategoryId } = evolu.create("todoCategory", {
-      name: S.parseSync(NonEmptyString50)("Not Urgent"),
+      name: S.decodeSync(NonEmptyString50)("Not Urgent"),
     });
 
     evolu.create("todo", {
-      title: S.parseSync(NonEmptyString1000)("Try React Suspense"),
+      title: S.decodeSync(NonEmptyString1000)("Try React Suspense"),
       categoryId: notUrgentCategoryId,
     });
   });
@@ -414,13 +414,13 @@ const Button: FC<{
 };
 
 const prompt = <From extends string, To>(
-  schema: S.Schema<From, To>,
+  schema: S.Schema<never, From, To>,
   message: string,
   onSuccess: (value: To) => void,
 ): void => {
   const value = window.prompt(message);
   if (value == null) return; // on cancel
-  const a = S.parseEither(schema)(value);
+  const a = S.decodeUnknownEither(schema)(value);
   if (a._tag === "Left") {
     alert(formatError(a.left));
     return;

diff --git a/examples/remix/app/routes/_index.tsx b/examples/remix/app/routes/_index.tsx
@@ -84,11 +84,11 @@ const createFixtures = (): Promise<void> =>
     if (todos.row || categories.row) return;
 
     const { id: notUrgentCategoryId } = evolu.create("todoCategory", {
-      name: S.parseSync(NonEmptyString50)("Not Urgent"),
+      name: S.decodeSync(NonEmptyString50)("Not Urgent"),
     });
 
     evolu.create("todo", {
-      title: S.parseSync(NonEmptyString1000)("Try React Suspense"),
+      title: S.decodeSync(NonEmptyString1000)("Try React Suspense"),
       categoryId: notUrgentCategoryId,
     });
   });
@@ -416,13 +416,13 @@ const Button: FC<{
 };
 
 const prompt = <From extends string, To>(
-  schema: S.Schema<From, To>,
+  schema: S.Schema<never, From, To>,
   message: string,
   onSuccess: (value: To) => void,
 ): void => {
   const value = window.prompt(message);
   if (value == null) return; // on cancel
-  const a = S.parseEither(schema)(value);
+  const a = S.decodeUnknownEither(schema)(value);
   if (a._tag === "Left") {
     alert(formatError(a.left));
     return;

diff --git a/examples/vite/src/App.tsx b/examples/vite/src/App.tsx
@@ -80,11 +80,11 @@ const createFixtures = (): Promise<void> =>
     if (todos.row || categories.row) return;
 
     const { id: notUrgentCategoryId } = evolu.create("todoCategory", {
-      name: S.parseSync(NonEmptyString50)("Not Urgent"),
+      name: S.decodeSync(NonEmptyString50)("Not Urgent"),
     });
 
     evolu.create("todo", {
-      title: S.parseSync(NonEmptyString1000)("Try React Suspense"),
+      title: S.decodeSync(NonEmptyString1000)("Try React Suspense"),
       categoryId: notUrgentCategoryId,
     });
   });
@@ -412,13 +412,13 @@ const Button: FC<{
 };
 
 const prompt = <From extends string, To>(
-  schema: S.Schema<From, To>,
+  schema: S.Schema<never, From, To>,
   message: string,
   onSuccess: (value: To) => void,
 ): void => {
   const value = window.prompt(message);
   if (value == null) return; // on cancel
-  const a = S.parseEither(schema)(value);
+  const a = S.decodeUnknownEither(schema)(value);
   if (a._tag === "Left") {
     alert(formatError(a.left));
     return;

diff --git a/packages/eslint-config-evolu/package.json b/packages/eslint-config-evolu/package.json
@@ -12,7 +12,7 @@
     "eslint-config-next": "14.1.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-config-turbo": "^1.11.1",
-    "eslint-plugin-jsdoc": "^48.0.2",
+    "eslint-plugin-jsdoc": "^48.0.4",
     "eslint-plugin-node": "^11.1.0",
     "next": "14.1.0",
     "react": "^18.2.0",

diff --git a/packages/evolu-common/package.json b/packages/evolu-common/package.json
@@ -61,20 +61,20 @@
     "nanoid": "^5.0.4"
   },
   "devDependencies": {
-    "@effect/schema": "^0.60.7",
+    "@effect/schema": "^0.61.2",
     "@evolu/tsconfig": "workspace:*",
     "@protobuf-ts/plugin": "^2.9.3",
     "@protobuf-ts/protoc": "^2.9.3",
     "array-shuffle": "^3.0.0",
-    "effect": "2.2.0",
+    "effect": "2.2.2",
     "eslint": "^8.56.0",
     "eslint-config-evolu": "workspace:*",
     "typescript": "^5.3.3",
     "vitest": "^1.2.1"
   },
   "peerDependencies": {
-    "@effect/schema": "^0.60.7",
-    "effect": "2.2.0"
+    "@effect/schema": "^0.61.2",
+    "effect": "2.2.2"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/evolu-common/src/Crdt.ts b/packages/evolu-common/src/Crdt.ts
@@ -44,14 +44,14 @@ export const Millis = S.number.pipe(
 
 export type Millis = S.Schema.To<typeof Millis>;
 
-export const initialMillis = S.parseSync(Millis)(
+export const initialMillis = S.decodeSync(Millis)(
   AllowedTimeRange.greaterThan + 1,
 );
 
 export const Counter = S.number.pipe(S.between(0, 65535), S.brand("Counter"));
 export type Counter = S.Schema.To<typeof Counter>;
 
-const initialCounter = S.parseSync(Counter)(0);
+const initialCounter = S.decodeSync(Counter)(0);
 
 export type TimestampHash = number & Brand.Brand<"TimestampHash">;
 
@@ -76,7 +76,7 @@ export const unsafeTimestampFromString = (s: TimestampString): Timestamp => {
 export const timestampToHash = (t: Timestamp): TimestampHash =>
   murmurhash(timestampToString(t)) as TimestampHash;
 
-const syncNodeId = S.parseSync(NodeId)("0000000000000000");
+const syncNodeId = S.decodeSync(NodeId)("0000000000000000");
 
 export const makeSyncTimestamp = (
   millis: Millis = initialMillis,
@@ -106,7 +106,7 @@ export const Time = Context.Tag<Time>();
 export const TimeLive = Layer.succeed(
   Time,
   Time.of({
-    now: Effect.suspend(() => S.parse(Millis)(Date.now())).pipe(
+    now: Effect.suspend(() => S.decode(Millis)(Date.now())).pipe(
       Effect.catchTag("ParseError", () =>
         Effect.fail<TimestampTimeOutOfRangeError>({
           _tag: "TimestampTimeOutOfRangeError",
@@ -177,11 +177,11 @@ const incrementCounter = (
 ): Either.Either<TimestampCounterOverflowError, Counter> =>
   pipe(
     Number.increment(counter),
-    S.parseEither(Counter),
+    S.decodeEither(Counter),
     Either.mapLeft(() => ({ _tag: "TimestampCounterOverflowError" })),
   );
 
-const counterMin = S.parseSync(Counter)(0);
+const counterMin = S.decodeSync(Counter)(0);
 
 export const sendTimestamp = (
   timestamp: Timestamp,

diff --git a/packages/evolu-common/src/Crypto.ts b/packages/evolu-common/src/Crypto.ts
@@ -45,8 +45,10 @@ export interface NanoId {
 
 export const NanoId = Context.Tag<NanoId>();
 
-export const NodeId: S.BrandSchema<string, string & Brand.Brand<"NodeId">> =
-  S.string.pipe(S.pattern(/^[\w-]{16}$/), S.brand("NodeId"));
+export const NodeId = S.string.pipe(
+  S.pattern(/^[\w-]{16}$/),
+  S.brand("NodeId"),
+);
 export type NodeId = S.Schema.To<typeof NodeId>;
 
 const nanoidForNodeId = customAlphabet("0123456789abcdef", 16);

diff --git a/packages/evolu-common/src/Db.ts b/packages/evolu-common/src/Db.ts
@@ -73,6 +73,7 @@ export const table = <Fields extends TableFields>(
   ? ValidateFieldsNames<Fields> extends true
     ? ValidateFieldsHasId<Fields> extends true
       ? S.Schema<
+          never,
           Types.Simplify<
             S.FromStruct<Fields> & S.Schema.From<typeof ReservedColumns>
           >,
@@ -91,15 +92,15 @@ const ReservedColumns = S.struct({
   isDeleted: SqliteBoolean,
 });
 
-type TableFields = Record<string, S.Schema<any, any>>;
+type TableFields = Record<string, S.Schema<never, any, any>>;
 
 type ValidateFieldsTypes<Fields extends TableFields> =
   keyof Fields extends infer K
     ? K extends keyof Fields
       ? Fields[K] extends TableFields
         ? ValidateFieldsTypes<Fields[K]>
         : // eslint-disable-next-line @typescript-eslint/no-unused-vars
-          Fields[K] extends S.Schema<infer _I, infer A>
+          Fields[K] extends S.Schema<never, infer _I, infer A>
           ? A extends Value
             ? true
             : false
@@ -258,9 +259,9 @@ export interface Table {
 
 // https://github.com/Effect-TS/schema/releases/tag/v0.18.0
 const getPropertySignatures = <I extends { [K in keyof A]: any }, A>(
-  schema: S.Schema<I, A>,
-): { [K in keyof A]: S.Schema<I[K], A[K]> } => {
-  const out: Record<PropertyKey, S.Schema<any>> = {};
+  schema: S.Schema<never, I, A>,
+): { [K in keyof A]: S.Schema<never, I[K], A[K]> } => {
+  const out: Record<PropertyKey, S.Schema<never, any, any>> = {};
   const propertySignatures = AST.getPropertySignatures(schema.ast);
   for (let i = 0; i < propertySignatures.length; i++) {
     const propertySignature = propertySignatures[i];
@@ -270,7 +271,7 @@ const getPropertySignatures = <I extends { [K in keyof A]: any }, A>(
   return out as any;
 };
 
-export const schemaToTables = (schema: S.Schema<any, any>): Tables =>
+export const schemaToTables = (schema: S.Schema<never, any, any>): Tables =>
   pipe(
     getPropertySignatures(schema),
     ReadonlyRecord.toEntries,