@dxos/echo 0.9.0 → 0.9.1-main.c7dcc2e112

package/dist/lib/neutral/Annotation.mjs

@@ -8,14 +8,18 @@ import {
   make,
   set,
   setDictionary
-} from "./chunk-3PBP4V4O.mjs";
-import "./chunk-4ZUHOTCG.mjs";
-import "./chunk-WTQJHC75.mjs";
+} from "./chunk-JZ6LFQU5.mjs";
+import "./chunk-X3NUUON4.mjs";
+import "./chunk-4TPQZPLY.mjs";
 import {
+  DEFAULT_LAYOUT_NAME,
   DescriptionAnnotation,
   FieldLookupAnnotationId,
   FormInlineAnnotation,
   FormInputAnnotation,
+  FormLayoutAnnotation,
+  FormLayoutAnnotationId,
+  FormOrderedAnnotation,
   GeneratorAnnotation,
   GeneratorAnnotationId,
   HiddenAnnotation,
@@ -31,16 +35,20 @@ import {
   getTypeIdentifierAnnotation,
   setDescriptionWithSchema,
   setLabelWithSchema
-} from "./chunk-R5W6DXR4.mjs";
+} from "./chunk-WZ32BF53.mjs";
 import "./chunk-O6BH7EPN.mjs";
 import "./chunk-BBFJWWAV.mjs";
 import "./chunk-J5LGTIGS.mjs";
 export {
+  DEFAULT_LAYOUT_NAME,
   DescriptionAnnotation,
   Dictionary,
   FieldLookupAnnotationId,
   FormInlineAnnotation,
   FormInputAnnotation,
+  FormLayoutAnnotation,
+  FormLayoutAnnotationId,
+  FormOrderedAnnotation,
   GeneratorAnnotation,
   GeneratorAnnotationId,
   HiddenAnnotation,

package/dist/lib/neutral/Database.mjs

@@ -4,6 +4,8 @@ import {
   TypeId2 as TypeId,
   add,
   addType,
+  appendToFeed,
+  deleteFromFeed,
   flush,
   isDatabase,
   layer,
@@ -14,7 +16,7 @@ import {
   remove,
   resolve,
   spaceId
-} from "./chunk-R5W6DXR4.mjs";
+} from "./chunk-WZ32BF53.mjs";
 import "./chunk-O6BH7EPN.mjs";
 import "./chunk-BBFJWWAV.mjs";
 import "./chunk-J5LGTIGS.mjs";
@@ -24,6 +26,8 @@ export {
   TypeId,
   add,
   addType,
+  appendToFeed,
+  deleteFromFeed,
   flush,
   isDatabase,
   layer,

package/dist/lib/neutral/Entity.mjs

@@ -22,20 +22,22 @@ import {
   isDeleted,
   isEntity,
   isSnapshot,
+  labelAtom,
+  labelProperty,
   removeTag,
   setLabel,
   subscribe,
   toJSON,
   update
-} from "./chunk-SBVFRTST.mjs";
-import "./chunk-T6E37YIP.mjs";
-import "./chunk-7FPIAJIV.mjs";
-import "./chunk-5SUJPHAE.mjs";
-import "./chunk-7PI7C4EF.mjs";
+} from "./chunk-Z3WMRRAZ.mjs";
+import "./chunk-HGWQR5KH.mjs";
+import "./chunk-VQYL2OQF.mjs";
+import "./chunk-L3OBWBV2.mjs";
+import "./chunk-K3S7D5PR.mjs";
 import "./chunk-TFEWTY5A.mjs";
-import "./chunk-4ZUHOTCG.mjs";
-import "./chunk-WTQJHC75.mjs";
-import "./chunk-R5W6DXR4.mjs";
+import "./chunk-X3NUUON4.mjs";
+import "./chunk-4TPQZPLY.mjs";
+import "./chunk-WZ32BF53.mjs";
 import "./chunk-O6BH7EPN.mjs";
 import "./chunk-BBFJWWAV.mjs";
 import "./chunk-J5LGTIGS.mjs";
@@ -63,6 +65,8 @@ export {
   isDeleted,
   isEntity,
   isSnapshot,
+  labelAtom,
+  labelProperty,
   removeTag,
   setLabel,
   subscribe,

package/dist/lib/neutral/Feed.mjs

@@ -16,19 +16,19 @@ import {
   runQuery,
   setRetention,
   sync
-} from "./chunk-ZGNNFYHS.mjs";
-import "./chunk-TYGKCRMK.mjs";
-import "./chunk-MZ7K3MLL.mjs";
-import "./chunk-SBVFRTST.mjs";
-import "./chunk-T6E37YIP.mjs";
-import "./chunk-7FPIAJIV.mjs";
-import "./chunk-5SUJPHAE.mjs";
-import "./chunk-7PI7C4EF.mjs";
+} from "./chunk-5GAIWRQB.mjs";
+import "./chunk-6CEISA3V.mjs";
+import "./chunk-TF5BSLF6.mjs";
+import "./chunk-Z3WMRRAZ.mjs";
+import "./chunk-HGWQR5KH.mjs";
+import "./chunk-VQYL2OQF.mjs";
+import "./chunk-L3OBWBV2.mjs";
+import "./chunk-K3S7D5PR.mjs";
 import "./chunk-TFEWTY5A.mjs";
-import "./chunk-3PBP4V4O.mjs";
-import "./chunk-4ZUHOTCG.mjs";
-import "./chunk-WTQJHC75.mjs";
-import "./chunk-R5W6DXR4.mjs";
+import "./chunk-JZ6LFQU5.mjs";
+import "./chunk-X3NUUON4.mjs";
+import "./chunk-4TPQZPLY.mjs";
+import "./chunk-WZ32BF53.mjs";
 import "./chunk-O6BH7EPN.mjs";
 import "./chunk-BBFJWWAV.mjs";
 import "./chunk-J5LGTIGS.mjs";

package/dist/lib/neutral/Filter.mjs

@@ -26,15 +26,15 @@ import {
   text,
   type,
   updated
-} from "./chunk-6YDI3J37.mjs";
-import "./chunk-MZ7K3MLL.mjs";
-import "./chunk-7FPIAJIV.mjs";
-import "./chunk-5SUJPHAE.mjs";
-import "./chunk-7PI7C4EF.mjs";
+} from "./chunk-NOL7O3BL.mjs";
+import "./chunk-TF5BSLF6.mjs";
+import "./chunk-VQYL2OQF.mjs";
+import "./chunk-L3OBWBV2.mjs";
+import "./chunk-K3S7D5PR.mjs";
 import "./chunk-TFEWTY5A.mjs";
