@cap-js/cds-types 0.7.0 → 0.8.0

package/dist/cds-types.d.ts

@@ -247,6 +247,7 @@ namespace cds {
         get,
         load,
         resolve,
+        minify,
         reflect,
         _flavor,
         _odata_options,
@@ -364,8 +365,7 @@ namespace cds {
         operator,
         function_call,
         enum_literal,
-        expr_literal,
-        minify
+        expr_literal
     }
 }
 
@@ -390,7 +390,9 @@ export interface cds_serve_fluent {
     // (req,res) : void
 }
 
-export type cds_services = { [name: string]: Service }
+export interface cds_services {
+    [name: string]: Service
+}
 
 export type CdsFunction = {
     (...args: any[]): any,
@@ -837,6 +839,7 @@ export namespace default_2 {
         get,
         load,
         resolve,
+        minify,
         reflect,
         _flavor,
         _odata_options,
@@ -954,8 +957,7 @@ export namespace default_2 {
         operator,
         function_call,
         enum_literal,
-        expr_literal,
-        minify
+        expr_literal
     }
 }
 
@@ -1222,6 +1224,10 @@ class Event_2 extends EventContext {
 
     headers: any
 
+    before(phase: 'commit', handler: () => void)
+
+    on(phase: 'succeeded' | 'failed' | 'done', handler: () => void)
+
 }
 export { Event_2 as Event }
 
@@ -1824,7 +1830,7 @@ export const middlewares: {
  * Minifies a given CSN model by removing all unused1 types and aspects, as well all entities tagged with `@cds.persistence.skip:'if-unused'`
  * @see [capire](https://cap.cloud.sap/docs/node.js/cds-compile#cds-minify)
  */
-export function minify (model: CSN): CSN
+export function minify (model: csn.CSN): csn.CSN
 
 /**
  * Allows arbitrary property access. Can be used for explicitly casting
@@ -1870,6 +1876,7 @@ namespace models {
         get,
         load,
         resolve,
+        minify,
         reflect,
         _flavor,
         _odata_options,
@@ -2018,7 +2025,7 @@ interface OrderBy<T> {
 }
 
 /** @private */
-export type ordering_term = expr & { sort?: 'asc' | 'desc', nulls?: 'first' | 'last' }
+export type ordering_term = UnionToIntersection<expr> & { sort?: 'asc' | 'desc', nulls?: 'first' | 'last' }
 
 export const outboxed: (service: Service) => Service;
 
@@ -2360,19 +2367,23 @@ type SELECT_2 = { SELECT: {
         columns?: column_expr[],
         excluding?: string[],
         where?: predicate,
-        having?: predicate,
         groupBy?: expr[],
+        having?: predicate,
         orderBy?: ordering_term[],
         limit?: { rows: val, offset: val },
+        forUpdate?: { wait: number },
+        forShareLock?: { wait: number },
+        search?: predicate,
+        count?: boolean,
     }, }
 export { SELECT_2 as SELECT }
 
 interface SELECT_3<T> extends Where<T>, And, Having<T>, GroupBy, OrderBy<T>, Limit {
     // overload specific to SELECT
-    columns: Columns<T, SELECT_3<T>>['columns'] & ((projection: Projection<T>) => this)
+    columns: Columns<T, this>['columns'] & ((projection: Projection<T>) => this)
 }
 
-class SELECT_3<T> extends ConstructedQuery<T> {
+class SELECT_3<T, Q = SELECT_from> extends ConstructedQuery<T> {
     private constructor();
 
     static one: SELECT_one & { from: SELECT_one } & { localized: SELECT_one }
@@ -2383,7 +2394,7 @@ class SELECT_3<T> extends ConstructedQuery<T> {
 
     static localized: SELECT_from & { from: SELECT_from }
 
-    from: SELECT_from
+    from: Q  // SELECT_from | SELECT_one
     & TaggedTemplateQueryPart<this>
     & ((entity: EntityDescription, primaryKey?: PK, projection?: Projection<unknown>) => this)
 
@@ -2454,22 +2465,22 @@ projection?: Projection<InstanceType<T>>
 ) => Awaitable<SELECT_3<InstanceType<T>>, InstanceType<T>>)
 
 type SELECT_one =
-TaggedTemplateQueryPart<Awaitable<SELECT_3<_TODO_2>, InstanceType<_TODO_2>>>
+TaggedTemplateQueryPart<Awaitable<SELECT_3<_TODO_2, SELECT_one>, InstanceType<_TODO_2>>>
 &
 // calling with class
 (<T extends ArrayConstructable>
 (entityType: T, projection?: Projection<QLExtensions<SingularInstanceType<T>>>)
-=> Awaitable<SELECT_3<SingularInstanceType<T>>, SingularInstanceType<T>>)
+=> Awaitable<SELECT_3<SingularInstanceType<T>, SELECT_one>, SingularInstanceType<T>>)
 &
 (<T extends ArrayConstructable>
 (entityType: T, primaryKey: PK, projection?: Projection<QLExtensions<SingularInstanceType<T>>>)
-=> Awaitable<SELECT_3<SingularInstanceType<T>>, SingularInstanceType<T>>)
+=> Awaitable<SELECT_3<SingularInstanceType<T>, SELECT_one>, SingularInstanceType<T>>)
 
-& ((entity: EntityDescription, primaryKey?: PK, projection?: Projection<unknown>) => SELECT_3<_TODO_2>)
-& (<T> (entity: T[], projection?: Projection<T>) => Awaitable<SELECT_3<T>, T>)
-& (<T> (entity: T[], primaryKey: PK, projection?: Projection<T>) => Awaitable<SELECT_3<T>, T>)
-& (<T> (entity: { new(): T }, projection?: Projection<T>) => Awaitable<SELECT_3<T>, T>)
-& (<T> (entity: { new(): T }, primaryKey: PK, projection?: Projection<T>) => Awaitable<SELECT_3<T>, T>)
+& ((entity: EntityDescription, primaryKey?: PK, projection?: Projection<unknown>) => SELECT_3<_TODO_2, SELECT_one>)
+& (<T> (entity: T[], projection?: Projection<T>) => Awaitable<SELECT_3<T, SELECT_one>, T>)
+& (<T> (entity: T[], primaryKey: PK, projection?: Projection<T>) => Awaitable<SELECT_3<T, SELECT_one>, T>)
+& (<T> (entity: { new(): T }, projection?: Projection<T>) => Awaitable<SELECT_3<T, SELECT_one>, T>)
+& (<T> (entity: { new(): T }, primaryKey: PK, projection?: Projection<T>) => Awaitable<SELECT_3<T, SELECT_one>, T>)
 & ((subject: ref) => SELECT_3<_TODO_2>)
 
 /**
@@ -2888,6 +2899,8 @@ export const test: {
     (command: string, ...args: string[]): Test,
 
     in (dirname: string): Test,
+
+    log: Test['log'],
 };
 
 class Time extends date { }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cap-js/cds-types",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "description": "Type definitions for main packages of CAP, like `@sap/cds`",
   "repository": "github:cap-js/cds-types",
   "homepage": "https://cap.cloud.sap/",