@dxos/echo 0.10.0 → 0.11.0

package/src/internal/common/types/index.ts

@@ -10,6 +10,7 @@ export * from './entity';
 // would create an eval-order cycle (TDZ on `createAnnotationHelper`). Import meta from `./meta`
 // directly, or from the top-level `@dxos/echo/internal` barrel (re-exported there after Ref loads).
 export * from './model-symbols';
+export * from './projection';
 export * from './typename';
 export * from './version';
 export * from './well-known-types';

package/src/internal/common/types/model-symbols.ts

@@ -50,6 +50,12 @@ export const ObjectVersionId: unique symbol = Symbol.for('@dxos/echo/Version');
  */
 export const ObjectDatabaseId = Symbol.for('@dxos/echo/Database');
 
+/**
+ * Branch accessor symbol. Resolves to the branch name this object instance is bound to (`'main'` for
+ * the canonical object, or the branch of a `db.branch()` independent instance). Read via `Obj.getBranch`.
+ */
+export const ObjectBranchId = Symbol.for('@dxos/echo/Branch');
+
 /**
  * Property name for relation source when object is serialized to JSON.
  */

package/src/internal/common/types/projection.ts

@@ -0,0 +1,45 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import type * as Types from 'effect/Types';
+
+import { type QueryAST } from '@dxos/echo-protocol';
+
+/**
+ * Brand for a query projected to a single scalar property (`Query.project`), consumed by
+ * `Filter.in` to build a subquery-membership predicate — an uncorrelated
+ * `col IN (SELECT property FROM ...)` semi-join. Defined in common/ (not in Query/) so
+ * Filter.ts can recognize the brand without importing Query.ts as a value: Query.ts already
+ * imports Filter.ts as a value, so a reverse value import would create a cycle. Both
+ * Filter.ts and Query.ts import this shared leaf module instead.
+ *
+ * A string-literal id (not a `Symbol.for`), matching `FilterTypeId`/`QueryTypeId`/`OrderTypeId` —
+ * this lets the sandboxed `query-lite` mirror (which cannot import `@dxos/echo`'s runtime) declare
+ * its own local constant with the same literal and construct structurally-compatible objects,
+ * the same way it already does for those brands.
+ */
+export const ProjectionTypeId = '~@dxos/echo/Query.Projection' as const;
+export type ProjectionTypeId = typeof ProjectionTypeId;
+
+/**
+ * `V` is the projected property's value type — carried only as a phantom brand (like
+ * `Filter<T>`'s `[FilterTypeId]: { value: Types.Covariant<T> }`) so `Filter.in(query.project(k))`
+ * infers its own type parameter from the projected property instead of defaulting to `unknown`.
+ */
+export interface Projection<V = unknown> {
+  readonly [ProjectionTypeId]: { value: Types.Covariant<V> };
+  readonly query: QueryAST.Query;
+  readonly property: string;
+}
+
+export const isProjection = (value: unknown): value is Projection =>
+  typeof value === 'object' && value !== null && ProjectionTypeId in value;
+
+const variance: Projection<any>[ProjectionTypeId] = {} as Projection<any>[ProjectionTypeId];
+
+export const makeProjection = <V>(query: QueryAST.Query, property: string): Projection<V> => ({
+  [ProjectionTypeId]: variance,
+  query,
+  property,
+});

package/src/testing/test-data.ts

@@ -3,18 +3,18 @@
 //
 
 import { DatabaseDirectory, EntityStructure } from '@dxos/echo-protocol';
-import { EID, EntityId, PublicKey } from '@dxos/keys';
+import { EID, EntityId, SpaceId } from '@dxos/keys';
 
 import { Type } from '../index';
 import { TestSchema } from './test-schema';
 
 // Lazy init: Cloudflare workers disallow non-determinism at module scope (e.g. random keys).
