@sap/cds-compiler 6.8.0 → 6.9.1

package/lib/render/toCdl.js

@@ -675,41 +675,60 @@ class CsnToCdl {
 
     // If there is nothing to extend, e.g. only annotations, don't render an
     // empty element list.  This would end up in diffs with parseCdl CSN.
-    if (!ext.elements && !ext.columns && !ext.actions && !ext.enum) {
+    if (!ext.elements && !ext.columns && !ext.actions && !ext.enum &&
+        !ext.where && !ext.groupBy && !ext.having && !ext.orderBy && !ext.limit) {
       result += `${ env.indent }extend ${ extName };\n`;
       return result;
     }
 
-    // We have the "old-style" prefix syntax and the "new-style" postfix "with <type>" syntax.
-    // The former one can not only extend (sub-)elements but also actions in the same statement whereas
-    // the latter cannot.
-    // If there are actions, check if there are also elements/columns, and if so, use the prefix notation.
-    const usePrefixNotation = ext.actions && (ext.columns || ext.elements);
-    if (usePrefixNotation)
-      result += `${ env.indent }extend ${ this.getExtendPrefixVariant(ext) } ${ extName } with {\n`;
-    else
-      result += `${ env.indent }extend ${ extName } with ${ this.getExtendPostfixVariant(ext) }{\n`;
+    if (ext.elements || ext.columns || ext.actions || ext.enum) {
+      // We have the "old-style" prefix syntax and the "new-style" postfix "with <type>" syntax.
+      // The former one can not only extend (sub-)elements but also actions in the same statement whereas
+      // the latter cannot.
+      // If there are actions, check if there are also elements/columns, and if so, use the prefix notation.
+      const usePrefixNotation = ext.actions && (ext.columns || ext.elements);
+      if (usePrefixNotation)
+        result += `${ env.indent }extend ${ this.getExtendPrefixVariant(ext) } ${ extName } with {\n`;
+      else
+        result += `${ env.indent }extend ${ extName } with ${ this.getExtendPostfixVariant(ext) }{\n`;
 
-    if (ext.columns)
-      result += this.renderViewColumns(ext, env.withIncreasedIndent());
+      if (ext.columns)
+        result += this.renderViewColumns(ext, env.withIncreasedIndent());
 
-    else if (ext.elements || ext.enum)
-      result += this.renderExtendStatementElements(ext, env);
+      else if (ext.elements || ext.enum)
+        result += this.renderExtendStatementElements(ext, env);
 
-    // Not part of if/else cascade, because it may be in postfix notation.
-    if (ext.actions) {
-      const childEnv = env.withIncreasedIndent();
-      let actions = '';
-      forEach(ext.actions, (actionName, action) => {
-        actions += this.renderActionOrFunction(actionName, action, childEnv.withSubPath([ 'actions', actionName ]), true);
-      });
-      if (!usePrefixNotation)
-        result += actions;
-      else if (actions !== '')
-        result += `${ env.indent }} actions {\n${ actions }`;
+      // Not part of if/else cascade, because it may be in postfix notation.
+      if (ext.actions) {
+        const childEnv = env.withIncreasedIndent();
+        let actions = '';
+        forEach(ext.actions, (actionName, action) => {
+          actions += this.renderActionOrFunction(actionName, action, childEnv.withSubPath([ 'actions', actionName ]), true);
+        });
+        if (!usePrefixNotation)
+          result += actions;
+        else if (actions !== '')
+          result += `${ env.indent }} actions {\n${ actions }`;
+      }
+
+      result += `${ env.indent }}`;
+    }
+    else {
+      result += `${ env.indent }extend ${ extName } with`;
     }
 
-    result += `${ env.indent }};\n`;
+    if (ext.where)
+      result += ` where ${ this.exprRenderer.renderExpr(ext.where, env.withSubPath([ 'where' ])) }`;
+    if (ext.groupBy)
+      result += ` group by ${ ext.groupBy.map((expr, i) => this.exprRenderer.renderExpr(expr, env.withSubPath([ 'groupBy', i ]))).join(', ') }`;
+    if (ext.having)
+      result += ` having ${ this.exprRenderer.renderExpr(ext.having, env.withSubPath([ 'having' ])) }`;
+    if (ext.orderBy)
+      result += ` order by ${ ext.orderBy.map((entry, i) => this.renderOrderByEntry(entry, env.withSubPath([ 'orderBy', i ]))).join(', ') }`;
+    if (ext.limit)
+      result += ` ${ this.renderLimit(ext.limit, env.withSubPath([ 'limit' ])) }`;
+
+    result += ';\n';
     return result;
   }
 
@@ -1997,7 +2016,7 @@ class CsnToCdl {
         return `#${ annoValue['#'] }`;
       }
       // Shorthand for absolute path (as string)
-      else if (annoValue['='] !== undefined) {
+      else if (typeof annoValue['='] === 'string') {
         if (annoValue['='].startsWith('@'))
           return this.quoteAnnotationPathIfRequired(annoValue['='], env);
         return this.quotePathIfRequired(annoValue['='], env);

package/lib/render/toSql.js

@@ -1422,6 +1422,15 @@ function toSqlDdl( csn, options, messageFunctions ) {
       if (isBuiltinType(elm.type)) {
         // cds.Integer => render as INTEGER (no quotes)
         result += renderBuiltinType(elm.type);
+
+        // On H2 & sqlite the underlying data type for a cds.Vector is a binary, needing a length.
+        // The data is stored as a vector of 4 byte real numbers with dimensions given by length. Additional 4 bytes are used to store the dimensions.
+        if (
+          elm.type === 'cds.Vector' && elm.length &&
+          (options.sqlDialect === 'h2' || options.sqlDialect === 'sqlite')
+        )
+          elm.length = elm.length * 4 + 4;
+
         result += renderTypeParameters(elm);
       }
       else {

package/lib/render/utils/common.js

@@ -294,7 +294,7 @@ const cdsToSqlTypes = {
     'cds.Binary': 'BINARY_BLOB',
     'cds.hana.BINARY': 'BINARY_BLOB',
     'cds.hana.SMALLDECIMAL': 'SMALLDECIMAL',
-    'cds.Vector': 'FLOAT32',
+    'cds.Vector': 'BLOB',
     'cds.Map': 'JSON_TEXT', // '_TEXT' suffix required for text affinity
   },
   plain: {
@@ -309,6 +309,7 @@ const cdsToSqlTypes = {
     'cds.DecimalFloat': 'DECFLOAT',
     'cds.DateTime': 'TIMESTAMP(0)',
     'cds.Timestamp': 'TIMESTAMP(7)',
+    'cds.Vector': 'VARBINARY',
     'cds.Map': 'JSON',
     'cds.UInt8': 'SMALLINT', // See #13870; not equivalent, but smallint can hold >byte
   },
@@ -320,7 +321,7 @@ const cdsToSqlTypes = {
     'cds.Binary': 'BYTEA',
     'cds.Double': 'FLOAT8',
     'cds.UInt8': 'SMALLINT', // See #13870; not equivalent, but smallint can hold >byte
-    'cds.Vector': 'VARCHAR', // Not supported; see #11725
+    'cds.Vector': 'VECTOR', // vector is the datatype for [pgvector](https://github.com/pgvector/pgvector?tab=readme-ov-file)
     'cds.Map': 'JSONB',
   },
 };

package/lib/tool-lib/enrichCsn.js

@@ -142,6 +142,7 @@ function enrichCsn( csn, options = {} ) {
       obj.forEach( (n, i) => assignment( obj, i, n ) );
     }
     else {
+      // TODO: check obj['='] is only String|true ?
       const record = !isAnnotationExpression( obj ) && assignment;
       // is record without `=` and other expression property
       for (const name of Object.getOwnPropertyNames( obj ) ) {

package/lib/transform/effective/flattening.js

@@ -4,9 +4,7 @@ const {
   forEachDefinition, forEachMemberRecursively, applyTransformationsOnNonDictionary, transformExpression, transformAnnotationExpression,
 } = require('../../model/csnUtils');
 const { getStructStepsFlattener } = require('../db/flattening');
-const { setProp } = require('../../utils/objectUtils');
-const { forEach } = require('../../utils/objectUtils');
-
+const { setProp, forEach } = require('../../utils/objectUtils');
 
 /**
  *
@@ -39,7 +37,7 @@ function flattenRefs(csn, options, csnUtils, messageFunctions) {
             .filter(pn => pn.startsWith('@') && element[pn])
             .forEach((anno) => {
               transformAnnotationExpression(element, anno, {
-                ref: absolutifier,
+                ref: (parent, prop, ref, path) => absolutifier(parent, prop, ref, path.at(-2) === 'where'),  // don't absolutify paths in filters
               }, []);
               if (element[anno].ref)
                 absolutifier(element[anno], 'ref', element[anno].ref);
@@ -105,7 +103,10 @@ function flattenRefs(csn, options, csnUtils, messageFunctions) {
 }
 
 function absolutifyPaths(prefix, cleanup) {
-  return function absolutify(_parent, _prop, ref) {
+  return function absolutify(_parent, _prop, ref, skip) {
+    if (typeof skip === 'boolean' && skip)
+      return false;
+
     if (ref[0].id || ref[0] !== '$self' && ref[0] !== '$projection' && !ref[0].startsWith('$') && !_parent.param) {
       _parent.ref = [ '$self', ...prefix, ...ref ];
       cleanup.push(_parent);

package/lib/transform/effective/main.js

@@ -153,6 +153,11 @@ function effectiveCsn( model, options, messageFunctions ) {
   messageFunctions.throwWithError();
   removeFeatureFlags(csn);
 
+  if (!options.testMode) {
+    csn.meta ??= {};
+    csn.meta.compilerCsnFlavor = 'effective';
+  }
+
   return csn;
 }
 

package/lib/transform/forOdata.js

@@ -16,6 +16,7 @@ const {
 const { checkCSNVersion } = require('../json/csnVersion');
 const validate = require('../checks/validator');
 const { timetrace } = require('../utils/timetrace');
+const shuffleGen = require('../utils/shuffle');
 const enrichUniversalCsn = require('./universalCsn/universalCsnEnricher');
 
 const { isArtifactInSomeService, isLocalizedArtifactInService } = require('./odata/utils');
@@ -32,7 +33,7 @@ const { addLocalizationViews } = require('./localized');
 const { cloneFullCsn } = require('../base/cloneCsn');
 const { csnRefs } = require('../base/csnRefs');
 const replaceForeignKeyRefsInExpressionAnnotations = require('./odata/foreignKeyRefsInXprAnnos');
-const { isAnnotationExpression, xprInAnnoProperties } = require('../base/builtins');
+const { isAnnotationExpression, primaryExprProperties } = require('../base/builtins');
 
 // Transformation for ODATA. Expects a CSN 'inputModel', processes it for ODATA.
 // The result should be suitable for consumption by EDMX processors (annotations and metadata)
@@ -123,6 +124,11 @@ function transform4odataWithCsn(inputModel, options, messageFunctions) {
   // @ts-ignore
   const isExternalServiceMember = (art, name) => !!(externalServices.includes(getServiceName(name)) || (art && art['@cds.external'] && art['@cds.external'] !== 2));
 
+  if (options.testMode && csn.definitions) {
+    const { shuffleDict } = shuffleGen(options.testMode);
+    csn.definitions = shuffleDict(csn.definitions);
+  }
+
   if (options.csnFlavor === 'universal' && isBetaEnabled(options, 'enableUniversalCsn'))
     enrichUniversalCsn(csn, options);
 
@@ -295,6 +301,12 @@ function transform4odataWithCsn(inputModel, options, messageFunctions) {
     // Resolve annotation shorthands for entities, types, annotations, ...
     renameShorthandAnnotations(def);
 
+    if ((def.kind === 'entity' || def.kind === 'aspect') &&
+        def['@readonly'] && isAnnotationExpression(def['@readonly'])) {
+      message('odata-unexpected-xpr-anno', [ 'definitions', defName, '@readonly' ],
+              { anno: '@readonly', kind: def.kind });
+    }
+
     // Generate annotations and fields needed for the Fiori Tree Views out of the @hierarchy annotation
     if (def['@hierarchy'])
       generateFioriTreeViewAnnotationsAndFields(def, defName, messageFunctions, csnUtils, transformers, options);
@@ -356,6 +368,11 @@ function transform4odataWithCsn(inputModel, options, messageFunctions) {
   if (isBetaEnabled(options, 'odataTerms'))
     forEachGeneric(csn, 'vocabularies', renameShorthandAnnotations);
 
+  if (!options.testMode) {
+    csn.meta ??= {};
+    csn.meta.compilerCsnFlavor = 'odata';
+  }
+
 
   cleanup();
   // Throw exception in case of errors
@@ -424,8 +441,9 @@ function transform4odataWithCsn(inputModel, options, messageFunctions) {
     }
 
     function getXprFromAnno(anno) {
-      const xprProp = xprInAnnoProperties.find(prop => anno[prop] !== undefined);
+      const xprProp = primaryExprProperties.find(prop => anno[prop] !== undefined);
       const constructResult = {
+        // TODO: expression property `param` not handled
         ref: () => {
           const result = { ref: anno.ref };
           if (anno.cast)

package/lib/transform/forRelationalDB.js

@@ -493,6 +493,11 @@ function transformForRelationalDBWithCsn(csn, options, messageFunctions) {
   redoProjections.forEach(fn => fn());
   removeFeatureFlags(csn);
 
+  if (!options.testMode) {
+    csn.meta ??= {};
+    csn.meta.compilerCsnFlavor = '$internal';
+  }
+
   timetrace.stop('Transform CSN');
   timetrace.stop('HANA transformation');
   return csn;
@@ -728,12 +733,11 @@ function transformForRelationalDBWithCsn(csn, options, messageFunctions) {
           break;
         }
         case 'cds.Vector': {
-          if (options.sqlDialect !== 'hana' && options.sqlDialect !== 'sqlite') {
+          if (options.sqlDialect === 'plain') {
             error('ref-unsupported-type', path, {
-              '#': 'hana',
+              '#': 'dialect',
               type: node.type,
-              value: 'hana',
-              othervalue: options.sqlDialect,
+              value: options.sqlDialect,
             });
           }
           else if (options.transformation === 'hdbcds') {

package/lib/transform/tupleExpansion.js

@@ -98,6 +98,10 @@ function tupleExpansion(csn, csnUtils, msgFunctions) {
 
     expr = expr.map((e, i) => expandStructurizedExpr(e, location.concat(i)));
 
+    // Handle `(list) in (...)` and `(list) not in (...)` - expand single-leafed structures in list
+    if (expr[0]?.list && (expr[1] === 'in' || (expr[1] === 'not' && expr[2] === 'in')))
+      return expandStructsInListIn(expr[0], expr, location) ?? expr;
+
     if (expr.length === 3 && typeof expr[1] === 'string') // also includes `<lhs> is null`
       return expandBinaryOp(expr[0], [ expr[1] ], expr[2], location) ?? expr;
 
@@ -111,6 +115,42 @@ function tupleExpansion(csn, csnUtils, msgFunctions) {
     return expr;
   }
 
+  /**
+   * Expands single-leafed structured elements and managed associations with a single key
+   * in `(list) in (...)` and `(list) not in (...)` expressions.
+   * If a structured element has more than one leaf, an error is emitted later during tupleExpansion.
+   *
+   * @param {object} listNode - The `{list: [...]}` node
+   * @param {Array} expr - The full expression array
+   * @param {CSN.Path} location
+   * @returns {Array|null} The (possibly modified) expr, or null on error.
+   */
+  function expandStructsInListIn(listNode, expr, location) {
+    const listLoc = location.concat(0, 'list');
+    const newItems = [];
+    for (let i = 0; i < listNode.list.length; i++) {
+      const item = listNode.list[i];
+      const art = item._art || (item.ref && enrichRef(item, listLoc.concat(i)));
+      if (!art || !isExpandable(art)) {
+        newItems.push(item);
+        continue;
+      }
+      // Expandable - try flattening to leaves
+      const paths = flattenPath(item, false, true);
+      if (paths.length === 1) {
+        // Single leaf - replace with the expanded scalar path
+        delete paths[0].comparisonRef;
+        newItems.push(paths[0]);
+      }
+      else {
+        // Multiple leaves - rejected later by rejectAnyDirectStructureReference
+        return null;
+      }
+    }
+    listNode.list = newItems;
+    return expr;
+  }
+
   /**
    * Expands the binary operation `lhs <op> rhs`, where `op` may be one or more tokens,
    * e.g. `is not` for `is not null`.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds-compiler",
-  "version": "6.8.0",
+  "version": "6.9.1",
   "description": "CDS (Core Data Services) compiler and backends",
   "homepage": "https://cap.cloud.sap/",
   "author": "SAP SE (https://www.sap.com)",
@@ -13,50 +13,13 @@
   },
   "main": "lib/main.js",
   "types": "lib/main.d.ts",
-  "scripts": {
-    "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/createCdlKeywordList.js && 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": "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/",
-    "testStandardDatabaseFunctions": "CDS_COMPILER_STANDARD_DB_FUNCTIONS=1 mocha --reporter-option maxDiffSize=0 test3/test.standard-database-functions.js",
-    "deployHanaSql": "CDS_COMPILER_DEPLOY_HANA=1 mocha --reporter-option maxDiffSize=0 test3/test.deploy.hana-sql.js",
-    "deployHdiHdbcds": "CDS_COMPILER_DEPLOY_HANA=1 mocha --reporter-option maxDiffSize=0 test3/test.deploy.hdi.hdbcds.js",
-    "deployHdi": "CDS_COMPILER_DEPLOY_HANA=1 mocha --reporter-option maxDiffSize=0 --extensions .hdi test3/test.deploy.hdi.hdbcds.js",
-    "deployHdbcds": "CDS_COMPILER_DEPLOY_HANA=1 mocha --reporter-option maxDiffSize=0 --extensions .hdbcds test3/test.deploy.hdi.hdbcds.js",
-    "deployGitDiffs": "CDS_COMPILER_DEPLOY_HANA=1 mocha --reporter-option maxDiffSize=0 test3/test.deploy.git-diffs.js",
-    "deployHdbcdsGitDiffs": "CDS_COMPILER_DEPLOY_HANA=1 mocha --reporter-option maxDiffSize=0 --extensions .hdbcds test3/test.deploy.git-diffs.js",
-    "deployHdiGitDiffs": "CDS_COMPILER_DEPLOY_HANA=1 mocha --reporter-option maxDiffSize=0 --extensions .hdi test3/test.deploy.git-diffs.js",
-    "gentest3": "cross-env MAKEREFS=${MAKEREFS:-'true'} mocha --reporter-option maxDiffSize=0 test3/testRefFiles.js",
-    "coverage": "cross-env npx nyc mocha --reporter-option maxDiffSize=0 test/ test3/testRefFiles.js && npx nyc report --reporter=lcov",
-    "coverage:piper": "cross-env npx nyc mocha --reporter test/TestMochaReporter.js --reporter-options mochaFile=./coverage/TEST-results.xml --reporter-option maxDiffSize=0 --timeout 10000 test/ test3/ && npx nyc report --reporter=lcov",
-    "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",
-    "generateCompilerRefs": "cross-env MAKEREFS='true' mocha test/testCompiler.js",
-    "generateMigrationRefs": "cross-env MAKEREFS='true' mocha test/test.to.migration.js",
-    "generateEdmRefs": "cross-env MAKEREFS='true' mocha test/testEdmPositive.js",
-    "generateForHanaRefs": "cross-env MAKEREFS='true' mocha test/testHanaTransformation.js",
-    "generateOdataRefs": "cross-env MAKEREFS='true' mocha test/testODataTransformation.js",
-    "generateOdataAnnoRefs": "cross-env MAKEREFS='true' mocha test/testODataAnnotations.js",
-    "generateToSqlRefs": "cross-env MAKEREFS='true' mocha test/testToSql.js",
-    "generateToRenameRefs": "cross-env MAKEREFS='true' mocha test/testToRename.js",
-    "generateDraftRefs": "cross-env MAKEREFS='true' mocha test/testDraft.js",
-    "generateAllRefs": "node scripts/verifyGrammarChecksum.js && cross-env MAKEREFS=force mocha --reporter-option maxDiffSize=0 test/ test3/"
-  },
   "keywords": [
     "CDS"
   ],
   "files": [
     "bin",
     "lib",
+    "!lib/parsers/CdlGrammar.g4",
     "doc",
     "share",
     "CHANGELOG.md"
@@ -64,4 +27,4 @@
   "engines": {
     "node": ">=20"
   }
-}
+}