@sap/cds-compiler 2.11.4 → 2.13.8

package/lib/base/messages.js

@@ -125,6 +125,7 @@ class CompileMessage {
    * @param {CSN.MessageSeverity} [severity='Error'] Severity: Debug, Info, Warning, Error
    * @param {string} [id] The ID of the message - visible as property messageId
    * @param {any} [home]
+   * @param {string} [moduleName] Name of the module that created this message
    *
    * @memberOf CompileMessage
    */
@@ -175,22 +176,6 @@ function dollarLocation( location ) {
   return loc;
 }
 
-/**
- * Handle compiler messages, i.e. throw a compiler exception if there are errors.
- *
- * @param {object} model CSN or XSN
- * @param {CSN.Options} [options]
- * @deprecated Use throwWithError() from makeMessageFunction instead.
- */
-function handleMessages( model, options = {} ) {
-  const messages = options.messages;
-  if (messages && messages.length) {
-    if (hasErrors( messages ))
-      throw new CompilationError( messages, options.attachValidNames && model );
-  }
-  return model;
-}
-
 const severitySpecs = {
   error: { name: 'Error', level: 0 },
   warning: { name: 'Warning', level: 1 },
@@ -282,16 +267,16 @@ function compareSeverities( a, b ) {
 /**
  * @todo This was copied from somewhere just to make CSN paths work.
  * @param {CSN.Model} model
- * @param {CSN.Path} path
+ * @param {CSN.Path} csnPath
  */
-function searchForLocation( model, path ) {
+function searchForLocation( model, csnPath ) {
   if (!model)
     return null;
   // Don't display a location if we cannot find one!
   let lastLocation = null;
   /** @type {object} */
   let currentStep = model;
-  for (const step of path) {
+  for (const step of csnPath) {
     if (!currentStep)
       return lastLocation;
     currentStep = currentStep[step];
@@ -1101,13 +1086,15 @@ function artName( art, omit ) {
     r.push( (art.kind === 'extend' ? 'block:' : 'query:') + name.select ); // TODO: rename to 'select:1' and consider whether there are more selects
   if (name.action && omit !== 'action')
     r.push( memberActionName(art) + ':' + quoted( name.action ) );
-  if (name.alias)
+  if (name.alias && art.kind !== '$self')
     r.push( (art.kind === 'mixin' ? 'mixin:' : 'alias:') + quoted( name.alias ) )
   if (name.param != null && omit !== 'param')
     r.push( name.param ? 'param:' + quoted( name.param ) : 'returns' ); // TODO: join
   if (name.element && omit !== 'element')
     // r.push( `${ art.kind }: ${ quoted( name.element )}` ); or even better element:"assoc"/key:"i" same with enum
     r.push( (art.kind === 'enum' ? 'enum:' : 'element:') + quoted( name.element ) );
+  if (art.kind === '$self')
+    r.push( 'alias:' + quoted( name.alias ) ) // should be late due to $self in anonymous aspect
   return r.join('/');
 }
 
@@ -1120,6 +1107,7 @@ function memberActionName( art ) {
   return 'action';
 }
 
+// TODO: XSN-specific things should probably move out
 function homeName( art, absoluteOnly ) {
   if (!art)
     return art;
@@ -1135,8 +1123,10 @@ function homeName( art, absoluteOnly ) {
     return homeName( art.name._artifact, absoluteOnly ); // use corresponding definition
   else if (absoluteOnly)
     return art.name.absolute;
-  else
-    return (art._main ? art._main.kind : art.kind) + ':' + artName( art );
+  let main = art._main || art;
+  while (main._outer)           // anonymous aspect
+    main = main._outer._main;
+  return main.kind + ':' + artName( art );
 }
 
 // The "home" for extensions is handled differently because `_artifact` is not
@@ -1190,9 +1180,9 @@ function constructSemanticLocationFromCsnPath(csnPath, model) {
 
   // remove definitions
   csnPath.shift();
-  const artName = csnPath.shift();
-  let currentThing = model.definitions[artName];
-  let result = `${ (currentThing && currentThing.kind) ? currentThing.kind : 'artifact' }:${ _quoted(artName) }`;
+  const artifactName = csnPath.shift();
+  let currentThing = model.definitions[artifactName];
+  let result = `${ (currentThing && currentThing.kind) ? currentThing.kind : 'artifact' }:${ _quoted(artifactName) }`;
 
   if (!currentThing)
     return result;
@@ -1444,12 +1434,12 @@ module.exports = {
   createMessageFunctions,
   makeMessageFunction,
   artName,
-  handleMessages,
   sortMessages: (m => m.sort(compareMessage)),
   sortMessagesSeverityAware: (m => m.sort(compareMessageSeverityAware)),
   deduplicateMessages,
   CompileMessage,
   CompilationError,
+  isMessageDowngradable: isDowngradable,
   explainMessage,
   hasMessageExplanation,
   messageIdsWithExplanation,

package/lib/base/model.js

@@ -63,7 +63,7 @@ function isBetaEnabled( options, feature ) {
  */
 function isDeprecatedEnabled( options, feature = null ) {
   const { deprecated } = options;
-  if(!feature)
+  if (!feature)
     return !!deprecated;
   return deprecated && typeof deprecated === 'object' && deprecated[feature];
 }
@@ -93,63 +93,6 @@ function forEachMember( construct, callback, target ) {
 
 }
 
-// Apply function `callback(member, memberName, prop)` to each member in
-// `construct`, recursively (i.e. also for sub-elements of elements).
-function forEachMemberRecursively( construct, callback ) {
-  forEachMember( construct, ( member, memberName, prop ) => {
-    callback( member, memberName, prop );
-    // Descend into nested members, too
-    forEachMemberRecursively( member, callback );
-  });
-  // If 'construct' has more than one query, descend into the elements of the remaining ones, too
-  if (construct.$queries && construct.$queries.length > 1) {
-    construct.$queries.slice(1).forEach(query => forEachMemberRecursively(query, callback));
-  }
-}
-
-/**
- * Apply function `callback` to all members of object `obj` (main artifact or
- * parent member).  Members are considered those in dictionaries `elements`,
- * `enum`, `actions` and `params` of `obj`, `elements` and `enums` are also
- * searched inside property `items` (array of).  `$queries`, `mixin` and
- * `columns` are also visited in contrast to `forEachMember()`.
- * See function `forEachGeneric()` for details.
- *
- * @param {XSN.Artifact} construct
- * @param {(member: object, memberName: string, prop: string) => any} callback
- * @param {object} [target]
- */
-function forEachMemberWithQuery( construct, callback, target ) {
-  let obj = construct.returns || construct; // why the extra `returns` for actions?
-  obj = obj.items || obj;
-  forEachGeneric( target || obj, 'elements', callback );
-  forEachGeneric( obj, 'enum', callback );
-  forEachGeneric( obj, 'foreignKeys', callback );
-  forEachGeneric( construct, 'actions', callback );
-  forEachGeneric( construct, 'params', callback );
-  // For Queries
-  forEachGeneric( construct, '$queries', callback );
-  forEachGeneric( construct, 'mixin', callback );
-  forEachGeneric( construct, 'columns', callback );
-}
-
-/**
- * Apply function `callback(member, memberName, prop)` to each member in
- * `construct`, recursively (i.e. also for sub-elements of elements).
- * In contrast to `forEachMemberRecursively()` this function also traverses
- * queries and mixins.
- *
- * @param {XSN.Artifact} construct
- * @param {(member: object, memberName: string, prop: string) => any} callback
- */
-function forEachMemberRecursivelyWithQuery( construct, callback ) {
-  forEachMemberWithQuery( construct, ( member, memberName, prop ) => {
-    callback( member, memberName, prop );
-    // Descend into nested members, too
-    forEachMemberRecursivelyWithQuery( member, callback );
-  });
-}
-
 // Apply function `callback` to all objects in dictionary `dict`, including all
 // duplicates (found under the same name).  Function `callback` is called with
 // the following arguments: the object, the name, and -if it is a duplicate-
@@ -157,7 +100,7 @@ function forEachMemberRecursivelyWithQuery( construct, callback ) {
 function forEachGeneric( obj, prop, callback ) {
   let dict = obj[prop];
   for (let name in dict) {
-    let obj = dict[name];
+    obj = dict[name];
     callback( obj, name, prop );
     if (Array.isArray(obj.$duplicates)) // redefinitions
       obj.$duplicates.forEach( o => callback( o, name, prop ) )
@@ -189,9 +132,6 @@ module.exports = {
   queryOps,
   forEachDefinition,
   forEachMember,
-  forEachMemberRecursively,
-  forEachMemberWithQuery,
-  forEachMemberRecursivelyWithQuery,
   forEachGeneric,
   forEachInOrder,
   setProp,