@dxos/echo 0.8.4-staging.ac66bdf99f → 0.9.1-main.c7dcc2e112

package/dist/lib/neutral/{chunk-JUXPFOEI.mjs → chunk-K3S7D5PR.mjs}

@@ -3,24 +3,25 @@ import {
   FormatAnnotation,
   FormatAnnotationId,
   TypeFormat
-} from "./chunk-DQYLD2RB.mjs";
+} from "./chunk-TFEWTY5A.mjs";
 import {
   createEchoReferenceSchema
-} from "./chunk-G3IQMKF7.mjs";
+} from "./chunk-4TPQZPLY.mjs";
 import {
   GeneratorAnnotationId,
   LabelAnnotationId,
   PropertyMetaAnnotationId,
   TypeAnnotationId,
   TypeIdentifierAnnotationId
-} from "./chunk-2KHZ36F5.mjs";
+} from "./chunk-WZ32BF53.mjs";
 import {
   ANY_OBJECT_TYPENAME,
   ANY_OBJECT_VERSION,
   EntityKind,
   EntityKindSchema,
+  getStaticTypeSchema,
   makeTypeJsonSchemaAnnotation
-} from "./chunk-TBKX6JQO.mjs";
+} from "./chunk-O6BH7EPN.mjs";
 
 // src/internal/JsonSchema/annotations.ts
 import * as SchemaAST from "effect/SchemaAST";
