@dxos/effect 0.6.14-staging.e15392e → 0.7.0

package/dist/lib/browser/index.mjs

@@ -1,90 +1,170 @@
 import "@dxos/node-std/globals";
 
 // packages/common/effect/src/index.ts
-import { AST as AST3, JSONSchema, Schema as S } from "@effect/schema";
+import { AST as AST3, JSONSchema, Schema as S2 } from "@effect/schema";
 
 // packages/common/effect/src/ast.ts
-import { AST } from "@effect/schema";
+import { AST, Schema as S } from "@effect/schema";
 import { Option, pipe } from "effect";
 import { invariant } from "@dxos/invariant";
 var __dxlog_file = "/home/runner/work/dxos/dxos/packages/common/effect/src/ast.ts";
-var isLeafType = (node) => !AST.isTupleType(node) && !AST.isTypeLiteral(node);
-var getAnnotation = (annotationId, node) => pipe(AST.getAnnotation(annotationId)(node), Option.getOrUndefined);
-var getType = (node) => {
-  if (AST.isUnion(node)) {
-    return node.types.find((type) => getType(type));
-  } else if (AST.isRefinement(node)) {
-    return getType(node.from);
-  } else {
-    return node;
+var getSimpleType = (node) => {
+  if (AST.isObjectKeyword(node)) {
+    return "object";
   }
-};
-var getProperty = (schema, path) => {
-  let node = schema.ast;
-  for (const part of path.split(".")) {
-    const props = AST.getPropertySignatures(node);
-    const prop = props.find((prop2) => prop2.name === part);
-    if (!prop) {
-      return void 0;
-    }
-    const type = getType(prop.type);
-    invariant(type, `invalid type: ${path}`, {
-      F: __dxlog_file,
-      L: 52,
-      S: void 0,
-      A: [
-        "type",
-        "`invalid type: ${path}`"
-      ]
-    });
-    node = type;
+  if (AST.isStringKeyword(node)) {
+    return "string";
+  }
+  if (AST.isNumberKeyword(node)) {
+    return "number";
+  }
+  if (AST.isBooleanKeyword(node)) {
+    return "boolean";
+  }
+  if (AST.isEnums(node)) {
+    return "enum";
+  }
+  if (AST.isLiteral(node)) {
+    return "literal";
   }
-  return node;
 };
+var isSimpleType = (node) => !!getSimpleType(node);
+var PATH_REGEX = /[a-zA-Z_$][\w$]*(?:\.[a-zA-Z_$][\w$]*)*/;
+var PROP_REGEX = /\w+/;
+var JsonPath = S.NonEmptyString.pipe(S.pattern(PATH_REGEX));
+var JsonProp = S.NonEmptyString.pipe(S.pattern(PROP_REGEX));
+var getAnnotation = (annotationId) => (node) => pipe(AST.getAnnotation(annotationId)(node), Option.getOrUndefined);
 var VisitResult;
 (function(VisitResult2) {
   VisitResult2[VisitResult2["CONTINUE"] = 0] = "CONTINUE";
   VisitResult2[VisitResult2["SKIP"] = 1] = "SKIP";
   VisitResult2[VisitResult2["EXIT"] = 2] = "EXIT";
 })(VisitResult || (VisitResult = {}));
+var defaultTest = (node) => isSimpleType(node) ? 0 : 1;
 var visit = (node, testOrVisitor, visitor) => {
   if (!visitor) {
-    visitNode(node, void 0, testOrVisitor);
+    visitNode(node, defaultTest, testOrVisitor);
   } else {
     visitNode(node, testOrVisitor, visitor);
   }
 };
 var visitNode = (node, test, visitor, path = [], depth = 0) => {
-  for (const prop of AST.getPropertySignatures(node)) {
-    const currentPath = [
-      ...path,
-      prop.name.toString()
-    ];
-    const type = getType(prop.type);
-    if (type) {
-      const result = test?.(node, path, depth) ?? 0;
-      if (result === 2) {
-        return result;
+  const result = test?.(node, path, depth) ?? 0;
+  if (result === 2) {
+    return result;
+  }
+  if (result !== 1) {
+    visitor(node, path, depth);
+  }
+  if (AST.isTypeLiteral(node)) {
+    for (const prop of AST.getPropertySignatures(node)) {
+      const currentPath = [
+        ...path,
+        prop.name.toString()
+      ];
+      const result2 = visitNode(prop.type, test, visitor, currentPath, depth + 1);
+      if (result2 === 2) {
+        return result2;
       }
-      visitor(type, currentPath, depth);
-      if (result !== 1) {
-        if (AST.isTypeLiteral(type)) {
-          visitNode(type, test, visitor, currentPath, depth + 1);
-        } else if (AST.isTupleType(type)) {
-          for (const [i, elementType] of type.elements.entries()) {
-            const type2 = getType(elementType.type);
-            if (type2) {
-              visitNode(type2, test, visitor, [
-                i,
-                ...currentPath
-              ], depth);
-            }
-          }
-        }
+    }
+  } else if (AST.isTupleType(node)) {
+    for (const [i, element] of node.elements.entries()) {
+      const currentPath = [
+        ...path,
+        i
+      ];
+      const result2 = visitNode(element.type, test, visitor, currentPath, depth);
+      if (result2 === 2) {
+        return result2;
       }
     }
+  } else if (AST.isUnion(node)) {
+    for (const type of node.types) {
+      const result2 = visitNode(type, test, visitor, path, depth);
+      if (result2 === 2) {
+        return result2;
+      }
+    }
+  } else if (AST.isRefinement(node)) {
+    const result2 = visitNode(node.from, test, visitor, path, depth);
+    if (result2 === 2) {
+      return result2;
+    }
   }
 };
+var findNode = (node, test) => {
+  if (test(node)) {
+    return node;
+  } else if (AST.isTypeLiteral(node)) {
+    for (const prop of AST.getPropertySignatures(node)) {
+      const child = findNode(prop.type, test);
+      if (child) {
+        return child;
+      }
+    }
+  } else if (AST.isTupleType(node)) {
+    for (const [_, element] of node.elements.entries()) {
+      const child = findNode(element.type, test);
+      if (child) {
+        return child;
+      }
+    }
+  } else if (AST.isUnion(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) => {
+    const [name, ...rest] = path2;
+    const typeNode = findNode(node, AST.isTypeLiteral);
+    invariant(typeNode, void 0, {
+      F: __dxlog_file,
+      L: 214,
+      S: void 0,
+      A: [
+        "typeNode",
+        ""
+      ]
+    });
+    for (const prop of AST.getPropertySignatures(typeNode)) {
+      if (prop.name === name) {
+        if (rest.length) {
+          return getProp(prop.type, rest);
+        } else {
+          return prop.type;
+        }
+      }
+    }
+    return void 0;
+  };
+  return getProp(schema.ast, path.split("."));
+};
+var findAnnotation = (node, annotationId) => {
+  const getAnnotationById = getAnnotation(annotationId);
+  const getBaseAnnotation = (node2) => {
+    const value = getAnnotationById(node2);
+    if (value !== void 0) {
+      return value;
+    }
+    if (AST.isUnion(node2)) {
+      for (const type of node2.types) {
+        const value2 = getBaseAnnotation(type);
+        if (value2 !== void 0) {
+          return value2;
+        }
+      }
+    }
+  };
+  return getBaseAnnotation(node);
+};
 
 // packages/common/effect/src/url.ts
 import { AST as AST2 } from "@effect/schema";
@@ -143,15 +223,19 @@ var UrlParser = class {
 export {
   AST3 as AST,
   JSONSchema,
+  JsonPath,
+  JsonProp,
   ParamKeyAnnotation,
-  S,
+  S2 as S,
   UrlParser,
   VisitResult,
+  findAnnotation,
+  findNode,
+  findProperty,
   getAnnotation,
   getParamKeyAnnotation,
-  getProperty,
-  getType,
-  isLeafType,
+  getSimpleType,
+  isSimpleType,
   visit
 };
 //# sourceMappingURL=index.mjs.map

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\nexport { AST, JSONSchema, S, Types };\n\nexport * from './ast';\nexport * from './url';\n", "//\n// Copyright 2024 DXOS.org\n//\n\nimport { AST, type 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 const isLeafType = (node: AST.AST) => !AST.isTupleType(node) && !AST.isTypeLiteral(node);\n\n/**\n * Get annotation or return undefined.\n */\nexport const getAnnotation = <T>(annotationId: symbol, node: AST.Annotated): T | undefined =>\n  pipe(AST.getAnnotation<T>(annotationId)(node), Option.getOrUndefined);\n\n/**\n * Get type node.\n */\nexport const getType = (node: AST.AST): AST.AST | undefined => {\n  if (AST.isUnion(node)) {\n    return node.types.find((type) => getType(type));\n  } else if (AST.isRefinement(node)) {\n    return getType(node.from);\n  } else {\n    return node;\n  }\n};\n\n/**\n * Get the AST node for the given property (dot-path).\n */\nexport const getProperty = (schema: S.Schema<any>, path: string): AST.AST | undefined => {\n  let node: AST.AST = schema.ast;\n  for (const part of path.split('.')) {\n    const props = AST.getPropertySignatures(node);\n    const prop = props.find((prop) => prop.name === part);\n    if (!prop) {\n      return undefined;\n    }\n\n    // TODO(burdon): Check if leaf.\n    const type = getType(prop.type);\n    invariant(type, `invalid type: ${path}`);\n    node = type;\n  }\n\n  return node;\n};\n\nexport enum VisitResult {\n  CONTINUE = 0,\n  /**\n   * Skip visiting children.\n   */\n  SKIP = 1,\n  /**\n   * Stop traversing immeditaely.\n   */\n  EXIT = 2,\n}\n\nexport type Path = (string | number)[];\n\nexport type Tester = (node: AST.AST, path: Path, depth: number) => VisitResult;\nexport type Visitor = (node: AST.AST, path: Path, depth: number) => void;\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, undefined, 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  for (const prop of AST.getPropertySignatures(node)) {\n    const currentPath = [...path, prop.name.toString()];\n    const type = getType(prop.type);\n    if (type) {\n      const result = test?.(node, path, depth) ?? VisitResult.CONTINUE;\n      if (result === VisitResult.EXIT) {\n        return result;\n      }\n\n      visitor(type, currentPath, depth);\n\n      if (result !== VisitResult.SKIP) {\n        if (AST.isTypeLiteral(type)) {\n          visitNode(type, test, visitor, currentPath, depth + 1);\n        } else if (AST.isTupleType(type)) {\n          for (const [i, elementType] of type.elements.entries()) {\n            const type = getType(elementType.type);\n            if (type) {\n              visitNode(type, test, visitor, [i, ...currentPath], depth);\n            }\n          }\n        }\n      }\n    }\n  }\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", "Option", "pipe", "invariant", "isLeafType", "node", "isTupleType", "isTypeLiteral", "getAnnotation", "annotationId", "getOrUndefined", "getType", "isUnion", "types", "find", "type", "isRefinement", "from", "getProperty", "schema", "path", "ast", "part", "split", "props", "getPropertySignatures", "prop", "name", "undefined", "VisitResult", "visit", "testOrVisitor", "visitor", "visitNode", "test", "depth", "currentPath", "toString", "result", "i", "elementType", "elements", "entries", "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';\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"]
 }

package/dist/lib/browser/meta.json

@@ -1 +1 @@
-{"inputs":{"packages/common/effect/src/ast.ts":{"bytes":11581,"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":1034,"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":10203},"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","ParamKeyAnnotation","S","UrlParser","VisitResult","getAnnotation","getParamKeyAnnotation","getProperty","getType","isLeafType","visit"],"entryPoint":"packages/common/effect/src/index.ts","inputs":{"packages/common/effect/src/index.ts":{"bytesInOutput":71},"packages/common/effect/src/ast.ts":{"bytesInOutput":2437},"packages/common/effect/src/url.ts":{"bytesInOutput":1624}},"bytes":4502}}}
+{"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}}}

package/dist/lib/node/index.cjs

@@ -20,15 +20,19 @@ var node_exports = {};
 __export(node_exports, {
   AST: () => import_schema.AST,
   JSONSchema: () => import_schema.JSONSchema,
+  JsonPath: () => JsonPath,
+  JsonProp: () => JsonProp,
   ParamKeyAnnotation: () => ParamKeyAnnotation,
   S: () => import_schema.Schema,
   UrlParser: () => UrlParser,
   VisitResult: () => VisitResult,
+  findAnnotation: () => findAnnotation,
+  findNode: () => findNode,
+  findProperty: () => findProperty,
   getAnnotation: () => getAnnotation,
   getParamKeyAnnotation: () => getParamKeyAnnotation,
-  getProperty: () => getProperty,
-  getType: () => getType,
-  isLeafType: () => isLeafType,
+  getSimpleType: () => getSimpleType,
+  isSimpleType: () => isSimpleType,
   visit: () => visit
 });
 module.exports = __toCommonJS(node_exports);
@@ -40,83 +44,163 @@ var import_schema3 = require("@effect/schema");
 var import_effect2 = require("effect");
 var import_util = require("@dxos/util");
 var __dxlog_file = "/home/runner/work/dxos/dxos/packages/common/effect/src/ast.ts";
-var isLeafType = (node) => !import_schema2.AST.isTupleType(node) && !import_schema2.AST.isTypeLiteral(node);
-var getAnnotation = (annotationId, node) => (0, import_effect.pipe)(import_schema2.AST.getAnnotation(annotationId)(node), import_effect.Option.getOrUndefined);
-var getType = (node) => {
-  if (import_schema2.AST.isUnion(node)) {
-    return node.types.find((type) => getType(type));
-  } else if (import_schema2.AST.isRefinement(node)) {
-    return getType(node.from);
-  } else {
-    return node;
+var getSimpleType = (node) => {
+  if (import_schema2.AST.isObjectKeyword(node)) {
+    return "object";
   }
-};
-var getProperty = (schema, path) => {
-  let node = schema.ast;
-  for (const part of path.split(".")) {
-    const props = import_schema2.AST.getPropertySignatures(node);
-    const prop = props.find((prop2) => prop2.name === part);
-    if (!prop) {
-      return void 0;
-    }
-    const type = getType(prop.type);
-    (0, import_invariant.invariant)(type, `invalid type: ${path}`, {
-      F: __dxlog_file,
-      L: 52,
-      S: void 0,
-      A: [
-        "type",
-        "`invalid type: ${path}`"
-      ]
-    });
-    node = type;
+  if (import_schema2.AST.isStringKeyword(node)) {
+    return "string";
+  }
+  if (import_schema2.AST.isNumberKeyword(node)) {
+    return "number";
+  }
+  if (import_schema2.AST.isBooleanKeyword(node)) {
+    return "boolean";
+  }
+  if (import_schema2.AST.isEnums(node)) {
+    return "enum";
+  }
+  if (import_schema2.AST.isLiteral(node)) {
+    return "literal";
   }
-  return node;
 };
+var isSimpleType = (node) => !!getSimpleType(node);
+var PATH_REGEX = /[a-zA-Z_$][\w$]*(?:\.[a-zA-Z_$][\w$]*)*/;
+var PROP_REGEX = /\w+/;
+var JsonPath = import_schema2.Schema.NonEmptyString.pipe(import_schema2.Schema.pattern(PATH_REGEX));
+var JsonProp = import_schema2.Schema.NonEmptyString.pipe(import_schema2.Schema.pattern(PROP_REGEX));
+var getAnnotation = (annotationId) => (node) => (0, import_effect.pipe)(import_schema2.AST.getAnnotation(annotationId)(node), import_effect.Option.getOrUndefined);
 var VisitResult;
 (function(VisitResult2) {
   VisitResult2[VisitResult2["CONTINUE"] = 0] = "CONTINUE";
   VisitResult2[VisitResult2["SKIP"] = 1] = "SKIP";
   VisitResult2[VisitResult2["EXIT"] = 2] = "EXIT";
 })(VisitResult || (VisitResult = {}));
+var defaultTest = (node) => isSimpleType(node) ? 0 : 1;
 var visit = (node, testOrVisitor, visitor) => {
   if (!visitor) {
-    visitNode(node, void 0, testOrVisitor);
+    visitNode(node, defaultTest, testOrVisitor);
   } else {
     visitNode(node, testOrVisitor, visitor);
   }
 };
 var visitNode = (node, test, visitor, path = [], depth = 0) => {
-  for (const prop of import_schema2.AST.getPropertySignatures(node)) {
-    const currentPath = [
-      ...path,
-      prop.name.toString()
-    ];
-    const type = getType(prop.type);
-    if (type) {
-      const result = test?.(node, path, depth) ?? 0;
-      if (result === 2) {
-        return result;
+  const result = test?.(node, path, depth) ?? 0;
+  if (result === 2) {
+    return result;
+  }
+  if (result !== 1) {
+    visitor(node, path, depth);
+  }
+  if (import_schema2.AST.isTypeLiteral(node)) {
+    for (const prop of import_schema2.AST.getPropertySignatures(node)) {
+      const currentPath = [
+        ...path,
+        prop.name.toString()
+      ];
+      const result2 = visitNode(prop.type, test, visitor, currentPath, depth + 1);
+      if (result2 === 2) {
+        return result2;
       }
-      visitor(type, currentPath, depth);
-      if (result !== 1) {
-        if (import_schema2.AST.isTypeLiteral(type)) {
-          visitNode(type, test, visitor, currentPath, depth + 1);
-        } else if (import_schema2.AST.isTupleType(type)) {
-          for (const [i, elementType] of type.elements.entries()) {
-            const type2 = getType(elementType.type);
-            if (type2) {
-              visitNode(type2, test, visitor, [
-                i,
-                ...currentPath
-              ], depth);
-            }
-          }
-        }
+    }
+  } else if (import_schema2.AST.isTupleType(node)) {
+    for (const [i, element] of node.elements.entries()) {
+      const currentPath = [
+        ...path,
+        i
+      ];
+      const result2 = visitNode(element.type, test, visitor, currentPath, depth);
+      if (result2 === 2) {
+        return result2;
       }
     }
+  } else if (import_schema2.AST.isUnion(node)) {
+    for (const type of node.types) {
+      const result2 = visitNode(type, test, visitor, path, depth);
+      if (result2 === 2) {
+        return result2;
+      }
+    }
+  } else if (import_schema2.AST.isRefinement(node)) {
+    const result2 = visitNode(node.from, test, visitor, path, depth);
+    if (result2 === 2) {
+      return result2;
+    }
   }
 };
+var findNode = (node, test) => {
+  if (test(node)) {
+    return node;
+  } else if (import_schema2.AST.isTypeLiteral(node)) {
+    for (const prop of import_schema2.AST.getPropertySignatures(node)) {
+      const child = findNode(prop.type, test);
+      if (child) {
+        return child;
+      }
+    }
+  } else if (import_schema2.AST.isTupleType(node)) {
+    for (const [_, element] of node.elements.entries()) {
+      const child = findNode(element.type, test);
+      if (child) {
+        return child;
+      }
+    }
+  } else if (import_schema2.AST.isUnion(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) => {
+    const [name, ...rest] = path2;
+    const typeNode = findNode(node, import_schema2.AST.isTypeLiteral);
+    (0, import_invariant.invariant)(typeNode, void 0, {
+      F: __dxlog_file,
+      L: 214,
+      S: void 0,
+      A: [
+        "typeNode",
+        ""
+      ]
+    });
+    for (const prop of import_schema2.AST.getPropertySignatures(typeNode)) {
+      if (prop.name === name) {
+        if (rest.length) {
+          return getProp(prop.type, rest);
+        } else {
+          return prop.type;
+        }
+      }
+    }
+    return void 0;
+  };
+  return getProp(schema.ast, path.split("."));
+};
+var findAnnotation = (node, annotationId) => {
+  const getAnnotationById = getAnnotation(annotationId);
+  const getBaseAnnotation = (node2) => {
+    const value = getAnnotationById(node2);
+    if (value !== 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;
+        }
+      }
+    }
+  };
+  return getBaseAnnotation(node);
+};
 var ParamKeyAnnotationId = Symbol.for("@dxos/schema/annotation/ParamKey");
 var getParamKeyAnnotation = import_schema3.AST.getAnnotation(ParamKeyAnnotationId);
 var ParamKeyAnnotation = (value) => (self) => self.annotations({
@@ -171,15 +255,19 @@ var UrlParser = class {
 0 && (module.exports = {
   AST,
   JSONSchema,
+  JsonPath,
+  JsonProp,
   ParamKeyAnnotation,
   S,
   UrlParser,
   VisitResult,
+  findAnnotation,
+  findNode,
+  findProperty,
   getAnnotation,
   getParamKeyAnnotation,
-  getProperty,
-  getType,
-  isLeafType,
+  getSimpleType,
+  isSimpleType,
   visit
 });
 //# sourceMappingURL=index.cjs.map