@sap/cds-compiler 2.13.6 → 2.15.4

package/lib/utils/moduleResolve.js

@@ -28,13 +28,18 @@ const extensions = [ '.cds', '.csn', '.json' ];
  *   - Why a global?  The Umbrella could pass it as an option.
  *
  * @param {string} modulePath
+ * @param {CSN.Options} options
  * @returns {string}
  */
-function adaptCdsModule(modulePath) {
-  // eslint-disable-next-line
-  if (global['cds'] && global['cds'].home && modulePath.startsWith( '@sap/cds/' ))
+function adaptCdsModule(modulePath, options = {}) {
+  if (modulePath.startsWith( '@sap/cds/' )) {
+    if (options.cdsHome)
+      return options.cdsHome + modulePath.slice(8);
     // eslint-disable-next-line
-    return global['cds'].home + modulePath.slice(8)
+    if (global['cds'] && global['cds'].home)
+      // eslint-disable-next-line
+      return global['cds'].home + modulePath.slice(8);
+  }
   return modulePath;
 }
 
@@ -42,6 +47,7 @@ function adaptCdsModule(modulePath) {
  * @param {object} dep
  * @param {object} fileCache
  * @param {CSN.Options} options
+ * @param {object} messageFunctions
  */
 function resolveModule( dep, fileCache, options, messageFunctions ) {
   const _fs = cdsFs(fileCache, options.traceFs);
@@ -58,7 +64,7 @@ function resolveModule( dep, fileCache, options, messageFunctions ) {
     realpath: _fs.realpath,
   };
   return new Promise( (fulfill, reject) => {
-    const lookupPath = adaptCdsModule(dep.module);
+    const lookupPath = adaptCdsModule(dep.module, options);
     resolveCDS( lookupPath, opts, (err, res) => {
       // console.log('RESOLVE', dep, res, err)
       if (err) {
@@ -105,6 +111,7 @@ function resolveModule( dep, fileCache, options, messageFunctions ) {
  * @param {object} dep
  * @param {object} fileCache
  * @param {CSN.Options} options
+ * @param {object} messageFunctions
  */
 function resolveModuleSync( dep, fileCache, options, messageFunctions ) {
   const _fs = cdsFs(fileCache, options.traceFs);
@@ -118,7 +125,7 @@ function resolveModuleSync( dep, fileCache, options, messageFunctions ) {
 
   let result = null;
   let error = null;
-  const lookupPath = adaptCdsModule(dep.module);
+  const lookupPath = adaptCdsModule(dep.module, options);
 
   resolveCDS( lookupPath, opts, (err, res) => {
     if (err)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds-compiler",
-  "version": "2.13.6",
+  "version": "2.15.4",
   "description": "CDS (Core Data Services) compiler and backends",
   "homepage": "https://cap.cloud.sap/",
   "author": "SAP SE (https://www.sap.com)",

package/share/messages/message-explanations.json

@@ -9,6 +9,7 @@
     "extend-unrelated-layer",
     "redirected-to-ambiguous",
     "redirected-to-unrelated",
-    "rewrite-not-supported"
+    "rewrite-not-supported",
+    "syntax-expected-integer"
   ]
 }

package/share/messages/syntax-expected-integer.md

@@ -0,0 +1,37 @@
+# syntax-expected-integer
+
+The compiler expects a safe integer here.
+The last safe Integer is `2^53 - 1` or `9007199254740991`.
+
+A safe integer is an integer that
+
+- can be exactly represented as an IEEE-754 double precision number, and
+- whose IEEE-754 representation cannot be the result of rounding any
+  other integer to fit the IEEE-754 representation.
+
+The message's severity is `Error`.
+
+## Example
+
+Erroneous code example:
+
+```cdl
+type LengthIsUnsafe : String(9007199254740992);
+type NotAnInteger : String(42.1);
+```
+
+In the above example, the string length for the type `LengthIsUnsafe` is not a
+safe Integer. It is too large.
+Likewise, the string length for the type `NotAnInteger` is a decimal.
+
+## How to Fix
+
+To fix the issue, you have to provide a safe integer:
+
+```cdl
+type LengthIsSafe : String(9007199254740991);
+type AnInteger : String(42);
+```
+
+If not feasible, a string representation of the number needs to be used,
+e.g. in annotation values.

package/lib/transform/odata/attachPath.js

@@ -1,96 +0,0 @@
-// The module traverses over a CSN or partial one and sets $path on the non-structural nodes and references.
-
-const structuralNodeHandlers = {
-  definitions: traverseDict,
-  elements: traverseDict,
-  actions: traverseDict,
-  params: traverseDict,
-  items: traverseTyped,
-  enum: traverseDict,
-  returns: traverseTyped,
-  on: traverseArray,
-  keys: traverseArray,
-  ref: traverseRef,
-  query: traverseTyped,
-  SELECT: traverseTyped,
-  SET: traverseTyped,
-  args: traverseArray,
-  columns: traverseArray,
-  projection: traverseTyped,
-  from: traverseTyped,
-  mixin: traverseDict,
-  where: traverseArray,
-  orderBy: traverseArray,
-  groupBy: traverseArray,
-  having: traverseArray,
-  xpr: traverseArray,
-  expand: traverseArray,
-  inline: traverseArray,
-}
-
-function attachPath(csn) {
-  traverseDict(csn.definitions, ['definitions']);
-}
-
-function attachPathOnPartialCSN(csnPart, pathPrefix) {
-  if(Array.isArray(csnPart))
-    traverseArray(csnPart, pathPrefix);
-  else
-    traverseDict(csnPart, pathPrefix);
-}
-
-function traverseRef(obj, path) {
-  if(!obj) return;
-  setPath(obj, path);
-  traverseArray(obj, path);
-}
-
-function traverseArray(obj, path) {
-  if(!Array.isArray(obj)) return;
-  obj.forEach( ( element, index ) => traverseTyped(element, path.concat(index)));
-}
-
-function traverseDict(obj, path) {
-  if(!obj || typeof obj !== 'object') return;
-  forAllEnumerableProperties(obj, name => {
-    const ipath = path.concat(name);
-    setPath(obj[name], ipath);
-    traverseTyped(obj[name], ipath);
-  })
-}
-
-function traverseDictArray(obj, path) {
-  if(!obj || typeof obj !== 'object') return;
-  forAllEnumerableProperties(obj, name => {
-    const ipath = path.concat(name);
-    setPath(obj[name], ipath);
-    traverseArray(obj[name], ipath);
-  })
-}
-
-function traverseTyped(obj, path) {
-  if(!obj || typeof obj !== 'object') return;
-  forAllEnumerableProperties(obj, name => {
-    if(name[0]==='@') return; // skip annotations
-    const func = structuralNodeHandlers[name];
-    if(func)
-      func(obj[name], path.concat(name));
-    else if(path[path.length-2] === 'columns')
-      traverseDictArray(obj[name], path.concat(name)); // for columns
-  })
-}
-
-function setPath(obj, path) {
-  if(!obj || typeof obj !== 'object') return;
-  if(path.length>0)
-    Object.defineProperty( obj, '$path', { value: path, configurable: true, writable: true, enumerable: false } );
-}
-
-function forAllEnumerableProperties(obj, callback) {
-  Object.keys(obj).forEach(callback);
-}
-
-module.exports = {
-  attachPath,
-  attachPathOnPartialCSN,
-}

package/lib/transform/odata/expandStructKeysInAssociations.js

@@ -1,59 +0,0 @@
-'use strict';
-
-const { forEachManagedAssociation } = require('./utils');
-const { attachPath, attachPathOnPartialCSN } = require('./attachPath');
-
-/**
- * This module runs through the model and for each managed association in it,
- * in case the foreign keys are structured, it is expanding them. Example:
- * entity A {
- *  toB: association to B { stru };
- * } // -> CSN: keys:[ { ref:['stru'] } ]
- *
- * entity B {
- *  stru: {
- *    subid: Integer;
- *  }
- * }
- * after expand -> keys:[ { ref: ['stru_subid'] } ]
- */
-module.exports = function (csn, referenceFlattener, csnUtils, isExternalServiceMember) {
-
-  forEachManagedAssociation(csn, (element) => {
-    if (element.keys) {
-      expandStructuredKeysForAssociation(element, referenceFlattener);
-    }
-  }, isExternalServiceMember);
-
-  // update paths and resolve references
-  attachPath(csn);
-  referenceFlattener.resolveAllReferences(csn, csnUtils.inspectRef, csnUtils.isStructured);
-
-  function expandStructuredKeysForAssociation(assoc, referenceFlattener) {
-    let newKeys = [];
-    for (let key of assoc.keys) {
-      // when are assigned $paths and when not???
-      let paths = key.$paths;
-      if (paths) {
-        let lastPath = paths[paths.length - 1];
-        let generatedElements = referenceFlattener.getGeneratedElementsForPath(lastPath);
-        if (generatedElements) {
-          generatedElements.forEach(elementName => {
-            let newRef = { ref: [elementName] };
-            if (key.as) {
-              newRef.as = elementName.replace(key.ref[0], key.as);
-            }
-            newKeys.push(newRef);
-          })
-          continue;
-        }
-      }
-      newKeys.push(key);
-    }
-
-    if (newKeys.length) {
-      attachPathOnPartialCSN(newKeys, assoc.$path.concat('keys'));
-      assoc.keys = newKeys;
-    }
-  }
-}

package/lib/transform/odata/generateForeignKeyElements.js

@@ -1,261 +0,0 @@
-'use strict';
-
-/**
- * The module handles the processing of foreign key for managed associations.
- */
-
-const { copyAnnotations } = require('../../model/csnUtils');
-const sortByAssociationDependency = require('./sortByAssociationDependency');
-const { flattenStructure } = require('./structureFlattener');
-const { setProp } = require('../../base/model');
-const { implicitAs } = require('../../model/csnRefs');
-
-/**
- *
- * @param {CSN.Model} csn
- * @param {*} options
- * @param {*} referenceFlattener
- * @param {*} csnUtils
- * @param {object} error;
- */
-module.exports = function (csn, options, referenceFlattener, csnUtils, error, isExternalServiceMember) {
-
-  const structuredOData = options.toOdata.odataFormat === 'structured' && options.toOdata.version === 'v4';
-  const flatKeys = !structuredOData || (structuredOData && options.toOdata.odataForeignKeys);
-
-  // sort all associations by their dependencies
-  const sortedAssociations = sortByAssociationDependency(csn, referenceFlattener, isExternalServiceMember);
-
-  // generate foreign keys
-  processSortedAssociations(sortedAssociations, flatKeys);
-
-
-  function processSortedAssociations(sortedAssociations, flatKeys,) {
-    // The map will collect all generated foreign key names for the specific path
-    let generatedForeignKeyNamesForPath = Object.create(null); // map<path,[key-name]>
-
-    sortedAssociations.forEach(item => {
-      const { definitionName, structuralNodeName, elementName, element, parent, path } = item;
-
-      if (csnUtils.isManagedAssociation(element) && element.keys) {
-        if (flatKeys) // tackling the ref value in assoc.keys
-          takeoverForeignKeysOfTargetAssociations(element, path, generatedForeignKeyNamesForPath);
-        // TODO: move in separate function
-        fixCardinality(element);
-      }
-
-      let arrayOfGeneratedForeignKeyNames = generateForeignKeys(definitionName, structuralNodeName, elementName, element, parent, path);
-      generatedForeignKeyNamesForPath[item.path.join('/')] = arrayOfGeneratedForeignKeyNames;
-    })
-
-  }
-
-  /**
-   * if a key is an association and it poins to another association,
-   * the foreign keys of the target association become primary keys
-   * in the current association
-   */
-  function takeoverForeignKeysOfTargetAssociations(assoc, path, generatedForeignKeyNamesForPath) {
-    let newResult = [];
-    assoc.keys.forEach( (key, keyIndex) => {
-      let keyPath = path.concat('keys', keyIndex);
-      let resolved = csnUtils.inspectRef(keyPath)
-      let targetElement = resolved.art;
-      if (targetElement) {
-        if (csnUtils.isAssociation(targetElement.type)) {
-          // association key
-          expandAssociationKey(key);
-        } else {
-          newResult.push(key);
-        }
-      } else {
-        // target element does not exist, warning is already reported, pass the key anyway
-        newResult.push(key);
-      }
-    });
-
-    function expandAssociationKey(key) {
-      let paths = key.$paths;
-      if (!paths) return;
-      let lastPath = paths[paths.length - 1];
-      let transitionPath = referenceFlattener.getElementTransition(lastPath)
-      if (transitionPath)
-        lastPath = transitionPath;
-      let generatedKeys = generatedForeignKeyNamesForPath[lastPath.join('/')];
-      if (!generatedKeys) return;
-      generatedKeys.forEach(fkName => {
-        let newFkRef = { ref: [fkName] };
-        if (key.as) {
-          let alias = fkName.replace(key.ref[0], key.as);
-          setProp(newFkRef, 'as', alias);
-        }
-        newResult.push(newFkRef);
-      })
-    } // expandAssociationKey
-
-    assoc.keys = newResult;
-
-  }
-
-  function fixCardinality(assoc) {
-    if (assoc.notNull) {
-      if (!assoc.cardinality) {
-        assoc.cardinality = {};
-      }
-      if (assoc.cardinality.min === undefined) {
-        assoc.cardinality.min = 1;
-      }
-    }
-  }
-
-  /**
-   * Generates foreign keys and returns their names as an array
-   */
-  function generateForeignKeys(definitionName, structuralNodeName, assocName, assoc, parent, path) {
-    let foreignKeyElements = Object.create(null);
-
-    // First, loop over the keys array of the association and generate the FKs.
-    // The result of all the FKs for the given association is accumulated
-    // in the 'foreignKeyElements' dictionary
-    assoc.keys.forEach( (key, keyIndex) => {
-      let keyPath = path.concat('keys', keyIndex);
-
-      let foreignKeyElementsForKey = generateForeignKeysForRef(assoc, assocName, key, keyPath);
-      Object.assign(foreignKeyElements, foreignKeyElementsForKey);
-    });
-
-    // After that, add the new elements to the definition.
-    // At the same time:
-    //    -> Check for coliding element's name
-    //      &
-    //    -> Propagate annotations from the association
-    if (parent.items) // proceed to items of such
-      parent = parent.items;
-    if (parent.returns)
-      parent = parent.returns.items || parent.returns;
-
-    const dictionary = parent[structuralNodeName];
-    let currElementsNames = Object.keys(parent[structuralNodeName]);
-    for (const [foreignKeyName, foreignKey] of Object.entries(foreignKeyElements)) {
-      copyAnnotations(assoc, foreignKey, true);
-      // Insert artificial element into artifact, with all cross-links
-      if (dictionary[foreignKeyName]) {
-        if (!(dictionary[foreignKeyName]['@odata.foreignKey4'] || isDeepEqual(dictionary[foreignKeyName], foreignKey))) {
-          const path = dictionary[foreignKeyName].$path;
-          error(null, path, { name: foreignKeyName, art: assocName }, 'Generated foreign key element $(NAME) for association $(ART) conflicts with existing element');
-        }
-      }
-    }
-
-    // make sure the generated foreign key(s) is added right after the association (that it belongs to) in the elements dictionary
-    const assocIndex = currElementsNames.findIndex(elemName => elemName === assocName);
-    // if (flatKeys)
-    currElementsNames.splice(assocIndex + 1, 0, ...Object.keys(foreignKeyElements));
-
-    parent[structuralNodeName] = currElementsNames.reduce((previous, name) => {
-      previous[name] = dictionary[name] || foreignKeyElements[name];
-      return previous;
-    }, Object.create(null));
-
-    return Object.keys(foreignKeyElements);
-  }
-
-  // FIXME: Very similar code to
-  // transformUtilsNew::getForeignKeyArtifact & createForeignKeyElement
-  // Can this be streamlined?
-  function generateForeignKeysForRef(assoc, assocName, foreignKeyRef, pathInKeysArr, foreignKey4 = assocName) {
-    // in structured OData, might be more than one generated FKs
-    let generatedFks = Object.create(null);
-    const fkArtifact = csnUtils.inspectRef(pathInKeysArr).art;
-    if(fkArtifact) {
-      if (csnUtils.isStructured(fkArtifact)) {
-        processStucturedKey(fkArtifact, assocName, foreignKeyRef);
-      } else {
-      // built-in
-        const foreignKeyElementName = `${assocName.replace(/\./g, '_')}_${foreignKeyRef.as || foreignKeyRef.ref.join('_')}`;
-        newForeignKey(fkArtifact, foreignKeyElementName);
-      }
-    }
-
-    return generatedFks;
-
-    function processStucturedKey(fkArtifact, assocName, foreignKeyRef) {
-      const subStruct = fkArtifact.elements ? fkArtifact : csnUtils.getFinalBaseType(fkArtifact.type);
-      const flatElements = flattenStructure(subStruct.elements, subStruct.$path, csnUtils, options, error, undefined, fkArtifact.$path.slice(-1) || []).newFlatElements;
-      for (const [flatElemName, flatElem] of Object.entries(flatElements)) {
-        const foreignKeyElementName =
-          `${assocName.replace(/\./g, '_')}_${foreignKeyRef.as ? flatElemName.replace(implicitAs(foreignKeyRef.ref), foreignKeyRef.as) : flatElemName}`;
-        newForeignKey(flatElem, foreignKeyElementName);
-      }
-    }
-
-    function newForeignKey(fkArtifact, foreignKeyElementName) {
-      if (fkArtifact.type === 'cds.Association' || fkArtifact.type === 'cds.Composition') {
-        processAssociationOrComposition(fkArtifact, foreignKeyElementName);
-        return;
-      }
-
-      // FIXME: better use transformUtlsNew::createRealFK(...);
-      let foreignKeyElement = Object.create(null);
-
-      // Transfer selected type properties from target key element
-      // FIXME: There is currently no other way but to treat the annotation '@odata.Type' as a type property.
-      for (let prop of ['type', 'length', 'scale', 'precision', 'srid', 'default', '@odata.Type']) {
-        if (fkArtifact[prop] !== undefined) {
-          foreignKeyElement[prop] = fkArtifact[prop];
-        }
-      }
-      // If the association is non-fkArtifact resp. key, so should be the foreign key field
-      for (let prop of ['notNull', 'key']) {
-        if (assoc[prop] !== undefined) {
-          foreignKeyElement[prop] = assoc[prop];
-        }
-      }
-
-      foreignKeyElement['@odata.foreignKey4'] = foreignKey4;
-      if (flatKeys) foreignKeyRef.$generatedFieldName = foreignKeyElementName;
-      setProp(foreignKeyElement, '$path', pathInKeysArr); // attach $path to the newly created element - used for inspectRef in processAssociationOrComposition
-      if (assoc.$location) {
-        setProp(foreignKeyElement, '$location', assoc.$location);
-      }
-      generatedFks[foreignKeyElementName] = foreignKeyElement;
-    }
-
-    function processAssociationOrComposition(fkArtifact, foreignKeyElementName) {
-      fkArtifact.keys.forEach((keyRef,keyId) => {
-        const path = fkArtifact.$path.concat('keys').concat(keyId);
-        const fksForAssoc = generateForeignKeysForRef(assoc, foreignKeyElementName, keyRef, path, foreignKey4);
-        Object.assign(generatedFks, fksForAssoc);
-      })
-    }
-  }
-}
-
-/**
- *
- * @param {object} obj
- * @param {*} other
- * @returns {boolean} Whether 'obj' and 'other' are deeply equal. We need the
- * deep comparison because of annotations that have structured values and they
- * are propagated to the generated foreign keys.
- */
-function isDeepEqual(obj, other) {
-  const objectKeys = Object.keys(obj);
-  const otherKeys = Object.keys(other);
-
-  if (objectKeys.length !== otherKeys.length)
-    return false;
-
-  for (let key of objectKeys) {
-    const areValuesObjects = (obj[key] != null && typeof obj[key] === 'object')
-      && (other[key] !== null && typeof other[key] === 'object');
-
-    if (areValuesObjects) {
-      if (!isDeepEqual(obj[key], other[key]))
-        return false;
-    } else if (obj[key] !== other[key]) {
-      return false;
-    }
-  }
-  return true;
-}