@@ -41,7 +42,7 @@ var EchoAnnotations = {
 
 // src/internal/JsonSchema/json-schema-type.ts
 import * as Schema from "effect/Schema";
-import { JsonPath } from "@dxos/effect";
+import { SchemaEx } from "@dxos/effect";
 var SimpleTypes = Schema.Literal("array", "boolean", "integer", "null", "number", "object", "string");
 var NonNegativeInteger = Schema.Number.pipe(Schema.greaterThanOrEqualTo(0));
 var StringArray = Schema.Array(Schema.String);
@@ -51,7 +52,7 @@ var JsonSchemaEchoAnnotations = Schema.Struct({
   * Label for this schema.
   * Mapped from {@link LabelAnnotationId}.
   */
-  labelProp: Schema.optional(Schema.Union(JsonPath, Schema.Array(JsonPath))),
+  labelProp: Schema.optional(Schema.Union(SchemaEx.JsonPath, Schema.Array(SchemaEx.JsonPath))),
   /**
   * Generator function for this schema.
   * Mapped from {@link GeneratorAnnotationId}.
@@ -317,9 +318,9 @@ import * as Option from "effect/Option";
 import * as Schema2 from "effect/Schema";
 import * as SchemaAST2 from "effect/SchemaAST";
 import { raise } from "@dxos/debug";
-import { mapAst } from "@dxos/effect";
+import { SchemaEx as SchemaEx2 } from "@dxos/effect";
 import { assertArgument, invariant } from "@dxos/invariant";
-import { DXN, ObjectId } from "@dxos/keys";
+import { DXN, EID, EntityId } from "@dxos/keys";
 import { log } from "@dxos/log";
 import { clearUndefined, orderKeys, removeProperties } from "@dxos/util";
 var __dxlog_file = "/__w/dxos/dxos/packages/core/echo/echo/src/internal/JsonSchema/json-schema.ts";
@@ -354,6 +355,15 @@ var toPropType = (type) => {
 };
 var JSON_SCHEMA_URL = "http://json-schema.org/draft-07/schema#";
 var toJsonSchema = (schema, options = {}) => {
+  const slot = getStaticTypeSchema(schema);
+  if (slot != null) {
+    schema = slot;
+  } else if (!Schema2.isSchema(schema)) {
+    const entityJsonSchema = schema.jsonSchema;
+    if (entityJsonSchema != null) {
+      return entityJsonSchema;
+    }
+  }
   assertArgument(Schema2.isSchema(schema), "schema");
   let jsonSchema = _toJsonSchemaAST(schema.ast);
   if (options.strict) {
@@ -400,7 +410,7 @@ var withEchoRefinements = (ast, path, suspendCache = /* @__PURE__ */ new Map())
       });
     }
   } else if (SchemaAST2.isTypeLiteral(ast)) {
-    recursiveResult = mapAst(ast, (ast2, key) => withEchoRefinements(ast2, path && typeof key === "string" ? `${path}/${key}` : void 0, suspendCache));
+    recursiveResult = SchemaEx2.mapAst(ast, (ast2, key) => withEchoRefinements(ast2, path && typeof key === "string" ? `${path}/${key}` : void 0, suspendCache));
     recursiveResult = addJsonSchemaFields(recursiveResult, {
       propertyOrder: [
         ...ast.propertySignatures.map((p) => p.name)
@@ -409,7 +419,7 @@ var withEchoRefinements = (ast, path, suspendCache = /* @__PURE__ */ new Map())
   } else if (SchemaAST2.isUndefinedKeyword(ast)) {
     return ast;
   } else {
-    recursiveResult = mapAst(ast, (ast2, key) => withEchoRefinements(ast2, path && (typeof key === "string" || typeof key === "number") ? `${path}/${key}` : void 0, suspendCache));
+    recursiveResult = SchemaEx2.mapAst(ast, (ast2, key) => withEchoRefinements(ast2, path && (typeof key === "string" || typeof key === "number") ? `${path}/${key}` : void 0, suspendCache));
   }
   const annotationFields = annotations_toJsonSchemaFields(ast.annotations);
   if (Object.keys(annotationFields).length === 0) {
@@ -435,7 +445,7 @@ var toEffectSchema = (root, _defs) => {
       }
     }
   } else if ("$id" in root) {
-    switch (root.$id) {
+    switch (decodeURIComponent(root.$id)) {
       case "/schemas/any": {
         result = anyToEffectSchema(root);
         break;
@@ -446,7 +456,7 @@ var toEffectSchema = (root, _defs) => {
       }
       case "/schemas/{}":
       case "/schemas/object": {
-        result = Schema2.Object;
+        result = Schema2.Struct({});
         break;
       }
       // Custom ECHO object reference.
@@ -465,12 +475,7 @@ var toEffectSchema = (root, _defs) => {
     if (root.allOf.length === 1) {
       result = toEffectSchema(root.allOf[0], defs);
     } else {
-      log.warn("allOf with multiple schemas is not supported", void 0, {
-        F: __dxlog_file,
-        L: 223,
-        S: void 0,
-        C: (f, a) => f(...a)
-      });
+      log.warn("allOf with multiple schemas is not supported", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 197, S: void 0 });
       result = Schema2.Unknown;
     }
   } else if ("type" in root) {
@@ -499,15 +504,7 @@ var toEffectSchema = (root, _defs) => {
           const [required, optional3] = Function.pipe(root.items, Array2.map((v) => toEffectSchema(v, defs)), Array2.splitAt(root.minItems ?? root.items.length));
           result = Schema2.Tuple(...required, ...optional3.map(Schema2.optionalElement));
         } else {
-          invariant(root.items, void 0, {
-            F: __dxlog_file,
-            L: 256,
-            S: void 0,
-            A: [
-              "root.items",
-              ""
-            ]
-          });
+          invariant(root.items, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 231, S: void 0, A: ["root.items", ""] });
           const items = root.items;
           result = Array2.isArray(items) ? Schema2.Tuple(...items.map((v) => toEffectSchema(v, defs))) : Schema2.Array(toEffectSchema(items, defs));
         }
@@ -521,15 +518,7 @@ var toEffectSchema = (root, _defs) => {
   } else if ("$ref" in root) {
     const refSegments = root.$ref.split("/");
     const jsonSchema = defs[refSegments[refSegments.length - 1]];
-    invariant(jsonSchema, `missing definition for ${root.$ref}`, {
-      F: __dxlog_file,
-      L: 272,
-      S: void 0,
-      A: [
-        "jsonSchema",
-        "`missing definition for ${root.$ref}`"
-      ]
-    });
+    invariant(jsonSchema, `missing definition for ${root.$ref}`, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 246, S: void 0, A: ["jsonSchema", "`missing definition for ${root.$ref}`"] });
     result = toEffectSchema(jsonSchema, defs).pipe(Schema2.annotations({
       identifier: refSegments[refSegments.length - 1]
     }));
@@ -539,15 +528,7 @@ var toEffectSchema = (root, _defs) => {
   return result;
 };
 var objectToEffectSchema = (root, defs) => {
-  invariant("type" in root && root.type === "object", `not an object: ${root}`, {
-    F: __dxlog_file,
-    L: 287,
-    S: void 0,
-    A: [
-      "'type' in root && root.type === 'object'",
-      "`not an object: ${root}`"
-    ]
-  });
+  invariant("type" in root && root.type === "object", `not an object: ${root}`, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 257, S: void 0, A: ["'type' in root && root.type === 'object'", "`not an object: ${root}`"] });
   const echoRefinement = root[ECHO_ANNOTATIONS_NS_DEPRECATED_KEY];
   const isEchoObject = echoRefinement != null || "$id" in root && typeof root.$id === "string" && root.$id.startsWith("dxn:");
   let fields = {};
@@ -565,24 +546,8 @@ var objectToEffectSchema = (root, defs) => {
   }
   let schema;
   if (root.patternProperties) {
-    invariant(propertyList.length === 0, "pattern properties mixed with regular properties are not supported", {
-      F: __dxlog_file,
-      L: 313,
-      S: void 0,
-      A: [
-        "propertyList.length === 0",
-        "'pattern properties mixed with regular properties are not supported'"
-      ]
-    });
-    invariant(Object.keys(root.patternProperties).length === 1 && Object.keys(root.patternProperties)[0] === "", "only one pattern property is supported", {
-      F: __dxlog_file,
-      L: 314,
-      S: void 0,
-      A: [
-        "Object.keys(root.patternProperties).length === 1 && Object.keys(root.patternProperties)[0] === ''",
-        "'only one pattern property is supported'"
-      ]
-    });
+    invariant(propertyList.length === 0, "pattern properties mixed with regular properties are not supported", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 276, S: void 0, A: ["propertyList.length === 0", "'pattern properties mixed with regular properties are not supported'"] });
+    invariant(Object.keys(root.patternProperties).length === 1 && Object.keys(root.patternProperties)[0] === "", "only one pattern property is supported", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 277, S: void 0, A: ["Object.keys(root.patternProperties).length === 1 && Object.keys(root.patternProperties)[0] === ''", "'only one pattern property is supported'"] });
     schema = Schema2.Record({
       key: Schema2.String,
       value: toEffectSchema(root.patternProperties[""], defs)
@@ -614,8 +579,8 @@ var objectToEffectSchema = (root, defs) => {
 var anyToEffectSchema = (root) => {
   const echoRefinement = root[ECHO_ANNOTATIONS_NS_DEPRECATED_KEY];
   if (echoRefinement?.reference != null) {
-    const echoId = root.$id.startsWith("dxn:echo:") ? root.$id : void 0;
-    return createEchoReferenceSchema(echoId, echoRefinement.reference.typename, echoRefinement.reference.version);
+    const echoUri = root.$id.startsWith("echo:") ? root.$id : void 0;
+    return createEchoReferenceSchema(echoUri, echoRefinement.reference.typename, echoRefinement.reference.version);
   }
   return Schema2.Any;
 };
@@ -627,17 +592,10 @@ var refToEffectSchema = (root) => {
   if (typeof reference !== "object") {
     throw new Error("Invalid reference field in ref schema");
   }
-  const targetSchemaDXN = DXN.parse(reference.schema.$ref);
-  invariant(targetSchemaDXN.kind === DXN.kind.TYPE, void 0, {
-    F: __dxlog_file,
-    L: 367,
-    S: void 0,
-    A: [
-      "targetSchemaDXN.kind === DXN.kind.TYPE",
-      ""
-    ]
-  });
-  return createEchoReferenceSchema(targetSchemaDXN.toString(), targetSchemaDXN.kind === DXN.kind.TYPE ? targetSchemaDXN.parts[0] : void 0, reference.schemaVersion);
+  const ref = reference.schema.$ref;
+  const targetSchemaDXN = DXN.tryMake(ref);
+  invariant(targetSchemaDXN, `Expected a type DXN, got: ${ref}`, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 327, S: void 0, A: ["targetSchemaDXN", "`Expected a type DXN, got: ${ref}`"] });
+  return createEchoReferenceSchema(ref, DXN.getName(targetSchemaDXN), reference.schemaVersion);
 };
 var annotations_toJsonSchemaFields = (annotations2) => {
   const schemaFields = {};
@@ -652,8 +610,7 @@ var annotations_toJsonSchemaFields = (annotations2) => {
   }
   const echoIdentifier = annotations2[TypeIdentifierAnnotationId];
   if (echoIdentifier) {
-    schemaFields[ECHO_ANNOTATIONS_NS_KEY] ??= {};
-    schemaFields[ECHO_ANNOTATIONS_NS_KEY].schemaId = echoIdentifier;
+    schemaFields.$id = echoIdentifier;
   }
   for (const [key, annotationId] of Object.entries(CustomAnnotations)) {
     const value = annotations2[annotationId];
@@ -664,13 +621,14 @@ var annotations_toJsonSchemaFields = (annotations2) => {
   return schemaFields;
 };
 var decodeTypeIdentifierAnnotation = (schema) => {
-  if (schema.$id && schema.$id.startsWith("dxn:echo:")) {
+  if (schema.$id && schema.$id.startsWith("echo:")) {
     return schema.$id;
-  } else if (schema.$id && schema.$id.startsWith("dxn:type:") && schema?.echo?.type?.schemaId) {
-    const id = schema?.echo?.type?.schemaId;
-    if (ObjectId.isValid(id)) {
-      return DXN.fromLocalObjectId(id).toString();
-    }
+  }
+  const legacySchemaId = schema.echo?.type?.schemaId;
+  if (legacySchemaId) {
+    return EntityId.isValid(legacySchemaId) ? EID.make({
+      entityId: legacySchemaId
+    }) : legacySchemaId;
   }
   return void 0;
 };
@@ -685,8 +643,8 @@ var decodeTypeAnnotation = (schema) => {
     if (annotation.kind === EntityKind.Relation) {
       const source = schema.relationSource?.$ref ?? raise(new Error("Relation source not set"));
       const target = schema.relationTarget?.$ref ?? raise(new Error("Relation target not set"));
-      annotation.sourceSchema = DXN.parse(source).toString();
-      annotation.targetSchema = DXN.parse(target).toString();
+      annotation.sourceSchema = DXN.tryMake(source) ?? raise(new Error(`Invalid relation source: ${source}`));
+      annotation.targetSchema = DXN.tryMake(target) ?? raise(new Error(`Invalid relation target: ${target}`));
     }
     return annotation;
   }
@@ -715,7 +673,9 @@ var jsonSchemaFieldsToAnnotations = (schema) => {
   if (typeAnnotation) {
     annotations2[TypeAnnotationId] = typeAnnotation;
     annotations2[SchemaAST2.JSONSchemaAnnotationId] = makeTypeJsonSchemaAnnotation({
-      identifier: typeIdentifier,
+      // $id is the typename DXN — the schema's type identity. The storage EID (if any)
+      // is preserved separately on TypeIdentifierAnnotation / echo.schemaId.
+      identifier: DXN.make(typeAnnotation.typename, typeAnnotation.version),
       kind: typeAnnotation.kind,
       typename: typeAnnotation.typename,
       version: typeAnnotation.version,
@@ -784,4 +744,4 @@ export {
   toJsonSchema,
   toEffectSchema
 };
-//# sourceMappingURL=chunk-JUXPFOEI.mjs.map
+//# sourceMappingURL=chunk-K3S7D5PR.mjs.map

package/dist/lib/neutral/chunk-K3S7D5PR.mjs.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/internal/JsonSchema/annotations.ts", "../../../src/internal/JsonSchema/json-schema-type.ts", "../../../src/internal/JsonSchema/json-schema.ts"],
+  "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\nimport * as SchemaAST from 'effect/SchemaAST';\n\nimport { GeneratorAnnotationId, LabelAnnotationId, PropertyMetaAnnotationId } from '../Annotation/annotations';\nimport { CurrencyAnnotationId, FormatAnnotationId } from '../Format';\nimport { type JsonSchemaEchoAnnotations, type JsonSchemaType } from '../JsonSchema';\n\n//\n// This file configures annotations for JSON encoding/decoding.\n//\n\n// Go on the root level.\ntype RootJsonSchemaProperty = keyof JsonSchemaType;\n\n// Go on the namespaced `annotations` property.\ntype NamespacedJsonSchemaProperty = keyof JsonSchemaEchoAnnotations;\n\n/**\n * List of annotations for JSON encoding/decoding.\n * Omits default effect-schema annotations since they are encoded with default serializer.\n */\n// TODO(burdon): Reconcile with `EchoAnnotations`.\nexport const CustomAnnotations: Partial<Record<RootJsonSchemaProperty, symbol>> = {\n  format: FormatAnnotationId,\n  currency: CurrencyAnnotationId,\n};\n\n/**\n * List of annotations for JSON decoding only.\n * Includes default effect annotations.\n */\nexport const DecodedAnnotations: Partial<Record<RootJsonSchemaProperty, symbol>> = {\n  title: SchemaAST.TitleAnnotationId,\n  description: SchemaAST.DescriptionAnnotationId,\n};\n\n/**\n * Annotations that go into ECHO namespace in json-schema.\n */\n// TODO(dmaretskyi): Consider removing ECHO namespace and putting them at the top level.\n// TODO(dmaretskyi): Move to format.ts when circular imports are solved\nexport const EchoAnnotations: Partial<Record<NamespacedJsonSchemaProperty, symbol>> = {\n  // TODO(dmaretskyi): `FieldLookupAnnotationId` might go here, but lets remove it entirely and use LabelAnnotation instead.\n  meta: PropertyMetaAnnotationId,\n  generator: GeneratorAnnotationId,\n  labelProp: LabelAnnotationId,\n};\n", "//\n// Copyright 2024 DXOS.org\n//\n\nimport * as Schema from 'effect/Schema';\n\nimport { SchemaEx } from '@dxos/effect';\n\nimport { type Mutable } from '../common/proxy';\nimport { EntityKindSchema } from '../common/types';\nimport { FormatAnnotation, TypeFormat } from '../Format';\n\n//\n// JSON Schema\n//\n\n// TODO(burdon): Reuse/reconcile with ScalarTypeEnum (handle arrays).\nconst SimpleTypes = Schema.Literal('array', 'boolean', 'integer', 'null', 'number', 'object', 'string');\n\nconst NonNegativeInteger = Schema.Number.pipe(Schema.greaterThanOrEqualTo(0));\n\nconst StringArray = Schema.Array(Schema.String);\n\nconst JsonSchemaOrBoolean = Schema.Union(\n  Schema.suspend(() => JsonSchemaType),\n  Schema.Boolean,\n);\n\n/**\n * Go under the `annotations` property.\n */\nexport const JsonSchemaEchoAnnotations = Schema.Struct({\n  /**\n   * Label for this schema.\n   * Mapped from {@link LabelAnnotationId}.\n   */\n  labelProp: Schema.optional(Schema.Union(SchemaEx.JsonPath, Schema.Array(SchemaEx.JsonPath))),\n\n  /**\n   * Generator function for this schema.\n   * Mapped from {@link GeneratorAnnotationId}.\n   */\n  generator: Schema.optional(Schema.Union(Schema.String, Schema.Tuple(Schema.String, Schema.Number))),\n\n  /**\n   * {@link PropertyMeta} annotations get serialized here.\n   */\n  meta: Schema.optional(\n    Schema.Record({\n      key: Schema.String,\n      value: Schema.Any,\n    }),\n  ),\n\n  /**\n   * @deprecated\n   */\n  // TODO(dmaretskyi): We risk old schema not passing validation due to the extra fields. Remove when we are sure this is safe.\n  type: Schema.optional(\n    Schema.Struct({\n      typename: Schema.String,\n      version: Schema.String,\n\n      // Not used.\n      schemaId: Schema.optional(Schema.String),\n    }),\n  ),\n\n  /**\n   * @deprecated Superseded by `meta`.\n   */\n  annotations: Schema.optional(\n    Schema.Record({\n      key: Schema.String,\n      value: Schema.Any,\n    }),\n  ),\n});\nexport type JsonSchemaEchoAnnotations = Schema.Schema.Type<typeof JsonSchemaEchoAnnotations>;\n\n/**\n * Describes a schema for the JSON-schema objects stored in ECHO.\n * Contains extensions for ECHO (e.g., references).\n * Ref: https://json-schema.org/draft-07/schema\n */\n// TODO(burdon): Integrate with Effect Serializable?\n// TODO(dmaretskyi): Update to latest draft: https://json-schema.org/draft/2020-12\nconst _JsonSchemaType = Schema.Struct({\n  /**\n   * Identifier for this schema.\n   * This schema might be referenced by $ref clause in other schemas.\n   */\n  // TODO(dmaretskyi): Specify how the ids are generated.\n  // TODO(dmaretskyi): For type dxns, should this include the version?\n  $id: Schema.optional(Schema.String),\n\n  /**\n   * Schema of this schema.\n   * Set to \"https://json-schema.org/draft-07/schema\".\n   */\n  $schema: Schema.optional(Schema.String),\n\n  /**\n   * Reference to another schema.\n   */\n  $ref: Schema.optional(Schema.String),\n\n  /**\n   * Comments are ignored when interpreting the schema.\n   */\n  $comment: Schema.optional(Schema.String),\n\n  /**\n   * Defines whether this schema is an object schema or a relation schema.\n   */\n  entityKind: Schema.optional(EntityKindSchema),\n\n  /**\n   * Typename of this schema.\n   * Only on schema representing an ECHO object.\n   *\n   * @example 'com.example.type.my-type'\n   */\n  typename: Schema.optional(Schema.String),\n\n  /**\n   * Version of this schema.\n   * Custom dialect for ECHO.\n   */\n  version: Schema.optional(Schema.String),\n\n  /**\n   * Target of this relation.\n   * Only for relation schemas.\n   * The referenced schema must be an object schema.\n   */\n  relationTarget: Schema.optional(Schema.suspend(() => JsonSchemaType)),\n\n  /**\n   * Source of this relation.\n   * Only for relation schemas.\n   * The referenced schema must be an object schema.\n   */\n  relationSource: Schema.optional(Schema.suspend(() => JsonSchemaType)),\n\n  /**\n   * Title of this schema.\n   */\n  title: Schema.optional(Schema.String),\n\n  /**\n   * Description of this schema.\n   */\n  description: Schema.optional(Schema.String),\n\n  /**\n   * Whether this schema is read-only.\n   */\n  readOnly: Schema.optional(Schema.Boolean),\n\n  /**\n   * Whether this schema is write-only.\n   */\n  writeOnly: Schema.optional(Schema.Boolean),\n\n  /**\n   * Examples of instances of this schema.\n   */\n  examples: Schema.optional(Schema.Array(Schema.Any)),\n\n  /**\n   * Default value for this schema.\n   */\n  default: Schema.optional(Schema.Any),\n\n  /**\n   * This schema only matches values that are equal to this value.\n   */\n  const: Schema.optional(Schema.Any),\n\n  /**\n   * This schema only matches one of the values in this array.\n   */\n  enum: Schema.optional(Schema.Array(Schema.Any)),\n\n  /**\n   * Base type of the schema.\n   */\n  type: Schema.optional(Schema.Union(SimpleTypes, Schema.Array(SimpleTypes))),\n\n  //\n  // Numbers.\n  //\n\n  multipleOf: Schema.optional(Schema.Number.pipe(Schema.greaterThan(0))),\n  maximum: Schema.optional(Schema.Number),\n  exclusiveMaximum: Schema.optional(Schema.Number),\n  minimum: Schema.optional(Schema.Number),\n  exclusiveMinimum: Schema.optional(Schema.Number),\n\n  //\n  // Strings.\n  //\n\n  maxLength: Schema.optional(NonNegativeInteger),\n\n  /**\n   * Regex pattern for strings.\n   */\n  pattern: Schema.optional(Schema.String.pipe(FormatAnnotation.set(TypeFormat.Regex))),\n\n  /**\n   * Serialized from {@link FormatAnnotationId}.\n   */\n  format: Schema.optional(Schema.String),\n\n  //\n  // Arrays\n  //\n\n  minLength: Schema.optional(NonNegativeInteger),\n  items: Schema.optional(\n    Schema.Union(\n      Schema.suspend(() => JsonSchemaType),\n      Schema.Array(Schema.suspend(() => JsonSchemaType)),\n    ),\n  ),\n  additionalItems: Schema.optional(\n    Schema.Union(\n      Schema.suspend(() => JsonSchemaType),\n      Schema.Boolean,\n    ),\n  ),\n  maxItems: Schema.optional(NonNegativeInteger),\n  minItems: Schema.optional(NonNegativeInteger),\n  uniqueItems: Schema.optional(Schema.Boolean),\n  contains: Schema.optional(Schema.suspend(() => JsonSchemaType)),\n\n  //\n  // Objects\n  //\n\n  maxProperties: Schema.optional(NonNegativeInteger),\n  minProperties: Schema.optional(NonNegativeInteger),\n  required: Schema.optional(StringArray),\n\n  /**\n   * Non-standard JSON Schema extension.\n   * Defines the order of properties in the object.\n   * The unmentioned properties are placed at the end.\n   *\n   * Related: https://github.com/json-schema/json-schema/issues/119\n   */\n  propertyOrder: Schema.optional(StringArray),\n\n  additionalProperties: Schema.optional(JsonSchemaOrBoolean),\n  properties: Schema.optional(\n    Schema.Record({\n      key: Schema.String,\n      value: Schema.suspend(() => JsonSchemaType),\n    }),\n  ),\n  patternProperties: Schema.optional(\n    Schema.Record({\n      key: Schema.String,\n      value: Schema.suspend(() => JsonSchemaType),\n    }),\n  ),\n  propertyNames: Schema.optional(Schema.suspend(() => JsonSchemaType)),\n\n  definitions: Schema.optional(\n    Schema.Record({\n      key: Schema.String,\n      value: Schema.suspend(() => JsonSchemaType),\n    }),\n  ),\n  dependencies: Schema.optional(\n    Schema.Record({\n      key: Schema.String,\n      value: Schema.suspend(() => Schema.Union(Schema.String, StringArray, JsonSchemaType)).annotations({\n        identifier: 'dependency',\n        description: 'Dependency',\n      }),\n    }),\n  ),\n\n  contentMediaType: Schema.optional(Schema.String),\n  contentEncoding: Schema.optional(Schema.String),\n\n  if: Schema.optional(Schema.suspend(() => JsonSchemaType)),\n  then: Schema.optional(Schema.suspend(() => JsonSchemaType)),\n  else: Schema.optional(Schema.suspend(() => JsonSchemaType)),\n  allOf: Schema.optional(Schema.Array(Schema.suspend(() => JsonSchemaType))),\n  anyOf: Schema.optional(Schema.Array(Schema.suspend(() => JsonSchemaType))),\n  oneOf: Schema.optional(Schema.Array(Schema.suspend(() => JsonSchemaType))),\n  not: Schema.optional(Schema.suspend(() => JsonSchemaType)),\n  $defs: Schema.optional(\n    Schema.Record({\n      key: Schema.String,\n      value: Schema.suspend(() => JsonSchemaType),\n    }),\n  ),\n\n  //\n  // ECHO extensions.\n  //\n\n  currency: Schema.optional(Schema.String),\n\n  reference: Schema.optional(\n    Schema.Struct({\n      schema: Schema.suspend(() => JsonSchemaType),\n      schemaVersion: Schema.optional(Schema.String),\n      schemaObject: Schema.optional(Schema.String),\n    }),\n  ),\n\n  /**\n   * ECHO-specific annotations.\n   */\n  // TODO(dmaretskyi): Since we are adding a lot of new extensions to the JSON Schema, it is safer to namespace them here.\n  annotations: Schema.optional(JsonSchemaEchoAnnotations),\n\n  /**\n   * @deprecated Use `annotations` instead.\n   */\n  echo: Schema.optional(JsonSchemaEchoAnnotations),\n}).annotations({ identifier: 'jsonSchema', description: 'JSON Schema' });\n\nexport const JsonSchemaFields = Object.keys(_JsonSchemaType.fields);\n\n/**\n * https://json-schema.org/draft-07/schema\n */\n// TODO(burdon): Reconcile with @effect/Schema/JSONSchema\nexport interface JsonSchemaType extends Schema.Schema.Type<typeof _JsonSchemaType> {}\n\nexport const JsonSchemaType: Schema.Schema<JsonSchemaType> = _JsonSchemaType;\n\n// TODO(burdon): Factor out JSON schema utils.\n\nexport const getSchemaProperty = (schema: JsonSchemaType, property: SchemaEx.JsonProp): JsonSchemaType | undefined => {\n  return schema.properties?.[property];\n};\n\n// TODO(burdon): Properties should be ordered.\nexport const setSchemaProperty = (\n  schema: Mutable<JsonSchemaType>,\n  property: SchemaEx.JsonProp,\n  value: Mutable<JsonSchemaType>,\n) => {\n  schema.properties ??= {};\n  schema.properties[property] = value;\n  return schema;\n};\n\n/**\n * @internal\n */\nexport const ECHO_ANNOTATIONS_NS_DEPRECATED_KEY: keyof JsonSchemaType = 'echo';\n\n/**\n * @internal\n */\nexport const ECHO_ANNOTATIONS_NS_KEY = 'annotations';\n\n/**\n * @internal\n * @returns ECHO annotations namespace object in its normalized form.\n *\n * `meta` holds PropertyMeta annotations.\n * `annotations` holds other annotations.\n */\nexport const getNormalizedEchoAnnotations = (obj: JsonSchemaType): JsonSchemaEchoAnnotations | undefined => {\n  if (obj[ECHO_ANNOTATIONS_NS_KEY] != null && obj[ECHO_ANNOTATIONS_NS_DEPRECATED_KEY] != null) {\n    return normalizeEchoAnnotations({\n      ...obj[ECHO_ANNOTATIONS_NS_DEPRECATED_KEY],\n      ...obj[ECHO_ANNOTATIONS_NS_KEY],\n    });\n  } else if (obj[ECHO_ANNOTATIONS_NS_KEY] != null) {\n    return normalizeEchoAnnotations(obj[ECHO_ANNOTATIONS_NS_KEY]!);\n  } else if (obj[ECHO_ANNOTATIONS_NS_DEPRECATED_KEY] != null) {\n    return normalizeEchoAnnotations(obj[ECHO_ANNOTATIONS_NS_DEPRECATED_KEY]!);\n  } else {\n    return undefined;\n  }\n};\n\nconst normalizeEchoAnnotations = (obj: JsonSchemaEchoAnnotations): JsonSchemaEchoAnnotations => {\n  if (!obj.annotations) {\n    return obj;\n  } else {\n    const res = {\n      ...obj,\n      meta: {\n        ...obj.annotations,\n        ...(obj.meta ?? {}),\n      },\n    };\n    delete res.annotations;\n    return res;\n  }\n};\n", "//\n// Copyright 2024 DXOS.org\n//\n\nimport * as Array from 'effect/Array';\nimport * as Function from 'effect/Function';\nimport * as JSONSchema from 'effect/JSONSchema';\nimport * as Option from 'effect/Option';\nimport * as Schema from 'effect/Schema';\nimport * as SchemaAST from 'effect/SchemaAST';\nimport type * as Types from 'effect/Types';\n\nimport { raise } from '@dxos/debug';\nimport { SchemaEx } from '@dxos/effect';\nimport { assertArgument, invariant } from '@dxos/invariant';\nimport { DXN, EID, EntityId } from '@dxos/keys';\nimport { log } from '@dxos/log';\nimport { clearUndefined, orderKeys, removeProperties } from '@dxos/util';\n\nimport type * as Type from '../../Type';\nimport { type TypeAnnotation, TypeAnnotationId, TypeIdentifierAnnotationId } from '../Annotation/annotations';\nimport { makeTypeJsonSchemaAnnotation } from '../Annotation/util';\nimport {\n  ANY_OBJECT_TYPENAME,\n  ANY_OBJECT_VERSION,\n  EntityKind,\n  EntityKindSchema,\n  getStaticTypeSchema,\n} from '../common/types';\nimport { type JsonSchemaReferenceInfo, createEchoReferenceSchema } from '../Ref';\nimport { CustomAnnotations, DecodedAnnotations, EchoAnnotations } from './annotations';\nimport {\n  ECHO_ANNOTATIONS_NS_DEPRECATED_KEY,\n  ECHO_ANNOTATIONS_NS_KEY,\n  type JsonSchemaEchoAnnotations,\n  type JsonSchemaType,\n  getNormalizedEchoAnnotations,\n} from './json-schema-type';\n\n// TODO(burdon): Are these values stored (can they be changed?)\nexport enum PropType {\n  NONE = 0,\n  STRING = 1, // TODO(burdon): vs TEXT?\n  NUMBER = 2,\n  BOOLEAN = 3,\n  DATE = 4,\n  REF = 5,\n  RECORD = 6,\n  ENUM = 7,\n}\n\n// TODO(burdon): Reconcile with @dxos/schema.\nexport const toPropType = (type?: PropType): string => {\n  switch (type) {\n    case PropType.STRING:\n      return 'string';\n    case PropType.NUMBER:\n      return 'number';\n    case PropType.BOOLEAN:\n      return 'boolean';\n    case PropType.DATE:\n      return 'date';\n    case PropType.REF:\n      return 'ref';\n    case PropType.RECORD:\n      return 'object';\n    default:\n      throw new Error(`Invalid type: ${type}`);\n  }\n};\n\nconst JSON_SCHEMA_URL = 'http://json-schema.org/draft-07/schema#';\n\nexport type JsonSchemaOptions = {\n  strict?: boolean;\n};\n\n/**\n * Convert effect schema to JSON Schema.\n * NOTE: This handles custom annotations.\n * @param schema\n */\n// TODO(burdon): Reconcile with possibly extending @effect/Schema/JSONSchema\n//  We add additional propertyOrder (but the object properties ARE ordered); and type \"string\" for literals.\n// TODO(wittjosiah): This is mutable because its a pojo, perhaps should be left as readonly at type level though?\nexport const toJsonSchema = (\n  schema: Schema.Schema.All | Type.AnyEntity,\n  options: JsonSchemaOptions = {},\n): Types.DeepMutable<JsonSchemaType> => {\n  // Allow passing a `Type.Type` entity — use its hidden source schema (or its\n  // already-built jsonSchema as a fallback).\n  const slot = getStaticTypeSchema(schema);\n  if (slot != null) {\n    schema = slot;\n  } else if (!Schema.isSchema(schema)) {\n    const entityJsonSchema = (schema as { jsonSchema?: JsonSchemaType }).jsonSchema;\n    if (entityJsonSchema != null) {\n      return entityJsonSchema as Types.DeepMutable<JsonSchemaType>;\n    }\n  }\n  assertArgument(Schema.isSchema(schema), 'schema');\n  let jsonSchema = _toJsonSchemaAST((schema as Schema.Schema.All).ast);\n  if (options.strict) {\n    // TOOD(burdon): Workaround to ensure JSON schema is valid (for agv parsing).\n    jsonSchema = removeProperties(jsonSchema, (key, value) => {\n      if (key === '$id' && value === '/schemas/any') {\n        return true;\n      }\n      if (key === '$ref' && value === '#/$defs/dependency') {\n        return true;\n      }\n      if (key === '$ref' && value === '#/$defs/jsonSchema') {\n        return true;\n      }\n\n      return false;\n    });\n  }\n\n  return jsonSchema;\n};\n\nconst _toJsonSchemaAST = (ast: SchemaAST.AST): Types.DeepMutable<JsonSchemaType> => {\n  const withRefinements = withEchoRefinements(ast, '#');\n  const jsonSchema = JSONSchema.fromAST(withRefinements, {\n    definitions: {},\n  }) as Types.DeepMutable<JsonSchemaType>;\n\n  return normalizeJsonSchema(jsonSchema);\n};\n\nconst withEchoRefinements = (\n  ast: SchemaAST.AST,\n  path: string | undefined,\n  suspendCache = new Map<SchemaAST.AST, string>(),\n): SchemaAST.AST => {\n  if (path) {\n    suspendCache.set(ast, path);\n  }\n\n  let recursiveResult: SchemaAST.AST;\n  if (SchemaAST.isSuspend(ast)) {\n    // Precompute JSON schema for suspended AST since effect serializer does not support it.\n    const suspendedAst = ast.f();\n    const cachedPath = suspendCache.get(suspendedAst);\n    if (cachedPath) {\n      recursiveResult = new SchemaAST.Suspend(() => withEchoRefinements(suspendedAst, path, suspendCache), {\n        [SchemaAST.JSONSchemaAnnotationId]: {\n          $ref: cachedPath,\n        },\n      });\n    } else {\n      const jsonSchema = _toJsonSchemaAST(suspendedAst);\n      recursiveResult = new SchemaAST.Suspend(() => withEchoRefinements(suspendedAst, path, suspendCache), {\n        [SchemaAST.JSONSchemaAnnotationId]: jsonSchema,\n      });\n    }\n  } else if (SchemaAST.isTypeLiteral(ast)) {\n    // Add property order annotations\n    recursiveResult = SchemaEx.mapAst(ast, (ast, key) =>\n      withEchoRefinements(ast, path && typeof key === 'string' ? `${path}/${key}` : undefined, suspendCache),\n    );\n    recursiveResult = addJsonSchemaFields(recursiveResult, {\n      propertyOrder: [...ast.propertySignatures.map((p) => p.name)] as string[],\n    });\n  } else if (SchemaAST.isUndefinedKeyword(ast)) {\n    // Ignore undefined keyword that appears in the optional fields.\n    return ast;\n  } else {\n    recursiveResult = SchemaEx.mapAst(ast, (ast, key) =>\n      withEchoRefinements(\n        ast,\n        path && (typeof key === 'string' || typeof key === 'number') ? `${path}/${key}` : undefined,\n        suspendCache,\n      ),\n    );\n  }\n\n  const annotationFields = annotations_toJsonSchemaFields(ast.annotations);\n  if (Object.keys(annotationFields).length === 0) {\n    return recursiveResult;\n  } else {\n    return addJsonSchemaFields(recursiveResult, annotationFields);\n  }\n};\n\n/**\n * Convert JSON schema to effect schema.\n * @param root\n * @param definitions\n */\nexport const toEffectSchema = (root: JsonSchemaType, _defs?: JsonSchemaType['$defs']): Schema.Schema.AnyNoContext => {\n  const defs = root.$defs ? { ..._defs, ...root.$defs } : (_defs ?? {});\n  if ('type' in root && root.type === 'object') {\n    return objectToEffectSchema(root, defs);\n  }\n\n  let result: Schema.Schema.AnyNoContext = Schema.Unknown;\n  if ('$ref' in root) {\n    switch (root.$ref) {\n      case '/schemas/echo/ref': {\n        result = refToEffectSchema(root);\n        break;\n      }\n    }\n  } else if ('$id' in root) {\n    switch (decodeURIComponent(root.$id as string)) {\n      case '/schemas/any': {\n        result = anyToEffectSchema(root as JSONSchema.JsonSchema7Any);\n        break;\n      }\n      case '/schemas/unknown': {\n        result = Schema.Unknown;\n        break;\n      }\n      case '/schemas/{}':\n      case '/schemas/object': {\n        result = Schema.Struct({});\n        break;\n      }\n      // Custom ECHO object reference.\n      case '/schemas/echo/ref': {\n        result = refToEffectSchema(root);\n        break;\n      }\n    }\n  } else if ('enum' in root) {\n    result = Schema.Union(...root.enum!.map((e) => Schema.Literal(e)));\n  } else if ('oneOf' in root) {\n    result = Schema.Union(...root.oneOf!.map((v) => toEffectSchema(v, defs)));\n  } else if ('anyOf' in root) {\n    result = Schema.Union(...root.anyOf!.map((v) => toEffectSchema(v, defs)));\n  } else if ('allOf' in root) {\n    if (root.allOf!.length === 1) {\n      result = toEffectSchema(root.allOf![0], defs);\n    } else {\n      log.warn('allOf with multiple schemas is not supported');\n      result = Schema.Unknown;\n    }\n  } else if ('type' in root) {\n    switch (root.type) {\n      case 'string': {\n        result = Schema.String;\n        if (root.pattern) {\n          result = result.pipe(Schema.pattern(new RegExp(root.pattern)));\n        }\n        break;\n      }\n      case 'number': {\n        result = Schema.Number;\n        break;\n      }\n      case 'integer': {\n        result = Schema.Number.pipe(Schema.int());\n        break;\n      }\n      case 'boolean': {\n        result = Schema.Boolean;\n        break;\n      }\n      case 'array': {\n        if (Array.isArray(root.items)) {\n          const [required, optional] = Function.pipe(\n            root.items,\n            Array.map((v) => toEffectSchema(v as JsonSchemaType, defs)),\n            Array.splitAt(root.minItems ?? root.items.length),\n          );\n          result = Schema.Tuple(...required, ...optional.map(Schema.optionalElement));\n        } else {\n          invariant(root.items);\n          const items = root.items;\n          result = Array.isArray(items)\n            ? Schema.Tuple(...items.map((v) => toEffectSchema(v as JsonSchemaType, defs)))\n            : Schema.Array(toEffectSchema(items as JsonSchemaType, defs));\n        }\n        break;\n      }\n      case 'null': {\n        result = Schema.Null;\n        break;\n      }\n    }\n  } else if ('$ref' in root) {\n    const refSegments = root.$ref!.split('/');\n    const jsonSchema = defs[refSegments[refSegments.length - 1]];\n    invariant(jsonSchema, `missing definition for ${root.$ref}`);\n    result = toEffectSchema(jsonSchema, defs).pipe(\n      Schema.annotations({ identifier: refSegments[refSegments.length - 1] }),\n    );\n  }\n\n  const annotations = jsonSchemaFieldsToAnnotations(root);\n\n  // log.info('toEffectSchema', { root, annotations });\n  result = result.annotations(annotations);\n\n  return result;\n};\n\nconst objectToEffectSchema = (root: JsonSchemaType, defs: JsonSchemaType['$defs']): Schema.Schema.AnyNoContext => {\n  invariant('type' in root && root.type === 'object', `not an object: ${root}`);\n\n  const echoRefinement: JsonSchemaEchoAnnotations = (root as any)[ECHO_ANNOTATIONS_NS_DEPRECATED_KEY];\n  const isEchoObject =\n    echoRefinement != null || ('$id' in root && typeof root.$id === 'string' && root.$id.startsWith('dxn:'));\n\n  let fields: Schema.Struct.Fields = {};\n  const propertyList = Object.entries(root.properties ?? {});\n  let immutableIdField: Schema.Schema.AnyNoContext | undefined;\n  for (const [key, value] of propertyList) {\n    if (isEchoObject && key === 'id') {\n      immutableIdField = toEffectSchema(value, defs);\n    } else {\n      // TODO(burdon): Mutable cast.\n      (fields as any)[key] = root.required?.includes(key)\n        ? toEffectSchema(value, defs)\n        : Schema.optional(toEffectSchema(value, defs));\n    }\n  }\n\n  if (root.propertyOrder) {\n    fields = orderKeys(fields, root.propertyOrder as any);\n  }\n\n  let schema: Schema.Schema<any, any, unknown>;\n  if (root.patternProperties) {\n    invariant(propertyList.length === 0, 'pattern properties mixed with regular properties are not supported');\n    invariant(\n      Object.keys(root.patternProperties).length === 1 && Object.keys(root.patternProperties)[0] === '',\n      'only one pattern property is supported',\n    );\n\n    schema = Schema.Record({ key: Schema.String, value: toEffectSchema(root.patternProperties[''], defs) });\n  } else if (typeof root.additionalProperties !== 'object') {\n    schema = Schema.Struct(fields);\n  } else {\n    const indexValue = toEffectSchema(root.additionalProperties, defs);\n    if (propertyList.length > 0) {\n      schema = Schema.Struct(fields, { key: Schema.String, value: indexValue });\n    } else {\n      schema = Schema.Record({ key: Schema.String, value: indexValue });\n    }\n  }\n\n  if (immutableIdField) {\n    schema = Schema.extend(schema, Schema.Struct({ id: immutableIdField }));\n  }\n\n  const annotations = jsonSchemaFieldsToAnnotations(root);\n  return schema.annotations(annotations) as any;\n};\n\nconst anyToEffectSchema = (root: JSONSchema.JsonSchema7Any): Schema.Schema.AnyNoContext => {\n  const echoRefinement: JsonSchemaEchoAnnotations = (root as any)[ECHO_ANNOTATIONS_NS_DEPRECATED_KEY];\n  // TODO(dmaretskyi): Is this branch still taken?\n  if ((echoRefinement as any)?.reference != null) {\n    const echoUri = root.$id.startsWith('echo:') ? root.$id : undefined;\n    return createEchoReferenceSchema(\n      echoUri,\n      (echoRefinement as any).reference.typename,\n      (echoRefinement as any).reference.version,\n    );\n  }\n\n  return Schema.Any;\n};\n\n// TODO(dmaretskyi): Types.\nconst refToEffectSchema = (root: any): Schema.Schema.AnyNoContext => {\n  if (!('reference' in root)) {\n    // Fallback to generic object ref when no reference info is provided.\n    return createEchoReferenceSchema(undefined, ANY_OBJECT_TYPENAME, ANY_OBJECT_VERSION);\n  }\n\n  const reference: JsonSchemaReferenceInfo = root.reference;\n  if (typeof reference !== 'object') {\n    throw new Error('Invalid reference field in ref schema');\n  }\n\n  const ref = reference.schema.$ref;\n  const targetSchemaDXN = DXN.tryMake(ref);\n  invariant(targetSchemaDXN, `Expected a type DXN, got: ${ref}`);\n\n  return createEchoReferenceSchema(ref, DXN.getName(targetSchemaDXN), reference.schemaVersion);\n};\n\n//\n// Annotations\n//\n\nconst annotations_toJsonSchemaFields = (annotations: SchemaAST.Annotations): Record<symbol, any> => {\n  const schemaFields: Record<string, any> = {};\n\n  const echoAnnotations: Types.Mutable<JsonSchemaEchoAnnotations> = {};\n  for (const [key, annotationId] of Object.entries(EchoAnnotations)) {\n    if (annotations[annotationId] != null) {\n      echoAnnotations[key as keyof JsonSchemaEchoAnnotations] = annotations[annotationId] as any;\n    }\n  }\n  if (Object.keys(echoAnnotations).length > 0) {\n    // TODO(dmaretskyi): use new namespace.\n    schemaFields[ECHO_ANNOTATIONS_NS_KEY] = echoAnnotations;\n  }\n\n  // For stored schemas the storage URI is the definitive identifier — it overrides\n  // the typename `$id` written above.\n  const echoIdentifier = annotations[TypeIdentifierAnnotationId];\n  if (echoIdentifier) {\n    schemaFields.$id = echoIdentifier;\n  }\n\n  // Custom (at end).\n  for (const [key, annotationId] of Object.entries(CustomAnnotations)) {\n    const value = annotations[annotationId];\n    if (value != null) {\n      schemaFields[key] = value;\n    }\n  }\n\n  return schemaFields;\n};\n\nconst decodeTypeIdentifierAnnotation = (schema: JsonSchemaType): string | undefined => {\n  // For stored schemas `$id` IS the storage URI (echo:/<id>).\n  if (schema.$id && schema.$id.startsWith('echo:')) {\n    return schema.$id;\n  }\n  // Older serializations stored the EID on echo.type.schemaId.\n  const legacySchemaId = schema.echo?.type?.schemaId;\n  if (legacySchemaId) {\n    return EntityId.isValid(legacySchemaId) ? EID.make({ entityId: legacySchemaId }) : legacySchemaId;\n  }\n  return undefined;\n};\n\nconst decodeTypeAnnotation = (schema: JsonSchemaType): TypeAnnotation | undefined => {\n  if (schema.typename) {\n    const annotation: Types.Mutable<TypeAnnotation> = {\n      // TODO(dmaretskyi): Decoding default.\n      kind: schema.entityKind ? Schema.decodeSync(EntityKindSchema)(schema.entityKind) : EntityKind.Object,\n      typename: schema.typename,\n      version: schema.version ?? '0.1.0',\n    };\n\n    if (annotation.kind === EntityKind.Relation) {\n      const source = schema.relationSource?.$ref ?? raise(new Error('Relation source not set'));\n      const target = schema.relationTarget?.$ref ?? raise(new Error('Relation target not set'));\n      annotation.sourceSchema = DXN.tryMake(source) ?? raise(new Error(`Invalid relation source: ${source}`));\n      annotation.targetSchema = DXN.tryMake(target) ?? raise(new Error(`Invalid relation target: ${target}`));\n    }\n\n    return annotation;\n  }\n\n  // Decode legacy schema.\n  if (!schema.typename && schema?.echo?.type) {\n    return {\n      kind: EntityKind.Object,\n      typename: schema.echo.type.typename,\n      version: schema.echo.type.version,\n    };\n  }\n\n  return undefined;\n};\n\nconst jsonSchemaFieldsToAnnotations = (schema: JsonSchemaType): SchemaAST.Annotations => {\n  const annotations: Types.Mutable<Schema.Annotations.Schema<any>> = {};\n\n  const echoAnnotations: JsonSchemaEchoAnnotations = getNormalizedEchoAnnotations(schema) ?? {};\n  if (echoAnnotations) {\n    for (const [key, annotationId] of Object.entries(EchoAnnotations)) {\n      if (echoAnnotations[key as keyof JsonSchemaEchoAnnotations]) {\n        annotations[annotationId] = echoAnnotations[key as keyof JsonSchemaEchoAnnotations];\n      }\n    }\n  }\n\n  const typeIdentifier = decodeTypeIdentifierAnnotation(schema);\n  annotations[TypeIdentifierAnnotationId] = typeIdentifier;\n  const typeAnnotation = decodeTypeAnnotation(schema);\n  if (typeAnnotation) {\n    annotations[TypeAnnotationId] = typeAnnotation;\n    annotations[SchemaAST.JSONSchemaAnnotationId] = makeTypeJsonSchemaAnnotation({\n      // $id is the typename DXN — the schema's type identity. The storage EID (if any)\n      // is preserved separately on TypeIdentifierAnnotation / echo.schemaId.\n      identifier: DXN.make(typeAnnotation.typename, typeAnnotation.version),\n      kind: typeAnnotation.kind,\n      typename: typeAnnotation.typename,\n      version: typeAnnotation.version,\n      relationSource: typeAnnotation.sourceSchema,\n      relationTarget: typeAnnotation.targetSchema,\n    });\n  }\n\n  // Custom (at end).\n  for (const [key, annotationId] of Object.entries({ ...CustomAnnotations, ...DecodedAnnotations })) {\n    if (key in schema) {\n      annotations[annotationId] = (schema as any)[key];\n    }\n  }\n\n  return clearUndefined(annotations);\n};\n\nconst makeAnnotatedRefinement = (ast: SchemaAST.AST, annotations: SchemaAST.Annotations): SchemaAST.Refinement => {\n  return new SchemaAST.Refinement(ast, () => Option.none(), annotations);\n};\n\nconst addJsonSchemaFields = (ast: SchemaAST.AST, schema: JsonSchemaType): SchemaAST.AST =>\n  makeAnnotatedRefinement(ast, { [SchemaAST.JSONSchemaAnnotationId]: schema });\n\n/**\n * Fixes field order.\n * Sets `$schema` prop.\n */\nconst normalizeJsonSchema = (jsonSchema: Types.DeepMutable<JsonSchemaType>): Types.DeepMutable<JsonSchemaType> => {\n  if (jsonSchema.properties && 'id' in jsonSchema.properties) {\n    jsonSchema.properties = orderKeys(jsonSchema.properties, ['id']); // Put id first.\n  }\n\n  // TODO(dmaretskyi): Makes sure undefined is not left on optional fields for the resulting object.\n  jsonSchema.$schema = JSON_SCHEMA_URL;\n  jsonSchema = orderKeys(jsonSchema, [\n    '$schema',\n    '$id',\n\n    'entityKind',\n    'typename',\n    'version',\n    'relationTarget',\n    'relationSource',\n\n    'type',\n    'enum',\n\n    'properties',\n    'required',\n    'propertyOrder', // Custom.\n    'items',\n    'additionalProperties',\n\n    'anyOf',\n    'oneOf',\n  ]);\n  return jsonSchema;\n};\n"],
+  "mappings": "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",
+  "names": ["SchemaAST", "CustomAnnotations", "format", "FormatAnnotationId", "currency", "CurrencyAnnotationId", "DecodedAnnotations", "title", "TitleAnnotationId", "description", "DescriptionAnnotationId", "EchoAnnotations", "meta", "PropertyMetaAnnotationId", "generator", "GeneratorAnnotationId", "labelProp", "LabelAnnotationId", "Schema", "SchemaEx", "SimpleTypes", "Literal", "NonNegativeInteger", "Number", "pipe", "greaterThanOrEqualTo", "StringArray", "Array", "String", "JsonSchemaOrBoolean", "Union", "suspend", "JsonSchemaType", "Boolean", "JsonSchemaEchoAnnotations", "Struct", "labelProp", "optional", "SchemaEx", "JsonPath", "generator", "Tuple", "meta", "Record", "key", "value", "Any", "type", "typename", "version", "schemaId", "annotations", "_JsonSchemaType", "$id", "$schema", "$ref", "$comment", "entityKind", "EntityKindSchema", "relationTarget", "relationSource", "title", "description", "readOnly", "writeOnly", "examples", "default", "const", "enum", "multipleOf", "greaterThan", "maximum", "exclusiveMaximum", "minimum", "exclusiveMinimum", "maxLength", "pattern", "FormatAnnotation", "set", "TypeFormat", "Regex", "format", "minLength", "items", "additionalItems", "maxItems", "minItems", "uniqueItems", "contains", "maxProperties", "minProperties", "required", "propertyOrder", "additionalProperties", "properties", "patternProperties", "propertyNames", "definitions", "dependencies", "identifier", "contentMediaType", "contentEncoding", "if", "then", "else", "allOf", "anyOf", "oneOf", "not", "$defs", "currency", "reference", "schema", "schemaVersion", "schemaObject", "echo", "JsonSchemaFields", "Object", "keys", "fields", "getSchemaProperty", "property", "setSchemaProperty", "ECHO_ANNOTATIONS_NS_DEPRECATED_KEY", "ECHO_ANNOTATIONS_NS_KEY", "getNormalizedEchoAnnotations", "obj", "normalizeEchoAnnotations", "undefined", "res", "Array", "Function", "JSONSchema", "Option", "Schema", "SchemaAST", "raise", "SchemaEx", "assertArgument", "invariant", "DXN", "EID", "EntityId", "log", "clearUndefined", "orderKeys", "removeProperties", "PropType", "schema", "slot", "Schema", "entityJsonSchema", "assertArgument", "jsonSchema", "removeProperties", "key", "_toJsonSchemaAST", "JSONSchema", "definitions", "normalizeJsonSchema", "withEchoRefinements", "ast", "suspendCache", "path", "recursiveResult", "suspendedAst", "cachedPath", "SchemaAST", "Suspend", "JSONSchemaAnnotationId", "mapAst", "propertyOrder", "propertySignatures", "annotationFields", "annotations_toJsonSchemaFields", "addJsonSchemaFields", "_defs", "$defs", "objectToEffectSchema", "result", "root", "Union", "oneOf", "toEffectSchema", "v", "anyOf", "map", "defs", "length", "log", "Tuple", "required", "optional", "invariant", "items", "Array", "isArray", "annotations", "identifier", "refSegments", "ECHO_ANNOTATIONS_NS_DEPRECATED_KEY", "isEchoObject", "echoRefinement", "$id", "fields", "propertyList", "Object", "properties", "immutableIdField", "value", "String", "additionalProperties", "indexValue", "anyToEffectSchema", "reference", "createEchoReferenceSchema", "echoUri", "Error", "ref", "targetSchemaDXN", "DXN", "annotationId", "echoAnnotations", "schemaFields", "ECHO_ANNOTATIONS_NS_KEY", "echoIdentifier", "decodeTypeIdentifierAnnotation", "startsWith", "isValid", "legacySchemaId", "undefined", "decodeTypeAnnotation", "kind", "entityKind", "version", "annotation", "EntityKind", "target", "relationTarget", "$ref", "sourceSchema", "source", "raise", "targetSchema", "typename", "echo", "jsonSchemaFieldsToAnnotations", "getNormalizedEchoAnnotations", "EchoAnnotations", "typeAnnotation", "TypeAnnotationId", "relationSource", "DecodedAnnotations", "makeAnnotatedRefinement", "orderKeys"]
+}

package/dist/lib/neutral/{chunk-OS35K56T.mjs → chunk-L3OBWBV2.mjs}

@@ -1,6 +1,6 @@
 import {
   Ref
-} from "./chunk-G3IQMKF7.mjs";
+} from "./chunk-4TPQZPLY.mjs";
 
 // src/internal/Ref/ref-array.ts
 import { isNonNullable } from "@dxos/util";
@@ -21,7 +21,7 @@ var RefArray = Object.freeze({
   * Removes the ref with the given id.
   */
   removeById: (refs, id) => {
-    const index = refs.findIndex(Ref.hasObjectId(id));
+    const index = refs.findIndex(Ref.hasEntityId(id));
     if (index >= 0) {
       refs.splice(index, 1);
     }
@@ -31,4 +31,4 @@ var RefArray = Object.freeze({
 export {
   RefArray
 };
-//# sourceMappingURL=chunk-OS35K56T.mjs.map
+//# sourceMappingURL=chunk-L3OBWBV2.mjs.map

package/dist/lib/neutral/{chunk-OS35K56T.mjs.map → chunk-L3OBWBV2.mjs.map}

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/internal/Ref/ref-array.ts"],
-  "sourcesContent": ["//\n// Copyright 2024 DXOS.org\n//\n\nimport { type ObjectId } from '@dxos/keys';\nimport { isNonNullable } from '@dxos/util';\n\nimport { type AnyEntity } from '../common/types';\nimport { Ref } from './ref';\n\n/**\n * Helper functions for working with arrays of refs.\n */\nexport const RefArray = Object.freeze({\n  /**\n   * @returns all resolved targets.\n   */\n  targets: <T extends AnyEntity>(refs: readonly Ref<T>[]): T[] => {\n    return refs.map((ref) => ref.target).filter(isNonNullable);\n  },\n\n  /**\n   * Load all referenced objects.\n   */\n  loadAll: <T extends AnyEntity>(refs: readonly Ref<T>[]): Promise<T[]> => {\n    return Promise.all(refs.map((ref) => ref.load()));\n  },\n\n  /**\n   * Removes the ref with the given id.\n   */\n  removeById: (refs: Ref<AnyEntity>[], id: ObjectId) => {\n    const index = refs.findIndex(Ref.hasObjectId(id));\n    if (index >= 0) {\n      refs.splice(index, 1);\n    }\n  },\n});\n"],
+  "sourcesContent": ["//\n// Copyright 2024 DXOS.org\n//\n\nimport { type EntityId } from '@dxos/keys';\nimport { isNonNullable } from '@dxos/util';\n\nimport { type AnyEntity } from '../common/types';\nimport { Ref } from './ref';\n\n/**\n * Helper functions for working with arrays of refs.\n */\nexport const RefArray = Object.freeze({\n  /**\n   * @returns all resolved targets.\n   */\n  targets: <T extends AnyEntity>(refs: readonly Ref<T>[]): T[] => {\n    return refs.map((ref) => ref.target).filter(isNonNullable);\n  },\n\n  /**\n   * Load all referenced objects.\n   */\n  loadAll: <T extends AnyEntity>(refs: readonly Ref<T>[]): Promise<T[]> => {\n    return Promise.all(refs.map((ref) => ref.load()));\n  },\n\n  /**\n   * Removes the ref with the given id.\n   */\n  removeById: (refs: Ref<AnyEntity>[], id: EntityId) => {\n    const index = refs.findIndex(Ref.hasEntityId(id));\n    if (index >= 0) {\n      refs.splice(index, 1);\n    }\n  },\n});\n"],
   "mappings": ";;;;;AAKA,SAASA,qBAAqB;AAQvB,IAAMC,WAAWC,OAAOC,OAAO;;;;EAIpCC,SAAS,CAAsBC,SAAAA;AAC7B,WAAOA,KAAKC,IAAI,CAACC,QAAQA,IAAIC,MAAM,EAAEC,OAAOC,aAAAA;EAC9C;;;;EAKAC,SAAS,CAAsBN,SAAAA;AAC7B,WAAOO,QAAQC,IAAIR,KAAKC,IAAI,CAACC,QAAQA,IAAIO,KAAI,CAAA,CAAA;EAC/C;;;;EAKAC,YAAY,CAACV,MAAwBW,OAAAA;AACnC,UAAMC,QAAQZ,KAAKa,UAAUC,IAAIC,YAAYJ,EAAAA,CAAAA;AAC7C,QAAIC,SAAS,GAAG;AACdZ,WAAKgB,OAAOJ,OAAO,CAAA;IACrB;EACF;AACF,CAAA;",
-  "names": ["isNonNullable", "RefArray", "Object", "freeze", "targets", "refs", "map", "ref", "target", "filter", "isNonNullable", "loadAll", "Promise", "all", "load", "removeById", "id", "index", "findIndex", "Ref", "hasObjectId", "splice"]
+  "names": ["isNonNullable", "RefArray", "Object", "freeze", "targets", "refs", "map", "ref", "target", "filter", "isNonNullable", "loadAll", "Promise", "all", "load", "removeById", "id", "index", "findIndex", "Ref", "hasEntityId", "splice"]
 }

package/dist/lib/neutral/{chunk-V36VO5SS.mjs → chunk-NOL7O3BL.mjs}

@@ -1,13 +1,13 @@
 import {
   isRef
-} from "./chunk-BVOFLCVF.mjs";
+} from "./chunk-TF5BSLF6.mjs";
 import {
-  getDXN,
   prettyFilter
-} from "./chunk-MOR5ERFM.mjs";
+} from "./chunk-VQYL2OQF.mjs";
 import {
-  getTypeDXNFromSpecifier
-} from "./chunk-2KHZ36F5.mjs";
+  getTypeURIFromSpecifier,
+  getUri
+} from "./chunk-WZ32BF53.mjs";
 import {
   __export
 } from "./chunk-J5LGTIGS.mjs";
@@ -29,6 +29,7 @@ __export(Filter_exports, {
   id: () => id,
   in: () => in$,
   is: () => is,
+  key: () => key,
   lt: () => lt,
   lte: () => lte,
   neq: () => neq,
@@ -40,15 +41,13 @@ __export(Filter_exports, {
   tag: () => tag,
   text: () => text,
   type: () => type,
-  typeDXN: () => typeDXN,
-  typename: () => typename,
   updated: () => updated
 });
 import * as Match from "effect/Match";
 import * as Schema from "effect/Schema";
 import * as SchemaAST from "effect/SchemaAST";
 import { assertArgument } from "@dxos/invariant";
-import { DXN, ObjectId } from "@dxos/keys";
+import { EID, EntityId } from "@dxos/keys";
 var FilterClass = class _FilterClass {
   ast;
   static "variance" = {};
@@ -81,7 +80,7 @@ var nothing = () => {
   });
 };
 var id = (...ids) => {
-  assertArgument(ids.every((id2) => ObjectId.isValid(id2)), "ids", "ids must be valid");
+  assertArgument(ids.every((id2) => EntityId.isValid(id2)), "ids", "ids must be valid");
   if (ids.length === 0) {
     return nothing();
   }
@@ -92,44 +91,38 @@ var id = (...ids) => {
     props: {}
   });
 };
-var type = (schema, props2) => {
-  if (Schema.isSchema(schema) && SchemaAST.isUnion(schema.ast)) {
-    const typenames = schema.ast.types.map((type2) => getTypeDXNFromSpecifier(Schema.make(type2)));
+var type = (input, props2) => {
+  if (Schema.isSchema(input) && SchemaAST.isUnion(input.ast)) {
+    const typenames = input.ast.types.map((t) => getTypeURIFromSpecifier(Schema.make(t)));
     return new FilterClass({
       type: "or",
-      filters: typenames.map((typename2) => ({
+      filters: typenames.map((typename) => ({
         type: "object",
-        typename: typename2.toString(),
+        typename,
         props: {}
       }))
     });
   }
-  const dxn = getTypeDXNFromSpecifier(schema);
+  const uri = getTypeURIFromSpecifier(input);
   return new FilterClass({
     type: "object",
-    typename: dxn.toString(),
+    typename: uri,
     ...propsFilterToAst(props2 ?? {})
   });
 };
-var typename = (typename2) => {
-  assertArgument(!typename2.startsWith("dxn:"), "typename", "Typename must no be qualified");
+var tag = (tag2) => {
   return new FilterClass({
-    type: "object",
-    typename: DXN.fromTypename(typename2).toString(),
-    props: {}
+    type: "tag",
+    tag: tag2
   });
 };
-var typeDXN = (dxn) => {
+var key = (key2, options) => {
   return new FilterClass({
     type: "object",
-    typename: dxn.toString(),
-    props: {}
-  });
-};
-var tag = (tag2) => {
-  return new FilterClass({
-    type: "tag",
-    tag: tag2
+    typename: null,
+    props: {},
+    metaKey: key2,
+    metaVersion: options?.version
   });
 };
 var props = (props2) => {
@@ -147,10 +140,10 @@ var text = (text2, options) => {
   });
 };
 var foreignKeys = (schema, keys) => {
-  const dxn = getTypeDXNFromSpecifier(schema);
+  const uri = getTypeURIFromSpecifier(schema);
   return new FilterClass({
     type: "object",
-    typename: dxn.toString(),
+    typename: uri,
     props: {},
     foreignKeys: keys
   });
@@ -251,9 +244,9 @@ var childOf = (parents, options) => {
   ];
   const dxns = items.map((item) => {
     if (isRef(item)) {
-      return item.dxn.toString();
+      return EID.parse(item.uri);
     }
-    return getDXN(item).toString();
+    return EID.parse(getUri(item));
   });
   return new FilterClass({
     type: "child-of",
@@ -286,7 +279,7 @@ var propsFilterToAst = (predicates) => {
     idFilter = typeof predicates.id === "string" ? [
       predicates.id
     ] : predicates.id;
-    Schema.Array(ObjectId).pipe(Schema.validateSync)(idFilter);
+    Schema.Array(EntityId).pipe(Schema.validateSync)(idFilter);
   }
   return {
     id: idFilter,
@@ -305,8 +298,8 @@ var processPredicate = (predicate) => {
       throw new Error("Array predicates are not yet supported.");
     }),
     Match.when((predicate2) => !isRef(predicate2) && typeof predicate2 === "object" && predicate2 !== null, (predicate2) => {
-      const nestedProps = Object.fromEntries(Object.entries(predicate2).map(([key, value2]) => [
-        key,
+      const nestedProps = Object.fromEntries(Object.entries(predicate2).map(([key2, value2]) => [
+        key2,
         processPredicate(value2)
       ]));
       return {
@@ -327,9 +320,8 @@ export {
   nothing,
   id,
   type,
-  typename,
-  typeDXN,
   tag,
+  key,
   props,
   text,
   foreignKeys,
@@ -351,4 +343,4 @@ export {
   pretty,
   Filter_exports
 };
-//# sourceMappingURL=chunk-V36VO5SS.mjs.map
+//# sourceMappingURL=chunk-NOL7O3BL.mjs.map