@dxos/echo 0.8.4-main.406dc2a → 0.8.4-main.548089c

package/dist/lib/node-esm/{chunk-BQRA4VLX.mjs → chunk-3FGSPSYN.mjs}

@@ -94,6 +94,8 @@ var LabelAnnotationId = Symbol.for("@dxos/schema/annotation/Label");
 var LabelAnnotation = createAnnotationHelper(LabelAnnotationId);
 var DescriptionAnnotationId = Symbol.for("@dxos/schema/annotation/Description");
 var DescriptionAnnotation = createAnnotationHelper(DescriptionAnnotationId);
+var FormAnnotationId = Symbol.for("@dxos/schema/annotation/Form");
+var FormAnnotation = createAnnotationHelper(FormAnnotationId);
 var FieldLookupAnnotationId = Symbol.for("@dxos/schema/annotation/FieldLookup");
 var GeneratorAnnotationId = Symbol.for("@dxos/schema/annotation/Generator");
 var GeneratorAnnotation = createAnnotationHelper(GeneratorAnnotationId);
@@ -725,8 +727,7 @@ var getSchemaProperty = (schema, property) => {
   return schema.properties?.[property];
 };
 var setSchemaProperty = (schema, property, value) => {
-  var _schema;
-  (_schema = schema).properties ?? (_schema.properties = {});
+  schema.properties ??= {};
   schema.properties[property] = value;
   return schema;
 };
@@ -1116,23 +1117,17 @@ var getType = (obj) => {
 };
 
 // src/internal/object/common.ts
