@confect/core 10.2.0 → 10.3.1

package/dist/Types.d.ts

@@ -22,8 +22,19 @@ export interface TypeDefect<Message extends string, T = never> {
 }
 export type IsRecursive<T> = true extends DetectCycle<T> ? true : false;
 type NonRecursiveLeaf = Brand.Brand<any> | GenericId<any> | ArrayBuffer;
-type DetectCycle<T, Cache extends any[] = []> = IsAny<T> extends true ? false : [T] extends [any] ? T extends NonRecursiveLeaf ? false : T extends Cache[number] ? true : T extends Array<infer U> ? DetectCycle<U, [...Cache, T]> : T extends Map<infer _U, infer V> ? DetectCycle<V, [...Cache, T]> : T extends Set<infer U> ? DetectCycle<U, [...Cache, T]> : T extends object ? true extends {
-    [K in keyof T]: DetectCycle<T[K], [...Cache, T]>;
+type IsSame<A, B> = (<G>() => G extends A ? 1 : 2) extends <G>() => (G extends B ? 1 : 2) ? true : false;
+type IsObject<T> = T extends object ? true : false;
+/**
+ * Whether `T` is one of the types already on the path, compared by identity.
+ * Assignability is not enough: a nested struct is assignable to an ancestor
+ * whenever the ancestor's extra fields are optional, and two structs whose
+ * fields are all optional can be assignable to each other in both directions.
+ * `DetectCycle` asks only once `T` is assignable to some type on the path,
+ * which keeps the identity comparisons off the common, non-recursive case.
+ */
+type IsAncestor<T, Ancestors> = Ancestors extends unknown ? IsSame<T, Ancestors> : never;
+type DetectCycle<T, Ancestors = never> = IsAny<T> extends true ? false : [T] extends [any] ? T extends NonRecursiveLeaf ? false : IsObject<T> extends false ? false : (T extends Ancestors ? true extends IsAncestor<T, Ancestors> ? true : false : false) extends true ? true : T extends Array<infer U> ? DetectCycle<U, Ancestors | T> : T extends Map<infer _U, infer V> ? DetectCycle<V, Ancestors | T> : T extends Set<infer U> ? DetectCycle<U, Ancestors | T> : T extends object ? true extends {
+    [K in keyof T]: DetectCycle<T[K], Ancestors | T>;
 }[keyof T] ? true : false : false : never;
 export type UnionToTuple<t> = _unionToTuple<t, []> extends infer result ? conform<result, t[]> : never;
 type _unionToTuple<t, result extends unknown[]> = getLastBranch<t> extends infer current ? [t] extends [never] ? result : _unionToTuple<Exclude<t, current>, [current, ...result]> : never;

package/dist/Types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Types.d.ts","sourceRoot":"","sources":["../src/Types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EACd,sBAAsB,EACtB,qBAAqB,EACrB,gBAAgB,EAChB,qBAAqB,EACtB,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAEpC,MAAM,MAAM,UAAU,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,IACzC,EAAE,SAAS,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,GAAG,KAAK,CAAC;AAEvC,MAAM,MAAM,KAAK,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,IAAI,GAAG,KAAK,CAAC;AAEtD,MAAM,MAAM,OAAO,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,OAAO,GACvD,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GACb,KAAK,GACL,IAAI,GACN,KAAK,CAAC;AAGV,MAAM,MAAM,cAAc,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,GACjD,KAAK,GACL,OAAO,CAAC,EAAE,CAAC,SAAS,IAAI,GACtB,KAAK,GACL,CAAC,EAAE,CAAC,SAAS,CAAC,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,GAC/C,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,GACnB,KAAK,GACL,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,GACnB,KAAK,GACL,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,GACpB,KAAK,GACL,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,GACnB,KAAK,GACL,IAAI,GACZ,KAAK,CAAC;AAEd;;GAEG;AACH,MAAM,MAAM,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,GACzC,KAAK,GACL,OAAO,CAAC,CAAC,CAAC,SAAS,IAAI,GACrB,KAAK,GACL,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GAC/B,MAAM,SAAS,MAAM,CAAC,GACpB,MAAM,CAAC,SAAS,MAAM,GACpB,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,GACzB,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,SAAS,CAAC,GACzB,IAAI,GACJ,KAAK,GACP,KAAK,GACP,KAAK,GACP,KAAK,GACP,KAAK,CAAC;AAEd,MAAM,MAAM,WAAW,CAAC,CAAC,IACvB,KAAK,CAAC,CAAC,CAAC,SAAS,IAAI,GACjB,GAAG,GACH,CAAC,SAAS,gBAAgB,GACxB,CAAC,GACD,CAAC,SAAS,WAAW,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC,GACrC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,GACnC,CAAC,SAAS,WAAW,CAAC,MAAM,CAAC,CAAC,GAC5B,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,GACnB,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,GACvB,CAAC,GACD;IACE,CAAC,UAAU,CAAC,IAAI,MAAM,CAAC,GAAG,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,SAAS,IAAI,GACnD,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,GACrC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CACtB,CAAC;AAEhB,MAAM,WAAW,SAAS,CAAC,OAAO,SAAS,MAAM,EAAE,CAAC,GAAG,KAAK;IAC1D,QAAQ,CAAC,gCAAgC,EAAE,OAAO,CAAC;IACnD,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;CACvB;AAED,MAAM,WAAW,UAAU,CAAC,OAAO,SAAS,MAAM,EAAE,CAAC,GAAG,KAAK;IAC3D,QAAQ,CAAC,iCAAiC,EAAE,OAAO,CAAC;IACpD,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;CACvB;AAED,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI,IAAI,SAAS,WAAW,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,KAAK,CAAC;AAExE,KAAK,gBAAgB,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC;AAExE,KAAK,WAAW,CAAC,CAAC,EAAE,KAAK,SAAS,GAAG,EAAE,GAAG,EAAE,IAC1C,KAAK,CAAC,CAAC,CAAC,SAAS,IAAI,GACjB,KAAK,GACL,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,GACf,CAAC,SAAS,gBAAgB,GACxB,KAAK,GACL,CAAC,SAAS,KAAK,CAAC,MAAM,CAAC,GACrB,IAAI,GACJ,CAAC,SAAS,KAAK,CAAC,MAAM,CAAC,CAAC,GACtB,WAAW,CAAC,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC,GAC7B,CAAC,SAAS,GAAG,CAAC,MAAM,EAAE,EAAE,MAAM,CAAC,CAAC,GAC9B,WAAW,CAAC,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC,GAC7B,CAAC,SAAS,GAAG,CAAC,MAAM,CAAC,CAAC,GACpB,WAAW,CAAC,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC,GAC7B,CAAC,SAAS,MAAM,GACd,IAAI,SAAS;KACV,CAAC,IAAI,MAAM,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC;CACjD,CAAC,MAAM,CAAC,CAAC,GACR,IAAI,GACJ,KAAK,GACP,KAAK,GACjB,KAAK,CAAC;AAQd,MAAM,MAAM,YAAY,CAAC,CAAC,IACxB,aAAa,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC;AAE3E,KAAK,aAAa,CAAC,CAAC,EAAE,MAAM,SAAS,OAAO,EAAE,IAC5C,aAAa,CAAC,CAAC,CAAC,SAAS,MAAM,OAAO,GAClC,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,GACjB,MAAM,GACN,aAAa,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,MAAM,CAAC,CAAC,GAC1D,KAAK,CAAC;AAEZ,KAAK,aAAa,CAAC,CAAC,IAClB,cAAc,CAAC,CAAC,SAAS,OAAO,GAAG,CAAC,CAAC,EAAE,CAAC,KAAK,IAAI,GAAG,KAAK,CAAC,SAAS,CACjE,CAAC,EAAE,MAAM,MAAM,KACZ,IAAI,GACL,MAAM,GACN,KAAK,CAAC;AAEZ,KAAK,cAAc,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,OAAO,GAAG,CAAC,CAAC,EAAE,CAAC,KAAK,IAAI,GAAG,KAAK,CAAC,SAAS,CAC5E,CAAC,EAAE,MAAM,YAAY,KAClB,IAAI,GACL,YAAY,GACZ,KAAK,CAAC;AAEV,KAAK,OAAO,CAAC,CAAC,EAAE,IAAI,IAAI,CAAC,SAAS,IAAI,GAAG,CAAC,GAAG,IAAI,CAAC;AAMlD,MAAM,MAAM,oBAAoB,CAC9B,eAAe,SAAS,gBAAgB,EACxC,KAAK,SAAS,qBAAqB,CAAC,eAAe,CAAC,EACpD,CAAC,SAAS,MAAM,EAAE,IAChB,CAAC,SAAS,SAAS,CAAC,GAAG,MAAM,IAAI,EAAE,GAAG,CAAC,GACvC,IAAI,SAAS,SAAS,MAAM,EAAE,GAC5B;KACG,CAAC,IAAI,MAAM,IAAI,GAAG,sBAAsB,CACvC,cAAc,CAAC,eAAe,EAAE,KAAK,CAAC,EACtC,IAAI,CAAC,CAAC,CAAC,CACR;CACF,GACD,KAAK,GACP,KAAK,CAAC;AAGV,MAAM,MAAM,kBAAkB,CAAC,SAAS,SAAS,gBAAgB,IAAI;IACnE,GAAG,EAAE,qBAAqB,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,CAAC;IAC7C,KAAK,EAAE,qBAAqB,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC;CAClD,CAAC"}
+{"version":3,"file":"Types.d.ts","sourceRoot":"","sources":["../src/Types.ts"],"names":[],"mappings":"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"}

package/dist/Types.js.map

@@ -1 +1 @@
-{"version":3,"file":"Types.js","names":[],"sources":["../src/Types.ts"],"sourcesContent":["import type {\n  DocumentByName,\n  FieldTypeFromFieldPath,\n  GenericDatabaseReader,\n  GenericDataModel,\n  TableNamesInDataModel,\n} from \"convex/server\";\nimport type { GenericId } from \"convex/values\";\nimport type { Brand } from \"effect\";\n\nexport type IsOptional<T, K extends keyof T> =\n  {} extends Pick<T, K> ? true : false;\n\nexport type IsAny<T> = 0 extends 1 & T ? true : false;\n\nexport type IsUnion<T, U extends T = T> = T extends unknown\n  ? [U] extends [T]\n    ? false\n    : true\n  : never;\n\n// https://stackoverflow.com/a/52806744\nexport type IsValueLiteral<Vl> = [Vl] extends [never]\n  ? never\n  : IsUnion<Vl> extends true\n    ? false\n    : [Vl] extends [string | number | bigint | boolean]\n      ? [string] extends [Vl]\n        ? false\n        : [number] extends [Vl]\n          ? false\n          : [boolean] extends [Vl]\n            ? false\n            : [bigint] extends [Vl]\n              ? false\n              : true\n      : false;\n\n/**\n * Only checks for records with string keys.\n */\nexport type IsRecord<T> = [T] extends [never]\n  ? false\n  : IsUnion<T> extends true\n    ? false\n    : T extends Record<string, infer V>\n      ? string extends keyof T\n        ? keyof T extends string\n          ? T extends Record<string, V>\n            ? Record<string, V> extends T\n              ? true\n              : false\n            : false\n          : false\n        : false\n      : false;\n\nexport type DeepMutable<T> =\n  IsAny<T> extends true\n    ? any\n    : T extends NonRecursiveLeaf\n      ? T\n      : T extends ReadonlyMap<infer K, infer V>\n        ? Map<DeepMutable<K>, DeepMutable<V>>\n        : T extends ReadonlySet<infer V>\n          ? Set<DeepMutable<V>>\n          : [keyof T] extends [never]\n            ? T\n            : {\n                -readonly [K in keyof T]: IsOptional<T, K> extends true\n                  ? DeepMutable<Exclude<T[K], undefined>>\n                  : DeepMutable<T[K]>;\n              };\n\nexport interface TypeError<Message extends string, T = never> {\n  readonly \"~@confect/core/Types/TypeError\": Message;\n  readonly \"~value\"?: T;\n}\n\nexport interface TypeDefect<Message extends string, T = never> {\n  readonly \"~@confect/core/Types/TypeDefect\": Message;\n  readonly \"~value\"?: T;\n}\n\nexport type IsRecursive<T> = true extends DetectCycle<T> ? true : false;\n\ntype NonRecursiveLeaf = Brand.Brand<any> | GenericId<any> | ArrayBuffer;\n\ntype DetectCycle<T, Cache extends any[] = []> =\n  IsAny<T> extends true\n    ? false\n    : [T] extends [any]\n      ? T extends NonRecursiveLeaf\n        ? false\n        : T extends Cache[number]\n          ? true\n          : T extends Array<infer U>\n            ? DetectCycle<U, [...Cache, T]>\n            : T extends Map<infer _U, infer V>\n              ? DetectCycle<V, [...Cache, T]>\n              : T extends Set<infer U>\n                ? DetectCycle<U, [...Cache, T]>\n                : T extends object\n                  ? true extends {\n                      [K in keyof T]: DetectCycle<T[K], [...Cache, T]>;\n                    }[keyof T]\n                    ? true\n                    : false\n                  : false\n      : never;\n\n//////////////////////////////////\n// START: Vendored from Arktype //\n//////////////////////////////////\n\n// https://github.com/arktypeio/arktype/blob/2e911d01a741ccee7a17e31ee144049817fabbb8/ark/util/unionToTuple.ts#L9\n\nexport type UnionToTuple<t> =\n  _unionToTuple<t, []> extends infer result ? conform<result, t[]> : never;\n\ntype _unionToTuple<t, result extends unknown[]> =\n  getLastBranch<t> extends infer current\n    ? [t] extends [never]\n      ? result\n      : _unionToTuple<Exclude<t, current>, [current, ...result]>\n    : never;\n\ntype getLastBranch<t> =\n  intersectUnion<t extends unknown ? (x: t) => void : never> extends (\n    x: infer branch,\n  ) => void\n    ? branch\n    : never;\n\ntype intersectUnion<t> = (t extends unknown ? (_: t) => void : never) extends (\n  _: infer intersection,\n) => void\n  ? intersection\n  : never;\n\ntype conform<t, base> = t extends base ? t : base;\n\n////////////////////////////////\n// END: Vendored from Arktype //\n////////////////////////////////\n\nexport type IndexFieldTypesForEq<\n  ConvexDataModel extends GenericDataModel,\n  Table extends TableNamesInDataModel<ConvexDataModel>,\n  T extends string[],\n> = T extends readonly [...infer Rest, any]\n  ? Rest extends readonly string[]\n    ? {\n        [K in keyof Rest]: FieldTypeFromFieldPath<\n          DocumentByName<ConvexDataModel, Table>,\n          Rest[K]\n        >;\n      }\n    : never\n  : never;\n\n// Would prefer to use `BaseDatabaseReader` from the `convex` package, but it's not exported.\nexport type BaseDatabaseReader<DataModel extends GenericDataModel> = {\n  get: GenericDatabaseReader<DataModel>[\"get\"];\n  query: GenericDatabaseReader<DataModel>[\"query\"];\n};\n"],"mappings":""}
+{"version":3,"file":"Types.js","names":[],"sources":["../src/Types.ts"],"sourcesContent":["import type {\n  DocumentByName,\n  FieldTypeFromFieldPath,\n  GenericDatabaseReader,\n  GenericDataModel,\n  TableNamesInDataModel,\n} from \"convex/server\";\nimport type { GenericId } from \"convex/values\";\nimport type { Brand } from \"effect\";\n\nexport type IsOptional<T, K extends keyof T> =\n  {} extends Pick<T, K> ? true : false;\n\nexport type IsAny<T> = 0 extends 1 & T ? true : false;\n\nexport type IsUnion<T, U extends T = T> = T extends unknown\n  ? [U] extends [T]\n    ? false\n    : true\n  : never;\n\n// https://stackoverflow.com/a/52806744\nexport type IsValueLiteral<Vl> = [Vl] extends [never]\n  ? never\n  : IsUnion<Vl> extends true\n    ? false\n    : [Vl] extends [string | number | bigint | boolean]\n      ? [string] extends [Vl]\n        ? false\n        : [number] extends [Vl]\n          ? false\n          : [boolean] extends [Vl]\n            ? false\n            : [bigint] extends [Vl]\n              ? false\n              : true\n      : false;\n\n/**\n * Only checks for records with string keys.\n */\nexport type IsRecord<T> = [T] extends [never]\n  ? false\n  : IsUnion<T> extends true\n    ? false\n    : T extends Record<string, infer V>\n      ? string extends keyof T\n        ? keyof T extends string\n          ? T extends Record<string, V>\n            ? Record<string, V> extends T\n              ? true\n              : false\n            : false\n          : false\n        : false\n      : false;\n\nexport type DeepMutable<T> =\n  IsAny<T> extends true\n    ? any\n    : T extends NonRecursiveLeaf\n      ? T\n      : T extends ReadonlyMap<infer K, infer V>\n        ? Map<DeepMutable<K>, DeepMutable<V>>\n        : T extends ReadonlySet<infer V>\n          ? Set<DeepMutable<V>>\n          : [keyof T] extends [never]\n            ? T\n            : {\n                -readonly [K in keyof T]: IsOptional<T, K> extends true\n                  ? DeepMutable<Exclude<T[K], undefined>>\n                  : DeepMutable<T[K]>;\n              };\n\nexport interface TypeError<Message extends string, T = never> {\n  readonly \"~@confect/core/Types/TypeError\": Message;\n  readonly \"~value\"?: T;\n}\n\nexport interface TypeDefect<Message extends string, T = never> {\n  readonly \"~@confect/core/Types/TypeDefect\": Message;\n  readonly \"~value\"?: T;\n}\n\nexport type IsRecursive<T> = true extends DetectCycle<T> ? true : false;\n\ntype NonRecursiveLeaf = Brand.Brand<any> | GenericId<any> | ArrayBuffer;\n\ntype IsSame<A, B> =\n  (<G>() => G extends A ? 1 : 2) extends <G>() => G extends B ? 1 : 2\n    ? true\n    : false;\n\ntype IsObject<T> = T extends object ? true : false;\n\n/**\n * Whether `T` is one of the types already on the path, compared by identity.\n * Assignability is not enough: a nested struct is assignable to an ancestor\n * whenever the ancestor's extra fields are optional, and two structs whose\n * fields are all optional can be assignable to each other in both directions.\n * `DetectCycle` asks only once `T` is assignable to some type on the path,\n * which keeps the identity comparisons off the common, non-recursive case.\n */\ntype IsAncestor<T, Ancestors> = Ancestors extends unknown\n  ? IsSame<T, Ancestors>\n  : never;\n\ntype DetectCycle<T, Ancestors = never> =\n  IsAny<T> extends true\n    ? false\n    : [T] extends [any]\n      ? T extends NonRecursiveLeaf\n        ? false\n        : IsObject<T> extends false\n          ? false\n          : (\n                T extends Ancestors\n                  ? true extends IsAncestor<T, Ancestors>\n                    ? true\n                    : false\n                  : false\n              ) extends true\n            ? true\n            : T extends Array<infer U>\n              ? DetectCycle<U, Ancestors | T>\n              : T extends Map<infer _U, infer V>\n                ? DetectCycle<V, Ancestors | T>\n                : T extends Set<infer U>\n                  ? DetectCycle<U, Ancestors | T>\n                  : T extends object\n                    ? true extends {\n                        [K in keyof T]: DetectCycle<T[K], Ancestors | T>;\n                      }[keyof T]\n                      ? true\n                      : false\n                    : false\n      : never;\n\n//////////////////////////////////\n// START: Vendored from Arktype //\n//////////////////////////////////\n\n// https://github.com/arktypeio/arktype/blob/2e911d01a741ccee7a17e31ee144049817fabbb8/ark/util/unionToTuple.ts#L9\n\nexport type UnionToTuple<t> =\n  _unionToTuple<t, []> extends infer result ? conform<result, t[]> : never;\n\ntype _unionToTuple<t, result extends unknown[]> =\n  getLastBranch<t> extends infer current\n    ? [t] extends [never]\n      ? result\n      : _unionToTuple<Exclude<t, current>, [current, ...result]>\n    : never;\n\ntype getLastBranch<t> =\n  intersectUnion<t extends unknown ? (x: t) => void : never> extends (\n    x: infer branch,\n  ) => void\n    ? branch\n    : never;\n\ntype intersectUnion<t> = (t extends unknown ? (_: t) => void : never) extends (\n  _: infer intersection,\n) => void\n  ? intersection\n  : never;\n\ntype conform<t, base> = t extends base ? t : base;\n\n////////////////////////////////\n// END: Vendored from Arktype //\n////////////////////////////////\n\nexport type IndexFieldTypesForEq<\n  ConvexDataModel extends GenericDataModel,\n  Table extends TableNamesInDataModel<ConvexDataModel>,\n  T extends string[],\n> = T extends readonly [...infer Rest, any]\n  ? Rest extends readonly string[]\n    ? {\n        [K in keyof Rest]: FieldTypeFromFieldPath<\n          DocumentByName<ConvexDataModel, Table>,\n          Rest[K]\n        >;\n      }\n    : never\n  : never;\n\n// Would prefer to use `BaseDatabaseReader` from the `convex` package, but it's not exported.\nexport type BaseDatabaseReader<DataModel extends GenericDataModel> = {\n  get: GenericDatabaseReader<DataModel>[\"get\"];\n  query: GenericDatabaseReader<DataModel>[\"query\"];\n};\n"],"mappings":""}

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@confect/core",
   "description": "Shared specs and schemas used by all Confect packages",
-  "version": "10.2.0",
+  "version": "10.3.1",
   "author": "RJ Dellecese",
   "bugs": {
     "url": "https://github.com/rjdellecese/confect/issues"
   },
   "devDependencies": {
-    "@effect/vitest": "4.0.1",
-    "@types/node": "26.6.4",
+    "@effect/vitest": "4.0.4",
+    "@types/node": "26.6.5",
     "confect-bench-harness": "0.0.0",
-    "effect": "4.0.1",
-    "tsdown": "0.23.0",
+    "effect": "4.0.4",
+    "tsdown": "0.23.1",
     "tsx": "4.23.15",
     "typescript": "7.0.2",
     "unrun": "0.3.1",
@@ -61,7 +61,7 @@
   "type": "module",
   "types": "./dist/index.d.ts",
   "scripts": {
-    "bench": "tsx test/Refs.bench.ts",
+    "bench": "tsx test/Refs.bench.ts && tsx test/Types.bench.ts",
     "clean": "shx rm -rf dist coverage node_modules",
     "dev": "tsdown --watch --no-clean --config-loader unrun",
     "test": "vitest run",

package/src/GroupSpec.ts

@@ -55,21 +55,6 @@ export interface GroupSpec<
     MiddlewareSpecs_
   >;
 
-  addGroup<Group extends AnyWithProps>(
-    group: Group,
-  ): GroupSpec<Runtime, Name_, Functions_, Groups_ | Group, MiddlewareSpecs_>;
-
-  addGroupAt<const AtName extends string, Group extends AnyWithProps>(
-    name: AtName,
-    group: Group,
-  ): GroupSpec<
-    Runtime,
-    Name_,
-    Functions_,
-    Groups_ | NamedAt<Group, AtName>,
-    MiddlewareSpecs_
-  >;
-
   middleware<MiddlewareSpec_ extends MiddlewareSpec.AnyMiddlewareSpec>(
     middlewareSpec: MiddlewareSpec_ &
       MiddlewareSpec.ValidateAttach<
@@ -99,16 +84,6 @@ export interface AnyWithProps extends GroupSpec<
   MiddlewareSpec.AnyMiddlewareSpec
 > {}
 
-export interface AnyWithPropsWithRuntime<
-  Runtime extends RuntimeAndFunctionType.Runtime,
-> extends GroupSpec<
-  Runtime,
-  string,
-  FunctionSpec.AnyWithPropsWithRuntime<Runtime>,
-  AnyWithPropsWithRuntime<Runtime>,
-  MiddlewareSpec.AnyMiddlewareSpec
-> {}
-
 export type Name<Group extends AnyWithProps> = Group["name"];
 
 export type Functions<Group extends AnyWithProps> = Group["~Functions"];
@@ -146,16 +121,16 @@ export type AddGroups<
 > =
   Group extends GroupSpec<
     infer Runtime,
-    infer Name_,
+    string,
     infer Functions_,
     infer Groups_,
     infer MiddlewareSpecs_
   >
     ? GroupSpec<
         Runtime,
-        Name_,
+        Group["name"],
         Functions_,
-        Groups_ | ExtraGroups,
+        Exclude<Groups_, { readonly name: Name<ExtraGroups> }> | ExtraGroups,
         MiddlewareSpecs_
       >
     : never;
@@ -196,32 +171,6 @@ const Proto = {
     });
   },
 
-  addGroup<Group extends Any>(this: Any, group: Group) {
-    const this_ = this as AnyWithProps;
-    const group_ = group as unknown as AnyWithProps;
-
-    return makeProto({
-      runtime: this_.runtime,
-      name: this_.name,
-      functions: this_.functions,
-      groups: Record.set(this_.groups, group_.name, group_),
-      middlewareAttachments: this_.middlewareAttachments,
-    });
-  },
-
-  addGroupAt<Group extends Any>(this: Any, name: string, group: Group) {
-    const this_ = this as AnyWithProps;
-    const group_ = group as unknown as AnyWithProps;
-
-    return makeProto({
-      runtime: this_.runtime,
-      name: this_.name,
-      functions: this_.functions,
-      groups: Record.set(this_.groups, name, withName(name, group_)),
-      middlewareAttachments: this_.middlewareAttachments,
-    });
-  },
-
   middleware<MiddlewareSpec_ extends MiddlewareSpec.AnyMiddlewareSpec>(
     this: Any,
     middlewareSpec: MiddlewareSpec_,
@@ -270,7 +219,7 @@ const makeProto = <
   Runtime extends RuntimeAndFunctionType.Runtime,
   Name_ extends string,
   Functions_ extends FunctionSpec.AnyWithPropsWithRuntime<Runtime>,
-  Groups_ extends AnyWithPropsWithRuntime<Runtime>,
+  Groups_ extends AnyWithProps,
   MiddlewareAttachments_ extends
     ReadonlyArray<MiddlewareAttachment.MiddlewareAttachment>,
 >({
@@ -315,20 +264,6 @@ export const make = (): GroupSpec<"Convex", ""> =>
     middlewareAttachments: [],
   });
 
-export const makeAt = <const Name_ extends string>(
-  name: Name_,
-): GroupSpec<"Convex", Name_> => {
-  validateConfectFunctionIdentifier(name);
-
-  return makeProto({
-    runtime: "Convex",
-    name,
-    functions: Record.empty(),
-    groups: Record.empty(),
-    middlewareAttachments: [],
-  });
-};
-
 export const makeNode = (): GroupSpec<"Node", ""> =>
   makeProto({
     runtime: "Node",
@@ -338,20 +273,6 @@ export const makeNode = (): GroupSpec<"Node", ""> =>
     middlewareAttachments: [],
   });
 
-export const makeNodeAt = <const Name_ extends string>(
-  name: Name_,
-): GroupSpec<"Node", Name_> => {
-  validateConfectFunctionIdentifier(name);
-
-  return makeProto({
-    runtime: "Node",
-    name,
-    functions: Record.empty(),
-    groups: Record.empty(),
-    middlewareAttachments: [],
-  });
-};
-
 export function withName<const Name_ extends string, Group extends Any>(
   name: Name_,
   group: Group,
@@ -373,6 +294,22 @@ export function withName(name: string, group: Any): AnyWithProps {
   });
 }
 
+export const addGroupsAt = (
+  group: AnyWithProps,
+  children: Record.ReadonlyRecord<string, AnyWithProps>,
+): AnyWithProps =>
+  makeProto({
+    runtime: group.runtime,
+    name: group.name,
+    functions: group.functions,
+    groups: Record.union(
+      group.groups,
+      Record.map(children, (child, name) => withName(name, child)),
+      (_existing, incoming) => incoming,
+    ),
+    middlewareAttachments: group.middlewareAttachments,
+  });
+
 export const validateMiddleware = (
   group: AnyWithProps,
 ): Result.Result<void, MiddlewareAttachment.ValidationError> =>

package/src/SchemaToValidator.ts

@@ -11,7 +11,6 @@ import type {
   VLiteral,
   VNull,
   VObject,
-  VOptional,
   VRecord,
   VString,
   VUnion,
@@ -130,123 +129,135 @@ export type ValueToValidator<Vl> = [Vl] extends [never]
   ? never
   : IsAny<Vl> extends true
     ? VAny
+    : [Vl] extends [string | number | bigint | boolean | null | ArrayBuffer]
+      ? ConvertValueToValidator<Vl>
+      : IsRecursive<Vl> extends true
+        ? VAny
+        : [Vl] extends [ReadonlyValue]
+          ? ConvertValueToValidator<Vl>
+          : TypeError<"Provided value is not a valid Convex value", Vl>;
+
+type OptionalValue<Vl, Optionality> = Optionality extends "optional"
+  ? Vl | undefined
+  : Vl;
+
+type ConvertValueToValidator<
+  Vl,
+  Optionality extends "required" | "optional" = "required",
+> = [Vl] extends [never]
+  ? never
+  : IsAny<Vl> extends true
+    ? VAny<any, Optionality>
     : [Vl] extends [null]
-      ? VNull
+      ? VNull<OptionalValue<null, Optionality>, Optionality>
       : [Vl] extends [boolean]
         ? [boolean] extends [Vl]
-          ? VBoolean
-          : VLiteral<Vl>
+          ? VBoolean<OptionalValue<boolean, Optionality>, Optionality>
+          : VLiteral<OptionalValue<Vl, Optionality>, Optionality>
         : IsUnion<Vl> extends true
-          ? IsRecursive<Vl> extends true
-            ? VAny
-            : [Vl] extends [ReadonlyValue]
-              ? UnionValueToValidator<Vl>
-              : TypeError<"Provided value is not a valid Convex value", Vl>
+          ? UnionValueToValidator<Vl, Optionality>
           : [Vl] extends [number]
             ? [number] extends [Vl]
-              ? VFloat64
-              : VLiteral<Vl>
+              ? VFloat64<OptionalValue<number, Optionality>, Optionality>
+              : VLiteral<OptionalValue<Vl, Optionality>, Optionality>
             : [Vl] extends [bigint]
               ? [bigint] extends [Vl]
-                ? VInt64
-                : VLiteral<Vl>
+                ? VInt64<OptionalValue<bigint, Optionality>, Optionality>
+                : VLiteral<OptionalValue<Vl, Optionality>, Optionality>
               : [Vl] extends [string]
-                ? Vl extends {
-                    __tableName: infer TableName extends string;
-                  }
-                  ? VId<GenericId.GenericId<TableName>>
-                  : [string] extends [Vl]
-                    ? VString
-                    : VLiteral<Vl>
+                ? StringValueToValidator<Vl, Optionality>
                 : [Vl] extends [ArrayBuffer]
-                  ? VBytes
+                  ? VBytes<OptionalValue<ArrayBuffer, Optionality>, Optionality>
                   : IsRecursive<Vl> extends true
-                    ? VAny
-                    : [Vl] extends [ReadonlyValue]
-                      ? Vl extends ReadonlyArray<ReadonlyValue>
-                        ? ArrayValueToValidator<Vl>
-                        : Vl extends ReadonlyRecordValue
-                          ? RecordValueToValidator<Vl>
-                          : TypeError<"Unexpected value", Vl>
-                      : TypeError<
-                          "Provided value is not a valid Convex value",
-                          Vl
-                        >;
-
-type ArrayValueToValidator<Vl extends ReadonlyArray<ReadonlyValue>> =
-  Vl extends ReadonlyArray<infer El extends ReadonlyValue>
-    ? ValueToValidator<El> extends infer Vd extends Validator<any, any, any>
-      ? VArray<MutableValue<El[]>, Vd>
+                    ? VAny<any, Optionality>
+                    : Vl extends ReadonlyArray<infer El>
+                      ? VArray<
+                          OptionalValue<MutableValue<El[]>, Optionality>,
+                          ConvertValueToValidator<El>,
+                          Optionality
+                        >
+                      : Vl extends object
+                        ? ObjectValueToValidator<Vl, Optionality>
+                        : never;
+
+type StringValueToValidator<
+  Vl,
+  Optionality extends "required" | "optional",
+> = Vl extends { __tableName: infer TableName extends string }
+  ? VId<OptionalValue<GenericId.GenericId<TableName>, Optionality>, Optionality>
+  : [string] extends [Vl]
+    ? VString<OptionalValue<string, Optionality>, Optionality>
+    : VLiteral<OptionalValue<Vl, Optionality>, Optionality>;
+
+type ObjectValueToValidator<Vl, Optionality extends "required" | "optional"> =
+  IsRecord<MutableValue<Vl>> extends true
+    ? ValueToValidator<Vl[keyof Vl]> extends infer VdValue extends Validator<
+        any,
+        "required",
+        any
+      >
+      ? VRecord<
+          OptionalValue<MutableValue<Vl>, Optionality>,
+          VString,
+          VdValue,
+          Optionality
+        >
       : never
-    : never;
+    : ObjectFieldsToValidators<Vl> extends infer VdFields extends Record<
+          string,
+          any
+        >
+      ? VObject<
+          OptionalValue<MutableValue<Vl>, Optionality>,
+          VdFields,
+          Optionality
+        >
+      : never;
 
-type RecordValueToValidator<Vl> = Vl extends ReadonlyRecordValue
-  ? {
-      -readonly [K in keyof Vl]-?: IsAny<Vl[K]> extends true
-        ? IsOptional<Vl, K> extends true
-          ? VOptional<VAny>
-          : VAny
-        : UndefinedOrValueToValidator<Vl[K]>;
-    } extends infer VdRecord extends Record<string, any>
-    ? MutableValue<Vl> extends infer VlRecord extends Record<string, any>
-      ? IsRecord<VlRecord> extends true
-        ? VRecord<VlRecord, VString, VdRecord[keyof VdRecord]>
-        : VObject<VlRecord, VdRecord>
-      : never
-    : never
-  : never;
+type ObjectFieldsToValidators<Vl> = {
+  -readonly [K in keyof Vl]-?: IsAny<Vl[K]> extends true
+    ? IsOptional<Vl, K> extends true
+      ? VAny<any, "optional">
+      : VAny
+    : undefined extends Vl[K]
+      ? OptionalValueToValidator<Vl[K]>
+      : [Vl[K]] extends [ReadonlyValue]
+        ? ConvertValueToValidator<Vl[K]>
+        : never;
+};
 
 export type UndefinedOrValueToValidator<Vl extends ReadonlyValue | undefined> =
   undefined extends Vl
-    ? [Vl] extends [(infer Val extends ReadonlyValue) | undefined]
-      ? ValueToValidator<Val> extends infer Vd extends Validator<
-          any,
-          "required",
-          any
-        >
-        ? VOptional<Vd>
-        : never
-      : never
+    ? OptionalValueToValidator<Vl>
     : [Vl] extends [ReadonlyValue]
       ? ValueToValidator<Vl>
       : never;
 
-type UnionValueToValidator<Vl extends ReadonlyValue> = [Vl] extends [
-  ReadonlyValue,
+type UnionValueToValidator<Vl, Optionality extends "required" | "optional"> =
+  IsRecursive<Vl> extends true
+    ? VAny<any, Optionality>
+    : VUnion<
+        OptionalValue<MutableValue<Vl>, Optionality>,
+        ValueTupleToValidatorTuple<UnionToTuple<Vl>>,
+        Optionality
+      >;
+
+type ValueTupleToValidatorTuple<
+  VlTuple extends readonly unknown[],
+  Acc extends Validator<any, "required", any>[] = [],
+> = VlTuple extends
+  | [true, false, ...infer VlRest]
+  | [false, true, ...infer VlRest]
+  ? ValueTupleToValidatorTuple<VlRest, [...Acc, VBoolean]>
+  : VlTuple extends [infer Vl, ...infer VlRest]
+    ? ValueTupleToValidatorTuple<VlRest, [...Acc, ConvertValueToValidator<Vl>]>
+    : Acc;
+
+type OptionalValueToValidator<Vl> = [Vl] extends [
+  (infer Val extends ReadonlyValue) | undefined,
 ]
-  ? IsUnion<Vl> extends true
-    ? UnionToTuple<Vl> extends infer VlTuple extends
-        ReadonlyArray<ReadonlyValue>
-      ? ValueTupleToValidatorTuple<VlTuple> extends infer VdTuple extends
-          Validator<any, "required", any>[]
-        ? VUnion<MutableValue<Vl>, VdTuple>
-        : TypeError<"Failed to convert value tuple to validator tuple">
-      : TypeError<"Failed to convert union to tuple">
-    : TypeError<"Expected a union of values, but got a single value instead">
-  : TypeError<"Provided value is not a valid Convex value">;
-
-type ValueTupleToValidatorTuple<VlTuple extends ReadonlyArray<ReadonlyValue>> =
-  VlTuple extends
-    | [true, false, ...infer VlRest extends ReadonlyArray<ReadonlyValue>]
-    | [false, true, ...infer VlRest extends ReadonlyArray<ReadonlyValue>]
-    ? ValueTupleToValidatorTuple<VlRest> extends infer VdRest extends Validator<
-        any,
-        any,
-        any
-      >[]
-      ? [VBoolean<boolean>, ...VdRest]
-      : never
-    : VlTuple extends [
-          infer Vl extends ReadonlyValue,
-          ...infer VlRest extends ReadonlyArray<ReadonlyValue>,
-        ]
-      ? ValueToValidator<Vl> extends infer Vd extends Validator<any, any, any>
-        ? ValueTupleToValidatorTuple<VlRest> extends infer VdRest extends
-            Validator<any, "required", any>[]
-          ? [Vd, ...VdRest]
-          : never
-        : never
-      : [];
+  ? ConvertValueToValidator<Val, "optional">
+  : never;
 
 export const compileSchema = <T, E>(
   schema: Schema.Codec<T, E>,

package/src/Spec.ts

@@ -1,6 +1,5 @@
 import * as Predicate from "effect/Predicate";
 import * as Record from "effect/Record";
-import * as Struct from "effect/Struct";
 import * as GroupSpec from "./GroupSpec";
 
 export const TypeId = "~@confect/core/Spec";
@@ -20,22 +19,6 @@ export interface Spec<
   Groups_ extends Record.ReadonlyRecord<string, GroupSpec.AnyWithProps> = {},
 > {
   readonly [TypeId]: Readonly<Groups_>;
-
-  add<Group extends GroupSpec.AnyWithProps>(
-    group: Group,
-  ): Spec<
-    Struct.Assign<Groups_, Record.ReadonlyRecord<GroupSpec.Name<Group>, Group>>
-  >;
-
-  addAt<const Name extends string, Group extends GroupSpec.AnyWithProps>(
-    name: Name,
-    group: Group,
-  ): Spec<
-    Struct.Assign<
-      Groups_,
-      Record.ReadonlyRecord<Name, GroupSpec.NamedAt<Group, Name>>
-    >
-  >;
 }
 
 export interface Any {
@@ -56,31 +39,10 @@ export const groups = <Spec_ extends AnyWithProps>(
   self: Spec_,
 ): Spec_[TypeId] => self[TypeId];
 
-const makeRecord = <
-  Groups_ extends Record.ReadonlyRecord<string, GroupSpec.AnyWithProps>,
->(
-  record: Groups_,
-): Spec<Groups_> => ({
-  [TypeId]: record,
-  add<Group extends GroupSpec.AnyWithProps>(group: Group) {
-    return makeRecord(
-      Struct.assign(
-        record,
-        Record.singleton<GroupSpec.Name<Group>, Group>(group.name, group),
-      ),
-    );
-  },
-  addAt<const Name extends string, Group extends GroupSpec.AnyWithProps>(
-    name: Name,
-    group: Group,
-  ) {
-    return makeRecord(
-      Struct.assign(
-        record,
-        Record.singleton(name, GroupSpec.withName(name, group)),
-      ),
-    );
-  },
+export const fromGroups = (
+  record: Record.ReadonlyRecord<string, GroupSpec.AnyWithProps>,
+): AnyWithProps => ({
+  [TypeId]: Record.map(record, (group, name) =>
+    GroupSpec.withName(name, group),
+  ),
 });
-
-export const make = (): Spec => makeRecord({});

package/src/Types.ts

@@ -86,27 +86,54 @@ export type IsRecursive<T> = true extends DetectCycle<T> ? true : false;
 
 type NonRecursiveLeaf = Brand.Brand<any> | GenericId<any> | ArrayBuffer;
 
-type DetectCycle<T, Cache extends any[] = []> =
+type IsSame<A, B> =
+  (<G>() => G extends A ? 1 : 2) extends <G>() => G extends B ? 1 : 2
+    ? true
+    : false;
+
+type IsObject<T> = T extends object ? true : false;
+
+/**
+ * Whether `T` is one of the types already on the path, compared by identity.
+ * Assignability is not enough: a nested struct is assignable to an ancestor
+ * whenever the ancestor's extra fields are optional, and two structs whose
+ * fields are all optional can be assignable to each other in both directions.
+ * `DetectCycle` asks only once `T` is assignable to some type on the path,
+ * which keeps the identity comparisons off the common, non-recursive case.
+ */
+type IsAncestor<T, Ancestors> = Ancestors extends unknown
+  ? IsSame<T, Ancestors>
+  : never;
+
+type DetectCycle<T, Ancestors = never> =
   IsAny<T> extends true
     ? false
     : [T] extends [any]
       ? T extends NonRecursiveLeaf
         ? false
-        : T extends Cache[number]
-          ? true
-          : T extends Array<infer U>
-            ? DetectCycle<U, [...Cache, T]>
-            : T extends Map<infer _U, infer V>
-              ? DetectCycle<V, [...Cache, T]>
-              : T extends Set<infer U>
-                ? DetectCycle<U, [...Cache, T]>
-                : T extends object
-                  ? true extends {
-                      [K in keyof T]: DetectCycle<T[K], [...Cache, T]>;
-                    }[keyof T]
+        : IsObject<T> extends false
+          ? false
+          : (
+                T extends Ancestors
+                  ? true extends IsAncestor<T, Ancestors>
                     ? true
                     : false
                   : false
+              ) extends true
+            ? true
+            : T extends Array<infer U>
+              ? DetectCycle<U, Ancestors | T>
+              : T extends Map<infer _U, infer V>
+                ? DetectCycle<V, Ancestors | T>
+                : T extends Set<infer U>
+                  ? DetectCycle<U, Ancestors | T>
+                  : T extends object
+                    ? true extends {
+                        [K in keyof T]: DetectCycle<T[K], Ancestors | T>;
+                      }[keyof T]
+                      ? true
+                      : false
+                    : false
       : never;
 
 //////////////////////////////////