-import "./chunk-4ZUHOTCG.mjs";
-import "./chunk-WTQJHC75.mjs";
-import "./chunk-R5W6DXR4.mjs";
+import "./chunk-X3NUUON4.mjs";
+import "./chunk-4TPQZPLY.mjs";
+import "./chunk-WZ32BF53.mjs";
 import "./chunk-O6BH7EPN.mjs";
 import "./chunk-BBFJWWAV.mjs";
 import "./chunk-J5LGTIGS.mjs";

package/dist/lib/neutral/JsonSchema.mjs

@@ -2,11 +2,11 @@ import {
   JsonSchema,
   toEffectSchema,
   toJsonSchema
-} from "./chunk-IGK6FN65.mjs";
-import "./chunk-7PI7C4EF.mjs";
+} from "./chunk-PLDMJJJC.mjs";
+import "./chunk-K3S7D5PR.mjs";
 import "./chunk-TFEWTY5A.mjs";
-import "./chunk-WTQJHC75.mjs";
-import "./chunk-R5W6DXR4.mjs";
+import "./chunk-4TPQZPLY.mjs";
+import "./chunk-WZ32BF53.mjs";
 import "./chunk-O6BH7EPN.mjs";
 import "./chunk-BBFJWWAV.mjs";
 import "./chunk-J5LGTIGS.mjs";

