@sap/cds-compiler 3.4.4 → 3.5.2

package/lib/transform/transformUtilsNew.js

@@ -10,9 +10,9 @@ const { setProp } = require('../base/model');
 const { copyAnnotations, applyTransformations } = require('../model/csnUtils');
 const { cloneCsnNonDict, cloneCsnDictionary, getUtils } = require('../model/csnUtils');
 const { typeParameters, isBuiltinType } = require('../compiler/builtins');
-const { ModelError } = require("../base/error");
+const { ModelError } = require('../base/error');
 const { forEach } = require('../utils/objectUtils');
-const { pathName } = require("../compiler/utils");
+const { pathName } = require('../compiler/utils');
 
 const RestrictedOperators = ['<', '>', '>=', '<='];
 const RelationalOperators = ['=', '!=', '<>', 'is' /*, 'like'*/,...RestrictedOperators];

package/lib/transform/translateAssocsToJoins.js

@@ -12,16 +12,16 @@ const { timetrace } = require('../utils/timetrace');
 const internalArtifactKinds = ['builtin', '$parameters', 'param'];
 
 function translateAssocsToJoinsCSN(csn, options){
-  timetrace.start('Recompiling model');
+  timetrace.start('A2J: Recompiling model');
   // Do not re-complain about localized
   const compileOptions = { ...options, $skipNameCheck: true };
   delete compileOptions.csnFlavor;
   const model = recompileX(csn, compileOptions);
-  timetrace.stop();
-  timetrace.start('Translating associations to joins');
+  timetrace.stop('A2J: Recompiling model');
+  timetrace.start('A2J: Translating associations to joins');
   translateAssocsToJoins(model, options);
-  timetrace.stop();
-  timetrace.start('Post-processing columns');
+  timetrace.stop('A2J: Translating associations to joins');
+  timetrace.start('A2J: Post-processing columns');
   // Use the effective elements list as columns
   forEachDefinition(model, art => {
     if (art.$queries) {
@@ -36,7 +36,7 @@ function translateAssocsToJoinsCSN(csn, options){
       }
     }
   });
-  timetrace.stop();
+  timetrace.stop('A2J: Post-processing columns');
 
   if (options.messages) {
     // Make sure that we don't complain twice about the same things
@@ -46,8 +46,7 @@ function translateAssocsToJoinsCSN(csn, options){
   // If A2J reports error - end! Continuing with a broken CSN makes no sense
   makeMessageFunction(model, options).throwWithAnyError();
   // FIXME: Move this somewhere more appropriate
-  const compact = compactModel(model, compileOptions);
-  return compact;
+  return compactModel(model, compileOptions);
 }
 
 function translateAssocsToJoins(model, inputOptions = {})
@@ -329,9 +328,10 @@ function translateAssocsToJoins(model, inputOptions = {})
 
       for(let i = 0; i < tail.length-1; i++) {
         if(tail[i]._navigation && tail[i]._navigation.$njr) {
-          // the correct flattened foreign key must match the leaf artifact of this path
+          // the correct flattened foreign key must match the leaf artifact and access path prefix of this path
           const leafArt = tail[tail.length-1]._artifact;
-          const fk = tail[i]._artifact.$flatSrcFKs.find(f => f._artifact === leafArt);
+          const tailPath = tail.map(p=>p.id).join(pathDelimiter);
+          const fk = tail[i]._artifact.$flatSrcFKs.find(f => f._artifact === leafArt && f.acc.startsWith(tailPath));
           if(!fk) {
             // const revealInternalProperties = require('../model/revealInternalProperties.js');
             // console.log('++++++++ Path tail: ', revealInternalProperties(tail[tail.length-1]._artifact));
@@ -565,7 +565,7 @@ function translateAssocsToJoins(model, inputOptions = {})
           QATs until a QA has been found).
         */
         if(!assoc.$flatSrcFKs)
-          setProp(assoc, '$flatSrcFKs', flattenElement(assoc, true, assoc.name.id));
+          setProp(assoc, '$flatSrcFKs', flattenElement(assoc, true, assoc.name.id, assoc.name.id));
         if(!assoc.$flatTgtFKs)
           setProp(assoc, '$flatTgtFKs', flattenElement(assoc, false));
 
@@ -664,7 +664,8 @@ function translateAssocsToJoins(model, inputOptions = {})
           }
           // If this is a backlink condition, produce the
           // ON cond of the forward assoc with swapped src/tgt aliases
-          else if(i < args.length-2 && args[i].path && args[i+1] === '=' && args[i+2].path)
+          else if(i < args.length-2 && args[i].path &&
+                  args[i+1]?.literal === 'token' && args[i+1]?.val === '=' && args[i+2].path)
           {
             let fwdAssoc = getForwardAssociation(args[i].path, args[i+2].path);
             if(fwdAssoc)
@@ -1088,11 +1089,11 @@ function translateAssocsToJoins(model, inputOptions = {})
     respecting the src or the target side of the ON condition.
     Return an array of column names and it's leaf element.
    */
-  function flattenElement(element, srcSide, prefix)
+  function flattenElement(element, srcSide, prefix, acc)
   {
     // terminate if element is unstructured
     if(!element.foreignKeys && !element.elements)
-      return [ { id: prefix, _artifact: element } ];
+      return [ { id: prefix, _artifact: element, acc } ];
 
     let paths = [];
     // get paths of managed assocs (unmanaged assocs are not allowed in FK paths)
@@ -1103,7 +1104,7 @@ function translateAssocsToJoins(model, inputOptions = {})
         let fk = element.foreignKeys[fkn];
         // once a fk is to be followed, treat all sub patsh as srcSide, this will add fk.name.id only
         if(srcSide)
-          paths = paths.concat(flattenElement(fk.targetElement._artifact, true,  fk.name.id));
+          paths = paths.concat(flattenElement(fk.targetElement._artifact, true,  fk.name.id, fk.targetElement.path.map(ps => ps.id).join(pathDelimiter)));
         else
         {
           // consume path segments until the next assoc and substitute against fk alias until path is eaten up
@@ -1113,7 +1114,7 @@ function translateAssocsToJoins(model, inputOptions = {})
             [tail, fkPrefix] = substituteFKAliasForPath(assocStep, tail, fkPrefix);
             [assocStep, tail, fkPrefix] = pathAsStringUpToAssoc(tail, fkPrefix);
           }
-          paths = paths.concat(flattenElement(fk.targetElement._artifact, true, fkPrefix));
+          paths = paths.concat(flattenElement(fk.targetElement._artifact, true, fkPrefix, fk.targetElement.path.map(ps => ps.id).join(pathDelimiter)));
         }
       }
     }
@@ -1123,11 +1124,15 @@ function translateAssocsToJoins(model, inputOptions = {})
       for(let n in element.elements)
       {
         let elt = element.elements[n];
-        paths = paths.concat(flattenElement(elt, true, elt.name.id));
+        paths = paths.concat(flattenElement(elt, true, elt.name.id, elt.name.id));
       }
     }
     return paths.map(p => {
-      return { id: (prefix ? prefix + pathDelimiter : '' ) + p.id, _artifact: p._artifact }
+      return {
+        id: (prefix ? prefix + pathDelimiter : '' ) + p.id, 
+        acc: (acc ? acc + pathDelimiter : '') + p.acc,
+        _artifact: p._artifact
+      }
     } );
   }
 
