@sap/cds-compiler 4.8.0 → 4.9.2

package/lib/transform/effective/misc.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const {
-  forEachDefinition, forEachMemberRecursively, getArtifactDatabaseNameOf, getElementDatabaseNameOf, applyTransformations,
+  getArtifactDatabaseNameOf, getElementDatabaseNameOf,
 } = require('../../model/csnUtils');
 /**
  * Attach @cds.persistence.name to all artifacts and "things".
@@ -9,17 +9,34 @@ const {
  * @param {CSN.Model} csn
  * @param {CSN.Options} options
  * @param {object} csnUtils
+ * @returns {object}
  */
 function attachPersistenceName( csn, options, csnUtils ) {
   const { addStringAnnotationTo } = csnUtils;
 
-  forEachDefinition(csn, (artifact, artifactName) => {
-    if (artifact.kind === 'entity') {
-      addStringAnnotationTo('@cds.persistence.name', getArtifactDatabaseNameOf(artifactName, options.sqlMapping, csn, options.sqlDialect), artifact);
-
-      forEachMemberRecursively(artifact, (member, memberName) => addStringAnnotationTo('@cds.persistence.name', getElementDatabaseNameOf(memberName, options.sqlMapping, options.sqlDialect), member), [ 'definitions', artifactName ]);
+  /**
+   *
+   * @param {object} parent
+   * @param {string} prop
+   * @param {object} dict
+   * @param {CSN.Path} path
+   */
+  function addToEachMember( parent, prop, dict, path ) {
+    const artifact = csn.definitions[path[1]];
+    if (artifact?.kind === 'entity') {
+      for (const memberName in dict)
+        addStringAnnotationTo('@cds.persistence.name', getElementDatabaseNameOf(memberName, options.sqlMapping, options.sqlDialect), dict[memberName]);
     }
-  });
+  }
+
+  return {
+    kind: (parent, prop, kind, path) => {
+      if (kind === 'entity')
+        addStringAnnotationTo('@cds.persistence.name', getArtifactDatabaseNameOf(path[1], options.sqlMapping, csn, options.sqlDialect), parent);
+    },
+    elements: addToEachMember,
+    params: addToEachMember,
+  };
 }
 
 /**
@@ -42,10 +59,11 @@ function killProp( parent, prop ) {
  * - localized
  * @param {CSN.Model} csn
  * @param {CSN.Options} options
+ * @returns {object}
  * @todo Callback-like architecture and merge with persistence name?
  */
 function _removeDefinitionsAndProperties( csn, options ) {
-  const killers = {
+  const transformers = {
     $ignore: (a, b, c, path, parentParent) => {
       const tail = path[path.length - 1];
       delete parentParent[tail];
@@ -74,13 +92,16 @@ function _removeDefinitionsAndProperties( csn, options ) {
     // Set when we remove .key from temporal things, used in localized.js
     $key: killProp,
     includes: killProp,
-    localized: killProp,
     enum: killProp,
     keys: killProp,
     excluding: killProp, // * is resolved, so has no effect anymore
+    targetAspect: killProp,
   };
 
-  applyTransformations(csn, killers, [], { skipIgnore: false });
+  if (!options.keepLocalized)
+    transformers.localized = killProp;
+
+  return transformers;
 }
 
 

package/lib/transform/forOdata.js

@@ -73,7 +73,7 @@ function transform4odataWithCsn(inputModel, options, messageFunctions) {
   timetrace.start('OData transformation');
 
   // copy the model as we don't want to change the input model
-  let csn = cloneFullCsn(inputModel, options);
+  const csn = cloneFullCsn(inputModel, options);
   messageFunctions.setModel(csn);
 
   const { message, error, warning, info, throwWithAnyError } = messageFunctions;
@@ -184,14 +184,19 @@ function transform4odataWithCsn(inputModel, options, messageFunctions) {
   expandStructsInExpression(csn, { skipArtifact: isExternalServiceMember, drillRef: true });
 
   if (!structuredOData) {
-    expansion.expandStructureReferences(csn, options, '_', { error, info, throwWithAnyError }, csnUtils, { skipArtifact: isExternalServiceMember });
+    expansion.expandStructureReferences(csn, options, '_',
+      { error, info, throwWithAnyError }, csnUtils,
+      { skipArtifact: isExternalServiceMember });
     const resolved = new WeakMap();
 
     const { inspectRef, effectiveType } = csnRefs(csn);
-    const { adaptRefs, transformer: refFlattener } = flattening.getStructRefFlatteningTransformer(csn, inspectRef, effectiveType, options, resolved, '_');
+    const { adaptRefs, transformer: refFlattener } =
+      flattening.getStructRefFlatteningTransformer(csn, inspectRef, effectiveType, options, resolved, '_');
 
-    flattening.allInOneFlattening(csn, refFlattener, adaptRefs, inspectRef, isExternalServiceMember, error, csnUtils, options);
-    flattening.flattenAllStructStepsInRefs(csn, refFlattener, adaptRefs, inspectRef, effectiveType, csnUtils, error, options,
+    flattening.allInOneFlattening(csn, refFlattener, adaptRefs,
+        inspectRef, isExternalServiceMember, error, csnUtils, options);
+    flattening.flattenAllStructStepsInRefs(csn, refFlattener, adaptRefs,
+        inspectRef, effectiveType, csnUtils, error, options,
       { //skip: ['action', 'aspect', 'event', 'function', 'type'],
         skipArtifact: isExternalServiceMember,
       });
@@ -208,12 +213,22 @@ function transform4odataWithCsn(inputModel, options, messageFunctions) {
           def[an] = av; 
         })
       }
+      if(def.actions) {
+        Object.values(def.actions).forEach((action) => {
+          if(action.$flatAnnotations) {
+            Object.entries(action.$flatAnnotations).forEach(([an, av]) => {
+              action[an] = av;
+            });
+          }
+        });
+      }
     });
   }
 
   // TODO: add the generated foreign keys to the columns when we are in a view
   // see db/views.js::addForeignKeysToColumns
-  flattening.handleManagedAssociationsAndCreateForeignKeys(csn, options, messageFunctions, '_', !structuredOData, csnUtils,{ skipArtifact: isExternalServiceMember });
+  flattening.handleManagedAssociationsAndCreateForeignKeys(csn, options, messageFunctions, '_',
+    !structuredOData, csnUtils,{ skipArtifact: isExternalServiceMember });
 
   // Allow using managed associations as steps in on-conditions to access their fks
   // To be done after handleManagedAssociationsAndCreateForeignKeys,
@@ -252,7 +267,8 @@ function transform4odataWithCsn(inputModel, options, messageFunctions) {
     // Annotate artifacts with their DB names if requested.
     // Skip artifacts that have no DB equivalent anyway
     if (options.sqlMapping && !(def.kind in skipPersNameKinds))
-      def['@cds.persistence.name'] = getArtifactDatabaseNameOf(defName, options.sqlMapping, csn, 'hana'); // hana to allow naming mode "hdbcds"
+       // hana to allow naming mode "hdbcds"
+      def['@cds.persistence.name'] = getArtifactDatabaseNameOf(defName, options.sqlMapping, csn, 'hana');
 
     forEachMemberRecursively(def, (member, memberName, propertyName) => {
       // Annotate elements, foreign keys, parameters, etc. with their DB names if requested

package/lib/transform/forRelationalDB.js

@@ -183,7 +183,7 @@ function transformForRelationalDBWithCsn(csn, options, messageFunctions) {
   forEachDefinition(csn, [
     // (001) Add a temporal where condition to views where applicable before assoc2join
     //       assoc2join eventually rewrites the table aliases
-    temporal.getViewDecorator(csn, messageFunctions, csnUtils),
+    temporal.getViewDecorator(csn, messageFunctions, csnUtils, options),
     // check unique constraints - further processing is done in rewriteUniqueConstraints
     assertUnique.prepare(csn, options, messageFunctions)
   ]);
@@ -951,7 +951,7 @@ function transformForRelationalDBWithCsn(csn, options, messageFunctions) {
                   if (isFulltextIndex)
                     error(null, path, { name: artName }, 'A fulltext index can\'t be defined on a structured element $(NAME)');
                   // First, compute the name from the path, e.g ['s', 's1', 's2' ] will result in 'S_s1_s2' ...
-                  const refPath = flattenStructStepsInRef(val.ref, path);
+                  const [ refPath ] = flattenStructStepsInRef(val.ref, path);
                   // ... and take this as the prefix for all elements
                   const flattenedElems = flattenStructuredElement(art, refPath, [], ['definitions', artName, 'elements']);
                   Object.keys(flattenedElems).forEach((elem, i, elems) => {
@@ -967,7 +967,7 @@ function transformForRelationalDBWithCsn(csn, options, messageFunctions) {
                 }
                 else {
                   // The reference is not structured, so just replace it by a ref to the combined prefix path
-                  const refPath = flattenStructStepsInRef(val.ref, path);
+                  const [ refPath ] = flattenStructStepsInRef(val.ref, path);
                   flattenedIndex.push({ ref: refPath });
                 }
               }

package/lib/transform/localized.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const { makeMessageFunction } = require('../base/messages');
-const { setProp, isDeprecatedEnabled} = require('../base/model');
+const { setProp, isDeprecatedEnabled, isBetaEnabled} = require('../base/model');
 const { forEachKey } = require('../utils/objectUtils');
 const { cleanSymbols } = require('../base/cleanSymbols.js');
 const {
@@ -747,7 +747,7 @@ function copyLocation(target, source) {
 }
 
 /**
- * Copy @cds.persistence.exists/skip annotations from the source to
+ * Copy @cds.persistence.skip annotations from the source to
  * the target.  Ignores existing annotations on the _target_.
  *
  * @param {CSN.Artifact} target
@@ -755,14 +755,15 @@ function copyLocation(target, source) {
  * @param {CSN.Options} options
  */
 function copyPersistenceAnnotations(target, source, options) {
-  const doNotCopyExists = isDeprecatedEnabled( options, 'eagerPersistenceForGeneratedEntities' );
+  const copyExists = !isBetaEnabled(options, 'v5preview') &&
+    !isDeprecatedEnabled( options, 'eagerPersistenceForGeneratedEntities' );
   forEachKey(source, anno => {
     // Note:
-    //   Because `.exists` is copied to the convenience view, it could
+    //   v3/v4: Because `.exists` is copied to the convenience view, it could
     //   lead to some localization views referencing non-existing ones.
     //   But that is the contract: User says that it already exists!
-    //   In v2, `.exists` was never copied.
-    if (anno === annoPersistenceSkip || (!doNotCopyExists && anno === '@cds.persistence.exists'))
+    //   v2/>=v5, `.exists` is never copied.
+    if (anno === annoPersistenceSkip || (copyExists && anno === '@cds.persistence.exists'))
       target[anno] = source[anno];
   });
 }