surreal-zod 0.0.0-alpha.12 → 0.0.0-alpha.14

package/src/zod/schema.ts

@@ -12,7 +12,6 @@ import {
 } from "surrealdb";
 import * as core from "zod/v4/core";
 import * as classic from "zod/v4";
-import {} from "zod/v4/core";
 import {
   inferSurrealType,
   inlineQueryParameters,
@@ -345,7 +344,7 @@ type UnwrapField<T> =
     : T;
 
 export interface ZodSurrealField<
-  T extends ZodSurrealType = ZodSurrealType,
+  T extends _core_.$ZodSurrealType = _core_.$ZodSurrealType,
   O = core.output<T>,
   I = core.input<T>,
   DBO = _core_.dboutput<T>,
@@ -356,6 +355,7 @@ export interface ZodSurrealField<
       I,
       DBO,
       DBI,
+        | ""
         | "$default"
         | "$prefault"
         | "$defaultAlways"
@@ -371,10 +371,17 @@ export interface ZodSurrealField<
               : {
                   dboptout?: "optional" | undefined;
                 })
-        : ZodSurrealFieldInternals<O, I, DBO, DBI> & {
-            dboptin: T["_zod"]["optin"];
-            dboptout: T["_zod"]["optout"];
-          }
+        : ZodSurrealFieldInternals<O, I, DBO, DBI> &
+            (T["_zod"] extends { optin?: any }
+              ? {
+                  dboptin?: T["_zod"]["optin"];
+                }
+              : { dboptin: T["_zod"]["optin"] }) &
+            (T["_zod"] extends { optout?: any }
+              ? {
+                  dboptout?: T["_zod"]["optout"];
+                }
+              : { dboptout: T["_zod"]["optout"] })
     >,
     ZodSurrealFieldMethods<Options> {
   // parsing/encoding/decoding
@@ -4843,7 +4850,7 @@ export interface ZodSurrealFunction<
 > extends _ZodSurrealType<ZodSurrealFunctionInternals<Args, Returns>>,
     ZodSurrealFieldMethods {
   "~standard": core.ZodStandardSchemaWithJSON<this>;
-  _def: _core_.ZodSurrealFunctionDef<Args, Returns>;
+  _def: ZodSurrealFunctionDef<Args, Returns>;
   _input: _core_.$InferInnerFunctionType<Args, Returns>;
   _output: _core_.$InferOuterFunctionType<Args, Returns>;
   _dbinput: _core_.$InferInnerFunctionDbType<Args, Returns>;
@@ -5219,7 +5226,12 @@ export function preprocess<A, U extends _core_.$SomeSurrealType, B = unknown>(
 //////////////////////////////////////////////////
 //////////////////////////////////////////////////
 
-export type ZodSurrealRecordIdValue = ZodSurrealType<RecordIdValue, unknown>;
+export type ZodSurrealRecordIdValue = _core_.$ZodSurrealType<
+  RecordIdValue | undefined,
+  unknown,
+  RecordIdValue,
+  unknown
+>;
 
 export type inferRecordIdValue<Id extends ZodSurrealRecordIdValue> =
   Id extends {
@@ -5258,10 +5270,10 @@ export interface ZodSurrealRecordIdInternals<
   Extras extends ZodSurrealRecordIdExtras = {},
 > extends ZodSurrealTypeInternals<
     // O
-    | RecordId<Table, core.output<Id>>
+    | RecordId<Table, Exclude<core.output<Id>, undefined>>
     | (Extras extends { output: infer Output } ? Output : never),
     // I
-    | RecordId<Table, core.output<Id>>
+    | RecordId<Table, Exclude<core.output<Id>, undefined>>
     | StringRecordId
     | (Extras extends { input: infer Input } ? Input : never),
     // DBO
@@ -5275,984 +5287,460 @@ export interface ZodSurrealRecordIdInternals<
   def: ZodSurrealRecordIdDef<Table, Id>;
 }
 
-type ZodSurrealRecordIdTrait<
+type AnyTableRecordIdTrait<
   Tb extends string,
   Id extends ZodSurrealRecordIdValue,
-  Extras extends ZodSurrealRecordIdExtras = {},
-> = string extends Tb
-  ? // Any Table:
-    ZodSurrealRecordIdValue extends Id
-    ? // Any Table + Any Value:
-      {
-        // Clone - Split Parameters
-        parse<
-          OverrideTb extends string = Tb,
-          OverrideId extends RecordIdValue = core.output<Id>,
-        >(
-          data: unknown,
-          params?: ParseDbContext,
-        ): RecordId<OverrideTb, OverrideId>;
-        parseAsync<
-          OverrideTb extends string = Tb,
-          OverrideId extends RecordIdValue = core.output<Id>,
-        >(
-          data: unknown,
-          params?: ParseDbContext,
-        ): Promise<RecordId<OverrideTb, OverrideId>>;
-        safeParse<
-          OverrideTb extends string = Tb,
-          OverrideId extends RecordIdValue = core.output<Id>,
-        >(
-          data: unknown,
-          params?: ParseDbContext,
-        ): classic.ZodSafeParseResult<RecordId<OverrideTb, OverrideId>>;
-        safeParseAsync<
-          OverrideTb extends string = Tb,
-          OverrideId extends RecordIdValue = core.output<Id>,
-        >(
-          data: unknown,
-          params?: ParseDbContext,
-        ): Promise<
-          classic.ZodSafeParseResult<RecordId<OverrideTb, OverrideId>>
-        >;
-        decode<
-          OverrideTb extends string = Tb,
-          OverrideId extends RecordIdValue = core.output<Id>,
-        >(
-          id:
-            | RecordId<NoInfer<OverrideTb>, NoInfer<OverrideId>>
-            | StringRecordId,
-          params?: ParseDbContext,
-        ): RecordId<OverrideTb, OverrideId>;
-        decodeAsync<
-          OverrideTb extends string = Tb,
-          OverrideId extends RecordIdValue = core.output<Id>,
-        >(
-          id:
-            | RecordId<NoInfer<OverrideTb>, NoInfer<OverrideId>>
-            | StringRecordId,
-          params?: ParseDbContext,
-        ): Promise<RecordId<OverrideTb, OverrideId>>;
-        safeDecode<
-          OverrideTb extends string = Tb,
-          OverrideId extends RecordIdValue = core.output<Id>,
-        >(
-          id:
-            | RecordId<NoInfer<OverrideTb>, NoInfer<OverrideId>>
-            | StringRecordId,
-          params?: ParseDbContext,
-        ): classic.ZodSafeParseResult<RecordId<OverrideTb, OverrideId>>;
-        safeDecodeAsync<
-          OverrideTb extends string = Tb,
-          OverrideId extends RecordIdValue = core.output<Id>,
-        >(
-          id:
-            | RecordId<NoInfer<OverrideTb>, NoInfer<OverrideId>>
-            | StringRecordId,
-          params?: ParseDbContext,
-        ): Promise<
-          classic.ZodSafeParseResult<RecordId<OverrideTb, OverrideId>>
-        >;
-
-        // From Parts - Split Parameters
-        fromParts<
-          OverrideTb extends string = Tb,
-          OverrideId extends RecordIdValue = core.output<Id>,
-        >(
-          table: NoInfer<OverrideTb>,
-          id: NoInfer<OverrideId>,
-          params?: ParseDbContext,
-        ): RecordId<OverrideTb, OverrideId>;
-        fromPartsAsync<
-          OverrideTb extends string = Tb,
-          OverrideId extends RecordIdValue = core.output<Id>,
-        >(
-          table: NoInfer<OverrideTb>,
-          id: NoInfer<OverrideId>,
-          params?: ParseDbContext,
-        ): Promise<RecordId<OverrideTb, OverrideId>>;
-        safeFromParts<
-          OverrideTb extends string = Tb,
-          OverrideId extends RecordIdValue = core.output<Id>,
-        >(
-          table: NoInfer<OverrideTb>,
-          id: NoInfer<OverrideId>,
-          params?: ParseDbContext,
-        ): classic.ZodSafeParseResult<RecordId<OverrideTb, OverrideId>>;
-        safeFromPartsAsync<
-          OverrideTb extends string = Tb,
-          OverrideId extends RecordIdValue = core.output<Id>,
-        >(
-          table: NoInfer<OverrideTb>,
-          id: NoInfer<OverrideId>,
-          params?: ParseDbContext,
-        ): Promise<
-          classic.ZodSafeParseResult<RecordId<OverrideTb, OverrideId>>
-        >;
+> = {
+  parse<Ctx extends ParseDbContext>(
+    data: unknown,
+    params?: Ctx,
+  ): RecordId<
+    Tb,
+    Ctx extends { db: any }
+      ? _core_.dboutput<Id>
+      : Exclude<core.output<Id>, undefined>
+  >;
+  parseAsync<Ctx extends ParseDbContext>(
+    data: unknown,
+    params?: Ctx,
+  ): Promise<
+    RecordId<
+      Tb,
+      Ctx extends { db: any }
+        ? _core_.dboutput<Id>
+        : Exclude<core.output<Id>, undefined>
+    >
+  >;
+  safeParse<Ctx extends ParseDbContext>(
+    data: unknown,
+    params?: Ctx,
+  ): classic.ZodSafeParseResult<
+    RecordId<
+      Tb,
+      Ctx extends { db: any }
+        ? _core_.dboutput<Id>
+        : Exclude<core.output<Id>, undefined>
+    >
+  >;
+  safeParseAsync<Ctx extends ParseDbContext>(
+    data: unknown,
+    params?: Ctx,
+  ): Promise<
+    classic.ZodSafeParseResult<
+      RecordId<
+        Tb,
+        Ctx extends { db: any }
+          ? _core_.dboutput<Id>
+          : Exclude<core.output<Id>, undefined>
+      >
+    >
+  >;
+  decode<Ctx extends ParseDbContext>(
+    id: RecordId<Tb, Exclude<core.output<Id>, undefined>> | StringRecordId,
+    params?: Ctx,
+  ): RecordId<
+    Tb,
+    Ctx extends { db: any }
+      ? _core_.dboutput<Id>
+      : Exclude<core.output<Id>, undefined>
+  >;
+  decodeAsync<Ctx extends ParseDbContext>(
+    id: RecordId<Tb, Exclude<core.output<Id>, undefined>> | StringRecordId,
+    params?: Ctx,
+  ): Promise<
+    RecordId<
+      Tb,
+      Ctx extends { db: any }
+        ? _core_.dboutput<Id>
+        : Exclude<core.output<Id>, undefined>
+    >
+  >;
+  safeDecode<Ctx extends ParseDbContext>(
+    id: RecordId<Tb, Exclude<core.output<Id>, undefined>> | StringRecordId,
+    params?: Ctx,
+  ): classic.ZodSafeParseResult<
+    RecordId<
+      Tb,
+      Ctx extends { db: any }
+        ? _core_.dboutput<Id>
+        : Exclude<core.output<Id>, undefined>
+    >
+  >;
+  safeDecodeAsync<Ctx extends ParseDbContext>(
+    id: RecordId<Tb, Exclude<core.output<Id>, undefined>> | StringRecordId,
+    params?: Ctx,
+  ): Promise<
+    classic.ZodSafeParseResult<
+      RecordId<
+        Tb,
+        Ctx extends { db: any }
+          ? _core_.dboutput<Id>
+          : Exclude<core.output<Id>, undefined>
+      >
+    >
+  >;
 
-        // Clone - Single Parameter
-        parse<
-          Override extends RecordId<string, RecordIdValue> = RecordId<
-            Tb,
-            core.output<Id>
-          >,
-        >(data: unknown, params?: ParseDbContext): Override;
-        parseAsync<
-          Override extends RecordId<string, RecordIdValue> = RecordId<
-            Tb,
-            core.output<Id>
-          >,
-        >(data: unknown, params?: ParseDbContext): Promise<Override>;
-        safeParse<
-          Override extends RecordId<string, RecordIdValue> = RecordId<
-            Tb,
-            core.output<Id>
-          >,
-        >(
-          data: unknown,
-          params?: ParseDbContext,
-        ): classic.ZodSafeParseResult<Override>;
-        safeParseAsync<
-          Override extends RecordId<string, RecordIdValue> = RecordId<
-            Tb,
-            core.output<Id>
-          >,
-        >(
-          data: unknown,
-          params?: ParseDbContext,
-        ): Promise<classic.ZodSafeParseResult<Override>>;
-        decode<
-          Override extends RecordId<string, RecordIdValue> = RecordId<
-            Tb,
-            core.output<Id>
-          >,
-        >(
-          id: NoInfer<Override> | StringRecordId,
-          params?: ParseDbContext,
-        ): Override;
-        decodeAsync<
-          Override extends RecordId<string, RecordIdValue> = RecordId<
-            Tb,
-            core.output<Id>
-          >,
-        >(
-          id: NoInfer<Override> | StringRecordId,
-          params?: ParseDbContext,
-        ): Promise<Override>;
-        safeDecode<
-          Override extends RecordId<string, RecordIdValue> = RecordId<
-            Tb,
-            core.output<Id>
-          >,
-        >(
-          id: NoInfer<Override> | StringRecordId,
-          params?: ParseDbContext,
-        ): classic.ZodSafeParseResult<Override>;
-        safeDecodeAsync<
-          Override extends RecordId<string, RecordIdValue> = RecordId<
-            Tb,
-            core.output<Id>
-          >,
-        >(
-          id: NoInfer<Override> | StringRecordId,
-          params?: ParseDbContext,
-        ): Promise<classic.ZodSafeParseResult<Override>>;
-
-        // From Parts - Single Parameter
-        fromParts<
-          Override extends RecordId<string, RecordIdValue> = RecordId<
+  fromParts<Ctx extends ParseDbContext>(
+    table: Tb,
+    id: Ctx extends { db: any }
+      ? core.output<Id>
+      : Exclude<core.output<Id>, undefined>,
+    params?: Ctx,
+  ): undefined extends core.output<Id>
+    ?
+        | RecordId<
             Tb,
-            core.output<Id>
-          >,
-        >(
-          table: NoInfer<Override["table"]["name"]>,
-          id: NoInfer<Override["id"]>,
-          params?: ParseDbContext,
-        ): Override;
-        fromPartsAsync<
-          Override extends RecordId<string, RecordIdValue> = RecordId<
+            // @ts-expect-error: output intersected above
+            Ctx extends { db: any }
+              ? _core_.dboutput<Id>
+              : Exclude<core.output<Id>, undefined>
+          >
+        | undefined
+    : RecordId<
+        Tb,
+        Ctx extends { db: any }
+          ? _core_.dboutput<Id>
+          : Exclude<core.output<Id>, undefined>
+      >;
+  fromPartsAsync<Ctx extends ParseDbContext>(
+    table: Tb,
+    id: Ctx extends { db: any }
+      ? core.output<Id>
+      : Exclude<core.output<Id>, undefined>,
+    params?: Ctx,
+  ): undefined extends core.output<Id>
+    ? Promise<
+        | RecordId<
             Tb,
-            core.output<Id>
-          >,
-        >(
-          table: NoInfer<Override["table"]["name"]>,
-          id: NoInfer<Override["id"]>,
-          params?: ParseDbContext,
-        ): Promise<Override>;
-        safeFromParts<
-          Override extends RecordId<string, RecordIdValue> = RecordId<
+            // @ts-expect-error: output intersected above
+            Ctx extends { db: any }
+              ? _core_.dboutput<Id>
+              : Exclude<core.output<Id>, undefined>
+          >
+        | undefined
+      >
+    : Promise<
+        RecordId<
+          Tb,
+          Ctx extends { db: any }
+            ? _core_.dboutput<Id>
+            : Exclude<core.output<Id>, undefined>
+        >
+      >;
+  safeFromParts<Ctx extends ParseDbContext>(
+    table: Tb,
+    id: Ctx extends { db: any }
+      ? core.output<Id>
+      : Exclude<core.output<Id>, undefined>,
+    params?: Ctx,
+  ): undefined extends core.output<Id>
+    ? classic.ZodSafeParseResult<
+        | RecordId<
             Tb,
-            core.output<Id>
-          >,
-        >(
-          table: NoInfer<Override["table"]["name"]>,
-          id: NoInfer<Override["id"]>,
-          params?: ParseDbContext,
-        ): classic.ZodSafeParseResult<Override>;
-        safeFromPartsAsync<
-          Override extends RecordId<string, RecordIdValue> = RecordId<
+            // @ts-expect-error: output intersected above
+            Ctx extends { db: any }
+              ? _core_.dboutput<Id>
+              : Exclude<core.output<Id>, undefined>
+          >
+        | undefined
+      >
+    : classic.ZodSafeParseResult<
+        RecordId<
+          Tb,
+          Ctx extends { db: any }
+            ? _core_.dboutput<Id>
+            : Exclude<core.output<Id>, undefined>
+        >
+      >;
+  safeFromPartsAsync<Ctx extends ParseDbContext>(
+    table: Tb,
+    id: Ctx extends { db: any }
+      ? core.output<Id>
+      : Exclude<core.output<Id>, undefined>,
+    params?: Ctx,
+  ): undefined extends core.output<Id>
+    ? Promise<
+        classic.ZodSafeParseResult<
+          | RecordId<
+              Tb,
+              // @ts-expect-error: output intersected above
+              Ctx extends { db: any }
+                ? _core_.dboutput<Id>
+                : Exclude<core.output<Id>, undefined>
+            >
+          | undefined
+        >
+      >
+    : Promise<
+        classic.ZodSafeParseResult<
+          RecordId<
             Tb,
-            core.output<Id>
-          >,
-        >(
-          table: NoInfer<Override["table"]["name"]>,
-          id: NoInfer<Override["id"]>,
-          params?: ParseDbContext,
-        ): Promise<classic.ZodSafeParseResult<Override>>;
-      }
-    : // Any Table + Typed Value:
-      {
-        // Clone - Split Parameters
-        parse<OverrideTb extends string = Tb>(
-          data: unknown,
-          params?: ParseDbContext,
-        ): RecordId<OverrideTb, core.output<Id>>;
-        parseAsync<OverrideTb extends string = Tb>(
-          data: unknown,
-          params?: ParseDbContext,
-        ): Promise<RecordId<OverrideTb, core.output<Id>>>;
-        safeParse<OverrideTb extends string = Tb>(
-          data: unknown,
-          params?: ParseDbContext,
-        ): classic.ZodSafeParseResult<RecordId<OverrideTb, core.output<Id>>>;
-        safeParseAsync<OverrideTb extends string = Tb>(
-          data: unknown,
-          params?: ParseDbContext,
-        ): Promise<
-          classic.ZodSafeParseResult<RecordId<OverrideTb, core.output<Id>>>
-        >;
-        decode<OverrideTb extends string = Tb>(
-          data: RecordId<NoInfer<OverrideTb>, core.output<Id>> | StringRecordId,
-          params?: ParseDbContext,
-        ): RecordId<OverrideTb, core.output<Id>>;
-        decodeAsync<OverrideTb extends string = Tb>(
-          data: RecordId<NoInfer<OverrideTb>, core.output<Id>> | StringRecordId,
-          params?: ParseDbContext,
-        ): Promise<RecordId<OverrideTb, core.output<Id>>>;
-        safeDecode<OverrideTb extends string = Tb>(
-          data: RecordId<NoInfer<OverrideTb>, core.output<Id>> | StringRecordId,
-          params?: ParseDbContext,
-        ): classic.ZodSafeParseResult<RecordId<OverrideTb, core.output<Id>>>;
-        safeDecodeAsync<OverrideTb extends string = Tb>(
-          data: RecordId<NoInfer<OverrideTb>, core.output<Id>> | StringRecordId,
-          params?: ParseDbContext,
-        ): Promise<
-          classic.ZodSafeParseResult<RecordId<OverrideTb, core.output<Id>>>
-        >;
+            Ctx extends { db: any }
+              ? _core_.dboutput<Id>
+              : Exclude<core.output<Id>, undefined>
+          >
+        >
+      >;
+};
 
-        // From Parts - Split Parameters
-        fromParts<OverrideTb extends string = Tb>(
-          table: NoInfer<OverrideTb>,
-          id: NoInfer<core.output<Id>>,
-          params?: ParseDbContext,
-        ): RecordId<OverrideTb, core.output<Id>>;
-        fromPartsAsync<OverrideTb extends string = Tb>(
-          table: NoInfer<OverrideTb>,
-          id: NoInfer<core.output<Id>>,
-          params?: ParseDbContext,
-        ): Promise<RecordId<OverrideTb, core.output<Id>>>;
-        safeFromParts<OverrideTb extends string = Tb>(
-          table: NoInfer<OverrideTb>,
-          id: NoInfer<core.output<Id>>,
-          params?: ParseDbContext,
-        ): classic.ZodSafeParseResult<RecordId<OverrideTb, core.output<Id>>>;
-        safeFromPartsAsync<OverrideTb extends string = Tb>(
-          table: NoInfer<OverrideTb>,
-          id: NoInfer<core.output<Id>>,
-          params?: ParseDbContext,
-        ): Promise<
-          classic.ZodSafeParseResult<RecordId<OverrideTb, core.output<Id>>>
-        >;
+type SpecificTableRecordIdTrait<
+  Tb extends string,
+  Id extends ZodSurrealRecordIdValue,
+> = {
+  parse<Ctx extends ParseDbContext>(
+    data: unknown,
+    params?: Ctx,
+  ): RecordId<
+    Tb,
+    Ctx extends { db: any }
+      ? _core_.dboutput<Id>
+      : Exclude<core.output<Id>, undefined>
+  >;
+  parseAsync<Ctx extends ParseDbContext>(
+    data: unknown,
+    params?: Ctx,
+  ): Promise<
+    RecordId<
+      Tb,
+      Ctx extends { db: any }
+        ? _core_.dboutput<Id>
+        : Exclude<core.output<Id>, undefined>
+    >
+  >;
+  safeParse<Ctx extends ParseDbContext>(
+    data: unknown,
+    params?: Ctx,
+  ): classic.ZodSafeParseResult<
+    RecordId<
+      Tb,
+      Ctx extends { db: any }
+        ? _core_.dboutput<Id>
+        : Exclude<core.output<Id>, undefined>
+    >
+  >;
+  safeParseAsync<Ctx extends ParseDbContext>(
+    data: unknown,
+    params?: Ctx,
+  ): Promise<
+    classic.ZodSafeParseResult<
+      RecordId<
+        Tb,
+        Ctx extends { db: any }
+          ? _core_.dboutput<Id>
+          : Exclude<core.output<Id>, undefined>
+      >
+    >
+  >;
+  decode<Ctx extends ParseDbContext>(
+    data: core.output<Id> | StringRecordId,
+    params?: Ctx,
+  ): RecordId<
+    Tb,
+    Ctx extends { db: any }
+      ? _core_.dboutput<Id>
+      : Exclude<core.output<Id>, undefined>
+  >;
+  decodeAsync<Ctx extends ParseDbContext>(
+    data: core.output<Id> | StringRecordId,
+    params?: Ctx,
+  ): Promise<
+    RecordId<
+      Tb,
+      Ctx extends { db: any }
+        ? _core_.dboutput<Id>
+        : Exclude<core.output<Id>, undefined>
+    >
+  >;
+  safeDecode<Ctx extends ParseDbContext>(
+    data: core.output<Id> | StringRecordId,
+    params?: Ctx,
+  ): classic.ZodSafeParseResult<
+    RecordId<
+      Tb,
+      Ctx extends { db: any }
+        ? _core_.dboutput<Id>
+        : Exclude<core.output<Id>, undefined>
+    >
+  >;
+  safeDecodeAsync<Ctx extends ParseDbContext>(
+    data: core.output<Id> | StringRecordId,
+    params?: Ctx,
+  ): Promise<
+    classic.ZodSafeParseResult<
+      RecordId<
+        Tb,
+        Ctx extends { db: any }
+          ? _core_.dboutput<Id>
+          : Exclude<core.output<Id>, undefined>
+      >
+    >
+  >;
 
-        // Clone - Single Parameter
-        parse<
-          Override extends RecordId<string, RecordIdValue> = RecordId<
-            Tb,
-            core.output<Id>
-          >,
-        >(
-          data: unknown,
-          params?: ParseDbContext,
-        ): RecordId<Override["table"]["name"], core.output<Id>>;
-        parseAsync<
-          Override extends RecordId<string, RecordIdValue> = RecordId<
-            Tb,
-            core.output<Id>
-          >,
-        >(
-          data: unknown,
-          params?: ParseDbContext,
-        ): Promise<RecordId<Override["table"]["name"], core.output<Id>>>;
-        safeParse<
-          Override extends RecordId<string, RecordIdValue> = RecordId<
-            Tb,
-            core.output<Id>
-          >,
-        >(
-          data: unknown,
-          params?: ParseDbContext,
-        ): classic.ZodSafeParseResult<
-          RecordId<Override["table"]["name"], core.output<Id>>
-        >;
-        safeParseAsync<
-          Override extends RecordId<string, RecordIdValue> = RecordId<
+  fromParts<Ctx extends ParseDbContext>(
+    table: Tb,
+    id: Ctx extends { db: any }
+      ? core.output<Id>
+      : Exclude<core.output<Id>, undefined>,
+    params?: Ctx,
+  ): undefined extends core.output<Id>
+    ?
+        | RecordId<
             Tb,
-            core.output<Id>
-          >,
-        >(
-          data: unknown,
-          params?: ParseDbContext,
-        ): Promise<
-          classic.ZodSafeParseResult<
-            RecordId<Override["table"]["name"], core.output<Id>>
+            // @ts-expect-error: output intersected above
+            Ctx extends { db: any }
+              ? _core_.dboutput<Id>
+              : Exclude<core.output<Id>, undefined>
           >
-        >;
-        decode<
-          Override extends RecordId<string, RecordIdValue> = RecordId<
-            Tb,
-            core.output<Id>
-          >,
-        >(
-          data:
-            | RecordId<Override["table"]["name"], core.output<Id>>
-            | StringRecordId,
-          params?: ParseDbContext,
-        ): RecordId<Override["table"]["name"], core.output<Id>>;
-        decodeAsync<
-          Override extends RecordId<string, RecordIdValue> = RecordId<
-            Tb,
-            core.output<Id>
-          >,
-        >(
-          data:
-            | RecordId<Override["table"]["name"], core.output<Id>>
-            | StringRecordId,
-          params?: ParseDbContext,
-        ): Promise<RecordId<Override["table"]["name"], core.output<Id>>>;
-        safeDecode<
-          Override extends RecordId<string, RecordIdValue> = RecordId<
-            Tb,
-            core.output<Id>
-          >,
-        >(
-          data:
-            | RecordId<Override["table"]["name"], core.output<Id>>
-            | StringRecordId,
-          params?: ParseDbContext,
-        ): classic.ZodSafeParseResult<
-          RecordId<Override["table"]["name"], core.output<Id>>
-        >;
-        safeDecodeAsync<
-          Override extends RecordId<string, RecordIdValue> = RecordId<
+        | undefined
+    : RecordId<
+        Tb,
+        Ctx extends { db: any }
+          ? _core_.dboutput<Id>
+          : Exclude<core.output<Id>, undefined>
+      >;
+  fromPartsAsync<Ctx extends ParseDbContext>(
+    table: Tb,
+    id: Ctx extends { db: any }
+      ? core.output<Id>
+      : Exclude<core.output<Id>, undefined>,
+    params?: Ctx,
+  ): undefined extends core.output<Id>
+    ? Promise<
+        | RecordId<
             Tb,
-            core.output<Id>
-          >,
-        >(
-          data:
-            | RecordId<Override["table"]["name"], core.output<Id>>
-            | StringRecordId,
-          params?: ParseDbContext,
-        ): Promise<
-          classic.ZodSafeParseResult<
-            RecordId<Override["table"]["name"], core.output<Id>>
+            // @ts-expect-error: output intersected above
+            Ctx extends { db: any }
+              ? _core_.dboutput<Id>
+              : Exclude<core.output<Id>, undefined>
           >
-        >;
-
-        // From Parts - Single Parameter
-        fromParts<
-          Override extends RecordId<string, RecordIdValue> = RecordId<
-            Tb,
-            core.output<Id>
-          >,
-        >(
-          table: NoInfer<Override["table"]["name"]>,
-          id: NoInfer<core.output<Id>>,
-          params?: ParseDbContext,
-        ): RecordId<Override["table"]["name"], core.output<Id>>;
-        fromPartsAsync<
-          Override extends RecordId<string, RecordIdValue> = RecordId<
-            Tb,
-            core.output<Id>
-          >,
-        >(
-          table: NoInfer<Override["table"]["name"]>,
-          id: NoInfer<core.output<Id>>,
-          params?: ParseDbContext,
-        ): Promise<RecordId<Override["table"]["name"], core.output<Id>>>;
-        safeFromParts<
-          Override extends RecordId<string, RecordIdValue> = RecordId<
-            Tb,
-            core.output<Id>
-          >,
-        >(
-          table: NoInfer<Override["table"]["name"]>,
-          id: NoInfer<core.output<Id>>,
-          params?: ParseDbContext,
-        ): classic.ZodSafeParseResult<
-          RecordId<Override["table"]["name"], core.output<Id>>
-        >;
-        safeFromPartsAsync<
-          Override extends RecordId<string, RecordIdValue> = RecordId<
+        | undefined
+      >
+    : Promise<
+        RecordId<
+          Tb,
+          Ctx extends { db: any }
+            ? _core_.dboutput<Id>
+            : Exclude<core.output<Id>, undefined>
+        >
+      >;
+  safeFromParts<Ctx extends ParseDbContext>(
+    table: Tb,
+    id: Ctx extends { db: any }
+      ? core.output<Id>
+      : Exclude<core.output<Id>, undefined>,
+    params?: Ctx,
+  ): undefined extends core.output<Id>
+    ? classic.ZodSafeParseResult<
+        | RecordId<
             Tb,
-            core.output<Id>
-          >,
-        >(
-          table: NoInfer<Override["table"]["name"]>,
-          id: NoInfer<core.output<Id>>,
-          params?: ParseDbContext,
-        ): Promise<
-          classic.ZodSafeParseResult<
-            RecordId<Override["table"]["name"], core.output<Id>>
+            // @ts-expect-error: output intersected above
+            Ctx extends { db: any }
+              ? _core_.dboutput<Id>
+              : Exclude<core.output<Id>, undefined>
           >
-        >;
-      }
-  : // Specific Table:
-    UnionToTuple<Tb> extends { length: 1 }
-    ? ZodSurrealRecordIdValue extends Id
-      ? // Specific Table + Any Value
-        {
-          // Clone - Split Parameters
-          parse<OverrideId extends RecordIdValue = core.output<Id>>(
-            data: unknown,
-            params?: ParseDbContext,
-          ): RecordId<Tb, OverrideId>;
-          parseAsync<OverrideId extends RecordIdValue = core.output<Id>>(
-            data: unknown,
-            params?: ParseDbContext,
-          ): Promise<RecordId<Tb, OverrideId>>;
-          safeParse<OverrideId extends RecordIdValue = core.output<Id>>(
-            data: unknown,
-            params?: ParseDbContext,
-          ): classic.ZodSafeParseResult<RecordId<Tb, OverrideId>>;
-          safeParseAsync<OverrideId extends RecordIdValue = core.output<Id>>(
-            data: unknown,
-            params?: ParseDbContext,
-          ): Promise<classic.ZodSafeParseResult<RecordId<Tb, OverrideId>>>;
-          decode<OverrideId extends RecordIdValue = core.output<Id>>(
-            data: RecordId<Tb, NoInfer<OverrideId>> | StringRecordId,
-            params?: ParseDbContext,
-          ): RecordId<Tb, OverrideId>;
-          decodeAsync<OverrideId extends RecordIdValue = core.output<Id>>(
-            data: RecordId<Tb, NoInfer<OverrideId>> | StringRecordId,
-            params?: ParseDbContext,
-          ): Promise<RecordId<Tb, OverrideId>>;
-          safeDecode<OverrideId extends RecordIdValue = core.output<Id>>(
-            data: RecordId<Tb, NoInfer<OverrideId>> | StringRecordId,
-            params?: ParseDbContext,
-          ): classic.ZodSafeParseResult<RecordId<Tb, OverrideId>>;
-          safeDecodeAsync<OverrideId extends RecordIdValue = core.output<Id>>(
-            data: RecordId<Tb, NoInfer<OverrideId>> | StringRecordId,
-            params?: ParseDbContext,
-          ): Promise<classic.ZodSafeParseResult<RecordId<Tb, OverrideId>>>;
-
-          // From Parts - Split Parameters
-          fromParts<OverrideId extends RecordIdValue = core.output<Id>>(
-            table: NoInfer<Tb>,
-            id: NoInfer<OverrideId>,
-            params?: ParseDbContext,
-          ): RecordId<Tb, OverrideId>;
-          fromPartsAsync<OverrideId extends RecordIdValue = core.output<Id>>(
-            table: NoInfer<Tb>,
-            id: NoInfer<OverrideId>,
-            params?: ParseDbContext,
-          ): Promise<RecordId<Tb, OverrideId>>;
-          safeFromParts<OverrideId extends RecordIdValue = core.output<Id>>(
-            table: NoInfer<Tb>,
-            id: NoInfer<OverrideId>,
-            params?: ParseDbContext,
-          ): classic.ZodSafeParseResult<RecordId<Tb, OverrideId>>;
-          safeFromPartsAsync<
-            OverrideId extends RecordIdValue = core.output<Id>,
-          >(
-            table: NoInfer<Tb>,
-            id: NoInfer<OverrideId>,
-            params?: ParseDbContext,
-          ): Promise<classic.ZodSafeParseResult<RecordId<Tb, OverrideId>>>;
-
-          // From Id - Split Parameters
-          fromId<OverrideId extends RecordIdValue = core.output<Id>>(
-            id: NoInfer<OverrideId>,
-            params?: ParseDbContext,
-          ): RecordId<Tb, OverrideId>;
-          fromIdAsync<OverrideId extends RecordIdValue = core.output<Id>>(
-            id: NoInfer<OverrideId>,
-            params?: ParseDbContext,
-          ): Promise<RecordId<Tb, OverrideId>>;
-          safeFromId<OverrideId extends RecordIdValue = core.output<Id>>(
-            id: NoInfer<OverrideId>,
-            params?: ParseDbContext,
-          ): classic.ZodSafeParseResult<RecordId<Tb, OverrideId>>;
-          safeFromIdAsync<OverrideId extends RecordIdValue = core.output<Id>>(
-            id: NoInfer<OverrideId>,
-            params?: ParseDbContext,
-          ): Promise<classic.ZodSafeParseResult<RecordId<Tb, OverrideId>>>;
-
-          // Clone - Single Parameter
-          parse<
-            Override extends RecordId<string, RecordIdValue> = RecordId<
-              Tb,
-              core.output<Id>
-            >,
-          >(
-            data: unknown,
-            params?: ParseDbContext,
-          ): RecordId<Tb, Override["id"]>;
-          parseAsync<
-            Override extends RecordId<string, RecordIdValue> = RecordId<
-              Tb,
-              core.output<Id>
-            >,
-          >(
-            data: unknown,
-            params?: ParseDbContext,
-          ): Promise<RecordId<Tb, Override["id"]>>;
-          safeParse<
-            Override extends RecordId<string, RecordIdValue> = RecordId<
-              Tb,
-              core.output<Id>
-            >,
-          >(
-            data: unknown,
-            params?: ParseDbContext,
-          ): classic.ZodSafeParseResult<RecordId<Tb, Override["id"]>>;
-          safeParseAsync<
-            Override extends RecordId<string, RecordIdValue> = RecordId<
-              Tb,
-              core.output<Id>
-            >,
-          >(
-            data: unknown,
-            params?: ParseDbContext,
-          ): Promise<classic.ZodSafeParseResult<RecordId<Tb, Override["id"]>>>;
-          decode<
-            Override extends RecordId<string, RecordIdValue> = RecordId<
-              Tb,
-              core.output<Id>
-            >,
-          >(
-            data: RecordId<Tb, Override["id"]> | StringRecordId,
-            params?: ParseDbContext,
-          ): RecordId<Tb, Override["id"]>;
-          decodeAsync<
-            Override extends RecordId<string, RecordIdValue> = RecordId<
-              Tb,
-              core.output<Id>
-            >,
-          >(
-            data: RecordId<Tb, Override["id"]> | StringRecordId,
-            params?: ParseDbContext,
-          ): Promise<RecordId<Tb, Override["id"]>>;
-          safeDecode<
-            Override extends RecordId<string, RecordIdValue> = RecordId<
-              Tb,
-              core.output<Id>
-            >,
-          >(
-            data: RecordId<Tb, Override["id"]> | StringRecordId,
-            params?: ParseDbContext,
-          ): classic.ZodSafeParseResult<RecordId<Tb, Override["id"]>>;
-          safeDecodeAsync<
-            Override extends RecordId<string, RecordIdValue> = RecordId<
-              Tb,
-              core.output<Id>
-            >,
-          >(
-            data: RecordId<Tb, Override["id"]> | StringRecordId,
-            params?: ParseDbContext,
-          ): Promise<classic.ZodSafeParseResult<RecordId<Tb, Override["id"]>>>;
-
-          // From Parts - Single Parameter
-          fromParts<
-            Override extends RecordId<string, RecordIdValue> = RecordId<
-              Tb,
-              core.output<Id>
-            >,
-          >(
-            table: NoInfer<Tb>,
-            id: NoInfer<Override["id"]>,
-            params?: ParseDbContext,
-          ): RecordId<Tb, Override["id"]>;
-          fromPartsAsync<
-            Override extends RecordId<string, RecordIdValue> = RecordId<
-              Tb,
-              core.output<Id>
-            >,
-          >(
-            table: NoInfer<Tb>,
-            id: NoInfer<Override["id"]>,
-            params?: ParseDbContext,
-          ): Promise<RecordId<Tb, Override["id"]>>;
-          safeFromParts<
-            Override extends RecordId<string, RecordIdValue> = RecordId<
-              Tb,
-              core.output<Id>
-            >,
-          >(
-            table: NoInfer<Tb>,
-            id: NoInfer<Override["id"]>,
-            params?: ParseDbContext,
-          ): classic.ZodSafeParseResult<RecordId<Tb, Override["id"]>>;
-          safeFromPartsAsync<
-            Override extends RecordId<string, RecordIdValue> = RecordId<
-              Tb,
-              core.output<Id>
-            >,
-          >(
-            table: NoInfer<Tb>,
-            id: NoInfer<Override["id"]>,
-            params?: ParseDbContext,
-          ): Promise<classic.ZodSafeParseResult<RecordId<Tb, Override["id"]>>>;
-
-          // From Id - Single Parameter
-          fromId<
-            Override extends RecordId<string, RecordIdValue> = RecordId<
-              Tb,
-              core.output<Id>
-            >,
-          >(
-            id: NoInfer<Override["id"]>,
-            params?: ParseDbContext,
-          ): RecordId<Tb, Override["id"]>;
-          fromIdAsync<
-            Override extends RecordId<string, RecordIdValue> = RecordId<
-              Tb,
-              core.output<Id>
-            >,
-          >(
-            id: NoInfer<Override["id"]>,
-            params?: ParseDbContext,
-          ): Promise<RecordId<Tb, Override["id"]>>;
-          safeFromId<
-            Override extends RecordId<string, RecordIdValue> = RecordId<
-              Tb,
-              core.output<Id>
-            >,
-          >(
-            id: NoInfer<Override["id"]>,
-            params?: ParseDbContext,
-          ): classic.ZodSafeParseResult<RecordId<Tb, Override["id"]>>;
-          safeFromIdAsync<
-            Override extends RecordId<string, RecordIdValue> = RecordId<
-              Tb,
-              core.output<Id>
-            >,
-          >(
-            id: NoInfer<Override["id"]>,
-            params?: ParseDbContext,
-          ): Promise<classic.ZodSafeParseResult<RecordId<Tb, Override["id"]>>>;
-        }
-      : // Specific Table + Typed Value
-        {
-          // Clone - Non Overridable
-          parse(
-            data: unknown,
-            params?: ParseDbContext,
-          ): RecordId<Tb, core.output<Id>>;
-          parseAsync(
-            data: unknown,
-            params?: ParseDbContext,
-          ): Promise<RecordId<Tb, core.output<Id>>>;
-          safeParse(
-            data: unknown,
-            params?: ParseDbContext,
-          ): classic.ZodSafeParseResult<RecordId<Tb, core.output<Id>>>;
-          safeParseAsync(
-            data: unknown,
-            params?: ParseDbContext,
-          ): Promise<classic.ZodSafeParseResult<RecordId<Tb, core.output<Id>>>>;
-          decode(
-            data: RecordId<Tb, core.output<Id>> | StringRecordId,
-            params?: ParseDbContext,
-          ): RecordId<Tb, core.output<Id>>;
-          decodeAsync(
-            data: RecordId<Tb, core.output<Id>> | StringRecordId,
-            params?: ParseDbContext,
-          ): Promise<RecordId<Tb, core.output<Id>>>;
-          safeDecode(
-            data: RecordId<Tb, core.output<Id>> | StringRecordId,
-            params?: ParseDbContext,
-          ): classic.ZodSafeParseResult<RecordId<Tb, core.output<Id>>>;
-          safeDecodeAsync(
-            data: RecordId<Tb, core.output<Id>> | StringRecordId,
-            params?: ParseDbContext,
-          ): Promise<classic.ZodSafeParseResult<RecordId<Tb, core.output<Id>>>>;
-
-          // From Parts - Non Overridable
-          fromParts(
-            table: NoInfer<Tb>,
-            id: NoInfer<core.output<Id>>,
-            params?: ParseDbContext,
-          ): RecordId<Tb, core.output<Id>>;
-          fromPartsAsync(
-            table: NoInfer<Tb>,
-            id: NoInfer<core.output<Id>>,
-            params?: ParseDbContext,
-          ): Promise<RecordId<Tb, core.output<Id>>>;
-          safeFromParts(
-            table: NoInfer<Tb>,
-            id: NoInfer<core.output<Id>>,
-            params?: ParseDbContext,
-          ): classic.ZodSafeParseResult<RecordId<Tb, core.output<Id>>>;
-          safeFromPartsAsync(
-            table: NoInfer<Tb>,
-            id: NoInfer<core.output<Id>>,
-            params?: ParseDbContext,
-          ): Promise<classic.ZodSafeParseResult<RecordId<Tb, core.output<Id>>>>;
-
-          // From Id - Non Overridable
-          fromId(
-            id: NoInfer<core.output<Id>>,
-            params?: ParseDbContext,
-          ): RecordId<Tb, core.output<Id>>;
-          fromIdAsync(
-            id: NoInfer<core.output<Id>>,
-            params?: ParseDbContext,
-          ): Promise<RecordId<Tb, core.output<Id>>>;
-          safeFromId(
-            id: NoInfer<core.output<Id>>,
-            params?: ParseDbContext,
-          ): classic.ZodSafeParseResult<RecordId<Tb, core.output<Id>>>;
-          safeFromIdAsync(
-            id: NoInfer<core.output<Id>>,
-            params?: ParseDbContext,
-          ): Promise<classic.ZodSafeParseResult<RecordId<Tb, core.output<Id>>>>;
-        }
-    : // Multiple Tables:
-      ZodSurrealRecordIdValue extends Id
-      ? // Multiple Tables + Any Value:
-        {
-          // Clone - Split Parameters
-          parse<OverrideId extends RecordIdValue = core.output<Id>>(
-            data: unknown,
-            params?: ParseDbContext,
-          ): RecordId<Tb, OverrideId>;
-          parseAsync<OverrideId extends RecordIdValue = core.output<Id>>(
-            data: unknown,
-            params?: ParseDbContext,
-          ): Promise<RecordId<Tb, OverrideId>>;
-          safeParse<OverrideId extends RecordIdValue = core.output<Id>>(
-            data: unknown,
-            params?: ParseDbContext,
-          ): classic.ZodSafeParseResult<RecordId<Tb, OverrideId>>;
-          safeParseAsync<OverrideId extends RecordIdValue = core.output<Id>>(
-            data: unknown,
-            params?: ParseDbContext,
-          ): Promise<classic.ZodSafeParseResult<RecordId<Tb, OverrideId>>>;
-          decode<OverrideId extends RecordIdValue = core.output<Id>>(
-            data: RecordId<Tb, NoInfer<OverrideId>> | StringRecordId,
-            params?: ParseDbContext,
-          ): RecordId<Tb, OverrideId>;
-          decodeAsync<OverrideId extends RecordIdValue = core.output<Id>>(
-            data: RecordId<Tb, NoInfer<OverrideId>> | StringRecordId,
-            params?: ParseDbContext,
-          ): Promise<RecordId<Tb, OverrideId>>;
-          safeDecode<OverrideId extends RecordIdValue = core.output<Id>>(
-            data: RecordId<Tb, NoInfer<OverrideId>> | StringRecordId,
-            params?: ParseDbContext,
-          ): classic.ZodSafeParseResult<RecordId<Tb, OverrideId>>;
-          safeDecodeAsync<OverrideId extends RecordIdValue = core.output<Id>>(
-            data: RecordId<Tb, NoInfer<OverrideId>> | StringRecordId,
-            params?: ParseDbContext,
-          ): Promise<classic.ZodSafeParseResult<RecordId<Tb, OverrideId>>>;
-
-          // From Parts - Split Parameters
-          fromParts<OverrideId extends RecordIdValue = core.output<Id>>(
-            table: NoInfer<Tb>,
-            id: NoInfer<OverrideId>,
-            params?: ParseDbContext,
-          ): RecordId<Tb, OverrideId>;
-          fromPartsAsync<OverrideId extends RecordIdValue = core.output<Id>>(
-            table: NoInfer<Tb>,
-            id: NoInfer<OverrideId>,
-            params?: ParseDbContext,
-          ): Promise<RecordId<Tb, OverrideId>>;
-          safeFromParts<OverrideId extends RecordIdValue = core.output<Id>>(
-            table: NoInfer<Tb>,
-            id: NoInfer<OverrideId>,
-            params?: ParseDbContext,
-          ): classic.ZodSafeParseResult<RecordId<Tb, OverrideId>>;
-          safeFromPartsAsync<
-            OverrideId extends RecordIdValue = core.output<Id>,
-          >(
-            table: NoInfer<Tb>,
-            id: NoInfer<OverrideId>,
-            params?: ParseDbContext,
-          ): Promise<classic.ZodSafeParseResult<RecordId<Tb, OverrideId>>>;
-
-          // Clone - Single Parameter
-          parse<
-            Override extends RecordId<string, RecordIdValue> = RecordId<
-              Tb,
-              core.output<Id>
-            >,
-          >(
-            data: unknown,
-            params?: ParseDbContext,
-          ): RecordId<Tb, Override["id"]>;
-          parseAsync<
-            Override extends RecordId<string, RecordIdValue> = RecordId<
-              Tb,
-              core.output<Id>
-            >,
-          >(
-            data: unknown,
-            params?: ParseDbContext,
-          ): Promise<RecordId<Tb, Override["id"]>>;
-          safeParse<
-            Override extends RecordId<string, RecordIdValue> = RecordId<
-              Tb,
-              core.output<Id>
-            >,
-          >(
-            data: unknown,
-            params?: ParseDbContext,
-          ): classic.ZodSafeParseResult<RecordId<Tb, Override["id"]>>;
-          safeParseAsync<
-            Override extends RecordId<string, RecordIdValue> = RecordId<
-              Tb,
-              core.output<Id>
-            >,
-          >(
-            data: unknown,
-            params?: ParseDbContext,
-          ): Promise<classic.ZodSafeParseResult<RecordId<Tb, Override["id"]>>>;
-          decode<
-            Override extends RecordId<string, RecordIdValue> = RecordId<
-              Tb,
-              core.output<Id>
-            >,
-          >(
-            data: RecordId<Tb, Override["id"]> | StringRecordId,
-            params?: ParseDbContext,
-          ): RecordId<Tb, Override["id"]>;
-          decodeAsync<
-            Override extends RecordId<string, RecordIdValue> = RecordId<
-              Tb,
-              core.output<Id>
-            >,
-          >(
-            data: RecordId<Tb, Override["id"]> | StringRecordId,
-            params?: ParseDbContext,
-          ): Promise<RecordId<Tb, Override["id"]>>;
-          safeDecode<
-            Override extends RecordId<string, RecordIdValue> = RecordId<
-              Tb,
-              core.output<Id>
-            >,
-          >(
-            data: RecordId<Tb, Override["id"]> | StringRecordId,
-            params?: ParseDbContext,
-          ): classic.ZodSafeParseResult<RecordId<Tb, Override["id"]>>;
-          safeDecodeAsync<
-            Override extends RecordId<string, RecordIdValue> = RecordId<
-              Tb,
-              core.output<Id>
-            >,
-          >(
-            data: RecordId<Tb, Override["id"]> | StringRecordId,
-            params?: ParseDbContext,
-          ): Promise<classic.ZodSafeParseResult<RecordId<Tb, Override["id"]>>>;
-
-          // From Parts - Single Parameter
-          fromParts<
-            Override extends RecordId<string, RecordIdValue> = RecordId<
-              Tb,
-              core.output<Id>
-            >,
-          >(
-            table: NoInfer<Tb>,
-            id: NoInfer<Override["id"]>,
-            params?: ParseDbContext,
-          ): RecordId<Tb, Override["id"]>;
-          fromPartsAsync<
-            Override extends RecordId<string, RecordIdValue> = RecordId<
-              Tb,
-              core.output<Id>
-            >,
-          >(
-            table: NoInfer<Tb>,
-            id: NoInfer<Override["id"]>,
-            params?: ParseDbContext,
-          ): Promise<RecordId<Tb, Override["id"]>>;
-          safeFromParts<
-            Override extends RecordId<string, RecordIdValue> = RecordId<
-              Tb,
-              core.output<Id>
-            >,
-          >(
-            table: NoInfer<Tb>,
-            id: NoInfer<Override["id"]>,
-            params?: ParseDbContext,
-          ): classic.ZodSafeParseResult<RecordId<Tb, Override["id"]>>;
-          safeFromPartsAsync<
-            Override extends RecordId<string, RecordIdValue> = RecordId<
+        | undefined
+      >
+    : classic.ZodSafeParseResult<
+        RecordId<
+          Tb,
+          Ctx extends { db: any }
+            ? _core_.dboutput<Id>
+            : Exclude<core.output<Id>, undefined>
+        >
+      >;
+  safeFromPartsAsync<Ctx extends ParseDbContext>(
+    table: Tb,
+    id: Ctx extends { db: any }
+      ? core.output<Id>
+      : Exclude<core.output<Id>, undefined>,
+    params?: Ctx,
+  ): undefined extends core.output<Id>
+    ? Promise<
+        classic.ZodSafeParseResult<
+          | RecordId<
               Tb,
-              core.output<Id>
-            >,
-          >(
-            table: NoInfer<Tb>,
-            id: NoInfer<Override["id"]>,
-            params?: ParseDbContext,
-          ): Promise<classic.ZodSafeParseResult<RecordId<Tb, Override["id"]>>>;
-        }
-      : // Multiple Tables + Typed Value:
-        {
-          // Clone
-          parse(
-            data: unknown,
-            params?: ParseDbContext,
-          ): RecordId<Tb, core.output<Id>>;
-          parseAsync(
-            data: unknown,
-            params?: ParseDbContext,
-          ): Promise<RecordId<Tb, core.output<Id>>>;
-          safeParse(
-            data: unknown,
-            params?: ParseDbContext,
-          ): classic.ZodSafeParseResult<RecordId<Tb, core.output<Id>>>;
-          safeParseAsync(
-            data: unknown,
-            params?: ParseDbContext,
-          ): Promise<classic.ZodSafeParseResult<RecordId<Tb, core.output<Id>>>>;
-          decode(
-            data: RecordId<Tb, core.output<Id>> | StringRecordId,
-            params?: ParseDbContext,
-          ): RecordId<Tb, core.output<Id>>;
-          decodeAsync(
-            data: RecordId<Tb, core.output<Id>> | StringRecordId,
-            params?: ParseDbContext,
-          ): Promise<RecordId<Tb, core.output<Id>>>;
-          safeDecode(
-            data: RecordId<Tb, core.output<Id>> | StringRecordId,
-            params?: ParseDbContext,
-          ): classic.ZodSafeParseResult<RecordId<Tb, core.output<Id>>>;
-          safeDecodeAsync(
-            data: RecordId<Tb, core.output<Id>> | StringRecordId,
-            params?: ParseDbContext,
-          ): Promise<classic.ZodSafeParseResult<RecordId<Tb, core.output<Id>>>>;
-
-          // From Parts - Non Overridable
-          fromParts(
-            table: NoInfer<Tb>,
-            id: NoInfer<core.output<Id>>,
-            params?: ParseDbContext,
-          ): RecordId<Tb, core.output<Id>>;
-          fromPartsAsync(
-            table: NoInfer<Tb>,
-            id: NoInfer<core.output<Id>>,
-            params?: ParseDbContext,
-          ): Promise<RecordId<Tb, core.output<Id>>>;
-          safeFromParts(
-            table: NoInfer<Tb>,
-            id: NoInfer<core.output<Id>>,
-            params?: ParseDbContext,
-          ): classic.ZodSafeParseResult<RecordId<Tb, core.output<Id>>>;
-          safeFromPartsAsync(
-            table: NoInfer<Tb>,
-            id: NoInfer<core.output<Id>>,
-            params?: ParseDbContext,
-          ): Promise<classic.ZodSafeParseResult<RecordId<Tb, core.output<Id>>>>;
-        };
+              // @ts-expect-error: output intersected above
+              Ctx extends { db: any }
+                ? _core_.dboutput<Id>
+                : Exclude<core.output<Id>, undefined>
+            >
+          | undefined
+        >
+      >
+    : Promise<
+        classic.ZodSafeParseResult<
+          RecordId<
+            Tb,
+            Ctx extends { db: any }
+              ? _core_.dboutput<Id>
+              : Exclude<core.output<Id>, undefined>
+          >
+        >
+      >;
+
+  fromId<Ctx extends ParseDbContext>(
+    id: Ctx extends { db: any }
+      ? core.output<Id>
+      : Exclude<core.output<Id>, undefined>,
+    params?: Ctx,
+  ): RecordId<
+    Tb,
+    Ctx extends { db: any }
+      ? _core_.dboutput<Id>
+      : Exclude<core.output<Id>, undefined>
+  >;
+  fromIdAsync<Ctx extends ParseDbContext>(
+    id: Ctx extends { db: any }
+      ? core.output<Id>
+      : Exclude<core.output<Id>, undefined>,
+    params?: Ctx,
+  ): Promise<
+    RecordId<
+      Tb,
+      Ctx extends { db: any }
+        ? _core_.dboutput<Id>
+        : Exclude<core.output<Id>, undefined>
+    >
+  >;
+  safeFromId<Ctx extends ParseDbContext>(
+    id: Ctx extends { db: any }
+      ? core.output<Id>
+      : Exclude<core.output<Id>, undefined>,
+    params?: Ctx,
+  ): classic.ZodSafeParseResult<
+    RecordId<
+      Tb,
+      Ctx extends { db: any }
+        ? _core_.dboutput<Id>
+        : Exclude<core.output<Id>, undefined>
+    >
+  >;
+  safeFromIdAsync<Ctx extends ParseDbContext>(
+    id: Ctx extends { db: any }
+      ? core.output<Id>
+      : Exclude<core.output<Id>, undefined>,
+    params?: Ctx,
+  ): Promise<
+    classic.ZodSafeParseResult<
+      RecordId<
+        Tb,
+        Ctx extends { db: any }
+          ? _core_.dboutput<Id>
+          : Exclude<core.output<Id>, undefined>
+      >
+    >
+  >;
+};
+
+type ZodSurrealRecordIdTrait<
+  Tb extends string,
+  Id extends ZodSurrealRecordIdValue,
+  Extras extends ZodSurrealRecordIdExtras = {},
+> = string extends Tb
+  ? AnyTableRecordIdTrait<Tb, Id>
+  : UnionToTuple<Tb> extends { length: 1 }
+    ? SpecificTableRecordIdTrait<Tb, Id>
+    : AnyTableRecordIdTrait<Tb, Id>;
 
 export type ZodSurrealdRecordId<
   Table extends string = string,
@@ -6266,7 +5754,8 @@ export type ZodSurrealdRecordId<
   | "nullish"
   | "nonoptional"
 > &
-  ZodSurrealRecordIdTrait<Table, Id, Extras> & {
+  ZodSurrealRecordIdTrait<Table, Id, Extras> &
+  ZodSurrealFieldMethods & {
     anytable(): ZodSurrealdRecordId<string, Id, Extras>;
 
     table<const NewTable extends string | string[]>(
@@ -6507,60 +5996,177 @@ export const ZodSurrealdRecordId: core.$constructor<ZodSurrealdRecordId> =
     inst.value = inst.type;
 
     // ------- Parsing/Encoding/Decoding -------
-    const _inst = inst as any;
-    _inst.fromParts = (
+    inst.fromParts = (
       table: string,
       id: RecordIdValue,
-      params?: core.ParseContext<core.$ZodIssue>,
-    ) => _inst.decode(new RecordId(table, id), params);
+      params?: ParseDbContext,
+    ) => {
+      const inner = def.innerType as core.$ZodType;
+      if (id === undefined) {
+        const res = core.safeDecode(inner, id, params);
+        if (res.error) {
+          for (const issue of res.error.issues) {
+            issue.path.unshift("id");
+          }
+          throw res.error;
+        }
+        id = res.data as RecordIdValue;
+        if (id === undefined) {
+          return undefined;
+        }
+      }
+      return inst.decode(new RecordId(table, id), params);
+    };
 
-    _inst.fromPartsAsync = (
+    inst.fromPartsAsync = async (
       table: string,
       id: RecordIdValue,
       params?: core.ParseContext<core.$ZodIssue>,
-    ) => _inst.decodeAsync(new RecordId(table, id), params);
+    ) => {
+      const inner = def.innerType as core.$ZodType;
+      if (id === undefined) {
+        const res = await core.safeDecodeAsync(inner, id, params);
+        if (res.error) {
+          for (const issue of res.error.issues) {
+            issue.path.unshift("id");
+          }
+          throw res.error;
+        }
+        id = res.data as RecordIdValue;
+      }
 
-    _inst.safeFromParts = (
+      return inst.decodeAsync(new RecordId(table, id), params);
+    };
+
+    inst.safeFromParts = (
       table: string,
       id: RecordIdValue,
       params?: core.ParseContext<core.$ZodIssue>,
-    ) => _inst.safeDecode(new RecordId(table, id), params);
+    ) => {
+      const inner = def.innerType as core.$ZodType;
+      if (id === undefined) {
+        const res = core.safeDecode(inner, id, params);
+        if (res.error) {
+          for (const issue of res.error.issues) {
+            issue.path.unshift("id");
+          }
+          throw res.error;
+        }
+        id = res.data as RecordIdValue;
+      }
 
-    _inst.safeFromPartsAsync = (
+      return inst.safeDecode(new RecordId(table, id), params);
+    };
+
+    inst.safeFromPartsAsync = async (
       table: string,
       id: RecordIdValue,
       params?: core.ParseContext<core.$ZodIssue>,
-    ) => _inst.safeDecodeAsync(new RecordId(table, id), params);
+    ) => {
+      const inner = def.innerType as core.$ZodType;
+      if (id === undefined) {
+        const res = await core.safeDecodeAsync(inner, id, params);
+        if (res.error) {
+          for (const issue of res.error.issues) {
+            issue.path.unshift("id");
+          }
+          throw res.error;
+        }
+        id = res.data as RecordIdValue;
+      }
+
+      return inst.safeDecodeAsync(new RecordId(table, id), params);
+    };
 
     if (normalized.table?.length === 1) {
+      const _inst = inst as any;
       _inst.fromId = (
         id: RecordIdValue,
         params?: core.ParseContext<core.$ZodIssue>,
-      ) => _inst.decode(new RecordId(normalized.table?.[0] ?? "", id), params);
+      ) => {
+        const inner = def.innerType as core.$ZodType;
+        if (id === undefined) {
+          const res = core.safeDecode(inner, id, params);
+          if (res.error) {
+            for (const issue of res.error.issues) {
+              issue.path.unshift("id");
+            }
+            throw res.error;
+          }
+          id = res.data as RecordIdValue;
+        }
+
+        return _inst.decode(
+          new RecordId(normalized.table?.[0] ?? "", id),
+          params,
+        );
+      };
 
-      _inst.fromIdAsync = (
+      _inst.fromIdAsync = async (
         id: RecordIdValue,
         params?: core.ParseContext<core.$ZodIssue>,
-      ) =>
-        _inst.decodeAsync(
+      ) => {
+        const inner = def.innerType as core.$ZodType;
+        if (id === undefined) {
+          const res = await core.safeDecodeAsync(inner, id, params);
+          if (res.error) {
+            for (const issue of res.error.issues) {
+              issue.path.unshift("id");
+            }
+            throw res.error;
+          }
+          id = res.data as RecordIdValue;
+        }
+
+        return _inst.decodeAsync(
           new RecordId(normalized.table?.[0] ?? "", id),
           params,
         );
+      };
 
       _inst.safeFromId = (
         id: RecordIdValue,
         params?: core.ParseContext<core.$ZodIssue>,
-      ) =>
-        _inst.safeDecode(new RecordId(normalized.table?.[0] ?? "", id), params);
+      ) => {
+        const inner = def.innerType as core.$ZodType;
+        if (id === undefined) {
+          const res = core.safeDecode(inner, id, params);
+          if (res.error) {
+            for (const issue of res.error.issues) {
+              issue.path.unshift("id");
+            }
+            throw res.error;
+          }
+          id = res.data as RecordIdValue;
+        }
+
+        return _inst.safeDecode(
+          new RecordId(normalized.table?.[0] ?? "", id),
+          params,
+        );
+      };
 
-      _inst.safeFromIdAsync = (
+      _inst.safeFromIdAsync = async (
         id: RecordIdValue,
         params?: core.ParseContext<core.$ZodIssue>,
-      ) =>
-        _inst.safeDecodeAsync(
+      ) => {
+        const inner = def.innerType as core.$ZodType;
+        if (id === undefined) {
+          const res = await core.safeDecodeAsync(inner, id, params);
+          if (res.error) {
+            for (const issue of res.error.issues) {
+              issue.path.unshift("id");
+            }
+            throw res.error;
+          }
+          id = res.data as RecordIdValue;
+        }
+
+        return _inst.safeDecodeAsync(
           new RecordId(normalized.table?.[0] ?? "", id),
           params,
         );
+      };
     }
 
     inst._zod.parse = (payload, ctx) => {