Update to latest edgedb driver with new codec handling

Author: jaclarke

shared/common/components/resultGrid/index.tsx

@@ -164,7 +164,11 @@ export const ResultGridContent = observer(function ResultGridContent({
               indexOffset -
               rowIndex
             }
-            data={header.name ? data[dataIndex][header.name] : data[dataIndex]}
+            data={
+              header.key != null
+                ? data[dataIndex][header.key]
+                : data[dataIndex]
+            }
           />
         );
         dataIndex += 1;

shared/common/components/resultGrid/state.ts

@@ -4,6 +4,7 @@ import {SetCodec} from "edgedb/dist/codecs/set";
 import {DataGridState} from "../dataGrid/state";
 import {assertNever} from "../../utils/assertNever";
 import {NamedTupleCodec} from "edgedb/dist/codecs/namedtuple";
+import {RecordCodec} from "edgedb/dist/codecs/record";
 
 export function createResultGridState(codec: ICodec, data: any[]) {
   return new ResultGridState(codec, data);
@@ -15,6 +16,7 @@ export interface GridHeader {
   id: string;
   parent: GridHeader | null;
   name: string | null;
+  key: string | number | null;
   multi: boolean;
   codec: ICodec;
   typename: string;
@@ -76,7 +78,7 @@ export class ResultGridState {
       ? tops.findIndex((top) => top > offsetRowIndex) - 1
       : offsetRowIndex;
     return {
-      data: parentData[dataIndex]?.[header.parent.name!] ?? [],
+      data: parentData[dataIndex]?.[header.parent.key!] ?? [],
       indexOffset: indexOffset + (tops ? tops[dataIndex] : dataIndex),
       endIndex: indexOffset + (tops ? tops[dataIndex + 1] : dataIndex + 1),
     };
@@ -97,8 +99,8 @@ function _getRowTops(
       if (!header.multi) continue;
       const colHeight =
         header.subHeaders && header.subHeaders[0].name !== null
-          ? _getRowTops(topsMap, item[header.name!], header.subHeaders)
-          : item[header.name!].length;
+          ? _getRowTops(topsMap, item[header.key!], header.subHeaders)
+          : item[header.key!].length;
       if (colHeight > height) {
         height = colHeight;
       }
@@ -139,6 +141,7 @@ function _getHeaders(
           id: parent ? `${parent.id}.${field.name}` : field.name,
           parent,
           name: field.name,
+          key: field.name,
           multi,
           codec: subcodec,
           typename: getTypename(subcodec),
@@ -165,6 +168,7 @@ function _getHeaders(
                 id: `${header.id}.__multi__`,
                 parent: header,
                 name: null,
+                key: null,
                 multi: false,
                 codec: subcodec,
                 typename: getTypename(subcodec),
@@ -180,6 +184,31 @@ function _getHeaders(
       }
     }
     return {headers, colCount};
+  } else if (codec instanceof RecordCodec) {
+    const subcodecs = codec.getSubcodecs();
+    const headers: GridHeader[] = [];
+    let i = 0;
+    const names = codec.getNames();
+    for (const name of names) {
+      const subcodec = subcodecs[i];
+      const startIndex = indexStart + i;
+      const header: GridHeader = {
+        id: name,
+        parent,
+        name: name,
+        key: i,
+        multi: false,
+        codec: subcodec,
+        typename: getTypename(subcodec),
+        depth,
+        startIndex,
+        span: 1,
+        subHeaders: null,
+      };
+      headers.push(header);
+      i++;
+    }
+    return {headers, colCount: headers.length};
   }
   throw new Error(`unexpected codec kind: ${codec.getKind()}`);
 }
@@ -197,6 +226,7 @@ function getTypename(codec: ICodec): string {
     case "scalar":
     case "object":
     case "sparse_object":
+    case "record":
       return codec.getKnownTypeName();
     case "array":
     case "range":

shared/common/decodeRawBuffer/index.ts

@@ -1,4 +1,4 @@
-import {_CodecsRegistry, _ReadBuffer, _ICodec} from "edgedb";
+import {_CodecsRegistry, _ReadBuffer, _ICodec, Options} from "edgedb";
 import type {ProtocolVersion} from "edgedb/dist/ifaces";
 
 export type EdgeDBSet = Array<any> & {_codec: _ICodec};
@@ -7,6 +7,7 @@ export function decode(
   registry: InstanceType<typeof _CodecsRegistry>,
   outCodecBuf: Uint8Array,
   resultBuf: Uint8Array,
+  options: Options,
   protocolVersion: ProtocolVersion = [0, 10]
 ): EdgeDBSet | null {
   let result: EdgeDBSet | null = null;
@@ -28,7 +29,7 @@ export function decode(
 
       buf.sliceInto(codecReadBuf, len - 4);
       codecReadBuf.discard(6);
-      const val = codec.decode(codecReadBuf);
+      const val = codec.decode(codecReadBuf, options.makeCodecContext());
       result.push(val);
     }
 

shared/common/package.json

@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "private": true,
   "peerDependencies": {
-    "edgedb": "1.6.0-canary.20241206T104839",
+    "edgedb": "1.6.0-canary.20250111T054901",
     "react": "^18.0.0",
     "react-dom": "^18.0.0"
   },

shared/inspector/buildItem.tsx

@@ -4,6 +4,7 @@ import {_ICodec} from "edgedb";
 import {CodecKind} from "edgedb/dist/codecs/ifaces";
 import {ObjectCodec} from "edgedb/dist/codecs/object";
 import {NamedTupleCodec} from "edgedb/dist/codecs/namedtuple";
+import {RecordCodec} from "edgedb/dist/codecs/record";
 
 import {buildScalarItem} from "./buildScalar";
 
@@ -16,6 +17,7 @@ export enum ItemType {
   Object,
   Tuple,
   NamedTuple,
+  Record,
   Scalar,
   Other,
 }
@@ -40,7 +42,7 @@ export interface ArrayLikeItem extends _BaseItem {
 }
 
 export interface ObjectLikeItem extends _BaseItem {
-  type: ItemType.Object | ItemType.NamedTuple;
+  type: ItemType.Object | ItemType.NamedTuple | ItemType.Record;
   data: {[key: string]: any};
   closingBracket: Item;
 }
@@ -299,12 +301,16 @@ export function expandItem(
       }
       break;
     case ItemType.NamedTuple:
+    case ItemType.Record:
       {
-        const fieldNames = (item.codec as NamedTupleCodec).getNames();
+        const fieldNames = (
+          item.codec as NamedTupleCodec | RecordCodec
+        ).getNames();
+        const isRecord = item.type === ItemType.Record;
         const subCodecs = item.codec.getSubcodecs();
 
         childItems = fieldNames.flatMap((fieldName, i) => {
-          const data = item.data[fieldName];
+          const data = item.data[isRecord ? i : fieldName];
 
           const id = `${item.id}.${i}`;
 
@@ -317,13 +323,13 @@ export function expandItem(
               label: (
                 <>
                   {fieldName}
-                  <span> := </span>
+                  <span>{isRecord ? ": " : " := "}</span>
                 </>
               ),
               fieldName: fieldName,
             },
             data,
-            fieldName,
+            isRecord ? i : fieldName,
             state.noMultiline,
             i < item.data.length - 1
           );
@@ -363,6 +369,7 @@ const itemTypes: {
   object: {type: ItemType.Object, brackets: "{}"},
   tuple: {type: ItemType.Tuple, brackets: "()"},
   namedtuple: {type: ItemType.NamedTuple, brackets: "()"},
+  record: {type: ItemType.Record, brackets: "()"},
   scalar: {type: ItemType.Scalar, brackets: ""},
 };
 

shared/inspector/package.json

@@ -4,7 +4,7 @@
   "version": "0.0.0",
   "license": "UNLICENSED",
   "peerDependencies": {
-    "edgedb": "1.6.0-canary.20241206T104839",
+    "edgedb": "1.6.0-canary.20250111T054901",
     "react": "^18.0.0",
     "react-dom": "^18.0.0"
   },

shared/inspector/renderJsonResult.ts

@@ -90,7 +90,8 @@ export function _renderToJson(
         .join(",\n")}\n${depth}]`;
     }
     case "object":
-    case "namedtuple": {
+    case "namedtuple":
+    case "record": {
       const subcodecs = codec.getSubcodecs();
       const explicitNum =
         codecKind === "object"
@@ -114,7 +115,7 @@ export function _renderToJson(
                 depth +
                   `  "${fieldName}": ` +
                   _renderToJson(
-                    val[fieldName],
+                    codecKind === "record" ? val[i] : val[fieldName],
                     subcodecs[i],
                     depth + "  ",
                     implicitLimit

shared/schemaGraph/package.json

@@ -4,7 +4,7 @@
   "version": "0.0.0",
   "license": "UNLICENSED",
   "peerDependencies": {
-    "edgedb": "1.6.0-canary.20241206T104839",
+    "edgedb": "1.6.0-canary.20250111T054901",
     "react": "^18.0.0",
     "react-dom": "^18.0.0"
   },

shared/studio/package.json

@@ -29,7 +29,7 @@
     "react-window": "^1.8.10"
   },
   "peerDependencies": {
-    "edgedb": "1.6.0-canary.20241206T104839",
+    "edgedb": "1.6.0-canary.20250111T054901",
     "react": "^18.0.0",
     "react-dom": "^18.0.0"
   },

shared/studio/state/connection.ts

@@ -10,7 +10,7 @@ import {
 } from "mobx-keystone";
 
 import {AuthenticationError} from "edgedb";
-import {Session} from "edgedb/dist/options";
+import {Options} from "edgedb/dist/options";
 import LRU from "edgedb/dist/primitives/lru";
 import {Capabilities} from "edgedb/dist/baseConn";
 import {AdminUIFetchConnection} from "edgedb/dist/fetchConn";
@@ -28,6 +28,7 @@ import {
   EdgeDBSet,
   QueryParams,
   codecsRegistry,
+  baseOptions,
 } from "../utils/decodeRawBuffer";
 import {instanceCtx} from "./instance";
 import {sessionStateCtx} from "./sessionState";
@@ -121,13 +122,12 @@ export function createAuthenticatedFetch({
   };
 }
 
-function setQueryTag(session: Session, tag: string) {
-  session = new Session({...session});
-  (session as any).annotations = new Map<string, string>(
-    (session as any).annotations
-  );
-  (session as any).annotations.set("tag", tag);
-  return session;
+function setQueryTag(options: Options, tag: string) {
+  const annos = new Map((options as any).annotations as Map<string, string>);
+  annos.set("tag", tag);
+  const clone = (options as any)._cloneWith({});
+  clone.annotations = annos;
+  return clone as Options;
 }
 
 @model("Connection")
@@ -154,7 +154,7 @@ export class Connection extends Model({
   get _state() {
     const sessionState = sessionStateCtx.get(this);
 
-    let state = Session.defaults();
+    let state = baseOptions;
 
     if (sessionState?.activeState.globals.length) {
       state = state.withGlobals(
@@ -283,10 +283,7 @@ export class Connection extends Model({
       let state = this._state;
 
       if (opts.ignoreSessionConfig) {
-        state = setQueryTag(
-          Session.defaults().withGlobals(state.globals),
-          "gel/ui"
-        );
+        state = setQueryTag(baseOptions.withGlobals(state.globals), "gel/ui");
       }
       if (opts.ignoreForceDatabaseError) {
         state = state.withConfig({force_database_error: "false"});
@@ -408,6 +405,7 @@ export class Connection extends Model({
         result: decode(
           outCodecBuf,
           resultBuf,
+          state,
           this.conn.protocolVersion,
           opts.newCodec
         ),

shared/studio/state/instance.ts

@@ -17,7 +17,7 @@ import {
 
 import {AuthenticationError} from "edgedb";
 
-import {Session} from "edgedb/dist/options";
+import {Options} from "edgedb/dist/options";
 import {AdminUIFetchConnection} from "edgedb/dist/fetchConn";
 import {OutputFormat, Cardinality} from "edgedb/dist/ifaces";
 import {codecsRegistry} from "../utils/decodeRawBuffer";
@@ -94,7 +94,7 @@ export class InstanceState extends Model({
         null,
         OutputFormat.BINARY,
         cardinality,
-        Session.defaults()
+        Options.defaults()
       )
     ).result;
   }

shared/studio/tabs/queryEditor/index.tsx

@@ -69,6 +69,7 @@ import {ICodec} from "edgedb/dist/codecs/ifaces";
 import {SplitViewDirection} from "@edgedb/common/ui/splitView/model";
 import {createPortal} from "react-dom";
 import {RelativeTime} from "@edgedb/common/utils/relativeTime";
+import {RecordCodec} from "edgedb/dist/codecs/record";
 
 export const QueryEditorView = observer(function QueryEditorView() {
   const editorState = useTabState(QueryEditor);
@@ -550,7 +551,8 @@ export function outputModeToggle(
   outputMode: OutputMode,
   setOutputMode: (mode: OutputMode) => void
 ) {
-  const tableOutputAvailable = codec instanceof ObjectCodec;
+  const tableOutputAvailable =
+    codec instanceof ObjectCodec || codec instanceof RecordCodec;
   const mode = tableOutputAvailable ? outputMode : OutputMode.Tree;
 
   return {

shared/studio/tabs/queryEditor/state/index.ts

@@ -30,7 +30,7 @@ import {
   QueryResultData,
 } from "../../../idbStore";
 
-import {EdgeDBSet, decode} from "../../../utils/decodeRawBuffer";
+import {EdgeDBSet, baseOptions, decode} from "../../../utils/decodeRawBuffer";
 import {
   ErrorDetails,
   extractErrorDetails,
@@ -416,6 +416,7 @@ export class QueryEditor extends Model({
           ? decode(
               resultData.outCodecBuf,
               resultData.resultBuf,
+              baseOptions,
               resultData.protoVer ?? [1, 0]
             )
           : null

shared/studio/tabs/repl/state/index.ts

@@ -22,7 +22,7 @@ import {
   extractErrorDetails,
 } from "../../../utils/extractErrorDetails";
 import {InspectorState, Item} from "@edgedb/inspector/state";
-import {decode, EdgeDBSet} from "../../../utils/decodeRawBuffer";
+import {baseOptions, decode, EdgeDBSet} from "../../../utils/decodeRawBuffer";
 import {CommandResult, handleSlashCommand} from "./commands";
 import {
   clearReplHistory,
@@ -326,6 +326,7 @@ export class Repl extends Model({
             ? decode(
                 resultData.outCodecBuf,
                 resultData.resultBuf,
+                baseOptions,
                 resultData.protoVer ?? [1, 0]
               )
             : null