@sap/cds-compiler 6.0.14 → 6.2.2

package/lib/transform/draft/odata.js

@@ -59,7 +59,7 @@ function generateDrafts( csn, options, services, messageFunctions ) {
   const filterDict = Object.create(null);
 
   // validate the 'DRAFT.DraftAdministrativeData_DraftMessage' type if already present in the model
-  if (isBetaEnabled(options, 'draftMessages')) {
+  if (isBetaEnabled(options, 'draftMessages') || options.draftMessages) {
     const draftAdminDataMessagesType = csn.definitions['DRAFT.DraftAdministrativeData_DraftMessage'];
     if (draftAdminDataMessagesType && !isValidDraftAdminDataMessagesType(draftAdminDataMessagesType)) {
       error(null, [ 'definitions', 'DRAFT.DraftAdministrativeData_DraftMessage' ], { name: 'DRAFT.DraftAdministrativeData_DraftMessage' },
@@ -180,7 +180,7 @@ function generateDrafts( csn, options, services, messageFunctions ) {
     // ... on SiblingEntity.IsActiveEntity != IsActiveEntity ...
     siblingEntity.SiblingEntity.on = createAssociationPathComparison('SiblingEntity', 'IsActiveEntity', '!=', 'IsActiveEntity');
 
-    if (isBetaEnabled(options, 'draftMessages')) {
+    if (isBetaEnabled(options, 'draftMessages') || options.draftMessages) {
       const draftMessages = { DraftMessages: { '@Core.Computed': true, virtual: true, items: { type: 'DRAFT.DraftAdministrativeData_DraftMessage' } } };
       addElement(draftMessages, artifact, artifactName);
 
@@ -189,8 +189,11 @@ function generateDrafts( csn, options, services, messageFunctions ) {
         setAnnotation(artifact, '@Common.SideEffects#alwaysFetchMessages.TargetProperties', ['DraftMessages'] );
       }
       setAnnotation(artifact, '@Common.Messages', { '=': 'DraftMessages', ref: ['DraftMessages'] });
-      const service = csn.definitions[getServiceOfArtifact(artifactName, services)];
-      setAnnotation(service, '@Common.AddressViaNavigationPath', true);
+      setAnnotationAddressViaNavigationPath(artifactName, services);
+    }
+
+    if (options.addAnnotationAddressViaNavigationPath) {
+      setAnnotationAddressViaNavigationPath(artifactName, services);
     }
 
     // Iterate elements
@@ -291,6 +294,13 @@ function generateDrafts( csn, options, services, messageFunctions ) {
       }
     })
   }
+
+  // Set the @Common.AddressViaNavigationPath annotation to the service of
+  // the current artifact, if not set already
+  function setAnnotationAddressViaNavigationPath(artifactName, services) {
+    const service = csn.definitions[getServiceOfArtifact(artifactName, services)];
+    setAnnotation(service, '@Common.AddressViaNavigationPath', true);
+  }
 }
 
 module.exports = generateDrafts;

package/lib/transform/forOdata.js

@@ -29,6 +29,7 @@ const { addLocalizationViews } = require('./localized');
 const { cloneFullCsn } = require('../model/cloneCsn');
 const { csnRefs } = require('../model/csnRefs');
 const replaceForeignKeyRefsInExpressionAnnotations = require('./odata/foreignKeyRefsInXprAnnos');
+const { isAnnotationExpression, xprInAnnoProperties } = require('../base/builtins');
 
 // Transformation for ODATA. Expects a CSN 'inputModel', processes it for ODATA.
 // The result should be suitable for consumption by EDMX processors (annotations and metadata)
@@ -293,6 +294,8 @@ function transform4odataWithCsn(inputModel, options, messageFunctions) {
                                                                     || memberName, options.sqlMapping, 'hana'); // hana to allow "hdbcds"
       }
 
+      processDynamicFieldControlAnnotations(member);
+
       // Mark fields with @odata.on.insert/update as @Core.Computed
       annotateCoreComputed(member);
 
@@ -338,6 +341,90 @@ function transform4odataWithCsn(inputModel, options, messageFunctions) {
   //--------------------------------------------------------------------
   // HELPER SECTION STARTS HERE
 
+  // Transform @readonly/@mandatory/@disabled into @Common.FieldControl annotation
+  // with a when/then/else expression consisting of the input from the annotations.
+  function processDynamicFieldControlAnnotations(node) {
+    if (node['@Common.FieldControl']) return;
+    // TODO (SO): factor this out into a constant so we don't create a fresh array all the time?
+    if (['@readonly', '@mandatory', '@disabled'].some(key => typeof node[key] === 'boolean')) {
+          return;
+    }
+
+    const definedAnnotations = ['@disabled', '@readonly', '@mandatory']
+      .filter(key => node[key] && isAnnotationExpression(node[key]));
+    
+    if (definedAnnotations.length === 0) return;
+
+    const values = {
+      '@disabled': { val: 0 },
+      '@readonly': { val: 1 },
+      '@mandatory': { val: 7 },
+    };
+
+    const fieldControl = {
+      '=': true,
+      xpr: createFieldControlExpression(definedAnnotations),
+    };
+  
+    setAnnotation(node, '@Common.FieldControl', fieldControl);
+
+    function createFieldControlExpression(annotations) {
+      let nestedExpression = null;
+
+      for (let i = annotations.length - 1; i >= 0; i--) {
+        const annotation = annotations[i];
+        const xprInAnnoValue = getXprFromAnno(node[annotation]);
+        const annotationVal = values[annotation];
+
+        // Build the current annotation's expression
+        const currentExpression = [
+          'case',
+          'when',
+          ...(Array.isArray(xprInAnnoValue) ? xprInAnnoValue : [xprInAnnoValue]),
+          'then',
+          annotationVal,
+          'else',
+           // Use the previous nested expression or default value. Note that annotations
+           // are looped backwards
+          nestedExpression ? { xpr: nestedExpression } : { val: 3 },
+          'end',
+        ];
+
+        // Update the nested expression
+        nestedExpression = currentExpression;
+      }
+      return nestedExpression;
+    }
+
+    function getXprFromAnno(anno) {
+      const xprProp = xprInAnnoProperties.find(prop => anno[prop] !== undefined);
+      const constructResult = {
+        'ref': () => {
+          const result = { ref: anno.ref };
+          if (anno.cast)
+            result.cast = anno.cast;
+          return result;
+        },
+        'xpr': () => anno.xpr,
+        'list': () => ({ list: anno.list }),
+        'literal': () => constructResult['val'](),
+        'val': () => {
+          const result = { val: anno.val };
+          if (anno.literal)
+            result.literal = anno.literal;
+          return result;
+        },
+        '#': () => ({ '#': anno['#'] }),
+        'func': () => ({ func: anno.func }),
+        'args': () => ({ args: anno.args }),
+        'SELECT': () => ({ SELECT: anno.SELECT }),
+        'SET': () => ({ SET: anno.SET }),
+        'cast': () => constructResult['ref']()
+      }
+      return constructResult[xprProp]();
+    }
+  }
+
   // Mark elements that are annotated with @odata.on.insert/update with the annotation @Core.Computed.
   function annotateCoreComputed(node) {
     // If @Core.Computed is explicitly set, don't overwrite it!
@@ -403,7 +490,8 @@ function transform4odataWithCsn(inputModel, options, messageFunctions) {
             setAnnotation(node, `@Capabilities.DeleteRestrictions${ qualifier ? '#' + qualifier : ''}.Deletable`, false);
             setAnnotation(node, `@Capabilities.InsertRestrictions${ qualifier ? '#' + qualifier : ''}.Insertable`, false);
             setAnnotation(node, `@Capabilities.UpdateRestrictions${ qualifier ? '#' + qualifier : ''}.Updatable`, false);
-          } else {
+          } else if (!isAnnotationExpression(node['@readonly'])) {
+            // add @Core.Computed only for non-xpr values of @readonly
             setAnnotation(node, '@Core.Computed', true);
           }
         };
@@ -426,7 +514,8 @@ function transform4odataWithCsn(inputModel, options, messageFunctions) {
 
     // Only on element level
     if(node.kind == null) {
-      if (node['@mandatory'] && !Object.entries(node).some(([k,v]) => k === '@Common.FieldControl' || k.startsWith('@Common.FieldControl.') && v != null)) {
+      if (node['@mandatory'] && !isAnnotationExpression(node['@mandatory'])
+          && !Object.entries(node).some(([k,v]) => k === '@Common.FieldControl' || k.startsWith('@Common.FieldControl.') && v != null)) {
         setAnnotation(node, '@Common.FieldControl', { '#': 'Mandatory' });
       }
       if (node['@assert.range'] != null)

package/lib/transform/forRelationalDB.js

@@ -360,7 +360,7 @@ function transformForRelationalDBWithCsn(csn, options, messageFunctions) {
   messageFunctions.throwWithError();
 
   // TODO: Might have to do this earlier if we want special rendering for projections?
-  const findAndMarkSqlServiceArtifacts = options.sqlDialect === 'hana' && options.src === 'hdi' && (csn.meta?.[featureFlags]?.$sqlService || csn.meta?.[featureFlags]?.$dummyService) ? processSqlServices(csn, options): () => {}
+  const findAndMarkSqlServiceArtifacts = options.sqlDialect === 'hana' && options.src === 'hdi' && (csn.meta?.[featureFlags]?.$sqlService || csn.meta?.[featureFlags]?.$dummyService || csn.meta?.[featureFlags]?.$dataProductService) ? processSqlServices(csn, options): () => {}
 
   // Apply view-specific transformations
   // (160) Projections now finally become views

package/lib/transform/odata/flattening.js

@@ -472,7 +472,7 @@ function allInOneFlattening(csn, refFlattener, adaptRefs, inspectRef, getFinalTy
     generatedForeignKeysForAssoc.forEach(gfk => gfk[1]['@odata.foreignKey4'] = flatEltName);
     // reassign the generated foreign keys for current assoc in order to assign
     // correct values for $generatedFieldName later on during flattenManagedAssocsAsKeys();
-    // eslint-disable-next-line @stylistic/js/max-statements-per-line
+    // eslint-disable-next-line @stylistic/max-statements-per-line
     setProp(flatElt, '$generatedForeignKeys', generatedForeignKeysForAssoc.map(gfk => { return { name: gfk[0] }}));
   }
 }

package/lib/transform/transformUtils.js

@@ -402,7 +402,7 @@ function getTransformers(model, options, msgFunctions, pathDelimiter = '_') {
     if (!draftAdminDataEntity) {
       draftAdminDataEntity = createAndAddDraftAdminDataEntity();
       model.definitions['DRAFT.DraftAdministrativeData'] = draftAdminDataEntity;
-      if (isBetaEnabled(options, 'draftMessages')
+      if ((isBetaEnabled(options, 'draftMessages') || options.draftMessages)
           && options.transformation === 'odata'
           && !model.definitions['DRAFT.DraftAdministrativeData_DraftMessage']) {
         model.definitions['DRAFT.DraftAdministrativeData_DraftMessage'] = createDraftAdminDataMessagesType();
@@ -475,7 +475,7 @@ function getTransformers(model, options, msgFunctions, pathDelimiter = '_') {
       draftIsProcessedByMe.DraftIsProcessedByMe['@Common.Label'] = '{i18n>Draft_DraftIsProcessedByMe}';
       addElement(draftIsProcessedByMe, artifact, artifactName);
 
-      if (isBetaEnabled(options, 'draftMessages')) {
+      if (isBetaEnabled(options, 'draftMessages') || options.draftMessages) {
         const messages = { DraftMessages: { } };
         if (options.transformation === 'odata') {
           messages.DraftMessages = { items: { type: 'DRAFT.DraftAdministrativeData_DraftMessage' } };

package/lib/transform/translateAssocsToJoins.js

@@ -18,8 +18,6 @@ function translateAssocsToJoinsCSN(csn, options){
   const compileOptions = { ...options, $skipNameCheck: true };
   delete compileOptions.csnFlavor;
 
-  //require('fs').writeFileSync('./csninput_a2j.json', JSON.stringify(csn, null,2))
-  //console.log('CSN passed by A2J to compiler:',JSON.stringify(csn,null,2))
   const model = recompileX(csn, compileOptions);
   timetrace.stop('A2J: Recompiling model');
   timetrace.start('A2J: Translating associations to joins');
@@ -45,11 +43,7 @@ function translateAssocsToJoinsCSN(csn, options){
     deduplicateMessages( options.messages );
   }
 
-  // FIXME: Move this somewhere more appropriate
-  const newCsn = compactModel(model, compileOptions);
-  //require('fs').writeFileSync('./csnoutput_a2j.json', JSON.stringify(newCsn, null,2))
-  //console.log('CSN returned by A2J:',JSON.stringify(newCsn,null,2))
-  return newCsn;
+  return compactModel(model, compileOptions);
 }
 
 function translateAssocsToJoins(model, inputOptions = {})
@@ -355,12 +349,8 @@ function translateAssocsToJoins(model, inputOptions = {})
           const leafArt = tail[tail.length-1]._artifact;
           const tailPath = tail.map(p=>p.id).join(pathDelimiter);
           const fk = tail[i]._artifact.$flatSrcFKs.find(f => f._artifact === leafArt && f.acc.startsWith(tailPath));
-          if(!fk) {
-            // const revealInternalProperties = require('../model/revealInternalProperties.js');
-            // console.log('++++++++ Path tail: ', revealInternalProperties(tail[tail.length-1]._artifact));
-            // console.log('******** Flat FKs\n', tail[i]._artifact.$flatSrcFKs.map(f => revealInternalProperties(f._artifact)));
+          if (!fk)
             throw new CompilerAssertion('Debug me: No flat FK found for FK rewriting');
-          }
           // replace tail path with flattened foreign key including prefix
           tail.splice(i, tail.length, fk);
         }
@@ -1707,17 +1697,6 @@ function translateAssocsToJoins(model, inputOptions = {})
     return p.map(p => delim + p.id + delim).join('.');
   }
 
-  // for debugging only
-  // eslint-disable-next-line no-unused-vars
-  function printPath(pathDict, env)
-  {
-    const alias = (pathDict.name && pathDict.name.id) || '<undefined>'
-    const path = pathDict.path;
-    const s = pathAsStr(path, '"');
-    const me = env.lead && (env.lead.name.id || env.lead.op);
-    console.log(me + ': ' + env.location + ': ' + s + ' alias: ' + alias);
-  }
-
   function clone(obj) {
     let newObj;
     if (typeof obj !== 'object' || obj === null) // return primitive type, note that typeof null === 'object'
@@ -1941,9 +1920,6 @@ function walkPath(node, env)
   // else if(path) {
   //   var util = require('util');
   //   var { reveal } = require('../model/revealInternalProperties');
-
-  //   console.log('Path not resolved, can\'t find leaf _artifact: ' + path.map(p=>p.id).join('.') + '\n' +
-  //   util.inspect( reveal( node, false ), false, null ));
   // }
   return path;
 }

package/lib/utils/moduleResolve.js

@@ -580,7 +580,7 @@ function checkFileCase( dep, realpath, nativeRealpath, messageFunctions ) {
   for (const using of dep.usingFroms) {
     const { warning } = messageFunctions;
     warning('file-unexpected-case-mismatch', [ using.location, using ], {},
-            // eslint-disable-next-line @stylistic/js/max-len
+            // eslint-disable-next-line @stylistic/max-len
             'The imported filename differs on the filesystem; ensure that capitalization matches the actual file\'s name');
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds-compiler",
-  "version": "6.0.14",
+  "version": "6.2.2",
   "description": "CDS (Core Data Services) compiler and backends",
   "homepage": "https://cap.cloud.sap/",
   "author": "SAP SE (https://www.sap.com)",
@@ -16,7 +16,7 @@
   "scripts": {
     "download": "exit 0",
     "gen": "npm run rdpg",
-    "rdpg": "node ./redepage/bin/redepage --compile lib/gen/CdlParser.js --copy-base-parser lib/parsers/CdlGrammar.g4 && node scripts/genGrammarChecksum.js",
+    "rdpg": "node ./redepage/bin/redepage --compile lib/gen/CdlParser.js --copy-base-parser lib/parsers/CdlGrammar.g4 && node ./scripts/createCdlKeywordList.js && node scripts/genGrammarChecksum.js",
     "xmakeAfterInstall": "npm run gen",
     "xmakePrepareRelease": "echo \"$(node scripts/stripReadme.js README.md)\" > README.md && node scripts/assertSnapshotVersioning.js && node scripts/assertChangelog.js && node scripts/cleanup.js --remove-dev",
     "test": "node scripts/xmakeTestDispatcher.js",