@dxos/echo 0.8.4-main.1da679c → 0.8.4-main.1f223c7

package/dist/lib/browser/{chunk-WG555MU5.mjs → chunk-EIXXFUN5.mjs}

@@ -39,7 +39,6 @@ import { SpaceId, ObjectId } from "@dxos/keys";
 // src/Obj.ts
 var Obj_exports = {};
 __export(Obj_exports, {
-  Any: () => Any,
   Meta: () => Meta,
   VersionTypeId: () => VersionTypeId2,
   clone: () => clone,
@@ -48,14 +47,14 @@ __export(Obj_exports, {
   deleteKeys: () => deleteKeys,
   encodeVersion: () => encodeVersion,
   fromJSON: () => fromJSON,
-  getDXN: () => getDXN2,
+  getDXN: () => getDXN,
   getKeys: () => getKeys,
   getLabel: () => getLabel2,
-  getMeta: () => getMeta3,
+  getMeta: () => getMeta2,
   getSchema: () => getSchema2,
   getSnapshot: () => getSnapshot2,
   getTypeDXN: () => getTypeDXN,
-  getTypename: () => getTypename2,
+  getTypename: () => getTypename,
   instanceOf: () => instanceOf,
   isDeleted: () => isDeleted2,
   isObject: () => isObject,
@@ -68,111 +67,38 @@ __export(Obj_exports, {
 });
 import { Schema } from "effect";
 import { dual } from "effect/Function";
-import * as EchoSchema2 from "@dxos/echo-schema";
-import { assertArgument, invariant as invariant2 } from "@dxos/invariant";
+import * as EchoSchema from "@dxos/echo-schema";
+import { assertArgument, invariant } from "@dxos/invariant";
 import * as LiveObject from "@dxos/live-object";
 import { live } from "@dxos/live-object";
 import { assumeType, deepMapValues } from "@dxos/util";
-
-// src/Type.ts
-var Type_exports = {};
-__export(Type_exports, {
-  DXN: () => DXN,
-  Expando: () => Expando2,
-  Format: () => Format,
-  JsonSchema: () => JsonSchemaType,
-  Kind: () => Kind,
-  KindId: () => KindId,
-  Obj: () => Obj,
-  ObjectId: () => ObjectId2,
-  Ref: () => Ref2,
-  Relation: () => Relation,
-  SpaceId: () => SpaceId2,
-  getDXN: () => getDXN,
-  getMeta: () => getMeta,
-  getTypename: () => getTypename,
-  getVersion: () => getVersion,
-  isMutable: () => isMutable2,
-  toEffectSchema: () => toEffectSchema,
-  toJsonSchema: () => toJsonSchema
-});
-import * as EchoSchema from "@dxos/echo-schema";
-import { invariant } from "@dxos/invariant";
-import { SpaceId as SpaceId2, ObjectId as ObjectId2, DXN } from "@dxos/keys";
-import { Format, JsonSchemaType, toEffectSchema, toJsonSchema } from "@dxos/echo-schema";
-var __dxlog_file = "/__w/dxos/dxos/packages/core/echo/echo/src/Type.ts";
-var KindId = EchoSchema.EntityKindId;
-var Kind = EchoSchema.EntityKind;
-var Obj = EchoSchema.EchoObject;
-var Expando2 = EchoSchema.Expando;
-var Relation = EchoSchema.EchoRelation;
-var Ref2 = EchoSchema.Ref;
-var getDXN = (schema) => {
-  return EchoSchema.getSchemaDXN(schema);
-};
-var getTypename = (schema) => {
-  const typename = EchoSchema.getSchemaTypename(schema);
-  invariant(typeof typename === "string" && !typename.startsWith("dxn:"), "Invalid typename", {
-    F: __dxlog_file,
-    L: 212,
-    S: void 0,
-    A: [
-      "typeof typename === 'string' && !typename.startsWith('dxn:')",
-      "'Invalid typename'"
-    ]
-  });
-  return typename;
-};
-var getVersion = (schema) => {
-  const version2 = EchoSchema.getSchemaVersion(schema);
-  invariant(typeof version2 === "string" && version2.match(/^\d+\.\d+\.\d+$/), "Invalid version", {
-    F: __dxlog_file,
-    L: 222,
-    S: void 0,
-    A: [
-      "typeof version === 'string' && version.match(/^\\d+\\.\\d+\\.\\d+$/)",
-      "'Invalid version'"
-    ]
-  });
-  return version2;
-};
-var isMutable2 = EchoSchema.isMutable;
-var getMeta = (schema) => {
-  return EchoSchema.getTypeAnnotation(schema);
-};
-
-// src/Obj.ts
-var __dxlog_file2 = "/__w/dxos/dxos/packages/core/echo/echo/src/Obj.ts";
-var Any = Schema.Struct({}).pipe(Obj({
-  typename: "dxos.org/types/Any",
-  version: "0.1.0"
-}));
-var Meta = EchoSchema2.MetaId;
+var __dxlog_file = "/__w/dxos/dxos/packages/core/echo/echo/src/Obj.ts";
+var Meta = EchoSchema.MetaId;
 var make = (schema, props, meta) => {
-  assertArgument(EchoSchema2.getTypeAnnotation(schema)?.kind === EchoSchema2.EntityKind.Object, "schema", "Expected an object schema");
-  if (props[EchoSchema2.MetaId] != null) {
-    meta = props[EchoSchema2.MetaId];
-    delete props[EchoSchema2.MetaId];
+  assertArgument(EchoSchema.getTypeAnnotation(schema)?.kind === EchoSchema.EntityKind.Object, "schema", "Expected an object schema");
+  if (props[EchoSchema.MetaId] != null) {
+    meta = props[EchoSchema.MetaId];
+    delete props[EchoSchema.MetaId];
   }
   return live(schema, props, meta);
 };
 var isObject = (obj) => {
   assumeType(obj);
-  return typeof obj === "object" && obj !== null && obj[EchoSchema2.EntityKindId] === EchoSchema2.EntityKind.Object;
+  return typeof obj === "object" && obj !== null && obj[EchoSchema.EntityKindId] === EchoSchema.EntityKind.Object;
 };
 var instanceOf = (...args) => {
   if (args.length === 1) {
-    return (obj) => EchoSchema2.isInstanceOf(args[0], obj);
+    return (obj) => EchoSchema.isInstanceOf(args[0], obj);
   }
-  return EchoSchema2.isInstanceOf(args[0], args[1]);
+  return EchoSchema.isInstanceOf(args[0], args[1]);
 };
-var getSchema2 = EchoSchema2.getSchema;
-var getDXN2 = (obj) => {
+var getSchema2 = EchoSchema.getSchema;
+var getDXN = (obj) => {
   assertArgument(!Schema.isSchema(obj), "obj", "Object should not be a schema.");
-  const dxn = EchoSchema2.getObjectDXN(obj);
-  invariant2(dxn != null, "Invalid object.", {
-    F: __dxlog_file2,
-    L: 120,
+  const dxn = EchoSchema.getObjectDXN(obj);
+  invariant(dxn != null, "Invalid object.", {
+    F: __dxlog_file,
+    L: 113,
     S: void 0,
     A: [
       "dxn != null",
@@ -181,19 +107,19 @@ var getDXN2 = (obj) => {
   });
   return dxn;
 };
-var getTypeDXN = EchoSchema2.getType;
-var getTypename2 = (obj) => {
+var getTypeDXN = EchoSchema.getType;
+var getTypename = (obj) => {
   const schema = getSchema2(obj);
   if (schema == null) {
-    return EchoSchema2.getType(obj)?.asTypeDXN()?.type;
+    return EchoSchema.getType(obj)?.asTypeDXN()?.type;
   }
-  return EchoSchema2.getSchemaTypename(schema);
+  return EchoSchema.getSchemaTypename(schema);
 };
-var getMeta3 = (obj) => {
-  const meta = EchoSchema2.getMeta(obj);
-  invariant2(meta != null, "Invalid object.", {
-    F: __dxlog_file2,
-    L: 148,
+var getMeta2 = (obj) => {
+  const meta = EchoSchema.getMeta(obj);
+  invariant(meta != null, "Invalid object.", {
+    F: __dxlog_file,
+    L: 141,
     S: void 0,
     A: [
       "meta != null",
@@ -203,10 +129,10 @@ var getMeta3 = (obj) => {
   return meta;
 };
 var getKeys = dual(2, (obj, source) => {
-  const meta = EchoSchema2.getMeta(obj);
-  invariant2(meta != null, "Invalid object.", {
-    F: __dxlog_file2,
-    L: 160,
+  const meta = EchoSchema.getMeta(obj);
+  invariant(meta != null, "Invalid object.", {
+    F: __dxlog_file,
+    L: 153,
     S: void 0,
     A: [
       "meta != null",
@@ -216,7 +142,7 @@ var getKeys = dual(2, (obj, source) => {
   return meta.keys.filter((key) => key.source === source);
 });
 var deleteKeys = (obj, source) => {
-  const meta = EchoSchema2.getMeta(obj);
+  const meta = EchoSchema.getMeta(obj);
   for (let i = 0; i < meta.keys.length; i++) {
     if (meta.keys[i].source === source) {
       meta.keys.splice(i, 1);
@@ -225,10 +151,10 @@ var deleteKeys = (obj, source) => {
   }
 };
 var isDeleted2 = (obj) => {
-  const deleted = EchoSchema2.isDeleted(obj);
-  invariant2(typeof deleted === "boolean", "Invalid object.", {
-    F: __dxlog_file2,
-    L: 182,
+  const deleted = EchoSchema.isDeleted(obj);
+  invariant(typeof deleted === "boolean", "Invalid object.", {
+    F: __dxlog_file,
+    L: 175,
     S: void 0,
     A: [
       "typeof deleted === 'boolean'",
@@ -240,24 +166,24 @@ var isDeleted2 = (obj) => {
 var getLabel2 = (obj) => {
   const schema = getSchema2(obj);
   if (schema != null) {
-    return EchoSchema2.getLabel(schema, obj);
+    return EchoSchema.getLabel(schema, obj);
   }
 };
 var setLabel2 = (obj, label) => {
   const schema = getSchema2(obj);
   if (schema != null) {
-    EchoSchema2.setLabel(schema, obj, label);
+    EchoSchema.setLabel(schema, obj, label);
   }
 };
-var toJSON = (obj) => EchoSchema2.objectToJSON(obj);
-var fromJSON = EchoSchema2.objectFromJSON;
+var toJSON = (obj) => EchoSchema.objectToJSON(obj);
+var fromJSON = EchoSchema.objectFromJSON;
 var getSnapshot2 = LiveObject.getSnapshot;
 var clone = (obj, opts) => {
   const { id, ...data } = obj;
   const schema = getSchema2(obj);
-  invariant2(schema != null, "Object should have a schema", {
-    F: __dxlog_file2,
-    L: 247,
+  invariant(schema != null, "Object should have a schema", {
+    F: __dxlog_file,
+    L: 240,
     S: void 0,
     A: [
       "schema != null",
@@ -265,7 +191,7 @@ var clone = (obj, opts) => {
     ]
   });
   const props = deepMapValues(data, (value, recurse) => {
-    if (EchoSchema2.Ref.isRef(value)) {
+    if (EchoSchema.Ref.isRef(value)) {
       return value;
     }
     return recurse(value);
@@ -273,16 +199,16 @@ var clone = (obj, opts) => {
   if (opts?.retainId) {
     props.id = id;
   }
-  const meta = getMeta3(obj);
-  props[EchoSchema2.MetaId] = deepMapValues(meta, (value, recurse) => {
-    if (EchoSchema2.Ref.isRef(value)) {
+  const meta = getMeta2(obj);
+  props[EchoSchema.MetaId] = deepMapValues(meta, (value, recurse) => {
+    if (EchoSchema.Ref.isRef(value)) {
       return value;
     }
     return recurse(value);
   });
   return make(schema, props);
 };
-var VersionTypeId2 = EchoSchema2.VersionTypeId;
+var VersionTypeId2 = EchoSchema.VersionTypeId;
 var unversioned = {
   [VersionTypeId2]: {},
   versioned: false
@@ -291,7 +217,7 @@ var isVersion = (obj) => {
   return obj != null && typeof obj === "object" && VersionTypeId2 in obj;
 };
 var version = (obj) => {
-  const version2 = obj[EchoSchema2.ObjectVersionId];
+  const version2 = obj[EchoSchema.ObjectVersionId];
   if (version2 === void 0) {
     return unversioned;
   }
@@ -332,16 +258,15 @@ __export(Ref_exports, {
   isRef: () => isRef,
   make: () => make2
 });
-import * as EchoSchema3 from "@dxos/echo-schema";
-var Array2 = EchoSchema3.RefArray;
-var isRef = EchoSchema3.Ref.isRef;
-var make2 = EchoSchema3.Ref.make;
-var fromDXN = EchoSchema3.Ref.fromDXN;
+import * as EchoSchema2 from "@dxos/echo-schema";
+var Array2 = EchoSchema2.RefArray;
+var isRef = EchoSchema2.Ref.isRef;
+var make2 = EchoSchema2.Ref.make;
+var fromDXN = EchoSchema2.Ref.fromDXN;
 
 // src/Relation.ts
 var Relation_exports = {};
 __export(Relation_exports, {
-  Any: () => Any2,
   Source: () => Source,
   Target: () => Target,
   getSource: () => getSource,
@@ -351,51 +276,44 @@ __export(Relation_exports, {
   isRelation: () => isRelation,
   make: () => make3
 });
-import { Schema as Schema2 } from "effect";
 import { raise } from "@dxos/debug";
-import * as EchoSchema4 from "@dxos/echo-schema";
-import { assertArgument as assertArgument2, invariant as invariant3 } from "@dxos/invariant";
-import { DXN as DXN2 } from "@dxos/keys";
+import * as EchoSchema3 from "@dxos/echo-schema";
+import { assertArgument as assertArgument2, invariant as invariant2 } from "@dxos/invariant";
+import { DXN } from "@dxos/keys";
 import { live as live2 } from "@dxos/live-object";
 import { assumeType as assumeType2 } from "@dxos/util";
-var __dxlog_file3 = "/__w/dxos/dxos/packages/core/echo/echo/src/Relation.ts";
-var Any2 = Schema2.Struct({}).pipe(Relation({
-  typename: "dxos.org/types/Any",
-  version: "0.1.0",
-  source: Any,
-  target: Any
-}));
-var Source = EchoSchema4.RelationSourceId;
-var Target = EchoSchema4.RelationTargetId;
+var __dxlog_file2 = "/__w/dxos/dxos/packages/core/echo/echo/src/Relation.ts";
+var Source = EchoSchema3.RelationSourceId;
+var Target = EchoSchema3.RelationTargetId;
 var make3 = (schema, props, meta) => {
-  assertArgument2(EchoSchema4.getTypeAnnotation(schema)?.kind === EchoSchema4.EntityKind.Relation, "schema", "Expected a relation schema");
-  if (props[EchoSchema4.MetaId] != null) {
-    meta = props[EchoSchema4.MetaId];
-    delete props[EchoSchema4.MetaId];
-  }
-  const sourceDXN = EchoSchema4.getObjectDXN(props[Source]) ?? raise(new Error("Unresolved relation source"));
-  const targetDXN = EchoSchema4.getObjectDXN(props[Target]) ?? raise(new Error("Unresolved relation target"));
-  props[EchoSchema4.RelationSourceDXNId] = sourceDXN;
-  props[EchoSchema4.RelationTargetDXNId] = targetDXN;
+  assertArgument2(EchoSchema3.getTypeAnnotation(schema)?.kind === EchoSchema3.EntityKind.Relation, "schema", "Expected a relation schema");
+  if (props[EchoSchema3.MetaId] != null) {
+    meta = props[EchoSchema3.MetaId];
+    delete props[EchoSchema3.MetaId];
+  }
+  const sourceDXN = EchoSchema3.getObjectDXN(props[Source]) ?? raise(new Error("Unresolved relation source"));
+  const targetDXN = EchoSchema3.getObjectDXN(props[Target]) ?? raise(new Error("Unresolved relation target"));
+  props[EchoSchema3.RelationSourceDXNId] = sourceDXN;
+  props[EchoSchema3.RelationTargetDXNId] = targetDXN;
   return live2(schema, props, meta);
 };
 var isRelation = (value) => {
   if (typeof value !== "object" || value === null) {
     return false;
   }
-  if (EchoSchema4.ATTR_RELATION_SOURCE in value || EchoSchema4.ATTR_RELATION_TARGET in value) {
+  if (EchoSchema3.ATTR_RELATION_SOURCE in value || EchoSchema3.ATTR_RELATION_TARGET in value) {
     return true;
   }
-  const kind = value[EchoSchema4.EntityKindId];
-  return kind === EchoSchema4.EntityKind.Relation;
+  const kind = value[EchoSchema3.EntityKindId];
+  return kind === EchoSchema3.EntityKind.Relation;
 };
 var getSourceDXN = (value) => {
   assertArgument2(isRelation(value), "Expected a relation");
   assumeType2(value);
-  const dxn = value[EchoSchema4.RelationSourceDXNId];
-  invariant3(dxn instanceof DXN2, void 0, {
-    F: __dxlog_file3,
-    L: 109,
+  const dxn = value[EchoSchema3.RelationSourceDXNId];
+  invariant2(dxn instanceof DXN, void 0, {
+    F: __dxlog_file2,
+    L: 100,
     S: void 0,
     A: [
       "dxn instanceof DXN",
@@ -407,10 +325,10 @@ var getSourceDXN = (value) => {
 var getTargetDXN = (value) => {
   assertArgument2(isRelation(value), "Expected a relation");
   assumeType2(value);
-  const dxn = value[EchoSchema4.RelationTargetDXNId];
-  invariant3(dxn instanceof DXN2, void 0, {
-    F: __dxlog_file3,
-    L: 121,
+  const dxn = value[EchoSchema3.RelationTargetDXNId];
+  invariant2(dxn instanceof DXN, void 0, {
+    F: __dxlog_file2,
+    L: 112,
     S: void 0,
     A: [
       "dxn instanceof DXN",
@@ -422,10 +340,10 @@ var getTargetDXN = (value) => {
 var getSource = (relation) => {
   assertArgument2(isRelation(relation), "Expected a relation");
   assumeType2(relation);
-  const obj = relation[EchoSchema4.RelationSourceId];
-  invariant3(obj !== void 0, `Invalid source: ${relation.id}`, {
-    F: __dxlog_file3,
-    L: 133,
+  const obj = relation[EchoSchema3.RelationSourceId];
+  invariant2(obj !== void 0, `Invalid source: ${relation.id}`, {
+    F: __dxlog_file2,
+    L: 124,
     S: void 0,
     A: [
       "obj !== undefined",
@@ -437,10 +355,10 @@ var getSource = (relation) => {
 var getTarget = (relation) => {
   assertArgument2(isRelation(relation), "Expected a relation");
   assumeType2(relation);
-  const obj = relation[EchoSchema4.RelationTargetId];
-  invariant3(obj !== void 0, `Invalid target: ${relation.id}`, {
-    F: __dxlog_file3,
-    L: 145,
+  const obj = relation[EchoSchema3.RelationTargetId];
+  invariant2(obj !== void 0, `Invalid target: ${relation.id}`, {
+    F: __dxlog_file2,
+    L: 136,
     S: void 0,
     A: [
       "obj !== undefined",
@@ -450,11 +368,78 @@ var getTarget = (relation) => {
   return obj;
 };
 
+// src/Type.ts
+var Type_exports = {};
+__export(Type_exports, {
+  DXN: () => DXN2,
+  Expando: () => Expando2,
+  Format: () => Format,
+  JsonSchema: () => JsonSchemaType,
+  Kind: () => Kind,
+  KindId: () => KindId,
+  Obj: () => Obj,
+  ObjectId: () => ObjectId2,
+  Ref: () => Ref4,
+  Relation: () => Relation,
+  SpaceId: () => SpaceId2,
+  getDXN: () => getDXN2,
+  getMeta: () => getMeta3,
+  getTypename: () => getTypename2,
+  getVersion: () => getVersion,
+  isMutable: () => isMutable2,
+  toEffectSchema: () => toEffectSchema,
+  toJsonSchema: () => toJsonSchema
+});
+import * as EchoSchema4 from "@dxos/echo-schema";
+import { invariant as invariant3 } from "@dxos/invariant";
+import { SpaceId as SpaceId2, ObjectId as ObjectId2, DXN as DXN2 } from "@dxos/keys";
+import { Format, JsonSchemaType, toEffectSchema, toJsonSchema } from "@dxos/echo-schema";
+var __dxlog_file3 = "/__w/dxos/dxos/packages/core/echo/echo/src/Type.ts";
+var KindId = EchoSchema4.EntityKindId;
+var Kind = EchoSchema4.EntityKind;
+var Obj = EchoSchema4.EchoObject;
+var Expando2 = EchoSchema4.Expando;
+var Relation = EchoSchema4.EchoRelation;
+var Ref4 = EchoSchema4.Ref;
+var getDXN2 = (schema) => {
+  return EchoSchema4.getSchemaDXN(schema);
+};
+var getTypename2 = (schema) => {
+  const typename = EchoSchema4.getSchemaTypename(schema);
+  invariant3(typeof typename === "string" && !typename.startsWith("dxn:"), "Invalid typename", {
+    F: __dxlog_file3,
+    L: 212,
+    S: void 0,
+    A: [
+      "typeof typename === 'string' && !typename.startsWith('dxn:')",
+      "'Invalid typename'"
+    ]
+  });
+  return typename;
+};
+var getVersion = (schema) => {
+  const version2 = EchoSchema4.getSchemaVersion(schema);
+  invariant3(typeof version2 === "string" && version2.match(/^\d+\.\d+\.\d+$/), "Invalid version", {
+    F: __dxlog_file3,
+    L: 222,
+    S: void 0,
+    A: [
+      "typeof version === 'string' && version.match(/^\\d+\\.\\d+\\.\\d+$/)",
+      "'Invalid version'"
+    ]
+  });
+  return version2;
+};
+var isMutable2 = EchoSchema4.isMutable;
+var getMeta3 = (schema) => {
+  return EchoSchema4.getTypeAnnotation(schema);
+};
+
 // src/index.ts
 import { DXN as DXN4 } from "@dxos/keys";
 
 // src/query/dsl.ts
-import { Match, Schema as Schema3 } from "effect";
+import { Match, Schema as Schema2 } from "effect";
 import { raise as raise2 } from "@dxos/debug";
 import { getTypeReference } from "@dxos/echo-schema";
 import { assertArgument as assertArgument3 } from "@dxos/invariant";
@@ -681,7 +666,7 @@ var propsFilterToAst = (predicates) => {
     idFilter = typeof predicates.id === "string" ? [
       predicates.id
     ] : predicates.id;
-    Schema3.Array(ObjectId3).pipe(Schema3.validateSync)(idFilter);
+    Schema2.Array(ObjectId3).pipe(Schema2.validateSync)(idFilter);
   }
   return {
     id: idFilter,
@@ -841,14 +826,14 @@ export {
   SchemaNotFoundError,
   ObjectNotFoundError,
   Key_exports,
-  Type_exports,
   Obj_exports,
   Ref_exports,
   Relation_exports,
+  Type_exports,
   Filter,
   Query,
   Order,
   DXN4 as DXN,
   QueryAST
 };
-//# sourceMappingURL=chunk-WG555MU5.mjs.map
+//# sourceMappingURL=chunk-EIXXFUN5.mjs.map