@dxos/echo-react 0.8.4-main.d05539e30a → 0.8.4-main.d9fc60f731

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/echo-react",
-  "version": "0.8.4-main.d05539e30a",
+  "version": "0.8.4-main.d9fc60f731",
   "description": "React integration for ECHO.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -25,10 +25,10 @@
     "src"
   ],
   "dependencies": {
-    "@effect-atom/atom": "^0.5.1",
+    "@effect-atom/atom": "^0.5.3",
     "@effect-atom/atom-react": "^0.5.0",
-    "@dxos/echo": "0.8.4-main.d05539e30a",
-    "@dxos/echo-atom": "0.8.4-main.d05539e30a"
+    "@dxos/echo": "0.8.4-main.d9fc60f731",
+    "@dxos/echo-atom": "0.8.4-main.d9fc60f731"
   },
   "devDependencies": {
     "@testing-library/react": "^16.3.0",
@@ -36,7 +36,7 @@
     "@types/react-dom": "~19.2.3",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/echo-db": "0.8.4-main.d05539e30a"
+    "@dxos/echo-db": "0.8.4-main.d9fc60f731"
   },
   "peerDependencies": {
     "react": "~19.2.3"

package/src/index.ts

@@ -3,5 +3,5 @@
 //
 
 export * from './useQuery';
-export * from './useSchema';
+export * from './useType';
 export * from './useObject';

package/src/useType.ts

@@ -0,0 +1,49 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { useMemo, useSyncExternalStore } from 'react';
+
+import { type Database, Filter, Query, Scope, Type } from '@dxos/echo';
+
+/**
+ * Subscribe to and retrieve a type by typename from a space.
+ *
+ * Fans across the owning space db (persisted custom types) and the shared
+ * registry (static/runtime plugin types). Persisted types live only in the db,
+ * so a registry-only lookup misses them.
+ */
+export const useType = <T extends Type.AnyEntity = Type.AnyEntity>(
+  db?: Database.Database,
+  typename?: string,
+): T | undefined => {
+  const { subscribe, getType } = useMemo(() => {
+    if (!typename || !db) {
+      return {
+        subscribe: () => () => {},
+        getType: (): T | undefined => undefined,
+      };
+    }
+
+    const queryResult = db.query(Query.select(Filter.type(Type.Type)).from(Scope.space(), Scope.registry()));
+    let subscribed = false;
+    const find = (): T | undefined =>
+      subscribed
+        ? (queryResult.results.find((type) => Type.getTypename(type) === typename) as T | undefined)
+        : undefined;
+
+    return {
+      subscribe: (onStoreChange: () => void) => {
+        subscribed = true;
+        const unsubscribe = queryResult.subscribe(onStoreChange);
+        return () => {
+          unsubscribe();
+          subscribed = false;
+        };
+      },
+      getType: find,
+    };
+  }, [typename, db]);
+
+  return useSyncExternalStore(subscribe, getType);
+};

package/dist/types/src/useSchema.d.ts

@@ -1,6 +0,0 @@
-import { type Database, type Type } from '@dxos/echo';
-/**
- * Subscribe to and retrieve schema changes from a space's schema registry.
- */
-export declare const useSchema: <T extends Type.AnyEntity = Type.AnyEntity>(db?: Database.Database, typename?: string) => T | undefined;
-//# sourceMappingURL=useSchema.d.ts.map

package/dist/types/src/useSchema.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"useSchema.d.ts","sourceRoot":"","sources":["../../../src/useSchema.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,QAAQ,EAAE,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAEtD;;GAEG;AACH,eAAO,MAAM,SAAS,GAAI,CAAC,SAAS,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,OAC5D,QAAQ,CAAC,QAAQ,aACX,MAAM,KAChB,CAAC,GAAG,SA2BN,CAAC"}

package/src/useSchema.ts

@@ -1,42 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { useMemo, useSyncExternalStore } from 'react';
-
-import { type Database, type Type } from '@dxos/echo';
-
-/**
- * Subscribe to and retrieve schema changes from a space's schema registry.
- */
-export const useSchema = <T extends Type.AnyEntity = Type.AnyEntity>(
-  db?: Database.Database,
-  typename?: string,
-): T | undefined => {
-  const { subscribe, getSchema } = useMemo(() => {
-    if (!typename || !db) {
-      return {
-        subscribe: () => () => {},
-        getSchema: () => undefined,
-      };
-    }
-
-    const query = db.schemaRegistry.query({ typename, location: ['database', 'runtime'] });
-    const initialResult = query.runSync()[0];
-    let currentSchema = initialResult;
-
-    return {
-      subscribe: (onStoreChange: () => void) => {
-        const unsubscribe = query.subscribe(() => {
-          currentSchema = query.results[0];
-          onStoreChange();
-        });
-
-        return unsubscribe;
-      },
-      getSchema: () => currentSchema,
-    };
-  }, [typename, db]);
-
-  return useSyncExternalStore(subscribe, getSchema) as T;
-};