@sap/cds-compiler 3.4.4 → 3.5.2

package/lib/checks/actionsFunctions.js

@@ -13,7 +13,7 @@ const { isBetaEnabled } = require('../base/model');
  * @param {string} prop Ignored property, always "definitions"
  * @param {CSN.Path} path path to the definition
  */
-function checkActionOrFunction(art, artName, prop, path) {
+function checkActionOrFunction( art, artName, prop, path ) {
   if (!(art.kind === 'action' || art.kind === 'function') && !art.actions)
     return;
 
@@ -21,7 +21,7 @@ function checkActionOrFunction(art, artName, prop, path) {
   //   (this.options.odataProxies || this.options.odataXServiceRefs);
 
   const serviceName = this.csnUtils.getServiceName(artName);
-  if (!serviceName)
+  if (!serviceName && art.kind !== 'aspect')
     this.warning(null, path, {}, 'Functions and actions must be declared in a service');
 
   if (art.kind === 'entity') {
@@ -50,7 +50,7 @@ function checkActionOrFunction(art, artName, prop, path) {
    * @param {CSN.Path} currPath path to the parameter
    * @param {string} actKind 'action' or 'function'
    */
-  function checkActionOrFunctionParameter(param, currPath, actKind) {
+  function checkActionOrFunctionParameter( param, currPath, actKind ) {
     const paramType = param.type ? this.csnUtils.getFinalTypeDef(param.type) : param;
 
     if (!isBetaEnabled(this.options, 'optionalActionFunctionParameters') && (param.default || paramType.default)) {
@@ -85,7 +85,7 @@ function checkActionOrFunction(art, artName, prop, path) {
    * @param {CSN.Path} currPath path to the returns object
    * @param {string} actKind 'action' or 'function'
    */
-  function checkReturns(returns, currPath, actKind) {
+  function checkReturns( returns, currPath, actKind ) {
     const finalReturnType = returns.type ? this.csnUtils.getFinalBaseTypeWithProps(returns.type) : returns;
     if (!finalReturnType)
       return; // no type, e.g. `type of V:calculated`; already an error in `checkTypeOfHasProperType()`
@@ -112,7 +112,7 @@ function checkActionOrFunction(art, artName, prop, path) {
    * @param {string} typeName Name of the type definition
    * @param {CSN.Path} currPath The current path
    */
-  function checkUserDefinedType(type, typeName, currPath) {
+  function checkUserDefinedType( type, typeName, currPath ) {
     // TODO: isBuiltinType does not resolve any type-chains.
     if (!isBuiltinType(type.type) && type.kind && type.kind !== 'type') {
       const serviceOfType = this.csnUtils.getServiceName(typeName);

package/lib/checks/annotationsOData.js

@@ -12,7 +12,7 @@
  *
  * @param {CSN.Element} member Member to be checked
  */
-function checkCoreMediaTypeAllowence(member) {
+function checkCoreMediaTypeAllowence( member ) {
   const allowedCoreMediaTypes = {
     'cds.String': 1,
     'cds.LargeString': 1,
@@ -34,7 +34,7 @@ function checkCoreMediaTypeAllowence(member) {
  *
  * @param {CSN.Element} member Member to be checked
  */
-function checkAnalytics(member) {
+function checkAnalytics( member ) {
   if (member['@Analytics.Measure'] && !member['@Aggregation.default']) {
     this.info(null, member.$path, {},
               'Annotation “@Analytics.Measure” expects “@Aggregation.default” to be assigned for the same element as well');
@@ -46,7 +46,7 @@ function checkAnalytics(member) {
  *
  * @param {(CSN.Artifact|CSN.Element)} node Member or artifact to be checked
  */
-function checkAtSapAnnotations(node) {
+function checkAtSapAnnotations( node ) {
   Object.keys(node).forEach((prop) => {
     if (prop.startsWith('@sap.') && typeof node[prop] !== 'boolean' && typeof node[prop] !== 'string')
       this.warning(null, node.$path, { name: prop }, 'Annotation $(NAME) must have a string or boolean value');
@@ -59,7 +59,7 @@ function checkAtSapAnnotations(node) {
  * @param {CSN.Artifact} artifact Artifact to be checked
  * @param {string} artifactName The name of the artifact
  */
-function checkReadOnlyAndInsertOnly(artifact, artifactName) {
+function checkReadOnlyAndInsertOnly( artifact, artifactName ) {
   if (!this.csnUtils.getServiceName(artifactName))
     return;
   if (artifact.kind === 'entity' && artifact['@readonly'] && artifact['@insertonly'])

package/lib/checks/arrayOfs.js

@@ -14,7 +14,7 @@ const { setProp } = require('../base/model');
  *
  * @param {CSN.Artifact} member Member
  */
-function validateAssociationsInItems(member) {
+function validateAssociationsInItems( member ) {
   const validate = (obj) => {
     if (obj && obj.elements) {
       for (const elementName of Object.keys(obj.elements)) {

package/lib/checks/cdsPersistence.js

@@ -10,7 +10,7 @@
  * @param {string} prop Property being looped over
  * @param {CSN.Path} path Path to the artifact
  */
-function validateCdsPersistenceAnnotation(artifact, artifactName, prop, path) {
+function validateCdsPersistenceAnnotation( artifact, artifactName, prop, path ) {
   if (artifact.kind === 'entity') {
     // filter for 'table', 'udf', 'calcview' === true
     const persistenceAnnos = [ '@cds.persistence.table', '@cds.persistence.udf', '@cds.persistence.calcview' ];

package/lib/checks/checkForTypes.js

@@ -10,7 +10,7 @@ const { isPersistedOnDatabase } = require('../model/csnUtils.js');
  * @param {Array} type type to check
  * @param {CSN.Path} path
  */
-function checkForHanaTypes(parent, name, type, path) {
+function checkForHanaTypes( parent, name, type, path ) {
   const artifact = this.csn.definitions[path[1]];
   if (artifact.kind === 'entity' && isPersistedOnDatabase(artifact) && typeof parent.type === 'string' && parent.type.startsWith('cds.hana.')) {
     this.error('ref-unexpected-hana-type', [ ...path, 'type' ], { type: 'cds.hana', value: this.options.sqlDialect },
@@ -26,7 +26,7 @@ function checkForHanaTypes(parent, name, type, path) {
  * @param {Array} type type to check
  * @param {CSN.Path} path
  */
-function CheckForUInt8(parent, name, type, path) {
+function CheckForUInt8( parent, name, type, path ) {
   const artifact = this.csn.definitions[path[1]];
   if (artifact.kind === 'entity' && isPersistedOnDatabase(artifact) && parent.type === 'cds.UInt8') {
     this.error('ref-unexpected-type', [ ...path, 'type' ], { type: 'cds.UInt8', value: this.options.sqlDialect },
@@ -42,7 +42,7 @@ function CheckForUInt8(parent, name, type, path) {
  * @param {Array} type type to check
  * @param {CSN.Path} path
  */
-function checkTypes(parent, name, type, path) {
+function checkTypes( parent, name, type, path ) {
   checkForHanaTypes.bind(this)(parent, name, type, path);
   if (this.options.sqlDialect === 'postgres' || this.options.sqlDialect === 'h2')
     CheckForUInt8.bind(this)(parent, name, type, path);

package/lib/checks/defaultValues.js

@@ -12,7 +12,7 @@
  * @param {string} prop Property being looped over
  * @param {CSN.Path} path Path to the member
  */
-function validateDefaultValues(member, memberName, prop, path) {
+function validateDefaultValues( member, memberName, prop, path ) {
   if (member.default && this.options.toOdata) {
     // unary minus is xpr: [ "-", { val: ... } ]
     if (member.default.xpr) {
@@ -36,7 +36,7 @@ function validateDefaultValues(member, memberName, prop, path) {
  * @param {string} prop Property being looped over
  * @param {CSN.Path} path Path to the member
  */
-function rejectParamDefaultsInHanaCds(member, memberName, prop, path) {
+function rejectParamDefaultsInHanaCds( member, memberName, prop, path ) {
   if (member.default && prop === 'params' && this.options.transformation === 'hdbcds')
     this.error(null, path, {}, 'Parameter default values are not supported in SAP HANA CDS');
 }
@@ -51,7 +51,7 @@ function rejectParamDefaultsInHanaCds(member, memberName, prop, path) {
  * @param {string} prop Property being looped over
  * @param {CSN.Path} path Path to the member
  */
-function warnAboutDefaultOnAssociationForHanaCds(member, memberName, prop, path) {
+function warnAboutDefaultOnAssociationForHanaCds( member, memberName, prop, path ) {
   const art = this.csn.definitions[path[1]];
   if (!art.query && this.options.transformation === 'hdbcds' && member.target && member.default) {
     this.warning(null, path, { '#': member._type.type === 'cds.Association' ? 'std' : 'comp' },

package/lib/checks/elements.js

@@ -11,7 +11,7 @@ const { setProp } = require('../base/model');
  *
  * @param {CSN.Artifact} art The artifacts that will be checked
  */
-function checkPrimaryKey(art) {
+function checkPrimaryKey( art ) {
   if (art.kind !== 'entity' && art.kind !== 'aspect')
     return;
   forEachMember(art, (member, memberName, prop, path) => {
@@ -34,7 +34,7 @@ function checkPrimaryKey(art) {
    * @param {boolean} parentIsKey Whether parent is a key
    * @param {CSN.Path} parentPath The path of the parent element (optional)
    */
-  function checkIfPrimaryKeyIsOfGeoType(member, elemFqName, parentIsKey, parentPath) {
+  function checkIfPrimaryKeyIsOfGeoType( member, elemFqName, parentIsKey, parentPath ) {
     if (member.key || parentIsKey) {
       const finalBaseType = this.csnUtils.getFinalBaseTypeWithProps(member.type);
       if (isGeoTypeName(finalBaseType?.type)) {
@@ -63,7 +63,7 @@ function checkPrimaryKey(art) {
    * @param {boolean} parentIsKey Whether parent is a key
    * @param {CSN.Path} parentPath The path of the parent element (optional)
    */
-  function checkIfPrimaryKeyIsArray(member, elemFqName, parentIsKey, parentPath) {
+  function checkIfPrimaryKeyIsArray( member, elemFqName, parentIsKey, parentPath ) {
     if (member.key || parentIsKey) {
       const finalBaseType = this.csnUtils.getFinalBaseTypeWithProps(member.type);
       if (member.items || (finalBaseType && finalBaseType.items)) {
@@ -90,7 +90,7 @@ function checkPrimaryKey(art) {
  *
  * @param {CSN.Element} member Element to be checked
  */
-function checkVirtualElement(member) {
+function checkVirtualElement( member ) {
   if (member.virtual) {
     if (this.csnUtils.isAssociation(member.type)) { // or Composition ???
       this.error(null, member.$path, {}, 'Element can\'t be virtual and an association');
@@ -105,7 +105,7 @@ function checkVirtualElement(member) {
  * @param {CSN.Artifact} art The artifact
  * @todo this is a member validator, is it not?
  */
-function checkManagedAssoc(art) {
+function checkManagedAssoc( art ) {
   forEachMemberRecursively(art, (member) => {
     if (this.csnUtils.isAssocOrComposition(member.type) &&
         !isManagedComposition.bind(this)(member)) {
@@ -129,7 +129,7 @@ function checkManagedAssoc(art) {
    * @param {CSN.Element} member The member
    * @returns {boolean} Whether the member is managed composition
    */
-  function isManagedComposition(member) {
+  function isManagedComposition( member ) {
     if (member.targetAspect)
       return true;
     if (!member.target)
@@ -148,7 +148,7 @@ function checkManagedAssoc(art) {
  *
  * @param {CSN.Artifact} art The artifact
  */
-function checkRecursiveTypeUsage(art) {
+function checkRecursiveTypeUsage( art ) {
   const visit = (def) => {
     const loc = def.$path;
     // recursive types are allowed inside arrays

package/lib/checks/emptyOrOnlyVirtual.js

@@ -11,7 +11,7 @@ const { isPersistedOnDatabase } = require('../model/csnUtils.js');
  * @param {string} prop Property being looped over
  * @param {CSN.Path} path Path to the artifact
  */
-function validateEmptyOrOnlyVirtual(artifact, artifactName, prop, path) {
+function validateEmptyOrOnlyVirtual( artifact, artifactName, prop, path ) {
   if (artifact.kind === 'entity' && isPersistedOnDatabase(artifact)) {
     if (!artifact.elements || !hasRealElements(artifact.elements))
       this.error('def-missing-element', path, { '#': artifact.query ? 'view' : 'std' });
@@ -24,7 +24,7 @@ function validateEmptyOrOnlyVirtual(artifact, artifactName, prop, path) {
  * @param {CSN.Elements} elements Elements to look through
  * @returns {boolean} True if something would be created on the db from these elements.
  */
-function hasRealElements(elements) {
+function hasRealElements( elements ) {
   for (const element of Object.values(elements)) {
     if (!element.virtual) {
       if (element.elements) {

package/lib/checks/foreignKeys.js

@@ -12,7 +12,7 @@ const { setProp } = require('../base/model');
  *
  * @param {object} member Member
  */
-function validateForeignKeys(member) {
+function validateForeignKeys( member ) {
   // We have a managed association
   const isManagedAssoc = mem => mem && mem.target && !mem.on;
   // We have an unmanaged association

package/lib/checks/invalidTarget.js

@@ -10,7 +10,7 @@ const { setProp } = require('../base/model');
  *
  * @param {object} member Member
  */
-function invalidTarget(member) {
+function invalidTarget( member ) {
   // Declared as arrow-function to keep scope the same (this value)
   const handleStructured = (mem) => {
     for (const elementName of Object.keys(mem.elements)) {
@@ -31,10 +31,10 @@ function invalidTarget(member) {
         this.error(
           null,
           member.$path,
-          { '#': isAssoc ? 'std' : 'comp', kind: target.kind },
+          { '#': isAssoc ? 'std' : 'comp', meta: target.kind },
           {
-            std: 'Association target must be an entity but found: $(KIND)',
-            comp: 'Composition target must be an entity but found: $(KIND)',
+            std: 'Association target must be an entity but found: $(META)',
+            comp: 'Composition target must be an entity but found: $(META)',
           }
         );
       }

package/lib/checks/managedInType.js

@@ -12,7 +12,7 @@ const { setProp } = require('../base/model');
  *
  * @param {object} member Member
  */
-function checkUsedTypesForAnonymousAspectComposition(member) {
+function checkUsedTypesForAnonymousAspectComposition( member ) {
   // Declared as arrow-function to keep scope the same (this value)
   const handleAssociation = (mem, fn) => {
     for (const key of mem.keys) {

package/lib/checks/managedWithoutKeys.js

@@ -10,7 +10,7 @@ const { ModelError } = require('../base/error');
  * @param {string} memberName the elements name
  * @param {string} prop which kind of member are we looking at -> only prop "elements"
  */
-function managedWithoutKeys(member, memberName, prop) {
+function managedWithoutKeys( member, memberName, prop ) {
   if (prop === 'elements' && member.target && !member.keys && !member.on) { // trigger recompilation
     throw new ModelError('Expected association to have either an on-condition or foreign keys.');
   }

package/lib/checks/nonexpandableStructured.js

@@ -9,7 +9,7 @@ const { otherSideIsExpandableStructure, resolveArtifactType } = require('./utils
  * @param {string} name Name of the expression property on parent
  * @param {Array} expression Expression to check - .on .xpr .having and .where
  */
-function nonexpandableStructuredInExpression(parent, name, expression) {
+function nonexpandableStructuredInExpression( parent, name, expression ) {
   for (let i = 0; i < expression.length; i++) {
     if (expression[i].ref) {
       const { ref } = expression[i];
@@ -21,8 +21,10 @@ function nonexpandableStructuredInExpression(parent, name, expression) {
       if (_art) {
         _art = resolveArtifactType.call(this, _art);
         // Paths of an expression may end on a structured element only if both operands in the expression end on a structured element
-        if (_art?.elements && !validStructuredElement && $scope !== '$self') { // TODO: Use $self to navigate to struct
-          this.error(null, expression[i].$path, { elemref: { ref } },
+        if ((_art?.elements || _art?.keys && (i === 0 || expression[i - 1] !== 'exists')) && !validStructuredElement && $scope !== '$self') { // TODO: Use $self to navigate to struct
+          this.error('ref-unexpected-structured',
+                     name === 'on' ? [ ...parent.$path, name, i ] : expression[i].$path,
+                     { elemref: { ref } },
                      'Unexpected usage of structured type $(ELEMREF)');
         }
       }

package/lib/checks/nullableKeys.js

@@ -5,7 +5,7 @@
  *
  * @param {CSN.Element} element The element to check
  */
-function checkExplicitlyNullableKeys(element) {
+function checkExplicitlyNullableKeys( element ) {
   if (element.key && element.notNull === false)
     this.error(null, element.$path, {}, 'Expecting primary key element to be not nullable');
 }

package/lib/checks/onConditions.js

@@ -11,7 +11,7 @@ const { otherSideIsExpandableStructure, resolveArtifactType } = require('./utils
  * @param {any} refStep part of a ref
  * @returns {string} Loggable string
  */
-function logReady(refStep) {
+function logReady( refStep ) {
   return refStep.id || refStep;
 }
 
@@ -25,7 +25,7 @@ function logReady(refStep) {
  * @param {number} startIndex Index of the current expression to "look around"
  * @returns {boolean} True if valid
  */
-function otherSideIsValidDollarSelf(on, startIndex) {
+function otherSideIsValidDollarSelf( on, startIndex ) {
   if (on[startIndex - 1] && on[startIndex - 1] === '=') {
     if (on[startIndex - 2]) {
       const { ref } = on[startIndex - 2];
@@ -57,7 +57,7 @@ function otherSideIsValidDollarSelf(on, startIndex) {
  * @param {string} property Current property (part of forEachMember)
  * @param {CSN.Path} path CSN Path to current member
  */
-function validateOnCondition(member, memberName, property, path) {
+function validateOnCondition( member, memberName, property, path ) {
   if (member && member.on) {
     // complain about nullability constraint on managed composition
     if (member.targetAspect && {}.hasOwnProperty.call(member, 'notNull')) {
@@ -116,8 +116,7 @@ function validateOnCondition(member, memberName, property, path) {
              !( /* 1) */ (_art.target && _art.keys) && validStructuredElement ||
              /* 2) */ (_art.target && validDollarSelf)) &&
              !_art.virtual) {
-            this.error(null, onPath, { elemref: { ref } },
-                       'The last path of an ON-condition must be a scalar value, path $(ELEMREF)');
+            // Do nothing - handled by lib/checks/nonexpandableStructured.js
           }
           else if (_art.items && !_art.virtual) {
             this.error(null, onPath, { elemref: { ref } },
@@ -139,7 +138,7 @@ function validateOnCondition(member, memberName, property, path) {
  * @param {CSN.Query} query query object
  * @param {CSN.Path} path path to the query
  */
-function validateMixinOnCondition(query, path) {
+function validateMixinOnCondition( query, path ) {
   if (query.SELECT && query.SELECT.mixin)
     forEachGeneric( query.SELECT, 'mixin', validateOnCondition.bind(this), path );
 }

package/lib/checks/parameters.js

@@ -10,7 +10,7 @@ const { isPersistedOnDatabase } = require('../model/csnUtils.js');
  * @param {object} params params
  * @param {CSN.Path} path
  */
-function checkForParams(parent, name, params, path) {
+function checkForParams( parent, name, params, path ) {
   const artifact = this.csn.definitions[path[1]];
   if (artifact.kind === 'entity' && isPersistedOnDatabase(artifact) && !(parent.kind !== 'entity')) {
     this.error('ref-unexpected-params', [ ...path, 'params' ], { value: this.options.sqlDialect },

package/lib/checks/queryNoDbArtifacts.js

@@ -16,7 +16,7 @@ const { hasAnnotationValue, isPersistedOnDatabase, isBuiltinType } = require('..
  *
  * @param {CSN.Query} query Query to check
  */
-function checkQueryForNoDBArtifacts(query) {
+function checkQueryForNoDBArtifacts( query ) {
   /**
    * Count the leaf-elements resulting from a given element.
    *
@@ -143,7 +143,7 @@ function checkQueryForNoDBArtifacts(query) {
  * @param {object} rhs Right hand side of the on-condition part
  * @returns {Array} Return the association object (index 0) and the corresponding path (index 1).
  */
-function getForwardAssociation(prefix, lhs, rhs) {
+function getForwardAssociation( prefix, lhs, rhs ) {
   if (lhs && rhs) {
     if (rhs.ref.length === 1 && rhs.ref[0] === '$self' &&
        lhs.ref.length > 1 && lhs.ref[0] === prefix)

package/lib/checks/selectItems.js

@@ -13,7 +13,7 @@ const { forEachGeneric, applyTransformationsOnNonDictionary } = require('../mode
  * @param {CSN.Query} query query object
  * @todo Why do we care about this with $self?
  */
-function validateSelectItems(query) {
+function validateSelectItems( query ) {
   const { SELECT } = query;
   if (!SELECT)
     return;
@@ -24,7 +24,7 @@ function validateSelectItems(query) {
    * @param {string} queryPart Part of the query that is being checked
    * @returns {Function} Function as callback for applyTransformations
    */
-  function checkRefForInvalid$Self(queryPart) {
+  function checkRefForInvalid$Self( queryPart ) {
     const signalError = (error, parent, type) => {
       if (queryPart === 'columns') {
         error(null, parent.$path,
@@ -78,7 +78,7 @@ function validateSelectItems(query) {
    * @param {string} prop
    * @param {Array} where
    */
-  function checkFilterForInvalid$Self(parent, prop, where) {
+  function checkFilterForInvalid$Self( parent, prop, where ) {
     where.forEach((whereStep) => {
       if (whereStep.ref && ( whereStep.ref[0] === '$projection' || whereStep.ref[0] === '$self')) {
         this.error('expr-where-unexpected-self', whereStep.$path,
@@ -127,7 +127,7 @@ function validateSelectItems(query) {
  * @param {CSN.Artifact} queryArtifact the query artifact which should be checked
  * @param {CSN.Path} artifactPath the path to that artifact
  */
-function rejectManagedAssociationsAndStructuresForHdbcdsNames(queryArtifact, artifactPath) {
+function rejectManagedAssociationsAndStructuresForHdbcdsNames( queryArtifact, artifactPath ) {
   if (this.options.transformation === 'hdbcds' && this.options.sqlMapping === 'hdbcds') {
     forEachGeneric(queryArtifact, 'elements', (selectItem, elemName, prop, elementPath) => {
       if (this.csnUtils.isManagedAssociation(selectItem))

package/lib/checks/sql-snippets.js

@@ -11,7 +11,7 @@
  * @param {CSN.Path} path
  * @returns {void}
  */
-function checkSqlAnnotationOnElement(member, memberName, prop, path) {
+function checkSqlAnnotationOnElement( member, memberName, prop, path ) {
   if (member['@sql.replace'])
     this.error(null, path, { anno: 'sql.replace' }, 'Annotation $(ANNO) is reserved and must not be used');
   if (member['@sql.prepend'])
@@ -34,7 +34,7 @@ function checkSqlAnnotationOnElement(member, memberName, prop, path) {
  * @param {Function} error
  * @param {CSN.Options} options
  */
-function checkValidAnnoValue(carrier, annotation, path, error, options) {
+function checkValidAnnoValue( carrier, annotation, path, error, options ) {
   if (carrier[annotation] !== undefined && carrier[annotation] !== null) {
     if (typeof carrier[annotation] !== 'string')
       error(null, path, { anno: annotation.slice(1), type: typeof carrier[annotation] }, 'Annotation $(ANNO) must be a string, found $(TYPE)' );
@@ -49,7 +49,7 @@ function checkValidAnnoValue(carrier, annotation, path, error, options) {
  * @param {CSN.Artifact} artifact
  * @param {string} artifactName
  */
-function checkSqlAnnotationOnArtifact(artifact, artifactName) {
+function checkSqlAnnotationOnArtifact( artifact, artifactName ) {
   if (artifact.kind !== 'entity') {
     if (artifact['@sql.prepend'])
       this.message('anno-invalid-sql-kind', [ 'definitions', artifactName ], { name: '@sql.prepend', kind: artifact.kind }, 'Annotation $(NAME) can\'t be used on an artifact of kind $(KIND)' );
@@ -83,7 +83,7 @@ const invalidInSnippet = [ ';', '--', '/*', '*/' ];
  * @param {CSN.Path} path
  * @param {Function} error
  */
-function guardAgainstInjection(annoName, annoValue, path, error) {
+function guardAgainstInjection( annoName, annoValue, path, error ) {
   for (const invalid of invalidInSnippet) {
     if (annoValue.indexOf(invalid) !== -1) // These should probably not be configurable, right?
       error(null, path, { name: annoName, prop: invalid }, 'Annotation $(NAME) must not contain $(PROP)');

package/lib/checks/types.js

@@ -14,7 +14,7 @@ const { getUtils, hasAnnotationValue } = require('../model/csnUtils');
  * @param {string} prop which kind of member are we looking at -> only prop "elements"
  * @param {CSN.Path} path the path to the member
  */
-function checkDecimalScale(member, memberName, prop, path) {
+function checkDecimalScale( member, memberName, prop, path ) {
   if (hasAnnotationValue(this.artifact, '@cds.persistence.exists') ||
      // skip is already filtered in validator, here for completeness
      hasAnnotationValue(this.artifact, '@cds.persistence.skip'))
@@ -31,7 +31,7 @@ function checkDecimalScale(member, memberName, prop, path) {
  * @param {string} prop which kind of member are we looking at -> only prop "elements"
  * @param {CSN.Path} path the path to the member
  */
-function checkTypeIsScalar(member, memberName, prop, path) {
+function checkTypeIsScalar( member, memberName, prop, path ) {
   if ( prop === 'params' && this.csnUtils.isStructured(member))
     this.error(null, path, {}, 'View parameter type must be scalar');
 }
@@ -45,7 +45,7 @@ function checkTypeIsScalar(member, memberName, prop, path) {
  * @param {string} prop which kind of member are we looking at -> only prop "elements"
  * @param {CSN.Path} path the path to the member
  */
-function checkElementTypeDefinitionHasType(member, memberName, prop, path) {
+function checkElementTypeDefinitionHasType( member, memberName, prop, path ) {
   // Computed elements, e.g. "1+1 as foo" in a view don't have a valid type and
   // are skipped here.
   // Elements in projections are not tested as well
@@ -90,7 +90,7 @@ function checkElementTypeDefinitionHasType(member, memberName, prop, path) {
  * @param {string} prop which kind of artifact we are looking at
  * @param {CSN.Path} path the path to the artifact
  */
-function checkTypeDefinitionHasType(artifact, artifactName, prop, path) {
+function checkTypeDefinitionHasType( artifact, artifactName, prop, path ) {
   if (artifact.kind !== 'type')
     return;
 
@@ -125,7 +125,7 @@ function checkTypeDefinitionHasType(artifact, artifactName, prop, path) {
  * @param {string} derivedTypeName if the type reference is another type/element e.g. type derivedType : MaliciousType; we want to
  *                                 point at the "MaliciousType" reference, that's why we need to remember the name when drilling down.
  */
-function checkTypeOfHasProperType(artOrElement, name, model, error, path, derivedTypeName = null) {
+function checkTypeOfHasProperType( artOrElement, name, model, error, path, derivedTypeName = null ) {
   if (!artOrElement.type)
     return;
 
@@ -158,7 +158,7 @@ function checkTypeOfHasProperType(artOrElement, name, model, error, path, derive
  * @param {string} name of the element or the artifact which is dubious
  * @param {boolean} isElement indicates whether we are dealing with an element or an artifact
  */
-function errorAboutMissingType(error, path, name, isElement = false) {
+function errorAboutMissingType( error, path, name, isElement = false ) {
   error('check-proper-type', path, { art: name, '#': isElement ? 'elm' : 'std' }, {
     std: 'Dubious type $(ART) without type information',
     elm: 'Dubious element $(ART) without type information',
@@ -174,7 +174,7 @@ function errorAboutMissingType(error, path, name, isElement = false) {
  * @param {CSN.Artifact} artifact the artifact to check
  * @returns {boolean} indicates whether the artifact has type information
  */
-function hasArtifactTypeInformation(artifact) {
+function hasArtifactTypeInformation( artifact ) {
   // When is what property set?
   return artifact.elements ||  // => `type A {}`
     artifact.items ||     // => `type A : array of Integer`

package/lib/checks/utils.js

@@ -8,7 +8,7 @@ const { RelationalOperators } = require('../transform/transformUtilsNew');
  * @param {any} refStep part of a ref
  * @returns {string} Loggable string
  */
-function logReady(refStep) {
+function logReady( refStep ) {
   return refStep.id || refStep;
 }
 
@@ -23,7 +23,7 @@ function logReady(refStep) {
  * @param {number} startIndex the index of the relational term in the on condition array
  * @returns {boolean} indicates whether the other side of a relational term is expandable
  */
-function otherSideIsExpandableStructure(on, startIndex) {
+function otherSideIsExpandableStructure( on, startIndex ) {
   if (on[startIndex - 1] && RelationalOperators.includes(on[startIndex - 1])) {
     const lhs = on[startIndex - 2];
     // if ever lhs is allowed to be a value uncomment this
@@ -46,7 +46,7 @@ function otherSideIsExpandableStructure(on, startIndex) {
    * @param {CSN.Artifact} art Artifact
    * @returns {boolean} True if expandable
    */
-  function isOk(art) {
+  function isOk( art ) {
     return !!(art && (art.elements || (art.target && art.keys)));
   }
 }
@@ -57,7 +57,7 @@ function otherSideIsExpandableStructure(on, startIndex) {
  * @param {object} art Whatever _art by csnRefs can be - element or artifact
  * @returns {object} final artifact type
  */
-function resolveArtifactType(art) {
+function resolveArtifactType( art ) {
   if (art && art.type && !isBuiltinType(art.type))
     return this.csnUtils.getFinalBaseTypeWithProps(art.type);
 

package/lib/checks/validator.js

@@ -2,7 +2,8 @@
 
 const {
   forEachDefinition, forEachMemberRecursively, forAllQueries,
-  forEachMember, getNormalizedQuery, hasAnnotationValue, applyTransformations,
+  forEachMember, getNormalizedQuery, hasAnnotationValue,
+  applyTransformations, functionList,
 } = require('../model/csnUtils');
 const enrich = require('./enricher');
 
@@ -128,12 +129,12 @@ const commonQueryValidators = [ validateMixinOnCondition ];
  * @param {object} iterateOptions can be used to skip certain kinds from being iterated e.g. 'action' and 'function' for hana
  * @returns {Function} Function taking no parameters, that cleans up the attached helpers
  */
-function _validate(csn, that,
-                   csnValidators = [],
-                   memberValidators = [],
-                   artifactValidators = [],
-                   queryValidators = [],
-                   iterateOptions = {}) {
+function _validate( csn, that,
+                    csnValidators = [],
+                    memberValidators = [],
+                    artifactValidators = [],
+                    queryValidators = [],
+                    iterateOptions = {} ) {
   const { cleanup } = enrich(csn);
 
   applyTransformations(csn, mergeCsnValidators(csnValidators, that), [], { drillRef: true });
@@ -151,8 +152,10 @@ function _validate(csn, that,
                                 iterateOptions );
     }
 
-    if (queryValidators.length && getNormalizedQuery(artifact).query)
-      forAllQueries(getNormalizedQuery(artifact).query, queryValidators.map(v => v.bind(that)), path.concat([ artifact.projection ? 'projection' : 'query' ]));
+    if (queryValidators.length && getNormalizedQuery(artifact).query) {
+      forAllQueries(getNormalizedQuery(artifact).query, functionList(queryValidators, that),
+                    path.concat([ artifact.projection ? 'projection' : 'query' ]));
+    }
   }, iterateOptions);
 
   return cleanup;
@@ -165,7 +168,7 @@ function _validate(csn, that,
  * @param {object} that Value for this
  * @returns {object} Remapped validators.
  */
-function mergeCsnValidators(csnValidators, that) {
+function mergeCsnValidators( csnValidators, that ) {
   const remapped = {};
   for (const validator of csnValidators) {
     for (const [ n, fns ] of Object.entries(validator)) {
@@ -196,7 +199,7 @@ function mergeCsnValidators(csnValidators, that) {
  * @param {CSN.Options} options
  * @returns {any[]} Array of validator functions (or objects?)
  */
-function getDBCsnValidators(options) {
+function getDBCsnValidators( options ) {
   if (options.sqlDialect === 'postgres' || options.sqlDialect === 'h2')
     return [ ...forRelationalDBCsnValidators, checkForHanaTypes, checkForParams ];
 
@@ -208,7 +211,7 @@ function getDBCsnValidators(options) {
  * @param {object} that Will be provided to the validators via "this"
  * @returns {Function} the validator function with the respective checks for the HANA backend
  */
-function forRelationalDB(csn, that) {
+function forRelationalDB( csn, that ) {
   return _validate(csn, that,
                    getDBCsnValidators(that.options),
                    forRelationalDBMemberValidators.concat(commonMemberValidators),
@@ -235,7 +238,7 @@ function forRelationalDB(csn, that) {
  * @param {object} that Will be provided to the validators via "this"
  * @returns {Function} the validator function with the respective checks for the OData backend
  */
-function forOdata(csn, that) {
+function forOdata( csn, that ) {
   return _validate(csn, that,
                    forOdataCsnValidators,
                    forOdataMemberValidators.concat(commonMemberValidators),