-function _define_property(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 var makeTypedEntityClass = (typename, version, baseSchema) => {
-  let _Schema_TypeId2;
-  var _class;
-  return _Schema_TypeId2 = Schema11.TypeId, _class = class {
+  return class {
+    // Implement TypedObject properties.
+    static typename = typename;
+    static version = version;
+    // Implement Schema.Schema properties.
+    // TODO(burdon): Comment required.
+    static [Schema11.TypeId] = schemaVariance;
+    static ast = baseSchema.ast;
+    static annotations = baseSchema.annotations.bind(baseSchema);
+    static pipe = baseSchema.pipe.bind(baseSchema);
     // TODO(burdon): Comment required.
     static [Symbol.hasInstance](obj) {
       return obj != null && getTypename(obj) === typename;
@@ -1141,10 +1136,7 @@ var makeTypedEntityClass = (typename, version, baseSchema) => {
     constructor() {
       throw new Error("Use live(Typename, { ...fields }) to instantiate an object.");
     }
-  }, // Implement TypedObject properties.
-  _define_property(_class, "typename", typename), _define_property(_class, "version", version), // Implement Schema.Schema properties.
-  // TODO(burdon): Comment required.
-  _define_property(_class, _Schema_TypeId2, schemaVariance), _define_property(_class, "ast", baseSchema.ast), _define_property(_class, "annotations", baseSchema.annotations.bind(baseSchema)), _define_property(_class, "pipe", baseSchema.pipe.bind(baseSchema)), _class;
+  };
 };
 var schemaVariance = {
   _A: (_) => _,
@@ -1201,59 +1193,6 @@ import { Reference } from "@dxos/echo-protocol";
 import { compositeRuntime } from "@dxos/echo-signals/runtime";
 import { assertArgument as assertArgument3, invariant as invariant4 } from "@dxos/invariant";
 import { DXN as DXN6, ObjectId as ObjectId3 } from "@dxos/keys";
-function _check_private_redeclaration(obj, privateCollection) {
-  if (privateCollection.has(obj)) {
-    throw new TypeError("Cannot initialize the same private elements twice on an object");
-  }
-}
-function _class_apply_descriptor_get(receiver, descriptor) {
-  if (descriptor.get) {
-    return descriptor.get.call(receiver);
-  }
-  return descriptor.value;
-}
-function _class_apply_descriptor_set(receiver, descriptor, value) {
-  if (descriptor.set) {
-    descriptor.set.call(receiver, value);
-  } else {
-    if (!descriptor.writable) {
-      throw new TypeError("attempted to set read only private field");
-    }
-    descriptor.value = value;
-  }
-}
-function _class_extract_field_descriptor(receiver, privateMap, action) {
-  if (!privateMap.has(receiver)) {
-    throw new TypeError("attempted to " + action + " private field on non-instance");
-  }
-  return privateMap.get(receiver);
-}
-function _class_private_field_get(receiver, privateMap) {
-  var descriptor = _class_extract_field_descriptor(receiver, privateMap, "get");
-  return _class_apply_descriptor_get(receiver, descriptor);
-}
-function _class_private_field_init(obj, privateMap, value) {
-  _check_private_redeclaration(obj, privateMap);
-  privateMap.set(obj, value);
-}
-function _class_private_field_set(receiver, privateMap, value) {
-  var descriptor = _class_extract_field_descriptor(receiver, privateMap, "set");
-  _class_apply_descriptor_set(receiver, descriptor, value);
-  return value;
-}
-function _define_property2(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 var __dxlog_file4 = "/__w/dxos/dxos/packages/core/echo/echo/src/internal/ref/ref.ts";
 var JSON_SCHEMA_ECHO_REF_ID = "/schemas/echo/ref";
 var getSchemaReference = (property) => {
@@ -1370,28 +1309,40 @@ var createEchoReferenceSchema = (echoId, typename, version, schemaName) => {
 var getSchemaExpectedName = (ast) => {
   return SchemaAST6.getIdentifierAnnotation(ast).pipe(Option4.orElse(() => SchemaAST6.getTitleAnnotation(ast)), Option4.orElse(() => SchemaAST6.getDescriptionAnnotation(ast)), Option4.getOrElse(() => void 0));
 };
-var _dxn = /* @__PURE__ */ new WeakMap();
-var _resolver = /* @__PURE__ */ new WeakMap();
-var _signal = /* @__PURE__ */ new WeakMap();
-var _target = /* @__PURE__ */ new WeakMap();
-var _resolverCallback = /* @__PURE__ */ new WeakMap();
-var _RefTypeId = RefTypeId;
 var RefImpl = class _RefImpl {
+  #dxn;
+  #resolver = void 0;
+  #signal = compositeRuntime.createSignal();
+  /**
+  * Target is set when the reference is created from a specific object.
+  * In this case, the target might not be in the database.
+  */
+  #target = void 0;
+  /**
+  * Callback to issue a reactive notification when object is resolved.
+  */
+  #resolverCallback = () => {
+    this.#signal.notifyWrite();
+  };
+  constructor(dxn, target) {
+    this.#dxn = dxn;
+    this.#target = target;
+  }
   /**
   * @inheritdoc
   */
   get dxn() {
-    return _class_private_field_get(this, _dxn);
+    return this.#dxn;
   }
   /**
   * @inheritdoc
   */
   get target() {
-    _class_private_field_get(this, _signal).notifyRead();
-    if (_class_private_field_get(this, _target)) {
-      return _class_private_field_get(this, _target);
+    this.#signal.notifyRead();
+    if (this.#target) {
+      return this.#target;
     }
-    invariant4(_class_private_field_get(this, _resolver), "Resolver is not set", {
+    invariant4(this.#resolver, "Resolver is not set", {
       F: __dxlog_file4,
       L: 368,
       S: this,
@@ -1400,16 +1351,16 @@ var RefImpl = class _RefImpl {
         "'Resolver is not set'"
       ]
     });
-    return _class_private_field_get(this, _resolver).resolveSync(_class_private_field_get(this, _dxn), true, _class_private_field_get(this, _resolverCallback));
+    return this.#resolver.resolveSync(this.#dxn, true, this.#resolverCallback);
   }
   /**
   * @inheritdoc
   */
   async load() {
-    if (_class_private_field_get(this, _target)) {
-      return _class_private_field_get(this, _target);
+    if (this.#target) {
+      return this.#target;
     }
-    invariant4(_class_private_field_get(this, _resolver), "Resolver is not set", {
+    invariant4(this.#resolver, "Resolver is not set", {
       F: __dxlog_file4,
       L: 379,
       S: this,
@@ -1418,7 +1369,7 @@ var RefImpl = class _RefImpl {
         "'Resolver is not set'"
       ]
     });
-    const obj = await _class_private_field_get(this, _resolver).resolve(_class_private_field_get(this, _dxn));
+    const obj = await this.#resolver.resolve(this.#dxn);
     if (obj == null) {
       throw new Error("Object not found");
     }
@@ -1428,7 +1379,7 @@ var RefImpl = class _RefImpl {
   * @inheritdoc
   */
   async tryLoad() {
-    invariant4(_class_private_field_get(this, _resolver), "Resolver is not set", {
+    invariant4(this.#resolver, "Resolver is not set", {
       F: __dxlog_file4,
       L: 391,
       S: this,
@@ -1437,7 +1388,7 @@ var RefImpl = class _RefImpl {
         "'Resolver is not set'"
       ]
     });
-    return await _class_private_field_get(this, _resolver).resolve(_class_private_field_get(this, _dxn));
+    return await this.#resolver.resolve(this.#dxn);
   }
   /**
   * Do not inline the target object in the reference.
@@ -1445,15 +1396,15 @@ var RefImpl = class _RefImpl {
   * Clones the reference object.
   */
   noInline() {
-    const ref = new _RefImpl(_class_private_field_get(this, _dxn), void 0);
-    _class_private_field_set(ref, _resolver, _class_private_field_get(this, _resolver));
+    const ref = new _RefImpl(this.#dxn, void 0);
+    ref.#resolver = this.#resolver;
     return ref;
   }
   encode() {
     return {
-      "/": _class_private_field_get(this, _dxn).toString(),
-      ..._class_private_field_get(this, _target) ? {
-        target: _class_private_field_get(this, _target)
+      "/": this.#dxn.toString(),
+      ...this.#target ? {
+        target: this.#target
       } : {}
     };
   }
@@ -1467,17 +1418,18 @@ var RefImpl = class _RefImpl {
     return this.encode();
   }
   toString() {
-    if (_class_private_field_get(this, _target)) {
-      return `Ref(${_class_private_field_get(this, _target).toString()})`;
+    if (this.#target) {
+      return `Ref(${this.#target.toString()})`;
     }
-    return `Ref(${_class_private_field_get(this, _dxn).toString()})`;
+    return `Ref(${this.#dxn.toString()})`;
   }
+  [RefTypeId] = refVariance;
   /**
   * Internal method to set the resolver.
   * @internal
   */
   _setResolver(resolver) {
-    _class_private_field_set(this, _resolver, resolver);
+    this.#resolver = resolver;
   }
   /**
   * Internal method to get the saved target.
@@ -1485,34 +1437,7 @@ var RefImpl = class _RefImpl {
   * @internal
   */
   _getSavedTarget() {
-    return _class_private_field_get(this, _target);
-  }
-  constructor(dxn, target) {
-    _class_private_field_init(this, _dxn, {
-      writable: true,
-      value: void 0
-    });
-    _class_private_field_init(this, _resolver, {
-      writable: true,
-      value: void 0
-    });
-    _class_private_field_init(this, _signal, {
-      writable: true,
-      value: compositeRuntime.createSignal()
-    });
-    _class_private_field_init(this, _target, {
-      writable: true,
-      value: void 0
-    });
-    _class_private_field_init(this, _resolverCallback, {
-      writable: true,
-      value: () => {
-        _class_private_field_get(this, _signal).notifyWrite();
-      }
-    });
-    _define_property2(this, _RefTypeId, refVariance);
-    _class_private_field_set(this, _dxn, dxn);
-    _class_private_field_set(this, _target, target);
+    return this.#target;
   }
 };
 var setRefResolver = (ref, resolver) => {
@@ -1551,6 +1476,8 @@ var refFromEncodedReference = (encodedReference, resolver) => {
   return ref;
 };
 var StaticRefResolver = class {
+  objects = /* @__PURE__ */ new Map();
+  schemas = /* @__PURE__ */ new Map();
   addObject(obj) {
     this.objects.set(obj.id, obj);
     return this;
@@ -1586,10 +1513,6 @@ var StaticRefResolver = class {
   async resolveSchema(dxn) {
     return this.schemas.get(dxn.toString());
   }
-  constructor() {
-    _define_property2(this, "objects", /* @__PURE__ */ new Map());
-    _define_property2(this, "schemas", /* @__PURE__ */ new Map());
-  }
 };
 
 // src/internal/ref/ref-array.ts
@@ -1926,19 +1849,6 @@ import * as SchemaAST7 from "effect/SchemaAST";
 import { raise as raise3 } from "@dxos/debug";
 import { assertArgument as assertArgument6, invariant as invariant7 } from "@dxos/invariant";
 import { DXN as DXN8 } from "@dxos/keys";
-function _define_property3(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 var __dxlog_file7 = "/__w/dxos/dxos/packages/core/echo/echo/src/internal/object/entity.ts";
 var EchoObject = ({ typename, version }) => {
   return (self) => {
@@ -2070,8 +1980,9 @@ var getDXNForRelationSchemaRef = (schema) => {
   return DXN8.fromTypename(typename).toString();
 };
 var makeEchoObjectSchema = (ast, typename, version) => {
-  var _Schema_make, _EchoObjectSchemaClass;
-  return _EchoObjectSchemaClass = class EchoObjectSchemaClass extends (_Schema_make = Schema15.make(ast)) {
+  return class EchoObjectSchemaClass extends Schema15.make(ast) {
+    static typename = typename;
+    static version = version;
     static annotations(annotations7) {
       const schema = Schema15.make(ast).annotations(annotations7);
       return makeEchoObjectSchema(
@@ -2095,7 +2006,7 @@ var makeEchoObjectSchema = (ast, typename, version) => {
     static instanceOf(value) {
       return Schema15.is(this)(value);
     }
-  }, _define_property3(_EchoObjectSchemaClass, "typename", typename), _define_property3(_EchoObjectSchemaClass, "version", version), _EchoObjectSchemaClass;
+  };
 };
 
 // src/internal/object/expando.ts
@@ -2739,8 +2650,7 @@ var annotations_toJsonSchemaFields = (annotations7) => {
   }
   const echoIdentifier = annotations7[TypeIdentifierAnnotationId];
   if (echoIdentifier) {
-    var _schemaFields, _ECHO_ANNOTATIONS_NS_KEY;
-    (_schemaFields = schemaFields)[_ECHO_ANNOTATIONS_NS_KEY = ECHO_ANNOTATIONS_NS_KEY] ?? (_schemaFields[_ECHO_ANNOTATIONS_NS_KEY] = {});
+    schemaFields[ECHO_ANNOTATIONS_NS_KEY] ??= {};
     schemaFields[ECHO_ANNOTATIONS_NS_KEY].schemaId = echoIdentifier;
   }
   for (const [key, annotationId] of Object.entries(CustomAnnotations)) {
@@ -3035,26 +2945,27 @@ var StoredSchema = Schema22.Struct({
 }));
 
 // src/internal/schema/echo-schema.ts
-function _define_property4(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 var __dxlog_file12 = "/__w/dxos/dxos/packages/core/echo/echo/src/internal/schema/echo-schema.ts";
-var _Schema_TypeId = Schema23.TypeId;
 var ImmutableSchema = class {
+  _schema;
+  _objectAnnotation;
+  constructor(_schema) {
+    this._schema = _schema;
+    this._objectAnnotation = getTypeAnnotation(this._schema);
+    invariant12(this._objectAnnotation, void 0, {
+      F: __dxlog_file12,
+      L: 47,
+      S: this,
+      A: [
+        "this._objectAnnotation",
+        ""
+      ]
+    });
+  }
   //
   // Effect Schema (push to abstract base class).
   //
-  get [_Schema_TypeId]() {
+  get [Schema23.TypeId]() {
     return schemaVariance2;
   }
   get Type() {
@@ -3100,29 +3011,13 @@ var ImmutableSchema = class {
   get mutable() {
     throw new Error("Schema is readonly.");
   }
-  constructor(_schema) {
-    _define_property4(this, "_schema", void 0);
-    _define_property4(this, "_objectAnnotation", void 0);
-    this._schema = _schema;
-    this._objectAnnotation = getTypeAnnotation(this._schema);
-    invariant12(this._objectAnnotation, void 0, {
-      F: __dxlog_file12,
-      L: 47,
-      S: this,
-      A: [
-        "this._objectAnnotation",
-        ""
-      ]
-    });
-  }
 };
 var EchoSchemaConstructor = () => {
-  let _Schema_TypeId2;
-  var _class;
-  return _Schema_TypeId2 = Schema23.TypeId, _class = class {
+  return class {
     static get _schema() {
       return Schema23.Union(StoredSchema, Schema23.instanceOf(EchoSchema)).annotations(StoredSchema.ast.annotations);
     }
+    static [Schema23.TypeId] = schemaVariance2;
     static get ast() {
       const schema = this._schema;
       return schema.ast;
@@ -3135,7 +3030,7 @@ var EchoSchemaConstructor = () => {
       const schema = this._schema;
       return schema.pipe.bind(schema);
     }
-  }, _define_property4(_class, _Schema_TypeId2, schemaVariance2), _class;
+  };
 };
 var isMutable = (schema) => {
   return schema instanceof EchoSchema;
@@ -3145,13 +3040,17 @@ var schemaVariance2 = {
   _I: (_) => _,
   _R: (_) => _
 };
-var _Schema_TypeId1 = Schema23.TypeId;
-var _SchemaMetaSymbol = SchemaMetaSymbol;
 var EchoSchema = class extends EchoSchemaConstructor() {
+  _storedSchema;
+  _schema;
+  _isDirty = true;
+  constructor(_storedSchema) {
+    super(), this._storedSchema = _storedSchema;
+  }
   //
   // Effect Schema (push to abstract base class).
   //
-  get [_Schema_TypeId1]() {
+  get [Schema23.TypeId]() {
     return schemaVariance2;
   }
   get Type() {
@@ -3230,7 +3129,7 @@ var EchoSchema = class extends EchoSchemaConstructor() {
   get name() {
     return this._storedSchema.name;
   }
-  get [_SchemaMetaSymbol]() {
+  get [SchemaMetaSymbol]() {
     return {
       id: this.id,
       typename: this.typename,
@@ -3324,9 +3223,6 @@ var EchoSchema = class extends EchoSchemaConstructor() {
     this._rebuild();
     return this._schema;
   }
-  constructor(_storedSchema) {
-    super(), _define_property4(this, "_storedSchema", void 0), _define_property4(this, "_schema", void 0), _define_property4(this, "_isDirty", void 0), this._storedSchema = _storedSchema, this._isDirty = true;
-  }
 };
 var unwrapOptionality = (property) => {
   if (!SchemaAST14.isUnion(property.type)) {
@@ -3342,21 +3238,14 @@ var unwrapOptionality = (property) => {
 import { raise as raise5 } from "@dxos/debug";
 import { invariant as invariant13 } from "@dxos/invariant";
 import { defaultMap } from "@dxos/util";
-function _define_property5(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 var __dxlog_file13 = "/__w/dxos/dxos/packages/core/echo/echo/src/internal/schema/runtime-schema-registry.ts";
 var RuntimeSchemaRegistry = class {
+  _registry = /* @__PURE__ */ new Map();
+  constructor() {
+    this._registry.set(StoredSchema.typename, [
+      StoredSchema
+    ]);
+  }
   get schemas() {
     return Array.from(this._registry.values()).flat();
   }
@@ -3405,12 +3294,6 @@ var RuntimeSchemaRegistry = class {
       versions.push(schema);
     });
   }
-  constructor() {
-    _define_property5(this, "_registry", /* @__PURE__ */ new Map());
-    this._registry.set(StoredSchema.typename, [
-      StoredSchema
-    ]);
-  }
 };
 
 // src/internal/projection/compose.ts
@@ -3439,12 +3322,10 @@ var composeSchema = (source, target) => {
     const propSchema = source.properties[prop];
     const annotations7 = propSchema?.annotations?.meta;
     if (annotations7) {
-      var _result_properties_prop, _result_properties_prop_annotations;
-      (_result_properties_prop = result.properties[prop]).annotations ?? (_result_properties_prop.annotations = {});
-      (_result_properties_prop_annotations = result.properties[prop].annotations).meta ?? (_result_properties_prop_annotations.meta = {});
+      result.properties[prop].annotations ??= {};
+      result.properties[prop].annotations.meta ??= {};
       for (const key in annotations7) {
-        var _result_properties_prop_annotations_meta, _key;
-        (_result_properties_prop_annotations_meta = result.properties[prop].annotations.meta)[_key = key] ?? (_result_properties_prop_annotations_meta[_key] = {});
+        result.properties[prop].annotations.meta[key] ??= {};
         Object.assign(result.properties[prop].annotations.meta[key], annotations7[key], {
           ...result.properties[prop].annotations.meta[key]
         });
@@ -3465,23 +3346,14 @@ import { inspectCustom as inspectCustom2 } from "@dxos/debug";
 import { compositeRuntime as compositeRuntime2 } from "@dxos/echo-signals/runtime";
 import { invariant as invariant15 } from "@dxos/invariant";
 import { ReactiveArray, createProxy, defineHiddenProperty as defineHiddenProperty3, isValidProxyTarget, objectData, symbolIsProxy } from "@dxos/live-object";
-function _define_property6(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 var __dxlog_file15 = "/__w/dxos/dxos/packages/core/echo/echo/src/internal/proxy/typed-handler.ts";
 var symbolSignal = Symbol("signal");
 var symbolPropertySignal = Symbol("property-signal");
-var TypedReactiveHandler = class {
+var TypedReactiveHandler = class _TypedReactiveHandler {
+  static instance = new _TypedReactiveHandler();
+  _proxyMap = /* @__PURE__ */ new WeakMap();
+  constructor() {
+  }
   init(target) {
     invariant15(typeof target === "object" && target !== null, void 0, {
       F: __dxlog_file15,
@@ -3582,11 +3454,7 @@ var TypedReactiveHandler = class {
       customInspect: false
     })}`;
   }
-  constructor() {
-    _define_property6(this, "_proxyMap", /* @__PURE__ */ new WeakMap());
-  }
 };
-_define_property6(TypedReactiveHandler, "instance", new TypedReactiveHandler());
 var toJSON = (target) => {
   return {
     "@type": "TypedReactiveObject",
@@ -3716,6 +3584,8 @@ export {
   LabelAnnotation,
   DescriptionAnnotationId,
   DescriptionAnnotation,
+  FormAnnotationId,
+  FormAnnotation,
   FieldLookupAnnotationId,
   GeneratorAnnotationId,
   GeneratorAnnotation,
@@ -3854,4 +3724,4 @@ export {
   ForeignKey2 as ForeignKey,
   defineHiddenProperty5 as defineHiddenProperty
 };
-//# sourceMappingURL=chunk-BQRA4VLX.mjs.map
+//# sourceMappingURL=chunk-3FGSPSYN.mjs.map