package/dist/lib/neutral/Migration.mjs

@@ -1,14 +1,14 @@
 import {
   define
-} from "./chunk-RIVWNMSF.mjs";
-import "./chunk-T6E37YIP.mjs";
-import "./chunk-7FPIAJIV.mjs";
-import "./chunk-5SUJPHAE.mjs";
-import "./chunk-7PI7C4EF.mjs";
+} from "./chunk-A53NTBHE.mjs";
+import "./chunk-HGWQR5KH.mjs";
+import "./chunk-VQYL2OQF.mjs";
+import "./chunk-L3OBWBV2.mjs";
+import "./chunk-K3S7D5PR.mjs";
 import "./chunk-TFEWTY5A.mjs";
-import "./chunk-4ZUHOTCG.mjs";
-import "./chunk-WTQJHC75.mjs";
-import "./chunk-R5W6DXR4.mjs";
+import "./chunk-X3NUUON4.mjs";
+import "./chunk-4TPQZPLY.mjs";
+import "./chunk-WZ32BF53.mjs";
 import "./chunk-O6BH7EPN.mjs";
 import "./chunk-BBFJWWAV.mjs";
 import "./chunk-J5LGTIGS.mjs";

package/dist/lib/neutral/Obj.mjs

@@ -35,6 +35,8 @@ import {
   isObject,
   isSnapshot,
   isVersion,
+  labelAtom,
+  labelProperty,
   make,
   removeTag,
   setDescription,
@@ -51,17 +53,17 @@ import {
   updateFrom,
   version,
   versionValid
-} from "./chunk-TYGKCRMK.mjs";
-import "./chunk-MZ7K3MLL.mjs";
-import "./chunk-SBVFRTST.mjs";
-import "./chunk-T6E37YIP.mjs";
-import "./chunk-7FPIAJIV.mjs";
-import "./chunk-5SUJPHAE.mjs";
-import "./chunk-7PI7C4EF.mjs";
+} from "./chunk-6CEISA3V.mjs";
+import "./chunk-TF5BSLF6.mjs";
+import "./chunk-Z3WMRRAZ.mjs";
+import "./chunk-HGWQR5KH.mjs";
+import "./chunk-VQYL2OQF.mjs";
+import "./chunk-L3OBWBV2.mjs";
+import "./chunk-K3S7D5PR.mjs";
 import "./chunk-TFEWTY5A.mjs";
-import "./chunk-4ZUHOTCG.mjs";
-import "./chunk-WTQJHC75.mjs";
-import "./chunk-R5W6DXR4.mjs";
+import "./chunk-X3NUUON4.mjs";
+import "./chunk-4TPQZPLY.mjs";
+import "./chunk-WZ32BF53.mjs";
 import "./chunk-O6BH7EPN.mjs";
 import "./chunk-BBFJWWAV.mjs";
 import "./chunk-J5LGTIGS.mjs";
@@ -102,6 +104,8 @@ export {
   isObject,
   isSnapshot,
   isVersion,
+  labelAtom,
+  labelProperty,
   make,
   removeTag,
   setDescription,

package/dist/lib/neutral/Query.mjs

@@ -7,21 +7,21 @@ import {
   select,
   type,
   without
-} from "./chunk-QQIYS74I.mjs";
-import "./chunk-ZGNNFYHS.mjs";
-import "./chunk-6YDI3J37.mjs";
-import "./chunk-TYGKCRMK.mjs";
-import "./chunk-MZ7K3MLL.mjs";
-import "./chunk-SBVFRTST.mjs";
-import "./chunk-T6E37YIP.mjs";
-import "./chunk-7FPIAJIV.mjs";
-import "./chunk-5SUJPHAE.mjs";
-import "./chunk-7PI7C4EF.mjs";
+} from "./chunk-AFANXSGV.mjs";
+import "./chunk-5GAIWRQB.mjs";
+import "./chunk-NOL7O3BL.mjs";
+import "./chunk-6CEISA3V.mjs";
+import "./chunk-TF5BSLF6.mjs";
+import "./chunk-Z3WMRRAZ.mjs";
+import "./chunk-HGWQR5KH.mjs";
+import "./chunk-VQYL2OQF.mjs";
+import "./chunk-L3OBWBV2.mjs";
+import "./chunk-K3S7D5PR.mjs";
 import "./chunk-TFEWTY5A.mjs";