-let cachedSpaceKeyHex: string | undefined;
-const getSpaceKeyHex = (): string => {
-  if (cachedSpaceKeyHex === undefined) {
-    cachedSpaceKeyHex = PublicKey.random().toHex();
+let cachedSpaceId: SpaceId | undefined;
+const getSpaceId = (): SpaceId => {
+  if (cachedSpaceId === undefined) {
+    cachedSpaceId = SpaceId.random();
   }
-  return cachedSpaceKeyHex;
+  return cachedSpaceId;
 };
 
 let cachedPeopleAlice: DatabaseDirectory | undefined;
@@ -32,7 +32,7 @@ export const PEOPLE = {
   get alice(): DatabaseDirectory {
     if (cachedPeopleAlice === undefined) {
       cachedPeopleAlice = DatabaseDirectory.make({
-        spaceKey: getSpaceKeyHex(),
+        spaceId: getSpaceId(),
         objects: {
           [EntityId.random()]: EntityStructure.makeObject({
             type: Type.getURI(TestSchema.Person)!,
@@ -49,7 +49,7 @@ export const PEOPLE = {
   get bob(): DatabaseDirectory {
     if (cachedPeopleBob === undefined) {
       cachedPeopleBob = DatabaseDirectory.make({
-        spaceKey: getSpaceKeyHex(),
+        spaceId: getSpaceId(),
         objects: {
           [EntityId.random()]: EntityStructure.makeObject({
             type: Type.getURI(TestSchema.Person)!,
@@ -68,7 +68,7 @@ export const ORGS = {
   get dxos(): DatabaseDirectory {
     if (cachedOrgsDxos === undefined) {
       cachedOrgsDxos = DatabaseDirectory.make({
-        spaceKey: getSpaceKeyHex(),
+        spaceId: getSpaceId(),
         objects: {
           [EntityId.random()]: EntityStructure.makeObject({
             type: Type.getURI(TestSchema.Organization)!,
@@ -86,7 +86,7 @@ export const ORGS = {
   get cyberdyne(): DatabaseDirectory {
     if (cachedOrgsCyberdyne === undefined) {
       cachedOrgsCyberdyne = DatabaseDirectory.make({
-        spaceKey: getSpaceKeyHex(),
+        spaceId: getSpaceId(),
         objects: {
           [EntityId.random()]: EntityStructure.makeObject({
             type: Type.getURI(TestSchema.Organization)!,
@@ -106,7 +106,7 @@ export const WORKS_FOR = {
   get fredWorksForCyberdyne(): DatabaseDirectory {
     if (cachedWorksFredCyberdyne === undefined) {
       cachedWorksFredCyberdyne = DatabaseDirectory.make({
-        spaceKey: getSpaceKeyHex(),
+        spaceId: getSpaceId(),
         objects: {
           [EntityId.random()]: EntityStructure.makeRelation({
             type: Type.getURI(TestSchema.EmployedBy)!,
@@ -126,7 +126,7 @@ export const WORKS_FOR = {
   get aliceWorksForAperture(): DatabaseDirectory {
     if (cachedWorksAliceAperture === undefined) {
       cachedWorksAliceAperture = DatabaseDirectory.make({
-        spaceKey: getSpaceKeyHex(),
+        spaceId: getSpaceId(),
         objects: {
           [EntityId.random()]: EntityStructure.makeRelation({
             type: Type.getURI(TestSchema.EmployedBy)!,
@@ -148,7 +148,7 @@ export const TASKS = {
   get task1(): DatabaseDirectory {
     if (cachedTasksTask1 === undefined) {
       cachedTasksTask1 = DatabaseDirectory.make({
-        spaceKey: getSpaceKeyHex(),
+        spaceId: getSpaceId(),
         objects: {
           [EntityId.random()]: EntityStructure.makeObject({
             type: Type.getURI(TestSchema.Task)!,
@@ -169,7 +169,7 @@ export const TASKS = {
   get task2(): DatabaseDirectory {
     if (cachedTasksTask2 === undefined) {
       cachedTasksTask2 = DatabaseDirectory.make({
-        spaceKey: getSpaceKeyHex(),
+        spaceId: getSpaceId(),
         objects: {
           [EntityId.random()]: EntityStructure.makeObject({
             type: Type.getURI(TestSchema.Task)!,

package/dist/lib/neutral/Annotation.mjs

@@ -1,90 +0,0 @@
-import {
-  Dictionary,
-  Key,
-  TypeId,
-  atom,
-  atomProperty,
-  buildDictionary,
-  get,
-  getDictionary,
-  getFromAst,
-  make,
-  set,
-  setDictionary,
-  update
-} from "./chunk-C62JYFAD.mjs";
-import "./chunk-2HKGAQM4.mjs";
-import "./chunk-4A2NWKRJ.mjs";
-import "./chunk-KCBW4BR6.mjs";
-import "./chunk-L3E5IXAE.mjs";
-import {
-  DEFAULT_LAYOUT_NAME,
-  DescriptionAnnotation,
-  FieldLookupAnnotationId,
-  FormCreateAnnotation,
-  FormCreateAnnotationId,
-  FormInlineAnnotation,
-  FormInputAnnotation,
-  FormLayoutAnnotation,
-  FormLayoutAnnotationId,
-  FormOrderedAnnotation,
-  GeneratorAnnotation,
-  GeneratorAnnotationId,
-  HiddenAnnotation,
-  IconAnnotation,
-  IconFromRefAnnotation,
-  LabelAnnotation,
-  ReferenceAnnotation,
-  ReferenceAnnotationId,
-  TypeAnnotation,
-  getDescriptionWithSchema,
-  getLabelWithSchema,
-  getTypeAnnotation,
-  getTypeIdentifierAnnotation,
-  setDescriptionWithSchema,
-  setLabelWithSchema
-} from "./chunk-3TN2VMI4.mjs";
-import "./chunk-2ZHECXUR.mjs";
-import "./chunk-TOCVVFK2.mjs";
-import "./chunk-J5LGTIGS.mjs";
-export {
-  DEFAULT_LAYOUT_NAME,
-  DescriptionAnnotation,
-  Dictionary,
-  FieldLookupAnnotationId,
-  FormCreateAnnotation,
-  FormCreateAnnotationId,
-  FormInlineAnnotation,
-  FormInputAnnotation,
-  FormLayoutAnnotation,
-  FormLayoutAnnotationId,
-  FormOrderedAnnotation,
-  GeneratorAnnotation,
-  GeneratorAnnotationId,
-  HiddenAnnotation,
-  IconAnnotation,
-  IconFromRefAnnotation,
-  Key,
-  LabelAnnotation,
-  ReferenceAnnotation,
-  ReferenceAnnotationId,
-  TypeAnnotation,
-  TypeId,
-  atom,
-  atomProperty,
-  buildDictionary,
-  get,
-  getDescriptionWithSchema,
-  getDictionary,
-  getFromAst,
-  getLabelWithSchema,
-  getTypeAnnotation,
-  getTypeIdentifierAnnotation,
-  make,
-  set,
-  setDescriptionWithSchema,
-  setDictionary,
-  setLabelWithSchema,
-  update
-};
-//# sourceMappingURL=Annotation.mjs.map

package/dist/lib/neutral/Annotation.mjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": [],
-  "sourcesContent": [],
-  "mappings": "",
-  "names": []
-}

package/dist/lib/neutral/Database.mjs

@@ -1,42 +0,0 @@
-import {
-  Database,
-  Service,
-  TypeId2 as TypeId,
-  add,
-  addType,
-  appendToFeed,
-  deleteFromFeed,
-  flush,
-  isDatabase,
-  layer,
-  load,
-  makeService,
-  notAvailable,
-  query,
-  remove,
-  resolve,
-  spaceId
-} from "./chunk-3TN2VMI4.mjs";
-import "./chunk-2ZHECXUR.mjs";
-import "./chunk-TOCVVFK2.mjs";
-import "./chunk-J5LGTIGS.mjs";
-export {
-  Database,
-  Service,
-  TypeId,
-  add,
-  addType,
-  appendToFeed,
-  deleteFromFeed,
-  flush,
-  isDatabase,
-  layer,
-  load,
-  makeService,
-  notAvailable,
-  query,
-  remove,
-  resolve,
-  spaceId
-};
-//# sourceMappingURL=Database.mjs.map

package/dist/lib/neutral/Database.mjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": [],
-  "sourcesContent": [],
-  "mappings": "",
-  "names": []
-}

package/dist/lib/neutral/Entity.mjs

@@ -1,76 +0,0 @@
-import {
-  Kind,
-  KindId,
-  KindSchema,
-  Meta,
-  SnapshotKindId,
-  Unknown,
-  addTag,
-  atom,
-  getDatabase,
-  getDescription,
-  getIcon,
-  getKeys,
-  getKind,
-  getLabel,
-  getMeta,
-  getType,
-  getTypeURI,
-  getTypename,
-  getURI,
-  instanceOf,
-  isDeleted,
-  isEntity,
-  isSnapshot,
-  labelAtom,
-  labelProperty,
-  removeTag,
-  setLabel,
-  subscribe,
-  toJSON,
-  update
-} from "./chunk-BEFR7LEA.mjs";
-import "./chunk-XB6ISRAO.mjs";
-import "./chunk-ACFAOTKJ.mjs";
-import "./chunk-WKIT2YY5.mjs";
-import "./chunk-2HKGAQM4.mjs";
-import "./chunk-4A2NWKRJ.mjs";
-import "./chunk-KCBW4BR6.mjs";
-import "./chunk-L3E5IXAE.mjs";
-import "./chunk-3TN2VMI4.mjs";
-import "./chunk-2ZHECXUR.mjs";
-import "./chunk-TOCVVFK2.mjs";
-import "./chunk-J5LGTIGS.mjs";
-export {
-  Kind,
-  KindId,
-  KindSchema,
-  Meta,
-  SnapshotKindId,
-  Unknown,
-  addTag,
-  atom,
-  getDatabase,
-  getDescription,
-  getIcon,
-  getKeys,
-  getKind,
-  getLabel,
-  getMeta,
-  getType,
-  getTypeURI,
-  getTypename,
-  getURI,
-  instanceOf,
-  isDeleted,
-  isEntity,
-  isSnapshot,
-  labelAtom,
-  labelProperty,
-  removeTag,
-  setLabel,
-  subscribe,
-  toJSON,
-  update
-};
-//# sourceMappingURL=Entity.mjs.map

package/dist/lib/neutral/Entity.mjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": [],
-  "sourcesContent": [],
-  "mappings": "",
-  "names": []
-}

package/dist/lib/neutral/Err.mjs

@@ -1,16 +0,0 @@
-import {
-  EntityNotFoundError,
-  GetReactiveError,
-  SchemaNotFoundError,
-  TextEditNotFoundError,
-  TextNotSupportedError
-} from "./chunk-TOCVVFK2.mjs";
-import "./chunk-J5LGTIGS.mjs";
-export {
-  EntityNotFoundError,
-  GetReactiveError,
-  SchemaNotFoundError,
-  TextEditNotFoundError,
-  TextNotSupportedError
-};
-//# sourceMappingURL=Err.mjs.map

package/dist/lib/neutral/Err.mjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": [],
-  "sourcesContent": [],
-  "mappings": "",
-  "names": []
-}

package/dist/lib/neutral/Feed.mjs

@@ -1,50 +0,0 @@
-import {
-  ContextFeedService,
-  Feed,
-  FeedService,
-  append,
-  cursor,
-  getQueueUri,
-  getSyncState,
-  make,
-  next,
-  nextOption,
-  notAvailable,
-  query,
-  remove,
-  setRetention,
-  sync
-} from "./chunk-XXWK4J53.mjs";
-import "./chunk-HBXT3GSB.mjs";
-import "./chunk-FSGX2R62.mjs";
-import "./chunk-BEFR7LEA.mjs";
-import "./chunk-XB6ISRAO.mjs";
-import "./chunk-ACFAOTKJ.mjs";
-import "./chunk-WKIT2YY5.mjs";
-import "./chunk-C62JYFAD.mjs";
-import "./chunk-2HKGAQM4.mjs";
-import "./chunk-4A2NWKRJ.mjs";
-import "./chunk-KCBW4BR6.mjs";
-import "./chunk-L3E5IXAE.mjs";
-import "./chunk-3TN2VMI4.mjs";
-import "./chunk-2ZHECXUR.mjs";
-import "./chunk-TOCVVFK2.mjs";
-import "./chunk-J5LGTIGS.mjs";
-export {
-  ContextFeedService,
-  Feed,
-  FeedService,
-  append,
-  cursor,
-  getQueueUri,
-  getSyncState,
-  make,
-  next,
-  nextOption,
-  notAvailable,
-  query,
-  remove,
-  setRetention,
-  sync
-};
-//# sourceMappingURL=Feed.mjs.map

package/dist/lib/neutral/Feed.mjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": [],
-  "sourcesContent": [],
-  "mappings": "",
-  "names": []
-}

package/dist/lib/neutral/Filter.mjs

@@ -1,72 +0,0 @@
-import {
-  and,
-  between,
-  childOf,
-  contains,
-  created,
-  eq,
-  everything,
-  foreignKeys,
-  fromAst,
-  gt,
-  gte,
-  id,
-  in$,
-  is,
-  key,
-  lt,
-  lte,
-  neq,
-  not,
-  nothing,
-  or,
-  pretty,
-  props,
-  tag,
-  text,
-  toPredicate,
-  type,
-  updated
-} from "./chunk-SCT6FFCR.mjs";
-import "./chunk-FSGX2R62.mjs";
-import "./chunk-ACFAOTKJ.mjs";
-import "./chunk-WKIT2YY5.mjs";
-import "./chunk-2HKGAQM4.mjs";
-import "./chunk-4A2NWKRJ.mjs";
-import "./chunk-KCBW4BR6.mjs";
-import "./chunk-L3E5IXAE.mjs";
-import "./chunk-3TN2VMI4.mjs";
-import "./chunk-2ZHECXUR.mjs";
-import "./chunk-TOCVVFK2.mjs";
-import "./chunk-J5LGTIGS.mjs";
-export {
-  and,
-  between,
-  childOf,
-  contains,
-  created,
-  eq,
-  everything,
-  foreignKeys,
-  fromAst,
-  gt,
-  gte,
-  id,
-  in$ as in,
-  is,
-  key,
-  lt,
-  lte,
-  neq,
-  not,
-  nothing,
-  or,
-  pretty,
-  props,
-  tag,
-  text,
-  toPredicate,
-  type,
-  updated
-};
-//# sourceMappingURL=Filter.mjs.map

package/dist/lib/neutral/Filter.mjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": [],
-  "sourcesContent": [],
-  "mappings": "",
-  "names": []
-}

package/dist/lib/neutral/Format.mjs

@@ -1,82 +0,0 @@
-import "./chunk-BXIKXT7Q.mjs";
-import {
-  Currency,
-  CurrencyAnnotationId,
-  DateOnly,
-  DateTime,
-  DecimalPrecision,
-  Duration,
-  Email,
-  Format,
-  FormatAnnotation,
-  FormatAnnotationId,
-  FormatEnums,
-  Formula,
-  GeoLocation,
-  GeoPoint,
-  Hostname,
-  OptionsAnnotation,
-  OptionsAnnotationId,
-  PropertyKind,
-  Regex,
-  SelectOption,
-  SimpleDate,
-  SimpleDateTime,
-  SimpleTime,
-  Text,
-  TimeOnly,
-  TypeEnum,
-  TypeFormat,
-  URL,
-  UUID,
-  formatToType,
-  getFormatAnnotation,
-  getOptionsAnnotation,
-  getTypeEnum,
-  toSimpleDate,
-  toSimpleDateTime,
-  toSimpleTime,
-  typeToFormat
-} from "./chunk-KCBW4BR6.mjs";
-import "./chunk-2ZHECXUR.mjs";
-import "./chunk-J5LGTIGS.mjs";
-export {
-  Currency,
-  CurrencyAnnotationId,
-  DateOnly,
-  DateTime,
-  DecimalPrecision,
-  Duration,
-  Email,
-  Format,
-  FormatAnnotation,
-  FormatAnnotationId,
-  FormatEnums,
-  Formula,
-  GeoLocation,
-  GeoPoint,
-  Hostname,
-  OptionsAnnotation,
-  OptionsAnnotationId,
-  PropertyKind,
-  Regex,
-  SelectOption,
-  SimpleDate,
-  SimpleDateTime,
-  SimpleTime,
-  Text,
-  TimeOnly,
-  TypeEnum,
-  TypeFormat,
-  URL,
-  UUID,
-  formatToType,
-  getFormatAnnotation,
-  getOptionsAnnotation,
-  getTypeEnum,
-  toSimpleDate,
-  toSimpleDateTime,
-  toSimpleTime,
-  typeToFormat
-};
-//# sourceMappingURL=Format.mjs.map

package/dist/lib/neutral/Format.mjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": [],
-  "sourcesContent": [],
-  "mappings": "",
-  "names": []
-}

package/dist/lib/neutral/JsonSchema.mjs

@@ -1,18 +0,0 @@
-import {
-  JsonSchema,
-  toEffectSchema,
-  toJsonSchema
-} from "./chunk-UGFFV2FR.mjs";
-import "./chunk-4A2NWKRJ.mjs";
-import "./chunk-KCBW4BR6.mjs";
-import "./chunk-L3E5IXAE.mjs";
-import "./chunk-3TN2VMI4.mjs";
-import "./chunk-2ZHECXUR.mjs";
-import "./chunk-TOCVVFK2.mjs";
-import "./chunk-J5LGTIGS.mjs";
-export {
-  JsonSchema,
-  toEffectSchema,
-  toJsonSchema
-};
-//# sourceMappingURL=JsonSchema.mjs.map

package/dist/lib/neutral/JsonSchema.mjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": [],
-  "sourcesContent": [],
-  "mappings": "",
-  "names": []
-}