@sap/cds-compiler 6.7.2 → 6.8.0

package/lib/compiler/define.js

@@ -122,10 +122,10 @@
 
 const { weakLocation, builtinLocation } = require('../base/location');
 
-const shuffleGen = require('../base/shuffle');
+const shuffleGen = require('../utils/shuffle');
 const {
   dictAdd, dictAddArray, dictForEach, pushToDict,
-} = require('../base/dictionaries');
+} = require('./dictionaries');
 const { kindProperties } = require('./base');
 const {
   setLink,
@@ -724,6 +724,9 @@ function define( model ) {
       // ORDER BY and LIMIT to be evaluated in leading query
     }
     else { // with parse error (`select from <EOF>`, `select from E { *, ( select }`)
+      // TODO: call initQuery() anyway to avoid Error[expr-no-subquery] also for
+      // UNIONs (test3/Queries/DollarSelf/CorruptedSource.err.cds), see also
+      // resolveExprNode()
       return undefined;
     }
     return query._leadingQuery || query;

package/lib/{base → compiler}/dictionaries.js

@@ -2,6 +2,8 @@
 //
 // Warning: this is Core-compiler only stuff
 
+// TODO: probably move to some future lib/xsn/
+
 'use strict';
 
 // New-style duplicate representation - use the style below for artifacts and

package/lib/compiler/extend.js

@@ -4,8 +4,8 @@
 
 const { weakRefLocation } = require('../base/location');
 const { searchName } = require('../base/messages');
-const { isDeprecatedEnabled } = require('../base/model');
-const { dictAdd, pushToDict, dictForEach } = require('../base/dictionaries');
+const { isDeprecatedEnabled } = require('../base/specialOptions');
+const { dictAdd, pushToDict, dictForEach } = require('./dictionaries');
 const { kindProperties, dictKinds } = require('./base');
 const {
   setLink,

package/lib/compiler/generate.js

@@ -4,8 +4,8 @@
 
 /* eslint-disable no-nested-ternary */
 
-const { isDeprecatedEnabled } = require('../base/model');
-const { dictAdd } = require('../base/dictionaries');
+const { isDeprecatedEnabled } = require('../base/specialOptions');
+const { dictAdd } = require('./dictionaries');
 const {
   setLink,
   setArtifactLink,

package/lib/compiler/index.js

@@ -32,8 +32,8 @@ const check = require('./checks');
 
 const { Location, emptyWeakLocation } = require('../base/location');
 const { createMessageFunctions, deduplicateMessages } = require('../base/messages');
-const { checkRemovedDeprecatedFlags } = require('../base/model');
-const { promiseAllDoNotRejectImmediately } = require('../base/node-helpers');
+const { checkRemovedDeprecatedFlags } = require('../base/specialOptions');
+const { promiseAllDoNotRejectImmediately } = require('../utils/node-helpers');
 const { cdsFs, fileExtension } = require('../utils/file');
 
 const fs = require('fs');
@@ -504,6 +504,8 @@ function compileDoXSync( model ) {
   // TODO: think about making this work
 
   resolve( model );
+  if (options.$cdsReplSupport)
+    return model;
   tweakAssocs( model );
   assertConsistency( model );
   check( model );
@@ -554,9 +556,15 @@ async function compileDoX( model ) {
 
   model.definitions = model.$functions.shuffleDict( model.definitions );
   // Shuffling extensions is more difficult due to intra-file extensions of same artifact
+  // TODO: shuffle _before_ populate()
   // TODO: think about making this work
 
-  for (const phase of [ resolve, tweakAssocs, assertConsistency, check ]) {
+  resolve( model );
+  if (options.$cdsReplSupport)
+    return model;
+  await checkAsyncAbortFlag( options.abortSignal );
+
+  for (const phase of [ tweakAssocs, assertConsistency, check ]) {
     phase( model );
     // eslint-disable-next-line no-await-in-loop
     await checkAsyncAbortFlag( options.abortSignal );

package/lib/compiler/kick-start.js

@@ -4,7 +4,7 @@
 
 'use strict';
 
-const { isBetaEnabled } = require('../base/model');
+const { isBetaEnabled } = require('../base/specialOptions');
 const {
   setLink,
   annotationVal,

package/lib/compiler/populate.js

@@ -17,10 +17,10 @@
 
 'use strict';
 
-const { isDeprecatedEnabled } = require('../base/model');
+const { isDeprecatedEnabled } = require('../base/specialOptions');
 const {
   dictAdd, dictAddArray, dictFirst, dictForEach,
-} = require('../base/dictionaries');
+} = require('./dictionaries');
 const { weakLocation, weakRefLocation } = require('../base/location');
 const { CompilerAssertion } = require('../base/error');
 

package/lib/compiler/resolve.js

@@ -38,8 +38,8 @@
 
 'use strict';
 
-const { isDeprecatedEnabled } = require('../base/model');
-const { dictAdd } = require('../base/dictionaries');
+const { isDeprecatedEnabled } = require('../base/specialOptions');
+const { dictAdd } = require('./dictionaries');
 const { weakLocation } = require('../base/location');
 const { combinedLocation } = require('../base/location');
 const { typeParameters } = require('./builtins');
@@ -1566,6 +1566,8 @@ function resolve( model ) {
       // No traversal into query, art.$queries set in define.js
       // No subqueries for type projections, nor in annotation expressions.
       const { query } = expr;
+      if (!query.from && !query.args) // parser error
+        return type;                  // ...see also TODO in initQueryExpression()
       if (query._main?.kind === 'type' ||
          (!query.kind && !query._leadingQuery)) { // UNION has _leadingQuery
         error( 'expr-no-subquery', [ expr.location, user ], {

package/lib/compiler/shared.js

@@ -121,7 +121,7 @@ function fns( model ) {
       lexical: userBlock,
       dynamic: modelBuiltinsOrDefinitions,
       navigation: environment,
-      notFound: undefinedDefinition,
+      notFound: undefinedFromReference,
       accept: acceptQuerySource,
       noDep: '',                // dependency special for from
       args: () => 'from-args',
@@ -131,7 +131,7 @@ function fns( model ) {
       lexical: userBlock,
       dynamic: modelBuiltinsOrDefinitions,
       navigation: staticTarget,
-      notFound: undefinedDefinition,
+      notFound: undefinedTypeReference,
       accept: acceptTypeOrElement,
       // special `scope`s for CDL parser - TYPE OF (TODO generated?), cds.Association:
       typeOf: typeOfSemantics,
@@ -629,9 +629,11 @@ function fns( model ) {
 
     if (Array.isArray( art ))
       art = art[0];
-    if (!art)
-      return (semantics.dynamic !== modelDefinitions) ? art : pathName( path );
-
+    if (!art) {
+      return (semantics.dynamic !== modelDefinitions && !options.$cdsReplSupport)
+        ? art
+        : pathName( path );
+    }
     const first = (art.kind === 'using' ? art.extern : art.name).id;
     return (path.length === 1) ? first : `${ first }.${ pathName( ref.path.slice(1) ) }`;
   }
@@ -1186,7 +1188,11 @@ function fns( model ) {
     return model.definitions;
   }
   function modelBuiltinsOrDefinitions( user ) {
-    return definedViaCdl( user ) ? model.$builtins : model.definitions;
+    if (!definedViaCdl( user ))
+      return model.definitions;
+    if (!options.$cdsReplSupport)
+      return model.$builtins;
+    return Object.assign( { __proto__: null }, model.definitions, model.$builtins );
   }
 
   function artifactParams( user ) {
@@ -1355,6 +1361,21 @@ function fns( model ) {
     // TODO: improve text, use text variant for: "or builtin" or "definitions" or none
   }
 
+  function undefinedFromReference( user, item, valid, dict, prev, path, semantics ) {
+    const base = Functions.effectiveType?.( prev );
+    if (Functions.effectiveType?.( base?.elements?.[item.id] )?.target)
+      signalElementHint( user, item, valid, prev, semantics, path );
+    else
+      undefinedDefinition( user, item, valid, dict, prev, path, semantics );
+  }
+
+  function undefinedTypeReference( user, item, valid, dict, prev, path, semantics ) {
+    if (prev?.elements?.[item.id])
+      signalElementHint( user, item, valid, prev, semantics, path );
+    else
+      undefinedDefinition( user, item, valid, dict, prev, path, semantics );
+  }
+
   function undefinedForAnnotate( user, item, valid, _dict, prev, path ) {
     // in a CSN source, only one env was tested (valid.length 1):
     const name = (prev) ? `${ prev.name.id }.${ item.id }` : item.id;
@@ -1382,6 +1403,14 @@ function fns( model ) {
     }
   }
 
+  function signalElementHint( user, item, valid, prev, semantics, path ) {
+    const art = searchName( prev, item.id, 'absolute' );
+    const addSeparators = p => ( p === item ? ':' : '.' ) + p.id;
+    const code = path[0].id + path.slice( 1 ).map( addSeparators ).join( '' );
+    signalNotFound( 'ref-undefined-def', [ item.location, user ], valid,
+                    { '#': 'hint', art, code }, semantics );
+  }
+
   function endsWithSuffix( name, suffix, cond ) {
     if (!name.endsWith( suffix ))
       return false;

package/lib/compiler/utils.js

@@ -6,11 +6,9 @@
 // Please do not add functions “for completeness”, this is not an API file for
 // others but only by the core compiler.
 
-// TODO: split this file into utils/….js, add some functions from lib/base/model.js
-
 'use strict';
 
-const { dictAdd, dictFirst } = require('../base/dictionaries');
+const { dictAdd, dictFirst } = require('./dictionaries');
 const { Location, weakLocation } = require('../base/location');
 const { XsnName, XsnArtifact } = require('./xsn-model');
 
@@ -419,7 +417,7 @@ function targetMaxNotOne( assoc, item ) {
  * two entities named `E`, the callback function is called on both.
  * It is also called on columns with `inline`.
  *
- * See also function forEachDefinition(), currently in lib/base/model.js.
+ * See also function forEachDefinition() below.
  */
 function forEachUserArtifact( model, prop, callback ) { // not enums
   forEachUserDict( model, prop, function main( art ) {

package/lib/compiler/xpr-rewrite.js

@@ -151,7 +151,7 @@ const {
   setExpandStatusAnnotate,
 } = require('./utils');
 const { CompilerAssertion } = require('../base/error');
-const { isBetaEnabled } = require('../base/model');
+const { isBetaEnabled } = require('../base/specialOptions');
 const { isSimpleCdlIdentifier } = require('../parsers/identifiers');
 
 // Config object passed around all "rewrite" functions.

package/lib/edm/annotations/edmJson.js

@@ -8,7 +8,7 @@ const {
 } = require('../EdmPrimitiveTypeDefinitions.js');
 const { isBuiltinType, isAnnotationExpression } = require('../../base/builtins');
 const { transformExpression } = require('../../transform/db/applyTransformations.js');
-const { conditionAsTree, expressionAsTree } = require('../../model/xprAsTree');
+const { conditionAsTree, expressionAsTree } = require('../../base/xprAsTree');
 
 /**
  * Translate a given token stream expression into an edmJson representation
@@ -390,9 +390,7 @@ function xpr2edmJson( carrier, anno, location, options, messageFunctions, generi
 
 
   transform.ref = (parent, prop, xpr, csnPath, parentParent, parentProp) => {
-    // until empty filter syntax is introduced for the annotation expressions,
-    // we ignore the filters in order to generate EDMX
-    if (xpr.some(ps => ps.args/* || ps.where */)) {
+    if (xpr.some(ps => ps.args /* || (ps.where && ps.where.length)) until PR#13752 filters were also forbidden */)) {
       error('odata-anno-xpr-ref', location, {
         anno, elemref: parent, '#': 'args',
       });

package/lib/edm/annotations/genericTranslation.js

@@ -6,7 +6,8 @@ const edmUtils = require('../edmUtils.js');
 const oDataDictionary = require('../../gen/Dictionary.json');
 const preprocessAnnotations = require('./preprocessAnnotations.js');
 const { forEachDefinition } = require('../../model/csnUtils');
-const { isBetaEnabled, setProp } = require('../../base/model.js');
+const { isBetaEnabled } = require('../../base/specialOptions.js');
+const { setProp } = require('../../utils/objectUtils.js');
 const { xpr2edmJson, getEdmJsonHandler } = require('./edmJson.js');
 const { vocabularyDefinitions } = require('./vocabularyDefinitions.js');
 const { EdmPathTypeMap } = require('../EdmPrimitiveTypeDefinitions.js');

package/lib/edm/csn2edm.js

@@ -9,7 +9,8 @@ const VALUELIST_NAVPROP_PREFIX = '';
 const edmUtils = require('./edmUtils.js');
 const { initializeModel } = require('./edmPreprocessor.js');
 const translate = require('./annotations/genericTranslation.js');
-const { setProp, isBetaEnabled } = require('../base/model');
+const { setProp } = require('../utils/objectUtils');
+const { isBetaEnabled } = require('../base/specialOptions');
 const {
   isEdmPropertyRendered, getUtils, findAnnotationExpression,
 } = require('../model/csnUtils');
@@ -21,7 +22,7 @@ const {
   EdmPrimitiveTypeMap,
 } = require('./EdmPrimitiveTypeDefinitions.js');
 const { getEdm } = require('./edm.js');
-const { cloneFullCsn } = require('../model/cloneCsn');
+const { cloneFullCsn } = require('../base/cloneCsn');
 const { forEach, forEachValue } = require('../utils/objectUtils.js');
 /*
 OData V2 spec 06/01/2017 PDF version is available here:

package/lib/edm/edmAnnoPreprocessor.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const edmUtils = require('./edmUtils.js');
-const { setProp } = require('../base/model');
+const { setProp } = require('../utils/objectUtils');
 const { forEachGeneric } = require('../model/csnUtils');
 
 /*

package/lib/edm/edmInboundChecks.js

@@ -1,6 +1,7 @@
 'use strict';
 
-const { setProp, isBetaEnabled } = require('../base/model');
+const { setProp } = require('../utils/objectUtils');
+const { isBetaEnabled } = require('../base/specialOptions');
 const {
   forEachDefinition, forEachMemberRecursively, getUtils,
   transformAnnotationExpression,

package/lib/edm/edmPreprocessor.js

@@ -1,7 +1,7 @@
 'use strict';
 
 /* eslint max-statements-per-line:off */
-const { setProp, isBetaEnabled } = require('../base/model');
+const { isBetaEnabled } = require('../base/specialOptions');
 const {
   forEachDefinition, forEachGeneric, forEachMemberRecursively,
   isEdmPropertyRendered, getUtils,
@@ -15,8 +15,8 @@ const edmAnnoPreproc = require('./edmAnnoPreprocessor.js');
 const { inboundQualificationChecks } = require('./edmInboundChecks.js');
 const typesExposure = require('../transform/odata/typesExposure');
 const expandCSNToFinalBaseType = require('../transform/odata/toFinalBaseType');
-const { cloneCsnNonDict, cloneAnnotationValue } = require('../model/cloneCsn');
-const { forEach, forEachKey } = require('../utils/objectUtils.js');
+const { cloneCsnNonDict, cloneAnnotationValue } = require('../base/cloneCsn');
+const { setProp, forEach, forEachKey } = require('../utils/objectUtils.js');
 
 const NavResAnno = '@Capabilities.NavigationRestrictions.RestrictedProperties';
 

package/lib/edm/edmUtils.js

@@ -1,13 +1,13 @@
 'use strict';
 
-const { setProp } = require('../base/model');
+const { setProp } = require('../utils/objectUtils');
 const {
   isEdmPropertyRendered, applyTransformations,
 } = require('../model/csnUtils');
 const { isBuiltinType } = require('../base/builtins');
 const { escapeString, hasControlCharacters, hasUnpairedUnicodeSurrogate } = require('../render/utils/stringEscapes');
 const { CompilerAssertion } = require('../base/error');
-const { cloneAnnotationValue } = require('../model/cloneCsn');
+const { cloneAnnotationValue } = require('../base/cloneCsn');
 
 /* eslint max-statements-per-line:off */
 function validateOptions( _options ) {

package/lib/gen/BaseParser.js

@@ -1,4 +1,4 @@
-//Base class for generated parser, for redepage v0.3.2
+// Base class for generated parser, for redepage v0.3.4
 
 'use strict';
 
@@ -370,18 +370,7 @@ throw Error( `this.s === ${ this.s }; illegally set by action, or runtime/genera
 this.dynamic_ = Object.getPrototypeOf( this.dynamic_ );
 const caller = this.stack.pop();
 const immediately = this.tokenIdx === caller.tokenIdx && this.tokenIdx >= this.errorTokenIdx;
-if (this.constructor.tracingParser) {
-const post = this.s == null &&
-(immediately
-? ' immediately'
-: caller.followState == null
-? ' unsuccessfully'
-: ' prematurely');
-const text = immediately ? '⚠ exit rule' : '⏎ exit rule';
-this.s = caller.followState;
-
 
-}
 this.prec_ = caller.prec;
 this.s = caller.followState;
 if (immediately)

package/lib/gen/CdlGrammar.checksum

@@ -1 +1 @@
-f0320d5264a6107c245a82427b4f6338
+1802b89cdce8e878cb15384d6731099a