@dxos/echo 0.8.4-main.406dc2a → 0.8.4-main.40e3dcdf1b

package/src/index.ts

@@ -2,15 +2,29 @@
 // Copyright 2025 DXOS.org
 //
 
-export * from './errors';
-export * from './query';
+export { QueryAST } from '@dxos/echo-protocol';
+// TODO(wittjosiah): Refactor DXN to not use statics similar to Query.
+export { DXN } from '@dxos/keys';
 
+export * as Annotation from './Annotation';
+export * as Database from './Database';
+export * as Entity from './Entity';
+export * as Err from './Err';
+export * as Feed from './Feed';
+export * as Filter from './Filter';
+export * as Format from './Format';
+export * as Hypergraph from './Hypergraph';
+export * as JsonSchema from './JsonSchema';
 export * as Key from './Key';
 export * as Obj from './Obj';
+export * as Order from './Order';
+export * as Query from './Query';
+export * as QueryResult from './QueryResult';
 export * as Ref from './Ref';
 export * as Relation from './Relation';
+export * as SchemaRegistry from './SchemaRegistry';
+export * as Tag from './Tag';
 export * as Type from './Type';
-
-export { QueryAST } from '@dxos/echo-protocol';
-export { DXN } from '@dxos/keys';
-export { type Live } from '@dxos/live-object';
+export * as Collection from './Collection';
+export * as View from './View';
+export * as Dataset from './Dataset';

package/src/internal/{ast → Annotation}/annotations.test.ts

@@ -5,9 +5,9 @@
 import * as Schema from 'effect/Schema';
 import { describe, test } from 'vitest';
 
-import { EchoObject, getLabel } from '../object';
+import { EchoObjectSchema } from '../Entity';
 
-import { LabelAnnotation, SchemaVersion, Typename } from './annotations';
+import { LabelAnnotation, TypenameSchema, VersionSchema, getLabelWithSchema } from './annotations';
 
 // TODO(dmaretskyi): Use one of the testing schemas.
 const TestObject = Schema.Struct({
@@ -16,44 +16,42 @@ const TestObject = Schema.Struct({
   other: Schema.String,
 }).pipe(LabelAnnotation.set(['name', 'fallbackName']));
 
-const a: Schema.Struct<typeof TestObject.fields> = TestObject;
-console.log(a);
-
 type TestObject = Schema.Schema.Type<typeof TestObject>;
 
 const TestEchoSchema = TestObject.pipe(
-  EchoObject({
-    typename: 'dxos.org/type/Test',
+  EchoObjectSchema({
+    typename: 'org.dxos.type.test',
     version: '0.1.0',
   }),
 );
+
 type TestEchoSchema = Schema.Schema.Type<typeof TestEchoSchema>;
 
 describe('annotations', () => {
   describe('Typename', () => {
     test('should validate typename', ({ expect }) => {
-      // Valid.
-      expect(Typename.make('dxos.org/type/foo')).to.exist;
-      expect(Typename.make('dxos.org/type/foo-bar')).to.exist;
-      expect(Typename.make('dxos.org/type/foo_bar')).to.exist;
+      // Valid (reverse-DNS format).
+      expect(TypenameSchema.make('org.dxos.type.foo')).to.exist;
+      expect(TypenameSchema.make('org.dxos.type.foo-bar')).to.exist;
+      expect(TypenameSchema.make('org.dxos.type.foobar')).to.exist;
 
       // Invalid.
-      expect(() => Typename.make('dxn:dxos.org')).to.throw();
-      expect(() => Typename.make('2dxos.org')).to.throw();
-      expect(() => Typename.make('dxos org')).to.throw();
+      expect(() => TypenameSchema.make('dxn:dxos.org')).to.throw();
+      expect(() => TypenameSchema.make('2dxos.org')).to.throw();
+      expect(() => TypenameSchema.make('dxos org')).to.throw();
     });
 
     test('should validate version', ({ expect }) => {
       // Valid.
-      expect(SchemaVersion.make('0.1.0')).to.exist;
+      expect(VersionSchema.make('0.1.0')).to.exist;
 
       // Invalid.
-      expect(() => SchemaVersion.make('0.1.x')).to.throw();
-      expect(() => SchemaVersion.make('0.1.0-alpha')).to.throw();
+      expect(() => VersionSchema.make('0.1.x')).to.throw();
+      expect(() => VersionSchema.make('0.1.0-alpha')).to.throw();
     });
   });
 
-  describe('getLabel', () => {
+  describe('getLabelWithSchema', () => {
     test('should return first available label value', ({ expect }) => {
       const obj: TestObject = {
         name: 'Primary Name',
@@ -61,7 +59,7 @@ describe('annotations', () => {
         other: 'Other',
       };
 
-      expect(getLabel(TestObject, obj)).toEqual('Primary Name');
+      expect(getLabelWithSchema(TestObject, obj)).toEqual('Primary Name');
     });
 
     test('should fallback to second path if first is undefined', ({ expect }) => {
@@ -71,7 +69,7 @@ describe('annotations', () => {
         other: 'Other',
       };
 
-      expect(getLabel(TestObject, obj)).toEqual('Fallback Name');
+      expect(getLabelWithSchema(TestObject, obj)).toEqual('Fallback Name');
     });
 
     test('should return undefined if no label paths resolve', ({ expect }) => {
@@ -81,7 +79,7 @@ describe('annotations', () => {
         other: 'Other',
       };
 
-      expect(getLabel(TestObject, obj)).toBeUndefined();
+      expect(getLabelWithSchema(TestObject, obj)).toBeUndefined();
     });
 
     test('should return label from echo object', ({ expect }) => {
@@ -92,7 +90,7 @@ describe('annotations', () => {
         other: 'Other',
       };
 
-      expect(getLabel(TestEchoSchema, obj)).toEqual('Primary Name');
+      expect(getLabelWithSchema(TestEchoSchema, obj)).toEqual('Primary Name');
     });
   });
 });