@sap/cds-compiler 2.11.2 → 2.13.6

package/lib/json/from-csn.js

@@ -89,6 +89,8 @@
 
 const { dictAdd } = require('../base/dictionaries');
 
+const $location = Symbol.for('cds.$location');
+
 let inExtensions = null;
 
 let vocabInDefinitions = null;  // must be reset!
@@ -661,6 +663,9 @@ const schema = compileSchema( {
     ignore: true, type: ignore,
   },
   // TODO: should we keep $parens ?
+  $generated: {
+    type: string,
+  },
   $: { type: ignore, ignore: true }, // including $origin
   _: { type: ignore, ignore: true },
 } );
@@ -705,7 +710,7 @@ let csnFilename = '';
 let virtualLine = 1;
 /** @type {CSN.Location[]} */
 let dollarLocations = [];
-let arrayLvlCnt = 0;
+let arrayLevelCount = 0;
 
 /**
  * @param {Object.<string, SchemaSpec>} specs
@@ -931,8 +936,10 @@ function definition( def, spec, xsn, csn, name ) {
   popLocation( def );
   if (kind !== 'annotation' || prop === 'vocabularies')
     return r;
-  if (!vocabInDefinitions)
+  if (!vocabInDefinitions) {
     vocabInDefinitions = Object.create(null);
+    vocabInDefinitions[$location] = location();
+  }
   vocabInDefinitions[name] = r;     // deprecated: anno def in 'definitions'
   return undefined;
 
@@ -957,6 +964,7 @@ function dictionaryOf( elementFct ) {
       return ignore( dict );
     }
     const r = Object.create(null);
+    r[$location] = location();
     const allNames = Object.keys( dict );
     if (!allNames.length)
       return r;                   // {} in one JSON line
@@ -980,6 +988,7 @@ function keys( array, spec, xsn ) {
   if (!isArray( array, spec ))
     return;
   const r = Object.create(null);
+  r[$location] = location();
   ++virtualLine;
   for (const def of array) {
     const id = def.as || implicitName( def.ref );
@@ -1164,6 +1173,12 @@ function symbol( id, spec, xsn ) { // for CSN property '#'
   xsn.sym = { id, location: location() };
 }
 
+// returns: false = no "...", true = "..." without UP TO, 'upTo' = "..." with UP TO
+function isEllipsis( val ) {
+  return val && typeof val === 'object' && '...' in val && Object.keys(val).length === 1 &&
+    (val['...'] === true || 'upTo');
+}
+
 function annoValue( val, spec ) {
   if (val == null)              // TODO: reject undefined
     return { val, literal: 'null', location: location() };
@@ -1171,22 +1186,40 @@ function annoValue( val, spec ) {
   if (lit !== 'object')
     return { val, literal: lit, location: location() };
   if (Array.isArray( val )) {
-    const ec = val.reduce((c, v) => ((v && v['...'] && Object.keys(v).length === 1) ? ++c : c), 0);
-    if (arrayLvlCnt === 0 && ec > 1) {
-      error( 'syntax-csn-duplicate-ellipsis', location(true), { code: '...' },
-             'Expected no more than one $(CODE)' );
+    /** @type {string|boolean} */
+    let seenEllipsis = false;
+    if (arrayLevelCount > 0) {  // TODO: also inside structure (possible in CSN!)
+      if (val.some( isEllipsis )) {
+        error( 'syntax-csn-unexpected-ellipsis', location(true), { code: '...' },
+               'Unexpected $(CODE) in nested array' );
+      }
     }
-    if (arrayLvlCnt > 0 && ec > 0) {
-      error( 'syntax-csn-unexpected-ellipsis', location(true), { code: '...' },
-             'Unexpected $(CODE) in nested array' );
+    else {
+      for (const item of val) {
+        if (seenEllipsis !== true) {
+          seenEllipsis = isEllipsis( item ) || seenEllipsis;
+        }
+        else if (isEllipsis( item )) { // with or without UP TO
+          // error position at the beginning of the array, but that is fine
+          error( 'syntax-csn-duplicate-ellipsis', location(true), { code: '...' },
+                 'Expected no more than one $(CODE)' );
+          break;
+        }
+      }
     }
-    arrayLvlCnt++;
+    arrayLevelCount++;
     const retval = {
       location: location(),
       val: arrayOf( annoValue )( val, spec ),
       literal: 'array',
     };
-    arrayLvlCnt--;
+    arrayLevelCount--;
+    if (seenEllipsis === 'upTo') {
+      error( 'syntax-csn-expecting-ellipsis', location(true), // at closing bracket
+             { code: '... up to', newcode: '...' },
+             // TODO: should we be more CSN specific in the message?
+             'Expecting an array item $(NEWCODE) after an item with $(CODE)' );
+    }
     return retval;
   }
   if (typeof val['#'] === 'string') {
@@ -1205,12 +1238,19 @@ function annoValue( val, spec ) {
       return refSplit( val['='], '=' );
     }
   }
-  else if (val['...'] && Object.keys(val).length === 1) {
-    return {
+  else if (val['...'] && Object.keys( val ).length === 1) {
+    // TODO: only if not nested - see error above
+    ++virtualLine;
+    const ell = val['...'];
+    const r = {
       val: '...',
       literal: 'token',
       location: location(),
     };
+    if (ell !== true)
+      r.upTo = annoValue( ell, schema['@'] );
+    ++virtualLine;
+    return r;
   }
   const struct = Object.create(null);
   ++virtualLine;
@@ -1354,12 +1394,11 @@ function exprArgs( cond, spec, xsn, csn ) {
 
 function condition( cond, spec ) {
   const loc = location();
-  const x = {
+  return {
     op: { val: 'xpr', location: loc },
     args: exprArgs( cond, spec ),
     location: loc,
   };
-  return x;
 }
 
 function vZeroValue( obj, spec, xsn ) {
@@ -1406,6 +1445,7 @@ function excluding( array, spec, xsn ) {
   if (!isArray( array, spec ))
     return;
   const r = Object.create(null);
+  r[$location] = location();
   ++virtualLine;
   for (const ex of array) {
     const id = string( ex, spec ) || '';
@@ -1666,8 +1706,8 @@ function pushLocation( obj ) {
     error( 'syntax-csn-expected-object', location(true), { prop: '$location' } );
   }
   // hidden feature: string $location
-  const m = /:(\d+)(?::(\d+)(?:-[0-9-]+)?)?$/.exec( loc ); // extra - at end for .refloc
-  if (!m) {
+  const m = /:(\d+)(?::(\d+))?$/.exec( loc ); // extra '^'s at end deliberately left out
+  if (!m) {                     // without location or with '^'s: do not use
     dollarLocations.push( null );
   }
   else {
@@ -1710,8 +1750,10 @@ function toXsn( csn, filename, options, messageFunctions ) {
   csnFilename = filename;
   virtualLine = 1;
   dollarLocations = [];
+  arrayLevelCount = 0;
   inExtensions = null;
   vocabInDefinitions = null;
+
   const xsn = { $frontend: 'json' };
 
   // eslint-disable-next-line object-curly-newline