-import "./chunk-3PBP4V4O.mjs";
-import "./chunk-4ZUHOTCG.mjs";
-import "./chunk-WTQJHC75.mjs";
-import "./chunk-R5W6DXR4.mjs";
+import "./chunk-JZ6LFQU5.mjs";
+import "./chunk-X3NUUON4.mjs";
+import "./chunk-4TPQZPLY.mjs";
+import "./chunk-WZ32BF53.mjs";
 import "./chunk-O6BH7EPN.mjs";
 import "./chunk-BBFJWWAV.mjs";
 import "./chunk-J5LGTIGS.mjs";

package/dist/lib/neutral/Ref.mjs

@@ -6,10 +6,10 @@ import {
   isRef,
   isRefType,
   make
-} from "./chunk-MZ7K3MLL.mjs";
-import "./chunk-5SUJPHAE.mjs";
-import "./chunk-WTQJHC75.mjs";
-import "./chunk-R5W6DXR4.mjs";
+} from "./chunk-TF5BSLF6.mjs";
+import "./chunk-L3OBWBV2.mjs";
+import "./chunk-4TPQZPLY.mjs";
+import "./chunk-WZ32BF53.mjs";
 import "./chunk-O6BH7EPN.mjs";
 import "./chunk-BBFJWWAV.mjs";
 import "./chunk-J5LGTIGS.mjs";

package/dist/lib/neutral/Relation.mjs

@@ -39,16 +39,16 @@ import {
   toJSON,
   update,
   version
-} from "./chunk-LWXVKPPW.mjs";
-import "./chunk-SBVFRTST.mjs";
-import "./chunk-T6E37YIP.mjs";
-import "./chunk-7FPIAJIV.mjs";
-import "./chunk-5SUJPHAE.mjs";
-import "./chunk-7PI7C4EF.mjs";
+} from "./chunk-SZ5WB6HF.mjs";
+import "./chunk-Z3WMRRAZ.mjs";
+import "./chunk-HGWQR5KH.mjs";
+import "./chunk-VQYL2OQF.mjs";
+import "./chunk-L3OBWBV2.mjs";
+import "./chunk-K3S7D5PR.mjs";
 import "./chunk-TFEWTY5A.mjs";
-import "./chunk-4ZUHOTCG.mjs";
-import "./chunk-WTQJHC75.mjs";
-import "./chunk-R5W6DXR4.mjs";
+import "./chunk-X3NUUON4.mjs";
+import "./chunk-4TPQZPLY.mjs";
+import "./chunk-WZ32BF53.mjs";
 import "./chunk-O6BH7EPN.mjs";
 import "./chunk-BBFJWWAV.mjs";
 import "./chunk-J5LGTIGS.mjs";

package/dist/lib/neutral/Tag.mjs

@@ -5,19 +5,19 @@ import {
   findTagByLabel,
   make,
   sortTags
-} from "./chunk-5SMDBFVB.mjs";
-import "./chunk-6YDI3J37.mjs";
-import "./chunk-TYGKCRMK.mjs";
-import "./chunk-MZ7K3MLL.mjs";
-import "./chunk-SBVFRTST.mjs";
-import "./chunk-T6E37YIP.mjs";
-import "./chunk-7FPIAJIV.mjs";
-import "./chunk-5SUJPHAE.mjs";
-import "./chunk-7PI7C4EF.mjs";
+} from "./chunk-E7IOTOZD.mjs";
+import "./chunk-NOL7O3BL.mjs";
+import "./chunk-6CEISA3V.mjs";
+import "./chunk-TF5BSLF6.mjs";
+import "./chunk-Z3WMRRAZ.mjs";
+import "./chunk-HGWQR5KH.mjs";
+import "./chunk-VQYL2OQF.mjs";
+import "./chunk-L3OBWBV2.mjs";
+import "./chunk-K3S7D5PR.mjs";
 import "./chunk-TFEWTY5A.mjs";
