@dxos/effect 0.7.0 → 0.7.1-staging.7f6f91c

package/dist/lib/browser/index.mjs

@@ -7,9 +7,10 @@ import { AST as AST3, JSONSchema, Schema as S2 } from "@effect/schema";
 import { AST, Schema as S } from "@effect/schema";
 import { Option, pipe } from "effect";
 import { invariant } from "@dxos/invariant";
+import { nonNullable } from "@dxos/util";
 var __dxlog_file = "/home/runner/work/dxos/dxos/packages/common/effect/src/ast.ts";
 var getSimpleType = (node) => {
-  if (AST.isObjectKeyword(node)) {
+  if (AST.isObjectKeyword(node) || AST.isTypeLiteral(node) || isDiscriminatedUnion(node)) {
     return "object";
   }
   if (AST.isStringKeyword(node)) {
@@ -110,16 +111,17 @@ var findNode = (node, test) => {
       }
     }
   } else if (AST.isUnion(node)) {
-    for (const type of node.types) {
-      const child = findNode(type, test);
-      if (child) {
-        return child;
+    if (isOption(node)) {
+      for (const type of node.types) {
+        const child = findNode(type, test);
+        if (child) {
+          return child;
+        }
       }
     }
   } else if (AST.isRefinement(node)) {
     return findNode(node.from, test);
   }
-  return void 0;
 };
 var findProperty = (schema, path) => {
   const getProp = (node, path2) => {
@@ -127,7 +129,7 @@ var findProperty = (schema, path) => {
     const typeNode = findNode(node, AST.isTypeLiteral);
     invariant(typeNode, void 0, {
       F: __dxlog_file,
-      L: 214,
+      L: 221,
       S: void 0,
       A: [
         "typeNode",
@@ -143,28 +145,122 @@ var findProperty = (schema, path) => {
         }
       }
     }
-    return void 0;
   };
   return getProp(schema.ast, path.split("."));
 };
-var findAnnotation = (node, annotationId) => {
+var defaultAnnotations = {
+  ["ObjectKeyword"]: AST.objectKeyword,
+  ["StringKeyword"]: AST.stringKeyword,
+  ["NumberKeyword"]: AST.numberKeyword,
+  ["BooleanKeyword"]: AST.booleanKeyword
+};
+var findAnnotation = (node, annotationId, options) => {
   const getAnnotationById = getAnnotation(annotationId);
   const getBaseAnnotation = (node2) => {
     const value = getAnnotationById(node2);
     if (value !== void 0) {
+      if (options?.noDefault && value === defaultAnnotations[node2._tag]?.annotations[annotationId]) {
+        return void 0;
+      }
       return value;
     }
     if (AST.isUnion(node2)) {
-      for (const type of node2.types) {
-        const value2 = getBaseAnnotation(type);
-        if (value2 !== void 0) {
-          return value2;
-        }
+      if (isOption(node2)) {
+        return getAnnotationById(node2.types[0]);
       }
     }
   };
   return getBaseAnnotation(node);
 };
+var isOption = (node) => {
+  return AST.isUnion(node) && node.types.length === 2 && AST.isUndefinedKeyword(node.types[1]);
+};
+var isLiteralUnion = (node) => {
+  return AST.isUnion(node) && node.types.every(AST.isLiteral);
+};
+var isDiscriminatedUnion = (node) => {
+  return AST.isUnion(node) && !!getDiscriminatingProps(node)?.length;
+};
+var getDiscriminatingProps = (node) => {
+  invariant(AST.isUnion(node), void 0, {
+    F: __dxlog_file,
+    L: 307,
+    S: void 0,
+    A: [
+      "AST.isUnion(node)",
+      ""
+    ]
+  });
+  if (isOption(node)) {
+    return;
+  }
+  return node.types.reduce((shared, type) => {
+    const props = AST.getPropertySignatures(type).filter((p) => AST.isLiteral(p.type)).map((p) => p.name.toString());
+    return shared.length === 0 ? props : shared.filter((prop) => props.includes(prop));
+  }, []);
+};
+var getDiscriminatedType = (node, value = {}) => {
+  invariant(AST.isUnion(node), void 0, {
+    F: __dxlog_file,
+    L: 328,
+    S: void 0,
+    A: [
+      "AST.isUnion(node)",
+      ""
+    ]
+  });
+  invariant(value, void 0, {
+    F: __dxlog_file,
+    L: 329,
+    S: void 0,
+    A: [
+      "value",
+      ""
+    ]
+  });
+  const props = getDiscriminatingProps(node);
+  if (!props?.length) {
+    return;
+  }
+  for (const type of node.types) {
+    const match = AST.getPropertySignatures(type).filter((prop) => props?.includes(prop.name.toString())).every((prop) => {
+      invariant(AST.isLiteral(prop.type), void 0, {
+        F: __dxlog_file,
+        L: 340,
+        S: void 0,
+        A: [
+          "AST.isLiteral(prop.type)",
+          ""
+        ]
+      });
+      return prop.type.literal === value[prop.name.toString()];
+    });
+    if (match) {
+      return type;
+    }
+  }
+  const fields = Object.fromEntries(props.map((prop) => {
+    const literals = node.types.map((type) => {
+      const literal = AST.getPropertySignatures(type).find((p) => p.name.toString() === prop);
+      invariant(AST.isLiteral(literal.type), void 0, {
+        F: __dxlog_file,
+        L: 358,
+        S: void 0,
+        A: [
+          "AST.isLiteral(literal.type)",
+          ""
+        ]
+      });
+      return literal.type.literal;
+    }).filter(nonNullable);
+    return literals.length ? [
+      prop,
+      S.Literal(...literals)
+    ] : void 0;
+  }).filter(nonNullable));
+  const schema = S.Struct(fields);
+  return schema.ast;
+};
 
 // packages/common/effect/src/url.ts
 import { AST as AST2 } from "@effect/schema";
@@ -233,8 +329,13 @@ export {
   findNode,
   findProperty,
   getAnnotation,
+  getDiscriminatedType,
+  getDiscriminatingProps,
   getParamKeyAnnotation,
   getSimpleType,
+  isDiscriminatedUnion,
+  isLiteralUnion,
+  isOption,
   isSimpleType,
   visit
 };

package/dist/lib/browser/index.mjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/index.ts", "../../../src/ast.ts", "../../../src/url.ts"],
-  "sourcesContent": ["//\n// Copyright 2020 DXOS.org\n//\n\nimport { AST, JSONSchema, Schema as S } from '@effect/schema';\nimport type * as Types from 'effect/Types';\n\n// TODO(dmaretskyi): Remove re-exports.\nexport { AST, JSONSchema, S, Types };\n\nexport * from './ast';\nexport * from './url';\n", "//\n// Copyright 2024 DXOS.org\n//\n\nimport { AST, Schema as S } from '@effect/schema';\nimport { Option, pipe } from 'effect';\n\nimport { invariant } from '@dxos/invariant';\n\n//\n// Refs\n// https://effect.website/docs/guides/schema\n// https://www.npmjs.com/package/@effect/schema\n// https://effect-ts.github.io/effect/schema/AST.ts.html\n//\n\nexport type SimpleType = 'object' | 'string' | 'number' | 'boolean' | 'enum' | 'literal';\n\nexport const getSimpleType = (node: AST.AST): SimpleType | undefined => {\n  if (AST.isObjectKeyword(node)) {\n    return 'object';\n  }\n  if (AST.isStringKeyword(node)) {\n    return 'string';\n  }\n  if (AST.isNumberKeyword(node)) {\n    return 'number';\n  }\n  if (AST.isBooleanKeyword(node)) {\n    return 'boolean';\n  }\n  if (AST.isEnums(node)) {\n    return 'enum';\n  }\n  if (AST.isLiteral(node)) {\n    return 'literal';\n  }\n};\n\nexport const isSimpleType = (node: AST.AST) => !!getSimpleType(node);\n\n//\n// Branded types\n//\n\nexport type JsonProp = string & { __JsonPath: true; __JsonProp: true };\nexport type JsonPath = string & { __JsonPath: true };\n\nconst PATH_REGEX = /[a-zA-Z_$][\\w$]*(?:\\.[a-zA-Z_$][\\w$]*)*/;\nconst PROP_REGEX = /\\w+/;\n\n/**\n * https://www.ietf.org/archive/id/draft-goessner-dispatch-jsonpath-00.html\n */\nexport const JsonPath = S.NonEmptyString.pipe(S.pattern(PATH_REGEX)) as any as S.Schema<JsonPath>;\nexport const JsonProp = S.NonEmptyString.pipe(S.pattern(PROP_REGEX)) as any as S.Schema<JsonProp>;\n\n/**\n * Get annotation or return undefined.\n */\nexport const getAnnotation =\n  <T>(annotationId: symbol) =>\n  (node: AST.Annotated): T | undefined =>\n    pipe(AST.getAnnotation<T>(annotationId)(node), Option.getOrUndefined);\n\nexport enum VisitResult {\n  CONTINUE = 0,\n  /**\n   * Skip visiting children.\n   */\n  SKIP = 1,\n  /**\n   * Stop traversing immediately.\n   */\n  EXIT = 2,\n}\n\nexport type Path = (string | number)[];\n\nexport type Tester = (node: AST.AST, path: Path, depth: number) => VisitResult | undefined;\nexport type Visitor = (node: AST.AST, path: Path, depth: number) => void;\n\nconst defaultTest: Tester = (node) => (isSimpleType(node) ? VisitResult.CONTINUE : VisitResult.SKIP);\n\n/**\n * Visit leaf nodes.\n * Refs:\n * - https://github.com/syntax-tree/unist-util-visit?tab=readme-ov-file#visitor\n * - https://github.com/syntax-tree/unist-util-is?tab=readme-ov-file#test\n */\nexport const visit: {\n  (node: AST.AST, visitor: Visitor): void;\n  (node: AST.AST, test: Tester, visitor: Visitor): void;\n} = (node: AST.AST, testOrVisitor: Tester | Visitor, visitor?: Visitor): void => {\n  if (!visitor) {\n    visitNode(node, defaultTest, testOrVisitor);\n  } else {\n    visitNode(node, testOrVisitor as Tester, visitor);\n  }\n};\n\nconst visitNode = (\n  node: AST.AST,\n  test: Tester | undefined,\n  visitor: Visitor,\n  path: Path = [],\n  depth = 0,\n): VisitResult | undefined => {\n  const result = test?.(node, path, depth) ?? VisitResult.CONTINUE;\n  if (result === VisitResult.EXIT) {\n    return result;\n  }\n  if (result !== VisitResult.SKIP) {\n    visitor(node, path, depth);\n  }\n\n  // Object.\n  if (AST.isTypeLiteral(node)) {\n    for (const prop of AST.getPropertySignatures(node)) {\n      const currentPath = [...path, prop.name.toString()];\n      const result = visitNode(prop.type, test, visitor, currentPath, depth + 1);\n      if (result === VisitResult.EXIT) {\n        return result;\n      }\n    }\n  }\n\n  // Array.\n  else if (AST.isTupleType(node)) {\n    for (const [i, element] of node.elements.entries()) {\n      const currentPath = [...path, i];\n      const result = visitNode(element.type, test, visitor, currentPath, depth);\n      if (result === VisitResult.EXIT) {\n        return result;\n      }\n    }\n  }\n\n  // Branching union.\n  else if (AST.isUnion(node)) {\n    for (const type of node.types) {\n      const result = visitNode(type, test, visitor, path, depth);\n      if (result === VisitResult.EXIT) {\n        return result;\n      }\n    }\n  }\n\n  // Refinement.\n  else if (AST.isRefinement(node)) {\n    const result = visitNode(node.from, test, visitor, path, depth);\n    if (result === VisitResult.EXIT) {\n      return result;\n    }\n  }\n\n  // TODO(burdon): Transform?\n};\n\n/**\n * Recursively descend into AST to find first node that passes the test.\n */\n// TODO(burdon): Reuse visitor.\nexport const findNode = (node: AST.AST, test: (node: AST.AST) => boolean): AST.AST | undefined => {\n  if (test(node)) {\n    return node;\n  }\n\n  // Object.\n  else if (AST.isTypeLiteral(node)) {\n    for (const prop of AST.getPropertySignatures(node)) {\n      const child = findNode(prop.type, test);\n      if (child) {\n        return child;\n      }\n    }\n  }\n\n  // Array.\n  else if (AST.isTupleType(node)) {\n    for (const [_, element] of node.elements.entries()) {\n      const child = findNode(element.type, test);\n      if (child) {\n        return child;\n      }\n    }\n  }\n\n  // Branching union.\n  else if (AST.isUnion(node)) {\n    for (const type of node.types) {\n      const child = findNode(type, test);\n      if (child) {\n        return child;\n      }\n    }\n  }\n\n  // Refinement.\n  else if (AST.isRefinement(node)) {\n    return findNode(node.from, test);\n  }\n\n  return undefined;\n};\n\n/**\n * Get the AST node for the given property (dot-path).\n */\nexport const findProperty = (schema: S.Schema<any>, path: JsonPath | JsonProp): AST.AST | undefined => {\n  const getProp = (node: AST.AST, path: JsonProp[]): AST.AST | undefined => {\n    const [name, ...rest] = path;\n    const typeNode = findNode(node, AST.isTypeLiteral);\n    invariant(typeNode);\n    for (const prop of AST.getPropertySignatures(typeNode)) {\n      if (prop.name === name) {\n        if (rest.length) {\n          return getProp(prop.type, rest);\n        } else {\n          return prop.type;\n        }\n      }\n    }\n\n    return undefined;\n  };\n\n  return getProp(schema.ast, path.split('.') as JsonProp[]);\n};\n\n/**\n * Recursively descend into AST to find first matching annotations\n */\nexport const findAnnotation = <T>(node: AST.AST, annotationId: symbol): T | undefined => {\n  const getAnnotationById = getAnnotation(annotationId);\n  const getBaseAnnotation = (node: AST.AST): T | undefined => {\n    const value = getAnnotationById(node);\n    if (value !== undefined) {\n      return value as T;\n    }\n\n    if (AST.isUnion(node)) {\n      for (const type of node.types) {\n        const value = getBaseAnnotation(type);\n        if (value !== undefined) {\n          return value as T;\n        }\n      }\n    }\n  };\n\n  return getBaseAnnotation(node);\n};\n", "//\n// Copyright 2024 DXOS.org\n//\n\nimport { AST, type Schema as S } from '@effect/schema';\nimport { Option, pipe } from 'effect';\n\nimport { decamelize } from '@dxos/util';\n\nconst ParamKeyAnnotationId = Symbol.for('@dxos/schema/annotation/ParamKey');\n\ntype ParamKeyAnnotationValue = { key: string };\n\nexport const getParamKeyAnnotation: (annotated: AST.Annotated) => Option.Option<ParamKeyAnnotationValue> =\n  AST.getAnnotation<ParamKeyAnnotationValue>(ParamKeyAnnotationId);\n\nexport const ParamKeyAnnotation =\n  (value: ParamKeyAnnotationValue) =>\n  <S extends S.Annotable.All>(self: S): S.Annotable.Self<S> =>\n    self.annotations({ [ParamKeyAnnotationId]: value });\n\n/**\n * HTTP params parser.\n * Supports custom key serialization.\n */\nexport class UrlParser<T extends Record<string, any>> {\n  constructor(private readonly _schema: S.Struct<T>) {}\n\n  /**\n   * Parse URL params.\n   */\n  parse(_url: string): T {\n    const url = new URL(_url);\n    return Object.entries(this._schema.fields).reduce<Record<string, any>>((params, [key, type]) => {\n      let value = url.searchParams.get(decamelize(key));\n      if (value == null) {\n        value = url.searchParams.get(key);\n      }\n\n      if (value != null) {\n        if (AST.isNumberKeyword(type.ast)) {\n          params[key] = parseInt(value);\n        } else if (AST.isBooleanKeyword(type.ast)) {\n          params[key] = value === 'true' || value === '1';\n        } else {\n          params[key] = value;\n        }\n      }\n\n      return params;\n    }, {}) as T;\n  }\n\n  /**\n   * Return URL with encoded params.\n   */\n  create(_url: string, params: T): URL {\n    const url = new URL(_url);\n    Object.entries(params).forEach(([key, value]) => {\n      if (value !== undefined) {\n        const field = this._schema.fields[key];\n        if (field) {\n          const { key: serializedKey } = pipe(\n            getParamKeyAnnotation(field.ast),\n            Option.getOrElse(() => ({\n              key: decamelize(key),\n            })),\n          );\n\n          url.searchParams.set(serializedKey, String(value));\n        }\n      }\n    });\n\n    return url;\n  }\n}\n"],
-  "mappings": "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",
-  "names": ["AST", "JSONSchema", "Schema", "S", "AST", "Schema", "S", "Option", "pipe", "invariant", "getSimpleType", "node", "isObjectKeyword", "isStringKeyword", "isNumberKeyword", "isBooleanKeyword", "isEnums", "isLiteral", "isSimpleType", "PATH_REGEX", "PROP_REGEX", "JsonPath", "NonEmptyString", "pattern", "JsonProp", "getAnnotation", "annotationId", "getOrUndefined", "VisitResult", "defaultTest", "visit", "testOrVisitor", "visitor", "visitNode", "test", "path", "depth", "result", "isTypeLiteral", "prop", "getPropertySignatures", "currentPath", "name", "toString", "type", "isTupleType", "i", "element", "elements", "entries", "isUnion", "types", "isRefinement", "from", "findNode", "child", "_", "undefined", "findProperty", "schema", "getProp", "rest", "typeNode", "length", "ast", "split", "findAnnotation", "getAnnotationById", "getBaseAnnotation", "value", "AST", "Option", "pipe", "decamelize", "ParamKeyAnnotationId", "Symbol", "for", "getParamKeyAnnotation", "AST", "getAnnotation", "ParamKeyAnnotation", "value", "self", "annotations", "UrlParser", "constructor", "_schema", "parse", "_url", "url", "URL", "Object", "entries", "fields", "reduce", "params", "key", "type", "searchParams", "get", "decamelize", "isNumberKeyword", "ast", "parseInt", "isBooleanKeyword", "create", "forEach", "undefined", "field", "serializedKey", "pipe", "Option", "getOrElse", "set", "String"]
+  "sourcesContent": ["//\n// Copyright 2020 DXOS.org\n//\n\nimport { AST, JSONSchema, Schema as S } from '@effect/schema';\nimport type * as Types from 'effect/Types';\n\n// TODO(dmaretskyi): Remove re-exports.\nexport { AST, JSONSchema, S, Types };\n\nexport * from './ast';\nexport * from './url';\n", "//\n// Copyright 2024 DXOS.org\n//\n\nimport { AST, Schema as S } from '@effect/schema';\nimport { Option, pipe } from 'effect';\n\nimport { invariant } from '@dxos/invariant';\nimport { nonNullable } from '@dxos/util';\n\n//\n// Refs\n// https://effect.website/docs/schema/introduction\n// https://www.npmjs.com/package/@effect/schema\n// https://effect-ts.github.io/effect/schema/AST.ts.html\n//\n\nexport type SimpleType = 'object' | 'string' | 'number' | 'boolean' | 'enum' | 'literal';\n\n/**\n * Get the base type; e.g., traverse through refinements.\n */\nexport const getSimpleType = (node: AST.AST): SimpleType | undefined => {\n  if (AST.isObjectKeyword(node) || AST.isTypeLiteral(node) || isDiscriminatedUnion(node)) {\n    return 'object';\n  }\n\n  if (AST.isStringKeyword(node)) {\n    return 'string';\n  }\n  if (AST.isNumberKeyword(node)) {\n    return 'number';\n  }\n  if (AST.isBooleanKeyword(node)) {\n    return 'boolean';\n  }\n\n  if (AST.isEnums(node)) {\n    return 'enum';\n  }\n\n  if (AST.isLiteral(node)) {\n    return 'literal';\n  }\n};\n\nexport const isSimpleType = (node: AST.AST): boolean => !!getSimpleType(node);\n\n//\n// Branded types\n//\n\nexport type JsonProp = string & { __JsonPath: true; __JsonProp: true };\nexport type JsonPath = string & { __JsonPath: true };\n\nconst PATH_REGEX = /[a-zA-Z_$][\\w$]*(?:\\.[a-zA-Z_$][\\w$]*)*/;\nconst PROP_REGEX = /\\w+/;\n\n/**\n * https://www.ietf.org/archive/id/draft-goessner-dispatch-jsonpath-00.html\n */\nexport const JsonPath = S.NonEmptyString.pipe(S.pattern(PATH_REGEX)) as any as S.Schema<JsonPath>;\nexport const JsonProp = S.NonEmptyString.pipe(S.pattern(PROP_REGEX)) as any as S.Schema<JsonProp>;\n\n/**\n * Get annotation or return undefined.\n */\nexport const getAnnotation =\n  <T>(annotationId: symbol) =>\n  (node: AST.Annotated): T | undefined =>\n    pipe(AST.getAnnotation<T>(annotationId)(node), Option.getOrUndefined);\n\nexport enum VisitResult {\n  CONTINUE = 0,\n  /**\n   * Skip visiting children.\n   */\n  SKIP = 1,\n  /**\n   * Stop traversing immediately.\n   */\n  EXIT = 2,\n}\n\nexport type Path = (string | number)[];\n\nexport type Tester = (node: AST.AST, path: Path, depth: number) => VisitResult | undefined;\nexport type Visitor = (node: AST.AST, path: Path, depth: number) => void;\n\nconst defaultTest: Tester = (node) => (isSimpleType(node) ? VisitResult.CONTINUE : VisitResult.SKIP);\n\n/**\n * Visit leaf nodes.\n * Refs:\n * - https://github.com/syntax-tree/unist-util-visit?tab=readme-ov-file#visitor\n * - https://github.com/syntax-tree/unist-util-is?tab=readme-ov-file#test\n */\nexport const visit: {\n  (node: AST.AST, visitor: Visitor): void;\n  (node: AST.AST, test: Tester, visitor: Visitor): void;\n} = (node: AST.AST, testOrVisitor: Tester | Visitor, visitor?: Visitor): void => {\n  if (!visitor) {\n    visitNode(node, defaultTest, testOrVisitor);\n  } else {\n    visitNode(node, testOrVisitor as Tester, visitor);\n  }\n};\n\nconst visitNode = (\n  node: AST.AST,\n  test: Tester | undefined,\n  visitor: Visitor,\n  path: Path = [],\n  depth = 0,\n): VisitResult | undefined => {\n  const result = test?.(node, path, depth) ?? VisitResult.CONTINUE;\n  if (result === VisitResult.EXIT) {\n    return result;\n  }\n  if (result !== VisitResult.SKIP) {\n    visitor(node, path, depth);\n  }\n\n  // Object.\n  if (AST.isTypeLiteral(node)) {\n    for (const prop of AST.getPropertySignatures(node)) {\n      const currentPath = [...path, prop.name.toString()];\n      const result = visitNode(prop.type, test, visitor, currentPath, depth + 1);\n      if (result === VisitResult.EXIT) {\n        return result;\n      }\n    }\n  }\n\n  // Array.\n  else if (AST.isTupleType(node)) {\n    for (const [i, element] of node.elements.entries()) {\n      const currentPath = [...path, i];\n      const result = visitNode(element.type, test, visitor, currentPath, depth);\n      if (result === VisitResult.EXIT) {\n        return result;\n      }\n    }\n  }\n\n  // Branching union (e.g., optional, discriminated unions).\n  else if (AST.isUnion(node)) {\n    for (const type of node.types) {\n      const result = visitNode(type, test, visitor, path, depth);\n      if (result === VisitResult.EXIT) {\n        return result;\n      }\n    }\n  }\n\n  // Refinement.\n  else if (AST.isRefinement(node)) {\n    const result = visitNode(node.from, test, visitor, path, depth);\n    if (result === VisitResult.EXIT) {\n      return result;\n    }\n  }\n\n  // TODO(burdon): Transforms?\n};\n\n/**\n * Recursively descend into AST to find first node that passes the test.\n */\n// TODO(burdon): Rewrite using visitNode?\nexport const findNode = (node: AST.AST, test: (node: AST.AST) => boolean): AST.AST | undefined => {\n  if (test(node)) {\n    return node;\n  }\n\n  // Object.\n  else if (AST.isTypeLiteral(node)) {\n    for (const prop of AST.getPropertySignatures(node)) {\n      const child = findNode(prop.type, test);\n      if (child) {\n        return child;\n      }\n    }\n  }\n\n  // Tuple.\n  else if (AST.isTupleType(node)) {\n    for (const [_, element] of node.elements.entries()) {\n      const child = findNode(element.type, test);\n      if (child) {\n        return child;\n      }\n    }\n  }\n\n  // Branching union (e.g., optional, discriminated unions).\n  else if (AST.isUnion(node)) {\n    if (isOption(node)) {\n      for (const type of node.types) {\n        const child = findNode(type, test);\n        if (child) {\n          return child;\n        }\n      }\n    }\n  }\n\n  // Refinement.\n  else if (AST.isRefinement(node)) {\n    return findNode(node.from, test);\n  }\n};\n\n/**\n * Get the AST node for the given property (dot-path).\n */\nexport const findProperty = (schema: S.Schema<any>, path: JsonPath | JsonProp): AST.AST | undefined => {\n  const getProp = (node: AST.AST, path: JsonProp[]): AST.AST | undefined => {\n    const [name, ...rest] = path;\n    const typeNode = findNode(node, AST.isTypeLiteral);\n    invariant(typeNode);\n    for (const prop of AST.getPropertySignatures(typeNode)) {\n      if (prop.name === name) {\n        if (rest.length) {\n          return getProp(prop.type, rest);\n        } else {\n          return prop.type;\n        }\n      }\n    }\n  };\n\n  return getProp(schema.ast, path.split('.') as JsonProp[]);\n};\n\n//\n// Annotations\n//\n\nconst defaultAnnotations: Record<string, AST.Annotated> = {\n  ['ObjectKeyword' as const]: AST.objectKeyword,\n  ['StringKeyword' as const]: AST.stringKeyword,\n  ['NumberKeyword' as const]: AST.numberKeyword,\n  ['BooleanKeyword' as const]: AST.booleanKeyword,\n};\n\n/**\n * Recursively descend into AST to find first matching annotations.\n * Optionally skips default annotations for basic types (e.g., 'a string').\n */\nexport const findAnnotation = <T>(\n  node: AST.AST,\n  annotationId: symbol,\n  options?: { noDefault: boolean },\n): T | undefined => {\n  const getAnnotationById = getAnnotation(annotationId);\n\n  const getBaseAnnotation = (node: AST.AST): T | undefined => {\n    const value = getAnnotationById(node);\n    if (value !== undefined) {\n      if (options?.noDefault && value === defaultAnnotations[node._tag]?.annotations[annotationId]) {\n        return undefined;\n      }\n\n      return value as T;\n    }\n\n    if (AST.isUnion(node)) {\n      if (isOption(node)) {\n        return getAnnotationById(node.types[0]) as T;\n      }\n    }\n  };\n\n  return getBaseAnnotation(node);\n};\n\n//\n// Unions\n//\n\n/**\n * Effect S.optional creates a union type with undefined as the second type.\n */\nexport const isOption = (node: AST.AST): boolean => {\n  return AST.isUnion(node) && node.types.length === 2 && AST.isUndefinedKeyword(node.types[1]);\n};\n\n/**\n * Determines if the node is a union of literal types.\n */\nexport const isLiteralUnion = (node: AST.AST): boolean => {\n  return AST.isUnion(node) && node.types.every(AST.isLiteral);\n};\n\n/**\n * Determines if the node is a discriminated union.\n */\nexport const isDiscriminatedUnion = (node: AST.AST): boolean => {\n  return AST.isUnion(node) && !!getDiscriminatingProps(node)?.length;\n};\n\n/**\n * Get the discriminating properties for the given union type.\n */\nexport const getDiscriminatingProps = (node: AST.AST): string[] | undefined => {\n  invariant(AST.isUnion(node));\n  if (isOption(node)) {\n    return;\n  }\n\n  // Get common literals across all types.\n  return node.types.reduce<string[]>((shared, type) => {\n    const props = AST.getPropertySignatures(type)\n      // TODO(burdon): Should check each literal is unique.\n      .filter((p) => AST.isLiteral(p.type))\n      .map((p) => p.name.toString());\n\n    // Return common literals.\n    return shared.length === 0 ? props : shared.filter((prop) => props.includes(prop));\n  }, []);\n};\n\n/**\n * Get the discriminated type for the given value.\n */\nexport const getDiscriminatedType = (node: AST.AST, value: Record<string, any> = {}): AST.AST | undefined => {\n  invariant(AST.isUnion(node));\n  invariant(value);\n  const props = getDiscriminatingProps(node);\n  if (!props?.length) {\n    return;\n  }\n\n  // Match provided values.\n  for (const type of node.types) {\n    const match = AST.getPropertySignatures(type)\n      .filter((prop) => props?.includes(prop.name.toString()))\n      .every((prop) => {\n        invariant(AST.isLiteral(prop.type));\n        return prop.type.literal === value[prop.name.toString()];\n      });\n\n    if (match) {\n      return type;\n    }\n  }\n\n  // Create union of discriminating properties.\n  // NOTE: This may not work with non-overlapping variants.\n  // TODO(burdon): Iterate through props and knock-out variants that don't match.\n  const fields = Object.fromEntries(\n    props\n      .map((prop) => {\n        const literals = node.types\n          .map((type) => {\n            const literal = AST.getPropertySignatures(type).find((p) => p.name.toString() === prop)!;\n            invariant(AST.isLiteral(literal.type));\n            return literal.type.literal;\n          })\n          .filter(nonNullable);\n\n        return literals.length ? [prop, S.Literal(...literals)] : undefined;\n      })\n      .filter(nonNullable),\n  );\n\n  const schema = S.Struct(fields);\n  return schema.ast;\n};\n", "//\n// Copyright 2024 DXOS.org\n//\n\nimport { AST, type Schema as S } from '@effect/schema';\nimport { Option, pipe } from 'effect';\n\nimport { decamelize } from '@dxos/util';\n\nconst ParamKeyAnnotationId = Symbol.for('@dxos/schema/annotation/ParamKey');\n\ntype ParamKeyAnnotationValue = { key: string };\n\nexport const getParamKeyAnnotation: (annotated: AST.Annotated) => Option.Option<ParamKeyAnnotationValue> =\n  AST.getAnnotation<ParamKeyAnnotationValue>(ParamKeyAnnotationId);\n\nexport const ParamKeyAnnotation =\n  (value: ParamKeyAnnotationValue) =>\n  <S extends S.Annotable.All>(self: S): S.Annotable.Self<S> =>\n    self.annotations({ [ParamKeyAnnotationId]: value });\n\n/**\n * HTTP params parser.\n * Supports custom key serialization.\n */\nexport class UrlParser<T extends Record<string, any>> {\n  constructor(private readonly _schema: S.Struct<T>) {}\n\n  /**\n   * Parse URL params.\n   */\n  parse(_url: string): T {\n    const url = new URL(_url);\n    return Object.entries(this._schema.fields).reduce<Record<string, any>>((params, [key, type]) => {\n      let value = url.searchParams.get(decamelize(key));\n      if (value == null) {\n        value = url.searchParams.get(key);\n      }\n\n      if (value != null) {\n        if (AST.isNumberKeyword(type.ast)) {\n          params[key] = parseInt(value);\n        } else if (AST.isBooleanKeyword(type.ast)) {\n          params[key] = value === 'true' || value === '1';\n        } else {\n          params[key] = value;\n        }\n      }\n\n      return params;\n    }, {}) as T;\n  }\n\n  /**\n   * Return URL with encoded params.\n   */\n  create(_url: string, params: T): URL {\n    const url = new URL(_url);\n    Object.entries(params).forEach(([key, value]) => {\n      if (value !== undefined) {\n        const field = this._schema.fields[key];\n        if (field) {\n          const { key: serializedKey } = pipe(\n            getParamKeyAnnotation(field.ast),\n            Option.getOrElse(() => ({\n              key: decamelize(key),\n            })),\n          );\n\n          url.searchParams.set(serializedKey, String(value));\n        }\n      }\n    });\n\n    return url;\n  }\n}\n"],
+  "mappings": "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",
+  "names": ["AST", "JSONSchema", "Schema", "S", "AST", "Schema", "S", "Option", "pipe", "invariant", "nonNullable", "getSimpleType", "node", "isObjectKeyword", "isTypeLiteral", "isDiscriminatedUnion", "isStringKeyword", "isNumberKeyword", "isBooleanKeyword", "isEnums", "isLiteral", "isSimpleType", "PATH_REGEX", "PROP_REGEX", "JsonPath", "NonEmptyString", "pattern", "JsonProp", "getAnnotation", "annotationId", "getOrUndefined", "VisitResult", "defaultTest", "visit", "testOrVisitor", "visitor", "visitNode", "test", "path", "depth", "result", "prop", "getPropertySignatures", "currentPath", "name", "toString", "type", "isTupleType", "i", "element", "elements", "entries", "isUnion", "types", "isRefinement", "from", "findNode", "child", "_", "isOption", "findProperty", "schema", "getProp", "rest", "typeNode", "length", "ast", "split", "defaultAnnotations", "objectKeyword", "stringKeyword", "numberKeyword", "booleanKeyword", "findAnnotation", "options", "getAnnotationById", "getBaseAnnotation", "value", "undefined", "noDefault", "_tag", "annotations", "isUndefinedKeyword", "isLiteralUnion", "every", "getDiscriminatingProps", "reduce", "shared", "props", "filter", "p", "map", "includes", "getDiscriminatedType", "match", "literal", "fields", "Object", "fromEntries", "literals", "find", "Literal", "Struct", "AST", "Option", "pipe", "decamelize", "ParamKeyAnnotationId", "Symbol", "for", "getParamKeyAnnotation", "AST", "getAnnotation", "ParamKeyAnnotation", "value", "self", "annotations", "UrlParser", "constructor", "_schema", "parse", "_url", "url", "URL", "Object", "entries", "fields", "reduce", "params", "key", "type", "searchParams", "get", "decamelize", "isNumberKeyword", "ast", "parseInt", "isBooleanKeyword", "create", "forEach", "undefined", "field", "serializedKey", "pipe", "Option", "getOrElse", "set", "String"]
 }

package/dist/lib/browser/meta.json

@@ -1 +1 @@
-{"inputs":{"packages/common/effect/src/ast.ts":{"bytes":21205,"imports":[{"path":"@effect/schema","kind":"import-statement","external":true},{"path":"effect","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true}],"format":"esm"},"packages/common/effect/src/url.ts":{"bytes":7711,"imports":[{"path":"@effect/schema","kind":"import-statement","external":true},{"path":"effect","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true}],"format":"esm"},"packages/common/effect/src/index.ts":{"bytes":1150,"imports":[{"path":"@effect/schema","kind":"import-statement","external":true},{"path":"packages/common/effect/src/ast.ts","kind":"import-statement","original":"./ast"},{"path":"packages/common/effect/src/url.ts","kind":"import-statement","original":"./url"}],"format":"esm"}},"outputs":{"packages/common/effect/dist/lib/browser/index.mjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":15614},"packages/common/effect/dist/lib/browser/index.mjs":{"imports":[{"path":"@effect/schema","kind":"import-statement","external":true},{"path":"@effect/schema","kind":"import-statement","external":true},{"path":"effect","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@effect/schema","kind":"import-statement","external":true},{"path":"effect","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true}],"exports":["AST","JSONSchema","JsonPath","JsonProp","ParamKeyAnnotation","S","UrlParser","VisitResult","findAnnotation","findNode","findProperty","getAnnotation","getParamKeyAnnotation","getSimpleType","isSimpleType","visit"],"entryPoint":"packages/common/effect/src/index.ts","inputs":{"packages/common/effect/src/index.ts":{"bytesInOutput":72},"packages/common/effect/src/ast.ts":{"bytesInOutput":4515},"packages/common/effect/src/url.ts":{"bytesInOutput":1624}},"bytes":6650}}}
+{"inputs":{"packages/common/effect/src/ast.ts":{"bytes":33857,"imports":[{"path":"@effect/schema","kind":"import-statement","external":true},{"path":"effect","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true}],"format":"esm"},"packages/common/effect/src/url.ts":{"bytes":7711,"imports":[{"path":"@effect/schema","kind":"import-statement","external":true},{"path":"effect","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true}],"format":"esm"},"packages/common/effect/src/index.ts":{"bytes":1150,"imports":[{"path":"@effect/schema","kind":"import-statement","external":true},{"path":"packages/common/effect/src/ast.ts","kind":"import-statement","original":"./ast"},{"path":"packages/common/effect/src/url.ts","kind":"import-statement","original":"./url"}],"format":"esm"}},"outputs":{"packages/common/effect/dist/lib/browser/index.mjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":21747},"packages/common/effect/dist/lib/browser/index.mjs":{"imports":[{"path":"@effect/schema","kind":"import-statement","external":true},{"path":"@effect/schema","kind":"import-statement","external":true},{"path":"effect","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true},{"path":"@effect/schema","kind":"import-statement","external":true},{"path":"effect","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true}],"exports":["AST","JSONSchema","JsonPath","JsonProp","ParamKeyAnnotation","S","UrlParser","VisitResult","findAnnotation","findNode","findProperty","getAnnotation","getDiscriminatedType","getDiscriminatingProps","getParamKeyAnnotation","getSimpleType","isDiscriminatedUnion","isLiteralUnion","isOption","isSimpleType","visit"],"entryPoint":"packages/common/effect/src/index.ts","inputs":{"packages/common/effect/src/index.ts":{"bytesInOutput":72},"packages/common/effect/src/ast.ts":{"bytesInOutput":7227},"packages/common/effect/src/url.ts":{"bytesInOutput":1624}},"bytes":9466}}}

package/dist/lib/node/index.cjs

@@ -30,8 +30,13 @@ __export(node_exports, {
   findNode: () => findNode,
   findProperty: () => findProperty,
   getAnnotation: () => getAnnotation,
+  getDiscriminatedType: () => getDiscriminatedType,
+  getDiscriminatingProps: () => getDiscriminatingProps,
   getParamKeyAnnotation: () => getParamKeyAnnotation,
   getSimpleType: () => getSimpleType,
+  isDiscriminatedUnion: () => isDiscriminatedUnion,
+  isLiteralUnion: () => isLiteralUnion,
+  isOption: () => isOption,
   isSimpleType: () => isSimpleType,
   visit: () => visit
 });
@@ -40,12 +45,13 @@ var import_schema = require("@effect/schema");
 var import_schema2 = require("@effect/schema");
 var import_effect = require("effect");
 var import_invariant = require("@dxos/invariant");
+var import_util = require("@dxos/util");
 var import_schema3 = require("@effect/schema");
 var import_effect2 = require("effect");
-var import_util = require("@dxos/util");
+var import_util2 = require("@dxos/util");
 var __dxlog_file = "/home/runner/work/dxos/dxos/packages/common/effect/src/ast.ts";
 var getSimpleType = (node) => {
-  if (import_schema2.AST.isObjectKeyword(node)) {
+  if (import_schema2.AST.isObjectKeyword(node) || import_schema2.AST.isTypeLiteral(node) || isDiscriminatedUnion(node)) {
     return "object";
   }
   if (import_schema2.AST.isStringKeyword(node)) {
@@ -146,16 +152,17 @@ var findNode = (node, test) => {
       }
     }
   } else if (import_schema2.AST.isUnion(node)) {
-    for (const type of node.types) {
-      const child = findNode(type, test);
-      if (child) {
-        return child;
+    if (isOption(node)) {
+      for (const type of node.types) {
+        const child = findNode(type, test);
+        if (child) {
+          return child;
+        }
       }
     }
   } else if (import_schema2.AST.isRefinement(node)) {
     return findNode(node.from, test);
   }
-  return void 0;
 };
 var findProperty = (schema, path) => {
   const getProp = (node, path2) => {
@@ -163,7 +170,7 @@ var findProperty = (schema, path) => {
     const typeNode = findNode(node, import_schema2.AST.isTypeLiteral);
     (0, import_invariant.invariant)(typeNode, void 0, {
       F: __dxlog_file,
-      L: 214,
+      L: 221,
       S: void 0,
       A: [
         "typeNode",
@@ -179,28 +186,122 @@ var findProperty = (schema, path) => {
         }
       }
     }
-    return void 0;
   };
   return getProp(schema.ast, path.split("."));
 };
-var findAnnotation = (node, annotationId) => {
+var defaultAnnotations = {
+  ["ObjectKeyword"]: import_schema2.AST.objectKeyword,
+  ["StringKeyword"]: import_schema2.AST.stringKeyword,
+  ["NumberKeyword"]: import_schema2.AST.numberKeyword,
+  ["BooleanKeyword"]: import_schema2.AST.booleanKeyword
+};
+var findAnnotation = (node, annotationId, options) => {
   const getAnnotationById = getAnnotation(annotationId);
   const getBaseAnnotation = (node2) => {
     const value = getAnnotationById(node2);
     if (value !== void 0) {
+      if (options?.noDefault && value === defaultAnnotations[node2._tag]?.annotations[annotationId]) {
+        return void 0;
+      }
       return value;
     }
     if (import_schema2.AST.isUnion(node2)) {
-      for (const type of node2.types) {
-        const value2 = getBaseAnnotation(type);
-        if (value2 !== void 0) {
-          return value2;
-        }
+      if (isOption(node2)) {
+        return getAnnotationById(node2.types[0]);
       }
     }
   };
   return getBaseAnnotation(node);
 };
+var isOption = (node) => {
+  return import_schema2.AST.isUnion(node) && node.types.length === 2 && import_schema2.AST.isUndefinedKeyword(node.types[1]);
+};
+var isLiteralUnion = (node) => {
+  return import_schema2.AST.isUnion(node) && node.types.every(import_schema2.AST.isLiteral);
+};
+var isDiscriminatedUnion = (node) => {
+  return import_schema2.AST.isUnion(node) && !!getDiscriminatingProps(node)?.length;
+};
+var getDiscriminatingProps = (node) => {
+  (0, import_invariant.invariant)(import_schema2.AST.isUnion(node), void 0, {
+    F: __dxlog_file,
+    L: 307,
+    S: void 0,
+    A: [
+      "AST.isUnion(node)",
+      ""
+    ]
+  });
+  if (isOption(node)) {
+    return;
+  }
+  return node.types.reduce((shared, type) => {
+    const props = import_schema2.AST.getPropertySignatures(type).filter((p) => import_schema2.AST.isLiteral(p.type)).map((p) => p.name.toString());
+    return shared.length === 0 ? props : shared.filter((prop) => props.includes(prop));
+  }, []);
+};
+var getDiscriminatedType = (node, value = {}) => {
+  (0, import_invariant.invariant)(import_schema2.AST.isUnion(node), void 0, {
+    F: __dxlog_file,
+    L: 328,
+    S: void 0,
+    A: [
+      "AST.isUnion(node)",
+      ""
+    ]
+  });
+  (0, import_invariant.invariant)(value, void 0, {
+    F: __dxlog_file,
+    L: 329,
+    S: void 0,
+    A: [
+      "value",
+      ""
+    ]
+  });
+  const props = getDiscriminatingProps(node);
+  if (!props?.length) {
+    return;
+  }
+  for (const type of node.types) {
+    const match = import_schema2.AST.getPropertySignatures(type).filter((prop) => props?.includes(prop.name.toString())).every((prop) => {
+      (0, import_invariant.invariant)(import_schema2.AST.isLiteral(prop.type), void 0, {
+        F: __dxlog_file,
+        L: 340,
+        S: void 0,
+        A: [
+          "AST.isLiteral(prop.type)",
+          ""
+        ]
+      });
+      return prop.type.literal === value[prop.name.toString()];
+    });
+    if (match) {
+      return type;
+    }
+  }
+  const fields = Object.fromEntries(props.map((prop) => {
+    const literals = node.types.map((type) => {
+      const literal = import_schema2.AST.getPropertySignatures(type).find((p) => p.name.toString() === prop);
+      (0, import_invariant.invariant)(import_schema2.AST.isLiteral(literal.type), void 0, {
+        F: __dxlog_file,
+        L: 358,
+        S: void 0,
+        A: [
+          "AST.isLiteral(literal.type)",
+          ""
+        ]
+      });
+      return literal.type.literal;
+    }).filter(import_util.nonNullable);
+    return literals.length ? [
+      prop,
+      import_schema2.Schema.Literal(...literals)
+    ] : void 0;
+  }).filter(import_util.nonNullable));
+  const schema = import_schema2.Schema.Struct(fields);
+  return schema.ast;
+};
 var ParamKeyAnnotationId = Symbol.for("@dxos/schema/annotation/ParamKey");
 var getParamKeyAnnotation = import_schema3.AST.getAnnotation(ParamKeyAnnotationId);
 var ParamKeyAnnotation = (value) => (self) => self.annotations({
@@ -216,7 +317,7 @@ var UrlParser = class {
   parse(_url) {
     const url = new URL(_url);
     return Object.entries(this._schema.fields).reduce((params, [key, type]) => {
-      let value = url.searchParams.get((0, import_util.decamelize)(key));
+      let value = url.searchParams.get((0, import_util2.decamelize)(key));
       if (value == null) {
         value = url.searchParams.get(key);
       }
@@ -242,7 +343,7 @@ var UrlParser = class {
         const field = this._schema.fields[key];
         if (field) {
           const { key: serializedKey } = (0, import_effect2.pipe)(getParamKeyAnnotation(field.ast), import_effect2.Option.getOrElse(() => ({
-            key: (0, import_util.decamelize)(key)
+            key: (0, import_util2.decamelize)(key)
           })));
           url.searchParams.set(serializedKey, String(value));
         }
@@ -265,8 +366,13 @@ var UrlParser = class {
   findNode,
   findProperty,
   getAnnotation,
+  getDiscriminatedType,
+  getDiscriminatingProps,
   getParamKeyAnnotation,
   getSimpleType,
+  isDiscriminatedUnion,
+  isLiteralUnion,
+  isOption,
   isSimpleType,
   visit
 });