fix: fixes issues in ql SELECT.from(...) when using typer classes

CHANGELOG.md

@@ -11,6 +11,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - Added missing type for `cds.context.model`
 - Added missing type for `req.query.elements`
 - Made constructors for query parts (`SELECT`, `UPDATE`, `DELETE`, ...) private, as they should only be accessed statically
+- `SELECT` returns a single instance now when specifying a primary key
 
 ### Added
 - `cds.app` typed as express.js application

apis/ql.d.ts

@@ -167,7 +167,7 @@ type SELECT_from =
     entityType: T,
     primaryKey: PK,
     columns: string[]  // could be keyof in the future
-  ) => Awaitable<SELECT<PluralInstanceType<T>>, PluralInstanceType<T>>)
+  ) => Awaitable<SELECT<InstanceType<T>>, InstanceType<T>>)
   & (<T extends Constructable>(
     entityType: T,
     projection?: Projection<InstanceType<T>>
@@ -176,7 +176,7 @@ type SELECT_from =
     entityType: T,
     primaryKey: PK,
     projection?: Projection<InstanceType<T>>
-  ) => Awaitable<SELECT<PluralInstanceType<T>>, PluralInstanceType<T>>)
+  ) => Awaitable<SELECT<InstanceType<T>>, InstanceType<T>>)
   // currently no auto completion of columns, due to complexity
 
 export interface INSERT<T> extends Columns<T>, InUpsert<T> {}

test/typescript/apis/project/cds-ql.ts

@@ -19,12 +19,10 @@ new DROP;
 // unwrapped plural types
 let sel: SELECT<Foos>
 sel = SELECT(Foo)
-sel = SELECT(Foo, 42)
 sel = SELECT(Foo.drafts)
 sel = SELECT(Foos.drafts)
 sel = SELECT.from(Foo.drafts)
 sel = SELECT.from(Foos.drafts)
-sel = SELECT.from(Foos.drafts, 42)
 
 let selSingular: SELECT<Foo> = undefined as unknown as SELECT<Foo>
 selSingular.columns('ref')  // auto suggested
@@ -116,6 +114,30 @@ DELETE([Foo, Foos])
 
 let selectOne: Foo
 let selectMany: Foos
+
+// SINGULAR TESTS
+selectOne = await SELECT.from(Foos.drafts, 42) // .drafts of plural still singular
+selectOne = await SELECT.from(Foo.drafts, 42)
+selectOne = await SELECT(Foo, 42)
+// explicitly select one
+selectOne = await SELECT.one.from(Foo)
+selectOne = await SELECT.one.from(Foo, 42)
+selectOne = await SELECT.one.from(Foo, 42)
+selectOne = await SELECT.one.from(Foo, 42, f => f.x)
+selectOne = await SELECT.one.from(Foo, f => f.x)
+selectOne = await SELECT.one.from(Foo).alias('Bars')
+// implicitly select one by specifying a key
+selectOne = await SELECT.from(Foo, 42)
+selectOne = await SELECT.from(Foo, 42, ["x"])
+selectOne = await SELECT.from(Foo, 42, (f: Foo) => f.x)
+
+selectMany = await SELECT.from(Foo)
+selectMany = await SELECT.from(Foo, (f: Foo) => f.x)
+selectMany = await SELECT.from(Foo).alias('Bars')
+await SELECT.from(Foo, f => attach(f.ref)('*'))
+
+// PLURAL TESTS
+selectOne = await SELECT(Foos, 42)
 // explicitly select one
 selectOne = await SELECT.one.from(Foos)
 selectOne = await SELECT.one.from(Foos, 42)
@@ -124,6 +146,7 @@ selectOne = await SELECT.one.from(Foos, f => f.x)
 selectOne = await SELECT.one.from(Foos).alias('Bars')
 // implicitly select one by specifying a key
 selectOne = await SELECT.from(Foos, 42)
+selectOne = await SELECT.from(Foos, 42)
 selectOne = await SELECT.from(Foos, 42, (f: Foo) => f.x)
 
 selectMany = await SELECT.from(Foos)