@cap-js/cds-types 0.4.0 → 0.5.0

package/dist/cds-types.d.ts

@@ -7,17 +7,79 @@ import * as http from 'http';
 import { ReadableStream } from 'node:stream/web';
 import { RequestHandler } from 'express';
 
-export declare class action extends any_<'action' | 'function'> {}
+export declare type __any_ = classes.any_
+
+export declare type __array = classes.array
+
+export declare type __aspect = classes.aspect
+
+export declare type __Association = classes.Association
+
+export declare type __Binary = classes.Binary
+
+export declare type __Boolean = classes.Boolean
+
+export declare type __Composition = classes.Composition
+
+export declare type __context_ = classes.context_
+
+export declare type __Date = classes.Date
+
+export declare type __date = classes.date
+
+export declare type __DateTime = classes.DateTime
+
+export declare type __Decimal = classes.Decimal
+
+export declare type __Double = classes.Double
+
+export declare type __entity = classes.entity
+
+export declare type __Float = classes.Float
+
+export declare type __Int16 = classes.Int16
+
+export declare type __Int32 = classes.Int32
+
+export declare type __Int64 = classes.Int64
+
+export declare type __Integer = classes.Integer
+
+export declare type __LargeBinary = classes.LargeBinary
+
+export declare type __LargeString = classes.LargeString
+
+export declare type __scalar = classes.scalar
+
+export declare type __service = classes.service_
+
+export declare type __String = classes.String
+
+export declare type __struct = classes.struct
+
+export declare type __Time = classes.Time
+
+export declare type __TimeStamp = classes.TimeStamp
+
+export declare type __type = classes.type
+
+export declare type __UInt8 = classes.UInt8
+
+export declare type __UUID = classes.UUID
+
+export declare type __Vector = classes.Vector
+
+declare class action extends any_<'action' | 'function'> {}
 
 export declare interface ActionEventHandler<P, R> {
     (req: Omit<Request_2, 'data'> & { data: P }, next: Function): Promise<R> | R
 }
 
-export declare const any: typeof any_;
+declare const any: typeof any_;
 
-export declare interface any_ extends csn.any_ {}
+declare interface any_ extends csn.any_ {}
 
