@sap/cds 7.4.0 → 7.4.1

package/CHANGELOG.md

@@ -4,6 +4,17 @@
 - The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - This project adheres to [Semantic Versioning](http://semver.org/).
 
+## Version 7.4.1 - 2023-11-23
+
+### Fixed
+
+- Add dynamic properties to result when experimental feature `cds.env.features.okra_skip_query_options` is active
+- Allow negative integers in new parser
+- Allow deletion of instances outside the draft tree
+- Tenant lookup in OData metadata requests
+- `cds.parse.csv` and `cds deploy` correctly parse CSV files with Windows file endings (CRLF) and quoted values
+- Typescript Typings
+
 ## Version 7.4.0 - 2023-11-13
 
 ### Added

package/apis/core.d.ts

@@ -3,13 +3,13 @@ import * as csn from './csn'
 import { service } from './server'
 
 // These are classes actually -> using the new() => interface trick
-export type Association = new() => LinkedAssociation
-export type Composition = new() => LinkedAssociation
-export type entity = new() => LinkedEntity
-export type event = new() => linked & csn.struct
-export type type = new() => linked & csn.type
-export type array = new() => linked & csn.type
-export type struct = new() => linked & csn.struct
+export type Association = new(_?:object) => LinkedAssociation
+export type Composition = new(_?:object) => LinkedAssociation
+export type entity = new(_?:object) => LinkedEntity
+export type event = new(_?:object) => linked & csn.struct
+export type type = new(_?:object) => linked & csn.type
+export type array = new(_?:object) => linked & csn.type
+export type struct = new(_?:object) => linked & csn.struct
 
 export default class cds {
   // infer (query : cqn, model : csn) : LinkedDefinition

package/apis/events.d.ts

@@ -34,6 +34,7 @@ export default class cds {
  * @see [capire docs](https://cap.cloud.sap/docs/node.js/events)
  */
 export class EventContext {
+  constructor(properties:{event:string, data?:object, query?:object, headers:object});
   http?: {req: express.Request, res: express.Response}
   tenant: string
   user: User
@@ -48,7 +49,7 @@ export class EventContext {
 export class Event extends EventContext {
   event: string
   data: any
-  headers: {}
+  headers: any
 }
 
 /**

package/apis/linked.d.ts

@@ -9,7 +9,9 @@ export interface linked {
 }
 
 interface LinkedEntity extends linked, entity {
+	constructor (properties: object)
 	keys: Definitions
+	drafts: LinkedEntity
 }
 
 interface LinkedAssociation extends linked, Association {

package/apis/ql.d.ts

@@ -1,6 +1,7 @@
 import { CSN, Definition, EntityElements } from "./csn"
 import * as CQN from "./cqn"
 import { Constructable, ArrayConstructable, SingularType } from "./internal/inference"
+import { LinkedEntity } from "./linked"
 
 export type Query = CQN.Query
 
@@ -206,6 +207,7 @@ TaggedTemplateQueryPart<Awaitable<SELECT<unknown>, InstanceType<any>>>
 	=> Awaitable<SELECT<SingularType<T>>, SingularType<T>>)
 
 & ((entity: Definition | string, primaryKey? : PK, projection? : Projection<unknown>) => SELECT<any>)
+& ((entity: LinkedEntity | string, primaryKey? : PK, projection? : Projection<unknown>) => SELECT<any>)
 & (<T> (entity: T[], projection? : Projection<T>) => Awaitable<SELECT<T>, T>)
 & (<T> (entity: T[], primaryKey : PK, projection? : Projection<T>) => Awaitable<SELECT<T>, T>)
 & (<T> (entity: {new():T}, projection? : Projection<T>) => Awaitable<SELECT<T>, T>)
@@ -225,6 +227,7 @@ type SELECT_from =
 	=> Awaitable<SELECT<SingularType<T>>, InstanceType<SingularType<T>>>)  // when specifying a key, we expect a single element as result
 // calling with definition
 & ((entity: Definition | string, primaryKey? : PK, projection? : Projection<unknown>) => SELECT<any>)
+& ((entity: LinkedEntity | string, primaryKey? : PK, projection? : Projection<unknown>) => SELECT<any>)
 // calling with concrete list
 & (<T> (entity: T[], projection? : Projection<T>) => SELECT<T> & Promise<T[]>)
 & (<T> (entity: T[], primaryKey : PK, projection? : Projection<T>) => Awaitable<SELECT<T>, T>)
@@ -234,6 +237,7 @@ export class INSERT<T> extends ConstructedQuery {
 	static into : (<T extends ArrayConstructable<any>> (entity:T, entries? : object | object[]) => INSERT<SingularType<T>>)
 		& (TaggedTemplateQueryPart<INSERT<unknown>>)
 		& ((entity : Definition | string, entries? : object | object[]) => INSERT<any>)
+		& ((entity : LinkedEntity | string, entries? : object | object[]) => INSERT<any>)
 		& (<T> (entity:Constructable<T>, entries? : object | object[]) => INSERT<T>)
 		& (<T> (entity:T, entries? : T | object | object[]) => INSERT<T>)
 
@@ -255,6 +259,7 @@ export class UPSERT<T> extends ConstructedQuery {
 	static into : (<T extends ArrayConstructable<any>> (entity:T, entries? : object | object[]) => UPSERT<SingularType<T>>)
 		& (TaggedTemplateQueryPart<UPSERT<unknown>>)
 		& ((entity : Definition | string, entries? : object | object[]) => UPSERT<any>)
+		& ((entity : LinkedEntity | string, entries? : object | object[]) => UPSERT<any>)
 		& (<T> (entity:Constructable<T>, entries? : object | object[]) => UPSERT<T>)
 		& (<T> (entity:T, entries? : T | object | object[]) => UPSERT<T>)
 
@@ -289,6 +294,7 @@ export class UPDATE<T> extends ConstructedQuery {
 	static entity <T extends ArrayConstructable<any>> (entity:T, primaryKey? : PK) : UPDATE<SingularType<T>>
 
 	static entity (entity : Definition | string, primaryKey? : PK) : UPDATE<any>
+	static entity (entity : LinkedEntity | string, primaryKey? : PK) : UPDATE<any>
 	static entity <T> (entity:Constructable<T>, primaryKey? : PK) : UPDATE<T>
 	static entity <T> (entity:T, primaryKey? : PK) : UPDATE<T>
 	byKey (primaryKey? : PK) : this
@@ -307,10 +313,12 @@ export class UPDATE<T> extends ConstructedQuery {
 
 export class CREATE<T> extends ConstructedQuery {
 	static entity (entity : Definition | string) : CREATE<any>
+	static entity (entity : LinkedEntity | string) : CREATE<any>
 	CREATE : CQN.CREATE["CREATE"]
 }
 
 export class DROP<T> extends ConstructedQuery {
 	static entity (entity : Definition | string) : DROP<any>
+	static entity (entity : LinkedEntity | string) : DROP<any>
 	DROP : CQN.DROP["DROP"]
 }

package/apis/server.d.ts

@@ -100,18 +100,18 @@ export default class cds {
 
 }
 
-export type service = any & {
+export type service = {
 	/**
 	 * Dummy wrapper for service implementation functions.
 	 * Use that in modules to get IntelliSense.
 	 */
 	impl (impl: ServiceImpl) : typeof impl
-	impl <T> (srv:T, impl: ( this: T, srv: (T) ) => any) : typeof impl
+	// impl <T> (srv:T, impl: ( this: T, srv: (T) ) => any) : typeof impl
 
 	/**
 	 * Array of all services constructed.
 	 */
-	providers : Service
+	providers : Service[]
 }
 
 

package/apis/services.d.ts

@@ -1,7 +1,7 @@
 import { SELECT, INSERT, UPDATE, DELETE, Query, ConstructedQuery, UPSERT } from './ql'
 import { Awaitable } from './ql'
 import { ArrayConstructable, Constructable } from './internal/inference'
-import { LinkedCSN, LinkedDefinition, Definitions } from './linked'
+import { LinkedCSN, LinkedDefinition, Definitions, LinkedEntity } from './linked'
 import { CSN } from './csn'
 import { EventContext } from './events'
 import { Request } from './events'
@@ -120,9 +120,9 @@ export class QueryAPI {
  */
 export class Service extends QueryAPI {
   constructor(
-    name: string,
-    model: CSN,
-    options: {
+    name?: string,
+    model?: CSN,
+    options?: {
       kind: string
       impl: string | ServiceImpl
     }
@@ -380,5 +380,5 @@ declare namespace types {
     | 'NEW' | 'EDIT' | 'PATCH' | 'SAVE'
     | 'GET' | 'PUT' | 'POST' | 'PATCH' | 'DELETE'
     | 'COMMIT' | 'ROLLBACK'
-  type target = string | LinkedDefinition | ArrayConstructable<any>
+  type target = string | LinkedDefinition | LinkedEntity | (string | LinkedDefinition | LinkedEntity)[] | ArrayConstructable<any>
 }

package/bin/serve.js

@@ -192,7 +192,7 @@ async function serve (all=[], o={}) {
   const server = await cds_server(o)
 
   // increase keep-alive timeout for CF (gorouter wants >90s)
-  if (process.env.VCAP_APPLICATION?.cf_api) server.keepAliveTimeout = 91 * 1000
+  if (process.env.CF_INSTANCE_GUID) server.keepAliveTimeout = 91 * 1000
 
   // return a promise which resolves to the created http server when listening
   return cds.server.listening = new Promise ((_resolve,_reject) => {

package/lib/compile/etc/csv.js

@@ -12,7 +12,8 @@ function read (res) {
 function parse (csv) {
   if (csv[0] === BOM)  csv = csv.slice(1)
   let sep
-  const lines = csv.split('\n')
+  // this also means that \r\n within quotes is NOT retained but normalized to \n.  We accept this for now.
+  const lines = csv.split(/\r?\n/)
   const rows = [], headers = []
 
   let val, values=[]

package/libx/_runtime/cds-services/adapter/odata-v4/handlers/metadata.js

@@ -21,7 +21,7 @@ const mpSupportsEmptyLocale = () => {
 const metadata = service => {
   return async (odataReq, odataRes, next) => {
     const req = odataReq.getIncomingRequest()
-    const tenant = req.user && req.user.tenant
+    const tenant = req.tenant ?? req.user?.tenant
     // REVISIT: can we take locale from user, or is there some odata special wrt metadata?
     const locale = odataRes.getContract().getLocale()
 

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-server/serializer/TrustedResourceJsonSerializer.js

@@ -212,7 +212,14 @@ class TrustedResourceJsonSerializer {
   _serializeEntity (result, entityType, data, expandItems, odataPath, structurePath) {
     this._serializeAnnotations(result, data, MetaProperties.ETAG, MetaProperties.CONTEXT)
 
-    this._serializeStructure(result, entityType, data, expandItems, odataPath, structurePath || [])
+    const { okra_skip_query_options, odata_new_parser } = cds.env.features
+    if (okra_skip_query_options && odata_new_parser) {
+      Object.entries(data).forEach(([key, value]) => {
+        if (!key.startsWith('*')) result[key] = value
+      })
+    } else {
+      this._serializeStructure(result, entityType, data, expandItems, odataPath, structurePath || [])
+    }
 
     // Add annotation '"@odata.id": null' for an entity of a transient type if some properties have been
     // aggregated away or if not all of the base type's properties have been serialized.

package/libx/_runtime/common/utils/resolveView.js

@@ -782,14 +782,14 @@ const findQueryTarget = q => {
   return q.SELECT && q.SELECT._transitions
     ? q.SELECT._transitions[q.SELECT._transitions.length - 1].target
     : q.INSERT
-    ? q.INSERT._transitions[q.INSERT._transitions.length - 1].target
-    : q.UPDATE
-    ? q.UPDATE._transitions[q.UPDATE._transitions.length - 1].target
-    : q.UPSERT
-    ? q.UPSERT._transitions[q.UPSERT._transitions.length - 1].target
-    : q.DELETE
-    ? q.DELETE._transitions[q.DELETE._transitions.length - 1].target
-    : undefined
+      ? q.INSERT._transitions[q.INSERT._transitions.length - 1].target
+      : q.UPDATE
+        ? q.UPDATE._transitions[q.UPDATE._transitions.length - 1].target
+        : q.UPSERT
+          ? q.UPSERT._transitions[q.UPSERT._transitions.length - 1].target
+          : q.DELETE
+            ? q.DELETE._transitions[q.DELETE._transitions.length - 1].target
+            : undefined
 }
 
 module.exports = {

package/libx/_runtime/db/expand/expandCQNToJoin.js

@@ -1282,10 +1282,10 @@ class JoinCQNFromExpanded {
         element.ref[0] === alias
           ? [...element.ref]
           : element.ref.length === 1
-          ? [alias, element.ref[0]]
-          : this._isPathExpressionToOne(element.ref, expandedEntity)
-          ? [alias, ...element.ref]
-          : [alias, element.ref[1]]
+            ? [alias, element.ref[0]]
+            : this._isPathExpressionToOne(element.ref, expandedEntity)
+              ? [alias, ...element.ref]
+              : [alias, element.ref[1]]
 
       return (sort && { ref, sort }) || { ref }
     })

package/libx/_runtime/db/expand/rawToExpanded.js

@@ -97,10 +97,10 @@ class RawToExpanded {
           ? null
           : !!entry[mappings.IsActiveEntity]
         : 'IsActiveEntity' in entry
-        ? entry.IsActiveEntity === null
-          ? null
-          : !!entry.IsActiveEntity
-        : null
+          ? entry.IsActiveEntity === null
+            ? null
+            : !!entry.IsActiveEntity
+          : null
       : null
 
     // A raw row contains more elements than the config. Iterating over config is faster.

package/libx/_runtime/fiori/lean-draft.js

@@ -112,8 +112,8 @@ cds.ApplicationService.prototype.handle = async function (req) {
   const _etagValidationType = req.headers['if-match']
     ? 'if-match'
     : req.headers['if-none-match']
-    ? 'if-none-match'
-    : undefined
+      ? 'if-none-match'
+      : undefined
 
   const query = _cleansed(req.query, this.model)
   _cleanseParams(req.params, req.target)
@@ -181,23 +181,23 @@ cds.ApplicationService.prototype.handle = async function (req) {
     const read = req.query._target.name.endsWith('.drafts')
       ? Read.ownDrafts
       : draftParams.IsActiveEntity === false && draftParams.SiblingEntity_IsActiveEntity === null
-      ? Read.all
-      : draftParams.IsActiveEntity === true &&
-        draftParams.SiblingEntity_IsActiveEntity === null &&
-        (draftParams.DraftAdministrativeData_InProcessByUser === 'not null' ||
-          draftParams.DraftAdministrativeData_InProcessByUser === 'not ')
-      ? Read.lockedByAnotherUser
-      : draftParams.IsActiveEntity === true &&
-        draftParams.SiblingEntity_IsActiveEntity === null &&
-        draftParams.DraftAdministrativeData_InProcessByUser === ''
-      ? Read.unsavedChangesByAnotherUser
-      : draftParams.IsActiveEntity === true && draftParams.HasDraftEntity === false
-      ? Read.unchanged
-      : draftParams.IsActiveEntity === true
-      ? Read.onlyActives
-      : draftParams.IsActiveEntity === false
-      ? Read.ownDrafts
-      : Read.onlyActives
+        ? Read.all
+        : draftParams.IsActiveEntity === true &&
+            draftParams.SiblingEntity_IsActiveEntity === null &&
+            (draftParams.DraftAdministrativeData_InProcessByUser === 'not null' ||
+              draftParams.DraftAdministrativeData_InProcessByUser === 'not ')
+          ? Read.lockedByAnotherUser
+          : draftParams.IsActiveEntity === true &&
+              draftParams.SiblingEntity_IsActiveEntity === null &&
+              draftParams.DraftAdministrativeData_InProcessByUser === ''
+            ? Read.unsavedChangesByAnotherUser
+            : draftParams.IsActiveEntity === true && draftParams.HasDraftEntity === false
+              ? Read.unchanged
+              : draftParams.IsActiveEntity === true
+                ? Read.onlyActives
+                : draftParams.IsActiveEntity === false
+                  ? Read.ownDrafts
+                  : Read.onlyActives
     const result = await read(run, query)
     return result
   }
@@ -218,18 +218,27 @@ cds.ApplicationService.prototype.handle = async function (req) {
 
   if (req.event === 'DELETE' && draftParams.IsActiveEntity) {
     const draftsRef = _redirectRefToDrafts(query.DELETE.from.ref, this.model)
-    const draft = await SELECT.one.from({ ref: draftsRef }).columns([
+    const draftQuery = SELECT.one.from({ ref: draftsRef }).columns([
       { ref: ['DraftAdministrativeData_DraftUUID'] },
       {
         ref: ['DraftAdministrativeData'],
         expand: [_inProcessByUserXpr(_lock.shiftedNow)]
       }
     ])
+
+    // Deletion of active instance outside draft tree, no need to check for draft
+    if (!draftQuery.target?.isDraft) {
+      await run(query)
+      return req.data
+    }
+
+    // Deletion of active instance inside draft tree, need to check that no draft exists
+    const draft = await draftQuery
     const inProcessByUser = draft?.DraftAdministrativeData?.InProcessByUser
     if (inProcessByUser && inProcessByUser !== cds.context.user.id)
       req.reject(403, 'DRAFT_LOCKED_BY_ANOTHER_USER', [inProcessByUser])
     if (draft) req.reject(403, 'DRAFT_ACTIVE_DELETE_FORBIDDEN_DRAFT_EXISTS')
-    await run(DELETE.from({ ref: query.DELETE.from.ref }))
+    await run(query)
     return req.data
   }
 

package/libx/_runtime/remote/utils/client.js

@@ -387,8 +387,8 @@ const getReqOptions = (req, query, service) => {
     typeof query === 'object'
       ? _cqnToReqOptions(query, service, req)
       : typeof query === 'string'
-      ? _stringToReqOptions(query, req.data, req.target)
-      : _pathToReqOptions(req.method, req.path, req.data, req.target, service.name)
+        ? _stringToReqOptions(query, req.data, req.target)
+        : _pathToReqOptions(req.method, req.path, req.data, req.target, service.name)
 
   if (service.kind === 'odata-v2' && req.event === 'READ' && reqOptions.url?.match(/(\/any\()|(\/all\()/)) {
     req.reject(501, 'Lambda expressions are not supported in OData v2')

package/libx/odata/afterburner.js

@@ -173,14 +173,15 @@ function _processWhere(where, entity) {
 function _convertVal(element, value) {
   if (value === null) return value
   switch (element._type) {
-    case 'cds.Integer':
     case 'cds.UInt8':
+    case 'cds.Integer':
     case 'cds.Int16':
     case 'cds.Int32':
-      if (!/^\d+$/.test(value)) throw new Error('Not a valid integer')
+      if (!/^-?\d+$/.test(value)) throw new Error('Not a valid integer')
       // eslint-disable-next-line no-case-declarations
       const n = Number(value)
       if (!Number.isSafeInteger(n)) throw new Error('Not a valid integer')
+      if (element._type === 'cds.UInt8' && n < 0) throw new Error('Not a positive integer')
       return n
 
     case 'cds.String':

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds",
-  "version": "7.4.0",
+  "version": "7.4.1",
   "description": "SAP Cloud Application Programming Model - CDS for Node.js",
   "homepage": "https://cap.cloud.sap/",
   "keywords": [