Introduce client.withCodecs()

packages/driver/src/baseClient.ts

@@ -35,7 +35,6 @@ import {
 } from "./ifaces";
 import type {
   RetryOptions,
-  Session,
   SimpleRetryOptions,
   SimpleTransactionOptions,
   TransactionOptions,
@@ -190,7 +189,7 @@ export class ClientConnectionHolder {
           args,
           outputFormat,
           expectedCardinality,
-          this.options.session,
+          this.options,
           false /* privilegedMode */,
           language,
         );
@@ -581,33 +580,28 @@ export class Client implements Executor {
     return new Client(this.pool, this.options.withRetryOptions(opts));
   }
 
-  withSession(session: Session): Client {
-    return new Client(this.pool, this.options.withSession(session));
-  }
-
   withModuleAliases(aliases: Record<string, string>) {
     return new Client(
       this.pool,
-      this.options.withSession(this.options.session.withModuleAliases(aliases)),
+      this.options.withModuleAliases(aliases),
     );
   }
 
   withConfig(config: SimpleConfig): Client {
-    const newConfig = this.options.session.withConfig(config);
-    return new Client(this.pool, this.options.withSession(newConfig));
+    return new Client(this.pool, this.options.withConfig(config));
   }
 
   withGlobals(globals: Record<string, any>): Client {
     return new Client(
       this.pool,
-      this.options.withSession(this.options.session.withGlobals(globals)),
+      this.options.withGlobals(globals),
     );
   }
 
   withQueryTag(tag: string | null): Client {
     return new Client(
       this.pool,
-      this.options.withSession(this.options.session.withQueryTag(tag)),
+      this.options.withQueryTag(tag),
     );
   }
 
@@ -775,7 +769,7 @@ export class Client implements Executor {
         query,
         OutputFormat.BINARY,
         Cardinality.MANY,
-        this.options.session,
+        this.options,
       );
       const cardinality = util.parseCardinality(result[0]);
 

packages/driver/src/baseConn.ts

@@ -48,7 +48,7 @@ import * as chars from "./primitives/chars";
 import Event from "./primitives/event";
 import LRU from "./primitives/lru";
 import type { SerializedSessionState } from "./options";
-import { Session } from "./options";
+import { Options } from "./options";
 
 export const PROTO_VER: ProtocolVersion = [3, 0];
 export const PROTO_VER_MIN: ProtocolVersion = [0, 9];
@@ -138,7 +138,7 @@ export class BaseRawConnection {
   isLegacyProtocol = false;
 
   protected stateCodec: ICodec = INVALID_CODEC;
-  protected stateCache = new WeakMap<Session, Uint8Array>();
+  protected stateCache = new WeakMap<Options, Uint8Array>();
   lastStateUpdate: SerializedSessionState | null = null;
 
   protected adminUIMode = false;
@@ -894,7 +894,7 @@ export class BaseRawConnection {
     query: string,
     outputFormat: OutputFormat,
     expectedCardinality: Cardinality,
-    state: Session,
+    state: Options,
     capabilitiesFlags: number,
     options: QueryOptions | undefined,
     language: Language,
@@ -936,7 +936,7 @@ export class BaseRawConnection {
     );
     wb.writeString(query);
 
-    if (!this.adminUIMode && state === Session.defaults()) {
+    if (!this.adminUIMode && state.isDefaultSession()) {
       wb.writeBuffer(NULL_CODEC.tidBuffer);
       wb.writeInt32(0);
     } else {
@@ -959,7 +959,7 @@ export class BaseRawConnection {
     query: string,
     outputFormat: OutputFormat,
     expectedCardinality: Cardinality,
-    state: Session,
+    state: Options,
     capabilitiesFlags: number = RESTRICTED_CAPABILITIES,
     options?: QueryOptions,
   ): Promise<ParseResult> {
@@ -1082,7 +1082,7 @@ export class BaseRawConnection {
     args: QueryArgs,
     outputFormat: OutputFormat,
     expectedCardinality: Cardinality,
-    state: Session,
+    state: Options,
     inCodec: ICodec,
     outCodec: ICodec,
     result: any[] | WriteBuffer,
@@ -1256,7 +1256,7 @@ export class BaseRawConnection {
     args: QueryArgs = null,
     outputFormat: OutputFormat,
     expectedCardinality: Cardinality,
-    state: Session,
+    state: Options,
     privilegedMode = false,
     language: Language = Language.EDGEQL,
   ): Promise<{ result: any; warnings: errors.EdgeDBError[] }> {
@@ -1307,7 +1307,7 @@ export class BaseRawConnection {
 
       if (
         (!inCodec && args !== null) ||
-        (this.stateCodec === INVALID_CODEC && state !== Session.defaults())
+        (this.stateCodec === INVALID_CODEC && !state.isDefaultSession())
       ) {
         [card, inCodec, outCodec, _, _, _, warnings] = await this._parse(
           language,
@@ -1353,7 +1353,7 @@ export class BaseRawConnection {
         }
       }
     } else {
-      if (state !== Session.defaults()) {
+      if (!state.isDefaultSession()) {
         throw new errors.InterfaceError(
           `setting session state is not supported in this version of ` +
             `EdgeDB. Upgrade to EdgeDB 2.0 or newer.`,
@@ -1491,7 +1491,7 @@ export class BaseRawConnection {
           undefined,
           OutputFormat.NONE,
           Cardinality.NO_RESULT,
-          Session.defaults(),
+          Options.defaults(),
           true,
         );
       } catch {

packages/driver/src/fetchConn.ts

@@ -40,7 +40,7 @@ import {
   type QueryArgs,
   type QueryOptions,
 } from "./ifaces";
-import type { Session } from "./options";
+import type { Options } from "./options";
 import { WriteBuffer } from "./primitives/buffer";
 import * as chars from "./primitives/chars";
 import Event from "./primitives/event";
@@ -209,7 +209,7 @@ export class AdminUIFetchConnection extends BaseFetchConnection {
   public async rawParse(
     language: Language,
     query: string,
-    state: Session,
+    state: Options,
     options?: QueryOptions,
     abortSignal?: AbortSignal | null,
   ): Promise<
@@ -239,7 +239,7 @@ export class AdminUIFetchConnection extends BaseFetchConnection {
   public async rawExecute(
     language: Language,
     query: string,
-    state: Session,
+    state: Options,
     outCodec?: ICodec,
     options?: QueryOptions,
     inCodec?: ICodec,

packages/driver/src/ifaces.ts

@@ -59,6 +59,15 @@ export interface Executor {
   queryRequiredSingleJSON(query: string, args?: QueryArgs): Promise<string>;
 }
 
+interface UserCodec {
+  encode(value: any): any;
+  decode(value: any): any;
+}
+
+export type UserCodecs = {
+  [typeName: string]: UserCodec;
+}
+
 export interface KnownServerSettings {
   suggested_pool_concurrency?: number;
   system_config?: any;

packages/driver/src/index.node.ts

@@ -31,7 +31,7 @@ export {
   IsolationLevel,
   RetryCondition,
   RetryOptions,
-  Session,
+  Options,
 } from "./options";
 export { defaultBackoff, logWarnings, throwWarnings } from "./options";
 export type { BackoffFunction } from "./options";