@sap/cds-compiler 3.9.2 → 3.9.6

package/CHANGELOG.md

@@ -7,6 +7,25 @@
 Note: `beta` fixes, changes and features are usually not listed in this ChangeLog but [here](doc/CHANGELOG_BETA.md).
 The compiler behavior concerning `beta` features can change at any time without notice.
 
+
+## Version 3.9.6 - 2023-07-27
+
+### Fixed
+
+- to.edm(x): Revert change introduced with [3.9.0](#version-390---2023-04-20)
+    "Correct referential constraint calculation for `[0..1]` backlink associations".
+- for.odata: Process shortcut annotations sequence independent.
+
+## Version 3.9.4 - 2023-06-07
+
+### Fixed
+
+- compiler: `USING` empty files were incorrectly marked as "not found".
+- Localized convenience views for projections (not views) did not have references rewritten.
+  This only affects CSN, the SQL result was correct.
+- to.edm(x): Render correct EntitySetPath and annotation target path for actions/functions
+  with explicit binding parameter.
+
 ## Version 3.9.2 - 2023-04-27
 
 ### Fixed

package/lib/base/message-registry.js

@@ -391,7 +391,7 @@ const centralMessageTexts = {
   'syntax-deprecated-value': {  // Warning
     std: 'Deprecated representation of the value in property $(PROP)',
     replace: 'Replace value in $(PROP) by $(VALUE)',
-    'zero-parens': 'Deprecated CSN v.0.1.0 representation of expressions in parentheses',
+    'zero-parens': 'Deprecated CSN v0.1.0 representation of expressions in parentheses',
     'zero-replace': 'Replace CSN v0.1.0 value in $(PROP) by $(VALUE)',
   },
   'syntax-deprecated-type-ref': {

package/lib/edm/annotations/genericTranslation.js

@@ -416,9 +416,19 @@ function csn2annotationEdm(reqDefs, csnVocabularies, serviceName,
     function relParList() {
     // we rely on the order of params in the csn being the correct one
       const params = [];
-      if (entityNameIfBound && !(cAction.kind === 'function' && cAction.$hasBindingParam)) {
-        params.push(cAction['@cds.odata.bindingparameter.collection'] ? 'Collection(' + entityNameIfBound + ')' : entityNameIfBound);
+      if (entityNameIfBound) {
+        // If this is an action and has an explicit binding parameter add it here
+        if(cAction.$bindingParam && cAction.kind === 'action') {
+          params.push(cAction.$bindingParam.items ? 'Collection(' + entityNameIfBound + ')' : entityNameIfBound);
+        }
+        // If action/function has no explicit binding parameter add it here
+        else if (!cAction.$bindingParam) {
+          params.push(cAction['@cds.odata.bindingparameter.collection'] ? 'Collection(' + entityNameIfBound + ')' : entityNameIfBound);
+        }
       }
+      // In case this is a function the explicit binding parameter is part of
+      // the functions params dictionary. Only for functions all parameters must
+      // be listed in the annotation target
       if (cAction.kind === 'function') {
         if(cAction.params) {
           cAction.params && Object.values(cAction.params).forEach(p => {

package/lib/edm/csn2edm.js

@@ -687,14 +687,15 @@ function csn2edmAll(_csn, _options, serviceNames=undefined) {
         The binding parameter remains in the CSN and is rendered as any other
         parameter (including default value/not null/ etc) and acts as annotation carrier.
         */
-        setProp(actionCsn, '$hasBindingParam', false);
+
+        let bpName = 'in';
         if(actionCsn.params) {
           const entries =  Object.entries(actionCsn.params);
           const firstParam = entries[0][1];
           const type = firstParam?.items?.type || firstParam?.type;
           if(type === special$self) {
-            actionCsn.$hasBindingParam = true;
-            const bpName = entries[0][0];
+            bpName = entries[0][0];
+            setProp(actionCsn, '$bindingParam', firstParam);
             if(bpType) {
               if(firstParam.items?.type)
                 firstParam.items.type = bpType;
@@ -707,16 +708,15 @@ function csn2edmAll(_csn, _options, serviceNames=undefined) {
         }
 
         // bpName is eventually used later for EntitySetPath
-        const bpNameAnno = actionCsn['@cds.odata.bindingparameter.name'];
-        let bpName = 'in';
-        if(bpNameAnno != null) {
-          if(typeof bpNameAnno === 'string')
-            bpName = bpNameAnno;
-          if(typeof bpNameAnno === 'object' && bpNameAnno['='])
-            bpName = bpNameAnno['='];
-        }
         // No explicit binding parameter, check (user defined) annotation value)
-        if(!actionCsn.$hasBindingParam) {
+        if(!actionCsn.$bindingParam) {
+          const bpNameAnno = actionCsn['@cds.odata.bindingparameter.name'];
+          if(bpNameAnno != null) {
+            if(typeof bpNameAnno === 'string')
+              bpName = bpNameAnno;
+            if(typeof bpNameAnno === 'object' && bpNameAnno['='])
+              bpName = bpNameAnno['='];
+          }
           if(!edmUtils.isODataSimpleIdentifier(bpName))
             message('odata-spec-violation-id', [...loc, '@cds.odata.bindingparameter.name'], { id: bpName });
           if(actionCsn.params && actionCsn.params[bpName]) {
@@ -726,7 +726,7 @@ function csn2edmAll(_csn, _options, serviceNames=undefined) {
         if(entityCsn != undefined)
         {
           actionNode.setEdmAttribute('IsBound', true);
-          if(!actionCsn.$hasBindingParam) {
+          if(!actionCsn.$bindingParam) {
             // Binding Parameter: 'in' at first position in sequence, this is decisive!
             if(actionCsn['@cds.odata.bindingparameter.collection'])
               actionNode.append(new Edm.Parameter(v, { Name: bpName, Type: bpType, Collection:true/*, Nullable: false*/ } ));

package/lib/edm/edm.js

@@ -1217,13 +1217,16 @@ function getEdm(options, messageFunctions) {
     // V4 referential constraints!
     addReferentialConstraintNodes()
     {
+      // flip the constrains if this is a $self partner
       let _constraints = this._csn._constraints;
+      let [i,j] = [0,1];
       if(this._csn._constraints._partnerCsn) {
         _constraints = this._csn._constraints._partnerCsn._constraints;
+        [i,j] = [1,0];
       }
       _constraints.constraints && Object.values(_constraints.constraints).forEach(c =>
         this.append(new ReferentialConstraint(this._v,
-          { Property: c[0].join(options.pathDelimiter), ReferencedProperty: c[1].join(options.pathDelimiter) } ) )
+          { Property: c[i].join(options.pathDelimiter), ReferencedProperty: c[j].join(options.pathDelimiter) } ) )
       );
     }
   }

package/lib/json/from-csn.js

@@ -1881,10 +1881,10 @@ function refSplit( name, prop ) {
   return { path: path.map( id => ({ id, location: location() }) ), location: location() };
 }
 
-function replaceZeroValue( spec, msgVariant, otherprop ) {
+function replaceZeroValue( spec, msgVariant, newValue ) {
   if (!csnVersionZero && !spec.vZeroFor) {
     warning( 'syntax-deprecated-value', location(true),
-             { '#': msgVariant, prop: spec.msgProp, otherprop } );
+             { '#': msgVariant, prop: spec.msgProp, value: newValue } );
   }
 }
 

package/lib/language/genericAntlrParser.js

@@ -413,6 +413,12 @@ function checkExtensionDict( dict ) {
           def[prop] = dup[prop]; // continuation semantics: last wins
         }
       }
+      if (dup.$annotations) {   // update deprecated $annotations for cds-lsp / annotation modeler
+        if (def.$annotations)
+          def.$annotations.push( ...dup.$annotations );
+        else
+          def.$annotations = dup.$annotations;
+      }
     }
     def.$duplicates = null;
   }

package/lib/transform/forOdataNew.js

@@ -346,44 +346,41 @@ function transform4odataWithCsn(inputModel, options) {
           setAnnotation(node, name.replace(setPrefix, setMappings[setPrefix]), node[name]);
         }
       }
-
+    });
       // Special case: '@readonly' becomes a triplet of capability restrictions for entities,
       // but '@Core.Immutable' for everything else.
-      if (!(node['@readonly'] && node['@insertonly'])) {
-        if (name === '@readonly' && node[name]) {
-          if (node.kind === 'entity' || node.kind === 'aspect') {
-            setAnnotation(node, '@Capabilities.DeleteRestrictions.Deletable', false);
-            setAnnotation(node, '@Capabilities.InsertRestrictions.Insertable', false);
-            setAnnotation(node, '@Capabilities.UpdateRestrictions.Updatable', false);
-          } else {
-            setAnnotation(node, '@Core.Computed', true);
-          }
+    if (!(node['@readonly'] && node['@insertonly'])) {
+      if (node['@readonly']) {
+        if (node.kind === 'entity' || node.kind === 'aspect') {
+          setAnnotation(node, '@Capabilities.DeleteRestrictions.Deletable', false);
+          setAnnotation(node, '@Capabilities.InsertRestrictions.Insertable', false);
+          setAnnotation(node, '@Capabilities.UpdateRestrictions.Updatable', false);
+        } else {
+          setAnnotation(node, '@Core.Computed', true);
         }
+      }
         // @insertonly is effective on entities/queries only
-        else if (name === '@insertonly' && node[name]) {
-          if (node.kind === 'entity' || node.kind === 'aspect') {
-            setAnnotation(node, '@Capabilities.DeleteRestrictions.Deletable', false);
-            setAnnotation(node, '@Capabilities.ReadRestrictions.Readable', false);
-            setAnnotation(node, '@Capabilities.UpdateRestrictions.Updatable', false);
-          }
-        }
+      if (node['@insertonly'] && (node.kind === 'entity' || node.kind === 'aspect')) {
+        setAnnotation(node, '@Capabilities.DeleteRestrictions.Deletable', false);
+        setAnnotation(node, '@Capabilities.ReadRestrictions.Readable', false);
+        setAnnotation(node, '@Capabilities.UpdateRestrictions.Updatable', false);
       }
+    }
       // Only on element level: translate @mandatory
-      if (name === '@mandatory' && node[name] &&
+    if (node['@mandatory'] &&
         node.kind === undefined && node['@Common.FieldControl'] === undefined) {
-        setAnnotation(node, '@Common.FieldControl', { '#': 'Mandatory' });
-      }
+      setAnnotation(node, '@Common.FieldControl', { '#': 'Mandatory' });
+    }
 
-      if (name === '@assert.format' && node[name] !== null)
-        setAnnotation(node, '@Validation.Pattern', node['@assert.format']);
+    if (node['@assert.format'] != null)
+      setAnnotation(node, '@Validation.Pattern', node['@assert.format']);
 
-      if (name === '@assert.range' && node[name] !== null) {
-        if (Array.isArray(node['@assert.range']) && node['@assert.range'].length === 2) {
-          setAnnotation(node, '@Validation.Minimum', node['@assert.range'][0]);
-          setAnnotation(node, '@Validation.Maximum', node['@assert.range'][1]);
-        }
+    if (node['@assert.range'] != null) {
+      if (Array.isArray(node['@assert.range']) && node['@assert.range'].length === 2) {
+        setAnnotation(node, '@Validation.Minimum', node['@assert.range'][0]);
+        setAnnotation(node, '@Validation.Maximum', node['@assert.range'][1]);
       }
-    });
+    }
   }
 
   // Apply default type facets to each type definition and every member

package/lib/transform/localized.js

@@ -511,7 +511,7 @@ function _addLocalizationViews(csn, options, useJoins, config) {
       // For view convenience views (i.e. transitive views) we need to rewrite `from`
       // references as well as need to handle `mixin` elements.
       // a.k.a 'LOCALIZED-VERTICAL'
-      forAllQueries(art.query || art.projection, (query) => {
+      forAllQueries(art.query || { SELECT: art.projection }, (query) => {
         query = query.SELECT || query.SET || query;
         if (query.from)
           rewriteFrom(query.from);

package/lib/utils/file.js

@@ -140,12 +140,12 @@ function cdsFs( fileCache, enableTrace ) {
         traceFS( 'ISFILE:cache:', filename, body );
         if (body instanceof Error)
           cb( body );   // no need for process.nextTick( cb, body ) with moduleResolve
-        else
-          cb( null, !!body );
+        else // body could be empty string
+          cb( null, !!body || typeof body === 'string');
       }
       else {
         traceFS( 'ISFILE:start:', filename, body );
-        // in the future (if we do module resolve ourself with just readFile),
+        // in the future (if we do module resolve ourselves with just readFile),
         // we avoid parallel readFile by storing having an array of `cb`s in
         // fileCache[ filename ] before starting fs.readFile().
         try {

package/lib/utils/moduleResolve.js

@@ -213,7 +213,7 @@ function resolveCDS( moduleName, options, callback ) {
   options.realpath(resolvedBaseDir, (realPathErr, realPath) => {
     // There may be an error in resolving the symlink.
     // We ignore the error and simply use the original path.
-    // Otherwise cds-lsp tests would fail because they don't have real
+    // Otherwise, cds-lsp tests would fail because they don't have real
     // files in their tests.
     if (!realPathErr)
       resolvedBaseDir = realPath;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds-compiler",
-  "version": "3.9.2",
+  "version": "3.9.6",
   "description": "CDS (Core Data Services) compiler and backends",
   "homepage": "https://cap.cloud.sap/",
   "author": "SAP SE (https://www.sap.com)",