@sap/cds-compiler 2.12.0 → 2.13.6

package/lib/main.js

@@ -18,11 +18,14 @@ const { odata, cdl, sql, hdi, hdbcds, edm, edmx } = require('./api/main');
 const { getArtifactDatabaseNameOf, getElementDatabaseNameOf } = require('./model/csnUtils');
 const { traverseCsn } = require('./model/api');
 const { createMessageFunctions, sortMessages, sortMessagesSeverityAware, deduplicateMessages } = require('./base/messages');
+const { smartId, smartFuncId, delimitedId } = require('./sql-identifier');
+const keywords = require( './base/keywords' );
 
 const parseLanguage = require('./language/antlrParser');
 const { parseX, compileX, compileSyncX, compileSourcesX, InvocationError } = require('./compiler');
 const { fns } = require('./compiler/shared');
-const { define } = require('./compiler/definer');
+const define = require('./compiler/define');
+const finalizeParseCdl = require('./compiler/finalize-parse-cdl');
 
 // The compiler version (taken from package.json)
 function version() {
@@ -41,7 +44,7 @@ const {
 
 const { compactModel, compactQuery, compactExpr } = require('./json/to-csn')
 
-function parseCdl( cdl, filename, options = {} ) {
+function parseCdl( cdlSource, filename, options = {} ) {
   options = Object.assign( {}, options, { parseCdl: true } );
   const sources = Object.create(null);
   /** @type {XSN.Model} */
@@ -49,26 +52,27 @@ function parseCdl( cdl, filename, options = {} ) {
   const messageFunctions = createMessageFunctions( options, 'parse', model );
   model.$messageFunctions = messageFunctions;
 
-  const xsn = parseLanguage( cdl, filename, Object.assign( { parseOnly: true }, options ),
+  const xsn = parseLanguage( cdlSource, filename, Object.assign( { parseOnly: true }, options ),
                              messageFunctions );
   sources[filename] = xsn;
   fns( model );
   define( model );
+  finalizeParseCdl( model );
   messageFunctions.throwWithError();
   return compactModel( model );
 }
 
-function parseCql( cdl, filename = '<query>.cds', options = {} ) {
+function parseCql( cdlSource, filename = '<query>.cds', options = {} ) {
   const messageFunctions = createMessageFunctions( options, 'parse' );
-  const xsn = parseLanguage( cdl, filename, Object.assign( { parseOnly: true }, options ),
+  const xsn = parseLanguage( cdlSource, filename, Object.assign( { parseOnly: true }, options ),
                              messageFunctions, 'query' );
   messageFunctions.throwWithError();
   return compactQuery( xsn );
 }
 
-function parseExpr( cdl, filename = '<expr>.cds', options = {} ) {
+function parseExpr( cdlSource, filename = '<expr>.cds', options = {} ) {
   const messageFunctions = createMessageFunctions( options, 'parse' );
-  const xsn = parseLanguage( cdl, filename, Object.assign( { parseOnly: true }, options ),
+  const xsn = parseLanguage( cdlSource, filename, Object.assign( { parseOnly: true }, options ),
                              messageFunctions, 'expr' );
   messageFunctions.throwWithError();
   return compactExpr( xsn );
@@ -107,10 +111,32 @@ module.exports = {
    * @deprecated Use parse.cql instead
    */
   parseToCqn: parseCql,
+  /**
+   * @deprecated Use parse.expr instead
+   */
   parseToExpr: parseExpr,       // deprecated name
   // SNAPI
   for: { odata },
-  to: { cdl, sql, hdi, hdbcds, edm, edmx },
+  to: {
+    cdl: Object.assign(cdl, {
+      keywords: Object.freeze([ ...keywords.cdl ]),
+      functions: Object.freeze([ ...keywords.cdl_functions ]),
+    }),
+    sql: Object.assign(sql, {
+      sqlite: { keywords: Object.freeze([ ...keywords.sqlite ] )},
+      smartId,
+      smartFunctionId: smartFuncId,
+      delimitedId,
+    }),
+    hdi: Object.assign(hdi, {
+      keywords: Object.freeze([ ...keywords.hana ]),
+    }),
+    hdbcds: Object.assign(hdbcds, {
+      keywords: Object.freeze([ ...keywords.hdbcds ]),
+    }),
+    edm,
+    edmx
+  },
   // Convenience for hdbtabledata calculation in @sap/cds
   getArtifactCdsPersistenceName: getArtifactDatabaseNameOf,
   getElementCdsPersistenceName: getElementDatabaseNameOf,
@@ -121,5 +147,5 @@ module.exports = {
   // INTERNAL functions for the cds-lsp package and friends - before you use
   // it, you MUST talk with us - there can be potential incompatibilities with
   // new releases (even having the same major version):
-  $lsp: { parse: parseX, compile: compileX },
+  $lsp: { parse: parseX, compile: compileX, getArtifactName: a => a.name },
 };

package/lib/model/api.js

@@ -28,12 +28,14 @@ const defaultFunctions = {
 
 /**
  * Traverse the CSN node `csn`.
+ *
  * If `csn` is an array, call it recursively on each array item.
  * If `csn` is an(other) object, call a function on each property:
  * - The property name is a used as key in argument `userFunctions` and the
  *   constant `defaultFunctions` above to get the function which is called on
  *   the property value, see `defaultFunctions` for details.
- * - If no function is found with the property name, try to find one with the first char.
+ * - If no function is found with the property name, try to find one with the
+ *   first char, which is useful for annotations.
  * - If still not found, call `traverseCsn` recursively.
  *
  * The functions in `userFunctions` are usually transformer functions, which