@sap/cds-compiler 5.9.4 → 6.0.12

package/lib/transform/forRelationalDB.js

@@ -5,7 +5,6 @@ const { forEachMemberRecursively, forAllQueries, applyTransformationsOnNonDictio
         getArtifactDatabaseNameOf, getElementDatabaseNameOf, applyTransformations,
         walkCsnPath, isPersistedOnDatabase
       } = require('../model/csnUtils');
-const { isBuiltinType } = require('../base/builtins');
 const transformUtils = require('./transformUtils');
 const { translateAssocsToJoinsCSN } = require('./translateAssocsToJoins');
 const { csnRefs, pathId, traverseQuery, columnAlias} = require('../model/csnRefs');
@@ -16,7 +15,7 @@ const { addTenantFields } = require('../transform/addTenantFields');
 const { addLocalizationViewsWithJoins, addLocalizationViews } = require('../transform/localized');
 const { timetrace } = require('../utils/timetrace');
 const { createReferentialConstraints, assertConstraintIdentifierUniqueness } = require('./db/constraints');
-const { createDict, forEach } = require('../utils/objectUtils');
+const { forEach } = require('../utils/objectUtils');
 const handleExists = require('./db/assocsToQueries/transformExists');
 const { rewriteCalculatedElementsInViews, processCalculatedElementsInEntities } = require('./db/rewriteCalculatedElements');
 const replaceAssociationsInGroupByOrderBy = require('./db/groupByOrderBy');
