@sap/cds-dk 10.1.2 → 10.2.1

package/node_modules/@sap/cds-compiler/lib/compiler/utils.js

@@ -61,7 +61,7 @@ function setAnnotation( art, anno, location = art.location, val = true, literal
   if (art[anno])  // do not overwrite user-defined including null
     return;
   art[anno] = {
-    name: { path: [ { id: anno.slice(1), location } ], location },
+    name: { __proto__: XsnName.prototype, path: [ { id: anno.slice(1), location } ], location },
     val,
     literal,
     $inferred: '$generated',
@@ -92,7 +92,8 @@ function linkToOrigin( origin, name, parent, prop, location, silentDep ) {
   // TODO: should `key` propagation be part of this?
   location ||= weakLocation( origin.name.location ); // not ??=
   const elem = {
-    name: { location, id: origin.name.id },
+    __proto__: XsnArtifact.prototype,
+    name: { __proto__: XsnName.prototype, location, id: origin.name.id },
     kind: origin.kind,
     location,
   };
@@ -113,7 +114,7 @@ function linkToOrigin( origin, name, parent, prop, location, silentDep ) {
 
 function proxyCopyMembers( art, dictProp, originDict, location, kind ) {
   art[dictProp] = Object.create( null );
-  // TODO: set $inferred ? for dict?
+  art[dictProp][$inferred] = 'expanded';
   for (const name in originDict) {
     const origin = originDict[name];
     if (origin !== undefined) {
@@ -133,7 +134,7 @@ function proxyCopyMembers( art, dictProp, originDict, location, kind ) {
 
 /**
  * Initialize artifact links inside `obj.items` (for nested ones as well).
- * Does nothing, it `obj.items` does not exist.
+ * Does nothing if `obj.items` does not exist.
  *
  * @param {XSN.Artifact} obj
  * @param {object} block
@@ -152,10 +153,23 @@ function initItemsLinks( obj, block ) {
   return obj;
 }
 
+function itemsArtifact( art ) {
+  while (art.items)
+    art = art.items;
+  return art;
+}
+
+function outerArtifact( art ) {
+  if (art.kind !== 'aspect') {
+    while (art._outer)
+      art = art._outer;
+  }
+  return art;
+}
+
 /**
  * Set the member `elem` to have a _parent link to `parent` and a corresponding
- * _main link.  Also set the member's name accordingly, where argument `name`
- * is most often the property `elem.name.id`.
+ * _main link.
  *
  * If argument `prop` is provided, add `elem` to the dictionary of that name,
  * e.g. `elements`.  TODO: remove `prop` and `name`, rename to `setParentAndMain`.
@@ -191,17 +205,15 @@ function initExprAnnoBlock( art, block, error ) {
       anno.kind = '$annotation';
       for (const item of anno.val) {
         setLink( item, '_block', block );
-        if (item.literal !== 'token' || item.val !== '...' || item.$errorReported != null)
+        if (item.literal !== 'token' || item.val !== '...')
           continue;
-        item.$errorReported = art.kind && art.kind !== 'annotate' && art.kind !== 'extend';
-        if (item.$errorReported) {
-          error( null, [ item.location, art ], { offending: '...' },
-                 'Unexpected $(OFFENDING) in the array of an annotation on a definition' );
-          item.$errorReported = 'syntax';
+        if (art.kind !== 'annotate' && art.kind !== 'extend') {
+          error( 'syntax-unexpected-ellipsis', [ item.location, art ],
+                 { '#': 'definition', code: '...' } );
         }
-        else if (item.upTo) {
-          item.$errorReported
-            = !checkUpToSpec( item.upTo, art, prop, true, error ) && 'syntax';
+        else if (item.upTo && !checkUpToSpec( item.upTo, art, prop, true, error )) {
+          item.$errorReported = 'anno-invalid-upto-value';
+          // Avoid later anno-unexpected-upto-value
         }
       }
     }
@@ -226,7 +238,7 @@ function checkUpToSpec( upToSpec, art, annoName, noBoolOrNull, error ) {
            : path && !upToSpec.scope && !path.some( hasSpecialPathItemProp )) {
     return true;
   }
-  error( null, [ upToSpec.location, art ],
+  error( 'anno-invalid-upto-value', [ upToSpec.location, art ],
          { anno: annoName, code: '... up to', '#': literal || (path ? 'ref' : 'expr') },
          {
            std: 'Unexpected $(CODE) value type in the assignment of $(ANNO)',
@@ -245,7 +257,7 @@ function initDollarSelf( art ) {
   // TODO: use setMemberParent() ?
   // TODO: also on 'namespace's?  (test with annotation with checked ref on them)
   const self = {
-    name: { id: '$self', location: art.location },
+    name: { __proto__: XsnName.prototype, id: '$self', location: art.location },
     kind: '$self',
     location: art.location,
   };
@@ -259,7 +271,7 @@ function initDollarSelf( art ) {
 function initDollarParameters( art ) {
   // TODO: use setMemberParent() ?
   const parameters = {
-    name: { id: '$parameters' },
+    name: { __proto__: XsnName.prototype, id: '$parameters' },
     kind: '$parameters',
     location: art.location,
     deprecated: true, // hide in code completion
@@ -904,6 +916,8 @@ module.exports = {
   dependsOn,
   dependsOnSilent,
   initItemsLinks,
+  itemsArtifact,
+  outerArtifact,
   setMemberParent,
   createAndLinkCalcDepElement,
   initExprAnnoBlock,

package/node_modules/@sap/cds-compiler/lib/edm/annotations/edmJson.js

@@ -978,9 +978,9 @@ function xpr2edmJson( carrier, anno, location, options, messageFunctions, generi
       return xpr;
     }
 
-    // "'=': true" has no meaning as an OData operator here and must be removed
+    // "'=': true" or "'=': "some.path" has no meaning as an OData operator here and must be removed
     // before transform runs, otherwise transform['='] misinterprets it as $Eq.
-    if (xpr['='] === true)
+    if (xpr['='] === true || typeof xpr['='] === 'string')
       delete xpr['='];
 
     if (xpr.list)
@@ -1037,7 +1037,7 @@ function xpr2edmJson( carrier, anno, location, options, messageFunctions, generi
       caseObj.push(xpr[pos + 1]);
       pos += 2;
     }
-    if (xpr[pos++]?.toLowerCase?.() !== 'end')
+    if (xpr[pos]?.toLowerCase?.() !== 'end')
       return xpr;
     return {
       case: caseObj,

package/node_modules/@sap/cds-compiler/lib/edm/annotations/genericTranslation.js

@@ -1,11 +1,11 @@
 'use strict';
 
-const { isEdmPropertyRendered, transformAnnotationExpression } = require('../../model/csnUtils');
+const { isEdmPropertyRendered, transformAnnotationExpression } = require('../../base/csnUtils');
 const { isBuiltinType, isMagicVariable } = require('../../base/builtins');
 const edmUtils = require('../edmUtils.js');
 const oDataDictionary = require('../../gen/Dictionary.json');
 const preprocessAnnotations = require('./preprocessAnnotations.js');
-const { forEachDefinition } = require('../../model/csnUtils');
+const { forEachDefinition } = require('../../base/csnUtils');
 const { isBetaEnabled } = require('../../base/specialOptions.js');
 const { setProp } = require('../../utils/objectUtils.js');
 const { xpr2edmJson, getEdmJsonHandler } = require('./edmJson.js');

package/node_modules/@sap/cds-compiler/lib/edm/annotations/preprocessAnnotations.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { forEachDefinition, forEachGeneric } = require('../../model/csnUtils.js');
+const { forEachDefinition, forEachGeneric } = require('../../base/csnUtils.js');
 
 
 /** ************************************************************************************************
@@ -201,7 +201,6 @@ function preprocessAnnotations( csn, serviceName, options, messageFunctions ) {
             // valueListProp: the (single) key field of the value list entity
             //   ignore the artificial key "IsActiveEntity" for draft-enabled entities
             //   if no key or multiple keys -> message
-            let valueListProp = null;
             const keys = Object.keys(vlEntity.elements).filter( x => vlEntity.elements[x].key && !vlEntity.elements[x].target &&
               !(vlEntity['@odata.draft.enabled'] && x === 'IsActiveEntity'));  // ignore added key for draft entities
             if (keys.length === 0) {
@@ -211,7 +210,7 @@ function preprocessAnnotations( csn, serviceName, options, messageFunctions ) {
             else if (keys.length > 1) {
               message('odata-anno-preproc', [ ...location, anno ], { anno, name: enameFull, '#': 'vhlmultkeys' });
             }
-            valueListProp = keys[0];
+            const valueListProp = keys[0];
 
             // textField:
             //   first entry of @UI.Identification

package/node_modules/@sap/cds-compiler/lib/edm/csn2edm.js

@@ -13,7 +13,7 @@ const { setProp } = require('../utils/objectUtils');
 const { isBetaEnabled } = require('../base/specialOptions');
 const {
   isEdmPropertyRendered, getUtils, findAnnotationExpression,
-} = require('../model/csnUtils');
+} = require('../base/csnUtils');
 const { isBuiltinType } = require('../base/builtins');
 const { checkCSNVersion } = require('../json/csnVersion');
 const {

package/node_modules/@sap/cds-compiler/lib/edm/edm.js

@@ -1166,13 +1166,12 @@ function getEdm( options ) {
       }
       if (_constraints.constraints) {
         Object.values(_constraints.constraints)
-          .forEach(c => this.append(
-            new ReferentialConstraint(this._v,
-                                      {
-                                        Property: c[i].join(options.pathDelimiter),
-                                        ReferencedProperty: c[j].join(options.pathDelimiter),
-                                      } )
-          ));
+          .forEach((c) => {
+            this.append(new ReferentialConstraint(this._v, {
+              Property: c[i].join(options.pathDelimiter),
+              ReferencedProperty: c[j].join(options.pathDelimiter),
+            }));
+          });
       }
     }
   }

package/node_modules/@sap/cds-compiler/lib/edm/edmAnnoPreprocessor.js

@@ -2,7 +2,7 @@
 
 const edmUtils = require('./edmUtils.js');
 const { setProp } = require('../utils/objectUtils');
-const { forEachGeneric } = require('../model/csnUtils');
+const { forEachGeneric } = require('../base/csnUtils');
 
 /*
  * Late application specific transformations

package/node_modules/@sap/cds-compiler/lib/edm/edmInboundChecks.js

@@ -5,7 +5,7 @@ const { isBetaEnabled } = require('../base/specialOptions');
 const {
   forEachDefinition, forEachMemberRecursively, getUtils,
   transformAnnotationExpression,
-} = require('../model/csnUtils');
+} = require('../base/csnUtils');
 const { isBuiltinType } = require('../base/builtins');
 const { assignAnnotation } = require('./edmUtils.js');
 

package/node_modules/@sap/cds-compiler/lib/edm/edmPreprocessor.js

@@ -8,7 +8,7 @@ const {
   applyTransformations, applyTransformationsOnNonDictionary,
   transformAnnotationExpression, findAnnotationExpression,
   cardinality2str,
-} = require('../model/csnUtils');
+} = require('../base/csnUtils');
 const { isBuiltinType, isMagicVariable } = require('../base/builtins');
 const edmUtils = require('./edmUtils.js');
 const edmAnnoPreproc = require('./edmAnnoPreprocessor.js');

package/node_modules/@sap/cds-compiler/lib/edm/edmUtils.js

@@ -3,7 +3,7 @@
 const { setProp } = require('../utils/objectUtils');
 const {
   isEdmPropertyRendered, applyTransformations,
-} = require('../model/csnUtils');
+} = require('../base/csnUtils');
 const { isBuiltinType } = require('../base/builtins');
 const { escapeString, hasControlCharacters, hasUnpairedUnicodeSurrogate } = require('../render/utils/stringEscapes');
 const { CompilerAssertion } = require('../base/error');
@@ -113,7 +113,7 @@ function resolveOnConditionAndPrepareConstraints( csn, assocCsn, messageFunction
     getExpressionArguments(assocCsn.on);
 
     // for all $self conditions, fill constraints of partner (if any)
-    let isBacklink = assocCsn._constraints.selfs.length === 1 && assocCsn._constraints.termCount === 1;
+    let isBacklink = assocCsn.$backlink || (assocCsn._constraints.selfs.length === 1 && assocCsn._constraints.termCount === 1);
 
     /* example for _originalTarget:
     entity E (with parameters) {
@@ -262,13 +262,18 @@ function finalizeReferentialConstraints( csn, assocCsn, options, info ) {
       // if the origin assoc is marked as primary key and if it's managed, add all its foreign keys as constraint
       // as they are also primary keys of the origin entity as well
       if (!assocCsn._target.$isParamEntity && originAssocCsn.key && originAssocCsn.keys) {
+        const renames = Object.create(null);
+        for (const bk of (assocCsn.$backlink?.keys ?? [])) {
+          if (bk.as)
+            renames[bk.as] = bk.ref[0];
+        }
         for (const fk of originAssocCsn.keys) {
           const realFk = originAssocCsn._parent.elements[fk.$generatedFieldName];
-          const pk = assocCsn._parent.elements[fk.ref[0]];
+          const pkName = renames[fk.ref[0]] ?? fk.ref[0];
+          const pk = assocCsn._parent.elements[pkName];
           if (isConstraintCandidate(pk) && isConstraintCandidate(realFk)) {
-            const c = [ [ fk.ref[0] ], [ fk.$generatedFieldName ] ];
-            const key = c.join(',');
-            assocCsn._constraints.constraints[key] = c;
+            const c = [ [ pkName ], [ fk.$generatedFieldName ] ];
+            assocCsn._constraints.constraints[c.join(',')] = c;
           }
         }
       }
@@ -362,7 +367,7 @@ function finalizeReferentialConstraints( csn, assocCsn, options, info ) {
     // Filter out all elements that are annotated with '@cds.api.ignore'
 
     // In structured format, foreign keys of managed associations are never rendered, so
-    // there are no constraints for them.
+    // there are no constraints for them. -> not true with "--odata-foreign-keys" flag
     const remainingPrincipalRefs = [];
     for (const fk of assocCsn.keys) {
       const realFk = assocCsn._parent.items ? assocCsn._parent.items.elements[fk.$generatedFieldName] : assocCsn._parent.elements[fk.$generatedFieldName];

package/node_modules/@sap/cds-compiler/lib/gen/CdlGrammar.checksum

@@ -1 +1 @@
-bfa8a04d3ff1bc96f00a7f8d532f11d0
+03f001bb7b3d56e0aff54a052723fa25

package/node_modules/@sap/cds-compiler/lib/gen/CdlParser.js

@@ -1605,7 +1605,7 @@ case 32:switch(this.lk()){
 case'as':this.ck(33);continue
 default:if(this.gr()){ this.classifyImplicitName( 'Using' ); }continue
 }
-case 33:if(this.mi(0,'UsingAlias')){ $.proxy.name = this.identAst(); }continue
+case 33:if(this.mi(0,'UsingAlias')){ $.proxy.name = this.identNameAst(); }continue
 default:
 this.attachLocation( $.proxy )
 return this.exit_()
@@ -2876,7 +2876,7 @@ case'localized':if(this.ck(377)){ $.art.localized = this.valueWithLocation( true
 case'association':if(this.ck(379)){assoc=this.lb();this.elementRestriction('calc')}continue;
 case'composition':if(this.ck(383)){assoc=this.lb();this.elementRestriction('calc')}continue;
 case'array':if(this.ck(387)){this.elementRestriction('calc')}continue;
-case'many':if(this.ck(388)){this.elementRestriction('calc'); $.art.items = { location: this.lb().location }; }continue
+case'many':if(this.ck(388)){this.elementRestriction('calc'); $.art.items = { __proto__: XsnArtifact.prototype, location: this.lb().location }; }continue
 case'{':if(this.elementsBlock({art:$.art},393)){this.elementRestriction('calc')}continue;
 default:this.e();continue
 }
@@ -2940,7 +2940,7 @@ case'Id':this.typeAssocProperties({art:$.art,assoc,card},0);continue
 case'{':if(this.elementsBlock({art:this.setAssocAndComposition( $.art, assoc, card )},0)){ $.art.target.location = $.art.target.elements[Symbol.for('cds.$location')]; }continue
 default:this.e();continue
 }
-case 387:if(this.mk(388,'of')){ $.art.items = { location: this.locationOfPrevTokens( 2 ) }; }continue
+case 387:if(this.mk(388,'of')){ $.art.items = { __proto__: XsnArtifact.prototype, location: this.locationOfPrevTokens( 2 ) }; }continue
 case 388:switch(this.l()){
 case'Id':this.typeRefOptArgs({art:$.art.items},389);continue
 case'type':this.typeTypeOf({art:$.art.items},389);continue
@@ -3237,7 +3237,7 @@ case 466:switch(this.lk()){
 case'all':case'distinct':if(this.ck(467)){ quantifier = this.valueWithLocation(); }continue
 default:this.s=467;continue
 }
-case 467:if(this.queryExpression(_={},464)){query=_.expr;this.orderByLimitRestriction(); if ($.expr.$parens || op.val !== $.expr.op?.val || quantifier?.val !== $.expr.quantifier?.val) $.expr = { op, args: [$.expr], quantifier, location: { ...$.expr.location } };
+case 467:if(this.queryExpression(_={},464)){query=_.expr;this.orderByLimitRestriction(); if ($.expr.$parens || op.val !== $.expr.op?.val || quantifier?.val !== $.expr.quantifier?.val) $.expr = { op, args: [$.expr], quantifier, location: this.locationCopy( $.expr.location ) };
 quantifier = undefined;
 $.expr.args.push( query ); this.attachLocation( $.expr ); }continue
 case 468:switch(this.l()){
@@ -3300,7 +3300,7 @@ default:this.s=484;continue
 }
 case 484:this.s=485;{this.inSelectItem('sqlStyle')}continue;
 case 485:switch(this.lt()){
-case'*':if(this.c(486)){ $.query.columns = [ this.valueWithLocation() ]; }continue
+case'*':if(this.c(486)){ $.query.columns = [ this.wildcardColumn() ]; }continue
 case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'@':case'{':case'Number':case'String':case'QuotedLiteral':this.selectItemDef({columns:($.query.columns = []),sqlStyle:true},486);continue
 default:this.e();continue
 }
@@ -3309,7 +3309,7 @@ case',':this.c(487);continue
 default:this.s=488;continue
 }
 case 487:switch(this.lt()){
-case'*':if(this.c(486)){ $.query.columns.push( this.valueWithLocation() ); }continue
+case'*':if(this.c(486)){ $.query.columns.push( this.wildcardColumn() ); }continue
 case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'@':case'{':case'Number':case'String':case'QuotedLiteral':this.selectItemDef({columns:$.query.columns,sqlStyle:true},486);continue
 default:this.e();continue
 }
@@ -3408,7 +3408,7 @@ case'as':this.ck(514);continue
 case'Id':if(this.ci(0,'FromAlias')){ $.expr = this.taggedIfQuery( $.expr ); $.expr.name = this.fragileAlias(); }continue
 default:this.gr(['full','join','left','cross','inner','right']);continue
 }
-case 514:if(this.mi(0,'FromAlias')){ $.expr = this.taggedIfQuery( $.expr ); $.expr.name = this.identAst(); }continue
+case 514:if(this.mi(0,'FromAlias')){ $.expr = this.taggedIfQuery( $.expr ); $.expr.name = this.identNameAst(); }continue
 default:return this.exit_()
 }
 }
@@ -3455,7 +3455,7 @@ case'as':this.ck(526);continue
 case'Id':if(this.ci(0,'FromAlias')){ $.expr.name = this.fragileAlias(); }continue
 default:this.s=527;continue
 }
-case 526:if(this.mi(0,'FromAlias')){ $.expr.name = this.identAst(); }continue
+case 526:if(this.mi(0,'FromAlias')){ $.expr.name = this.identNameAst(); }continue
 case 527:if(this.gr()){ this.classifyImplicitName( $.expr.scope ? 'FromElemImplicit' : 'FromImplicit', $.expr ); }continue
 default:
 this.attachLocation( $.expr )
@@ -3590,7 +3590,7 @@ this.rule_(566,$next)
 for(;;)switch(this.s){
 case 566:if(this.m(567,'{')){this.inSelectItem('top'); $.query.columns = this.createArray( $.start ); }continue
 case 567:switch(this.lt()){
-case'*':if(this.c(568)){ $.query.columns.push( this.valueWithLocation() ); }continue
+case'*':if(this.c(568)){ $.query.columns.push( this.wildcardColumn() ); }continue
 case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'@':case'{':case'Number':case'String':case'QuotedLiteral':this.selectItemDef({columns:$.query.columns,sqlStyle:false},568);continue
 default:this.s=569;continue
 }
@@ -3608,7 +3608,7 @@ this.rule_(571,$next)
 for(;;)switch(this.s){
 case 571:if(this.m(572,'{')){this.inSelectItem(); $.query[$.clause] = this.createArray(); }continue
 case 572:switch(this.lt()){
-case'*':if(this.c(573)){ $.query[$.clause].push( this.valueWithLocation() ); }continue
+case'*':if(this.c(573)){ $.query[$.clause].push( this.wildcardColumn() ); }continue
 case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'@':case'{':case'Number':case'String':case'QuotedLiteral':this.selectItemDef({columns:$.query[$.clause],sqlStyle:false},573);continue
 default:this.s=574;continue
 }
@@ -3652,7 +3652,7 @@ case'as':this.ck(582);continue
 case'Id':if(this.ci(591,'ItemAlias')){ art.name = this.fragileAlias( true ); }continue
 default:this.s=591;continue
 }
-case 582:if(this.mi(591,'ItemAlias')){ art.name = this.identAst(); }continue
+case 582:if(this.mi(591,'ItemAlias')){ art.name = this.identNameAst(); }continue
 case 583:switch(this.l()){
 case'over':if(this.ck(584)){ this.pushXprToken( expr.suffix = [] ); }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(_={ expr: expr },586,666)){e=_.expr; Object.assign( e.location || {}, expr.location ); art.value = this.attachLocation( e ) }continue
@@ -3672,11 +3672,11 @@ case'as':this.ck(587);continue
 case'Id':if(this.ci(591,'ItemAlias')){ art.name = this.fragileAlias( true ); }continue
 default:this.s=591;continue
 }
-case 587:if(this.mi(591,'ItemAlias')){ art.name = this.identAst(); }continue
-case 588:if(this.mi(591,'ItemAlias')){this.nestedExpand(); art.name = this.identAst(); }continue
+case 587:if(this.mi(591,'ItemAlias')){ art.name = this.identNameAst(); }continue
+case 588:if(this.mi(591,'ItemAlias')){this.nestedExpand(); art.name = this.identNameAst(); }continue
 case 589:switch(this.lt()){
 case'{':this.nestedSelectItemsList({query:art,clause:'inline'},590);continue
-case'*':if(this.c(0)){ art.inline = [ this.valueWithLocation() ]; }continue
+case'*':if(this.c(0)){ art.inline = [ this.wildcardColumn() ]; }continue
 default:this.e();continue
 }
 case 590:switch(this.lk()){
@@ -3697,7 +3697,7 @@ case'excluding':this.excludingClause({query:art},595);continue
 default:this.s=595;continue
 }
 case 595:this.mk(596,'as');continue
-case 596:if(this.mi(597,'ItemAlias')){ art.name = this.identAst(); }continue
+case 596:if(this.mi(597,'ItemAlias')){ art.name = this.identNameAst(); }continue
 case 597:this.s=598;{this.columnExpr(); this.docComment( art ); }continue
 case 598:switch(this.lt()){
 case'@':this.annoAssignMid({art},598);continue

package/node_modules/@sap/cds-compiler/lib/gen/Dictionary.json

@@ -589,6 +589,13 @@
       "$experimental": true,
       "Type": "Edm.String"
     },
+    "Common.ExpandAfterConcatSupported": {
+      "$experimental": true,
+      "AppliesTo": [
+        "EntityContainer"
+      ],
+      "Type": "Core.Tag"
+    },
     "Common.Experimental": {
       "Type": "Edm.String"
     },

package/node_modules/@sap/cds-compiler/lib/json/from-csn.js

@@ -120,7 +120,7 @@ const { quotedLiteralPatterns } = require('../compiler/builtins');
 const { exprProperties, isAnnotationExpression } = require('../base/builtins');
 const { CompilerAssertion } = require('../base/error');
 const { Location } = require('../base/location');
-const { XsnSource } = require('../compiler/xsn-model');
+const { XsnSource, XsnArtifact, XsnName } = require('../compiler/xsn-model');
 const { isValidEnumValue } = require( '../compiler/base' );
 const { xsnAsTree, splitClauses } = require('../parsers/XprTree');
 
@@ -276,7 +276,7 @@ const schema = compileSchema( {
     ],
   },
   actions: {
-    dictionaryOf: actions,
+    dictionaryOf: definition,
     defaultKind: 'action',
     validKinds: [ 'action', 'function' ],
     onlyWith: { aspect: 'elements' },
@@ -385,6 +385,7 @@ const schema = compileSchema( {
     type: object,
     optional: typeProperties, // TODO: think of items: {}, then requires: false
     inKind: [ 'element', 'type', 'param', 'annotation' ],
+    instanceOf: XsnArtifact,
   },
   localized: {
     type: boolOrNull,
@@ -941,7 +942,9 @@ function object( obj, spec ) {
   if (!isObject( obj, spec ))
     return undefined;
   pushLocation( obj );
-  const r = { location: location() };
+  const r = spec.instanceOf
+    ? { __proto__: spec.instanceOf.prototype, location: location() }
+    : { location: location() };
   const xor = {};
   const csnProps = Object.keys( obj );
   const o = eventualCast( obj, spec, r ); // do s/th special for CAST
@@ -990,14 +993,15 @@ function vZeroDelete( o, spec ) { // for old-CSN property 'origin'
 function definition( def, spec, xsn, csn, name ) {
   if (!isObject( def, spec )) {
     return {
+      __proto__: XsnArtifact.prototype,
       kind: (inExtensions ? 'annotate' : spec.defaultKind),
-      name: { id: '', location: location() },
+      name: { __proto__: XsnName.prototype, id: '', location: location() },
       location: location(),
     };
   }
   pushLocation( def );
   const savedInExtensions = inExtensions;
-  const r = { location: location(), kind: undefined };
+  const r = { __proto__: XsnArtifact.prototype, location: location(), kind: undefined };
   const kind = calculateKind( def, spec, r ); // might set inExtensions
   if (kind !== '$column')
     r.kind ??= kind;
@@ -1020,7 +1024,7 @@ function definition( def, spec, xsn, csn, name ) {
     }
   }
   if (!r.name && name != null) {
-    r.name = { id: name, location: r.location };
+    r.name = { __proto__: XsnName.prototype, id: name, location: r.location };
     if (prop === 'columns' || prop === 'keys' || prop === 'foreignKeys')
       r.name.$inferred = 'as';
   }
@@ -1062,22 +1066,6 @@ function couldBeEnumProperty( prop ) {
     (!Array.isArray( inKind ) || prop === 'value' || inKind.includes( 'enum' ));
 }
 
-function actions( def, spec, xsn, csn, name ) {
-  if (def.kind === 'extend' && (def.elements || def.enum)) {
-    // TODO: Handle this case in extend.js; already done for `returns`
-    //       See message ext-expecting-returns
-    // TODO: the location would also bad here
-    // (should be at the property, not containing object - but we remove this anyway)
-    error( 'syntax-unexpected-property', location(true), {
-      '#': def.kind,
-      prop: def.enum ? 'enum' : 'elements',
-      parentprop: spec.msgProp,
-      kind: def.kind,
-    } );
-  }
-  return definition( def, spec, xsn, csn, name );
-}
-
 // A dictionary is expected. Uses spec.dictionaryOf. If unset, default is "definition".
 function dictionaryOf( elementFct ) {
   return function dictionary( dict, spec ) {
@@ -1126,7 +1114,7 @@ function keys( array, spec, xsn ) {
 // Use with spec.msgVariant: 'or-asterisk'
 function selectItem( def, spec, xsn, csn ) {
   if (def === '*')              // compile() will complain about repeated '*'s
-    return { val: '*', location: location() };
+    return { __proto__: XsnArtifact.prototype, val: '*', location: location() };
 
   return definition( def, spec, xsn, csn, null ); // definer sets name
 }
@@ -1144,6 +1132,8 @@ function includeRefs( def, spec, xsn, csn ) {
         ? postpone
         : 0;
     } );
+    // TODO v8: if not on ext and no CSN $postponeIncludes, set $postponeInclude
+    // on 1st include to -1 (there are too many `includes` places in the CDL parser )
   }
   return array;
 }
@@ -1182,7 +1172,9 @@ function elementsDict( def, spec, xsn ) {
            { prop: 'elements', parentprop: 'returns' },
            // eslint-disable-next-line @stylistic/max-len
            'Expecting property $(PROP) to be put into an object for property $(PARENTPROP) when annotating action return structures' );
-  xsn.returns = { kind: 'annotate', elements, location: elements[$location] };
+  xsn.returns = {
+    __proto__: XsnArtifact.prototype, kind: 'annotate', elements, location: elements[$location],
+  };
   return undefined;
 }
 
@@ -1190,7 +1182,7 @@ function enumDict( def, spec, xsn ) {
   const dict = dictionaryOf( definition )( def, spec );
   if (!inExtensions)
     return dict;
-  xsn.elements = dict;          // normalize to `elements` for `annotate`
+  xsn.elements = dict;    // normalize to `elements` for `annotate` (not `extend`)
   return undefined;
 }
 
@@ -1212,12 +1204,16 @@ function kindAndName( id, spec, xsn ) {
   xsn.kind = prop;              // TODO: set this in definition
   if (!string( id, spec ))
     return;
-  xsn.name = { path: [ { id, location: location() } ], location: location() };
+  xsn.name = {
+    __proto__: XsnName.prototype,
+    path: [ { id, location: location() } ],
+    location: location(),
+  };
 }
 
 function explicitName( id, spec, xsn ) {
   if (string( id, spec ))
-    xsn.name = { id, location: location() };
+    xsn.name = { __proto__: XsnName.prototype, id, location: location() };
 }
 
 function abstract( val, spec, xsn, csn ) {
@@ -1529,7 +1525,7 @@ function annotation( val, spec, xsn, csn, name ) {
   if (!id)              // `"@": …` is already syntax-unknown-property
     message( 'syntax-invalid-name', location(true), { '#': '{}' } );
 
-  const n = { id, location: location() };
+  const n = { __proto__: XsnName.prototype, id, location: location() };
   const r = annoValue( val, spec );
   r.name = n;
   return r;
@@ -1652,7 +1648,7 @@ function args( exprs, spec ) {
   for (const id of Object.keys( exprs )) {
     const a = expr( exprs[id], s );
     if (a) {
-      a.name = { id, location: a.location };
+      a.name = { __proto__: XsnName.prototype, id, location: a.location };
       r[id] = a;
     }
     ++virtualLine;
@@ -1771,7 +1767,11 @@ function excluding( array, spec, xsn ) {
     ++virtualLine; // possibly empty array
   for (const ex of array) {
     const id = string( ex, spec ) || '';
-    dictAdd( r, id, { name: { id, location: location() }, location: location() },
+    dictAdd( r, id,
+             {
+               name: { __proto__: XsnName.prototype, id, location: location() },
+               location: location(),
+             },
              duplicateExcluding );
     ++virtualLine;
   }

package/node_modules/@sap/cds-compiler/lib/json/to-csn.js

@@ -567,7 +567,7 @@ function keepElements( node, line ) {
     const ltype = line.type && line.type._artifact;
     if (!array ||     // reference errors
         array._main && !line.elements && !line.enum && !line.items && !line.notNull &&
-        (!ltype || !ltype._main)) // many Foo:bar -> not SimpleType
+        (!ltype || !ltype._main)) // no line type, or elem ref as line type
       return true;
   }
   // even if expanded elements have no new target or direct annotation,
@@ -1635,6 +1635,7 @@ module.exports = {
   compactModel,
   compactQuery,
   compactExpr,
+  csnVersion,
   csnDictionaries,
   csnDirectValues,
   csnPropertyOrder: propertyOrder,