@sap/cds-compiler 3.4.4 → 3.5.2

package/lib/model/revealInternalProperties.js

@@ -124,7 +124,7 @@ function revealInternalProperties( model, nameOrPath ) {
   // Examples:
   //   `name.space/S/E/elements/a/kind/`
   //   `name.space/S/E/elements/a/type/scope/`
-  function revealXsnPath(path, xsn) {
+  function revealXsnPath( path, xsn ) {
     if (!path || path === '+')
       return reveal( xsn );
 

package/lib/model/sortViews.js

@@ -20,7 +20,7 @@ const { ModelError } = require('../base/error');
  * @param {Symbol} _dependencies Symbol used to attach the dependencies
  * @returns {Layers}
  */
-function sortTopologically(csn, _dependents, _dependencies) {
+function sortTopologically( csn, _dependents, _dependencies ) {
   const layers = [];
   let { zero, nonZero } = _calculateDepth(Object.entries(csn.definitions), _dependents, _dependencies);
   while (zero.length !== 0) {
@@ -41,7 +41,7 @@ function sortTopologically(csn, _dependents, _dependencies) {
   return { layers, leftover: nonZero };
 }
 
-function _calculateDepth(definitionsArray, _dependents, _dependencies) {
+function _calculateDepth( definitionsArray, _dependents, _dependencies ) {
   const zero = [];
   const nonZero = [];
 
@@ -61,7 +61,7 @@ function _calculateDepth(definitionsArray, _dependents, _dependencies) {
   };
 }
 
-function _findWithXPointers(definitionsArray, x, _dependents, _dependencies) {
+function _findWithXPointers( definitionsArray, x, _dependents, _dependencies ) {
   const zero = [];
   const nonZero = [];
 
@@ -87,9 +87,7 @@ function _findWithXPointers(definitionsArray, x, _dependents, _dependencies) {
  * For ordering, only the FROM clause of views is checked - this requires A2J to
  * be run beforehand to resolve association usages.
  *
- * @param {object} sql Map of <object name>: "CREATE STATEMENT"
- * @param {CSN.Model} csn
- *
+ * @param {{sql: string, csn: CSN.Model}} arg sql: Map of <object name>: "CREATE STATEMENT", csn: Model
  * @returns {{name: string, sql: string}[]} Sorted array of artifact name / "CREATE STATEMENTS" pairs
  */
 module.exports = function sortViews({ sql, csn }) {

package/lib/modelCompare/utils/filter.js

@@ -6,7 +6,7 @@
 const { forEach } = require('../../utils/objectUtils');
 const { isPersistedAsTable } = require('../../model/csnUtils');
 
-function isKey(element) {
+function isKey( element ) {
   return element.key;
 }
 
@@ -31,9 +31,10 @@ module.exports = {
   ),
   postgres: getFilterObject('postgres'),
   h2: getFilterObject('h2'),
+  hana: getFilterObject('hana'),
 };
 
-function getFilterObject(dialect, extensionCallback, migrationCallback) {
+function getFilterObject( dialect, extensionCallback, migrationCallback ) {
   return {
     // will be called with a simple Array.forEach
     extension: ({ elements, extend }, error) => {
@@ -90,7 +91,7 @@ const allowedTypeChanges = {
   h2: defaultAllowedTypeChanges,
 };
 
-function typeChangeIsNotCompatible(dialect, before, after) {
+function typeChangeIsNotCompatible( dialect, before, after ) {
   if (allowedTypeChanges[dialect]) {
     const map = allowedTypeChanges[dialect];
     return map[before] ? !map[before].includes(after) : true;

package/lib/optionProcessor.js

@@ -106,6 +106,7 @@ optionProcessor
                               postgres
                               aspectWithoutElements
                               odataOpenType
+                              odtaTerms
                               optionalActionFunctionParameters
        --deprecated <list>  Comma separated list of deprecated options.
                             Valid values are:
@@ -209,6 +210,7 @@ optionProcessor.command('O, toOdata')
   .option('-x, --xml')
   .option('-j, --json')
   .option('    --odata-containment')
+  .option('    --odata-capabilities-pullup')
   .option('    --odata-proxies')
   .option('    --odata-x-service-refs')
   .option('    --odata-foreign-keys')
@@ -235,6 +237,7 @@ optionProcessor.command('O, toOdata')
                                   flat       : (default) Flat type and property names
                                   structured : (V4 only) Render structured metadata
        --odata-containment         Generate Containment Navigation Properties for compositions (V4 only)
+       --odata-capabilities-pullup Rewrite @Capabilities annotations (V4 containment only).
        --odata-proxies             Generate Proxies for out-of-service navigation targets (V4 only).
        --odata-x-service-refs      Generate schema references (V4 only).
        --odata-foreign-keys        Render foreign keys in structured format (V4 only)
@@ -395,6 +398,7 @@ optionProcessor.command('toCsn')
   .option('-f, --csn-flavor <flavor>', ['client', 'gensrc', 'universal'], { aliases: ['--flavor'] })
   .option('    --with-localized')
   .option('    --with-locations')
+  .option('    --struct-xpr')
   .help(`
   Usage: cdsc toCsn [options] <files...>
 
@@ -414,6 +418,7 @@ optionProcessor.command('toCsn')
 
   Internal options (for testing only, may be changed/removed at any time)
        --with-localized   Add localized convenience views to the CSN output.
+       --struct-xpr       Write structured expressions to the CSN output.
 `);
 
 optionProcessor.command('parseCdl')

package/lib/render/DuplicateChecker.js

@@ -17,7 +17,7 @@ const { forEach } = require('../utils/objectUtils');
  *
  * @returns {string} Name as it is present on the database
  */
-function asDBName(name) {
+function asDBName( name ) {
   return (name[0] === '"')
     ? name
     : name.toUpperCase();

package/lib/render/manageConstraints.js

@@ -21,7 +21,7 @@ const {
  * @param {CSN.Model} csn
  * @param {CSN.Options} options
  */
-function alterConstraintsWithCsn(csn, options) {
+function alterConstraintsWithCsn( csn, options ) {
   const { error } = makeMessageFunction(csn, options, 'manageConstraints');
 
   const {
@@ -54,7 +54,7 @@ function alterConstraintsWithCsn(csn, options) {
   return intermediateResult;
 }
 
-function _transformSqlOptions(model, options) {
+function _transformSqlOptions( model, options ) {
   // Merge options with defaults.
   options = Object.assign({ sqlMapping: 'plain', sqlDialect: 'plain' }, options);
   options.toSql = true;
@@ -91,14 +91,14 @@ function _transformSqlOptions(model, options) {
  * @param {CSN.Options} options
  * @returns a map holding the constraint identifier as key and the corresponding, rendered SQL statement / hdbconstraint artifact as value.
  */
-function manageConstraints(csn, options) {
+function manageConstraints( csn, options ) {
   const {
     drop, alter, src,
   } = options.manageConstraints || {};
   const indent = '';
   // either ALTER TABLE statements or .hdbconstraint artifacts
   const resultArtifacts = {};
-  const { quoteSqlId } = getIdentifierUtils(options);
+  const { quoteSqlId } = getIdentifierUtils(csn, options);
   forEachDefinition(csn, (artifact) => {
     if (artifact.$tableConstraints && artifact.$tableConstraints.referential) {
       forEach(artifact.$tableConstraints.referential, (fileName, constraint) => {
@@ -131,8 +131,8 @@ function manageConstraints(csn, options) {
  * @param {CSN.Model} csn
  * @returns a map holding the constraint identifier as key and the corresponding rendered SQL-SELECT statement as value.
  */
-function listReferentialIntegrityViolations(csn, options) {
-  const { quoteSqlId } = getIdentifierUtils(options);
+function listReferentialIntegrityViolations( csn, options ) {
+  const { quoteSqlId } = getIdentifierUtils(csn, options);
   const referentialConstraints = getListOfAllConstraints(csn);
   const resultArtifacts = {};
   const indent = '    ';
@@ -176,7 +176,7 @@ function listReferentialIntegrityViolations(csn, options) {
    * @param {CSN.ReferentialConstraint} constraint
    * @returns comma separated list of primary key columns
    */
-  function selectPrimaryKeyColumns(constraint) {
+  function selectPrimaryKeyColumns( constraint ) {
     const pkReducer = keyStringReducer('K');
     const primaryKeyOfDependentTable = Object.keys(csn.definitions[constraint.dependentTable].elements)
       .filter((key) => {
@@ -195,7 +195,7 @@ function listReferentialIntegrityViolations(csn, options) {
    * @param {CSN.ReferentialConstraint} constraint
    * @returns comma separated list of foreign key columns
    */
-  function selectForeignKeyColumns(constraint) {
+  function selectForeignKeyColumns( constraint ) {
     const fkReducer = keyStringReducer('FK');
     return constraint.foreignKey.reduce(fkReducer, `${quoteSqlId(constraint.foreignKey[0])} AS "FK:${constraint.foreignKey[0]}"`);
   }
@@ -206,7 +206,7 @@ function listReferentialIntegrityViolations(csn, options) {
    * @param {CSN.ReferentialConstraint} constraint
    * @returns WHERE NOT ( <foreign_key IS NULL ... ) statement
    */
-  function whereNotForeignKeyIsNull(constraint) {
+  function whereNotForeignKeyIsNull( constraint ) {
     let whereNot = `${indent}WHERE NOT (\n`;
     whereNot += constraint.foreignKey
       .reduce((prev, curr, index) => {
@@ -225,7 +225,7 @@ function listReferentialIntegrityViolations(csn, options) {
    * @param {string} mainQueryAlias
    * @returns AND NOT EXISTS ( SELECT * FROM <parent_table> WHERE <dependent_table>.<foreign_key> = <parent_table>.<parent_key> ) statement
    */
-  function andNoMatchingPrimaryKeyExists(constraint, mainQueryAlias) {
+  function andNoMatchingPrimaryKeyExists( constraint, mainQueryAlias ) {
     let andNotExists = `\n${indent}AND NOT EXISTS (\n`;
     andNotExists += `${increaseIndent(indent)}SELECT * FROM ${quoteAndGetResultingName(constraint.parentTable)}`;
     // add an alias to both queries so that they can be distinguished at all times
@@ -242,7 +242,7 @@ function listReferentialIntegrityViolations(csn, options) {
     return andNotExists;
   }
 
-  function quoteAndGetResultingName(id) {
+  function quoteAndGetResultingName( id ) {
     return quoteSqlId(getResultingName(csn, options.sqlMapping, id));
   }
 
@@ -250,7 +250,7 @@ function listReferentialIntegrityViolations(csn, options) {
 }
 
 
-function getListOfAllConstraints(csn) {
+function getListOfAllConstraints( csn ) {
   const referentialConstraints = {};
   forEachDefinition(csn, (artifact) => {
     if (artifact.$tableConstraints && artifact.$tableConstraints.referential) {