Infer expression cardinality for Object UUID casts (#912)

edgedb · Mar 19, 2024 · 3676ed2 · 3676ed2
1 parent f9f39c9
commit 3676ed2
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 4 deletions.
diff --git a/integration-tests/lts/casts.test.ts b/integration-tests/lts/casts.test.ts
@@ -3,7 +3,7 @@ import e from "./dbschema/edgeql-js";
 import type { $Movie } from "./dbschema/edgeql-js/modules/default";
 
 import { setupTests, tc, teardownTests } from "./setupTeardown";
-import type { Client } from "edgedb";
+import type { Client, $ } from "edgedb";
 
 describe("casts", () => {
   let client: Client;
@@ -47,6 +47,7 @@ describe("casts", () => {
     assert.equal(expr.toEdgeQL(), `<default::Movie>{}`);
 
     tc.assert<tc.IsExact<(typeof expr)["__element__"], $Movie>>(true);
+    tc.assert<tc.IsExact<(typeof expr)["__cardinality__"], $.Cardinality.Empty>>(true);
   });
 
   test("UUID to object cast", () => {
@@ -61,8 +62,26 @@ describe("casts", () => {
     );
 
     tc.assert<tc.IsExact<(typeof expr)["__element__"], $Movie>>(true);
+    tc.assert<tc.IsExact<(typeof expr)["__cardinality__"], $.Cardinality.One>>(true);
 
     // @ts-expect-error: does not allow assignment of non UUID
     e.cast(e.Movie, 42);
   });
+
+  test("multiple UUIDs to object cast", () => {
+    const ids = e.cast(e.uuid, e.set(
+      "00000000-0000-0000-0000-000000000000",
+      "00000000-0000-0000-0000-000000000001",
+      "00000000-0000-0000-0000-000000000002",
+    ));
+    const expr = e.cast(e.Movie, ids);
+
+    assert.equal(
+      expr.toEdgeQL(),
+      `<default::Movie>(<std::uuid>({ "00000000-0000-0000-0000-000000000000", "00000000-0000-0000-0000-000000000001", "00000000-0000-0000-0000-000000000002" }))`
+    );
+
+    tc.assert<tc.IsExact<(typeof expr)["__element__"], $Movie>>(true);
+    tc.assert<tc.IsExact<(typeof expr)["__cardinality__"], $.Cardinality.AtLeastOne>>(true);
+  });
 });
diff --git a/packages/generate/src/syntax/cast.ts b/packages/generate/src/syntax/cast.ts
@@ -21,10 +21,13 @@ export function cast<Target extends BaseType | ObjectTypeExpression>(
     : never,
   Cardinality.Empty
 >;
-export function cast<Target extends ObjectTypeExpression>(
+export function cast<
+  Target extends ObjectTypeExpression,
+  Card extends Cardinality
+>(
   target: Target,
-  arg: TypeSet<ScalarType<"std::uuid">>
-): $expr_Cast<Target["__element__"], Cardinality.One>;
+  arg: TypeSet<ScalarType<"std::uuid">, Card>
+): $expr_Cast<Target["__element__"], Card>;
 export function cast<Target extends BaseType, Expr extends TypeSet>(
   target: Target,
   expr: orScalarLiteral<Expr>