@sap/cds-compiler 3.1.2 → 3.4.0

package/lib/inspect/inspectModelStatistics.js

@@ -14,7 +14,7 @@ function inspectModelStatistics(xsn, options) {
   let result = '';
 
   // Default color mode is 'auto'
-  const color = term(options.color || 'auto');
+  const color = term(options.color !== undefined ? options.color : 'auto');
 
   const defCount = countDefinitionKinds(xsn);
   const sources = {

package/lib/inspect/inspectPropagation.js

@@ -16,7 +16,7 @@ function inspectPropagation(xsn, options, artifactName) {
   const result = [];
 
   // Default color mode is 'auto'
-  const color = term(options.color || 'auto');
+  const color = term(options.color !== undefined ? options.color : 'auto');
 
   const path = stringRefToPath(artifactName);
   if (!path) {
@@ -121,19 +121,28 @@ function _inspectElements(artifactXsn) {
   const result = [];
   const elements = Object.keys(artifactXsn.elements);
 
-  let maxElemLength = 12;
-
   const inferredNiceOutput = {
     '*': 'wildcard',
-    'expand-element': 'expanded',
-    'expand-param': 'expanded',
     'aspect-composition': 'composition',
   };
 
+  let maxElemLength = 12;
+  let maxOriginLength = 6;
+
+  // type: assume max length 11 of 'composition'
+  // element: assume average length of 30, chosen randomly
+  result.push([
+    'type'.padStart(11),
+    'element'.padEnd(maxElemLength),
+    'origin'.padEnd(maxOriginLength),
+    'location (definition)',
+  ].join(' | '));
+
   for (const element of elements) {
     const elementXsn = artifactXsn.elements[element];
     const loc = locationString(_origin(elementXsn).name.location);
     let origin;
+    const originName = elementXsn._origin?.name?.absolute || '';
 
     if (elementXsn.$inferred) {
       // Use nice(r) output for known $inferred
@@ -151,11 +160,16 @@ function _inspectElements(artifactXsn) {
     }
 
     maxElemLength = Math.max(maxElemLength, element.length);
-
-    // origin: assume max length 11 of 'composition'
-    // element: assume average length of 30, chosen randomly
-    result.push([ origin.padStart(11), element.padEnd(maxElemLength), loc ].join(' | '));
+    maxOriginLength = Math.max(maxOriginLength, originName.length);
+
+    result.push([
+      origin.padStart(11),
+      element.padEnd(maxElemLength),
+      originName.padEnd(maxOriginLength),
+      loc,
+    ].join(' | '));
   }
+
   return result;
 }
 

package/lib/json/csnVersion.js

@@ -1,5 +1,6 @@
-// csn version functions
+'use strict';
 
+// csn version functions
 
 // The CSN file format version produced by this compiler
 // (Note that all 0.x.x versions are floating targets, i.e. the format is frequently
@@ -18,15 +19,12 @@
 // Use literal version constants intentionally and not number intervals to
 // record all published version strings of the core compiler.
 const newCSNVersions = [ '0.1.99', '0.2', '0.2.0', '1.0', '2.0' ];
-// checks if new-csn is requested via the options of already specified in the CSN
-// default: old-style
+
+// Check if new-style CSN is requested, i.e. versions >= 0.1.99
 function isNewCSN(csn, options) {
-  if ( (options && options.newCsn === false) ||
+  return !( options?.newCsn === false ||
         (csn.version && !newCSNVersions.includes(csn.version.csn)) ||
-        (csn.$version && !newCSNVersions.includes(csn.$version)))
-    return false;
-
-  return true;
+        (csn.$version && !newCSNVersions.includes(csn.$version)));
 }
 
 function checkCSNVersion(csn, options) {
@@ -35,11 +33,13 @@ function checkCSNVersion(csn, options) {
     const { makeMessageFunction } = require('../base/messages');
     const { error, throwWithAnyError } = makeMessageFunction(csn, options);
 
-    let errStr = 'CSN Version not supported, version tag: "';
-    errStr += `${ csn.version && csn.version.csn ? csn.version.csn : (csn.$version ? csn.$version : 'not available') }"`;
-    errStr += (options.newCsn !== undefined) ? `, options.newCsn: ${ options.newCsn }` : '';
-
-    error(null, null, errStr);
+    const version = csn.version?.csn ? csn.version.csn : (csn.$version || 'unknown');
+    const variant = options.newCsn !== undefined ? 'newCsn' : 'std';
+    error('api-unsupported-csn-version', null,
+          { '#': variant, version, code: options.newCsn }, {
+            std: 'CSN version $(VERSION) not supported',
+            newCsn: 'CSN version $(VERSION) not supported; options.newCsn: $(CODE)',
+          });
     throwWithAnyError();
   }
 }