@dxos/plugin-space 0.8.2-main.f11618f → 0.8.2-staging.42af850

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-space",
-  "version": "0.8.2-main.f11618f",
+  "version": "0.8.2-staging.42af850",
   "description": "DXOS Surface plugin for DXOS ECHO Spaces",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -33,72 +33,78 @@
     "src"
   ],
   "dependencies": {
-    "@preact/signals-core": "^1.6.0",
-    "effect": "3.13.3",
+    "@automerge/automerge": "3.0.0-beta.4",
+    "@preact-signals/safe-react": "^0.9.0",
+    "@preact/signals-core": "^1.9.0",
+    "effect": "3.14.21",
     "jszip": "^3.10.1",
     "localforage": "^1.10.0",
-    "lodash.get": "^4.4.2",
     "react-drag-drop-files": "^2.3.8",
     "react-is": "~18.2.0",
     "react-qr-rounded": "^1.0.0",
-    "@dxos/artifact": "0.8.2-main.f11618f",
-    "@dxos/app-framework": "0.8.2-main.f11618f",
-    "@dxos/async": "0.8.2-main.f11618f",
-    "@dxos/automerge": "0.8.2-main.f11618f",
-    "@dxos/context": "0.8.2-main.f11618f",
-    "@dxos/client": "0.8.2-main.f11618f",
-    "@dxos/display-name": "0.8.2-main.f11618f",
-    "@dxos/echo-schema": "0.8.2-main.f11618f",
-    "@dxos/effect": "0.8.2-main.f11618f",
-    "@dxos/echo-signals": "0.8.2-main.f11618f",
-    "@dxos/invariant": "0.8.2-main.f11618f",
-    "@dxos/keys": "0.8.2-main.f11618f",
-    "@dxos/live-object": "0.8.2-main.f11618f",
-    "@dxos/migrations": "0.8.2-main.f11618f",
-    "@dxos/log": "0.8.2-main.f11618f",
-    "@dxos/local-storage": "0.8.2-main.f11618f",
-    "@dxos/plugin-attention": "0.8.2-main.f11618f",
-    "@dxos/plugin-client": "0.8.2-main.f11618f",
-    "@dxos/plugin-graph": "0.8.2-main.f11618f",
-    "@dxos/plugin-status-bar": "0.8.2-main.f11618f",
-    "@dxos/plugin-deck": "0.8.2-main.f11618f",
-    "@dxos/protocols": "0.8.2-main.f11618f",
-    "@dxos/plugin-observability": "0.8.2-main.f11618f",
-    "@dxos/react-client": "0.8.2-main.f11618f",
-    "@dxos/react-ui-attention": "0.8.2-main.f11618f",
-    "@dxos/react-ui-editor": "0.8.2-main.f11618f",
-    "@dxos/react-ui-pickers": "0.8.2-main.f11618f",
-    "@dxos/react-ui-searchlist": "0.8.2-main.f11618f",
-    "@dxos/react-ui-stack": "0.8.2-main.f11618f",
-    "@dxos/react-ui-list": "0.8.2-main.f11618f",
-    "@dxos/react-ui-tabs": "0.8.2-main.f11618f",
-    "@dxos/react-ui-syntax-highlighter": "0.8.2-main.f11618f",
-    "@dxos/react-ui-form": "0.8.2-main.f11618f",
-    "@dxos/schema": "0.8.2-main.f11618f",
-    "@dxos/shell": "0.8.2-main.f11618f",
-    "@dxos/react-ui-theme": "0.8.2-main.f11618f",
-    "@dxos/util": "0.8.2-main.f11618f"
+    "@dxos/artifact": "0.8.2-staging.42af850",
+    "@dxos/app-framework": "0.8.2-staging.42af850",
+    "@dxos/ai": "0.8.2-staging.42af850",
+    "@dxos/async": "0.8.2-staging.42af850",
+    "@dxos/context": "0.8.2-staging.42af850",
+    "@dxos/client": "0.8.2-staging.42af850",
+    "@dxos/display-name": "0.8.2-staging.42af850",
+    "@dxos/echo": "0.8.2-staging.42af850",
+    "@dxos/echo-schema": "0.8.2-staging.42af850",
+    "@dxos/echo-signals": "0.8.2-staging.42af850",
+    "@dxos/effect": "0.8.2-staging.42af850",
+    "@dxos/invariant": "0.8.2-staging.42af850",
+    "@dxos/keys": "0.8.2-staging.42af850",
+    "@dxos/live-object": "0.8.2-staging.42af850",
+    "@dxos/local-storage": "0.8.2-staging.42af850",
+    "@dxos/migrations": "0.8.2-staging.42af850",
+    "@dxos/log": "0.8.2-staging.42af850",
+    "@dxos/plugin-attention": "0.8.2-staging.42af850",
+    "@dxos/plugin-deck": "0.8.2-staging.42af850",
+    "@dxos/plugin-graph": "0.8.2-staging.42af850",
+    "@dxos/plugin-observability": "0.8.2-staging.42af850",
+    "@dxos/plugin-client": "0.8.2-staging.42af850",
+    "@dxos/plugin-status-bar": "0.8.2-staging.42af850",
+    "@dxos/protocols": "0.8.2-staging.42af850",
+    "@dxos/react-client": "0.8.2-staging.42af850",
+    "@dxos/react-ui-attention": "0.8.2-staging.42af850",
+    "@dxos/react-ui-editor": "0.8.2-staging.42af850",
+    "@dxos/react-ui-form": "0.8.2-staging.42af850",
+    "@dxos/react-ui-list": "0.8.2-staging.42af850",
+    "@dxos/react-ui-pickers": "0.8.2-staging.42af850",
+    "@dxos/react-ui-searchlist": "0.8.2-staging.42af850",
+    "@dxos/react-ui-stack": "0.8.2-staging.42af850",
+    "@dxos/react-ui-tabs": "0.8.2-staging.42af850",
+    "@dxos/react-ui-syntax-highlighter": "0.8.2-staging.42af850",
+    "@dxos/react-ui-theme": "0.8.2-staging.42af850",
+    "@dxos/schema": "0.8.2-staging.42af850",
+    "@dxos/util": "0.8.2-staging.42af850",
+    "@dxos/shell": "0.8.2-staging.42af850"
   },
   "devDependencies": {
     "@babel/core": "^7.18.13",
+    "@effect-rx/rx-react": "^0.34.1",
+    "@effect/platform": "0.80.12",
     "@phosphor-icons/react": "^2.1.5",
-    "@types/lodash.get": "^4.4.7",
     "@types/react": "~18.2.0",
     "@types/react-dom": "~18.2.0",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "5.4.7",
-    "@dxos/random": "0.8.2-main.f11618f",
-    "@dxos/react-ui": "0.8.2-main.f11618f",
-    "@dxos/react-ui-theme": "0.8.2-main.f11618f",
-    "@dxos/storybook-utils": "0.8.2-main.f11618f"
+    "@dxos/random": "0.8.2-staging.42af850",
+    "@dxos/react-ui": "0.8.2-staging.42af850",
+    "@dxos/react-ui-theme": "0.8.2-staging.42af850",
+    "@dxos/storybook-utils": "0.8.2-staging.42af850"
   },
   "peerDependencies": {
+    "@effect-rx/rx-react": "^0.34.1",
+    "@effect/platform": "0.80.12",
     "@phosphor-icons/react": "^2.1.5",
+    "effect": "^3.13.3",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.2-main.f11618f",
-    "@dxos/react-ui-theme": "0.8.2-main.f11618f"
+    "@dxos/react-ui": "0.8.2-staging.42af850",
+    "@dxos/react-ui-theme": "0.8.2-staging.42af850"
   },
   "publishConfig": {
     "access": "public"

package/src/SpacePlugin.tsx

@@ -2,6 +2,8 @@
 // Copyright 2025 DXOS.org
 //
 
+import { Schema } from 'effect';
+
 import {
   allOf,
   Capabilities,
@@ -12,10 +14,9 @@ import {
   Events,
   oneOf,
 } from '@dxos/app-framework';
-import { S } from '@dxos/echo-schema';
-import { RefArray } from '@dxos/live-object';
 import { AttentionEvents } from '@dxos/plugin-attention';
 import { ClientEvents } from '@dxos/plugin-client';
+import { RefArray } from '@dxos/react-client/echo';
 import { osTranslations } from '@dxos/shell/react';
 
 import {
@@ -25,8 +26,8 @@ import {
   IntentResolver,
   ReactRoot,
   ReactSurface,
-  Schema,
-  Tools,
+  SchemaDefs,
+  SchemaTools,
   SpaceCapabilities,
   SpaceSettings,
   SpacesReady,
@@ -107,7 +108,7 @@ export const SpacePlugin = ({
           SpaceCapabilities.ObjectForm,
           defineObjectForm({
             objectSchema: CollectionType,
-            formSchema: S.Struct({ name: S.optional(S.String) }),
+            formSchema: Schema.Struct({ name: Schema.optional(Schema.String) }),
             getIntent: (props) => createIntent(CollectionAction.Create, props),
           }),
         ),
@@ -116,7 +117,7 @@ export const SpacePlugin = ({
       id: `${meta.id}/module/schema`,
       activatesOn: ClientEvents.ClientReady,
       activatesBefore: [ClientEvents.SetupSchema],
-      activate: Schema,
+      activate: SchemaDefs,
     }),
     defineModule({
       id: `${meta.id}/module/react-root`,
@@ -167,7 +168,7 @@ export const SpacePlugin = ({
     defineModule({
       id: `${meta.id}/module/tools`,
       activatesOn: Events.SetupArtifactDefinition,
-      activate: Tools,
+      activate: SchemaTools,
     }),
   ]);
 };