@sap/cds-compiler 2.5.0 → 2.10.4

package/lib/transform/universalCsnEnricher.js

@@ -0,0 +1,67 @@
+'use strict';
+
+const { forEachDefinition } = require('../base/model');
+const {
+  applyTransformations,
+  cloneCsn,
+  getUtils,
+  isBuiltinType,
+} = require('../model/csnUtils');
+
+/**
+ * Loop through a universal CSN and enrich it with the properties
+ * from the source definition - modifies the input model in-place
+ * 
+ * @param {CSN.Model} csn
+ * @param {CSN.Options} options
+ */
+module.exports = function(csn, options) {
+  let { getOrigin, getFinalType, getFinalTypeDef } = getUtils(csn);
+  // User-defined structured types do not have the elements propagated any longer
+  // if there is no association among the elements. For that reason,
+  // as a first step propagate the elements of these
+  forEachDefinition(csn, (def) => {
+    if (def.kind === 'type' && def.type && !def.elements) {
+      const finalType = getFinalType(def.type);
+      if (isBuiltinType(finalType)) return;
+      const finalTypeDef = getFinalTypeDef(def.type);
+      if (finalTypeDef.elements)
+        def.elements = cloneCsn(finalTypeDef.elements, options);
+    }
+  });
+
+  // as a second step, loop through all the $origin properties in the model
+  // and propagate the properties from the origin definition
+  applyTransformations(csn, {
+    '$origin': (node, _$orign, $originValue, _path, parent, propName) => {
+      if (!node.kind) { // we do not want to replace whole definitions
+        if (Array.isArray($originValue))
+          propagatePropsFromOrigin(node, propName, parent);
+        else if ($originValue.$origin && Array.isArray($originValue.$origin)) {
+          // cover the case of query entity elements where we have own and ihnerited attributes/annotations
+          propagatePropsFromOrigin($originValue, propName, parent);
+        }
+
+      }
+    }
+  }, undefined, undefined, options);
+
+  function propagatePropsFromOrigin(member, memberName, construct) {
+    // TODO: shall the $origin be kept as part of the element?
+    const origin = getOrigin(member);
+    if (origin.kind) return;
+    if (member.elements && origin.type) {
+      delete member.$origin;
+      member.type = origin.type;
+      return;
+    }
+    let newMember = cloneCsn(origin, options);
+    // keep targets and keys of assoc, if it was redirected
+    if (origin.type === 'cds.Association') {
+      newMember.target = member.target || newMember.target;
+      newMember.keys = member.keys || newMember.keys;
+    }
+    // TODO: check if this works fine for items/returns/actions
+    construct[memberName] = newMember;
+  }
+}

package/lib/utils/file.js

@@ -15,16 +15,6 @@ function splitLines(src) {
   return src.split(/\r\n?|\n/);
 }
 
-/**
- * Change Windows style line endings to Unix style
- *
- * @param {string} src
- * @returns {string}
- */
-function normalizeLineEndings(src) {
-  return (src && process.platform === 'win32') ? src.replace(/\r\n/g, '\n') : src;
-}
-
 /**
  * Returns filesystem utils readFile(), isFile(), realpath() for _CDS_ usage.
  * This includes a trace as well as usage of a file cache.
@@ -181,6 +171,5 @@ function cdsFs(fileCache, enableTrace) {
 
 module.exports = {
   splitLines,
-  normalizeLineEndings,
   cdsFs,
 };

package/lib/utils/moduleResolve.js

@@ -7,7 +7,6 @@
 
 const path = require('path');
 
-const { makeMessageFunction } = require('../base/messages');
 const { cdsFs } = require('./file');
 
 const DEFAULT_ENCODING = 'utf-8';
@@ -44,7 +43,7 @@ function adaptCdsModule(modulePath) {
  * @param {object} fileCache
  * @param {CSN.Options} options
  */
-function resolveModule( dep, fileCache, options ) {
+function resolveModule( dep, fileCache, options, messageFunctions ) {
   const _fs = cdsFs(fileCache, options.traceFs);
   // let opts = { extensions, basedir: dep.basedir, preserveSymlinks: false };
   // `preserveSymlinks` option does not really work -> provide workaround anyway...
@@ -96,7 +95,7 @@ function resolveModule( dep, fileCache, options ) {
       }
     }
   }).catch( () => {
-    _errorFileNotFound(dep, options);
+    _errorFileNotFound(dep, options, messageFunctions);
     return false;
   });
 }
@@ -107,7 +106,7 @@ function resolveModule( dep, fileCache, options ) {
  * @param {object} fileCache
  * @param {CSN.Options} options
  */
-function resolveModuleSync( dep, fileCache, options ) {
+function resolveModuleSync( dep, fileCache, options, messageFunctions ) {
   const _fs = cdsFs(fileCache, options.traceFs);
   const opts = {
     extensions,
@@ -129,7 +128,7 @@ function resolveModuleSync( dep, fileCache, options ) {
   });
 
   if (error) {
-    _errorFileNotFound(dep, options);
+    _errorFileNotFound(dep, options, messageFunctions);
     return false;
   }
 
@@ -148,7 +147,7 @@ function resolveModuleSync( dep, fileCache, options ) {
   }
 
   if (error) {
-    _errorFileNotFound(dep, options);
+    _errorFileNotFound(dep, options, messageFunctions);
     return false;
   }
 
@@ -161,8 +160,7 @@ function resolveModuleSync( dep, fileCache, options ) {
   return result;
 }
 
-function _errorFileNotFound(dep, options) {
-  const { error } = makeMessageFunction( null, options, 'compile' );
+function _errorFileNotFound(dep, options, { error }) {
   if (dep.resolved) {
     let resolved = path.relative( dep.basedir, dep.resolved );
     if (options.testMode)

package/package.json

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

package/lib/json/walker.js

@@ -1,26 +0,0 @@
-/**
- * Walker module provides non-recursive tree walkers with different flavours
- * @module json/walker
- */
-
-/**
- * Callback of the forEach function called for each node it walks
- * @callback forEachCallback
- * @param {string} name of the node
- * @param {object} node
- */
-
-/**
- * Loops over all elements in an object and calls the specified callback(key,obj)
- * @param {object} obj
- * @param {forEachCallback} callback
- */
-function forEach(obj, callback) {
-  for(var key in obj) {
-    callback(key, obj[key]);
-  }
-}
-
-module.exports = {
-  forEach,
-}

package/lib/utils/string.js

@@ -1,17 +0,0 @@
-'use strict';
-
-// String utils
-
-/**
- * Removes duplicate entries from the given string array.
- *
- * @param {string[]} strings Array of strings with duplicates
- * @returns {string[]} strings New array with unique strings
- */
-function uniqueStrings(strings) {
-  return [ ...new Set(strings) ];
-}
-
-module.exports = {
-  uniqueStrings,
-};