@sap/cds-compiler 6.0.10 → 6.0.12

package/CHANGELOG.md

@@ -8,6 +8,19 @@ Note: `beta` fixes, changes and features are usually not listed in this ChangeLo
 but in [doc/CHANGELOG_BETA.md](doc/CHANGELOG_BETA.md).
 The compiler behavior concerning `beta` features can change at any time without notice.
 
+## Version 6.0.12 - 2025-06-06
+
+### Changed
+
+- Update OData vocabularies: 'Common', 'Hierarchy'
+
+### Fixed
+
+- compiler: Fix artifact refs in annotated annotation expressions,
+  i.e. the `Type` inside `annotate … with @SomeAnno: (cast( … as Type ))`.
+- to.sql: Checks around managed associations for mocked entities have been relaxed.
+- to.edm(x): Resolved a crash caused by references in annotation expressions that were not properly updated.
+
 ## Version 6.0.10 - 2025-05-28
 
 ### Fixed

package/bin/cdsc.js

@@ -349,7 +349,8 @@ async function executeCommandLine( command, options, args ) {
     return;
   }
 
-  options.messages = [];
+  if (!options.directMessages)
+    options.messages = [];
   args.files ??= [];
 
   // Load a file from stdin if no explicit file is given and stdin is not a TTY.

package/lib/base/message-registry.js

