@sap/cds-compiler 3.9.4 → 3.9.6

package/CHANGELOG.md

@@ -7,6 +7,15 @@
 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

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/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/package.json

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