Fix linkprop card issuee (#439)

* Fix linkprop card issuee

* 0.22.3

* Fix card in scopify

package.json

@@ -1,6 +1,6 @@
 {
   "name": "edgedb",
-  "version": "0.22.2",
+  "version": "0.22.3",
   "description": "The official Node.js client library for EdgeDB",
   "homepage": "https://edgedb.com/docs",
   "author": "EdgeDB <[email protected]>",

qb/playground.ts

@@ -8,11 +8,14 @@ async function run() {
   console.log(`~~~~~~~~~~~~~~~~~~~~~~~~~~~`);
 
   // const query = e.for(e.Bag, bag => {});
-  const query = e.select(e.Movie, movie => ({
-    id: true,
-    title: true,
-    filter: e.op(movie.genre, "=", e.Genre.Action),
-  }));
+
+  const query = e.select(e.Movie.characters, c => {
+    console.log(c["@character_name"].__cardinality__);
+    return {
+      name: true,
+      // ["@character_name"]: true,
+    };
+  });
   console.log(query.toEdgeQL());
   const result = await query.run(client);
   console.log(JSON.stringify(result, null, 2));

qb/test/select.test.ts

@@ -1193,6 +1193,20 @@ test("filter on link prop in nested path", async () => {
   await query.run(client);
 });
 
+test("cardinality of linkprop in scopified object", async () => {
+  const query = e.select(e.Movie.characters, c => {
+    expect(c["@character_name"].__cardinality__).toEqual(
+      $.Cardinality.AtMostOne
+    );
+    return {
+      name: true,
+      // doesn't work yet
+      // ["@character_name"]: true,
+    };
+  });
+  await query.run(client);
+});
+
 // EdgeQL limitation
 // test("link prop on backlink", async()=>{
 //   const query = e.select(e.Person, person => ({

src/reflection/path.ts

@@ -48,12 +48,7 @@ export type $linkPropify<Root extends ObjectTypeSet> = Root extends {
       any,
       any
     >
-    ? pathifyLinkProps<
-        // tslint:disable-next-line
-        LinkProps,
-        Root,
-        PathParent<Parent, L>
-      >
+    ? pathifyLinkProps<LinkProps, Root, PathParent<Parent, L>>
     : {}
   : unknown;
 

src/syntax/select.ts

@@ -706,7 +706,12 @@ export function select<
 >(
   expr: Expr,
   shape: (
-    scope: $scopify<Expr["__element__"]> & $linkPropify<Expr>
+    scope: $scopify<Expr["__element__"]> &
+      $linkPropify<{
+        [k in keyof Expr]: k extends "__cardinality__"
+          ? Cardinality.One
+          : Expr[k];
+      }>
   ) => Readonly<Shape>
 ): $expr_Select<{
   __element__: ObjectType<