@sap/cds-compiler 3.4.2 → 3.5.0

package/lib/render/toHdbcds.js

@@ -7,9 +7,9 @@ const {
 } = require('../model/csnUtils');
 const keywords = require('../base/keywords');
 const {
-  renderFunc, getExpressionRenderer, getRealName, addContextMarkers, addIntermediateContexts,
+  renderFunc, createExpressionRenderer, getRealName, addContextMarkers, addIntermediateContexts,
   hasHanaComment, getHanaComment, funcWithoutParen, getSqlSnippets,
-  cdsToSqlTypes, cdsToHdbcdsTypes,
+  cdsToSqlTypes, cdsToHdbcdsTypes, withoutCast,
 } = require('./utils/common');
 const {
   renderReferentialConstraint,
@@ -32,7 +32,7 @@ const $SELF = '$self';
  * @param {CSN.Artifact} obj
  * @returns {string}
  */
-function getEscapedHanaComment(obj) {
+function getEscapedHanaComment( obj ) {
   return getHanaComment(obj).replace(/\n/g, '\\n').replace(/'/g, "''");
 }
 
@@ -42,7 +42,7 @@ function getEscapedHanaComment(obj) {
  * @param {string} str
  * @returns {string}
  */
-function renderStringForHdbcds(str) {
+function renderStringForHdbcds( str ) {
   return `'${str.replace(/'/g, '\'\'')}'`;
 }
 
@@ -60,7 +60,7 @@ function renderStringForHdbcds(str) {
  * @param {CSN.Options} [options] Transformation options
  * @returns {object} Dictionary of filename: content
  */
-function toHdbcdsSource(csn, options) {
+function toHdbcdsSource( csn, options ) {
   timetrace.start('HDBCDS rendering');
   const plainNames = options.sqlMapping === 'plain';
   const quotedNames = options.sqlMapping === 'quoted';
@@ -70,37 +70,41 @@ function toHdbcdsSource(csn, options) {
     info, warning, error, throwWithAnyError,
   } = makeMessageFunction(csn, options, 'to.hdbcds');
 
-  const renderExpr = getExpressionRenderer({
+  const exprRenderer = createExpressionRenderer({
     finalize: x => x,
-    explicitTypeCast(x, env) {
-      let typeRef = renderTypeReference(x.cast, env);
-
+    typeCast(x) {
+      let typeRef = renderTypeReference(x.cast, this.env);
       // inside a cast expression, the cds and hana cds types need to be mapped to hana sql types
       const hanaSqlType = cdsToSqlTypes.hana[x.cast.type] || cdsToSqlTypes.standard[x.cast.type];
       if (hanaSqlType) {
         const typeRefWithoutParams = typeRef.substring(0, typeRef.indexOf('(')) || typeRef;
         typeRef = typeRef.replace(typeRefWithoutParams, hanaSqlType);
       }
-      return `CAST(${renderExpr(x, env)} AS ${typeRef})`;
+      return `CAST(${this.renderExpr(withoutCast(x))} AS ${typeRef})`;
     },
     val: renderExpressionLiteral,
     enum: x => `#${x['#']}`,
     ref: renderExpressionRef,
-    aliasOnly(x, _env) {
-      return x.as;
-    },
+    aliasOnly: x => x.as,
     windowFunction: renderExpressionFunc,
     func: renderExpressionFunc,
-    xpr(x, env) {
-      if (this.nestedExpr && !x.cast)
-        return `(${renderExpr(x.xpr, env, this.inline, true)})`;
-
-      return renderExpr(x.xpr, env, this.inline, true);
+    xpr(x) {
+      if (this.isNestedXpr && !x.cast)
+        return `(${this.renderSubExpr(x.xpr)})`;
+      return this.renderSubExpr(x.xpr);
+    },
+    SELECT(x) {
+      return `(${renderQuery(x, false, increaseIndent(this.env))})`;
+    },
+    SET(x) {
+      return `${renderQuery(x, false, increaseIndent(this.env))}`;
     },
-    SELECT: (x, env) => `(${renderQuery(x, false, increaseIndent(env))})`,
-    SET: (x, env) => `${renderQuery(x, false, increaseIndent(env))}`,
   });
 
+  function renderExpr( x, env ) {
+    return exprRenderer.renderExpr(x, env);
+  }
+
   checkCSNVersion(csn, options);
 
   const hdbcdsResult = Object.create(null);
@@ -160,7 +164,7 @@ function toHdbcdsSource(csn, options) {
   killList.forEach(fn => fn());
 
   throwWithAnyError();
-  timetrace.stop();
+  timetrace.stop('HDBCDS rendering');
   return options.testMode ? sort(hdbcdsResult) : hdbcdsResult;
 
   /**
@@ -169,7 +173,7 @@ function toHdbcdsSource(csn, options) {
    * @param {Object} obj Object to sort
    * @returns {Object} With keys sorted
    */
-  function sort(obj) {
+  function sort( obj ) {
     const keys = Object.keys(obj).sort((a, b) => a.localeCompare(b));
     const sortedResult = Object.create(null);
     for (let i = 0; i < keys.length; i++)
@@ -186,7 +190,7 @@ function toHdbcdsSource(csn, options) {
    * @param {CdlRenderEnvironment} env Environment
    * @returns {string} The rendered artifact
    */
-  function renderArtifact(artifactName, art, env) {
+  function renderArtifact( artifactName, art, env ) {
     // FIXME: Correctly build the paths during runtime to give better locations
     env.path = [ 'definitions', artifactName ];
     // Ignore whole artifacts if toHana says so
@@ -229,7 +233,7 @@ function toHdbcdsSource(csn, options) {
    * @param {string} artifactName Find all children of this artifact
    * @returns {object} Dictionary with direct sub-artifacts
    */
-  function getSubArtifacts(artifactName) {
+  function getSubArtifacts( artifactName ) {
     const prefix = `${artifactName}.`;
     const result = Object.create(null);
     for (const name in csn.definitions) {
@@ -261,7 +265,7 @@ function toHdbcdsSource(csn, options) {
    * @param {string} contextName Name of the (grand?)parent context
    * @returns {boolean} True if there is another context in between
    */
-  function isContainedInOtherContext(containee, contextName) {
+  function isContainedInOtherContext( containee, contextName ) {
     const parts = containee.split('.');
     const prefixLength = contextName.split('.').length;
 
@@ -329,7 +333,7 @@ function toHdbcdsSource(csn, options) {
    * @param {CdlRenderEnvironment} env Environment
    * @returns {string} The rendered context/service
    */
-  function renderContext(artifactName, art, env, isShadowed) {
+  function renderContext( artifactName, art, env, isShadowed ) {
     let result = '';
     if (!isShadowed)
       isShadowed = contextIsShadowed(artifactName);
@@ -361,7 +365,7 @@ function toHdbcdsSource(csn, options) {
    * @param {string} artifactName
    * @returns {boolean}
    */
-  function contextIsShadowed(artifactName) {
+  function contextIsShadowed( artifactName ) {
     if (artifactName.indexOf('.') === -1)
       return false;
 
@@ -383,7 +387,7 @@ function toHdbcdsSource(csn, options) {
    * @param {string} name Possibly dotted artifact name
    * @returns {CdlRenderEnvironment} Updated env or original instance
    */
-  function updatePrefixForDottedName(env, name) {
+  function updatePrefixForDottedName( env, name ) {
     if (plainNames) {
       let innerEnv = env;
       if (name.indexOf('.') !== -1) {
@@ -405,7 +409,7 @@ function toHdbcdsSource(csn, options) {
    * @param {CdlRenderEnvironment} env Environment
    * @returns {string} The rendered children of the namespace
    */
-  function renderNamespace(artifactName, art, env) {
+  function renderNamespace( artifactName, art, env ) {
     // We currently do not render anything for a namespace, we just append its id to
     // the environment's current name prefix and descend into its children
     let result = '';
@@ -425,7 +429,7 @@ function toHdbcdsSource(csn, options) {
    * @param {CdlRenderEnvironment} env Environment
    * @returns {string} The rendered entity
    */
-  function renderEntity(artifactName, art, env) {
+  function renderEntity( artifactName, art, env ) {
     let result = '';
     const childEnv = increaseIndent(env);
     const normalizedArtifactName = renderArtifactName(artifactName, env);
@@ -474,7 +478,7 @@ function toHdbcdsSource(csn, options) {
    * @param {CSN.Artifact} art
    * @param {CdlRenderEnvironment} env
    */
-  function createTopLevelAliasesForArtifact(artName, art, env) {
+  function createTopLevelAliasesForArtifact( artName, art, env ) {
     forEachMember(art, (element) => {
       if (!element.target)
         return;
@@ -499,7 +503,7 @@ function toHdbcdsSource(csn, options) {
    * @param {CdlRenderEnvironment} env Environment
    * @returns {string} Return the resulting source string.
    */
-  function renderTechnicalConfiguration(tc, env) {
+  function renderTechnicalConfiguration( tc, env ) {
     let result = '';
     const childEnv = increaseIndent(env);
 
@@ -573,7 +577,7 @@ function toHdbcdsSource(csn, options) {
      * @param {string} columnName Name of the SQL column
      * @returns {Array} Modified expression array
      */
-    function fixFuzzyIndex(fuzzyIndex, columnName) {
+    function fixFuzzyIndex( fuzzyIndex, columnName ) {
       return fuzzyIndex.map(token => (token === 'on' ? { xpr: [ 'on', '(', { ref: columnName.split('.') }, ')' ] } : token));
     }
   }
@@ -589,7 +593,7 @@ function toHdbcdsSource(csn, options) {
    * @param {boolean} [isSubElement] Whether the given element is a subelement or not - subelements cannot be key!
    * @returns {string} The rendered element
    */
-  function renderElement(elementName, elm, env, duplicateChecker, isSubElement) {
+  function renderElement( elementName, elm, env, duplicateChecker, isSubElement ) {
     // Ignore if toHana says so
     if (elm.virtual)
       return '';
@@ -630,7 +634,7 @@ function toHdbcdsSource(csn, options) {
    * @param {CdlRenderEnvironment} env Environment
    * @returns {string} Rendered view source
    */
-  function renderViewSource(source, env) {
+  function renderViewSource( source, env ) {
     // Sub-SELECT
     if (source.SELECT || source.SET) {
       let result = `(${renderQuery(source, false, increaseIndent(env))})`;
@@ -647,7 +651,7 @@ function toHdbcdsSource(csn, options) {
         result = `(${result} ${source.join} `;
         result += `join ${renderViewSource(source.args[i], env)}`;
         if (source.on)
-          result += ` on ${renderExpr(source.on, env, true, true)}`;
+          result += ` on ${renderExpr(source.on, env)}`;
 
         result += ')';
       }
@@ -667,7 +671,7 @@ function toHdbcdsSource(csn, options) {
    * @param {CdlRenderEnvironment} env Environment
    * @returns {string} Rendered path
    */
-  function renderAbsolutePath(path, env) {
+  function renderAbsolutePath( path, env ) {
     // Sanity checks
     if (!path.ref)
       throw new ModelError(`Expecting ref in path: ${JSON.stringify(path)}`);
@@ -688,7 +692,7 @@ function toHdbcdsSource(csn, options) {
       result += `(${renderArgs(path.ref[0], ':', env)})`;
 
     if (path.ref[0].where)
-      result += `[${path.ref[0].cardinality ? (`${path.ref[0].cardinality.max}: `) : ''}${renderExpr(path.ref[0].where, env, true, true)}]`;
+      result += `[${path.ref[0].cardinality ? (`${path.ref[0].cardinality.max}: `) : ''}${renderExpr(path.ref[0].where, env)}]`;
 
     // Add any path steps (possibly with parameters and filters) that may follow after that
     if (path.ref.length > 1)
@@ -708,7 +712,7 @@ function toHdbcdsSource(csn, options) {
    * @param {CdlRenderEnvironment} env Environment
    * @returns {string} Rendered path including alias
    */
-  function renderAbsolutePathWithAlias(path, env) {
+  function renderAbsolutePathWithAlias( path, env ) {
     let result = renderAbsolutePath(path, env);
     // Take care of aliases - for artifact references, use the resulting name (multi-dot joined with _)
     const implicitAlias = path.ref.length === 0 ? getLastPartOf(getResultingName(csn, options.sqlMapping, path.ref[0])) : getLastPartOfRef(path.ref);
@@ -733,7 +737,7 @@ function toHdbcdsSource(csn, options) {
    * @param {CdlRenderEnvironment} env Environment
    * @returns {string} Rendered column
    */
-  function renderViewColumn(col, elements, env ) {
+  function renderViewColumn( col, elements, env ) {
     // Annotations and column
     let result = '';
 
@@ -761,7 +765,7 @@ function toHdbcdsSource(csn, options) {
         error(null, env.path, { tokensymbol: 'key', $reviewed: true }, 'Unexpected $(TOKENSYMBOL) in subquery');
 
       const key = (!env.skipKeys && (col.key || (element && element.key)) ? 'key ' : '');
-      result += key + renderExpr(col, env, true);
+      result += key + renderExpr(withoutCast(col), env);
       let alias = col.as || col.func;
       // HANA requires an alias for 'key' columns just for syntactical reasons
       // FIXME: This will not complain for non-refs (but that should be checked in forRelationalDB)
@@ -779,7 +783,7 @@ function toHdbcdsSource(csn, options) {
         // Redirections are never flattened (don't exist in HANA)
         result += ` : redirected to ${renderAbsoluteNameWithQuotes(col.cast.target, env)}`;
         if (col.cast.on)
-          result += ` on ${renderExpr(col.cast.on, env, true, true)}`;
+          result += ` on ${renderExpr(col.cast.on, env)}`;
       }
 
       return result;
@@ -796,7 +800,7 @@ function toHdbcdsSource(csn, options) {
    * @param {CdlRenderEnvironment} env Environment
    * @returns {string} The rendered view
    */
-  function renderView(artifactName, art, env) {
+  function renderView( artifactName, art, env ) {
     let result = '';
     const artifactPath = [ 'definitions', artifactName ];
     globalDuplicateChecker.addArtifact(art['@cds.persistence.name'], artifactPath, artifactName);
@@ -840,7 +844,7 @@ function toHdbcdsSource(csn, options) {
    * @param {object} [elements] For leading query, the elements of the artifact
    * @returns {string} The rendered query
    */
-  function renderQuery(query, isLeadingQuery, env, path = [], elements = null) {
+  function renderQuery( query, isLeadingQuery, env, path = [], elements = null ) {
     let result = '';
     env.skipKeys = !isLeadingQuery;
     // Set operator, like UNION, INTERSECT, ...
@@ -908,15 +912,15 @@ function toHdbcdsSource(csn, options) {
    * @param {CdlRenderEnvironment} env Environment
    * @returns {string} The query with WHERE etc. added
    */
-  function renderSelectProperties(select, alreadyRendered, env) {
+  function renderSelectProperties( select, alreadyRendered, env ) {
     if (select.where)
-      alreadyRendered += `${continueIndent(alreadyRendered, env)}where ${renderExpr(select.where, env, true, true)}`;
+      alreadyRendered += `${continueIndent(alreadyRendered, env)}where ${renderExpr(select.where, env)}`;
 
     if (select.groupBy)
-      alreadyRendered += `${continueIndent(alreadyRendered, env)}group by ${select.groupBy.map(expr => renderExpr(expr, env, true, false, true)).join(', ')}`;
+      alreadyRendered += `${continueIndent(alreadyRendered, env)}group by ${select.groupBy.map(expr => renderExpr(expr, env)).join(', ')}`;
 
     if (select.having)
-      alreadyRendered += `${continueIndent(alreadyRendered, env)}having ${renderExpr(select.having, env, true, true)}`;
+      alreadyRendered += `${continueIndent(alreadyRendered, env)}having ${renderExpr(select.having, env)}`;
 
     if (select.orderBy)
       alreadyRendered += `${continueIndent(alreadyRendered, env)}order by ${select.orderBy.map(entry => renderOrderByEntry(entry, env)).join(', ')}`;
@@ -934,7 +938,7 @@ function toHdbcdsSource(csn, options) {
    * @param {CdlRenderEnvironment} env Environment
    * @returns {string} String to join with
    */
-  function continueIndent(result, env) {
+  function continueIndent( result, env ) {
     if (result.endsWith('}') || result.endsWith('})')) {
       // The preceding clause ended with '}', just append after that
       return ' ';
@@ -950,7 +954,7 @@ function toHdbcdsSource(csn, options) {
    * @param {CdlRenderEnvironment} env Environment
    * @returns {string} Rendered limit clause
    */
-  function renderLimit(limit, env) {
+  function renderLimit( limit, env ) {
     let result = '';
     if (limit.rows !== undefined)
       result += `limit ${renderExpr(limit.rows, env)}`;
@@ -969,8 +973,8 @@ function toHdbcdsSource(csn, options) {
    * @param {CdlRenderEnvironment} env Environment
    * @returns {string} Rendered order by
    */
-  function renderOrderByEntry(entry, env) {
-    let result = renderExpr(entry, env, true, false, true);
+  function renderOrderByEntry( entry, env ) {
+    let result = renderExpr(entry, env);
     if (entry.sort)
       result += ` ${entry.sort}`;
 
@@ -988,7 +992,7 @@ function toHdbcdsSource(csn, options) {
    * @param {CdlRenderEnvironment} env Environment
    * @returns {string} The resulting parameter as source string (no trailing LF).
    */
-  function renderParameter(parName, par, env) {
+  function renderParameter( parName, par, env ) {
     if (par.notNull === true || par.notNull === false)
       info('query-ignoring-param-nullability', env.path.concat([ 'params', parName ]), { '#': 'std' });
     return `${env.indent + formatParamIdentifier(parName, env.path.concat([ 'params', parName ]))} : ${renderTypeReference(par, env)}`;
@@ -1003,7 +1007,7 @@ function toHdbcdsSource(csn, options) {
    * @param {CdlRenderEnvironment} env Environment
    * @returns {string} Rendered type/annotation
    */
-  function renderType(artifactName, art, env) {
+  function renderType( artifactName, art, env ) {
     if (art.kind === 'aspect' || art.kind === 'type' && !hdbcdsNames || art.kind === 'type' && hdbcdsNames && !art.elements)
       return '';
     let result = '';
@@ -1036,7 +1040,7 @@ function toHdbcdsSource(csn, options) {
    * @param {CdlRenderEnvironment} env Environment
    * @returns {string} Rendered type reference
    */
-  function renderTypeReference(elm, env) {
+  function renderTypeReference( elm, env ) {
     let result = '';
 
     // Array type: Render items instead
@@ -1095,7 +1099,7 @@ function toHdbcdsSource(csn, options) {
    * @param {CdlRenderEnvironment} env
    * @returns {string}
    */
-  function renderAssociationType(elm, env) {
+  function renderAssociationType( elm, env ) {
     // Type, cardinality and target
     let result = 'association';
 
@@ -1118,7 +1122,7 @@ function toHdbcdsSource(csn, options) {
 
     // ON-condition (if any)
     if (elm.on) {
-      result += ` on ${renderExpr(elm.on, env, true, true)}`;
+      result += ` on ${renderExpr(elm.on, env)}`;
     }
     else if (elm.targetAspect && elm.targetAspect.elements) { // anonymous aspect
       const childEnv = increaseIndent(env);
@@ -1144,7 +1148,7 @@ function toHdbcdsSource(csn, options) {
    * @param {CSN.Element} elm Element with the type
    * @returns {string} The rendered type
    */
-  function renderBuiltinType(elm) {
+  function renderBuiltinType( elm ) {
     if (elm.type === 'cds.Decimal' && elm.scale === undefined && elm.precision === undefined)
       return 'DecimalFloat';
 
@@ -1159,7 +1163,7 @@ function toHdbcdsSource(csn, options) {
    * @param {number} idx Path position
    * @returns {string} Rendered path step
    */
-  function renderPathStep(s, idx, ref, env, inline) {
+  function renderPathStep( s, idx, ref, env ) {
     // Simple id or absolute name
     if (typeof s === 'string') {
       // HANA-specific extra magic (should actually be in forRelationalDB)
@@ -1210,7 +1214,7 @@ function toHdbcdsSource(csn, options) {
       }
       if (s.where) {
         // Filter, possibly with cardinality
-        result += `[${s.cardinality ? (`${s.cardinality.max}: `) : ''}${renderExpr(s.where, env, inline, true)}]`;
+        result += `[${s.cardinality ? (`${s.cardinality.max}: `) : ''}${renderExpr(s.where, env)}]`;
       }
       return result;
     }
@@ -1222,7 +1226,7 @@ function toHdbcdsSource(csn, options) {
    * @param {object} x Expression with a val and/or literal property
    * @returns {string} Rendered expression
    */
-  function renderExpressionLiteral(x) {
+  function renderExpressionLiteral( x ) {
     // Literal value, possibly with explicit 'literal' property
     switch (x.literal || typeof x.val) {
       case 'number':
@@ -1250,16 +1254,15 @@ function toHdbcdsSource(csn, options) {
    * Render the given expression x - which has a .func property
    *
    * @param {object} x
-   * @param {CdlRenderEnvironment} env
    * @returns {string}
    */
-  function renderExpressionFunc(x, env) {
+  function renderExpressionFunc( x ) {
     const regex = RegExp(/^[a-zA-Z][\w#$]*$/, 'g');
     const funcName = regex.test(x.func) ? x.func : quoteId(x.func);
     // we can't quote functions with parens, issue warning if it is a reserved keyword
     if (!funcWithoutParen(x, 'hana') && keywords.hdbcds.includes(uppercaseAndUnderscore(funcName)))
       warning(null, x.$location, { id: uppercaseAndUnderscore(funcName) }, 'The identifier $(ID) is a SAP HANA keyword');
-    return renderFunc(funcName, x, 'hana', a => renderArgs(a, '=>', env));
+    return renderFunc(funcName, x, 'hana', a => renderArgs(a, '=>', this.env));
   }
 
   /**
@@ -1267,7 +1270,7 @@ function toHdbcdsSource(csn, options) {
    * @returns {string} Rendered expression
    * @todo no extra magic with x.param or x.global
    */
-  function renderExpressionRef(x, env) {
+  function renderExpressionRef( x ) {
     if (!x.param && !x.global) {
       const magicReplacement = getVariableReplacement(x.ref, options);
       if (x.ref[0] === '$user') {
@@ -1294,7 +1297,7 @@ function toHdbcdsSource(csn, options) {
         return renderStringForHdbcds(magicReplacement);
       }
     }
-    return `${(x.param || x.global) ? ':' : ''}${x.ref.map((step, index) => renderPathStep(step, index, x.ref, env, this.inline)).join('.')}`;
+    return `${(x.param || x.global) ? ':' : ''}${x.ref.map((step, index) => renderPathStep(step, index, x.ref, this.env)).join('.')}`;
   }
 
   /**
@@ -1306,16 +1309,16 @@ function toHdbcdsSource(csn, options) {
    * @param {CdlRenderEnvironment} env Environment
    * @returns {string} Rendered arguments
    */
-  function renderArgs(node, sep, env) {
+  function renderArgs( node, sep, env ) {
     const args = node.args ? node.args : {};
     // Positional arguments
     if (Array.isArray(args))
-      return args.map(arg => renderExpr(arg, env, true, false, true)).join(', ');
+      return args.map(arg => renderExpr(arg, env)).join(', ');
 
     // Named arguments (object/dict)
     else if (typeof args === 'object')
       // if this is a function param which is not a reference to the model, we must not quote it
-      return Object.keys(args).map(key => `${node.func ? key : formatIdentifier(key)} ${sep} ${renderExpr(args[key], env, true, false, true)}`).join(', ');
+      return Object.keys(args).map(key => `${node.func ? key : formatIdentifier(key)} ${sep} ${renderExpr(args[key], env)}`).join(', ');
 
 
     throw new ModelError(`Unknown args: ${JSON.stringify(args)}`);
@@ -1327,7 +1330,7 @@ function toHdbcdsSource(csn, options) {
    * @param {CSN.Cardinality} card Cardinality
    * @returns {string} Rendered cardinality
    */
-  function renderCardinality(card) {
+  function renderCardinality( card ) {
     if (!card)
       return '';
 
@@ -1350,7 +1353,7 @@ function toHdbcdsSource(csn, options) {
    * @param {object} obj Thing to render for
    * @returns {string} null/not null
    */
-  function renderNullability(obj /* , env */) {
+  function renderNullability( obj /* , env */) {
     if (obj.notNull === undefined) {
       // Attribute not set at all
       return '';
@@ -1367,7 +1370,7 @@ function toHdbcdsSource(csn, options) {
    * @param {CdlRenderEnvironment} env Environment
    * @returns {string} Rendered foreign key
    */
-  function renderForeignKey(fKey, env) {
+  function renderForeignKey( fKey, env ) {
     return `${renderExpr(fKey, env)}${fKey.as ? (` as ${fKey.as}`) : ''}`;
   }
 
@@ -1378,7 +1381,7 @@ function toHdbcdsSource(csn, options) {
    * @param {CSN.Element} elm Element to render type parameters for
    * @returns {string} Rendered type parameters
    */
-  function renderTypeParameters(elm /* , env */) {
+  function renderTypeParameters( elm /* , env */) {
     const params = [];
     // Length, precision and scale (even if incomplete)
     if (elm.length !== undefined)
@@ -1405,7 +1408,7 @@ function toHdbcdsSource(csn, options) {
    * @param {CdlRenderEnvironment} env Environment
    * @returns {string} Uppercased and underscored absName
    */
-  function renderAbsoluteNamePlain(absName, env) {
+  function renderAbsoluteNamePlain( absName, env ) {
     // Add using declaration
     env.topLevelAliases[absName] = {
       quotedName: formatIdentifier(uppercaseAndUnderscore(absName)),
@@ -1423,7 +1426,7 @@ function toHdbcdsSource(csn, options) {
    * @param {CdlRenderEnvironment} env Environment
    * @returns {string} absName, with correct quotes
    */
-  function renderAbsoluteNameWithQuotes(absName, env) {
+  function renderAbsoluteNameWithQuotes( absName, env ) {
     // Special case: If the top-level artifact name is not a valid artifact name, it came from an unchecked annotation
     // and must be left as it is (just quoted)
     let topLevelName = getRootArtifactName(absName, csn);
@@ -1481,7 +1484,7 @@ function toHdbcdsSource(csn, options) {
    * @param {string} topLevelName Name of a top-level artifact
    * @returns {string} Appropriate __alias
    */
-  function createTopLevelAliasName(topLevelName) {
+  function createTopLevelAliasName( topLevelName ) {
     // FIXME: We should rather check for conflicts than just using something obscure like this ...
     return `__${topLevelName.replace(/::/g, '__').replace(/\./g, '_')}`;
   }
@@ -1493,7 +1496,7 @@ function toHdbcdsSource(csn, options) {
    * @param {CdlRenderEnvironment} env Environment
    * @returns {string} Usings for the given artifact
    */
-  function renderUsings(artifactName, env) {
+  function renderUsings( artifactName, env ) {
     const distinct = {};
     Object.keys(env.topLevelAliases)
       .filter(name => env.topLevelAliases[name].quotedAlias !== formatIdentifier(uppercaseAndUnderscore(artifactName))) // avoid "using FOO as FOO" in FOO.cds
@@ -1510,7 +1513,7 @@ function toHdbcdsSource(csn, options) {
      * see cap/cds-compiler#8269 for details
      * @param {string} name of the native db object
      */
-    function checkForNameClashesWithNativeObject(name) {
+    function checkForNameClashesWithNativeObject( name ) {
       const possibleShadowName = getNamePrefix(env.topLevelAliases[name].quotedName);
       const mightBeShadowedBy = csn.definitions[possibleShadowName];
       if (mightBeShadowedBy) {
@@ -1521,7 +1524,7 @@ function toHdbcdsSource(csn, options) {
       }
     }
 
-    function isArtifactRendered(art, artName) {
+    function isArtifactRendered( art, artName ) {
       const isHanaCdsContext = art.kind === 'service' || art.kind === 'context';
       if (isHanaCdsContext)
         return isContextRendered(artName);
@@ -1538,7 +1541,7 @@ function toHdbcdsSource(csn, options) {
      * @param {string} contextName
      * @returns {boolean} true if a context/service will be rendered as a SAP HANA CDS context.
      */
-    function isContextRendered(contextName) {
+    function isContextRendered( contextName ) {
       const subArtifacts = getSubArtifacts(contextName);
       return Object.entries(subArtifacts).some(([ artName, art ]) => {
         if (art.kind === 'context')
@@ -1554,7 +1557,7 @@ function toHdbcdsSource(csn, options) {
      *  "com.sap.foo.native.object"  -->  com
      *  "com.sap.foo::native.object" -->  com.sap.foo.native
      */
-    function getNamePrefix(usingName) {
+    function getNamePrefix( usingName ) {
       usingName = usingName.replace(/"/g, '');
       if (usingName.indexOf('::') !== -1) {
         const parts = usingName.split('::');
@@ -1576,7 +1579,7 @@ function toHdbcdsSource(csn, options) {
    * @param {CdlRenderEnvironment} env Environment
    * @returns {string} Rendered namespace declaration
    */
-  function renderNamespaceDeclaration(topLevelName, env) {
+  function renderNamespaceDeclaration( topLevelName, env ) {
     if (plainNames) {
       // No namespaces in plain mode
       return '';
@@ -1640,7 +1643,7 @@ function toHdbcdsSource(csn, options) {
    * @param {string} id Name prefix to add
    * @returns {CdlRenderEnvironment} New environment with added prefix
    */
-  function addNamePrefix(env, id) {
+  function addNamePrefix( env, id ) {
     return Object.assign({}, env, { namePrefix: `${env.namePrefix + quoteId(id)}.` });
   }
 
@@ -1650,7 +1653,7 @@ function toHdbcdsSource(csn, options) {
    * @param {CdlRenderEnvironment} env Current environment
    * @returns {CdlRenderEnvironment} New environment with increased indent
    */
-  function increaseIndent(env) {
+  function increaseIndent( env ) {
     return Object.assign({}, env, { namePrefix: '', indent: `${env.indent}  ` });
   }
 
@@ -1660,7 +1663,7 @@ function toHdbcdsSource(csn, options) {
    * @param {string} path Path to quote
    * @returns {string} Quoted path
    */
-  function quotePathString(path) {
+  function quotePathString( path ) {
     // "foo"."bar"."wiz"."blub"
     return path.split('.').map(quoteId).join('.');
   }
@@ -1672,7 +1675,7 @@ function toHdbcdsSource(csn, options) {
    * @param {string} absPath Absolute path to quote
    * @returns {string} Quoted path
    */
-  function quoteAbsolutePathString(absPath) {
+  function quoteAbsolutePathString( absPath ) {
     const namespace = getNamespace(csn, absPath);
     const resultingName = getResultingName(csn, options.sqlMapping, absPath);
 
@@ -1688,7 +1691,7 @@ function toHdbcdsSource(csn, options) {
    * @param {string} id Identifier to quote
    * @returns {string} Properly quoted identifier
    */
-  function quoteId(id) {
+  function quoteId( id ) {
     // Should only ever be called for real IDs (i.e. no dots inside)
     if (id.indexOf('.') !== -1)
       throw new ModelError(`HDBCDS: Tried to quote id with dot: ${id}`);
@@ -1712,7 +1715,7 @@ function toHdbcdsSource(csn, options) {
    * @param {string} absName Absolute name
    * @returns {string} Correctly quoted absName
    */
-  function quoteAbsoluteNameAsId(absName) {
+  function quoteAbsoluteNameAsId( absName ) {
     const resultingName = getResultingName(csn, options.sqlMapping, absName);
 
     if (hdbcdsNames) {
@@ -1729,7 +1732,7 @@ function toHdbcdsSource(csn, options) {
    * @param {string} id Identifier
    * @returns {string} Quoted/uppercased id
    */
-  function formatIdentifier(id) {
+  function formatIdentifier( id ) {
     id = plainNames ? id.toUpperCase() : id;
     return quoteId(id);
   }
@@ -1743,7 +1746,7 @@ function toHdbcdsSource(csn, options) {
    * @param {CSN.Path} [location] Optional location for the warning.
    * @returns {string} Quoted/uppercased id
    */
-  function formatParamIdentifier(id, location) {
+  function formatParamIdentifier( id, location ) {
     // Warn if colliding with HANA keyword, but do not quote for plain
     // --> quoted reserved words as param lead to a weird deployment error
     if (keywords.hdbcds.includes(uppercaseAndUnderscore(id)))
@@ -1772,7 +1775,7 @@ function toHdbcdsSource(csn, options) {
    * @param {boolean} [fallthrough=false] For certain artifacts, plain-rendering is supposed to look like quoted/hdbcds
    * @returns {string} Artifact name ready for rendering
    */
-  function renderArtifactName(artifactName, env, fallthrough = false) {
+  function renderArtifactName( artifactName, env, fallthrough = false ) {
     if (plainNames && !fallthrough)
       return formatIdentifier(uppercaseAndUnderscore(artifactName));
     // hdbcds with quoted or hdbcds naming
@@ -1789,7 +1792,7 @@ function toHdbcdsSource(csn, options) {
    * @param {string} name Name to transform
    * @returns {string} Uppercased and underscored name
    */
-  function uppercaseAndUnderscore(name) {
+  function uppercaseAndUnderscore( name ) {
     // Always replace '.' by '_' and uppercase
     return name.replace(/\./g, '_').toUpperCase();
   }
@@ -1804,9 +1807,9 @@ function toHdbcdsSource(csn, options) {
  * @property {{[name: string]: {
       quotedName: string,
       quotedAlias: string
-    }}} topLevelAliases Dictionary of aliases for used artifact names
+    }}} [topLevelAliases] Dictionary of aliases for used artifact names
  *
- * @property {string} namePrefix Current name prefix (including trailing dot if not empty)
+ * @property {string} [namePrefix] Current name prefix (including trailing dot if not empty)
  * @property {boolean} [skipKeys] Skip rendering keys in subqueries
  * @property {CSN.Artifact} [_artifact] The original view artifact, used when rendering queries
  */