@@ -106,7 +106,6 @@ const centralMessages = {
   'def-unexpected-nested-proj': { severity: 'Error' },
   'def-unexpected-paramview-assoc': { severity: 'Error' },
   'def-unexpected-calcview-assoc': { severity: 'Error' },
-  'chained-array-of': { severity: 'Error' },
   'def-missing-type':    { severity: 'Error', configurableFor: [ 'compile' ] },
   'def-missing-argument':    { severity: 'Error' },
   'check-proper-type-of': { severity: 'Info',  errorFor: [ 'for.odata', 'to.edmx', 'to.hdbcds', 'to.sql', 'to.hdi', 'to.rename', 'for.effective' ] },
@@ -390,8 +389,6 @@ const centralMessageTexts = {
     param: 'Assign a value for $(ANNO); the value inherited from $(ART) can\'t be rewritten due to parameter reference $(ELEMREF)',
   },
 
-  'chained-array-of': '"Array of"/"many" must not be chained with another "array of"/"many" inside a service',
-
   'check-proper-type-of': {
     std: 'Referred element $(NAME) of $(ART) does not contain proper type information',
     derived: 'Referred type of $(ART) does not contain proper type information',
@@ -908,6 +905,7 @@ const centralMessageTexts = {
     nested: 'Unexpected $(PROP) inside $(PROP)',
     assoc: 'Unexpected association inside $(PROP)',
     comp: 'Unexpected composition inside $(PROP)',
+    'chained-service': '"Array of"/"many" must not be chained with another "array of"/"many" inside a service',
   },
 
   'type-unexpected-default': {

package/lib/base/messages.js

@@ -1494,12 +1494,17 @@ function homeName( art, absoluteOnly ) {
     return art;
   if (art._user)               // when providing a path item with filter as “user”
     return homeName( art._user, absoluteOnly );
-  if (art._outer) {              // in items property, or annotation with path
+  if (art._outer) {             // in items property, or annotation with path
+    if (art._outer?.kind === '$annotation')
+      art = art._outer;
     const outer = homeName( art._outer, absoluteOnly );
     if (art.kind === '$annotation') // eslint-disable-next-line sonarjs/no-nested-template-literals
       return `${ outer }/${ quoted( `@${ art.name.id }` ) }`;
     return outer;
   }
+  else if (art.kind === '$annotation') { // in items property, or annotation with path
+    return quoted( `@${ art.name.id }` );
+  }
   else if (art.kind === 'source' || !art.name) { // error reported in parser or on source level
     return null;
   }

package/lib/checks/elements.js

@@ -126,8 +126,13 @@ function checkManagedAssoc( member ) {
   if (targetMax === 1 || member.on)
     return;
 
+  // Special case for "--with-mocks" of the cds cli: For testing databases such as H2 and SQLite, we allow
+  // associations with neither on-condition nor foreign keys if the CSN is mocked.
+  // See #13916 for details.
+  const allowForMocked = this.csn._mocked && (this.options.sqlDialect === 'h2' || this.options.sqlDialect === 'sqlite');
+
   const isPersisted = !hasPersistenceSkipAnnotation(this.artifact) && !this.artifact['@cds.persistence.exists'];
-  if (isPersisted && !member.keys && (targetMax === '*' || Number(targetMax) > 1) && this.options.transformation === 'sql') {
+  if (isPersisted && !allowForMocked && !member.keys && (targetMax === '*' || Number(targetMax) > 1) && this.options.transformation === 'sql') {
     // Since cds-compiler v6, managed to-many no longer get 'keys'.
     // As this would lead to DROP COLUMNs, emit an error instead.
     this.error('type-missing-on-condition', member.cardinality?.$path || member.$path, {

package/lib/compiler/assert-consistency.js

@@ -497,6 +497,7 @@ function assertConsistency( model, stage ) {
         // expressions as annotation values
         '$tokenTexts', 'op', 'args', 'func', '_artifact', 'type', '$typeArgs',
         'scale', 'srid', 'length', 'precision', 'scope', '$parens',
+        '_block', '_outer',     // for annotation assignments
       ],
       // TODO: restrict path to #simplePath
     },

package/lib/compiler/checks.js

@@ -972,7 +972,7 @@ function check( model ) {
 
   function checkAnnotationAssignment1( art, anno ) {
     const name = anno.name?.id;
-    if (art.$contains?.$annotation && anno.kind === '$annotation') {
+    if (art.$contains?.$annotation && anno.kind === '$annotation' && anno._outer) {
       if (checkAnnotationAcceptsExpressions( anno, art ))
         checkAnnotationExpressions( anno, art );
     }
@@ -1125,7 +1125,7 @@ function check( model ) {
       return;
     }
 
-    // Struct expected (can only happen within arrays)?
+    // Struct expected (can only happen within arrays, or CSN input)?
     if (elementDecl._effectiveType.elements) {
       if (value.literal !== 'struct') {
         warning( null, loc, { anno }, 'A struct value is required here for annotation $(ANNO)' );

package/lib/compiler/define.js

@@ -298,6 +298,7 @@ function define( model ) {
       return;
     }
     setLink( art, '_block', block );
+    initExprAnnoBlock( art, block );
     // dictAdd might set $duplicates
     dictAdd( model.definitions, absolute, art );
   }
@@ -393,6 +394,7 @@ function define( model ) {
 
   function addExtension( ext, block ) {
     setLink( ext, '_block', block );
+    initExprAnnoBlock( ext, block );
     const absolute = ext.name && resolveUncheckedPath( ext.name, '_extensions', ext );
     if (!absolute)                    // broken path
       return;
@@ -429,6 +431,7 @@ function define( model ) {
       if (prop === 'params' && name === '') // RETURNS
         sub.name = { id: '', location: sub.location };
       setLink( sub, '_block', parent._block );
+      initExprAnnoBlock( sub, parent._block );
       setLink( sub, '_parent', parent );
       setLink( sub, '_main', parent._main || parent );
       initExtension( sub );
@@ -446,6 +449,26 @@ function define( model ) {
     }
   }
 
+  function initExprAnnoBlock( art, block ) {
+    // remark: `art` could also be the extension
+    for (const prop in art) {
+      if (prop.charAt(0) !== '@')
+        continue;
+      const anno = art[prop];
+      // _block links needed for `cast( … as Type )`, `[ ..., cast( … as Type ) ]`
+      if (anno.literal === 'array') {
+        anno.kind = '$annotation';
+        for (const item of anno.val)
+          setLink( item, '_block', block );
+      }
+      else if (anno.$tokenTexts) {
+        // remark: it wouldn't hurt to set it always...
+        anno.kind = '$annotation';
+        setLink( anno, '_block', block );
+      }
+    }
+  }
+
   function addVocabulary( vocab, block, prefix ) {
     setLink( vocab, '_block', block );
     const { name } = vocab;
@@ -1009,6 +1032,7 @@ function define( model ) {
       }
 
       initItemsLinks( col, parent._block );
+      initExprAnnoBlock( col, parent._block );
     }
 
     if (hasItems && !wildcard && parent.excludingDict && !options.$recompile) {
@@ -1069,6 +1093,7 @@ function define( model ) {
     const main = parent._main || parent;
     const isQueryExtension = construct.kind === 'extend' && main.query;
     let obj = initItemsLinks( construct, block );
+    initExprAnnoBlock( construct, block );
     if (obj.target && targetIsTargetAspect( obj )) {
       obj.targetAspect = obj.target;
       delete obj.target;

package/lib/compiler/extend.js

@@ -490,6 +490,7 @@ function extend( model ) {
       const location = firstEllipsis.location || anno.name.location;
       message( 'anno-unexpected-ellipsis', [ location, art ], { code: '...' } );
       previousAnno = {
+        kind: '$annotation',
         val: [],
         literal: 'array',
         name: { id: annoName.slice( 1 ) },
@@ -500,6 +501,7 @@ function extend( model ) {
       // TODO: If we introduce sub-messages, point to the non-array base value.
       error( 'anno-mismatched-ellipsis', [ anno.name.location, art ], { code: '...' } );
       previousAnno = {
+        kind: '$annotation',
         val: [],
         literal: 'array',
         name: previousAnno.name,
@@ -533,6 +535,7 @@ function extend( model ) {
     }
     // console.log('TP:',previousValue.map(se),anno.val.map(se),'->',result.map(se))
     return {
+      kind: '$annotation',
       val: result,
       literal: 'array',
       name: previousAnno.name,

package/lib/compiler/resolve.js

@@ -1466,19 +1466,35 @@ function resolve( model ) {
     }
   }
 
-  function resolveAnnoExpr( expr, art, anno = expr ) {
+  function resolveAnnoExpr( expr, art, anno = expr, topItem = false ) {
     if (expr.$tokenTexts) {
-      if (!anno.kind)
+      if (anno === expr) {
         initAnnotationForExpression( anno, art );
+      }
+      else if (topItem) {     // item of top-level array annotation
+        setLink( expr, '_outer', anno );
+        anno = expr;
+      }
+
       const type = anno === expr && anno.name;
       // TODO: it might be best to set an _artifact link also for property values
       // like in `@Anno: [ { foo: #EnumSymbol }]
       resolveExpr( expr, 'annotation', anno, type );
     }
     else if (expr.literal === 'array') {
-      expr.val.forEach( val => resolveAnnoExpr( val, art, anno ) );
+      const withExpr = anno === expr &&
+        // the following is needed for checkAnnotationAcceptsExpressions(),
+        // otherwise @cds.persistence.skip: [hdi, hdbcds, sql.postgres] fails
+        expr.val.some( item => item.$tokenTexts || item.literal === 'struct');
+      if (withExpr)
+        initAnnotationForExpression( anno, art );
+      expr.val.forEach( val => resolveAnnoExpr( val, art, anno, withExpr ) );
     }
     else if (expr.literal === 'struct') {
+      if (topItem) {     // item of top-level array annotation
+        setLink( expr, '_outer', anno );
+        anno = expr;
+      }
       Object.values( expr.struct ).forEach( val => resolveAnnoExpr( val, art, anno ) );
     }
   }
@@ -1490,10 +1506,9 @@ function resolve( model ) {
    * @param {XSN.Artifact} art
    */
   function initAnnotationForExpression( anno, art ) {
-    anno.kind = '$annotation';
     setLink( anno, '_outer', art );
     art.$contains ??= {};
-    art.$contains.$annotation = { // set in resolveExprNode
+    art.$contains.$annotation ??= { // set in resolveExprPath
       $path: false,
       $self: false,
     };
@@ -1501,6 +1516,9 @@ function resolve( model ) {
     // Might be useful for future recursive types.
   }
 
+  // Note: for annotation assignments, `art` should be the annotation, not the
+  // assignee (element, ...); otherwise, artifact links could be resolved in the
+  // wrong block
   function resolveExpr( expr, exprCtx, art, type = null ) {
     traverseTypedExpr( expr, exprCtx, art, type, resolveExprNode );
   }
@@ -1553,8 +1571,12 @@ function resolve( model ) {
     const ref = resolvePath( expr, expected, user );
 
     if (expected === 'annotation') {
-      user._outer.$contains.$annotation.$path = true;
-      user._outer.$contains.$annotation.$self ||= expr.path[0]?._navigation?.kind === '$self';
+      const ruser = (user._outer.kind === '$annotation')
+        ? user._outer._outer
+        : user._outer;
+      // if (!ruser.$contains) console.log('UO:',!!ruser,!!user._block,user._outer)
+      ruser.$contains.$annotation.$path = true;
+      ruser.$contains.$annotation.$self ||= expr.path[0]?._navigation?.kind === '$self';
     }
 
     // check whether arguments and filters are allowed on last path item;

package/lib/compiler/shared.js

@@ -775,8 +775,13 @@ function fns( model ) {
     if (head._artifact !== undefined)
       return head._artifact;
     let ruser = user._user || user; // TODO: nicer name if we keep this
-    if (ruser.kind === '$annotation')
-      ruser = ruser._outer;
+    // TODO: re-think _user link
+    if (ruser._outer && !semantics.isMainRef) {
+      if (ruser.kind === '$annotation')
+        ruser = ruser._outer;     // for elem refs, use elem as real "user"
+      else if (ruser._outer.kind === '$annotation')
+        ruser = ruser._outer._outer;
+    }
 
     // Handle expand/inline, `type of`, :param, global (internally for CDL):
     if (user._columnParent && !semantics.isMainRef) { // in expand/inline
@@ -1002,7 +1007,8 @@ function fns( model ) {
         // TODO: remove again, should be easy enough in to-csn without.
         if (path.length === 1 && art.kind === '$tableAlias')
           (user._user || user).$noOrigin = true;
-        if (head.id === '$projection' && user.kind === '$annotation') {
+        if (head.id === '$projection' &&
+            (user.kind === '$annotation' || user._outer?.kind === '$annotation')) {
           error( 'ref-unsupported-projection', [ head.location, user ],
                  { code: '$projection', newcode: '$self' },
                  '$(CODE) is not supported in annotations; replace by $(NEWCODE)' );

package/lib/edm/annotations/edmJson.js

@@ -510,12 +510,10 @@ function xpr2edmJson( carrier, anno, location, options, messageFunctions ) {
             evalArgs(td, typeFacets, typeDef);
             EdmTypeFacetNames.forEach((facetName) => {
               const facetDef = EdmTypeFacetMap[facetName];
-              const optional
-              = (facetDef.optional !== undefined)
-                ? (Array.isArray(facetDef.optional)
+              const optional = (facetDef.optional !== undefined) &&
+                (Array.isArray(facetDef.optional)
                   ? facetDef.optional.includes(typeDef)
-                  : facetDef.optional)
-                : false;
+                  : facetDef.optional);
 
               if (td[facetName]) {
                 // ignore facets that are not type relevant

package/lib/edm/annotations/genericTranslation.js

@@ -267,7 +267,8 @@ function csn2annotationEdm( reqDefs, reqDefsUtils, csnVocabularies, serviceName,
 
     Object.entries(cObject.actions).forEach(([ n, action ]) => {
       setProp(action, '$isBound', true);
-      const actionName = `${ serviceName }.${ isV2() ? `${ entityName }_` : '' }${ n }`;
+      const v2entity = isV2() ? `${ entityName }_` : '';
+      const actionName = `${ serviceName }.${ v2entity }${ n }`;
       handleAction(actionName, action, cObjectname, [ ...location, 'actions', n ]);
     });
   }
@@ -1662,7 +1663,9 @@ function csn2annotationEdm( reqDefs, reqDefsUtils, csnVocabularies, serviceName,
         message('odata-anno-dict', msg.location, { anno: msg.anno(), '#': 'experimental' });
         usedExperimentalTerms[termName] = true;
       }
-      if (dictTerm.$deprecated && !usedDeprecatedTerms[termName]) {
+      // TODO: remove this part "&& termName !== 'Common.DraftNode'" once the annotation is not part
+      // of the dictionaries
+      if (dictTerm.$deprecated && !usedDeprecatedTerms[termName] && termName !== 'Common.DraftNode') {
         message('odata-anno-def', msg.location,
                 { anno: msg.anno(), depr: dictTerm.$deprecationText, '#': 'deprecated' });
         usedDeprecatedTerms[termName] = true;

package/lib/edm/csn2edm.js

@@ -1172,12 +1172,10 @@ function csn2edmAll( _csn, _options, serviceNames, messageFunctions ) {
           }
           EdmTypeFacetNames.forEach((name) => {
             const facet = EdmTypeFacetMap[name];
-            const optional
-              = (facet.optional !== undefined)
-                ? (Array.isArray(facet.optional)
-                  ? facet.optional.includes(edmType)
-                  : facet.optional)
-                : false;
+            const optional = (facet.optional !== undefined) &&
+              (Array.isArray(facet.optional)
+                ? facet.optional.includes(edmType)
+                : facet.optional);
 
             // facet is not in attributes
             // facet is member of type definition and mandatory

package/lib/edm/edm.js

@@ -633,17 +633,17 @@ function getEdm( options ) {
       this._typeName = typeName;
       this._scalarType = undefined;
       if (this._edmAttributes[typeName] === undefined) {
-        const typecsn = csn.type ? csn : (csn.items && csn.items.type ? csn.items : csn);
+        const typeCsn = csn.items?.type ? csn.items : csn;
         // Complex/EntityType are derived from TypeBase
         // but have no type attribute in their CSN
-        if (typecsn.type) { // this thing has a type
+        if (typeCsn.type) { // this thing has a type
           // check whether this is a scalar type (or array of scalar type) or a named type
-          if (typecsn.items && typecsn.items.type &&
-            isBuiltinType(typecsn.items.type))
-            this._scalarType = typecsn.items;
+          if (typeCsn.items?.type &&
+            isBuiltinType(typeCsn.items.type))
+            this._scalarType = typeCsn.items;
 
-          else if (isBuiltinType(typecsn.type))
-            this._scalarType = typecsn;
+          else if (isBuiltinType(typeCsn.type))
+            this._scalarType = typeCsn;
 
           if (this._scalarType) {
             this._edmAttributes[typeName] = csn._edmType;
@@ -658,7 +658,7 @@ function getEdm( options ) {
           }
           else {
             // it's either _edmType or type (_edmType only used for explicit binding param)
-            this._edmAttributes[typeName] = typecsn._edmType || typecsn.type;
+            this._edmAttributes[typeName] = typeCsn._edmType || typeCsn.type;
           }
         }
         // CDXCORE-245:
@@ -666,7 +666,7 @@ function getEdm( options ) {
         // optionally add @odata { MaxLength, Precision, Scale, SRID }
         // but only in combination with @odata.Type
         // Allow to override type only on scalar and undefined types
-        if ((this._scalarType || typecsn.type == null) && !csn.elements) {
+        if ((this._scalarType || typeCsn.type == null) && !csn.elements) {
           const odataType = csn['@odata.Type'];
           if (odataType) {
             const td = EdmPrimitiveTypeMap[odataType];
@@ -1053,15 +1053,15 @@ function getEdm( options ) {
           delete this._edmAttributes.Nullable;
         }
         // we have exactly one selfReference or the default partner
-        const partner
-          = !csn.$noPartner
-            ? csn._selfReferences.length === 1
-              ? csn._selfReferences[0]
-              : csn._constraints._partnerCsn
-            : undefined;
-        if (partner && partner['@odata.navigable'] !== false && this._csn._edmParentCsn.kind !== 'type') {
-          // $abspath[0] is main entity
-          this._edmAttributes.Partner = partner.$abspath.slice(1).join('/');
+
+        if ( !csn.$noPartner) {
+          const partner = csn._selfReferences.length === 1
+            ? csn._selfReferences[0]
+            : csn._constraints._partnerCsn;
+          if (partner && partner['@odata.navigable'] !== false && this._csn._edmParentCsn.kind !== 'type') {
+            // $abspath[0] is main entity
+            this._edmAttributes.Partner = partner.$abspath.slice(1).join('/');
+          }
         }
 
         /*
@@ -1212,8 +1212,11 @@ function getEdm( options ) {
         /* short notation for Edm.Boolean, Edm.String and Edm.Float, see internal project:
            edmx2csn-npm/edm-converters/blob/835d92a1aa6b0be25c56cef85e260c9188187429/lib/edmxV40ToJsonV40/README.md
         */
-        if (inline[0] === 'Edm.Boolean')
-          return (v === 'true' ? true : (v === 'false' ? false : v));
+        if (inline[0] === 'Edm.Boolean') {
+          if (v === 'true')
+            return true;
+          return (v === 'false') ? false : v;
+        }
         return v;
       }
 
@@ -1292,7 +1295,8 @@ function getEdm( options ) {
     }
 
     getJsonFQTermName() {
-      return `@${ this._edmAttributes.Term }${ this._edmAttributes.Qualifier ? `#${ this._edmAttributes.Qualifier }` : '' }`;
+      const qualifier = this._edmAttributes.Qualifier ? `#${ this._edmAttributes.Qualifier }` : '';
+      return `@${ this._edmAttributes.Term }${ qualifier }`;
     }
   }
 

package/lib/edm/edmInboundChecks.js

@@ -117,13 +117,13 @@ function inboundQualificationChecks( csn, options, messageFunctions,
             i++;
         }
         if (i > 1) {
-          message('chained-array-of', path);
+          message('type-invalid-items', path, { '#': 'nested', prop: 'items' });
           return;
         }
 
         const itemsType = csnUtils.effectiveType(memberType.items);
         if (itemsType.items)
-          message('chained-array-of', path);
+          message('type-invalid-items', path, { '#': 'chained-service', prop: 'items' });
       }
     }
 

package/lib/edm/edmPreprocessor.js

@@ -275,7 +275,10 @@ function initializeModel( csn, _options, messageFunctions, requestedServiceNames
         // if this definition has a root def and the root def is not the service/schema name
         // => service C { type D.E }, replace the prefix dots with underscores
         if (rootDef && defName !== rootDef && rootDef !== edmUtils.getSchemaPrefix(defName)) {
-          const newDefName = `${ rootDef }.${ defName.replace(`${ rootDef }.`, '').replace(/\./g, '_') }`;
+          const underscoredDefName = defName
+            .replace(`${ rootDef }.`, '')
+            .replace(/\./g, '_');
+          const newDefName = `${ rootDef }.${ underscoredDefName }`;
           // store renamed types in correlation maps for later renaming
           if (def.kind === 'entity')
             dotEntityNameMap[defName] = newDefName;
@@ -335,8 +338,20 @@ function initializeModel( csn, _options, messageFunctions, requestedServiceNames
         rewriteReferencesInActions(node);
       };
 
-      forEachMemberRecursively(def, applyOnNode);
+      const applyOnAnnoXprs = (node) => {
+        Object.keys(node).filter(pn => pn[0] === '@').forEach((anno) => {
+          transformAnnotationExpression(node, anno, {
+            ref: (elemRef, _prop, ref) => {
+              if (dotEntityNameMap[ref[0]] || dotTypeNameMap[ref[0]])
+                elemRef.ref[0] = dotEntityNameMap[ref[0]] || dotTypeNameMap[ref[0]];
+            },
+          });
+        });
+      };
+
+      forEachMemberRecursively(def, [ applyOnNode, applyOnAnnoXprs ]);
       applyOnNode(def);
+      applyOnAnnoXprs(def);
       // handle unbound action/function and params in views
       rewriteReferencesInActions(def);
     };
@@ -876,7 +891,7 @@ function initializeModel( csn, _options, messageFunctions, requestedServiceNames
             // eslint-disable-next-line eqeqeq
             const srcMult = (partnerCsn.cardinality.src == 1) ? '0..1' : '*';
             const newMult
-              = (element.cardinality?.min == 1 && element.cardinality?.max == 1) // eslint-disable-line eqeqeq
+              = (element.cardinality?.min == 1 && element.cardinality?.max == 1) // eslint-disable-line
                 ? 1
                 : (element.cardinality?.max === '*' || element.cardinality?.max > 1)
                   ? '*'
@@ -1082,8 +1097,9 @@ function initializeModel( csn, _options, messageFunctions, requestedServiceNames
 
       // 1) construct the proxy definition
       // proxyDefinitionName: strip the serviceName and replace '.' with '_'
-      const defName
-        = `${ assoc._target.name.replace(`${ proxySchemaName }.`, '').replace(/\./g, '_') }`;
+      const defName = assoc._target.name
+        .replace(`${ proxySchemaName }.`, '')
+        .replace(/\./g, '_');
 
       // fullName: Prepend serviceName and if in same service add '_proxy'
       const proxy = isParamProxy

package/lib/edm/edmUtils.js

@@ -446,23 +446,20 @@ function determineMultiplicity( csn ) {
   if (!csn.cardinality)
     csn.cardinality = Object.create(null);
 
-  if (!csn.cardinality.src)
-    csn.cardinality.src = isAssoc ? '*' : '1';
-  if (!csn.cardinality.min)
-    csn.cardinality.min = 0;
-  if (!csn.cardinality.max)
-    csn.cardinality.max = 1;
+  csn.cardinality.src ??= isAssoc ? '*' : '1';
+  csn.cardinality.min ??= 0;
+  csn.cardinality.max ??= 1;
 
   const srcCardinality
-    = (csn.cardinality.src == 1) // eslint-disable-line eqeqeq
-      ? (!isAssoc || csn.cardinality.srcmin == 1) // eslint-disable-line eqeqeq
+    = (csn.cardinality.src == 1) // eslint-disable-line
+      ? (!isAssoc || csn.cardinality.srcmin == 1) // eslint-disable-line
         ? '1'
         : '0..1'
       : '*';
-  const tgtCardinality
+  const tgtCardinality // eslint-disable-next-line no-nested-ternary
     = (csn.cardinality.max > 1 || csn.cardinality.max === '*')
       ? '*'
-      : (csn.cardinality.min == 1) // eslint-disable-line eqeqeq
+      : (csn.cardinality.min == 1) // eslint-disable-line
         ? '1'
         : '0..1';
 

package/lib/gen/BaseParser.js

@@ -1,4 +1,4 @@
-// Base class for generated parser, for redepage v0.2.3
+// Base class for generated parser, for redepage v0.2.4
 
 'use strict';
 
@@ -9,7 +9,7 @@
 // list of predicates which are tested when continue parsing after error starts,
 // i.e. there is a predicate on the first token to match after recover example
 // `afterBrace` or just method which by default just sets this.conditionTokenIdx
- // and this.conditionStackLength and returns true?
+// and this.conditionStackLength and returns true?
 
 class BaseParser {
   keywords;
@@ -314,7 +314,7 @@ class BaseParser {
     }
     // calling the condition might have side effects (precendence conditions have)
     // → call tracing “name” before
-    const fail = this[cond]( true, arg ); // TODO: use single-letter for run?
+    const fail = this[cond]( arg, true ); // TODO: use single-letter for run?
     if (this.constructor.tracingParser)
       this._traceSubPush( !fail );
     // The default case must not have actions. If written in grammar with action,
@@ -580,7 +580,7 @@ class BaseParser {
     if (!cond || lean && !this.leanConditions[cond])
       return false;
     if (!this.constructor.tracingParser)
-      return !!this[cond]( mode, cmd[4] );
+      return !!this[cond]( cmd[4], mode );
     // TODO: let this[cond]( true ) return recovery badness in error case
     if (!lean) {
       const { traceName } = this[cond];
@@ -588,7 +588,7 @@ class BaseParser {
       // calling the condition might have side effects (precendence conditions have)
       // → call tracing “name” before
     }
-    const succeed = !this[cond]( mode, cmd[4] );
+    const succeed = !this[cond]( cmd[4], mode );
     this._traceSubPush( lean ? { true: 'C✔', false: 'C✖' }[succeed] : succeed );
     return !succeed;
   }
@@ -934,24 +934,24 @@ class BaseParser {
 
   // Predefined conditions with extra option names:
 
-  hide_( mode ) {
+  hide_( _arg, mode ) {
     return mode === 'M';
   }
-  precLeft_( _test, prec ) {    // <prec=…>, <…,assoc=left>, <…,prefix=once>
+  precLeft_( prec ) {           // <prec=…>, <…,assoc=left>, <…,prefix=once>
     const parentPrec = this.stack.at( -1 ).prec;
     if (parentPrec != null && parentPrec >= prec)
       return true;
     this.prec_ = prec;
     return false;
   }
-  precRight_( _test, prec ) {   // <…,assoc=right>, <…,prefix>
+  precRight_( prec ) {          // <…,assoc=right>, <…,prefix>
     const parentPrec = this.stack.at( -1 ).prec;
     if (parentPrec != null && parentPrec >= prec)
       return true;
     this.prec_ = prec - 1;
     return false;
   }
-  precNone_( _test, prec ) {    // <…,assoc=none>, <…,postfix=once>
+  precNone_( prec ) {           // <…,assoc=none>, <…,postfix=once>
     const parentPrec = this.stack.at( -1 ).prec;
     if (parentPrec != null && parentPrec >= prec ||
         this.prec_ != null && this.prec_ <= prec)
@@ -959,7 +959,7 @@ class BaseParser {
     this.prec_ = prec;
     return false;
   }
-  precPost_( _test, prec ) {    // <…,postfix>
+  precPost_( prec ) {           // <…,postfix>
     const parentPrec = this.stack.at( -1 ).prec;
     if (parentPrec != null && parentPrec >= prec ||
         this.prec_ != null && this.prec_ < prec)

package/lib/gen/CdlGrammar.checksum

@@ -1 +1 @@
-539f33c85849442e96168a85adec09fb
+eb778bab22f4006cfcf64e418dcae71c

package/lib/gen/CdlParser.js

@@ -1,4 +1,4 @@
-// Parser generated by redepage v0.2.3
+// Parser generated by redepage v0.2.4
 'use strict;'
 const { XsnSource, XsnArtifact, XsnName } = require( '../compiler/xsn-model' )
 const AstBuildingParser = require('../parsers/AstBuildingParser')
@@ -783,7 +783,7 @@ floating:['ck',0],variable:'floating',
 {
 '*':['c',430],
 Number:['c',432],
-'':434
+']':434,
 },
 {',':['c',431],'':434},
 [434,436],
@@ -1259,10 +1259,10 @@ Id:['ciA',720],
 },
 ['m',721,'=>'],
 [718,644],
-{Id:[723,731],'#':'Id','(':'Id','*':'Id','+':'Id','-':'Id',':':'Id','?':'Id',Id_all:'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',DeleteStarFromSet:'Id','':728},
+{Id:[723,731],'#':'Id','(':'Id','*':'Id','+':'Id','-':'Id',':':'Id','?':'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',DeleteStarFromSet:'Id','':728},
 {',':['c',724,,,,'nextFunctionArgument'],'':725},
 {
-Id:[723,731],'#':'Id','(':'Id','*':'Id','+':'Id','-':'Id',':':'Id','?':'Id',not:'Id',case:'Id',cast:'Id',null:'Id',true:'Id',false:'Id',Id_all:'Id',Number:'Id',String:'Id',exists:'Id',QuotedLiteral:'Id',DeleteStarFromSet:'Id',
+Id:[723,731],'#':'Id','(':'Id','*':'Id','+':'Id','-':'Id',':':'Id','?':'Id',not:'Id',case:'Id',cast:'Id',null:'Id',true:'Id',false:'Id',Number:'Id',String:'Id',exists:'Id',QuotedLiteral:'Id',DeleteStarFromSet:'Id',
 ')':['g',725,1,'atRightParen'],order:')',
 },
 {order:['ck',726],'':728},
@@ -1430,7 +1430,10 @@ Id:[825,815],'#':'Id','(':'Id','+':'Id','-':'Id','@':'Id','[':'Id','{':'Id',Numb
 '...':['c',822,,'arrayAnno','ellipsis'],
 '':826
 },
-{up:['ck',823],'':825},
+{
+up:['ck',823],
+',':825,']':825,
+},
 ['mk',824,'to'],
 [825,815],
 {
@@ -1447,7 +1450,7 @@ constructor(lexer,...args){super(lexer,keywords,table,...args)}
 start($,$next){
 $.source??=new XsnSource( 'cdl' )
 this.rule_(1,$next)
-{ this.afterBrace( null, 'init' ); }
+{ this.afterBrace( 'init' ); }
 for(;;)switch(this.s){
 case 1:switch(this.lk()){
 case'namespace':this.gc(3,'namespaceRestriction')&&this.namespaceDeclaration({source:$.source},2);continue
@@ -1468,7 +1471,7 @@ default:return this.exit_()
 artifactsBlock($,$next){
 this.rule_(5,$next)
 for(;;)switch(this.s){
-case 5:if(this.m(6,'{')){this.afterBrace(0,'init'); $.art.artifacts = this.createDict( $.start ); $.art.extensions = []; }continue
+case 5:if(this.m(6,'{')){this.afterBrace('init'); $.art.artifacts = this.createDict( $.start ); $.art.extensions = []; }continue
 case 6:switch(this.l()){
 case'Id':case'@':this.artifactDefOrExtend({outer:$.art},7);continue
 default:this.s=8;continue
@@ -1771,7 +1774,7 @@ default:this.e();continue
 case 81:this.elementsBlock({art:$.art},87);continue
 case 82:switch(this.lk()){
 case'(':case'select':if(this.queryExpression(_={},87)){query=_.expr; $.art.query = query; $.art.$syntax = 'entity'; }continue
-case'projection':this.s=83;{this.afterBrace(0,'sloppy')}continue;
+case'projection':this.s=83;{this.afterBrace('sloppy')}continue;
 default:this.e();continue
 }
 case 83:if(this.projectionSpec(_={},84)){query=_.query; $.art.query = query; $.art.$syntax = 'projection'; }continue
@@ -1783,7 +1786,7 @@ case 85:switch(this.lk()){
 case'limit':case'order':this.orderByLimitOffset({query},86);continue
 default:this.s=86;continue
 }
-case 86:this.s=87;{this.afterBrace(0,'normal'); ; }continue
+case 86:this.s=87;{this.afterBrace('normal'); ; }continue
 case 87:switch(this.lk()){
 case'actions':this.actionsBlock({art:$.art},0);continue
 default:this.gr([';']);continue
@@ -2021,7 +2024,7 @@ let art=new XsnArtifact()
 let ret
 this.rule_(154,$next)
 for(;;)switch(this.s){
-case 154:if(this.mk(155,'returns')){ret=this.lb();this.elementRestriction(0,'default'); art.kind = 'param'; $.outer.returns = art;
+case 154:if(this.mk(155,'returns')){ret=this.lb();this.elementRestriction('default'); art.kind = 'param'; $.outer.returns = art;
 this.docComment( art ); }continue
 case 155:switch(this.l()){
 case'@':this.annoAssignStd({art},155);continue
@@ -2078,7 +2081,7 @@ case 167:switch(this.lk()){
 case'element':if(this.ckP(168,['Id'])){ $.art.$syntax = 'element'; }continue
 default:this.s=168;continue
 }
-case 168:if(this.mi(169,'Element')){this.elementRestriction(0,'elem'); this.addDef( $.art, $.outer, 'elements', 'element', this.identAst() );
+case 168:if(this.mi(169,'Element')){this.elementRestriction('elem'); this.addDef( $.art, $.outer, 'elements', 'element', this.identAst() );
 this.docComment( $.art ); }continue
 case 169:switch(this.l()){
 case'@':this.annoAssignMid({art:$.art},169);continue
@@ -2811,11 +2814,11 @@ case 358:switch(this.lk()){
 case'Id':this.typeRefOptArgs({art:$.art},359);continue
 case'type':this.lP()&&this.typeTypeOf({art:$.art},359);continue
 case'localized':if(this.ckP(368,['Id'])){ $.art.localized = this.valueWithLocation( true ); }continue
-case'association':if(this.ckP(370,['[','to'])){assoc=this.lb();this.elementRestriction(0,'calc')}continue;
-case'composition':if(this.ckP(374,['[','of'])){assoc=this.lb();this.elementRestriction(0,'calc')}continue;
-case'array':if(this.ckP(378,['of'])){this.elementRestriction(0,'calc')}continue;
-case'many':if(this.ckP(379,['Id','{'])){this.elementRestriction(0,'calc'); $.art.items = { location: this.lb().location }; }continue
-case'{':if(this.elementsBlock({art:$.art},385)){this.elementRestriction(0,'calc')}continue;
+case'association':if(this.ckP(370,['[','to'])){assoc=this.lb();this.elementRestriction('calc')}continue;
+case'composition':if(this.ckP(374,['[','of'])){assoc=this.lb();this.elementRestriction('calc')}continue;
+case'array':if(this.ckP(378,['of'])){this.elementRestriction('calc')}continue;
+case'many':if(this.ckP(379,['Id','{'])){this.elementRestriction('calc'); $.art.items = { location: this.lb().location }; }continue
+case'{':if(this.elementsBlock({art:$.art},385)){this.elementRestriction('calc')}continue;
 default:this.ei();continue
 }
 case 359:this.s=360;{ this.docComment( $.art ); }continue
@@ -2832,7 +2835,7 @@ case'@':this.annoAssignStd({art:$.art},362);continue
 default:this.s=363;continue
 }
 case 363:switch(this.lk()){
-case'enum':if(this.enumSymbolsBlock({art:$.art},364)){this.elementRestriction(0,'anno')}continue;
+case'enum':if(this.enumSymbolsBlock({art:$.art},364)){this.elementRestriction('anno')}continue;
 case'@':case'not':case'null':case'default':this.typeProperties({art:$.art},0);continue
 default:this.gr([]);continue
 }
@@ -3062,7 +3065,8 @@ case 428:this.m(429,'[');continue
 case 429:switch(this.l()){
 case'*':if(this.c(430)){ card.targetMax = this.valueWithLocation(); }continue
 case'Number':if(this.c(432)){ card.targetMax = this.unsignedIntegerLiteral(); }continue
-default:this.s=434;{ card.targetMax = this.valueWithLocation( '*' ); }continue
+case']':this.s=434;{ card.targetMax = this.valueWithLocation( '*' ); }continue
+default:this.e();continue
 }
 case 430:switch(this.l()){
 case',':this.c(431);continue
@@ -3228,7 +3232,7 @@ case 473:switch(this.lk()){
 case'excluding':this.excludingClause({query:$.query},480);continue
 default:this.s=480;continue
 }
-case 474:this.s=475;{this.inSelectItem(0,'sqlStyle'); ; }continue
+case 474:this.s=475;{this.inSelectItem('sqlStyle'); ; }continue
 case 475:switch(this.l()){
 case'*':if(this.c(476)){ $.query.columns = [ this.valueWithLocation() ]; }continue
 case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'@':case'{':case'Number':case'String':case'QuotedLiteral':this.selectItemDef({columns:($.query.columns = [])},476);continue
@@ -3324,12 +3328,12 @@ for(;;)switch(this.s){
 case 500:if(this.m(501,'(')){this.queryOnLeft()}continue;
 case 501:switch(this.lk()){
 case'(':this.tableOrQueryParens($,502);continue
-case'Id':if(this.tableExpression($,503)){this.queryOnLeft(0,'table')}continue;
+case'Id':if(this.tableExpression($,503)){this.queryOnLeft('table')}continue;
 case'select':this.queryExpression($,503);continue
 default:this.ei();continue
 }
 case 502:switch(this.lk()){
-case'full':case'join':case'left':case'cross':case'inner':case'right':if(this.tableExpression($,503,488)){this.queryOnLeft(0,'table')}continue;
+case'full':case'join':case'left':case'cross':case'inner':case'right':if(this.tableExpression($,503,488)){this.queryOnLeft('table')}continue;
 case'limit':case'minus':case'order':case'union':case'except':case'intersect':this.gc(503,'queryOnLeft')&&this.queryExpression($,503,456);continue
 default:this.s=503;continue
 }
@@ -3526,7 +3530,7 @@ default:return this.exit_()
 selectItemsList($,$next){
 this.rule_(559,$next)
 for(;;)switch(this.s){
-case 559:if(this.m(560,'{')){this.inSelectItem(0,'top'); $.query.columns = this.createArray( $.start ); }continue
+case 559:if(this.m(560,'{')){this.inSelectItem('top'); $.query.columns = this.createArray( $.start ); }continue
 case 560:switch(this.l()){
 case'*':if(this.c(561)){ $.query.columns.push( this.valueWithLocation() ); }continue
 case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'@':case'{':case'Number':case'String':case'QuotedLiteral':this.selectItemDef({columns:$.query.columns},561);continue
@@ -3574,7 +3578,7 @@ case 570:switch(this.lk()){
 case'virtual':if(this.lP(['Id','#','(','+','-',':','?','{','key','not','case','cast','null','true','false','Number','String','exists','QuotedLiteral'])&&this.gc(571,'modifierRestriction')&&this.ck(571)){ art.virtual = this.valueWithLocation( true ); }continue
 default:this.s=571;continue
 }
-case 571:this.s=572;{this.columnExpr(0,'key'); ; }continue
+case 571:this.s=572;{this.columnExpr('key'); ; }continue
 case 572:switch(this.lk()){
 case'key':if(this.gc(573,'modifierRestriction')&&this.ck(573)){ art.key = this.valueWithLocation( true ); }continue
 default:this.s=573;continue
@@ -3588,7 +3592,7 @@ default:this.ei();continue
 case 574:switch(this.lk()){
 case'as':this.ck(575);continue
 case'Id':if(this.ci(584,'ItemAlias')){ art.name = this.fragileAlias( true ); }continue
-default:this.gi(584);continue
+default:this.giR(584);continue
 }
 case 575:if(this.mi(584,'ItemAlias')){ art.name = this.identAst(); }continue
 case 576:switch(this.lk()){
@@ -3598,7 +3602,7 @@ case'as':this.ck(581);continue
 case'Id':if(this.ci(584,'ItemAlias')){this.nestedExpand(); art.name = this.fragileAlias( true ); }continue
 case'.':if(this.c(582)){ this.reportUnexpectedSpace( this.lb(), this.la().location, true );
 this.reportExpandInline( art, true ); }continue
-default:if(this.gi(584)){this.nestedExpand(); this.virtualOrImplicit( art ); }continue
+default:if(this.giR(584)){this.nestedExpand(); this.virtualOrImplicit( art ); }continue
 }
 case 577:this.overClause({outer:expr.suffix},578);continue
 case 578:switch(this.lk()){
@@ -3608,7 +3612,7 @@ default:this.s=579;continue
 case 579:switch(this.lk()){
 case'as':this.ck(580);continue
 case'Id':if(this.ci(584,'ItemAlias')){ art.name = this.fragileAlias( true ); }continue
-default:this.gi(584);continue
+default:this.giR(584);continue
 }
 case 580:if(this.mi(584,'ItemAlias')){ art.name = this.identAst(); }continue
 case 581:if(this.mi(584,'ItemAlias')){this.nestedExpand(); art.name = this.identAst(); }continue
@@ -3622,7 +3626,7 @@ case'excluding':this.excludingClause({query:art},0);continue
 default:this.gr([',']);continue
 }
 case 584:switch(this.l()){
-case'{':if(this.gc(590,'nestedExpand')&&this.g(585)){ if (!this.nestedExpand(true)) this.reportExpandInline( art, false ); }continue
+case'{':if(this.gc(590,'nestedExpand')&&this.g(585)){ if (!this.nestedExpand(0,true)) this.reportExpandInline( art, false ); }continue
 default:this.s=590;continue
 }
 case 585:this.nestedSelectItemsList({query:art,clause:'expand'},586);continue
@@ -3929,13 +3933,13 @@ for(;;)switch(this.s){
 case 679:if(this.m(680,'(')){this.queryOnLeft()}continue;
 case 680:switch(this.lk()){
 case'(':this.expressionOrQueryParens($,681);continue
-case'Id':case'#':case'+':case'-':case':':case'?':case'not':case'case':case'cast':case'null':case'true':case'false':case'Number':case'String':case'exists':case'QuotedLiteral':if(this.expression($,683)){this.queryOnLeft(0,'expr')}continue;
+case'Id':case'#':case'+':case'-':case':':case'?':case'not':case'case':case'cast':case'null':case'true':case'false':case'Number':case'String':case'exists':case'QuotedLiteral':if(this.expression($,683)){this.queryOnLeft('expr')}continue;
 case'select':this.queryExpression($,684);continue
 default:this.ei();continue
 }
 case 681:switch(this.lk()){
-case'*':case'+':case'-':case'/':case'<':case'=':case'>':case'?':case'!=':case'<=':case'<>':case'==':case'>=':case'in':case'is':case'or':case'||':case'and':case'not':case'like':case'between':if(this.expression($,682,645)){this.queryOnLeft(0,'expr')}continue;
-case',':if(this.continueExpressionslist($,684)){this.queryOnLeft(0,'expr')}continue;
+case'*':case'+':case'-':case'/':case'<':case'=':case'>':case'?':case'!=':case'<=':case'<>':case'==':case'>=':case'in':case'is':case'or':case'||':case'and':case'not':case'like':case'between':if(this.expression($,682,645)){this.queryOnLeft('expr')}continue;
+case',':if(this.continueExpressionslist($,684)){this.queryOnLeft('expr')}continue;
 case'limit':case'minus':case'order':case'union':case'except':case'intersect':this.gc(684,'queryOnLeft')&&this.queryExpression($,684,456);continue
 default:this.s=684;continue
 }
@@ -4063,7 +4067,7 @@ default:this.e();continue
 case 720:this.m(721,'=>');continue
 case 721:if(this.expression(_={},718)){expr=_.expr; this.addNamedArg( $.pathStep, id, expr ); }continue
 case 722:switch(this.l()){
-case'Id':case'#':case'(':case'*':case'+':case'-':case':':case'?':case'Id_all':case'Number':case'String':case'QuotedLiteral':case'DeleteStarFromSet':if(this.funcExpression(_={},723)){expr=_.expr; $.pathStep.args.push( expr ); }continue
+case'Id':case'#':case'(':case'*':case'+':case'-':case':':case'?':case'Number':case'String':case'QuotedLiteral':case'DeleteStarFromSet':if(this.funcExpression(_={},723)){expr=_.expr; $.pathStep.args.push( expr ); }continue
 default:this.s=728;continue
 }
 case 723:switch(this.l()){
@@ -4071,7 +4075,7 @@ case',':if(this.c(724)){this.nextFunctionArgument()}continue;
 default:this.s=725;continue
 }
 case 724:switch(this.lk()){
-case'Id':case'#':case'(':case'*':case'+':case'-':case':':case'?':case'not':case'case':case'cast':case'null':case'true':case'false':case'Id_all':case'Number':case'String':case'exists':case'QuotedLiteral':case'DeleteStarFromSet':if(this.funcExpression(_={},723)){expr=_.expr; $.pathStep.args.push( expr ); }continue
+case'Id':case'#':case'(':case'*':case'+':case'-':case':':case'?':case'not':case'case':case'cast':case'null':case'true':case'false':case'Number':case'String':case'exists':case'QuotedLiteral':case'DeleteStarFromSet':if(this.funcExpression(_={},723)){expr=_.expr; $.pathStep.args.push( expr ); }continue
 case')':case'order':this.lP()&&this.ec('atRightParen')&&this.g(725);continue
 default:this.ei();continue
 }
@@ -4452,7 +4456,8 @@ default:this.s=826;continue
 }
 case 822:switch(this.lk()){
 case'up':this.ck(823);continue
-default:this.s=825;{ $.value.val.push( { literal: 'token', val: '...', location: ellipsis.location } ); }continue
+case',':case']':this.s=825;{ $.value.val.push( { literal: 'token', val: '...', location: ellipsis.location } ); }continue
+default:this.e();continue
 }
 case 823:this.mk(824,'to');continue
 case 824:if(this.annoValue(_={},825)){upTo=_.value; $.value.val.push( { literal: 'token', val: '...', location: ellipsis.location, upTo: upTo } ); }continue

package/lib/gen/Dictionary.json

@@ -557,9 +557,11 @@
       "AppliesTo": [
         "EntitySet"
       ],
-      "Type": "Collection(Core.SimpleIdentifier)"
+      "Type": "Core.SimpleIdentifier"
     },
     "Common.DraftNode": {
+      "$deprecated": true,
+      "$deprecationText": "Draft nodes are marked with [`DraftActivationVia`](#DraftActivationVia)",
       "AppliesTo": [
         "EntitySet"
       ],
@@ -879,6 +881,14 @@
       ],
       "Type": "Core.Tag"
     },
+    "Common.OperationTemplate": {
+      "$experimental": true,
+      "AppliesTo": [
+        "Term",
+        "Property"
+      ],
+      "Type": "Common.QualifiedName"
+    },
     "Common.OriginalProtocolVersion": {
       "AppliesTo": [
         "Schema"
@@ -3198,6 +3208,8 @@
       }
     },
     "Common.DraftNodeType": {
+      "$deprecated": true,
+      "$deprecationText": "The deprecated term [`DraftNode`](#DraftNode) effectively only tags the entity set, its value is an empty record",
       "$kind": "ComplexType",
       "Properties": {
         "PreparationAction": "Common.QualifiedName",
@@ -3214,10 +3226,18 @@
         "EditAction": "Common.QualifiedName",
         "NewAction": "Common.QualifiedName",
         "PreparationAction": "Common.QualifiedName",
+        "ResumeAction": "Common.QualifiedName",
         "ShareAction": "Common.QualifiedName",
         "ValidationFunction": "Common.QualifiedName"
       }
     },
+    "Common.DraftUserAccessType": {
+      "$kind": "ComplexType",
+      "Properties": {
+        "UserAccessRole": "Edm.String",
+        "UserID": "Edm.String"
+      }
+    },
     "Common.EffectType": {
       "$deprecated": true,
       "$deprecationText": "All side effects are essentially value changes, differentiation not needed.",

package/lib/model/cloneCsn.js

@@ -108,6 +108,9 @@ function cloneCsn( csn, options, sort ) {
       setHidden( r, prop, csn[prop] );
   });
 
+  if (csn._mocked) // special case for cds cli's `--with-mocks`; used in SQL backend
+    setHidden(r, '_mocked', csn._mocked);
+
   return r;
 }
 

package/lib/optionProcessor.js

@@ -44,6 +44,7 @@ optionProcessor
   .option('    --beta <list>')
   .option('    --deprecated <list>')
   .option('    --direct-backend')
+  .option('    --direct-messages')
   .option('    --fallback-parser <type>', { valid: [ 'auto!', 'cdl', 'csn', 'csn!' ] })
   .option('    --shuffle <seed>') // 0 | 1..4294967296
   .option('    --test-mode')
@@ -138,6 +139,8 @@ optionProcessor
                             Can only be used with certain new CSN based backends. Combination with
                             other flags is limited, e.g. --test-mode will not run a consistency check.
                             No recompilation is triggered in case of errors. cdsc will dump.
+       --direct-messages    Messages are written directly to console.error when an error/warning/… is detected.
+                            Useful to see some messages before a compiler dump.
        --shuffle <seed>     If provided, some internal processing sequences are changed, most notably by
                             using a shuffled version of ‹model›.definitions. <seed> should be a number
                             between 1 and 4294967296, the compiler uses a random number in that range if the

package/lib/parsers/AstBuildingParser.js

@@ -113,6 +113,8 @@ class AstBuildingParser extends BaseParser {
     err.expectedTokens = this.expectingArray();
   }
 
+  // Guards, Prepare Commands and Lookahead Methods -----------------------------
+
   tableWithoutAs() {            // not used in <guard=…>, only called by other guard
     // TODO TOOL: if the tool properly creates `default: this.giR()`, this
     // condition method is most likely not necessary
@@ -135,7 +137,7 @@ class AstBuildingParser extends BaseParser {
    * - <guard=queryOnLeft, arg=tableWithoutAs>: …after having checked
    *   whether the next token is no (reserved or unreserved) keyword
    */
-  queryOnLeft( test, arg ) {
+  queryOnLeft( arg, test ) {
     if (arg === 'tableWithoutAs') {
       if (this.tableWithoutAs())
         return true;
@@ -217,7 +219,7 @@ class AstBuildingParser extends BaseParser {
     }
   }
 
-  inSelectItem( _test, arg ) {  // only as action
+  inSelectItem( arg ) {         // <prepare=…>
     this.dynamic_.inSelectItem = arg ||
       (this.tokens[this.tokenIdx - 2].type === '.' ? 'inline' : 'expand');
   }
@@ -248,7 +250,7 @@ class AstBuildingParser extends BaseParser {
     return next === '*' || next === '{';
   }
 
-  notAfterEntityArgOrFilter( mode ) { // TODO: for <hide>
+  notAfterEntityArgOrFilter( _arg, mode ) { // TODO: for <hide>
     if (mode !== 'M')
       return false;
     const { type } = this.lb();
@@ -260,14 +262,14 @@ class AstBuildingParser extends BaseParser {
 
   // <prec=10, postfix=once> + test that the next token is not `null`; TODO: code
   // completion for `… default 3 not ~;` → currently just `null` but hey
-  isNegatedRelation( _test, prec ) {
+  isNegatedRelation( prec ) {
     return this.tokens[this.tokenIdx + 1]?.keyword === 'null' ||
-      this.precNone_( _test, prec );
+      this.precNone_( prec );
   }
 
   // TODO: as leanCondition ?  `order` should probably appear in the message for
   // test3/Compiler/GrammarRobustness/InvalidSelectInWhere.err.cds
-  orderByLimitRestriction( mode ) {
+  orderByLimitRestriction( _arg, mode ) {
     if (mode && (!this.$allowOrderByLimit || this.precPost_( mode, 0 )))
       return true;
     this.$allowOrderByLimit = !mode;
@@ -309,7 +311,7 @@ class AstBuildingParser extends BaseParser {
   /**
    * `annotation` def is only allowed top-level. TODO: combine with `extensionRestriction`
    */
-  vocabularyRestriction( test ) {
+  vocabularyRestriction( _arg, test ) {
     if (!test)
       this.dynamic_.inBlock = this.tokenIdx;
     return this.dynamic_.inBlock ?? this.dynamic_.inExtension;
@@ -325,7 +327,7 @@ class AstBuildingParser extends BaseParser {
    * Currently only to restrict it to a single `Id` for published associations.
    * No extra syntax-unexpected-assoc for failure.
    */
-  columnExpr( mode, arg ) {
+  columnExpr( arg, mode ) {
     if (mode)
       return !this.columnExpr$;
     if (arg)
@@ -337,7 +339,7 @@ class AstBuildingParser extends BaseParser {
     return true;
   }
 
-  nestedExpand( mode ) {
+  nestedExpand( _arg, mode ) {
     if (!mode)
       this.nestedExpand$ = this.tokenIdx;
     return this.nestedExpand$ !== this.tokenIdx;
@@ -381,7 +383,7 @@ class AstBuildingParser extends BaseParser {
    * - DEFAULT: true if `default` had been provided
    * - NOTNULL: true if `null` or `not null` had been provided
    */
-  elementRestriction( test, arg ) {
+  elementRestriction( arg, test ) {
     let { elementCtx } = this.dynamic_;
     if (test) {
       if (elementCtx?.[0] === arg)
@@ -424,7 +426,7 @@ class AstBuildingParser extends BaseParser {
                        'Unexpected $(OFFENDING) after $(KEYWORD) clause, expecting $(EXPECTING)' );
   }
 
-  noRepeatedCardinality( mode ) {
+  noRepeatedCardinality( _arg, mode ) {
     if (this.tokens[this.tokenIdx - 2]?.type !== ']')
       return false;
     if (mode === 'M')
@@ -449,7 +451,7 @@ class AstBuildingParser extends BaseParser {
    *
    * Beware: mentioned in leanConditions, i.e. executed in predictions!
    */
-  afterBrace( test, arg ) {
+  afterBrace( arg, test ) {
     if (!test) {
       if (arg === 'normal' && this.lb().type !== '}') {
         const { type, keyword } = this.la();
@@ -493,7 +495,7 @@ class AstBuildingParser extends BaseParser {
   /**
    * For annotations at the beginning of columns outside parentheses
    */
-  annoInSameLine( test ) {
+  annoInSameLine( _arg, test ) {
     if (!test)
       this.dynamic_.safeAnno = true;
     return !this.dynamic_.safeAnno &&
@@ -505,7 +507,7 @@ class AstBuildingParser extends BaseParser {
    * - `...` can appear in the top-level array value only and not after `...`
    *   without `up to`.
    */
-  arrayAnno( test, arg ) {
+  arrayAnno( arg, test ) {
     if (!test) {
       this.dynamic_.arrayAnno = [ !this.dynamic_.arrayAnno ];
     }
@@ -538,7 +540,7 @@ class AstBuildingParser extends BaseParser {
     return this.tokens[this.tokenIdx + 1]?.text !== ':';
   }
 
-  fail( mode ) {
+  fail( _arg, mode ) {
     // TODO TOOL: the following test belongs to the BaseParser.js:
     if (this.conditionTokenIdx === this.tokenIdx &&        // tested on same
         this.conditionStackLength == null && // after error recover
@@ -624,6 +626,8 @@ class AstBuildingParser extends BaseParser {
     return prefixLoc;
   }
 
+  // Locations for ASTs ---------------------------------------------------------
+
   startLocation( { location } = this.lr() ) {
     return {
       __proto__: Location.prototype,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds-compiler",
-  "version": "6.0.10",
+  "version": "6.0.12",
   "description": "CDS (Core Data Services) compiler and backends",
   "homepage": "https://cap.cloud.sap/",
   "author": "SAP SE (https://www.sap.com)",