@sap/cds-compiler 2.4.4 → 2.10.2

package/lib/checks/validator.js

@@ -2,13 +2,13 @@
 
 const {
   forEachDefinition, forEachMemberRecursively, forAllQueries,
-  forEachMember, getNormalizedQuery, hasBoolAnnotation,
+  forEachMember, getNormalizedQuery, hasAnnotationValue, applyTransformations,
 } = require('../model/csnUtils');
 const enrich = require('./enricher');
 
 // forHana
-const validateSelectItems = require('./selectItems');
-const { rejectParamDefaultsInHanaCds } = require('./defaultValues');
+const { validateSelectItems } = require('./selectItems');
+const { rejectParamDefaultsInHanaCds, warnAboutDefaultOnAssociationForHanaCds } = require('./defaultValues');
 const validateCdsPersistenceAnnotation = require('./cdsPersistence');
 const checkUsedTypesForAnonymousAspectComposition = require('./managedInType');
 const checkForEmptyOrOnlyVirtual = require('./emptyOrOnlyVirtual');
@@ -23,19 +23,28 @@ const {
 // both
 const { validateOnCondition, validateMixinOnCondition } = require('./onConditions');
 const validateForeignKeys = require('./foreignKeys');
-const { checkTypeDefinitionHasType, checkElementTypeDefinitionHasType, checkTypeIsScalar } = require('./types');
+const {
+  checkTypeDefinitionHasType, checkElementTypeDefinitionHasType,
+  checkTypeIsScalar, checkDecimalScale,
+} = require('./types');
 const { checkPrimaryKey, checkVirtualElement, checkManagedAssoc } = require('./elements');
 const checkForInvalidTarget = require('./invalidTarget');
 const { validateAssociationsInItems } = require('./arrayOfs');
 const checkQueryForNoDBArtifacts = require('./queryNoDbArtifacts');
 const checkExplicitlyNullableKeys = require('./nullableKeys');
+const nonexpandableStructuredInExpression = require('./nonexpandableStructured');
+const unknownMagic = require('./unknownMagic');
+const managedWithoutKeys = require('./managedWithoutKeys');
 
 const forHanaMemberValidators
 = [
   // For HANA CDS specifically, reject any default parameter values, as these are not supported.
   rejectParamDefaultsInHanaCds,
   checkTypeIsScalar,
+  checkDecimalScale,
   checkExplicitlyNullableKeys,
+  managedWithoutKeys,
+  warnAboutDefaultOnAssociationForHanaCds,
 ];
 
 const forHanaArtifactValidators
@@ -46,8 +55,11 @@ const forHanaArtifactValidators
   checkForEmptyOrOnlyVirtual,
 ];
 
