Merge pull request #88 from geobrowser/model-nominal-types

add model based nominal type system

Author: nikgraf

apps/events/package.json

@@ -31,7 +31,7 @@
     "@xmtp/xmtp-js": "^13.0.0",
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.1.1",
-    "effect": "^3.10.19",
+    "effect": "^3.12.2",
     "ethers": "^6.13.3",
     "isomorphic-ws": "^5.0.0",
     "lucide-react": "^0.441.0",

apps/events/src/components/todos-app.tsx

@@ -1,13 +1,16 @@
 import { useState } from 'react';
-import { useCreateEntity, useDeleteEntity, useQuery, useUpdateEntity } from '../schema';
+
+import { useCreateEntity, useDeleteEntity, useQuery, useUpdateEntity } from '@graph-framework/schema';
+
+import { Todo } from '../schema';
 import { Button } from './ui/button';
 import { Input } from './ui/input';
 
 export const TodosApp = () => {
-  const createEntity = useCreateEntity();
-  const updateEntity = useUpdateEntity();
+  const todos = useQuery(Todo);
+  const createEntity = useCreateEntity(Todo);
+  const updateEntity = useUpdateEntity(Todo);
   const deleteEntity = useDeleteEntity();
-  const todos = useQuery({ types: ['Todo'] });
   const [newTodoTitle, setNewTodoTitle] = useState('');
 
   return (
@@ -17,10 +20,7 @@ export const TodosApp = () => {
         <Input type="text" value={newTodoTitle} onChange={(e) => setNewTodoTitle(e.target.value)} />
         <Button
           onClick={() => {
-            createEntity({
-              types: ['Todo'],
-              data: { name: newTodoTitle, completed: false },
-            });
+            createEntity({ name: newTodoTitle, completed: false });
             setNewTodoTitle('');
           }}
         >
@@ -33,13 +33,7 @@ export const TodosApp = () => {
           <input
             type="checkbox"
             checked={todo.completed}
-            onChange={(e) =>
-              updateEntity({
-                id: todo.id,
-                types: ['Todo'],
-                data: { completed: e.target.checked },
-              })
-            }
+            onChange={(e) => updateEntity(todo.id, { completed: e.target.checked })}
           />
           <Button onClick={() => deleteEntity(todo.id)}>Delete</Button>
         </div>

apps/events/src/schema.ts

@@ -1,8 +1,7 @@
-import { createSchemaHooks, type } from '@graphprotocol/graph-framework';
+import { Model, Types } from '@graphprotocol/graph-framework';
 
-export const { useCreateEntity, useDeleteEntity, useQuery, useUpdateEntity } = createSchemaHooks({
-  Todo: {
-    name: type.Text,
-    completed: type.Checkbox,
-  },
-});
+export class Todo extends Model.Class<Todo>('Todo')({
+  id: Model.Generated(Types.Text),
+  name: Types.Text,
+  completed: Types.Checkbox,
+}) {}

apps/server/package.json

@@ -25,7 +25,7 @@
     "@prisma/client": "5.22.0",
     "cors": "^2.8.5",
     "dotenv": "^16.4.5",
-    "effect": "^3.10.19",
+    "effect": "^3.12.2",
     "express": "^5.0.1",
     "siwe": "^2.3.2",
     "viem": "^2.21.56",

packages/graph-framework-identity/package.json

@@ -32,7 +32,7 @@
   },
   "devDependencies": {
     "@types/react": "^18.3.7",
-    "effect": "^3.10.19"
+    "effect": "^3.12.2"
   },
   "dependencies": {
     "@graph-framework/key": "workspace:*",

packages/graph-framework-key/package.json

@@ -31,6 +31,6 @@
     "@noble/ciphers": "^1.0.0",
     "@noble/curves": "^1.6.0",
     "@noble/hashes": "^1.5.0",
-    "effect": "^3.10.19"
+    "effect": "^3.12.2"
   }
 }

packages/graph-framework-messages/package.json

@@ -28,9 +28,9 @@
     "check:fix": "pnpm biome check --write src/*"
   },
   "dependencies": {
+    "@graph-framework/space-events": "workspace:*",
     "@noble/ciphers": "^1.0.0",
     "@noble/curves": "^1.6.0",
-    "effect": "^3.10.19",
-    "@graph-framework/space-events": "workspace:*"
+    "effect": "^3.12.2"
   }
 }

packages/graph-framework-schema/package.json

@@ -31,23 +31,24 @@
     "@automerge/automerge": "^2",
     "@automerge/automerge-repo": "^2",
     "@automerge/automerge-repo-react-hooks": "^2",
-    "effect": "^3.10.19",
+    "@effect/experimental": "^0.36.2",
+    "effect": "^3.12.2",
     "react": "^18"
   },
   "devDependencies": {
     "@automerge/automerge": "^v2.2.9-alpha.3",
     "@automerge/automerge-repo": "^2.0.0-alpha.14",
     "@automerge/automerge-repo-react-hooks": "^2.0.0-alpha.14",
-    "effect": "^3.10.19",
+    "@effect/experimental": "^0.36.2",
     "@testing-library/jest-dom": "^6.5.0",
     "@testing-library/react": "^16.0.1",
     "@types/react": "^18.3.7",
     "@types/uuid": "^10.0.0",
     "@vitejs/plugin-react": "^4.3.2",
+    "effect": "^3.12.2",
     "jsdom": "^25.0.1"
   },
   "dependencies": {
-    "fast-deep-equal": "^3.1.3",
     "@graph-framework/utils": "workspace:*"
   }
 }