@dxos/echo-atom 0.8.4-main.e00bdcdb52 → 0.8.4-main.effb148878

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/echo-atom",
-  "version": "0.8.4-main.e00bdcdb52",
+  "version": "0.8.4-main.effb148878",
   "description": "Effect Atom wrappers for ECHO objects with explicit subscriptions.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -8,7 +8,7 @@
     "type": "git",
     "url": "https://github.com/dxos/dxos"
   },
-  "license": "MIT",
+  "license": "FSL-1.1-Apache-2.0",
   "author": "DXOS.org",
   "sideEffects": false,
   "type": "module",
@@ -26,16 +26,16 @@
   ],
   "dependencies": {
     "@effect-atom/atom": "^0.5.1",
-    "@dxos/echo": "0.8.4-main.e00bdcdb52",
-    "@dxos/echo-db": "0.8.4-main.e00bdcdb52",
-    "@dxos/invariant": "0.8.4-main.e00bdcdb52",
-    "@dxos/util": "0.8.4-main.e00bdcdb52"
+    "@dxos/echo-db": "0.8.4-main.effb148878",
+    "@dxos/invariant": "0.8.4-main.effb148878",
+    "@dxos/util": "0.8.4-main.effb148878",
+    "@dxos/echo": "0.8.4-main.effb148878"
   },
   "devDependencies": {
     "effect": "3.20.0",
-    "@dxos/random": "0.8.4-main.e00bdcdb52",
-    "@dxos/context": "0.8.4-main.e00bdcdb52",
-    "@dxos/test-utils": "0.8.4-main.e00bdcdb52"
+    "@dxos/random": "0.8.4-main.effb148878",
+    "@dxos/test-utils": "0.8.4-main.effb148878",
+    "@dxos/context": "0.8.4-main.effb148878"
   },
   "peerDependencies": {
     "effect": "3.20.0"

package/src/atom.ts

@@ -8,7 +8,7 @@ import * as Effect from 'effect/Effect';
 import * as Function from 'effect/Function';
 import * as Option from 'effect/Option';
 
-import { type Entity, Obj, Ref, Relation } from '@dxos/echo';
+import { Entity, Obj, Ref, Relation } from '@dxos/echo';
 import { assertArgument } from '@dxos/invariant';
 
 import { loadRefTarget } from './ref-utils';
@@ -130,7 +130,12 @@ export function make<T extends Entity.Unknown>(
 
   // At this point, objOrRef is definitely T (not a Ref).
   const obj = objOrRef as T;
-  assertArgument(Obj.isObject(obj) || Relation.isRelation(obj), 'obj', 'Object must be a reactive object');
+  // Accept any kind of entity (Obj, Relation, or persisted Type) — the
+  // reactive subscription only needs `[KindId]` to be set; the proxy machinery
+  // is kind-agnostic. Narrowing to Obj/Relation here used to throw for type
+  // entities returned by the schema registry (e.g. persisted RoastLog), which
+  // broke the schema-node connector in plugin-space.
+  assertArgument(Entity.isEntity(obj), 'obj', 'Object must be a reactive object');
 
   // TODO(dmaretskyi): Fix echo types during review.
   return objectFamily(obj as any);

package/src/query-atom.test.ts

@@ -7,8 +7,7 @@ import * as Schema from 'effect/Schema';
 import { afterEach, beforeEach, describe, expect, test } from 'vitest';
 
 import { sleep } from '@dxos/async';
-import { Obj, type QueryResult, Type } from '@dxos/echo';
-import { Filter, Query } from '@dxos/echo';
+import { DXN, Filter, Obj, Query, type QueryResult, Type } from '@dxos/echo';
 import { type EchoDatabase, RuntimeSchemaRegistry } from '@dxos/echo-db';
 import { EchoTestBuilder } from '@dxos/echo-db/testing';
 import { TestSchema } from '@dxos/echo/testing';
@@ -22,13 +21,8 @@ import * as AtomQuery from './query-atom';
 const TestItem = Schema.Struct({
   name: Schema.String,
   value: Schema.Number,
-}).pipe(
-  Type.object({
-    typename: 'com.example.type.test-item',
-    version: '0.1.0',
-  }),
-);
-type TestItem = Schema.Schema.Type<typeof TestItem>;
+}).pipe(Type.makeObject(DXN.make('com.example.type.testItem', '0.1.0')));
+type TestItem = Type.InstanceType<typeof TestItem>;
 
 describe('AtomQuery', () => {
   let testBuilder: EchoTestBuilder;
@@ -265,21 +259,11 @@ describe('AtomQuery with queues', () => {
 
 const SchemaA = Schema.Struct({
   name: Schema.String,
-}).pipe(
-  Type.object({
-    typename: 'com.example.type.a',
-    version: '0.1.0',
-  }),
-);
+}).pipe(Type.makeObject(DXN.make('com.example.type.a', '0.1.0')));
 
 const SchemaB = Schema.Struct({
   value: Schema.Number,
-}).pipe(
-  Type.object({
-    typename: 'com.example.type.b',
-    version: '0.1.0',
-  }),
-);
+}).pipe(Type.makeObject(DXN.make('com.example.type.b', '0.1.0')));
 
 describe('AtomQuery.fromQuery with schema registry', () => {
   let schemaRegistry: RuntimeSchemaRegistry;

package/src/query-atom.ts

@@ -4,7 +4,7 @@
 
 import { Atom } from '@effect-atom/atom';
 
-import { DXN, Database, type Entity, type Filter, Query, type QueryResult } from '@dxos/echo';
+import { Database, type Entity, type Filter, Key, Query, type QueryResult } from '@dxos/echo';
 import { WeakDictionary } from '@dxos/util';
 
 /**
@@ -68,9 +68,9 @@ const getQueryableIdentifier = (queryable: Database.Queryable): string => {
   if (Database.isDatabase(queryable)) {
     return queryable.spaceId;
   }
-  // Queue or similar: use dxn if it's a DXN instance.
-  if ('dxn' in queryable && queryable.dxn instanceof DXN) {
-    return queryable.dxn.toString();
+  // Queue or similar: use uri if it's a URI (EchoURI or DXN).
+  if ('uri' in queryable && Key.URI.isURI(queryable.uri)) {
+    return queryable.uri;
   }
   // Fallback: use id if it's a string.
   if ('id' in queryable && typeof queryable.id === 'string') {