Build from edgedb-js 3d789fb906d50101035862d31f93103dc8bccac0

edgedb · Mar 1, 2023 · 827c229 · 827c229
1 parent c306d2d
commit 827c229
Show file tree

Hide file tree

Showing 3 changed files with 80 additions and 13 deletions.
diff --git a/_src/codecs/array.ts b/_src/codecs/array.ts
@@ -21,6 +21,7 @@ import {WriteBuffer, ReadBuffer} from "../primitives/buffer.ts";
 import {TupleCodec} from "./tuple.ts";
 import {RangeCodec} from "./range.ts";
 import {InvalidArgumentError, ProtocolError} from "../errors/index.ts";
+import {NamedTupleCodec} from "./namedtuple.ts";
 
 export class ArrayCodec extends Codec implements ICodec {
   private subCodec: ICodec;
@@ -37,10 +38,13 @@ export class ArrayCodec extends Codec implements ICodec {
       !(
         this.subCodec instanceof ScalarCodec ||
         this.subCodec instanceof TupleCodec ||
+        this.subCodec instanceof NamedTupleCodec ||
         this.subCodec instanceof RangeCodec
       )
     ) {
-      throw new InvalidArgumentError("only arrays of scalars are supported");
+      throw new InvalidArgumentError(
+        "only arrays of scalars or tuples are supported"
+      );
     }
 
     if (!Array.isArray(obj) && !isTypedArray(obj)) {

diff --git a/_src/codecs/namedtuple.ts b/_src/codecs/namedtuple.ts
@@ -23,7 +23,8 @@ import {
   InvalidArgumentError,
   MissingArgumentError,
   UnknownArgumentError,
-  ProtocolError
+  ProtocolError,
+  QueryArgumentError
 } from "../errors/index.ts";
 
 export class NamedTupleCodec extends Codec implements ICodec, IArgsCodec {
@@ -38,10 +39,52 @@ export class NamedTupleCodec extends Codec implements ICodec, IArgsCodec {
     this.namesSet = new Set(names);
   }
 
-  encode(_buf: WriteBuffer, _object: any): void {
-    throw new InvalidArgumentError(
-      "Named tuples cannot be passed in query arguments"
-    );
+  encode(buf: WriteBuffer, object: any): void {
+    if (typeof object !== "object" || Array.isArray(object)) {
+      throw new InvalidArgumentError(
+        `an object was expected, got "${object}"`
+      );
+    }
+
+    const codecsLen = this.subCodecs.length;
+
+    if (Object.keys(object).length !== codecsLen) {
+      throw new QueryArgumentError(
+        `expected ${codecsLen} element${
+          codecsLen === 1 ? "" : "s"
+        } in named tuple, got ${Object.keys(object).length}`
+      );
+    }
+
+    const elemData = new WriteBuffer();
+    for (let i = 0; i < codecsLen; i++) {
+      const key = this.names[i];
+      const val = object[key];
+
+      if (val == null) {
+        throw new MissingArgumentError(
+          `element '${key}' in named tuple cannot be 'null'`
+        );
+      } else {
+        elemData.writeInt32(0); // reserved
+        try {
+          this.subCodecs[i].encode(elemData, val);
+        } catch (e) {
+          if (e instanceof QueryArgumentError) {
+            throw new InvalidArgumentError(
+              `invalid element '${key}' in named tuple: ${e.message}`
+            );
+          } else {
+            throw e;
+          }
+        }
+      }
+    }
+
+    const elemBuf = elemData.unwrap();
+    buf.writeInt32(4 + elemBuf.length);
+    buf.writeInt32(codecsLen);
+    buf.writeBuffer(elemBuf);
   }
 
   encodeArgs(args: any): Uint8Array {

diff --git a/_src/codecs/tuple.ts b/_src/codecs/tuple.ts
@@ -20,7 +20,12 @@ import {KNOWN_TYPENAMES} from "./consts.ts";
 
 import {ICodec, Codec, uuid, IArgsCodec, CodecKind} from "./ifaces.ts";
 import {ReadBuffer, WriteBuffer} from "../primitives/buffer.ts";
-import {InvalidArgumentError, ProtocolError} from "../errors/index.ts";
+import {
+  InvalidArgumentError,
+  MissingArgumentError,
+  ProtocolError,
+  QueryArgumentError
+} from "../errors/index.ts";
 
 export class TupleCodec extends Codec implements ICodec, IArgsCodec {
   private subCodecs: ICodec[];
@@ -30,9 +35,9 @@ export class TupleCodec extends Codec implements ICodec, IArgsCodec {
     this.subCodecs = codecs;
   }
 
-  encode(buf: WriteBuffer, object: any): void {
+  encode(buf: WriteBuffer, object: any, allowNull: boolean = false): void {
     if (!Array.isArray(object)) {
-      throw new InvalidArgumentError(`an array was expected, got ${object}`);
+      throw new InvalidArgumentError(`an array was expected, got "${object}"`);
     }
 
     const codecs = this.subCodecs;
@@ -55,10 +60,25 @@ export class TupleCodec extends Codec implements ICodec, IArgsCodec {
       const elem = object[i];
       elemData.writeInt32(0); // reserved bytes
       if (elem == null) {
-        elemData.writeInt32(-1);
+        if (allowNull) {
+          elemData.writeInt32(-1);
+        } else {
+          throw new MissingArgumentError(
+            `element at index ${i} in tuple cannot be 'null'`
+          );
+        }
       } else {
-        const codec = codecs[i];
-        codec.encode(elemData, elem);
+        try {
+          codecs[i].encode(elemData, elem);
+        } catch (e) {
+          if (e instanceof QueryArgumentError) {
+            throw new InvalidArgumentError(
+              `invalid element at index ${i} in tuple: ${e.message}`
+            );
+          } else {
+            throw e;
+          }
+        }
       }
     }
 
@@ -84,7 +104,7 @@ export class TupleCodec extends Codec implements ICodec, IArgsCodec {
     }
 
     const buf = new WriteBuffer();
-    this.encode(buf, args);
+    this.encode(buf, args, true);
     return buf.unwrap();
   }