-import "./chunk-4ZUHOTCG.mjs";
-import "./chunk-WTQJHC75.mjs";
-import "./chunk-R5W6DXR4.mjs";
+import "./chunk-X3NUUON4.mjs";
+import "./chunk-4TPQZPLY.mjs";
+import "./chunk-WZ32BF53.mjs";
 import "./chunk-O6BH7EPN.mjs";
 import "./chunk-BBFJWWAV.mjs";
 import "./chunk-J5LGTIGS.mjs";

package/dist/lib/neutral/Type.mjs

@@ -24,14 +24,14 @@ import {
   update,
   updateFieldPropertyName,
   updateFields
-} from "./chunk-T6E37YIP.mjs";
-import "./chunk-7FPIAJIV.mjs";
-import "./chunk-5SUJPHAE.mjs";
-import "./chunk-7PI7C4EF.mjs";
+} from "./chunk-HGWQR5KH.mjs";
+import "./chunk-VQYL2OQF.mjs";
+import "./chunk-L3OBWBV2.mjs";
+import "./chunk-K3S7D5PR.mjs";
 import "./chunk-TFEWTY5A.mjs";
-import "./chunk-4ZUHOTCG.mjs";
-import "./chunk-WTQJHC75.mjs";
-import "./chunk-R5W6DXR4.mjs";
+import "./chunk-X3NUUON4.mjs";
+import "./chunk-4TPQZPLY.mjs";
+import "./chunk-WZ32BF53.mjs";
 import "./chunk-O6BH7EPN.mjs";
 import "./chunk-BBFJWWAV.mjs";
 import "./chunk-J5LGTIGS.mjs";

package/dist/lib/neutral/{chunk-UUP46KUQ.mjs → chunk-3JXQUMUI.mjs}

@@ -1,32 +1,32 @@
 import {
   select
-} from "./chunk-QQIYS74I.mjs";
+} from "./chunk-AFANXSGV.mjs";
 import {
   Feed
-} from "./chunk-ZGNNFYHS.mjs";
+} from "./chunk-5GAIWRQB.mjs";
 import {
   nothing
-} from "./chunk-6YDI3J37.mjs";
+} from "./chunk-NOL7O3BL.mjs";
 import {
   Unknown,
   instanceOf,
   make
-} from "./chunk-TYGKCRMK.mjs";
+} from "./chunk-6CEISA3V.mjs";
 import {
   Ref
-} from "./chunk-MZ7K3MLL.mjs";
+} from "./chunk-TF5BSLF6.mjs";
 import {
   getSchema,
   makeObject
-} from "./chunk-T6E37YIP.mjs";
+} from "./chunk-HGWQR5KH.mjs";
 import {
   JsonSchemaType
-} from "./chunk-7PI7C4EF.mjs";
+} from "./chunk-K3S7D5PR.mjs";
 import {
   FormInputAnnotation,
   HiddenAnnotation,
   IconAnnotation
-} from "./chunk-R5W6DXR4.mjs";
+} from "./chunk-WZ32BF53.mjs";
 import {
   __export
 } from "./chunk-J5LGTIGS.mjs";
@@ -202,4 +202,4 @@ export {
   EID2 as EID,
   URI
 };
-//# sourceMappingURL=chunk-UUP46KUQ.mjs.map
+//# sourceMappingURL=chunk-3JXQUMUI.mjs.map

