Tweak tuple type emission for nesting

edgedb · Mar 5, 2024 · fdf4a5b · fdf4a5b
1 parent fd2cf31
commit fdf4a5b
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/packages/driver/src/reflection/analyzeQuery.ts b/packages/driver/src/reflection/analyzeQuery.ts
@@ -149,7 +149,8 @@ export const defaultCodecGenerators: CodecGeneratorMap = new Map([
     const subCodecs = codec
       .getSubcodecs()
       .map((subCodec) => ctx.walk(subCodec));
-    return `${ctx.readonly ? "readonly " : ""}[${subCodecs.join(", ")}]`;
+    const tuple = `[${subCodecs.join(", ")}]`;
+    return ctx.readonly ? `(readonly ${tuple})` : tuple;
   }),
   genDef(ArrayCodec, (codec, ctx) =>
     ctx.applyCardinality(ctx.walk(codec.getSubcodecs()[0]), Cardinality.Many)
@@ -216,13 +217,15 @@ export const defaultApplyCardinalityToTsType =
   (type: string, cardinality: Cardinality): string => {
     switch (cardinality) {
       case Cardinality.Many:
-        return `${ctx.readonly ? "readonly " : ""}${type}[]`;
+        return `${ctx.readonly ? "Readonly" : ""}Array<${type}>`;
       case Cardinality.One:
         return type;
       case Cardinality.AtMostOne:
         return `${type} | null`;
-      case Cardinality.AtLeastOne:
-        return `${ctx.readonly ? "readonly " : ""}[(${type}), ...(${type})[]]`;
+      case Cardinality.AtLeastOne: {
+        const tuple = `[(${type}), ...(${type})[]]`;
+        return ctx.readonly ? `(readonly ${tuple})` : tuple;
+      }
     }
     throw new Error(`Unexpected cardinality: ${cardinality}`);
   };