@sap/cds-compiler 2.15.4 → 3.0.0

package/lib/compiler/tweak-assocs.js

@@ -39,7 +39,7 @@ function tweakAssocs( model ) {
   const { environment } = model.$volatileFunctions;
 
   // behavior depending on option `deprecated`:
-  const enableExpandElements = !isDeprecatedEnabled( options, 'noElementsExpansion' );
+  const enableExpandElements = !isDeprecatedEnabled( options, '_noElementsExpansion' );
   // TODO: we should get rid of noElementsExpansion soon; both
   // beta.nestedProjections and beta.universalCsn do not work with it.
 
@@ -95,15 +95,14 @@ function tweakAssocs( model ) {
     if (!target || target._service) // assoc to other service is OK
       return;
     if (!elem.$inferred) {      // && !elem.target.$inferred
-      // TODO: spec meeting 2021-01-22: no warning
-      warning( 'assoc-target-not-in-service', [ elem.target.location, elem ],
-               { target, '#': (elem._main.query ? 'select' : 'define') }, {
-                 std: 'Target $(TARGET) of association is outside any service', // not used
-                 // eslint-disable-next-line max-len
-                 define: 'Target $(TARGET) of explicitly defined association is outside any service',
-                 // eslint-disable-next-line max-len
-                 select: 'Target $(TARGET) of explicitly selected association is outside any service',
-               } );
+      info( 'assoc-target-not-in-service', [ elem.target.location, elem ],
+            { target, '#': (elem._main.query ? 'select' : 'define') }, {
+              std: 'Target $(TARGET) of association is outside any service', // not used
+              // eslint-disable-next-line max-len
+              define: 'Target $(TARGET) of explicitly defined association is outside any service',
+              // eslint-disable-next-line max-len
+              select: 'Target $(TARGET) of explicitly selected association is outside any service',
+            } );
     }
     else {
       info( 'assoc-outside-service', [ elem.target.location, elem ],

package/lib/compiler/utils.js

@@ -31,6 +31,10 @@ function annotationVal( anno ) {
 function annotationIsFalse( anno ) {                   // falsy, but not null (unset)
   return anno && (anno.val === false || anno.val === 0 || anno.val === '');
 }
+function annotationHasEllipsis( anno ) {
+  const { val } = anno || {};
+  return Array.isArray( val ) && val.some( v => v.literal === 'token' && v.val === '...' );
+}
 
 /**
  * Set compiler-calculated annotation value.
@@ -381,6 +385,7 @@ module.exports = {
   pushLink,
   annotationVal,
   annotationIsFalse,
+  annotationHasEllipsis,
   annotateWith,
   setLink,
   setArtifactLink,

package/lib/edm/csn2edm.js

@@ -395,14 +395,14 @@ function csn2edmAll(_csn, _options, serviceNames=undefined) {
       {
         const EntityTypeName = entityCsn.name.replace(schemaNamePrefix, '');
         const EntitySetName = edmUtils.getBaseName(entityCsn.$entitySetName || entityCsn.name);
-
+        const isSingleton = edmUtils.isSingleton(entityCsn) && options.isV4();
         const [ properties, hasStream ] = createProperties(entityCsn);
 
         const loc = ['definitions', entityCsn.name];
         const type = `${schema.name}.${EntityTypeName}`;
         if(properties.length === 0)
           warning(null, loc, { type }, 'EDM EntityType $(TYPE) has no properties');
-        else if(entityCsn.$edmKeyPaths.length === 0)
+        else if(entityCsn.$edmKeyPaths.length === 0 && !isSingleton)
           message('odata-spec-violation-no-key', loc);
 
         if(!edmUtils.isODataSimpleIdentifier(EntityTypeName))
@@ -688,9 +688,7 @@ function csn2edmAll(_csn, _options, serviceNames=undefined) {
           if(elementCsn._edmParentCsn == undefined)
             setProp(elementCsn, '_edmParentCsn', edmParentCsn);
 
-          if(!elementCsn._ignore) {
-            if(edmUtils.isAssociationOrComposition(elementCsn))
-            {
+          if(edmUtils.isAssociationOrComposition(elementCsn)) {
               // Foreign keys are part of the generic elementCsn.elements property creation
 
               // This is the V4 edmx:NavigationProperty
@@ -698,36 +696,35 @@ function csn2edmAll(_csn, _options, serviceNames=undefined) {
 
               // suppress navprop creation only if @odata.navigable:false is not annotated.
               // (undefined !== false) still evaluates to true
-              if (!elementCsn._target.abstract && elementCsn['@odata.navigable'] !== false)
+            if (!elementCsn._target.abstract && elementCsn['@odata.navigable'] !== false)
               {
-                const navProp = new Edm.NavigationProperty(v, {
-                  Name: elementName,
-                  Type: elementCsn._target.name
-                }, elementCsn);
-                props.push(navProp);
+              const navProp = new Edm.NavigationProperty(v, {
+                Name: elementName,
+                Type: elementCsn._target.name
+              }, elementCsn);
+              props.push(navProp);
                 // save the navProp in the global array for late constraint building
-                navigationProperties.push(navProp);
-              }
+              navigationProperties.push(navProp);
             }
+          }
             // render ordinary property if element is NOT ...
             // 1) ... annotated @cds.api.ignore
             // 2) ... annotated @odata.foreignKey4 and odataFormat: structured
 
-            else if(isEdmPropertyRendered(elementCsn, options))
+          else if(isEdmPropertyRendered(elementCsn, options))
             {
               // CDXCORE-CDXCORE-173
               // V2: filter  @Core.MediaType
-              if ( options.isV2() && elementCsn['@Core.MediaType']) {
-                hasStream = elementCsn['@Core.MediaType'];
-                delete elementCsn['@Core.MediaType'];
+            if ( options.isV2() && elementCsn['@Core.MediaType']) {
+              hasStream = elementCsn['@Core.MediaType'];
+              delete elementCsn['@Core.MediaType'];
                 // CDXCORE-CDXCORE-177:
                 // V2: don't render element but add attribute 'm:HasStream="true' to EntityType
                 // V4: render property type 'Edm.Stream'
-                streamProps.push(elementName);
+              streamProps.push(elementName);
 
-              } else {
-                props.push(new Edm.Property(v, { Name: elementName }, elementCsn));
-              }
+            } else {
+              props.push(new Edm.Property(v, { Name: elementName }, elementCsn));
             }
           }
 

package/lib/edm/edmPreprocessor.js

@@ -54,6 +54,10 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
     fallBackSchemaName,
     whatsMyServiceRootName ] = getAnOverviewOnTheServices(csn);
 
+  if(serviceRootNames.length === 0) {
+    return [serviceRoots, Object.create(null), reqDefs, whatsMyServiceRootName, fallBackSchemaName, options];
+  }
+
   if(requestedServiceNames === undefined)
     requestedServiceNames = options.serviceNames;
   if(requestedServiceNames === undefined) {
@@ -64,10 +68,6 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
     return requestedServiceNames.includes(whatsMyServiceRootName(n));
   }
 
-  if(serviceRootNames.length === 0) {
-    return [serviceRoots, Object.create(null), reqDefs, whatsMyServiceRootName, fallBackSchemaName, options];
-  }
-
   // Structural CSN inbound QA checks
   inboundQualificationChecks();
   // not needed at the moment
@@ -85,7 +85,7 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
 
   /*
     Final base type expansion is required here when:
-    1) The input CSN was already transformed for V4 but shall be rendered in V2 and the 
+    1) The input CSN was already transformed for V4 but shall be rendered in V2 and the
        edmx generator is called directly (bypassing OData transformation)
     2) The input CSN was already transformed for V4 and persisted (all non-enumerables are
        stripped of)
@@ -119,11 +119,6 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
   }
 
   if(schemaNames.length) {
-    // First attach names to all definitions (and actions/params) in the model
-    // elements are done in initializeStruct
-    // Set myServiceName for later reference and indication of a service member
-    // First attach names to all definitions in the model and fill reqDefs
-    // Link association targets and spray @odata.contained over untagged compositions
     forEachDefinition(csn, [
       attachNameProperty,
       (def, defName) => {
@@ -307,7 +302,7 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
         const myServiceRoot = whatsMyServiceRootName(defName);
         const mySchemaPrefix = getSchemaPrefix(defName);
         if(myServiceRoot && options.isV4() &&
-        /*(options.toOdata.odataProxies || options.toOdata.odataXServiceRefs) && options.isStructFormat && */
+        /*(options.odataProxies || options.odataXServiceRefs) && options.isStructFormat && */
         defName !== myServiceRoot && myServiceRoot !== mySchemaPrefix) {
           const service = { kind: 'service', name: mySchemaPrefix };
           serviceRoots[mySchemaPrefix] = service;
@@ -341,7 +336,7 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
   // link association target to association and add @odata.contained to compositions in V4
   function linkAssociationTarget(struct) {
     forEachMemberRecursively(struct, (element, name, prop, subpath) => {
-      if(isAssociationOrComposition(element) && !element._ignore) {
+      if(isAssociationOrComposition(element)) {
         if(!element._target) {
           let target = csn.definitions[element.target];
           if(target) {
@@ -685,7 +680,7 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
       applyAppSpecificLateCsnTransformationOnElement(options, element, def, error);
     }, [], true, { elementsOnly: true });
 
-    if(!isDeprecatedEnabled(options, 'v1KeysForTemporal')) {
+    if(!isDeprecatedEnabled(options, '_v1KeysForTemporal')) {
       // if artifact has a cds.valid.key mention it as @Core.AlternateKey
       if(validKey.length) {
         let altKeys = [{ Key: [] }];
@@ -738,7 +733,7 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
     forEachMemberRecursively(def.items || def, initConstraintsOnAssoc, [], true, { elementsOnly: true });
   }
   function initConstraintsOnAssoc(element) {
-    if (isAssociationOrComposition(element) && !element._ignore && !element._constraints) {
+    if (isAssociationOrComposition(element) && !element._constraints) {
         // setup the constraints object
       setProp(element, '_constraints', { constraints: Object.create(null), selfs: [], _origins: [], termCount: 0 });
         // and crack the ON condition
@@ -790,7 +785,7 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
             delete struct.$keys[element.name];
           }
         }
-        // deprecated unmanagedUpInComponent:
+        // deprecated._unmanagedUpInComponent:
         // Only in containment:
         // Ignore this (foreign key) elment if renderForeignKeys is false
         if(options.odataContainment && element['@odata.containment.ignore']) {
@@ -855,7 +850,7 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
     sub artifacts exposed by the initial type exposure
   */
   function convertExposedTypesOfOtherServicesIntoCrossReferences() {
-    if(options.toOdata.odataXServiceRefs && options.isV4()) {
+    if(options.odataXServiceRefs && options.isV4()) {
       serviceRootNames.forEach(srn => {
         schemaNames.forEach(fqSchemaName => {
           if(fqSchemaName.startsWith(srn + '.')) {
@@ -912,7 +907,7 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
     // if this artifact is a service member check its associations
     if(globalSchemaPrefix) {
       forEachGeneric(struct.items || struct, 'elements', element => {
-        if(!isAssociationOrComposition(element) || element._ignore || element['@odata.navigable'] === false)
+        if(!isAssociationOrComposition(element) || element['@odata.navigable'] === false)
           return;
         /*
          * Consider everything @cds.autoexpose: falsy to be a proxy candidate for now
@@ -949,18 +944,18 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
         const targetSchemaName = element._target.$mySchemaName;
         if(isProxyRequired(element)) {
           if(options.isV4() &&
-             (options.toOdata.odataProxies || options.toOdata.odataXServiceRefs) &&
+             (options.odataProxies || options.odataXServiceRefs) &&
              // must be a managed association with keys OR an unambiguous backlink
-             element.keys || 
+             element.keys ||
              (element.on && element._constraints.selfs.length === 1 && element._constraints.termCount === 1)
             ) {
             // reuse proxy if available
             let proxy = getProxyForTargetOf(element);
             if(!proxy) {
-              if(targetSchemaName && options.toOdata.odataXServiceRefs) {
+              if(targetSchemaName && options.odataXServiceRefs) {
                 proxy = createSchemaRefFor(targetSchemaName);
               }
-              else if(options.toOdata.odataProxies) {
+              else if(options.odataProxies) {
                 proxy = createProxyFor(element, targetSchemaName);
               }
               proxy = registerProxy(proxy, element);
@@ -1024,7 +1019,7 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
       // proxyDefinitionName: strip the serviceName and replace '.' with '_'
       let defName =
         `${assoc._target.name.replace(proxySchemaName + '.', '').replace(/\./g, '_')}`;
-      
+
       // fullName: Prepend serviceName and if in same service add '_proxy'
       const proxy = isParamProxy
         ? createParameterEntity(assoc._target,  proxySchemaName + '.' + defName, true)
@@ -1074,7 +1069,7 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
           if(!newElt) {
             if(csnUtils.isAssocOrComposition(e.type)) {
               if(!e.on && e.keys) {
-                if(options.toOdata.odataNoTransitiveProxies)
+                if(options.odataNoTransitiveProxies)
                   newElt = convertManagedAssocIntoStruct(e);
                 else
                   newElt = createProxyOrSchemaRefForManagedAssoc(e);
@@ -1275,10 +1270,10 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
           proxy = getProxyForTargetOf(e);
           if(!proxy) {
             // option odataXServiceRefs has precedence over odataProxies
-            if(e._target.$mySchemaName && options.toOdata.odataXServiceRefs) {
+            if(e._target.$mySchemaName && options.odataXServiceRefs) {
               proxy = createSchemaRefFor(e._target.$mySchemaName);
             }
-            else if(options.toOdata.odataProxies) {
+            else if(options.odataProxies) {
               proxy = createProxyFor(e, e._target.$mySchemaName);
               if(!e._target.$isParamEntity)
                 populateProxyElements(e, proxy, getForeignKeyDefinitions(e));
@@ -1451,7 +1446,7 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
     if(def.$keys) {
       setProp(def, '$edmKeyPaths', []);
       // for all key elements that shouldn't be ignored produce the paths
-      foreach(def.$keys, k => !k._ignore && !(k._isToContainer && k._selfReferences.length), (k, kn) => {
+      foreach(def.$keys, k => !(k._isToContainer && k._selfReferences.length), (k, kn) => {
         if(isEdmPropertyRendered(k, options) &&
          !(options.isV2() && k['@Core.MediaType'])) {
           if(options.isV4() && options.isStructFormat) {
@@ -1922,7 +1917,7 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
           if(Object.keys(o).length) {
             // ReadRestrictions may have sub type ReadByKeyRestrictions { Description, LongDescription }
             // chop annotations into dictionaries
-            if(prefix === '@Capabilities.ReadRestrictions' && 
+            if(prefix === '@Capabilities.ReadRestrictions' &&
                Object.keys(o).some(k => k.startsWith('ReadByKeyRestrictions.'))) {
               const no = {};
               Object.entries(o).forEach(([k,v]) => {
@@ -1964,15 +1959,15 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
 
   function mapCdsToEdmProp(obj) {
     if (obj.type && isBuiltinType(obj.type) && !isAssociationOrComposition(obj) && !obj.targetAspect) {
-      let edmType = edmUtils.mapCdsToEdmType(obj, messageFunctions, _options.toOdata.version === 'v2', obj['@Core.MediaType']);
+      let edmType = edmUtils.mapCdsToEdmType(obj, messageFunctions, _options.odataVersion === 'v2', obj['@Core.MediaType']);
       assignProp(obj, '_edmType', edmType);
     } else if (obj._isCollection && (obj.items && isBuiltinType(csnUtils.getFinalTypeDef(obj.items.type)))) {
-      let edmType = edmUtils.mapCdsToEdmType(obj.items, messageFunctions, _options.toOdata.version === 'v2', obj['@Core.MediaType'], obj.$path);
+      let edmType = edmUtils.mapCdsToEdmType(obj.items, messageFunctions, _options.odataVersion === 'v2', obj['@Core.MediaType'], obj.$path);
       assignProp(obj, '_edmType', edmType);
     }
     // This is the special case when we have array of array, but will not be supported in the future
     else if (obj._isCollection && obj.items && obj.items.type && obj.items.items && isBuiltinType(csnUtils.getFinalTypeDef(obj.items.items.type))) {
-      let edmType = edmUtils.mapCdsToEdmType(obj.items.items, messageFunctions, _options.toOdata.version === 'v2', obj['@Core.MediaType']);
+      let edmType = edmUtils.mapCdsToEdmType(obj.items.items, messageFunctions, _options.odataVersion === 'v2', obj['@Core.MediaType']);
       assignProp(obj, '_edmType', edmType);
     }
   }

package/lib/edm/edmUtils.js

@@ -8,31 +8,17 @@ function validateOptions(_options)
 {
   if(!_options.isV2 && !_options.isV4)
   {
-    // csn2edm expects "version" to be a top-level property of options
+    // csn2edm expects "odataVersion" to be a top-level property of options
     // set to 'v4' as default, override with value from incoming options
-    // (here version comes inside "toOdata")
-    const options = Object.assign({ version: 'v4'}, _options);
-    if (options.toOdata) {
-      if(options.toOdata.version)
-        options.version = options.toOdata.version;
-      if(options.toOdata.odataFormat)
-        options.odataFormat = options.toOdata.odataFormat;
-      if(options.toOdata.odataContainment)
-        options.odataContainment = options.toOdata.odataContainment;
-      if(options.toOdata.odataForeignKeys)
-        options.odataForeignKeys = options.toOdata.odataForeignKeys;
-      if(options.toOdata.odataV2PartialConstr)
-        options.odataV2PartialConstr = options.toOdata.odataV2PartialConstr;
-      // global flag that indicates whether or not FKs shall be rendered in general
-      // V2/V4 flat: yes
-      // V4/struct: depending on odataForeignKeys
-      options.renderForeignKeys =
-        options.version === 'v4' ? options.odataFormat === 'structured' &&  !!options.odataForeignKeys : true;
-
-    }
-
-    const v2 = options.version.match(/v2/i) !== null;
-    const v4 = options.version.match(/v4/i) !== null;
+    const options = Object.assign({ odataVersion: 'v4'}, _options);
+    // global flag that indicates whether or not FKs shall be rendered in general
+    // V2/V4 flat: yes
+    // V4/struct: depending on odataForeignKeys
+    options.renderForeignKeys =
+      options.odataVersion === 'v4' ? options.odataFormat === 'structured' &&  !!options.odataForeignKeys : true;
+
+    const v2 = options.odataVersion.match(/v2/i) !== null;
+    const v4 = options.odataVersion.match(/v4/i) !== null;
 
     options.v = [v2, v4];
     options.isStructFormat = options.odataFormat && options.odataFormat === 'structured';

package/lib/gen/language.checksum

@@ -1 +1 @@
-351a6ed427f91f2eef4d8e9a2e11dd17
+dd18d05cabbe93eabf1bd17b83add5ee