package/dist/lib/neutral/{chunk-WTQJHC75.mjs → chunk-4TPQZPLY.mjs}

@@ -4,7 +4,7 @@ import {
   getSchemaURI,
   getTypeAnnotation,
   getTypeIdentifierAnnotation
-} from "./chunk-R5W6DXR4.mjs";
+} from "./chunk-WZ32BF53.mjs";
 import {
   getStaticTypeSchema
 } from "./chunk-O6BH7EPN.mjs";
@@ -86,7 +86,7 @@ var getReferenceAst = (ast) => {
     version: ast.annotations[ReferenceAnnotationId].version
   };
 };
-var RefTypeId = /* @__PURE__ */ Symbol("@dxos/echo/internal/Ref");
+var RefTypeId = /* @__PURE__ */ Symbol.for("@dxos/echo/internal/Ref");
 var Ref = (input) => {
   const schema = getStaticTypeSchema(input) ?? input;
   assertArgument(Schema.isSchema(schema), "schema", "Must call with an instance of effect-schema");
@@ -97,7 +97,7 @@ var Ref = (input) => {
   return createEchoReferenceSchema(getTypeIdentifierAnnotation(schema), annotation.typename, annotation.version);
 };
 Ref.isRef = (obj) => {
-  return obj && typeof obj === "object" && RefTypeId in obj;
+  return obj != null && typeof obj === "object" && RefTypeId in obj;
 };
 Ref.hasEntityId = (id) => (ref) => {
   const uri = EID.tryParse(ref.uri);
@@ -114,11 +114,12 @@ Ref.make = (obj) => {
     throw new TypeError("Expected: ECHO object.");
   }
   const id = obj.id;
-  invariant(EntityId.isValid(id), "Invalid object ID", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 86, S: void 0, A: ["EntityId.isValid(id)", "'Invalid object ID'"] });
+  invariant(EntityId.isValid(id), "Invalid object ID", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 87, S: void 0, A: ["EntityId.isValid(id)", "'Invalid object ID'"] });
   const uri = EID.make({
     entityId: id
   });
-  return new RefImpl(uri, obj);
+  const ref = new RefImpl(uri, obj);
+  return ref;
 };
 Ref.fromURI = (uri) => {
   assertArgument(typeof uri === "string", "uri", "Expected URI string");
@@ -180,6 +181,14 @@ var createEchoReferenceSchema = (echoUri, typename, version) => {
   });
   return refSchema;
 };
