@sap/cds-compiler 6.3.6 → 6.4.2

package/lib/json/to-csn.js

@@ -31,7 +31,6 @@ const normalizedKind = {
 let gensrcFlavor = true;       // good enough here...
 let universalCsn = false;
 let strictMode = false;        // whether to dump with unknown properties (in standard)
-/** @type {boolean|string} */
 let withLocations = false;
 let withDocComments = false;
 let structXpr = false;
@@ -121,6 +120,7 @@ const transformers = {
   default: expression,
   targetElement,                // special display of foreign key
   value: enumValueOrCalc,       // do not list for select items as elements
+  $calc: enumValueOrCalc,
   query,
   elements,
   actions: sortedDict,          // TODO: just normal dictionary
@@ -253,7 +253,7 @@ function compactModel( model, options = model.options || {} ) {
     const loc = srcDict[first].location;
     if (loc && loc.file) {
       Object.defineProperty( csn, '$location', {
-        value: { file: loc.file }, configurable: true, writable: true, enumerable: !!withLocations,
+        value: { file: loc.file }, configurable: true, writable: true, enumerable: withLocations,
       } );
     }
     set( '$extra', csn, srcDict[first] );
@@ -612,7 +612,7 @@ function addLocation( loc, csn ) {
       val.endCol = loc.endCol;
     }
     Object.defineProperty( csn, '$location', {
-      value: val, configurable: true, writable: true, enumerable: !!withLocations,
+      value: val, configurable: true, writable: true, enumerable: withLocations,
     } );
   }
   return csn;
@@ -1165,19 +1165,22 @@ function targetElement( val, csn, node ) {
   Object.assign(csn, key);
 }
 
-function enumValueOrCalc( v, csn, node ) {
+function enumValueOrCalc( v, csn, node, prop ) {
   if (v.$inferred && (universalCsn || gensrcFlavor))
     return undefined;
   // Enum values in CSN are without outer `value: { … }`:
   if (node.kind === 'enum') {
     Object.assign( csn, expression( v ) );
   }
+  else if (v === true && prop === '$calc') {
+    return true;                // calculation has used non-projected elements
+  }
   // In XSN, there are combined elem/column objects: do not represent column
   // expression when presented as element in CSN
 
   // node.$syntax set in define.el(!), but not inside an `extend`, a _parent might
   // not be set always for parse-only, especially with CSN input
-  else if (node.$syntax === 'calc' ||
+  else if (node.$syntax === 'calc' || prop === '$calc' ||
            !node._parent || node._parent.kind === 'extend') {
     const stored = v.stored ? { stored: value(v.stored) } : {};
     return Object.assign( stored, expression( v ) );

package/lib/main.js

@@ -20,7 +20,7 @@ const { traceApi } = require('./api/trace');
 
 const snapi = lazyload('./api/main');
 const csnUtils = lazyload('./model/csnUtils');
-const model_api = lazyload('./model/api');
+const modelApi = lazyload('./model/api');
 const messages = lazyload('./base/messages');
 const sqlIdentifier = lazyload('./sql-identifier');
 const keywords = lazyload( './base/keywords' );
@@ -37,13 +37,15 @@ const lsp = lazyload('./compiler/lsp-api');
 const meta = lazyload('./base/meta');
 
 
-const toCsn = lazyload('./json/to-csn')
+const toCsn = lazyload('./json/to-csn');
 
 function parseCdl( cdlSource, filename, options = {} ) {
   options = Object.assign( {}, options, { parseCdl: true } );
   const sources = Object.create(null);
   /** @type {XSN.Model} */
-  const model = { sources, options, $functions: {}, $volatileFunctions: {} };
+  const model = {
+    sources, options, $functions: {}, $volatileFunctions: {},
+  };
   const messageFunctions = messages.createMessageFunctions( options, 'parse', model );
   model.$messageFunctions = messageFunctions;
 
@@ -73,7 +75,8 @@ function parseExpr( cdlSource, filename = '<expr>.cds', options = {} ) {
   return toCsn.compactExpr( xsn );
 }
 
-// FIXME: The implementation of those functions that delegate to 'backends' should probably move here
+// FIXME: The implementation of those functions that delegate to 'backends'
+//        should probably move here
 // ATTENTION: Keep in sync with main.d.ts!
 module.exports = {
   // Compiler
@@ -96,7 +99,7 @@ module.exports = {
       value: messages.CompilationError,
       writable: false,
       configurable: false,
-      enumerable: true
+      enumerable: true,
     });
     return messages.CompilationError;
   },
@@ -113,7 +116,7 @@ module.exports = {
       value: compiler.InvocationError,
       writable: false,
       configurable: false,
-      enumerable: false
+      enumerable: false,
     });
     return compiler.InvocationError;
   },
@@ -123,7 +126,7 @@ module.exports = {
   parse: {
     cdl: (...args) => parseCdl(...args),
     cql: (...args) => parseCql(...args),
-    expr: (...args) => parseExpr(...args)
+    expr: (...args) => parseExpr(...args),
   },
   // SNAPI
   for: {
@@ -143,13 +146,13 @@ module.exports = {
     sql: Object.assign((...args) => snapi.sql(...args), {
       migration: (...args) => snapi.sql.migration(...args),
       sqlite: {
-        keywords: Object.freeze([ ...keywords.sqlite ] )
+        keywords: Object.freeze([ ...keywords.sqlite ] ),
       },
       postgres: {
-        keywords: Object.freeze([ ...keywords.postgres ] )
+        keywords: Object.freeze([ ...keywords.postgres ] ),
       },
       h2: {
-        keywords: Object.freeze([ ...keywords.h2 ] )
+        keywords: Object.freeze([ ...keywords.h2 ] ),
       },
       smartId: (...args) => sqlIdentifier.smartId(...args),
       smartFunctionId: (...args) => sqlIdentifier.smartFuncId(...args),
@@ -163,13 +166,13 @@ module.exports = {
       keywords: Object.freeze([ ...keywords.hdbcds ] ),
     }),
     edm: Object.assign((...args) => snapi.edm(...args), {
-      all: (...args) => snapi.edm.all(...args)
+      all: (...args) => snapi.edm.all(...args),
     }),
     edmx: Object.assign((...args) => snapi.edmx(...args), {
-      all: (...args) => snapi.edmx.all(...args)
+      all: (...args) => snapi.edmx.all(...args),
     }),
     odata: Object.assign((...args) => snapi.odata2(...args), {
-      all: (...args) => snapi.odata2.all(...args)
+      all: (...args) => snapi.odata2.all(...args),
     }),
   },
   // Convenience for hdbtabledata calculation in @sap/cds
@@ -177,7 +180,7 @@ module.exports = {
   getElementCdsPersistenceName: (...args) => csnUtils.getElementDatabaseNameOf(...args),
 
   // Other API functions:
-  traverseCsn: (...args) => model_api.traverseCsn(...args),
+  traverseCsn: (...args) => modelApi.traverseCsn(...args),
 
   // INTERNAL functions for the cds-lsp package and friends - before you use
   // it, you MUST talk with us - there can be potential incompatibilities with
@@ -185,9 +188,9 @@ module.exports = {
   $lsp: {
     parse: (...args) => compiler.parseX(...args),
     compile: (...args) => compiler.compileX(...args),
-    getArtifactName: (art) => base.getArtifactName(art),
+    getArtifactName: art => base.getArtifactName(art),
     traverseSemanticTokens: (xsn, options) => lsp.traverseSemanticTokens(xsn, options),
-    getSemanticTokenOrigin: (obj) => lsp.getSemanticTokenOrigin(obj),
+    getSemanticTokenOrigin: obj => lsp.getSemanticTokenOrigin(obj),
   },
 
   // CSN Model related functionality