@sap/cds-compiler 2.10.2 → 2.11.4

package/lib/compiler/index.js

@@ -1,5 +1,17 @@
 // Main XSN-based compiler functions
 
+// ...
+
+// How functions are shared across the Core Compiler sub modules:
+
+// - Shared XSN-related functions which do not use a context are in utils.js,
+//   they are `require`d as usual at the beginning of sub modules.
+// - The XSN is the only context which context-dependent functions can depend on.
+// - Sharing such a function is by adding it to `‹xsn›.$functions`,
+//   e.g. `resolvePath` and similar will be attached to the XSN.
+// - Functions which might be overwritten in a next sub module
+//   are added to `‹xsn›.$volatileFunctions`, currently just `environment`.
+
 'use strict';
 
 const { resolveModule, resolveModuleSync } = require('../utils/moduleResolve');
@@ -8,12 +20,12 @@ const parseCsn = require('../json/from-csn');
 
 const assertConsistency = require('./assert-consistency');
 const moduleLayers = require('./moduleLayers');
+const { fns } = require('./shared');
 const { define } = require('./definer');
 const resolve = require('./resolver');
 const propagator = require('./propagator');
 const check = require('./checks');
 
-
 const { emptyWeakLocation } = require('../base/location');
 const { createMessageFunctions, deduplicateMessages } = require('../base/messages');
 const { promiseAllDoNotRejectImmediately } = require('../base/node-helpers');
@@ -110,7 +122,6 @@ function compileX( filenames, dir = '', options = {}, fileCache = Object.create(
   //   fileCache = Object.assign( Object.create(null), fileCache );
   dir = path.resolve(dir);
   const a = processFilenames( filenames, dir );
-  a.fileContentDict = Object.create(null);
 
   const model = { sources: a.sources, options };
   model.$messageFunctions = createMessageFunctions( options, 'compile', model );
@@ -132,37 +143,25 @@ function compileX( filenames, dir = '', options = {}, fileCache = Object.create(
   });
 
   // Read file `filename` and parse its content, return messages
-  function readAndParse( filename ) {
+  async function readAndParse( filename ) {
+    const { sources } = a;
     if ( filename === false )   // module which has not been found
       return [];
-    const rel = a.sources[filename] || path.relative( dir, filename );
+    const rel = sources[filename] || path.relative( dir, filename );
     if (typeof rel === 'object') // already parsed
       return [];                 // no further dependency processing
     // no parallel readAndParse with same resolved filename should read the file,
-    // also ensure deterministic sequence in a.sources:
-    a.sources[filename] = { location: { file: rel } };
+    // also ensure deterministic sequence in sources:
+    sources[filename] = { location: { file: rel } };
 
-    return new Promise( (fulfill, reject) => {
-      cdsFs( fileCache, options.traceFs ).readFile( filename, 'utf8', (err, source) => {
-        if (err) {
-          reject(err);
-        }
-        else {
-          try {
-            a.fileContentDict[filename] = source;
-            const ast = parseX( source, rel, options, model.$messageFunctions );
-            a.sources[filename] = ast;
-            ast.location = { file: rel };
-            ast.dirname = path.dirname( filename );
-            assertConsistency( ast, options );
-            fulfill( ast );
-          }
-          catch (e) {
-            reject( e );
-          }
-        }
-      });
-    });
+    const source = await cdsFs( fileCache, options.traceFs ).readFileAsync( filename, 'utf8' );
+    const ast = parseX( source, rel, options, model.$messageFunctions );
+    sources[filename] = ast;
+    ast.location = { file: rel };
+    ast.dirname = path.dirname( filename );
+    assertConsistency( ast, options );
+
+    return ast;
   }
 
   // Combine the parse results (if there are not file IO errors)
@@ -220,7 +219,6 @@ function compileSyncX( filenames, dir = '', options = {}, fileCache = Object.cre
   // absolute file names - they start with `/` or `\` or similar
   dir = path.resolve(dir);
   const a = processFilenames( filenames, dir );
-  a.fileContentDict = Object.create(null);
 
   const model = { sources: a.sources, options };
   model.$messageFunctions = createMessageFunctions( options, 'compile', model );
@@ -281,7 +279,6 @@ function compileSyncX( filenames, dir = '', options = {}, fileCache = Object.cre
       }
       else {
         try {
-          a.fileContentDict[filename] = source;
           const ast = parseX( source, rel, options, model.$messageFunctions );
           a.sources[filename] = ast;
           ast.location = { file: rel };
@@ -416,6 +413,9 @@ function compileDoX( model ) {
     throwWithError();
     return model;
   }
+  model.$functions = {};
+  model.$volatileFunctions = {};
+  fns( model );                 // attach (mostly) paths functions
   define( model );
   // do not run the resolver in parse-cdl mode or we get duplicate annotations, etc.
   // TODO: do not use this function for parseCdl anyway…

package/lib/compiler/propagator.js

@@ -8,7 +8,7 @@ const {
   setProp,
   isDeprecatedEnabled,
 } = require( '../base/model');
-const { linkToOrigin, withAssociation } = require('./shared');
+const { linkToOrigin, withAssociation } = require('./utils');
 // const { refString } = require( '../base/messages')
 
 function propagate( model ) {
@@ -179,6 +179,8 @@ function propagate( model ) {
   // accessed at their type being a main artifact
   function expensive( prop, target, source ) {
     // console.log(prop,source.name,'->',target.kind,target.name);
+    if (source.kind === 'builtin')
+      return;
     if (prop !== 'foreignKeys' && availableAtType( prop, target, source ))
       // foreignKeys must always be copied with target to avoid any confusion
       // whether we have to generated implicit keys
@@ -211,7 +213,8 @@ function propagate( model ) {
   }
 
   function onlyViaParent( prop, target, source ) {
-    if (target.$inferred === 'proxy') // assocs and enums do not have 'include'
+    if (target.$inferred === 'proxy' || target.$inferred === 'expand-element')
+      // assocs and enums do not have 'include'
       always( prop, target, source );
   }