+var makeSettledRequest = (state, result) => ({
+  state,
+  stateChanged: new Event(),
+  getResult: () => state === "ready" ? result : void 0,
+  wait: async () => state === "ready" ? result : void 0,
+  abort: () => {
+  }
+});
 var RefImpl = class _RefImpl {
   #uri;
   #resolver = void 0;
@@ -218,7 +227,7 @@ var RefImpl = class _RefImpl {
     if (this.#target) {
       return this.#target;
     }
-    invariant(this.#resolver, "Resolver is not set", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 193, S: this, A: ["this.#resolver", "'Resolver is not set'"] });
+    invariant(this.#resolver, "Resolver is not set", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 205, S: this, A: ["this.#resolver", "'Resolver is not set'"] });
     return this.#resolver.resolveSync(this.#uri, true, this.#resolverCallback);
   }
   /**
@@ -228,8 +237,8 @@ var RefImpl = class _RefImpl {
     if (this.#target) {
       return this.#target;
     }
-    invariant(this.#resolver, "Resolver is not set", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 202, S: this, A: ["this.#resolver", "'Resolver is not set'"] });
-    const obj = await this.#resolver.resolve(this.#uri);
+    invariant(this.#resolver, "Resolver is not set", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 214, S: this, A: ["this.#resolver", "'Resolver is not set'"] });
+    const obj = await this.#resolver.resolveLegacy(this.#uri);
     if (obj == null) {
       throw new Error("Object not found");
     }
@@ -242,8 +251,8 @@ var RefImpl = class _RefImpl {
     if (this.#target) {
       return this.#target;
     }
-    invariant(this.#resolver, "Resolver is not set", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 215, S: this, A: ["this.#resolver", "'Resolver is not set'"] });
-    return await this.#resolver.resolve(this.#uri);
+    invariant(this.#resolver, "Resolver is not set", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 227, S: this, A: ["this.#resolver", "'Resolver is not set'"] });
+    return await this.#resolver.resolveLegacy(this.#uri);
   }
   /**
   * @inheritdoc
@@ -323,11 +332,11 @@ var RefImpl = class _RefImpl {
   }
 };
 var setRefResolver = (ref, resolver) => {
-  invariant(ref instanceof RefImpl, "Ref is not an instance of RefImpl", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 292, S: void 0, A: ["ref instanceof RefImpl", "'Ref is not an instance of RefImpl'"] });
+  invariant(ref instanceof RefImpl, "Ref is not an instance of RefImpl", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 304, S: void 0, A: ["ref instanceof RefImpl", "'Ref is not an instance of RefImpl'"] });
   ref._setResolver(resolver);
 };
 var getRefSavedTarget = (ref) => {
-  invariant(ref instanceof RefImpl, "Ref is not an instance of RefImpl", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 298, S: void 0, A: ["ref instanceof RefImpl", "'Ref is not an instance of RefImpl'"] });
+  invariant(ref instanceof RefImpl, "Ref is not an instance of RefImpl", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 310, S: void 0, A: ["ref instanceof RefImpl", "'Ref is not an instance of RefImpl'"] });
   return ref._getSavedTarget();
 };
 var refVariance = {
@@ -350,21 +359,26 @@ var StaticRefResolver = class {
   }
   addSchema(input) {
     const schema = getStaticTypeSchema(input);
-    invariant(schema, "Type entity is missing its source schema", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 323, S: this, A: ["schema", "'Type entity is missing its source schema'"] });
+    invariant(schema, "Type entity is missing its source schema", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 335, S: this, A: ["schema", "'Type entity is missing its source schema'"] });
     const uri = getSchemaURI(schema);
-    invariant(uri, "Schema has no URI", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 325, S: this, A: ["uri", "'Schema has no URI'"] });
+    invariant(uri, "Schema has no URI", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 337, S: this, A: ["uri", "'Schema has no URI'"] });
     this.schemas.set(uri, schema);
     return this;
   }
+  resolve(uri, _options) {
+    const obj = this.#lookup(uri);
+    return makeSettledRequest(obj ? "ready" : "unavailable", obj);
+  }
   resolveSync(uri, _load, _onLoad) {
-    const echoUri = EID.tryParse(uri);
-    const id = echoUri ? EID.getEntityId(echoUri) : void 0;
-    if (id == null) {
-      return void 0;
-    }
-    return this.objects.get(id);
+    return this.#lookup(uri);
+  }
+  async resolveLegacy(uri) {
+    return this.#lookup(uri);
+  }
+  async resolveSchema(uri) {
+    return this.schemas.get(uri);
   }
-  async resolve(uri) {
+  #lookup(uri) {
     const echoUri = EID.tryParse(uri);
     const id = echoUri ? EID.getEntityId(echoUri) : void 0;
     if (id == null) {
@@ -372,9 +386,6 @@ var StaticRefResolver = class {
     }
     return this.objects.get(id);
   }
-  async resolveSchema(uri) {
-    return this.schemas.get(uri);
-  }
 };
 
 export {
@@ -386,10 +397,11 @@ export {
   RefTypeId,
   Ref,
   createEchoReferenceSchema,
+  makeSettledRequest,
   RefImpl,
   setRefResolver,
   getRefSavedTarget,
   refFromEncodedReference,
   StaticRefResolver
 };
-//# sourceMappingURL=chunk-WTQJHC75.mjs.map
+//# sourceMappingURL=chunk-4TPQZPLY.mjs.map