@sap/cds-compiler 3.6.2 → 3.8.0

package/lib/compiler/finalize-parse-cdl.js

@@ -13,8 +13,7 @@
 
 'use strict';
 
-const { dictAddArray } = require('../base/dictionaries');
-const { forEachGeneric, forEachMember } = require('../base/model');
+const { forEachGeneric } = require('../base/model');
 const { setLink, setArtifactLink } = require('./utils');
 
 
@@ -30,19 +29,19 @@ function finalizeParseCdl( model ) {
     resolveUncheckedPath,
     resolveTypeArgumentsUnchecked,
     initMembers,
-    extensionsDict,
   } = model.$functions;
 
   resolveTypesAndExtensionsForParseCdl();
   return;
 
   function resolveTypesAndExtensionsForParseCdl() {
+    const late = model.$lateExtensions;
     const extensions = [];
 
-    for (const name in extensionsDict) {
-      for (const ext of extensionsDict[name]) {
+    // TODO: why not just use the extensions as they are from the first source?
+    for (const name in late) {
+      for (const ext of late[name]._extensions) {
         ext.name.absolute = resolveUncheckedPath( ext.name, 'extend', ext );
-        mergeAnnotatesForSameArtifact( ext ); // TODO: should not be necessary anymore
         // Initialize members and define annotations in sub-elements.
         initMembers( ext, ext, ext._block, true );
         extensions.push( ext );
@@ -96,8 +95,6 @@ function finalizeParseCdl( model ) {
 
     if (artifact.from) {
       const { from } = artifact;
-      // Note: `_from` only contains sources necessary for calculating elements,
-      //       not e.g. those from the `where exists` clause.
       resolveUncheckedPath(from, 'from', main);
       resolveTypesForParseCdl(from, main);
     }
@@ -108,11 +105,6 @@ function finalizeParseCdl( model ) {
       if (parseCdlSpeciallyHandledXsnProps.includes(prop) || parseCdlIgnoredXsnProps.includes(prop))
         continue;
 
-      // define.js (and initMembers()) initializes annotations.  If there is a duplicate, the
-      // annotation is an array in XSN.
-      if (prop[0] === '@' && Array.isArray(artifact[prop]))
-        chooseAndReportDuplicateAnnotation(artifact, prop);
-
       if (artifact[prop] && Object.getPrototypeOf(artifact[prop]) === null)
         // Dictionary in XSN
         forEachGeneric(artifact, prop, art => resolveTypesForParseCdl(art, art));
@@ -172,12 +164,10 @@ function finalizeParseCdl( model ) {
       const name = resolveUncheckedPath( artWithType.type, 'type', user );
       const type = name && model.definitions[name] || { name: { absolute: name } };
       resolveTypeArgumentsUnchecked( artWithType, type, user );
-      return;
     }
     else if (!user._main) {
       error( 'ref-undefined-typeof', [ artWithType.type.location, user ], {},
              'Current artifact has no element to refer to as type' );
-      return;
     }
     else if (root.id === '$self' || root.id === '$projection') {
       setArtifactLink( root, user._main );
@@ -206,49 +196,6 @@ function finalizeParseCdl( model ) {
       setArtifactLink( root, fake );
     }
   }
-
-  function chooseAndReportDuplicateAnnotation( artifact, annoName ) {
-    for (const anno of artifact[annoName])
-      message( 'anno-duplicate', [ anno.name.location, artifact ], { anno: annoName } );
-
-    // Choose any annotation, doesn't matter because of the error above.
-    artifact[annoName] = artifact[annoName][0];
-  }
-
-  /**
-   * For duplicate entries in `annotate {}` blocks, we de-duplicate the entries and merge them.
-   * Since it is allowed in "normal" compilations to have e.g.
-   * `annotate E with { @anno1 id, @anno2 id }`.
-   *
-   * @param {object} ext
-   */
-  function mergeAnnotatesForSameArtifact( ext ) {
-    if (!ext || typeof ext !== 'object')
-      return;
-
-    forEachMember(ext, sub => mergeAnnotatesForSameArtifact(sub));
-
-    // do not do a complex merge:
-    if (isComplexExtension( ext ) ||
-        !Array.isArray( ext.$duplicates ) || ext.$duplicates.some( isComplexExtension ))
-      return;
-    for (const dup of ext.$duplicates) {
-      for (const prop in dup) {
-        if (prop.charAt(0) === '@')
-          dictAddArray( ext, prop, dup[prop] );
-      }
-    }
-    delete ext.$duplicates;
-  }
-}
-
-/**
- * We only de-duplicate an extend/annotate `ext` in function
- * mergeAnnotatesForSameArtifact() if the extend/annotate is simple, i.e. has
- * no members like elements.
- */
-function isComplexExtension( ext ) {
-  return ext.kind !== 'annotate' || ext.elements || ext.parameters || ext.actions;
 }
 
 module.exports = finalizeParseCdl;

package/lib/compiler/index.js

@@ -15,7 +15,7 @@
 'use strict';
 
 const { resolveModule, resolveModuleSync } = require('../utils/moduleResolve');
-const parseLanguage = require('../language/antlrParser');
+const parseLanguage = require('../language/antlrParser'); // TODO: should we do some lazyload here?
 const parseCsn = require('../json/from-csn');
 
 const assertConsistency = require('./assert-consistency');

package/lib/compiler/kick-start.js

@@ -31,9 +31,9 @@ function kickStart( model ) {
    */
   function setAncestorsAndService( name ) {
     const art = model.definitions[name];
-    if (!('_parent' in art))
+    if (art._parent === undefined)
       return;                   // nothing to do for builtins and redefinitions
-    if (art._from && !('_ancestors' in art))
+    if (art.query && art._ancestors === undefined)
       setProjectionAncestors( art );
 
     let parent = art._parent;
@@ -72,13 +72,12 @@ function kickStart( model ) {
     // no need to set preferredRedirectionTarget in the while loop as we would
     // use the projection having @cds.redirection.target anyhow instead of
     // `art` anyway (if we do the no-x-service-implicit-redirection TODO above)
-    while (art && !('_ancestors' in art) &&
-           art._from && art._from.length === 1 &&
-           (preferredRedirectionTarget || !annotationIsFalse( art['@cds.redirection.target'] ) ) &&
-           art.query.op && art.query.op.val === 'SELECT') {
+    while (art?.query?.from?.path && // direct select with one source
+           art._ancestors !== 0 &&        // prevent inf-loop
+           (preferredRedirectionTarget || !annotationIsFalse( art['@cds.redirection.target'] ) )) {
       chain.push( art );
-      setLink( art, '_ancestors', null ); // avoid infloop with cyclic from
-      const name = resolveUncheckedPath( art._from[0], 'include', art ); // TODO: 'include'?
+      setLink( art, '_ancestors', 0 ); // avoid infloop with cyclic from
+      const name = resolveUncheckedPath( art.query.from, 'include', art ); // TODO: 'include'?
       art = name && model.definitions[name];
       if (autoexposed)
         break;                  // only direct projection for auto-exposed