@@ -403,10 +402,9 @@ function transformForRelationalDBWithCsn(csn, options, messageFunctions) {
       assertConstraintIdentifierUniqueness(parent, path[1], path, error);
     },
     elements: (parent, prop, elements, path) => {
-      // Attach @cds.persistence.name to elements, replace enums by their base value
+      // Attach @cds.persistence.name to elements
       const artifact = csn.definitions[path[1]];
       forEach(elements, (name, element) => {
-        replaceEnums(element, name, path.concat(['elements', name]));
         if ((!element.virtual || artifact.query))
           csnUtils.addStringAnnotationTo('@cds.persistence.name', getElementDatabaseNameOf(name, options.sqlMapping, options.sqlDialect), element);
       });
@@ -467,7 +465,6 @@ function transformForRelationalDBWithCsn(csn, options, messageFunctions) {
     includes: killProp,
     masked: killProp,
     localized: killProp,
-    enum: killProp
   }
 
   if(options.sqlDialect === 'postgres') {
@@ -671,25 +668,6 @@ function transformForRelationalDBWithCsn(csn, options, messageFunctions) {
     timetrace.stop('A2J');
   }
 
-
-
-  /**
-   * Replace Enum symbols by their values.
-   *
-   * Only applies to elements.
-   *
-   * @param {CSN.Element} obj
-   * @param {String} objName
-   * @param {CSN.Path} path
-   */
-  function replaceEnums(obj, objName, path) {
-    // (190 a) Replace enum symbols by their value (if found)
-    replaceEnumSymbolsByValues(obj, path);
-
-    if (obj.enum)
-      delete obj.enum;
-  }
-
   // Change the names of those builtin types that have different names in HANA.
   // (do that directly in the csn where the builtin types are defined, so that
   // all users of the types benefit from it). Also add the type parameter 'length'
@@ -697,9 +675,10 @@ function transformForRelationalDBWithCsn(csn, options, messageFunctions) {
   // TODO: there is no benefit at all - it is fundamentally wrong
   function renamePrimitiveTypesAndUuid(val, node, key) {
     // assert key === 'type'
-    const hanaNamesMap = createDict({
+    const hanaNamesMap = {
+      __proto__: null,
       'cds.UUID': 'cds.String'
-    });
+    };
     node[key] = hanaNamesMap[val] || val;
     if (val === 'cds.UUID' && !node.length) {
       node.length = 36;
@@ -722,55 +701,6 @@ function transformForRelationalDBWithCsn(csn, options, messageFunctions) {
   //   }
   // }
 
-
-  // If 'elem' has a default that is an enum constant, replace that by its value. Complain
-  // if not found or not an enum type,
-  // usually done by the Core Compiler, but backend might be called directly
-  function replaceEnumSymbolsByValues(elem, path) {
-    // (190 a) Replace enum symbols by their value (if found)
-    if (!elem.default?.['#'])
-      return;
-    if (elem.default.val !== undefined) {
-      delete elem.default['#'];
-    }
-    else {
-      let Enum = elem.enum;
-      if (!Enum && !isBuiltinType(elem.type)) {
-        const typeDef = csnUtils.getCsnDef(elem.type);
-        Enum = typeDef && typeDef.enum;
-      }
-      if (!Enum) {
-        // Not an enum at all
-        // Looks like it is always run?! But message says HANA CDS?!
-        error(null, path, {
-          $reviewed: true,
-          name: `#${ elem.default['#'] }`
-        },
-        'Expecting enum literal $(NAME) to be used with an enum type');
-      }
-      else {
-        // Try to get the corresponding enum symbol from the element's type
-        const enumSymbol = Enum[elem.default['#']];
-        if (!enumSymbol) {
-          error(null, path, {
-            $reviewed: true,
-            name: `#${ elem.default['#'] }`
-          }, 'Enum literal $(NAME) is undefined in enumeration type');
-        }
-        else if (enumSymbol.val !== undefined) { // `val` may be `null`
-          // Replace default with enum value
-          elem.default.val = enumSymbol.val;
-          delete elem.default['#'];
-        }
-        else {
-          // Enum symbol without explicit value - replace default by the symbol in string form
-          elem.default.val = elem.default['#'];
-          delete elem.default['#'];
-        }
-      }
-    }
-  }
-
   /**
    * Check that required actual parameters on 'node.type' are set, that their values are in the correct range etc.
 

package/lib/transform/localized.js

@@ -659,7 +659,7 @@ function _addLocalizationViews(csn, options, config) {
                                    { art: name });
         }
       },
-    });
+    }, messageFunctions.error);
     forEachDefinition(csn, checkAnnotationsOnLocalized);
   }
 

package/lib/transform/odata/createForeignKeys.js

@@ -63,16 +63,16 @@ function createForeignKeyElements(csn, options, messageFunctions, csnUtils, iter
         }
 
         adaptAnnotationsRefs(generatedForeignKeys, csnUtils, messageFunctions);
-        setProp(element, '$generatedForeignKeys', generatedForeignKeys.map(gfk => gfk.prefix));
+        setProp(element, '$generatedForeignKeys', generatedForeignKeys.map(gfk => { 
+          return { name: gfk.prefix, origin: gfk.originalKey, source: gfk.sourceElement } } ));
         orderedElements.push(...generatedForeignKeys.map(gfk => [ gfk.prefix, gfk.foreignKey ]));
-      
-    });
+      });
 
-    parent[prop] = orderedElements.reduce((elementsAccumulator, [ name, element ]) => {
-      elementsAccumulator[name] = element;
-      return elementsAccumulator;
-    }, Object.create(null));
-  }
+      parent[prop] = orderedElements.reduce((elementsAccumulator, [ name, element ]) => {
+        elementsAccumulator[name] = element;
+        return elementsAccumulator;
+      }, Object.create(null));
+    }
 
   function createForeignKeysForElement(path, element, prefix, csn, options, pathDelimiter, lvl = 0, originalKey = {} ) {
     const special$self = !csn?.definitions?.$self && '$self';
@@ -108,7 +108,7 @@ function createForeignKeyElements(csn, options, messageFunctions, csnUtils, iter
     // main if for this function
     // the element is a managed association
     if (csnUtils.isManagedAssociation(finalElement)) {
-      finalElement.keys.forEach((key, keyIndex) => {
+      finalElement.keys?.forEach((key, keyIndex) => {
         const continuePath = getContinuePath([ 'keys', keyIndex ]);
         const alias = key.as || implicitAs(key.ref);
         const result = csnUtils.inspectRef(continuePath);
@@ -143,7 +143,8 @@ function createForeignKeyElements(csn, options, messageFunctions, csnUtils, iter
         if (element[prop] !== undefined)
           newFk[prop] = element[prop];
       });
-      return [ { prefix, foreignKey: newFk, originalKey, keyAnnotations: [] } ];
+      let result = { prefix, foreignKey: newFk, originalKey, keyAnnotations: [], sourceElement: finalElement }
+      return [ result ];
     }
 
     fks.forEach((fk) => {

package/lib/transform/odata/flattening.js

@@ -151,7 +151,7 @@ function allInOneFlattening(csn, refFlattener, adaptRefs, inspectRef, getFinalTy
     }
     // loop through types as well in order to collect the managaed associations
     // that reside in types definitions
-    if ((def.kind === 'action' || def.kind === 'function' || def.kind === 'type' || def.kind === 'aspect' || def.kind === 'event') 
+    if ((def.kind === 'action' || def.kind === 'function' || def.kind === 'type' || def.kind === 'aspect' || def.kind === 'event')
         && !isExternalServiceMember(def, defName)) {
       if (def.kind === 'type' && csnUtils.isManagedAssociation(def))
         allMgdAssocDefs.push(def);
@@ -472,7 +472,8 @@ function allInOneFlattening(csn, refFlattener, adaptRefs, inspectRef, getFinalTy
     generatedForeignKeysForAssoc.forEach(gfk => gfk[1]['@odata.foreignKey4'] = flatEltName);
     // reassign the generated foreign keys for current assoc in order to assign
     // correct values for $generatedFieldName later on during flattenManagedAssocsAsKeys();
-    setProp(flatElt, '$generatedForeignKeys', generatedForeignKeysForAssoc.map(gfk => gfk[0]));
+    // eslint-disable-next-line @stylistic/js/max-statements-per-line
+    setProp(flatElt, '$generatedForeignKeys', generatedForeignKeysForAssoc.map(gfk => { return { name: gfk[0] }}));
   }
 }
 
@@ -644,6 +645,9 @@ function replaceManagedAssocsAsKeys(allFlatManagedAssocDefinitions, csnUtils) {
   allFlatManagedAssocDefinitions.forEach( assoc => {
     let finished = false;
 
+    if (!assoc.keys)
+      return; // managed to-many assoc
+
     while (!finished) {
       const newKeys = [];
       finished = processKeys(newKeys);
@@ -670,8 +674,8 @@ function replaceManagedAssocsAsKeys(allFlatManagedAssocDefinitions, csnUtils) {
             // we do not generate foreign keys in the definition, therefore no $generatedForeignKeys,
             // respectively we do not assign $generatedFieldName
             if (assoc.$generatedForeignKeys) {
-              const generatedForeignKey = assoc.$generatedForeignKeys.find(gfk => gfk === `${flatAssocName}_${key.as || key.ref.join('_')}`);
-              key.$generatedFieldName = generatedForeignKey;
+              const generatedForeignKey = assoc.$generatedForeignKeys.find(gfk => gfk.name === `${flatAssocName}_${key.as || key.ref.join('_')}`);
+              key.$generatedFieldName = generatedForeignKey.name;
             }
           }
           if (key.as && key.as === key.ref[0]) delete key.as;

package/lib/transform/odata/foreignKeyRefsInXprAnnos.js

@@ -0,0 +1,96 @@
+'use strict'
+
+const { applyTransformations, transformAnnotationExpression } = require('../../model/csnUtils');
+const { isBuiltinType } = require('../../base/builtins');
+
+
+function replaceForeignKeyRefsInExpressionAnnotations(csn, options, messageFunctions, csnUtils, iterateOptions = {}) {
+  const transformers = {
+    elements: processRef,
+    params: processRef,
+    actions: processRef
+    // '@': processRef
+  };
+  applyTransformations(csn, transformers, [ processRef ], iterateOptions);
+
+  function processRef(parent, prop, _dict, path) {
+    transformAnnotationExpression(parent, prop,
+      {
+        ref: (parent, _prop, ref, path, _p, _ppn, ctx) => {
+          const { art, links } = 
+            (parent._art && parent._links) ? 
+            { art: parent._art, links: parent._links } :
+            csnUtils.inspectRef(path);
+          // if a reference points to a structure(managed assoc or structured element), then we do not process
+          // as we can't guess which specific foreign key is targeted
+          if (!art || csnUtils.isManagedAssociation(art) || csnUtils.isStructured(art)) return;
+
+          const allMngAssocsInRef = links.filter(link => csnUtils.isManagedAssociation(link.art));
+          if (!allMngAssocsInRef.length) return;
+          let firstAssocToProcess = allMngAssocsInRef[0];
+
+          const mngAssocsWithFilter = allMngAssocsInRef.filter(assoc => typeof ref[assoc.idx] !== 'string');
+          if (mngAssocsWithFilter.length) {
+            const refTail = links.slice(mngAssocsWithFilter.at(-1).idx + 1);
+            firstAssocToProcess = refTail.find(link => csnUtils.isManagedAssociation(link.art));
+          }
+
+          const match = findMatchingForeignKeyForAssoc(firstAssocToProcess, art, ref, links);
+          if (match) {
+            const refHead = ref.slice(0, match.idx);
+            parent.ref = [...refHead, match.fkName];
+            if (ctx?.annoExpr?.['=']) {
+              ctx.annoExpr['='] = true;
+            }
+          }
+        }
+      },
+      path);
+  }
+
+  function findMatchingForeignKeyForAssoc(assoc, refArt, ref, links) {
+    if (!assoc) return undefined;
+
+    const expectedFkName = findExpectedFkName(assoc, ref, links);
+    const gfks = assoc.art?.$generatedForeignKeys;
+    if (!gfks) return undefined;
+    const matchedFk = gfks.find(fk => fk.source === refArt && fk.name === expectedFkName);
+    if (matchedFk) {
+      return { fkName: matchedFk.name, idx: assoc.idx };
+    } else {
+      // try to find FK substitution in the next assoc in the ref (if there is such assoc)
+      const refTail = links.slice(assoc.idx + 1);
+      const nextAssoc = refTail.find(link => csnUtils.isManagedAssociation(link.art));
+      return findMatchingForeignKeyForAssoc(nextAssoc, refArt, ref, links);
+    }
+
+
+    function findExpectedFkName(assoc, ref, links) {
+      let expectedFkName = ref[assoc.idx];
+      const refAliasMapping = assoc.art.keys.reduce( (acc, key) => {
+        acc[key.ref.join('_')] = key.as;
+        return acc;
+      }, {});
+      let bufferRef = [];
+      for (let i = assoc.idx + 1; i < links.length; i++) {
+        const link = links[i];
+        bufferRef.push(ref[i]);
+        if (csnUtils.isManagedAssociation(link.art)) {
+          const subFkName = findExpectedFkName(link, ref, links);
+          if (!subFkName) return undefined;
+          expectedFkName += bufferRef.length > 1 ? 
+          `_${bufferRef.slice(0, -1).join('_')}_${subFkName}` :
+          `_${subFkName}`;
+          break;
+        } else if (isBuiltinType(link.art.type)) {
+          expectedFkName += `_${refAliasMapping[bufferRef.join('_')] || ref[i]}`;
+          bufferRef = [];
+        }
+  
+      }
+      return expectedFkName;
+    }
+  }
+}
+
+module.exports = replaceForeignKeyRefsInExpressionAnnotations;

package/lib/transform/odata/typesExposure.js

@@ -101,8 +101,8 @@ function typesExposure(csn, whatsMyServiceName, requestedServiceNames, fallBackS
     forEachGeneric(csn, 'vocabularies', (def, defName, _propertyName, path) => {
       const serviceName = whatsMyServiceName(defName, false);
       if (serviceName && requestedServiceNames.includes(serviceName)) {
-        if(csn.definitions[defName]) {
-          error('odata-definition-exists', ['vocabularies', defName], { anno: defName, '#':'anno' });
+        if (csn.definitions[defName]) {
+          error('odata-duplicate-definition', [ 'vocabularies', defName ], { anno: defName, '#': 'anno' });
         }
         else {
           // link def into definitions for later use
@@ -403,7 +403,7 @@ function typesExposure(csn, whatsMyServiceName, requestedServiceNames, fallBackS
               cloned.cardinality = {};
             cloned.cardinality.min = 1;
           }
-          // if odata-spec-violation-key-null is checking on min>1, this can
+          // if odata-unexpected-nullable-key is checking on min>1, this can
           // be an else if
           if(cloned.notNull === undefined)
             cloned.notNull = true;

package/lib/transform/transformUtils.js

@@ -28,7 +28,6 @@ function getTransformers(model, options, msgFunctions, pathDelimiter = '_') {
   const {
     getCsnDef,
     getFinalTypeInfo,
-    hasAnnotationValue,
     inspectRef,
     isStructured,
     effectiveType,
@@ -731,16 +730,13 @@ function getTransformers(model, options, msgFunctions, pathDelimiter = '_') {
    */
   function extractValidFromToKeyElement(element, path) {
     const validFroms = [], validTos = [], validKeys = [];
-    if (hasAnnotationValue(element, '@cds.valid.from')) {
+    if (element['@cds.valid.from'])
       validFroms.push({ element, path: [...path] });
-    }
-    if (hasAnnotationValue(element, '@cds.valid.to')) {
+    if (element['@cds.valid.to'])
       validTos.push({ element, path: [...path] });
-    }
-    if (hasAnnotationValue(element, '@cds.valid.key')) {
+    if (element['@cds.valid.key'])
       validKeys.push({ element, path: [...path] });
-    }
-    return [validFroms, validTos, validKeys];
+    return [ validFroms, validTos, validKeys ];
   }
 
   /**

package/lib/transform/translateAssocsToJoins.js

@@ -609,7 +609,7 @@ function translateAssocsToJoins(model, inputOptions = {})
         // TODO: why inner "parenthesise" - comparison in `and`?
         return parenthesise((args.length > 1 ? { op: { val: 'and' }, args: [ ...args.map(parenthesise) ] } : args[0] ));
       }
-      else {
+      else if (assoc.on) {
         if(env.assocStack === undefined) {
           env.assocStack = [];
           env.assocStack.head = function() {
@@ -655,13 +655,19 @@ function translateAssocsToJoins(model, inputOptions = {})
               }
             }
             return path;
-          }
+          };
         }
-
         env.assocStack.push(assoc);
         const onCond = cloneOnCondition(assoc.on);
         env.assocStack.pop();
         return compareTenants ? addTenantComparison(assoc, onCond) : onCond;
+
+      } else if (!hasPersistenceSkipAnnotation(assoc._main)) {
+        // TODO: exclude non-persisted entities from SQL generation; they may have
+        //       to-many associations without foreign keys nor ON-condition.
+        throw new CompilerAssertion(`Association must have either ON-condition or foreign keys: ${assoc.name.id} at ${JSON.stringify(assoc.location)}`);
+      } else {
+        return null;
       }
 
       // Add tenant comparison
@@ -716,10 +722,7 @@ function translateAssocsToJoins(model, inputOptions = {})
             {
               //env.assocStack.includes(fwdAssoc) => recursion
               if(env.assocStack.length === 2) {
-                // reuse (ugly) error message from forHana
-                error(null, [env.assocStack[0].location,env.assocStack[0]],
-                  { name: '$self', id: '$self' },
-                  'An association that uses $(NAME) in its ON-condition can\'t be compared to $(ID)');
+                error('type-invalid-self', [env.assocStack[0].location, env.assocStack[0]], { name: '$self' });
                 // don't check these paths again
                 args[i].$check = args[i+2].$check = false;
               }
@@ -1950,4 +1953,8 @@ function annotationVal( anno ) {
   return anno && (anno.val === undefined || anno.val);
 }
 
+function hasPersistenceSkipAnnotation( art ) {
+  return art?.['@cds.persistence.skip']?.val && art['@cds.persistence.skip'].val !== 'if-unused';
+}
+
 module.exports = { translateAssocsToJoinsCSN };

package/lib/transform/universalCsn/universalCsnEnricher.js

@@ -34,7 +34,7 @@ module.exports = (csn, options) => {
     // Example: `type E : F;` does not have `elements`, but they are required for e.g. OData.
     elements: onlyTypeDef,
     type: always,
-    doc: nullStopsPropagation,
+    doc: options.propagateDocComments ? nullStopsPropagation : null,
     length: always,
     precision: always,
     scale: always,
@@ -529,8 +529,14 @@ module.exports = (csn, options) => {
    * @param {CSN.Element} member
    */
   function calculateForeignKeys( member ) {
-    // managed assocs in universal CSN have no longer keys
-    // if they are not explicitly defined - PR#8064
+    // Managed assocs in universal CSN have don't have 'keys'
+    // if they are not explicitly defined - PR#8064.
+
+    // Beware that since cds-compiler v6, managed _to-many_ associations don't get 'keys'.
+    const max = member.cardinality?.max ?? 1;
+    if (typeof max !== 'number' || max > 1)
+      return; // to-many assoc
+
     const target = artifactRef(member.target);
     const targetKeys = Object.keys(target.elements).filter(key => target.elements[key].key);
     member.keys = targetKeys.map(
@@ -582,7 +588,7 @@ module.exports = (csn, options) => {
    * @param {CSN.Artifact} rootArtifact The artifact that had the localized
    */
   function attachAnnosForTextsTable( parent, rootArtifact ) {
-    const isFioriDraftEnabled = rootArtifact && (rootArtifact['@fiori.draft.enabled'] === true || getOriginChain(rootArtifact).some(({ origin }) => origin['@fiori.draft.enabled'] === true));
+    const isFioriDraftEnabled = rootArtifact && (rootArtifact['@fiori.draft.enabled'] || getOriginChain(rootArtifact).some(({ origin }) => origin['@fiori.draft.enabled']));
     if (isFioriDraftEnabled) {
       setAnnotationIfNotDefined(parent, '@assert.unique.locale', [ { '=': 'locale' } ]);
       forEach(rootArtifact.elements, (name, element) => {

package/lib/utils/objectUtils.js

@@ -13,22 +13,6 @@ function copyPropIfExist( sourceObj, property, targetObj ) {
     targetObj[property] = sourceObj[property];
 }
 
-/**
- * Takes an object and creates a dictionary out of it.
- * This avoids cases where e.g. properties named "toString" are interpreted
- * as JS internal functions.
- *
- * @param {object} obj Object with prototype.
- * @return {object} Object without prototype, i.e. a dict.
- */
-function createDict( obj ) {
-  const dict = Object.create(null);
-  const keys = Object.keys(obj);
-  for (const key of keys)
-    dict[key] = obj[key];
-  return dict;
-}
-
 /**
  * Loops over all elements in an object and calls the specified callback(key,obj)
  *
@@ -97,7 +81,6 @@ function hasNonEnumerable( object, propertyName ) {
 
 module.exports = {
   copyPropIfExist,
-  createDict,
   forEach,
   forEachValue,
   forEachKey,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds-compiler",
-  "version": "5.9.4",
+  "version": "6.0.12",
   "description": "CDS (Core Data Services) compiler and backends",
   "homepage": "https://cap.cloud.sap/",
   "author": "SAP SE (https://www.sap.com)",
@@ -14,11 +14,13 @@
   "main": "lib/main.js",
   "types": "lib/main.d.ts",
   "scripts": {
-    "download": "node scripts/downloadANTLR.js",
-    "gen": "node ./scripts/build.js && node scripts/genGrammarChecksum.js && node ./redepage/bin/redepage --compile lib/gen/CdlParser.js --copy-base-parser lib/parsers/CdlGrammar.g4",
+    "download": "exit 0",
+    "gen": "npm run rdpg",
+    "rdpg": "node ./redepage/bin/redepage --compile lib/gen/CdlParser.js --copy-base-parser lib/parsers/CdlGrammar.g4 && node scripts/genGrammarChecksum.js",
     "xmakeAfterInstall": "npm run gen",
     "xmakePrepareRelease": "echo \"$(node scripts/stripReadme.js README.md)\" > README.md && node scripts/assertSnapshotVersioning.js && node scripts/assertChangelog.js && node scripts/cleanup.js --remove-dev",
-    "test": "npm run test:piper",
+    "test": "node scripts/xmakeTestDispatcher.js",
+    "test:xmake": "npm run test3 -- --topic=Drafts --test=CalculatedElements",
     "test:ci": "node scripts/verifyGrammarChecksum.js && mocha --timeout 10000 --reporter-option maxDiffSize=0 scripts/testLazyLoading.js && mocha --parallel --reporter-option maxDiffSize=0 test/ test3/",
     "test:piper": "node scripts/verifyGrammarChecksum.js && npm run coverage:piper",
     "test3": "node scripts/verifyGrammarChecksum.js && mocha --reporter-option maxDiffSize=0 test3/",
@@ -33,7 +35,8 @@
     "gentest3": "cross-env MAKEREFS=${MAKEREFS:-'true'} mocha --reporter-option maxDiffSize=0 test3/testRefFiles.js",
     "coverage": "cross-env nyc mocha --reporter-option maxDiffSize=0 test/ test3/testRefFiles.js && nyc report --reporter=lcov",
     "coverage:piper": "cross-env nyc mocha --reporter test/TestMochaReporter.js --reporter-options mochaFile=./coverage/TEST-results.xml --reporter-option maxDiffSize=0 --timeout 10000 test/ test3/ && nyc report --reporter=cobertura && nyc report --reporter=lcov",
-    "lint": "eslint bin/ benchmark/ lib/ test/ test3/ scripts/ && node scripts/linter/lintGrammar.js && node scripts/linter/lintTests.js test3/ && node scripts/linter/lintMessages.js && node scripts/linter/lintMessageIdCoverage.js lib/ && markdownlint README.md CHANGELOG.md doc/ internalDoc/ && cd share/messages && markdownlint . && cd ../../ && node scripts/check-changelog.js",
+    "lint": "eslint bin/ benchmark/ lib/ test/ test3/ scripts/ && node scripts/linter/lintConstants.js && node scripts/linter/lintGrammar.js && node scripts/linter/lintTests.js test3/ && node scripts/linter/lintMessages.js && node scripts/linter/lintMessageIdCoverage.js lib/ && markdownlint README.md CHANGELOG.md doc/ internalDoc/ && cd share/messages && markdownlint . && cd ../../ && node scripts/check-changelog.js",
+    "lint:edmx": "node scripts/odata/lint-edmx-v4.js",
     "tslint": "tsc --pretty -p .",
     "updateVocs": "node scripts/odataAnnotations/generateDictMain.js && npm run generateAllRefs",
     "updateTocs": "node scripts/update-toc.js",
@@ -51,20 +54,14 @@
   "keywords": [
     "CDS"
   ],
-  "dependencies": {
-    "antlr4": "4.9.3"
-  },
   "files": [
     "bin",
     "lib",
     "doc",
     "share",
-    "package.json",
-    "README.md",
-    "CHANGELOG.md",
-    "LICENSE"
+    "CHANGELOG.md"
   ],
   "engines": {
-    "node": ">=18"
+    "node": ">=20"
   }
 }

package/share/messages/def-upcoming-virtual-change.md

@@ -21,7 +21,7 @@ entity Proj as projection on Source {
 In `@sap/cds-compiler` v5 and earlier, element `Proj:a` is a reference
 to element `Source:a`, which was marked virtual.
 
-In `@sap/cds-compiler` v6 and later, it will instead of a _new_ element,
+In `@sap/cds-compiler` v6 and later, it will instead be a _new_ element,
 without any reference to `Source:a`.
 
 This may or may not affect your runtime coding, hence the warning.

package/LICENSE

@@ -1,37 +0,0 @@
-SAP DEVELOPER LICENSE AGREEMENT
-
-Version 3.1
-
-Please scroll down and read the following Developer License Agreement carefully ("Developer Agreement").  By clicking "I Accept" or by attempting to download, or install, or use the SAP software and other materials that accompany this Developer Agreement ("SAP Materials"), You agree that this Developer Agreement forms a legally binding agreement between You ("You" or "Your") and SAP SE, for and on behalf of itself and its subsidiaries and affiliates (as defined in Section 15 of the German Stock Corporation Act) and You agree to be bound by all of the terms and conditions stated in this Developer Agreement. If You are trying to access or download the SAP Materials on behalf of Your employer or as a consultant or agent of a third party (either "Your Company"), You represent and warrant that You have the authority to act on behalf of and bind Your Company to the terms of this Developer Agreement and everywhere in this Developer Agreement that refers to 'You' or 'Your' shall also include Your Company. If You do not agree to these terms, do not click "I Accept", and do not attempt to access or use the SAP Materials.
-
-1.  LICENSE: SAP grants You a non-exclusive, non-transferable, non-sublicensable, revocable, limited use license to copy, reproduce and distribute the application programming interfaces ("API"), documentation, plug-ins, templates, scripts and sample code ("Tools") on a desktop, laptop, tablet, smart phone, or other appropriate computer device that You own or control (any, a "Computer") to create new applications ("Customer Applications"). You agree that the Customer Applications will not: (a) unreasonably impair, degrade or reduce the performance or security of any SAP software applications, services or related technology ("Software"); (b) enable the bypassing or circumventing of SAP's license restrictions and/or provide users with access to the Software to which such users are not licensed; (c) render or provide, without prior written consent from SAP, any information concerning SAP software license terms, Software, or any other information related to SAP products; or (d) permit mass data extraction from an SAP product to a non-SAP product, including use, modification, saving or other processing of such data in the non-SAP product. In exchange for the right to develop Customer Applications under this Agreement, You covenant not to assert any Intellectual Property Rights in Customer Applications created by You against any SAP product, service, or future SAP development.
-
-2.  INTELLECTUAL PROPERTY: (a) SAP or its licensors retain all ownership and intellectual property rights in the APIs, Tools and Software. You may not: a) remove or modify any marks or proprietary notices of SAP, b) provide or make the APIs, Tools or Software available to any third party, c) assign this Developer Agreement or give or transfer the APIs, Tools or Software or an interest in them to another individual or entity, d) decompile, disassemble or reverse engineer (except to the extent permitted by applicable law) the APIs Tools or Software, (e) create derivative works of or based on the APIs, Tools or Software, (f) use any SAP name, trademark or logo, or (g) use the APIs or Tools to modify existing Software or other SAP product functionality or to access the Software or other SAP products' source code or metadata.
-(b) Subject to SAP's underlying rights in any part of the APIs, Tools or Software, You retain all ownership and intellectual property rights in Your Customer Applications.
-
-3. FREE AND OPEN SOURCE COMPONENTS: The SAP Materials may include certain third party free or open source components ("FOSS Components"). You may have additional rights in such FOSS Components that are provided by the third party licensors of those components.
-
-4. THIRD PARTY DEPENDENCIES: The SAP Materials may require certain third party software dependencies ("Dependencies") for the use or operation of such SAP Materials. These dependencies may be identified by SAP in Maven POM files, product documentation or by other means. SAP does not grant You any rights in or to such Dependencies under this Developer Agreement. You are solely responsible for the acquisition, installation and use of Dependencies. SAP DOES NOT MAKE ANY REPRESENTATIONS OR WARRANTIES IN RESPECT OF DEPENDENCIES, INCLUDING BUT NOT LIMITED TO IMPLIED WARRANTIES OF MERCHANTABILITY AND OF FITNESS FOR A PARTICULAR PURPOSE. IN PARTICULAR, SAP DOES NOT WARRANT THAT DEPENDENCIES WILL BE AVAILABLE, ERROR FREE, INTEROPERABLE WITH THE SAP MATERIALS, SUITABLE FOR ANY PARTICULAR PURPOSE OR NON-INFRINGING.  YOU ASSUME ALL RISKS ASSOCIATED WITH THE USE OF DEPENDENCIES, INCLUDING WITHOUT LIMITATION RISKS RELATING TO QUALITY, AVAILABILITY, PERFORMANCE, DATA LOSS, UTILITY IN A PRODUCTION ENVIRONMENT, AND NON-INFRINGEMENT. IN NO EVENT WILL SAP BE LIABLE DIRECTLY OR INDIRECTLY IN RESPECT OF ANY USE OF DEPENDENCIES BY YOU.
-
-
-5.  WARRANTY:
-a)  If You are located outside the US or Canada: AS THE API AND TOOLS ARE PROVIDED TO YOU FREE OF CHARGE, SAP DOES NOT GUARANTEE OR WARRANT ANY FEATURES OR QUALITIES OF THE TOOLS OR API OR GIVE ANY UNDERTAKING WITH REGARD TO ANY OTHER QUALITY. NO SUCH WARRANTY OR UNDERTAKING SHALL BE IMPLIED BY YOU FROM ANY DESCRIPTION IN THE API OR TOOLS OR ANY AVAILABLE DOCUMENTATION OR ANY OTHER COMMUNICATION OR ADVERTISEMENT. IN PARTICULAR, SAP DOES NOT WARRANT THAT THE SOFTWARE WILL BE AVAILABLE UNINTERRUPTED, ERROR FREE, OR PERMANENTLY AVAILABLE.  FOR THE TOOLS AND API ALL WARRANTY CLAIMS ARE SUBJECT TO THE LIMITATION OF LIABILITY STIPULATED IN SECTION 4 BELOW.
-b)  If You are located in the US or Canada: THE API AND TOOLS ARE LICENSED TO YOU "AS IS", WITHOUT ANY WARRANTY, ESCROW, TRAINING, MAINTENANCE, OR SERVICE OBLIGATIONS WHATSOEVER ON THE PART OF SAP. SAP MAKES NO EXPRESS OR IMPLIED WARRANTIES OR CONDITIONS OF SALE OF ANY TYPE WHATSOEVER, INCLUDING BUT NOT LIMITED TO IMPLIED WARRANTIES OF MERCHANTABILITY AND OF FITNESS FOR A PARTICULAR PURPOSE. IN PARTICULAR, SAP DOES NOT WARRANT THAT THE SOFTWARE WILL BE AVAILABLE UNINTERRUPTED, ERROR FREE, OR PERMANENTLY AVAILABLE.  YOU ASSUME ALL RISKS ASSOCIATED WITH THE USE OF THE API AND TOOLS, INCLUDING WITHOUT LIMITATION RISKS RELATING TO QUALITY, AVAILABILITY, PERFORMANCE, DATA LOSS, AND UTILITY IN A PRODUCTION ENVIRONMENT.
-
-6.  LIMITATION OF LIABILITY:
-a)  If You are located outside the US or Canada: IRRESPECTIVE OF THE LEGAL REASONS, SAP SHALL ONLY BE LIABLE FOR DAMAGES UNDER THIS AGREEMENT IF SUCH DAMAGE (I) CAN BE CLAIMED UNDER THE GERMAN PRODUCT LIABILITY ACT OR (II) IS CAUSED BY INTENTIONAL MISCONDUCT OF SAP OR (III) CONSISTS OF PERSONAL INJURY. IN ALL OTHER CASES, NEITHER SAP NOR ITS EMPLOYEES, AGENTS AND SUBCONTRACTORS SHALL BE LIABLE FOR ANY KIND OF DAMAGE OR CLAIMS HEREUNDER.
-b)  If You are located in the US or Canada: IN NO EVENT SHALL SAP BE LIABLE TO YOU, YOUR COMPANY OR TO ANY THIRD PARTY FOR ANY DAMAGES IN AN AMOUNT IN EXCESS OF $100 ARISING IN CONNECTION WITH YOUR USE OF OR INABILITY TO USE THE TOOLS OR API OR IN CONNECTION WITH SAP'S PROVISION OF OR FAILURE TO PROVIDE SERVICES PERTAINING TO THE TOOLS OR API, OR AS A RESULT OF ANY DEFECT IN THE API OR TOOLS. THIS DISCLAIMER OF LIABILITY SHALL APPLY REGARDLESS OF THE FORM OF ACTION THAT MAY BE BROUGHT AGAINST SAP, WHETHER IN CONTRACT OR TORT, INCLUDING WITHOUT LIMITATION ANY ACTION FOR NEGLIGENCE. YOUR SOLE REMEDY IN THE EVENT OF BREACH OF THIS DEVELOPER AGREEMENT BY SAP OR FOR ANY OTHER CLAIM RELATED TO THE API OR TOOLS SHALL BE TERMINATION OF THIS AGREEMENT. NOTWITHSTANDING ANYTHING TO THE CONTRARY HEREIN, UNDER NO CIRCUMSTANCES SHALL SAP AND ITS LICENSORS BE LIABLE TO YOU OR ANY OTHER PERSON OR ENTITY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, OR INDIRECT DAMAGES, LOSS OF GOOD WILL OR BUSINESS PROFITS, WORK STOPPAGE, DATA LOSS, COMPUTER FAILURE OR MALFUNCTION, ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSS, OR EXEMPLARY OR PUNITIVE DAMAGES.
-
-7.  INDEMNITY: You will fully indemnify, hold harmless and defend SAP against law suits based on any claim: (a) that any Customer Application created by You infringes or misappropriates any patent, copyright, trademark, trade secrets, or other proprietary rights of a third party, or (b) related to Your alleged violation of the terms of this Developer Agreement.
-
-8.  EXPORT: The Tools and API are subject to German, EU and US export control regulations. You confirm that: a) You will not use the Tools or API for, and will not allow the Tools or API to be used for, any purposes prohibited by German, EU and US law, including, without limitation, for the development, design, manufacture or production of nuclear, chemical or biological weapons of mass destruction; b) You are not located in Cuba, Iran, Sudan, Iraq, North Korea, Syria, nor any other country to which the United States has prohibited export or that has been designated by the U.S. Government as a "terrorist supporting" country (any, an "US Embargoed Country"); c) You are not a citizen, national or resident of, and are not under the control of, a US Embargoed Country; d) You will not download or otherwise export or re-export the API or Tools, directly or indirectly, to a US Embargoed Country nor to citizens, nationals or residents of a US Embargoed Country; e) You are not listed on the United States Department of Treasury lists of Specially Designated Nationals, Specially Designated Terrorists, and Specially Designated Narcotic Traffickers, nor listed on the United States Department of Commerce Table of Denial Orders or any other U.S. government list of prohibited or restricted parties and f) You will not download or otherwise export or re-export the API or Tools , directly or indirectly, to persons on the above-mentioned lists.
-
-9.  SUPPORT: Other than what is made available on the SAP Community Website (SCN) by SAP at its sole discretion and by SCN members, SAP does not offer support for the API or Tools which are the subject of this Developer Agreement.
-
-10.  TERM AND TERMINATION: You may terminate this Developer Agreement by destroying all copies of the API and Tools on Your Computer(s). SAP may terminate Your license to use the API and Tools immediately if You fail to comply with any of the terms of this Developer Agreement, or, for SAP's convenience by providing you with ten (10) day's written notice of termination (including email). In case of termination or expiration of this Developer Agreement, You must destroy all copies of the API and Tools immediately.  In the event Your Company or any of the intellectual property you create using the API, Tools or Software are acquired (by merger, purchase of stock, assets or intellectual property or exclusive license), or You become employed, by a direct competitor of SAP, then this Development Agreement and all licenses granted in this Developer Agreement shall immediately terminate upon the date of such acquisition.
-
-11.  LAW/VENUE:
-a)  If You are located outside the US or Canada: This Developer Agreement is governed by and construed in accordance with the laws of the Germany. You and SAP agree to submit to the exclusive jurisdiction of, and venue in, the courts of Karlsruhe in Germany in any dispute arising out of or relating to this Developer Agreement.
-b)  If You are located in the US or Canada: This Developer Agreement shall be governed by and construed under the Commonwealth of Pennsylvania law without reference to its conflicts of law principles. In the event of any conflicts between foreign law, rules, and regulations, and United States of America law, rules, and regulations, United States of America law, rules, and regulations shall prevail and govern. The United Nations Convention on Contracts for the International Sale of Goods shall not apply to this Developer Agreement. The Uniform Computer Information Transactions Act as enacted shall not apply.
-
-12. MISCELLANEOUS: This Developer Agreement is the complete agreement for the API and Tools licensed (including reference to information/documentation contained in a URL). This Developer Agreement supersedes all prior or contemporaneous agreements or representations with regards to the subject matter of this Developer Agreement. If any term of this Developer Agreement is found to be invalid or unenforceable, the surviving provisions shall remain effective. SAP's failure to enforce any right or provisions stipulated in this Developer Agreement will not constitute a waiver of such provision, or any other provision of this Developer Agreement.