@sap/cds-compiler 2.12.0 → 2.15.2

package/lib/base/messages.js

@@ -7,10 +7,11 @@
 const { term } = require('../utils/term');
 const { locationString } = require('./location');
 const { isDeprecatedEnabled } = require('./model');
-const { centralMessages, centralMessageTexts } = require('./message-registry');
+const { centralMessages, centralMessageTexts, oldMessageIds } = require('./message-registry');
 const { copyPropIfExist } = require('../utils/objectUtils');
 const _messageIdsWithExplanation = require('../../share/messages/message-explanations.json').messages;
 const { analyseCsnPath, traverseQuery } = require('../model/csnRefs');
+const { CompilerAssertion } = require("./error");
 
 const fs = require('fs');
 const path = require('path');
@@ -24,7 +25,8 @@ let test$severities = null;
 let test$texts = null;
 
 /**
- * Returns true if at least one of the given messages is of severity "Error"
+ * Returns true if at least one of the given messages is of severity "Error".
+ *
  * @param {CSN.Message[]} messages
  * @returns {boolean}
  */
@@ -34,7 +36,8 @@ function hasErrors( messages ) {
 
 /**
  * Returns true if at least one of the given messages is of severity "Error"
- * and *cannot* be reclassified to a warning.
+ * and *cannot* be reclassified to a warning for the given module.
+ * Won't detect already downgraded messages.
  *
  * @param {CSN.Message[]} messages
  * @param {string} moduleName
@@ -122,9 +125,10 @@ class CompileMessage {
    * Creates an instance of CompileMessage.
    * @param {any} location Location of the message
    * @param {string} msg The message text
-   * @param {CSN.MessageSeverity} [severity='Error'] Severity: Debug, Info, Warning, Error
+   * @param {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
    */
@@ -140,7 +144,7 @@ class CompileMessage {
       Object.defineProperty( this, 'messageId', { value: id } );
       // this.messageId = id;  // ids not yet finalized
     if (moduleName)
-      Object.defineProperty( this, '$module', { value: moduleName } );
+      Object.defineProperty( this, '$module', { value: moduleName, configurable: true } );
   }
 
   toString() {                  // should have no argument...
@@ -175,22 +179,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 },
@@ -199,7 +187,7 @@ const severitySpecs = {
 };
 
 /**
- * Reclassify the given message's severity using:
+ * Get the reclassified severity of the given message using:
  *
  *  1. The specified severity: either centrally provided or via the input severity
  *     - when generally specified as 'Error', immediately return 'Error'
@@ -210,17 +198,14 @@ const severitySpecs = {
  *     been returned according to 1, return the severity according to the user wishes.
  *  3. Otherwise, use the specified severity.
  *
- * @param {string} id
- * @param {CSN.MessageSeverity} severity
- * @param {object} severities
+ * @param {object} msg The CompileMessage.
+ * @param {CSN.Options} options
  * @param {string} moduleName
- * @returns {CSN.MessageSeverity}
- *
- * TODO: we should pass options as usual
- * TODO: should be part of the returned function
+ * @param {boolean} deprecatedDowngradable
+ * @returns {MessageSeverity}
  */
-function reclassifiedSeverity( id, severity, severities, moduleName, deprecatedDowngradable ) {
-  const spec = centralMessages[id] || { severity };
+function reclassifiedSeverity(msg, options, moduleName, deprecatedDowngradable ) {
+  const spec = centralMessages[msg.messageId] || { severity: msg.severity, configurableFor: null, errorFor: null };
   if (spec.severity === 'Error') {
     const { configurableFor } = spec;
     if (!(Array.isArray( configurableFor )
@@ -233,7 +218,17 @@ function reclassifiedSeverity( id, severity, severities, moduleName, deprecatedD
     if (Array.isArray( errorFor ) && errorFor.includes( moduleName ))
       return 'Error';
   }
-  return normalizedSeverity( severities[id] ) || spec.severity;
+
+  if (!options.severities)
+    return spec.severity;
+
+  let newSeverity = options.severities[msg.messageId];
+  // The user could have specified a severity through an old message ID.
+  if (!newSeverity && spec.oldNames) {
+    const oldName = spec.oldNames.find((name => options.severities[name]))
+    newSeverity = options.severities[oldName];
+  }
+  return normalizedSeverity( newSeverity ) || spec.severity;
 }
 
 function normalizedSeverity( severity ) {
@@ -243,24 +238,6 @@ function normalizedSeverity( severity ) {
   return s ? s.name : 'Error';
 }
 
-/**
- * Reclassifies all messages according to the current module.
- * This is required because if throwWithError() throws and the message's
- * severities has `errorFor` set, then the message may still appear to be a warning.
- *
- * TODO: this actually likely needs to be called by the backend module at the beginning!
- *
- * @param {CSN.Message[]} messages
- * @param {object} severities
- * @param {string} moduleName
- */
-function reclassifyMessagesForModule(messages, severities, moduleName, deprecatedDowngradable) {
-  for (const msg of messages) {
-    if (msg.messageId && msg.severity !== 'Error')
-      msg.severity = reclassifiedSeverity(msg.messageId, msg.severity, severities, moduleName, deprecatedDowngradable);
-  }
-}
-
 /**
  * Compare two severities.  Returns 0 if they are the same, and <0 if
  * `a` has a lower `level` than `b` according to {@link severitySpecs},
@@ -268,8 +245,8 @@ function reclassifyMessagesForModule(messages, severities, moduleName, deprecate
  *
  *   compareSeverities('Error', 'Info')  =>  Error < Info  =>  -1
  *
- * @param {CSN.MessageSeverity} a
- * @param {CSN.MessageSeverity} b
+ * @param {MessageSeverity} a
+ * @param {MessageSeverity} b
  * @see severitySpecs
  */
 function compareSeverities( a, b ) {
@@ -282,16 +259,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];
@@ -304,10 +281,9 @@ function searchForLocation( model, path ) {
 
 /**
  * Create the `message` functions to emit messages.
- * See internalDoc/ReportingMessages.md for detail
  *
  * @example
- * ```
+ * ```js
  *   const { createMessageFunctions } = require(‘../base/messages’);
  *   function module( …, options ) {
  *     const { message, info, throwWithError } = createMessageFunctions( options, moduleName );
@@ -323,14 +299,14 @@ function searchForLocation( model, path ) {
  * @param {object} [model=null] the CSN or XSN model, used for convenience
  */
 function createMessageFunctions( options, moduleName, model = null ) {
-  return makeMessageFunction( model, options, moduleName, true );
+  return makeMessageFunction( model, options, moduleName );
 }
 
 /**
  * Create the `message` function to emit messages.
  *
  * @example
- * ```
+ * ```js
  *   const { makeMessageFunction } = require(‘../base/messages’);
  *   function module( …, options ) {
  *     const { message, info, throwWithError } = makeMessageFunction( model, options, moduleName );
@@ -344,15 +320,13 @@ function createMessageFunctions( options, moduleName, model = null ) {
  * @param {object} model
  * @param {CSN.Options} [options]
  * @param {string} [moduleName]
- * @param {boolean} [throwOnlyWithNew=false] behave like createMessageFunctions
  */
-function makeMessageFunction( model, options, moduleName = null, throwOnlyWithNew = false ) {
+function makeMessageFunction( model, options, moduleName = null ) {
   // ensure message consistency during runtime with --test-mode
   if (options.testMode)
     _check$Init( options );
 
   const hasMessageArray = !!options.messages;
-  const severities = options.severities || {};
   const deprecatedDowngradable = isDeprecatedEnabled( options, 'downgradableErrors' );
   /**
    * Array of collected compiler messages. Only use it for debugging. Will not
@@ -361,10 +335,17 @@ function makeMessageFunction( model, options, moduleName = null, throwOnlyWithNe
    * @type {CSN.Message[]}
    */
   let messages = options.messages || [];
+  /**
+   * Whether an error was emitted in the module. Also includes reclassified errors.
+   * @type {boolean}
+   */
   let hasNewError = false;
+
+  reclassifyMessagesForModule();
+
   return {
     message, error, warning, info, debug, messages,
-    throwWithError: (throwOnlyWithNew ? throwWithError : throwWithAnyError),
+    throwWithError, throwWithAnyError,
     callTransparently, moduleName,
   };
 
@@ -376,11 +357,6 @@ function makeMessageFunction( model, options, moduleName = null, throwOnlyWithNe
       texts = { std: textOrArguments };
       textOrArguments = {};
     }
-    if (id) {
-      if (options.testMode && !options.$recompile)
-        _check$Consistency( id, moduleName, severity, texts, options )
-      severity = reclassifiedSeverity( id, severity, severities, moduleName, deprecatedDowngradable );
-    }
 
     const [ fileLocation, semanticLocation, definition ] = _normalizeMessageLocation(location);
     const text = messageText( texts || centralMessageTexts[id], textOrArguments );
@@ -392,6 +368,12 @@ function makeMessageFunction( model, options, moduleName = null, throwOnlyWithNe
     if (definition)
       msg.$location.address = { definition };
 
+    if (id) {
+      if (options.testMode && !options.$recompile)
+        _check$Consistency( id, moduleName, severity, texts, options )
+      msg.severity = reclassifiedSeverity(msg, options, moduleName, deprecatedDowngradable );
+    }
+
     messages.push( msg );
     hasNewError = hasNewError || msg.severity === 'Error' &&
       !(options.testMode && msg.messageId && isDowngradable( msg.messageId, moduleName ));
@@ -421,7 +403,7 @@ function makeMessageFunction( model, options, moduleName = null, throwOnlyWithNe
 
     if (isShortSignature) {
       if (texts)
-        throw new Error('No "texts" argument expected because text was already provided as third argument.');
+        throw new CompilerAssertion('No "texts" argument expected because text was already provided as third argument.');
     } else {
       if (textArguments !== undefined && typeof textArguments !== 'object')
         _expectedType('textArguments', textArguments, 'object')
@@ -430,7 +412,7 @@ function makeMessageFunction( model, options, moduleName = null, throwOnlyWithNe
     }
 
     function _expectedType(field, value, type) {
-      throw new Error(`Invalid argument type for ${ field }! Expected ${ type } but got ${ typeof value }. Do you use the old function signature?`);
+      throw new CompilerAssertion(`Invalid argument type for ${ field }! Expected ${ type } but got ${ typeof value }. Do you use the old function signature?`);
     }
   }
 
@@ -485,9 +467,9 @@ function makeMessageFunction( model, options, moduleName = null, throwOnlyWithNe
    */
   function message(id, location, textArguments = null, texts = null) {
     if (!id)
-      throw new Error('A message id is missing!');
+      throw new CompilerAssertion('A message id is missing!');
     if (!centralMessages[id])
-      throw new Error(`Message id '${ id }' is missing an entry in the central message register!`);
+      throw new CompilerAssertion(`Message id '${ id }' is missing an entry in the central message register!`);
     return _message(id, location, textArguments, null, texts);
   }
 
@@ -539,12 +521,31 @@ function makeMessageFunction( model, options, moduleName = null, throwOnlyWithNe
   function throwWithAnyError() {
     if (!messages || !messages.length)
       return;
-    reclassifyMessagesForModule( messages, severities, moduleName ); // TODO: no, at the beginning of the module
     const hasError = options.testMode ? hasNonDowngradableErrors : hasErrors;
     if (hasError( messages, moduleName ))
       throw new CompilationError( messages, options.attachValidNames && model );
   }
 
+  /**
+   * Reclassifies all messages according to the current module.
+   * This is required because if throwWithError() throws and the message's
+   * severities has `errorFor` set, then the message may still appear to be a warning.
+   */
+  function reclassifyMessagesForModule() {
+    for (const msg of messages) {
+      if (msg.messageId && msg.severity !== 'Error') {
+        const severity = reclassifiedSeverity(msg, options, moduleName, deprecatedDowngradable);
+        if (severity !== msg.severity) {
+          msg.severity = severity;
+          // Re-set the module regardless of severity, since we reclassified it.
+          Object.defineProperty( msg, '$module', { value: moduleName, configurable: true } );
+          hasNewError = hasNewError || severity === 'Error' &&
+            !(options.testMode && msg.messageId && isDowngradable( msg.messageId, moduleName ));
+        }
+      }
+    }
+  }
+
   /**
    * Collects all messages during the call of the callback function instead of
    * storing them in the model. Returns the collected messages.
@@ -580,7 +581,7 @@ function _check$Init( options ) {
 
 function _check$Consistency( id, moduleName, severity, texts, options ) {
   if (id.length > 30 && !centralMessages[id])
-    throw new Error( `The message ID "${id}" has more than 30 chars and must be listed centrally` );
+    throw new CompilerAssertion( `The message ID "${id}" has more than 30 chars and must be listed centrally` );
   if (!options.severities)
     _check$Severities( id, moduleName || '?', severity );
   for (const [variant, text] of
@@ -597,20 +598,19 @@ function _check$Severities( id, moduleName, severity ) {
     if (!expected)
       test$severities[id] = severity;
     else if (expected !== severity)
-      throw new Error( `Expecting severity "${expected}" from previous call, not "${severity}" for message ID "${id}"` );
+      throw new CompilerAssertion( `Expecting severity "${expected}" from previous call, not "${severity}" for message ID "${id}"` );
     return;
   }
   // now try whether the message could be something less than an Error in the module due to user wishes
-  const user = reclassifiedSeverity( id, null, { [id]: 'Info' }, moduleName, false );
-  if (user === 'Error') {       // always an error in module
+  if (!isDowngradable( id, moduleName )) { // always an error in module
     if (severity !== 'Error')
-      throw new Error( `Expecting severity "Error", not "${severity}" for message ID "${id}" in module "${moduleName}"` );
+      throw new CompilerAssertion( `Expecting severity "Error", not "${severity}" for message ID "${id}" in module "${moduleName}"` );
   }
   else if (spec.severity === 'Error') {
-    throw new Error( `Expecting the use of function message() when message ID "${id}" is a configurable error in module "${moduleName}"` );
+    throw new CompilerAssertion( `Expecting the use of function message() when message ID "${id}" is a configurable error in module "${moduleName}"` );
   }
   else if (spec.severity !== severity) {
-    throw new Error( `Expecting severity "${spec.severity}", not "${severity}" for message ID "${id}" in module "${moduleName}"` );
+    throw new CompilerAssertion( `Expecting severity "${spec.severity}", not "${severity}" for message ID "${id}" in module "${moduleName}"` );
   }
 }
 
@@ -621,7 +621,7 @@ function _check$Texts( id, prop, value ) {
   if (!expected)
     test$texts[id][prop] = value;
   else if (expected !== value)
-    throw new Error( `Expecting text "${expected}", not "${value}" for message ID "${id}" and text variant "${prop}"`);
+    throw new CompilerAssertion( `Expecting text "${expected}", not "${value}" for message ID "${id}" and text variant "${prop}"`);
 }
 
 const quote = {                 // could be an option in the future
@@ -664,6 +664,7 @@ const paramsTransform = {
   expecting: transformManyWith( tokenSymbol ),
   // msg: m => m,
   $reviewed: ignoreTextTransform,
+  version: quote.meta,
 };
 
 function ignoreTextTransform() {
@@ -828,7 +829,7 @@ function messageString( err, normalizeFilename, noMessageId, noHome ) {
   return (err.$location && err.$location.file
           ? locationString( err.$location, normalizeFilename ) + ': '
           : '') +
-         (err.severity||'Error') +
+         (err.severity || 'Error') +
          // TODO: use [message-id]
          (err.messageId && !noMessageId ? ' ' + err.messageId + ': ' : ': ') +
          err.message +
@@ -1101,13 +1102,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 +1123,7 @@ function memberActionName( art ) {
   return 'action';
 }
 
+// TODO: XSN-specific things should probably move out
 function homeName( art, absoluteOnly ) {
   if (!art)
     return art;
@@ -1135,8 +1139,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 +1196,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;
@@ -1405,6 +1411,7 @@ function _quoted( name ) {
 
 /**
  * Get the explanation string for the given message-id.
+ * Ensure to have called hasMessageExplanation() before.
  *
  * @param {string} messageId
  * @returns {string}
@@ -1412,18 +1419,22 @@ function _quoted( name ) {
  * @see hasMessageExplanation()
  */
 function explainMessage(messageId) {
+  messageId = oldMessageIds[messageId] || messageId;
   const filename = path.join(__dirname, '..', '..', 'share', 'messages', `${messageId}.md`);
   return fs.readFileSync(filename, 'utf8');
 }
 
 /**
  * Returns true if the given message has an explanation file.
+ * Takes into account changed message ids, i.e. looks up if the new
+ * message id has an explanation.
  *
  * @param {string} messageId
  * @returns {boolean}
  */
 function hasMessageExplanation(messageId) {
-  return messageId && _messageIdsWithExplanation.includes(messageId);
+  const id = oldMessageIds[messageId] || messageId || false;
+  return id && _messageIdsWithExplanation.includes(id);
 }
 
 /**
@@ -1444,12 +1455,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

@@ -27,7 +27,6 @@ const availableBetaFlags = {
   ignoreAssocPublishingInUnion: true,
   nestedProjections: true,
   enableUniversalCsn: true,
-  sqlSnippets: true,
   // disabled by --beta-mode
   nestedServices: false,
 };
@@ -64,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];
 }
@@ -94,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-
@@ -158,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 ) )
@@ -190,9 +132,6 @@ module.exports = {
   queryOps,
   forEachDefinition,
   forEachMember,
-  forEachMemberRecursively,
-  forEachMemberWithQuery,
-  forEachMemberRecursivelyWithQuery,
   forEachGeneric,
   forEachInOrder,
   setProp,