-export declare class any_<K extends kinds = kinds> {
+declare class any_<K extends kinds = kinds> {
     private _: K // break covariance
     constructor (...aspects: any[])
 
@@ -52,7 +114,7 @@ declare type _ArrayLike<T> = Iterable<T> & {
     find: (predicate: (element: T) => boolean) => T | undefined,
 }
 
-export declare class aspect<K extends kinds = 'aspect'> extends type<K> implements WithElements {
+declare class aspect<K extends kinds = 'aspect'> extends type<K> implements WithElements {
     elements: Definitions<type<'type'>>
 }
 
@@ -123,14 +185,13 @@ declare class Axios {
 
 }
 
-export declare class Binary extends string { }
+declare class Binary extends string { }
 
-export declare const boolean: typeof boolean_;
+declare const boolean: typeof boolean_;
 
 declare class boolean_ extends scalar { }
 
 declare class Boolean_2 extends boolean { }
-export { Boolean_2 as Boolean }
 
 export declare const builtin: {
 
@@ -201,6 +262,37 @@ declare namespace cds {
         model,
         parse,
         linked,
+        __type,
+        __aspect,
+        __any_,
+        __scalar,
+        __Boolean,
+        __UUID,
+        __String,
+        __LargeString,
+        __Binary,
+        __LargeBinary,
+        __Vector,
+        __Integer,
+        __UInt8,
+        __Int16,
+        __Int32,
+        __Int64,
+        __Float,
+        __Double,
+        __Decimal,
+        __date,
+        __Date,
+        __Time,
+        __DateTime,
+        __TimeStamp,
+        __array,
+        __struct,
+        __context_,
+        __service,
+        __entity,
+        __Association,
+        __Composition,
         compile,
         spawn,
         Key,
@@ -270,10 +362,41 @@ declare namespace cds {
         operator,
         function_call,
         enum_literal,
-        expr_literal,
-        ModelPart,
-        Definition,
-        CSN,
+        expr_literal
+    }
+}
+
+export declare type _cds = typeof cds
+
+declare type _cds_2 = typeof cds
+
+export declare interface cds_connect_options {
+    impl?: string
+    service?: string
+    kind?: string
+    model?: string
+    credentials?: object
+}
+
+export declare interface cds_serve_fluent {
+    from (model: string | CSN): cds_serve_fluent
+    to (protocol: string): cds_serve_fluent
+    at (path: string): cds_serve_fluent
+    in (app: Application): cds_serve_fluent
+    with (impl: ServiceImpl | string): cds_serve_fluent
+    // (req,res) : void
+}
+
+export declare type cds_services = { [name: string]: Service }
+
+export declare type CdsFunction = {
+    (...args: any[]): any,
+    __parameters: object,
+    __returns: any,
+}
+
+declare namespace classes {
+    export {
         mixin,
         Protocol,
         Column,
@@ -282,6 +405,7 @@ declare namespace cds {
         any_,
         any,
         aspect,
+        type,
         scalar,
         boolean,
         Boolean_2 as Boolean,
@@ -306,44 +430,21 @@ declare namespace cds {
         Time,
         DateTime,
         TimeStamp,
+        array,
+        struct,
         context_,
         service_,
         action,
+        event,
+        entity,
+        Association,
+        Composition,
         ManagedAssociation,
         MixedIn
     }
 }
 
-export declare type _cds = typeof cds
-
-declare type _cds_2 = typeof cds
-
-export declare interface cds_connect_options {
-    impl?: string
-    service?: string
-    kind?: string
-    model?: string
-    credentials?: object
-}
-
-export declare interface cds_serve_fluent {
-    from (model: string | CSN_2): cds_serve_fluent
-    to (protocol: string): cds_serve_fluent
-    at (path: string): cds_serve_fluent
-    in (app: Application): cds_serve_fluent
-    with (impl: ServiceImpl | string): cds_serve_fluent
-    // (req,res) : void
-}
-
-export declare type cds_services = { [name: string]: Service }
-
-export declare type CdsFunction = {
-    (...args: any[]): any,
-    __parameters: object,
-    __returns: any,
-}
-
-export declare type Column = { ref: [string], as?: string }
+declare type Column = { ref: [string], as?: string }
 
 export declare type column_expr = UnionToIntersection<expr> & { as?: name, cast?: any, expand?: column_expr[], inline?: column_expr[] }
 
@@ -474,9 +575,9 @@ declare class ConstructedQuery {
  */
 export declare let context: EventContext | undefined;
 
-export declare interface context_ extends csn.context {}
+declare interface context_ extends csn.context {}
 
-export declare class context_ extends any_ { }
+declare class context_ extends any_ { }
 
 declare interface context_2 extends any__2 { }
 
@@ -531,110 +632,10 @@ export declare namespace CRUDEventHandler {
     export type After<P, R = P | void | Error> = (data: undefined | P, req: TypedRequest<P>) => Promise<R> | R
 }
 
-export declare interface CSN extends Omit<csn.CSN, 'definitions'> {
-
-    /**
-     	 * Fetches definitions matching the given filter, returning an iterator on them.
-     	 * @example
-     	 * ```js
-     	 *   let m = cds.reflect (aParsedModel)
-     	 *   for (let d of m.each('entity'))  console.log (d.kind, d.name)
-     	 *   let entities = [...m.each('entity')]  //> capture all
-     	 *   let entities = m.all('entity')        //> equivalent shortcut
-     	 * ```
-     	 */
-    each<T extends any_>(x: Filter, defs?: Definitions<T>): IterableIterator<T>
-
-    /**
-     	 * Fetches definitions matching the given filter, returning them in an array.
-     	 * Convenience shortcut for `[...reflect.each('entity')]`
-     	 */
-    all<T extends any_>(x: Filter, defs?: Definitions<T>): T[]
-
-    /**
-     	 * Fetches definitions matching the given filter, returning the first match, if any.
-     	 * @example
-     	 *      let service = model.find('service')
-     	 * @param x - the filter
-     	 * @param defs - the definitions to fetch in, default: `this.definitions`
-     	 */
-    find<T extends any_>(x: Filter, defs?: Definitions<T>): T | undefined
-
-    /**
-     	 * Calls the visitor for each definition matching the given filter.
-     	 * @see [capire](https://cap.cloud.sap/docs/node.js/cds-reflect#foreach)
-     	 */
-    foreach(x: Filter, visitor: Visitor, defs?: Definitions): this
-    foreach(visitor: Visitor, defs?: Definitions): this
-
-    /**
-     	 * Same as foreach but recursively visits each element definition
-     	 * @see [capire](https://cap.cloud.sap/docs/node.js/cds-reflect#foreach)
-     	 */
-    forall(x: Filter, visitor: Visitor, defs?: Definitions): this
-    forall(visitor: Visitor, defs?: Definitions): this
-
-    /**
-     	 * Fetches definitions declared as children of a given parent context or service.
-     	 * It fetches all definitions whose fully-qualified names start with the parent's name.
-     	 * Returns the found definitions as an object with the local names as keys.
-     	 * @example
-     	 * ```js
-     	 *   let service  = model.find ('service')
-     	 *   let entities = m.childrenOf (service)
-     	 * ```
-     	 * @param parent - either the parent itself or its fully-qualified name
-     	 * @param filter - an optional filter to apply before picking a child
-     	 */
-    childrenOf(parent: any | string, filter?: ((def: any_) => boolean)): Definitions
-
-    /**
-     	 * Provides convenient access to the model's top-level definitions.
-     	 * For example, you can use it in an es6-import-like fashion to avoid
-     	 * working with fully-qualified names as follows:
-     	 *
-     	 * @example
-     	 * ```js
-     	 * let model = cds.reflect (cds.parse(`
-     	 *     namespace our.lovely.bookshop;
-     	 *     entity Books {...}
-     	 *     entity Authors {...}
-     	 * `))
-     	 * const {Books,Authors} = model.exports
-     	 * SELECT.from (Books) .where ({ID:11})
-     	 * ```
-     	 */
-    exports: IterableMap<any_>
-    definitions: IterableMap<any_>
-    entities: ModelPart<entity>
-    services: ModelPart<service_>
-
-}
-
-declare namespace csn {
-    export {
-        CSN_2 as CSN,
-        FQN,
-        Definition_2 as Definition,
-        Extension,
-        Element,
-        kinds,
-        any__2 as any_,
-        context_2 as context,
-        service_2 as service,
-        type_2 as type,
-        struct_2 as struct,
-        entity_2 as entity,
-        EntityElements,
-        Association_2 as Association
-    }
-}
-export { csn }
-
 /**
  * A parsed CDS model in CSN object notation.
  */
-declare interface CSN_2 {
+declare interface CSN {
 
     /**
      * The assigned namespace. If parsed from multiple sources,
@@ -652,7 +653,7 @@ declare interface CSN_2 {
     /**
      * All definitions in the model including those from imported models.
      */
-    definitions?: Record<FQN, Definition_2>
+    definitions?: Record<FQN, Definition>
 
     /**
      * All extensions in the model including those from imported models.
@@ -666,6 +667,26 @@ declare interface CSN_2 {
     $sources?: string[]
 }
 
+declare namespace csn {
+    export {
+        CSN,
+        FQN,
+        Definition,
+        Extension,
+        Element,
+        kinds,
+        any__2 as any_,
+        context_2 as context,
+        service_2 as service,
+        type_2 as type,
+        struct_2 as struct,
+        entity_2 as entity,
+        EntityElements,
+        Association_2 as Association
+    }
+}
+export { csn }
+
 /** @private */
 export declare type data = Record<string, any>
 
@@ -689,12 +710,11 @@ declare class DataUtil {
 
 }
 
-export declare class date extends scalar { }
+declare class date extends scalar { }
 
 declare class Date_2 extends date { }
-export { Date_2 as Date }
 
-export declare class DateTime extends date { }
+declare class DateTime extends date { }
 
 export declare const db: DatabaseService;
 
@@ -712,19 +732,19 @@ export declare const db: DatabaseService;
  */
 export declare function debug (name: string): undefined | Log
 
-export declare class Decimal extends Float { }
-
-export declare type Definition = any_
+declare class Decimal extends Float { }
 
 /**
  * Definitions are the central elements of a CDS model.
  */
-declare type Definition_2 = context_2 & service_2 & type_2 & struct_2 & entity_2 & Association_2
+declare type Definition = context_2 & service_2 & type_2 & struct_2 & entity_2 & Association_2
+
+declare type Definition_2 = any_
 
 /**
  * @see [capire](https://cap.cloud.sap/docs/node.js/cds-reflect#iterable)
  */
-export declare type Definitions<T extends any_ = any_> = IterableMap<T>
+declare type Definitions<T extends any_ = any_> = IterableMap<T>
 
 declare const delete_: Service['delete'];
 export { delete_ as delete };
@@ -755,7 +775,7 @@ declare class DELETE_3<T> extends ConstructedQuery {
 
 }
 
-export declare class Double extends Float { }
+declare class Double extends Float { }
 
 declare type DROP_2 = { DROP: {
         entity: name,
@@ -813,7 +833,7 @@ declare interface entity_2 extends Omit<struct_2, 'elements'> {
      */
     elements: EntityElements
     // REVISIT: following should move to LinkedCSN
-    keys: { [name: string]: Definition_2 }
+    keys: { [name: string]: Definition }
     drafts?: entity_2
 }
 
@@ -1018,7 +1038,7 @@ declare type Filter = string | (<T extends any_ = any_>(def: T) => boolean)
 
 export declare type _flavor = 'parsed' | 'xtended' | 'inferred'
 
-export declare class Float extends number { }
+declare class Float extends number { }
 
 export declare const foreach: Service['foreach'];
 
@@ -1094,13 +1114,13 @@ declare class INSERT_3<T> extends ConstructedQuery {
 
 }
 
-export declare class Int16 extends Integer { }
+declare class Int16 extends Integer { }
 
-export declare class Int32 extends Integer { }
+declare class Int32 extends Integer { }
 
-export declare class Int64 extends Integer { }
+declare class Int64 extends Integer { }
 
-export declare class Integer extends number { }
+declare class Integer extends number { }
 
 declare type Intersect<T extends readonly unknown[]> = T extends [infer Head, ...infer Tail]
 ? Head & Intersect<Tail>
@@ -1119,9 +1139,9 @@ export declare type Key = number | string | any
 
 declare type kinds = 'aspect' | 'entity' | 'type' | 'event' | 'action' | 'function' | 'service' | 'context' | 'elements'
 
-export declare class LargeBinary extends Binary { }
+declare class LargeBinary extends Binary { }
 
-export declare class LargeString extends String_2 { }
+declare class LargeString extends String_2 { }
 
 /**
  * Prepare a node module for lazy-loading submodules instead
@@ -1168,114 +1188,162 @@ export declare const linked: {
      * Turns the given plain CSN model into a linked model
      * @see [capire](https://cap.cloud.sap/docs/node.js/cds-reflect)
      */
-    (model: csn.CSN): linked_2.CSN,
+    (model: csn.CSN): linked_2.LinkedCSN,
 
     /**
      * Base classes of linked definitions from reflected models.
      * @see [capire](https://cap.cloud.sap/docs/node.js/cds-reflect#cds-builtin-classes)
      */
-    classes: typeof LinkedClasses,
+    classes: typeof classes,
+
+    /**
+     * @see [capire](https://cap.cloud.sap/docs/node.js/cds-reflect#linked-csn)
+     */
+    LinkedCSN: linked_2.LinkedCSN,
+
+    /**
+     * @see [capire](https://cap.cloud.sap/docs/node.js/cds-reflect#iterable)
+     */
+    LinkedDefinitions: IterableMap<linked_2.classes.any_>,
 };
 
+export declare namespace linked {
+    export type LinkedDefinitions = IterableMap<linked_2.classes.any_>
+    export type LinkedCSN = linked_2.LinkedCSN
+
+    export namespace classes {
+        export type type = __type
+        export type aspect = __aspect
+
+        export type any_ = __any_
+
+        export type scalar = __scalar
+        // can not shadow builtins. Same for string and number...
+        //export type boolean = LinkedClasses.Boolean  // on purpose
+        export type Boolean = __Boolean
+
+        export type UUID = __UUID
+        //export type string = LinkedClasses.String  // on purpose
+        export type String = __String
+        export type LargeString = __LargeString
+        export type Binary = __Binary
+        export type LargeBinary = __LargeBinary
+        export type Vector = __Vector
+
+        //export type number = LinkedClasses.scalar  // currently no better way to do this
+        export type Integer = __Integer
+        export type UInt8 = __UInt8
+        export type Int16 = __Int16
+        export type Int32 = __Int32
+        export type Int64 = __Int64
+        export type Float = __Float
+        export type Double = __Double
+        export type Decimal = __Decimal
+
+        export type date = __date
+        export type Date = __Date
+        export type Time = __Time
+        export type DateTime = __DateTime
+        export type TimeStamp = __TimeStamp
+
+        export type array = __array
+
+        export type struct = __struct
+        export type context_ = __context_
+        export type service = __service
+        export type entity = __entity
+        export type Association = __Association
+        export type Composition = __Composition
+    }
+}
+
 declare namespace linked_2 {
     export {
         ModelPart,
-        Definition,
-        CSN,
-        mixin,
-        Protocol,
-        Column,
-        Definitions,
-        WithElements,
-        any_,
-        any,
-        aspect,
-        type,
-        scalar,
-        boolean,
-        Boolean_2 as Boolean,
-        string,
-        UUID,
-        String_2 as String,
-        LargeString,
-        Binary,
-        LargeBinary,
-        Vector,
-        number,
-        Integer,
-        UInt8,
-        Int16,
-        Int32,
-        Int64,
-        Float,
-        Double,
-        Decimal,
-        date,
-        Date_2 as Date,
-        Time,
-        DateTime,
-        TimeStamp,
-        array,
-        struct,
-        context_,
-        service_,
-        action,
-        event,
-        entity,
-        Association,
-        Composition,
-        ManagedAssociation,
-        MixedIn
+        Definition_2 as Definition,
+        LinkedCSN,
+        classes
     }
 }
 
-declare namespace LinkedClasses {
-    export {
-        mixin,
-        Protocol,
-        Column,
-        Definitions,
-        WithElements,
-        any_,
-        any,
-        aspect,
-        type,
-        scalar,
-        boolean,
-        Boolean_2 as Boolean,
-        string,
-        UUID,
-        String_2 as String,
-        LargeString,
-        Binary,
-        LargeBinary,
-        Vector,
-        number,
-        Integer,
-        UInt8,
-        Int16,
-        Int32,
-        Int64,
-        Float,
-        Double,
-        Decimal,
-        date,
-        Date_2 as Date,
-        Time,
-        DateTime,
-        TimeStamp,
-        array,
-        struct,
-        context_,
-        service_,
-        action,
-        event,
-        entity,
-        Association,
-        Composition,
-        ManagedAssociation,
-        MixedIn
-    }
+declare interface LinkedCSN extends Omit<csn.CSN, 'definitions'> {
+
+    /**
+     	 * Fetches definitions matching the given filter, returning an iterator on them.
+     	 * @example
+     	 * ```js
+     	 *   let m = cds.reflect (aParsedModel)
+     	 *   for (let d of m.each('entity'))  console.log (d.kind, d.name)
+     	 *   let entities = [...m.each('entity')]  //> capture all
+     	 *   let entities = m.all('entity')        //> equivalent shortcut
+     	 * ```
+     	 */
+    each<T extends any_>(x: Filter, defs?: Definitions<T>): IterableIterator<T>
+
+    /**
+     	 * Fetches definitions matching the given filter, returning them in an array.
+     	 * Convenience shortcut for `[...reflect.each('entity')]`
+     	 */
+    all<T extends any_>(x: Filter, defs?: Definitions<T>): T[]
+
+    /**
+     	 * Fetches definitions matching the given filter, returning the first match, if any.
+     	 * @example
+     	 *      let service = model.find('service')
+     	 * @param x - the filter
+     	 * @param defs - the definitions to fetch in, default: `this.definitions`
+     	 */
+    find<T extends any_>(x: Filter, defs?: Definitions<T>): T | undefined
+
+    /**
+     	 * Calls the visitor for each definition matching the given filter.
+     	 * @see [capire](https://cap.cloud.sap/docs/node.js/cds-reflect#foreach)
+     	 */
+    foreach(x: Filter, visitor: Visitor, defs?: Definitions): this
+    foreach(visitor: Visitor, defs?: Definitions): this
+
+    /**
+     	 * Same as foreach but recursively visits each element definition
+     	 * @see [capire](https://cap.cloud.sap/docs/node.js/cds-reflect#foreach)
+     	 */
+    forall(x: Filter, visitor: Visitor, defs?: Definitions): this
+    forall(visitor: Visitor, defs?: Definitions): this
+
+    /**
+     	 * Fetches definitions declared as children of a given parent context or service.
+     	 * It fetches all definitions whose fully-qualified names start with the parent's name.
+     	 * Returns the found definitions as an object with the local names as keys.
+     	 * @example
+     	 * ```js
+     	 *   let service  = model.find ('service')
+     	 *   let entities = m.childrenOf (service)
+     	 * ```
+     	 * @param parent - either the parent itself or its fully-qualified name
+     	 * @param filter - an optional filter to apply before picking a child
+     	 */
+    childrenOf(parent: any | string, filter?: ((def: any_) => boolean)): Definitions
+
+    /**
+     	 * Provides convenient access to the model's top-level definitions.
+     	 * For example, you can use it in an es6-import-like fashion to avoid
+     	 * working with fully-qualified names as follows:
+     	 *
+     	 * @example
+     	 * ```js
+     	 * let model = cds.reflect (cds.parse(`
+     	 *     namespace our.lovely.bookshop;
+     	 *     entity Books {...}
+     	 *     entity Authors {...}
+     	 * `))
+     	 * const {Books,Authors} = model.exports
+     	 * SELECT.from (Books) .where ({ID:11})
+     	 * ```
+     	 */
+    exports: IterableMap<any_>
+    definitions: IterableMap<any_>
+    entities: ModelPart<entity>
+    services: ModelPart<service_>
+
 }
 
 /**
@@ -1426,7 +1494,7 @@ declare class Logger {
 
 declare type LogLevel = keyof typeof levels | Lowercase<keyof typeof levels> | levels
 
-export declare type ManagedAssociation = Association & {
+declare type ManagedAssociation = Association & {
     foreignKeys: Definitions<type>,
     keys: Column[],
 }
@@ -1459,7 +1527,7 @@ export declare const middlewares: {
  * s2.bar  // error :)
  * ```
  */
-export declare type MixedIn<T> = T & { [key: string | number | symbol]: unknown }
+declare type MixedIn<T> = T & { [key: string | number | symbol]: unknown }
 
 /**
  * Using this will require you to explicitly cast all classes you added mixins to
@@ -1467,16 +1535,16 @@ export declare type MixedIn<T> = T & { [key: string | number | symbol]: unknown
  * properties, you can use the {@link MixedIn} type.
  * @see [capire](https://cap.cloud.sap/docs/node.js/cds-reflect#mixin)
  */
-export declare function mixin (...classes: (new () => any)[]): void
+declare function mixin (...classes: (new () => any)[]): void
 
 /**
  * The effective CDS model loaded during bootstrapping, which contains all service and entity definitions,
  * including required services.
  * Should only be ever set explictly in test scenarios!
  */
-export declare let model: linked_2.CSN | undefined;
+export declare let model: linked_2.LinkedCSN | undefined;
 
-export declare type ModelPart<T extends any_> = IterableMap<T> & ((namespace: string) => IterableMap<T>)
+declare type ModelPart<T extends any_> = IterableMap<T> & ((namespace: string) => IterableMap<T>)
 
 declare namespace models {
     export {
@@ -1498,6 +1566,37 @@ declare namespace models {
         model,
         parse,
         linked,
+        __type,
+        __aspect,
+        __any_,
+        __scalar,
+        __Boolean,
+        __UUID,
+        __String,
+        __LargeString,
+        __Binary,
+        __LargeBinary,
+        __Vector,
+        __Integer,
+        __UInt8,
+        __Int16,
+        __Int32,
+        __Int64,
+        __Float,
+        __Double,
+        __Decimal,
+        __date,
+        __Date,
+        __Time,
+        __DateTime,
+        __TimeStamp,
+        __array,
+        __struct,
+        __context_,
+        __service,
+        __entity,
+        __Association,
+        __Composition,
         compile
     }
 }
@@ -1505,7 +1604,7 @@ declare namespace models {
 /** @private */
 export declare type name = string
 
-export declare const number: typeof number_;
+declare const number: typeof number_;
 
 declare class number_ extends scalar { }
 
@@ -1521,7 +1620,7 @@ export declare type _odata_options = {
  	 */
 // FIXME: this is actually supposed to be part of models.d.ts
 // but had to be moved here so export * would not clash their definitions
-export declare function on (event: 'loaded', listener: (model: CSN_2) => void): _cds
+export declare function on (event: 'loaded', listener: (model: CSN) => void): _cds
 
 /**
  	 * Emitted whenever a specific service is connected for the first time.
@@ -1638,7 +1737,7 @@ declare type Projection<T> = (e: QLExtensions<T extends ArrayConstructable ? Sin
  * @alpha
  * related to .protocols getters
  */
-export declare type Protocol = 'odata' | 'rest'
+declare type Protocol = 'odata' | 'rest'
 
 declare class QL<T> {
 
@@ -1724,7 +1823,7 @@ declare type Query_2 = CQN.Query
 
 export declare class QueryAPI {
 
-    entities: linked_2.CSN['entities']
+    entities: linked_2.LinkedCSN['entities']
 
     /**
      * @see [docs](https://cap.cloud.sap/docs/node.js/core-services#crud-style-api)
@@ -1819,7 +1918,7 @@ export declare type ref = { ref: (name & { id?: string, where?: expr, args?: exp
  * Turns the given plain CSN model into a reflected model
  * @see [capire](https://cap.cloud.sap/docs/node.js/cds-reflect)
  */
-export declare function reflect (model: csn.CSN): linked_2.CSN
+export declare function reflect (model: csn.CSN): linked_2.LinkedCSN
 
 export declare class RemoteService extends Service {}
 
@@ -1834,7 +1933,7 @@ declare class Request_2 extends Event_2 {
 
     path: string
 
-    target: Definition
+    target: Definition_2
 
     /**
      * Shortcut to {@link Request.target | target (entity) name}
@@ -1914,7 +2013,7 @@ export declare const root: string;
 
 export declare const run: Service['run'];
 
-export declare class scalar extends type { }
+declare class scalar extends type { }
 
 declare type Scalarise<A> = A extends Array<infer N> ? N : A
 
@@ -2092,31 +2191,31 @@ export declare class Service extends QueryAPI {
      * The model from which the service's definition was loaded
      * @see [capire docs](https://cap.cloud.sap/docs/node.js/core-services)
      */
-    model: linked_2.CSN
+    model: linked_2.LinkedCSN
 
     /**
      * Provides access to the entities exposed by a service
      * @see [capire docs](https://cap.cloud.sap/docs/node.js/core-services)
      */
-    entities: linked_2.ModelPart<linked_2.entity>
+    entities: linked_2.ModelPart<linked_2.classes.entity>
 
     /**
      * Provides access to the events declared by a service
      * @see [capire docs](https://cap.cloud.sap/docs/node.js/core-services)
      */
-    events: linked_2.ModelPart<linked_2.event>
+    events: linked_2.ModelPart<linked_2.classes.event>
 
     /**
      * Provides access to the types exposed by a service
      * @see [capire docs](https://cap.cloud.sap/docs/node.js/core-services)
      */
-    types: linked_2.ModelPart<linked_2.type>
+    types: linked_2.ModelPart<linked_2.classes.type>
 
     /**
      * Provides access to the operations, i.e. actions and functions, exposed by a service
      * @see [capire docs](https://cap.cloud.sap/docs/node.js/core-services)
      */
-    operations: linked_2.ModelPart<linked_2.action>
+    operations: linked_2.ModelPart<linked_2.classes.action>
 
     /**
      * Acts like a parameter-less constructor. Ensure to call `await super.init()` to have the base class’s handlers added.
@@ -2246,9 +2345,9 @@ export declare type service = {
 /**
  * @see [capire](https://cap.cloud.sap/docs/node.js/cds-reflect#cds-service)
  */
-export declare interface service_ extends csn.service {}
+declare interface service_ extends csn.service {}
 
-export declare class service_ extends context_ {
+declare class service_ extends context_ {
     is_service: true
     get entities (): Definitions<entity>
     get types (): Definitions<type>
@@ -2325,12 +2424,11 @@ declare type StaticSELECT<T> = typeof SELECT_3
 
 export declare const stream: Service['stream'];
 
-export declare const string: typeof string_;
+declare const string: typeof string_;
 
 declare class string_ extends scalar { }
 
 declare class String_2 extends string { }
-export { String_2 as String }
 
 /**
  * @see [capire](https://cap.cloud.sap/docs/node.js/cds-reflect#cds-struct)
@@ -2405,7 +2503,7 @@ declare type TaggedTemplateQueryPart<T> = (strings: TemplateStringsArray, ...par
 /**
  * Target for any QL operation
  */
-declare type Target = linked_2.entity | Definition_2 | string
+declare type Target = linked_2.classes.entity | Definition | string
 
 declare class Test extends Axios {
 
@@ -2463,9 +2561,9 @@ export declare const test: {
     in (dirname: string): Test,
 };
 
-export declare class Time extends date { }
+declare class Time extends date { }
 
-export declare class TimeStamp extends DateTime { }
+declare class TimeStamp extends DateTime { }
 
 /**
  * DO NOT USE
@@ -2510,10 +2608,10 @@ export declare namespace types {
     | 'NEW' | 'EDIT' | 'PATCH' | 'SAVE'
     | 'GET' | 'PUT' | 'POST' | 'PATCH' | 'DELETE'
     | 'COMMIT' | 'ROLLBACK'
-    export type target = string | linked_2.Definition | linked_2.entity | (string | linked_2.Definition | linked_2.entity)[] | ArrayConstructable
+    export type target = string | linked_2.Definition | linked_2.classes.entity | (string | linked_2.Definition | linked_2.classes.entity)[] | ArrayConstructable
 }
 
-export declare class UInt8 extends Integer { }
+declare class UInt8 extends Integer { }
 
 export declare const unboxed: (service: Service) => Service;
 
@@ -2721,18 +2819,18 @@ export declare const utils: {
     rm: (...path: string[]) => Promise<ReturnType<typeof fs.promises.rm>>,
 };
 
-export declare class UUID extends string { }
+declare class UUID extends string { }
 
 /** @private */
 export declare type val = { val: any }
 
-export declare class Vector extends Binary { }
+declare class Vector extends Binary { }
 
 export declare const version: string;
 
 declare type Visitor = (def: any_, name: string, parent: any_, defs: Definitions) => void
 
-export declare interface WithElements {
+declare interface WithElements {
     elements: Definitions<type>
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cap-js/cds-types",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "Type definitions for main packages of CAP, like `@sap/cds`",
   "repository": "github:cap-js/cds-types",
   "homepage": "https://cap.cloud.sap/",
@@ -19,6 +19,7 @@
   ],
   "scripts": {
     "test": "jest --silent",
+    "test:rollup": "npm run rollup; npm run rollup:on; npm run test; npm run rollup:off",
     "rollup": "rm -rf dist/ && mkdir -p etc/ && npx -y @microsoft/api-extractor run --local --verbose && .github/rollup-patch.js",
     "rollup:on": "npm pkg set typings=dist/cds-types.d.ts && [ -d 'apis' ] && mv -- apis -apis || true",
     "rollup:off": "npm pkg set typings=apis/cds.d.ts  && [ -d '-apis' ] && mv -- -apis apis || true",