@@ -1556,7 +1561,7 @@ function translateAssocsToJoins(model, inputOptions = {})
           if(!qat[qatChildrenName]) {
             setProp(qat, '$njr', true);
             // flatten left hand side ON condition paths ( => foreign keys to the source side)
-            setProp(art, '$flatSrcFKs', flattenElement(art, true, art.name.id));
+            setProp(art, '$flatSrcFKs', flattenElement(art, true, art.name.id, art.name.id));
           }
         }
         else {

package/lib/transform/universalCsn/coreComputed.js

@@ -10,17 +10,17 @@ const { setAnnotationIfNotDefined } = require('./utils');
  *
  * @param {CSN.Model} csn
  */
-function setCoreComputedOnViews(csn) {
+function setCoreComputedOnViews( csn ) {
   const {
     artifactRef, getColumn, getElement, getOrigin,
   } = getUtils(csn, 'init-all');
 
-  forEachDefinition(csn, (artifact) => {
+  forEachDefinition(csn, (artifact, name, prop, path) => {
     if (artifact.query || artifact.projection) {
       forAllQueries(getNormalizedQuery(artifact).query, (query) => {
         if (query.SELECT)
           traverseQueryAndAttachCoreComputed(query, query.SELECT.elements || artifact.elements);
-      });
+      }, path);
     }
   });
   /**
@@ -33,7 +33,7 @@ function setCoreComputedOnViews(csn) {
    * @param {CSN.Query} query
    * @param {CSN.Elements} elements
    */
-  function traverseQueryAndAttachCoreComputed(query, elements) {
+  function traverseQueryAndAttachCoreComputed( query, elements ) {
     for (const [ name, element ] of Object.entries(elements)) {
       const ancestor = getAncestor(element, name, query.SELECT);
 
@@ -53,7 +53,7 @@ function setCoreComputedOnViews(csn) {
      * @param {CSN.QuerySelect} base
      * @returns {CSN.Column|CSN.Element}
      */
-    function getAncestor(element, name, base) {
+    function getAncestor( element, name, base ) {
       const column = getColumn(element);
       if (column)
         return column;
@@ -81,7 +81,7 @@ function setCoreComputedOnViews(csn) {
      * @returns {CSN.Element}
      * @todo cleanup throw(s) - but leave in during dev
      */
-    function getElementFromFrom(name, base) {
+    function getElementFromFrom( name, base ) {
       if (base.SELECT && base.SELECT.elements) {
         return getAncestor(base.SELECT.elements[name], name, base.SELECT);
       }
@@ -108,7 +108,7 @@ function setCoreComputedOnViews(csn) {
      * @param {string} name
      * @returns {CSN.Element|null} Null if no element was found
      */
-    function checkJoinSources(args, name) {
+    function checkJoinSources( args, name ) {
       for (const arg of args) {
         if (arg.args) { // Join after join - A join B on <..> join C on <..>
           const result = checkJoinSources(arg.args, name);
@@ -130,7 +130,7 @@ function setCoreComputedOnViews(csn) {
      *
      * @param {CSN.Column} column
      */
-    function attachCoreComputed(column) {
+    function attachCoreComputed( column ) {
       if (needsCoreComputed(column))
         setAnnotationIfNotDefined(getElement(column), '@Core.Computed', true);
     }
@@ -141,7 +141,7 @@ function setCoreComputedOnViews(csn) {
      * @param {CSN.Column} column
      * @returns {boolean}
      */
-    function needsCoreComputed(column) {
+    function needsCoreComputed( column ) {
       return column &&
         (
           column.xpr || column.func || column.val !== undefined || column.param || column.SELECT || column.SET ||
@@ -155,7 +155,7 @@ function setCoreComputedOnViews(csn) {
      * @param {CSN.Column} column
      * @param {Function} callback
      */
-    function traverseExpandInline(column, callback) {
+    function traverseExpandInline( column, callback ) {
       if (column.expand) {
         column.expand.forEach((col) => {
           callback(col);

package/lib/transform/universalCsn/universalCsnEnricher.js

@@ -206,7 +206,7 @@ module.exports = (csn, options) => {
      * @param {object} root
      * @returns {object|string|null}
      */
-    function getTargetAspectBase(root) {
+    function getTargetAspectBase( root ) {
       if (root.target && root.target.elements) {
         return root.target;
       }
@@ -229,7 +229,7 @@ module.exports = (csn, options) => {
      * @see getTargetAspectBase for details on how we find our "start"
      * @param {object} root
      */
-    function setTargetAspectIfRequired(root) {
+    function setTargetAspectIfRequired( root ) {
       if (root.$origin || root.target && root.target.elements) {
         const base = getTargetAspectBase(root);
         if (base && (base.elements || typeof base === 'string' && csn.definitions[base].kind === 'aspect')) {
@@ -324,7 +324,7 @@ module.exports = (csn, options) => {
      *                                     of the `member`
      * @param {object}       [force=null]  Overwrite any member propagation rules or any except and always propagate the corresponding keys
      */
-    function propagateMemberPropsFromOrigin(member, except = null, force = null) {
+    function propagateMemberPropsFromOrigin( member, except = null, force = null ) {
       const memberChain = getOriginChain(member);
       const virtualOrigin = Object.create(null); // To collect stuff across the origin chain - currently only for .items via type-of
 
@@ -359,7 +359,7 @@ module.exports = (csn, options) => {
        * @returns {boolean} whether props from the members origin should be propagated
        * @todo check if still necessary
        */
-      function skipMemberPropagation(origin) {
+      function skipMemberPropagation( origin ) {
       // For empty members (`{}`), the origin was set in a previous call to `getOrigin(definition)`.
         return !origin;
       }
@@ -374,7 +374,7 @@ module.exports = (csn, options) => {
      * @param {CSN.Element} target
      * @param {CSN.Element} source
      */
-    function onlyWithTypeRef(prop, target, source) {
+    function onlyWithTypeRef( prop, target, source ) {
       const typeIsTypeRef = Boolean(typeof target.type === 'object' && target.type.ref);
       if (typeIsTypeRef) {
         const referencedArtifact = csn.definitions[target.type.ref[0]];
@@ -390,7 +390,7 @@ module.exports = (csn, options) => {
    *
    * @param {object} art Target object for propagation
    */
-  function propagateOnArtifactLevel(art) {
+  function propagateOnArtifactLevel( art ) {
     // check if art was already processed by the status flag
     // TODO: clean up later on, together with validator clean up probably or
     //       when this module is meant to be used standalone -> use internal cache to store already processed definitions?
@@ -407,7 +407,7 @@ module.exports = (csn, options) => {
      * @param {CSN.Element} targetsOrigin
      * @param {CSN.Element} rootOrigin
      */
-    function definitionPropagation(targetDefinition, targetsOrigin, rootOrigin) {
+    function definitionPropagation( targetDefinition, targetsOrigin, rootOrigin ) {
       // if target was already processed -> continue
       if (targetDefinition._status === 'propagated')
         return;
@@ -430,7 +430,7 @@ module.exports = (csn, options) => {
        * @param {CSN.Definition|CSN.Element} source
        * @param {CSN.Definition|CSN.Element} root
        */
-      function propagateDefProps(definition, source, root) {
+      function propagateDefProps( definition, source, root ) {
         copyProperties(source, definition, getDefinitionPropagationRuleFor);
         // If $origin is an object, it is the anonymous prototype of `definition`
         // e.g. for structure includes annotations are part of the $origin object and must be copied over to the `definition`
@@ -454,7 +454,7 @@ module.exports = (csn, options) => {
      * @param {CSN.Artifact|CSN.Element} start
      * @returns {CSN.Artifact|CSN.Element|null} Null if no origin with .elements was found
      */
-    function getFirstOriginWithElements(start) {
+    function getFirstOriginWithElements( start ) {
       let target = start;
       let firstOriginWithElements;
       do {
@@ -479,7 +479,7 @@ module.exports = (csn, options) => {
    * @returns {object[]} chain of origin - target
    * @todo Optimize: Only return the chain until the first propagated thing?
    */
-  function getOriginChain(start) {
+  function getOriginChain( start ) {
     const chain = [];
     let target = start;
     let origin;
@@ -504,7 +504,7 @@ module.exports = (csn, options) => {
    * @param {CSN.Query} query
    * @param {CSN.Artifact} artifact
    */
-  function propagateToPublishedMixin(query, artifact) {
+  function propagateToPublishedMixin( query, artifact ) {
     const elements = query.SELECT.elements || artifact.elements;
     forEachValue(elements, (element) => {
       if (element.target) {
@@ -520,7 +520,7 @@ module.exports = (csn, options) => {
   /**
    * @param {CSN.Element} member
    */
-  function calculateForeignKeys(member) {
+  function calculateForeignKeys( member ) {
     // managed assocs in universal CSN have no longer keys
     // if they are not explicitly defined - PR#8064
     const target = artifactRef(member.target);
@@ -538,7 +538,7 @@ module.exports = (csn, options) => {
    * @param {CSN.Definition} target
    * @param {CSN.Definition} source
    */
-  function onlyViaArtifact(prop, target, source) {
+  function onlyViaArtifact( prop, target, source ) {
     if (!target.kind)
       return;
     const primarySourceRef = getQueryPrimarySource(target.query || target.projection);
@@ -553,7 +553,7 @@ module.exports = (csn, options) => {
    * @param {string} key identifier of the csn prop we are looking for
    * @returns {Function} which can be used to apply custom propagation rules for certain props
    */
-  function getMemberPropagationRuleFor(key) {
+  function getMemberPropagationRuleFor( key ) {
     return memberPropagationRules[key] || memberPropagationRules[key.charAt(0)] || getDefinitionPropagationRuleFor(key);
   }
 
@@ -563,7 +563,7 @@ module.exports = (csn, options) => {
    * @param {string} key identifier of the csn prop we are looking for
    * @returns {Function} which can be used to apply custom propagation rules for certain props
    */
-  function getDefinitionPropagationRuleFor(key) {
+  function getDefinitionPropagationRuleFor( key ) {
     return definitionPropagationRules[key] || definitionPropagationRules[key.charAt(0)];
   }
 
@@ -573,7 +573,7 @@ module.exports = (csn, options) => {
    * @param {CSN.Artifact} parent
    * @param {CSN.Artifact} rootArtifact The artifact that had the localized
    */
-  function attachAnnosForTextsTable(parent, rootArtifact) {
+  function attachAnnosForTextsTable( parent, rootArtifact ) {
     const isFioriDraftEnabled = rootArtifact && (rootArtifact['@fiori.draft.enabled'] === true || getOriginChain(rootArtifact).some(({ origin }) => origin['@fiori.draft.enabled'] === true));
     if (isFioriDraftEnabled) {
       setAnnotationIfNotDefined(parent, '@assert.unique.locale', [ { '=': 'locale' } ]);
@@ -606,7 +606,7 @@ module.exports = (csn, options) => {
  * @param {object} [except=null] array of properties which should not be propagated
  * @param {object} [force=null] Force propagation of the contained keys via a custom rule.
  */
-function copyProperties(from, to, getCustomRule, except = null, force = null) {
+function copyProperties( from, to, getCustomRule, except = null, force = null ) {
   const keys = Object.keys(from);
   // Copy over properties from the origin element to the target.
   for (const key of keys) {
@@ -626,7 +626,7 @@ function copyProperties(from, to, getCustomRule, except = null, force = null) {
  * @param {object} elements
  * @returns {boolean} whether some element in the elements has an annotation
  */
-function hasAnnotationOnSubelement(elements) {
+function hasAnnotationOnSubelement( elements ) {
   for (const element of Object.values(elements)) {
     if (Object.keys(element).some(key => key.startsWith('@')))
       return true;
@@ -654,7 +654,7 @@ function skip() {
  * @param {object} target
  * @param {object} source
  */
-function always(prop, target, source) {
+function always( prop, target, source ) {
   const val = source[prop];
   if (Array.isArray(val))
     target[prop] = [ ...val ];
@@ -669,7 +669,7 @@ function always(prop, target, source) {
  * @param {CSN.Definition} target
  * @param {CSN.Definition} source
  */
-function onlyTypeDef(prop, target, source) {
+function onlyTypeDef( prop, target, source ) {
   if (target.kind !== 'type')
     return;
   target[prop] = source[prop];
@@ -684,7 +684,7 @@ function onlyTypeDef(prop, target, source) {
  * @param {object} target
  * @param {object} source
  */
-function notWithPersistenceTable(prop, target, source) {
+function notWithPersistenceTable( prop, target, source ) {
   const tableAnno = target['@cds.persistence.table'];
   if (tableAnno === undefined || tableAnno === null)
     target[prop] = source[prop];
@@ -699,7 +699,7 @@ function notWithPersistenceTable(prop, target, source) {
  * @param {CSN.Element} target
  * @param {CSN.Element} source
  */
-function notWithTypeOrigin(prop, target, source) {
+function notWithTypeOrigin( prop, target, source ) {
   if (source.kind !== 'type')
     target[prop] = source[prop];
 }
@@ -712,7 +712,7 @@ function notWithTypeOrigin(prop, target, source) {
  * @param {CSN.Element} target
  * @param {CSN.Element} source
  */
-function nullStopsPropagation(prop, target, source) {
+function nullStopsPropagation( prop, target, source ) {
   if (source[prop] !== null)
     target[prop] = source[prop];
 }
@@ -732,7 +732,7 @@ function nullStopsPropagation(prop, target, source) {
  * @param {CSN.Element} target
  * @param {CSN.Element} source
  */
-function specialItemsRules(prop, target, source) {
+function specialItemsRules( prop, target, source ) {
   if (source.kind !== 'type' && ((!source.type && !target.type) || !(source[prop].type && source[prop].type.ref || !isBuiltinType(source[prop].type))))
     target[prop] = source[prop];
 }
@@ -746,7 +746,7 @@ function specialItemsRules(prop, target, source) {
  * @param {CSN.Element} target
  * @param {CSN.Element} source
  */
-function notWithItemsOrElements(prop, target, source) {
+function notWithItemsOrElements( prop, target, source ) {
   if (!target.items && !target.elements || !source.target)
     target[prop] = source[prop];
 }
@@ -759,7 +759,7 @@ function notWithItemsOrElements(prop, target, source) {
  * @param {CSN.Element} target
  * @param {CSN.Element} source
  */
-function notWithTypeRef(prop, target, source) {
+function notWithTypeRef( prop, target, source ) {
   const typeIsTypeRef = Boolean(typeof target.type === 'object' && target.type.ref);
   if (!typeIsTypeRef)
     target[prop] = source[prop];

package/lib/transform/universalCsn/utils.js

@@ -12,7 +12,7 @@ const { setProp } = require('../../base/model');
  * @param {string} name Name of the annotations
  * @param {any} value Value of the annotation
  */
-function setAnnotationIfNotDefined(carrier, name, value) {
+function setAnnotationIfNotDefined( carrier, name, value ) {
   if (carrier[name] === undefined)
     carrier[name] = value;
 }
@@ -26,7 +26,7 @@ function setAnnotationIfNotDefined(carrier, name, value) {
  *
  * @param {CSN.Model} csn
  */
-function makeClientCompatible(csn) {
+function makeClientCompatible( csn ) {
   applyTransformations(csn, {
     actions: removeNullProperty,
     notNull: removeNullProperty,
@@ -52,7 +52,7 @@ function makeClientCompatible(csn) {
  * @param {object} node
  * @param {string} prop
  */
-function removeNullProperty(node, prop) {
+function removeNullProperty( node, prop ) {
   if (node[prop] === null)
     delete node[prop];
 }

package/lib/utils/file.js

@@ -12,7 +12,7 @@ const util = require('util');
  * @param {string} src
  * @returns {string[]}
  */
-function splitLines(src) {
+function splitLines( src ) {
   return src.split(/\r\n?|\n/);
 }
 
@@ -27,7 +27,7 @@ function splitLines(src) {
  * @param {object} fileCache
  * @param {boolean} enableTrace
  */
-function cdsFs(fileCache, enableTrace) {
+function cdsFs( fileCache, enableTrace ) {
   const readFile = _wrapReadFileCached(fs.readFile);
   const readFileSync = _wrapReadFileCached((filename, enc, cb) => {
     try {
@@ -60,11 +60,11 @@ function cdsFs(fileCache, enableTrace) {
     realpathSync,
   };
 
-  function realpath(path, cb) {
+  function realpath( path, cb ) {
     return fs.realpath.native(path, cb);
   }
 
-  function realpathSync(path, cb) {
+  function realpathSync( path, cb ) {
     try {
       cb(null, fs.realpathSync.native(path));
     }
@@ -133,7 +133,7 @@ function cdsFs(fileCache, enableTrace) {
    *
    * @param {(filename: string, cb: (err, data) => void) => void} fsStat
    */
-  function _wrapIsFileCached(fsStat) {
+  function _wrapIsFileCached( fsStat ) {
     return ( filename, cb ) => {
       let body = fileCache[filename];
       if (body !== undefined) {

package/lib/utils/moduleResolve.js

@@ -30,7 +30,7 @@ const extensions = [ '.cds', '.csn', '.json' ];
  * @param {CSN.Options} options
  * @returns {string}
  */
-function adaptCdsModule(modulePath, options = {}) {
+function adaptCdsModule( modulePath, options = {} ) {
   if (modulePath.startsWith( '@sap/cds/' )) {
     if (options.cdsHome)
       return options.cdsHome + modulePath.slice(8);
@@ -166,7 +166,7 @@ function resolveModuleSync( dep, fileCache, options, messageFunctions ) {
   return result;
 }
 
-function _errorFileNotFound(dep, options, { error }) {
+function _errorFileNotFound( dep, options, { error } ) {
   if (dep.resolved) {
     let resolved = path.relative( dep.basedir, dep.resolved );
     if (options.testMode)
@@ -204,7 +204,7 @@ function _errorFileNotFound(dep, options, { error }) {
  * @param {ResolveOptions} options
  * @param {(err, result) => void} callback
  */
-function resolveCDS(moduleName, options, callback) {
+function resolveCDS( moduleName, options, callback ) {
   const isWindows = (process.platform === 'win32');
   let resolvedBaseDir = path.resolve(options.basedir);
 
@@ -252,7 +252,7 @@ function resolveCDS(moduleName, options, callback) {
    * @param {string} absoluteModulePath
    * @param {(err, filepath: string|null) => void} cb
    */
-  function loadAsLocalFileOrDirectory(absoluteModulePath, cb) {
+  function loadAsLocalFileOrDirectory( absoluteModulePath, cb ) {
     loadAsFile(absoluteModulePath, (err, filepath) => {
       if (!err && filepath)
         cb(null, filepath);
@@ -268,7 +268,7 @@ function resolveCDS(moduleName, options, callback) {
    * @param {string} absoluteModulePath
    * @param {(err, filepath: string|null) => void} cb
    */
-  function loadAsFile(absoluteModulePath, cb) {
+  function loadAsFile( absoluteModulePath, cb ) {
     const extensionsToTry = [ '' ].concat(options.extensions);
     loadFileWithExtensions(extensionsToTry);
 
@@ -277,7 +277,7 @@ function resolveCDS(moduleName, options, callback) {
      *
      * @param {string[]} exts The extensions to try. Loaded in the order of the array.
      */
-    function loadFileWithExtensions(exts) {
+    function loadFileWithExtensions( exts ) {
       if (exts.length === 0) {
         // If we reach this point then no file with the given extensions could be found.
         cb(makeNotFoundError(), null);
@@ -300,7 +300,7 @@ function resolveCDS(moduleName, options, callback) {
    * @param {string} absoluteModulePath
    * @param {(err, filepath: string|null) => void} cb
    */
-  function loadAsDirectory(absoluteModulePath, cb) {
+  function loadAsDirectory( absoluteModulePath, cb ) {
     loadAndParsePackageJsonInDirectory(absoluteModulePath, (packageErr, packageJson) => {
       const main = packageCdsMain(packageJson);
       if (!packageErr && main)
@@ -309,7 +309,7 @@ function resolveCDS(moduleName, options, callback) {
         loadIndex();
     });
 
-    function loadMain(main) {
+    function loadMain( main ) {
       const file = path.join(absoluteModulePath, main);
       loadAsFile(file, (fileErr, filePath) => {
         if (!fileErr && filePath)
@@ -337,11 +337,11 @@ function resolveCDS(moduleName, options, callback) {
    *
    * @param {string} absoluteDir
    */
-  function loadNodeModules(absoluteDir) {
+  function loadNodeModules( absoluteDir ) {
     const dirs = nodeModulesPaths(absoluteDir);
     loadFromNodeDirs(dirs);
 
-    function loadFromNodeDirs(nodeDirs) {
+    function loadFromNodeDirs( nodeDirs ) {
       const dir = nodeDirs.shift();
       if (!dir) {
         // We're at root
@@ -365,7 +365,7 @@ function resolveCDS(moduleName, options, callback) {
    * @param {string} packageDir
    * @param {(err, json) => void} cb
    */
-  function loadAndParsePackageJsonInDirectory(packageDir, cb) {
+  function loadAndParsePackageJsonInDirectory( packageDir, cb ) {
     const file = path.join(packageDir, 'package.json');
 
     options.readFile(file, DEFAULT_ENCODING, (err, content) => {
@@ -390,7 +390,7 @@ function resolveCDS(moduleName, options, callback) {
    * @param {string} absoluteStart
    * @returns {string[]} Array of possible "node_modules" folders for the given path.
    */
-  function nodeModulesPaths(absoluteStart) {
+  function nodeModulesPaths( absoluteStart ) {
     // Use platform-dependent separator.  All NodeJS `path` methods use the system's path separator.
     const parts = absoluteStart.split(path.sep);
     // Do NOT use global node_modules directories.
@@ -429,7 +429,7 @@ function resolveCDS(moduleName, options, callback) {
  *
  * @param {string} moduleName
  */
-function isLocalFile(moduleName) {
+function isLocalFile( moduleName ) {
   // Starts with or is equal to '..'
   // Starts with '/'
   // Starts with 'C:/' or 'C:\'