-const forHanaQueryValidators
-= [
+const forHanaCsnValidators = [ nonexpandableStructuredInExpression, unknownMagic ];
+/**
+ * @type {Array<(query: CSN.Query, path: CSN.Path) => void>}
+ */
+const forHanaQueryValidators = [
   // TODO reason why this is forHana exclusive
   validateSelectItems,
   checkQueryForNoDBArtifacts,
@@ -57,6 +69,7 @@ const forOdataMemberValidators
 = [
   // OData allows only simple values, no expressions or functions
   validateDefaultValues,
+  managedWithoutKeys,
 ];
 
 const forOdataArtifactValidators
@@ -75,6 +88,8 @@ const forOdataArtifactValidators
   checkReadOnlyAndInsertOnly,
 ];
 
+const forOdataCsnValidators = [ nonexpandableStructuredInExpression ];
+
 const forOdataQueryValidators = [];
 
 const commonMemberValidators
@@ -91,6 +106,7 @@ const commonQueryValidators = [ validateMixinOnCondition ];
  *
  * @param {CSN.Model} csn CSN to check
  * @param {object} that Will be provided to the validators via "this"
+ * @param {object[]} [csnValidators=[]] Validations on whole CSN using applyTransformations
  * @param {Function[]} [memberValidators=[]] Validations on member-level
  * @param {Function[]} [artifactValidators=[]] Validations on artifact-level
  * @param {Function[]} [queryValidators=[]] Validations on query-level
@@ -98,19 +114,21 @@ const commonQueryValidators = [ validateMixinOnCondition ];
  * @returns {Function} Function taking no parameters, that cleans up the attached helpers
  */
 function _validate(csn, that,
+                   csnValidators = [],
                    memberValidators = [],
                    artifactValidators = [],
                    queryValidators = [],
                    iterateOptions = {}) {
   const { cleanup } = enrich(csn);
 
+  applyTransformations(csn, mergeCsnValidators(csnValidators, that), [], true, { drillRef: true });
+
   forEachDefinition(csn, (artifact, artifactName, prop, path) => {
     artifactValidators.forEach((artifactValidator) => {
       artifactValidator.bind(that)(artifact, artifactName, prop, path);
     });
     that.artifact = artifact;
-    if (memberValidators.length &&
-      (!iterateOptions.filterArtifact || iterateOptions.filterArtifact(artifact))) {
+    if (memberValidators.length) {
       forEachMemberRecursively( artifact,
                                 memberValidators.map(v => v.bind(that)),
                                 path,
@@ -119,20 +137,52 @@ function _validate(csn, that,
     }
 
     if (queryValidators.length && getNormalizedQuery(artifact).query)
-      forAllQueries(getNormalizedQuery(artifact).query, queryValidators.map(v => v.bind(that)), path.concat([ 'query' ]));
+      forAllQueries(getNormalizedQuery(artifact).query, queryValidators.map(v => v.bind(that)), path.concat([ artifact.projection ? 'projection' : 'query' ]));
   }, iterateOptions);
 
   return cleanup;
 }
 
+/**
+ * Ensure the CSN validators adhere to the applyTransformation format - also, supply correct this value for each subfunction
+ *
+ * @param {object[]} csnValidators Validators
+ * @param {object} that Value for this
+ * @returns {object} Remapped validators.
+ */
+function mergeCsnValidators(csnValidators, that) {
+  const remapped = {};
+  for (const validator of csnValidators) {
+    for (const [ n, fns ] of Object.entries(validator)) {
+      if (!remapped[n])
+        remapped[n] = [];
+
+      if (Array.isArray(fns)) {
+        remapped[n].push((parent, name, prop, path) => fns.forEach(
+          fn => fn.bind(that)(parent, name, prop, path)
+        ));
+      }
+      else {
+        remapped[n].push((parent, name, prop, path) => fns.bind(that)(parent, name, prop, path));
+      }
+    }
+  }
+
+  for (const [ n, fns ] of Object.entries(remapped))
+    remapped[n] = (parent, name, prop, path) => fns.forEach(fn => fn.bind(that)(parent, name, prop, path));
+
+
+  return remapped;
+}
+
 /**
  * @param {CSN.Model} csn CSN to check
  * @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 forHana(csn, that) {
   return _validate(csn, that,
+                   forHanaCsnValidators,
                    forHanaMemberValidators.concat(commonMemberValidators),
                    forHanaArtifactValidators.concat(commonArtifactValidators).concat(
                      // why is this hana exclusive
@@ -146,7 +196,7 @@ function forHana(csn, that) {
                    ),
                    forHanaQueryValidators.concat(commonQueryValidators),
                    {
-                     filterArtifact: artifact => !artifact.abstract && !hasBoolAnnotation(artifact, '@cds.persistence.skip'),
+                     skipArtifact: artifact => artifact.abstract || hasAnnotationValue(artifact, '@cds.persistence.skip'),
                      skip: [
                        'action',
                        'function',
@@ -158,11 +208,11 @@ function forHana(csn, that) {
 /**
  * @param {CSN.Model} csn CSN to check
  * @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) {
   return _validate(csn, that,
+                   forOdataCsnValidators,
                    forOdataMemberValidators.concat(commonMemberValidators),
                    forOdataArtifactValidators.concat(commonArtifactValidators).concat(
                      (artifact, artifactName) => {
@@ -176,7 +226,10 @@ function forOdata(csn, that) {
                        }
                      }
                    ),
-                   forOdataQueryValidators.concat(commonQueryValidators));
+                   forOdataQueryValidators.concat(commonQueryValidators),
+                   {
+                     skipArtifact: this.isExternalServiceMember,
+                   });
 }
 
 module.exports = { forHana, forOdata };

package/lib/compiler/assert-consistency.js

@@ -97,6 +97,7 @@ function assertConsistency( model, stage ) {
         '_entities', '$entity',
         '$blocks',
         '$newfeatures',
+        '$messageFunctions',
       ],
     },
     ':parser': {                // top-level from parser
@@ -111,6 +112,7 @@ function assertConsistency( model, stage ) {
         'meta',
         '@sql_mapping',         // TODO: it is time that a 'header' attribute replaces 'version'
         '$withLocalized',
+        '$sources',
       ],
     },
     location: {                 // location req if at least one property:
@@ -121,8 +123,8 @@ function assertConsistency( model, stage ) {
       schema: {
         line: { test: isNumber },
         col: { test: isNumber },
-        endLine: { test: isNumber },
-        endCol: { test: isNumber },
+        endLine: { test: isNumber, also: [ undefined ] },
+        endCol: { test: isNumber, also: [ undefined ] },
         $notFound: { test: isBoolean },
       },
     },
@@ -244,8 +246,8 @@ function assertConsistency( model, stage ) {
         optional: [
           'name', '$parens', 'quantifier', 'mixin', 'excludingDict', 'columns', 'elements', '_deps',
           'where', 'groupBy', 'having', 'orderBy', '$orderBy', 'limit',
-          '_projections', '_block', '_parent', '_main', '_effectiveType',
-          '$tableAliases', 'kind', '_$next', '_combined',
+          '_projections', '_block', '_parent', '_main', '_effectiveType', '$expand',
+          '$tableAliases', 'kind', '_$next', '_combined', '$inlines',
         ],
       },
       none: { optional: () => true }, // parse error
@@ -286,8 +288,8 @@ function assertConsistency( model, stage ) {
     },
     columns: {
       kind: [ 'extend' ],
-      inherits: 'definitions',
       test: isArray( column ),
+      optional: thoseWithKind,
       enum: [ '*' ],
       requires: [ 'location' ],
       // schema: { kind: { isRequired: () => {} } } // kind not required
@@ -295,6 +297,7 @@ function assertConsistency( model, stage ) {
     expand: { kind: [ 'element' ], inherits: 'columns' },
     inline: { kind: [ 'element' ], inherits: 'columns' },
     excludingDict: {
+      kind: 'element',
       test: isDictionary( definition ), // definition since redef
       requires: [ 'location', 'name' ],
       optional: [ '$annotations' ], // TODO: get rid of annos: []
@@ -308,6 +311,7 @@ function assertConsistency( model, stage ) {
     rows: { inherits: 'value' },
     offset: { inherits: 'value' },
     _combined: { test: TODO },
+    $inlines: { test: TODO },
     type: {
       kind: true,
       requires: [ 'location', 'path' ],
@@ -320,7 +324,7 @@ function assertConsistency( model, stage ) {
       requires: [ 'location' ],
       optional: [
         'path', 'elements', '_outer',
-        'scope', '_artifact', '$inferred',
+        'scope', '_artifact', '$inferred', '$expand',
         '_effectiveType',           // by propagation
       ],
     },
@@ -347,6 +351,7 @@ function assertConsistency( model, stage ) {
     $delimited: { parser: true, test: isBoolean },
     scope: { test: isScope },
     func: { test: TODO },
+    suffix: { test: TODO },
     kind: {
       isRequired: !stageParser && (() => true),
       // required to be set by Core Compiler even with parse errors
@@ -394,6 +399,7 @@ function assertConsistency( model, stage ) {
         optional: [
           'args',
           'func',
+          'suffix',
           'quantifier',
           '$inferred',
           '$parens',
@@ -422,7 +428,7 @@ function assertConsistency( model, stage ) {
     struct: { inherits: 'val', test: isDictionary( definition ) }, // def because double @
     args: {
       inherits: 'value',
-      optional: [ 'name', '$duplicate', '$expected' ],
+      optional: [ 'name', '$duplicate', '$expected', 'args', 'suffix' ],
       test: args,
     },
     on: { kind: true, inherits: 'value', test: expression },
@@ -525,11 +531,11 @@ function assertConsistency( model, stage ) {
         // query specific
         'op', 'from', 'elements',
         '_combined',
-        '$tableAliases',
+        '$tableAliases', '$inlines',
       ],
       optional: [
         '_effectiveType', '$parens',
-        '_deps',
+        '_deps', '$expand',
         // query specific
         'where', 'columns', 'mixin', 'quantifier', 'offset',
         'orderBy', '$orderBy', 'groupBy', 'excludingDict', 'having',
@@ -539,7 +545,7 @@ function assertConsistency( model, stage ) {
     _leadingQuery: { kind: true, test: TODO },
     $replacement: { kind: true, test: TODO }, // for smart * in queries
     _origin: { kind: [ 'entity' ], test: TODO },
-    _pathHead: { kind: [ 'element' ], test: TODO },
+    _pathHead: { kind: [ 'element', undefined ], test: TODO }, // column or * (wildcard)
     _from: { kind: true, test: TODO }, // all table refs necessary to compute elements
     // array of $tableAlias (or includes) for explicit and implicit redirection:
     _redirected: { kind: true, test: TODO },
@@ -570,12 +576,18 @@ function assertConsistency( model, stage ) {
     $duplicates: { parser: true, kind: true, test: TODO }, // array of arts or true
     $extension: { kind: true, test: TODO }, // TODO: introduce $applied instead or $status
     $inferred: { parser: true, kind: true, test: isString },
-    $expand: { kind: true, test: isString },
+
+    // Helper property for the XSN-to-CSN transformation, see function setExpandStatus():
+    // client, universal: render expanded elements?  gensrc: produce annotate statements?
+    $expand: { kind: true, test: isString }, // TODO: rename it to $elementsExpand ?
+
     $autoexpose: { kind: [ 'entity' ], test: isBoolean, also: [ null, 'Composition' ] },
     $a2j: { kind: true, enumerable: true, test: TODO },
     $extra: { parser: true, test: TODO },   // for unexpected properties in CSN
     $withLocalized: { test: isBoolean },
+    $sources: { parser: true, test: isArray( isString ) },
     $expected: { parser: true, test: isString },
+    $messageFunctions: { test: TODO },
   };
   let _noSyntaxErrors = null;
   assertProp( model, null, stageParser ? ':parser' : ':model', null, true );
@@ -806,7 +818,7 @@ function assertConsistency( model, stage ) {
     return function valWithLocation( node, parent, prop, spec, name ) {
       const valSchema = { val: Object.assign( {}, spec, { test: func } ) };
       const requires = [ 'val', 'location' ];
-      const optional = [ 'literal', '$inferred' ];
+      const optional = [ 'literal', '$inferred', '_pathHead' ];
       standard( node, parent, prop, { schema: valSchema, requires, optional }, name );
     };
   }

package/lib/compiler/builtins.js

@@ -83,6 +83,8 @@ const specialFunctions = {
 const magicVariables = {
   $user: {
     elements: { id: {}, locale: {} },
+    // Allow $user.<any>
+    $uncheckedElements: true,
     // Allow shortcut in CDL: `$user` becomes `$user.id` in CSN.
     $autoElement: 'id',
   },                  // CDS-specific, not part of SQL

package/lib/compiler/checks.js

@@ -13,16 +13,16 @@
 
 'use strict';
 
-const { makeMessageFunction } = require('../base/messages');
 // const { hasArtifactTypeInformation } = require('../model/csnUtils')
 const builtins = require('../compiler/builtins');
-const { forEachGeneric, forEachDefinition, forEachMember } = require('../base/model');
+const {
+  forEachGeneric, forEachDefinition, forEachMember,
+} = require('../base/model');
 
 function check( model ) {       // = XSN
-  const { options } = model;
   const {
     error, warning, message,
-  } = makeMessageFunction( model, options, 'compile' );
+  } = model.$messageFunctions;
   forEachDefinition( model, checkArtifact );
   return;
 
@@ -66,6 +66,8 @@ function check( model ) {       // = XSN
   }
 
   function checkName( construct ) {
+    if (model.options.$skipNameCheck)
+      return;
     // TODO: Move a corrected version of this check to definer (but do not rely
     // on it!): The code below misses to consider CSN input.
     if (construct.name.id && construct.name.id.indexOf('.') !== -1) {