@sap/cds-compiler 6.7.3 → 6.8.0

package/lib/json/from-csn.js

@@ -115,7 +115,7 @@
  * @returns {any} XSN property (e.g. string, object, ...)
  */
 
-const { dictAdd } = require('../base/dictionaries');
+const { dictAdd } = require('../compiler/dictionaries');
 const { quotedLiteralPatterns } = require('../compiler/builtins');
 const { isAnnotationExpression } = require('../base/builtins');
 const { CompilerAssertion } = require('../base/error');
@@ -752,7 +752,7 @@ const schema = compileSchema( {
     type: namespace,
   },
   meta: {                       // meta information
-    type: ignore,               // TODO: should we test s/th here?
+    type: meta,                 // TODO: should we test s/th here?
   },
   version: {                    // deprecated top-level property
     type: ignore,
@@ -904,6 +904,11 @@ function arrayOf( fn, filter = undefined ) {
 
 // Generic functions, objects (std signature) --------------------------------
 
+function meta( obj ) {
+  ignore( obj );
+  return obj;
+}
+
 function ignore( obj ) {
   if (obj && typeof obj === 'object') {
     const array = (Array.isArray( obj )) ? obj : Object.values( obj );

package/lib/json/to-csn.js

@@ -12,7 +12,7 @@
 'use strict';
 
 const { locationString } = require('../base/messages');
-const { isBetaEnabled } = require('../base/model');
+const { isBetaEnabled } = require('../base/specialOptions');
 const { pathName } = require('../compiler/utils');
 const { CompilerAssertion } = require('../base/error');
 
@@ -260,10 +260,25 @@ function compactModel( model, options = model.options || {} ) {
     break;
   }
 
+  const srcNames = Object.keys( srcDict );
+  const firstMeta = srcDict[srcNames[0]].meta;
+  const meta = srcNames.length === 1 && firstMeta ? { ...firstMeta } : undefined;
+  if (meta?.flavor)
+    delete meta.flavor; // not supported, compilerCsnFlavor is used instead
+  const flavorMap = {
+    client: 'inferred',
+    gensrc: 'xtended',
+    universal: 'universal',
+  };
+  const compilerCsnFlavor = flavorMap[options.csnFlavor] ||
+                            (options.parseCdl ? 'parsed' : 'inferred');
   if (!options.testMode) {
-    csn.meta = Object.assign( {}, model.meta, { creator } );
+    csn.meta = Object.assign( {}, model.meta, meta, { creator, compilerCsnFlavor } );
     csn.$version = csnVersion;
   }
+  else if (meta !== undefined) {
+    csn.meta = Object.assign( {}, meta );
+  }
   return csn;
 }
 

package/lib/main.js

@@ -14,13 +14,13 @@
 
 'use strict';
 
-const lazyload = require('./base/lazyload')( module );
+const lazyload = require('./utils/lazyload')( module );
 
-const { traceApi } = require('./api/trace');
+const { traceApi } = require('./base/trace');
 
 const snapi = lazyload('./api/main');
 const csnUtils = lazyload('./model/csnUtils');
-const modelApi = lazyload('./model/api');
+const modelApi = lazyload('./base/model-api');
 const messages = lazyload('./base/messages');
 const sqlIdentifier = lazyload('./sql-identifier');
 const keywords = lazyload( './base/keywords' );

package/lib/model/csnUtils.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { csnRefs, implicitAs, pathId } = require('./csnRefs');
+const { csnRefs, implicitAs, pathId } = require('../base/csnRefs');
 const {
   transformExpression,
   transformAnnotationExpression,
@@ -13,7 +13,7 @@ const { isBuiltinType, isAnnotationExpression } = require('../base/builtins');
 const { ModelError, CompilerAssertion } = require('../base/error');
 const { typeParameters } = require('../compiler/builtins');
 const { forEach } = require('../utils/objectUtils');
-const { cloneAnnotationValue } = require('./cloneCsn');
+const { cloneAnnotationValue } = require('../base/cloneCsn');
 
 // Low-level utility functions to work with compact CSN.
 

package/lib/modelCompare/compare.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const { makeMessageFunction } = require('../base/messages');
-const { setProp } = require('../base/model');
+const { setProp } = require('../utils/objectUtils');
 const {
   forEachDefinition,
   forEachMember,

package/lib/modelCompare/utils/filter.js

@@ -148,6 +148,7 @@ const defaultAllowedTypeChanges = {
   'cds.Integer': [ 'cds.Int32', 'cds.Int64', 'cds.Integer64' ],
   'cds.Integer64': [ 'cds.Int64' ],
   'cds.Int64': [ 'cds.Integer64' ],
+  'cds.String': [ 'cds.LargeString' ],
 };
 
 const allowedTypeChanges = {

package/lib/parsers/AstBuildingParser.js

@@ -3,7 +3,7 @@
 const BaseParser = require( '../gen/BaseParser' );
 
 const { Location } = require( '../base/location' );
-const { dictAdd, dictAddArray } = require('../base/dictionaries');
+const { dictAdd, dictAddArray } = require('../compiler/dictionaries');
 const { functionsWithoutParentheses } = require('./identifiers');
 
 const { pathName } = require('../compiler/utils');
@@ -39,7 +39,7 @@ const valueTokens = {
   true: true,
 };
 const valueTokensLength = Object.values( valueTokens ).length;
-// likewise, if expectedArray contains all the following tokens, replace them by 'Literal'
+// if expectedArray contains all the following tokens, replace them by 'Literal'
 const literalTokens = {
   Number: true,
   QuotedLiteral: true,
@@ -51,6 +51,29 @@ const literalTokens = {
 };
 const literalTokensLength = Object.values( literalTokens ).length;
 
+// if expectedArray contains all the following tokens, replace them by 'Comparison'
+const comparisonTokens = {
+  '=': true,
+  '<>': true,
+  '>': true,
+  '>=': true,
+  '<': true,
+  '<=': true,
+  '!=': true,
+  '==': true,
+};
+const comparisonTokensLength = Object.values( comparisonTokens ).length;
+
+// if expectedArray contains all the following tokens, replace them by 'Operator'
+const operatorTokens = {
+  '+': true,
+  '-': true,
+  '*': true,
+  '/': true,
+  '||': true,
+};
+const operatorTokensLength = Object.values( operatorTokens ).length;
+
 const extensionDicts = {
   elements: true, enum: true, params: true, returns: true,
 };
@@ -127,6 +150,19 @@ class AstBuildingParser extends BaseParser {
       if (withoutLiteralTokens.length + literalTokensLength === array.length)
         array = [ 'Literal', ...withoutLiteralTokens ];
     }
+
+    const withoutComparisonTokens = raw ? array : array.filter(
+      tok => comparisonTokens[tok] !== true
+    );
+    if (withoutComparisonTokens.length + comparisonTokensLength === array.length)
+      array = [ 'Comparison', ...withoutComparisonTokens ];
+
+    const withoutOperatorTokens = raw ? array : array.filter(
+      tok => operatorTokens[tok] !== true
+    );
+    if (withoutOperatorTokens.length + operatorTokensLength === array.length)
+      array = [ 'Operator', ...withoutOperatorTokens ];
+
     return array.map( tok => this.antlrName( tok ) )
       .sort( (a, b) => (tokenPrecedence(a) < tokenPrecedence(b) ? -1 : 1) );
   }
@@ -328,7 +364,8 @@ class AstBuildingParser extends BaseParser {
   // TODO: as leanCondition ?  `order` should probably appear in the message for
   // test3/Compiler/GrammarRobustness/InvalidSelectInWhere.err.cds
   orderByLimitRestriction( _arg, mode ) {
-    if (mode && (!this.$allowOrderByLimit || this.precPost_( mode, 0 )))
+    if (mode &&
+        (!this.$allowOrderByLimit && mode !== 'M' || this.precPost_( mode, 0 )))
       return true;
     this.$allowOrderByLimit = !mode;
     return false;

package/lib/parsers/index.js

@@ -2,7 +2,7 @@
 
 'use strict';
 
-const lazyload = require('../base/lazyload')( module );
+const lazyload = require('../utils/lazyload')( module );
 const { CompilerAssertion } = require( '../base/error' );
 const { createMessageFunctions } = require( '../base/messages' );
 const { XsnSource } = require('../compiler/xsn-model');

package/lib/render/manageConstraints.js

@@ -11,7 +11,7 @@ const { transformForRelationalDBWithCsn } = require('../transform/forRelationalD
 const {
   renderReferentialConstraint, getIdentifierUtils,
 } = require('./utils/sql');
-const { sortCsn } = require('../model/cloneCsn');
+const { sortCsn } = require('../base/cloneCsn');
 
 /**
  * Used only by `cdsc manageConstraints`.

package/lib/render/toCdl.js

@@ -20,14 +20,14 @@ const { escapeString, hasUnpairedUnicodeSurrogate } = require('./utils/stringEsc
 const { checkCSNVersion } = require('../json/csnVersion');
 const { normalizeTypeRef, forEachDefinition } = require('../model/csnUtils');
 const enrichUniversalCsn = require('../transform/universalCsn/universalCsnEnricher');
-const { isBetaEnabled } = require('../base/model');
+const { isBetaEnabled } = require('../base/specialOptions');
 const { ModelError, CompilerAssertion } = require('../base/error');
 const { typeParameters, specialFunctions } = require('../compiler/builtins');
 const { isAnnotationExpression } = require('../base/builtins');
 const { forEach } = require('../utils/objectUtils');
 const { isBuiltinType } = require('../base/builtins');
-const { cloneFullCsn } = require('../model/cloneCsn');
-const { getKeysDict, implicitAs } = require('../model/csnRefs');
+const { cloneFullCsn } = require('../base/cloneCsn');
+const { getKeysDict, implicitAs } = require('../base/csnRefs');
 const { undelimitedIdentifierRegex } = require('../parsers/identifiers');
 const { getNormalizedQuery } = require('../model/csnUtils');
 const {

package/lib/render/toHdbcds.js

@@ -18,13 +18,13 @@ const {
   renderReferentialConstraint,
 } = require('./utils/sql');
 const DuplicateChecker = require('./DuplicateChecker');
-const { isDeprecatedEnabled } = require('../base/model');
+const { isDeprecatedEnabled } = require('../base/specialOptions');
 const { checkCSNVersion } = require('../json/csnVersion');
 const { timetrace } = require('../utils/timetrace');
 
 const { smartId, delimitedId } = require('../sql-identifier');
 const { ModelError, CompilerAssertion } = require('../base/error');
-const { pathId } = require('../model/csnRefs');
+const { pathId } = require('../base/csnRefs');
 
 const $PROJECTION = '$projection';
 const $SELF = '$self';

package/lib/render/toSql.js

@@ -24,15 +24,15 @@ const {
 const DuplicateChecker = require('./DuplicateChecker');
 const { checkCSNVersion } = require('../json/csnVersion');
 const { timetrace } = require('../utils/timetrace');
-const { isBetaEnabled, isDeprecatedEnabled } = require('../base/model');
+const { isBetaEnabled, isDeprecatedEnabled } = require('../base/specialOptions');
 const sqlIdentifiers = require('../sql-identifier');
-const { sortCsn } = require('../model/cloneCsn');
+const { sortCsn } = require('../base/cloneCsn');
 const { manageConstraints, manageConstraint } = require('./manageConstraints');
 const { renderUniqueConstraintString, renderUniqueConstraintDrop, renderUniqueConstraintAdd } = require('./utils/unique');
 const { ModelError, CompilerAssertion } = require('../base/error');
-const { pathId } = require('../model/csnRefs');
+const { pathId } = require('../base/csnRefs');
 const { transformExprOperators } = require('./utils/operators');
-const { exprAsTree, condAsTree } = require('../model/xprAsTree');
+const { exprAsTree, condAsTree } = require('../base/xprAsTree');
 
 class SqlRenderEnvironment {
   indent = '';
@@ -114,7 +114,7 @@ function toSqlDdl( csn, options, messageFunctions ) {
   const {
     error, warning, info, throwWithAnyError,
   } = messageFunctions;
-  const { quoteSqlId, prepareIdentifier, renderArtifactName } = getIdentifierUtils(csn, options);
+  const { quoteSqlId, prepareIdentifier, renderArtifactName } = getIdentifierUtils(csn, options, warning);
   const reportedMissingReplacements = Object.create(null);
 
   const exprRenderer = createExpressionRenderer({
@@ -795,7 +795,7 @@ function toSqlDdl( csn, options, messageFunctions ) {
       return '';
     env = env.withSubPath([ 'elements', elementName ]);
     const isPostgresAlterColumn = env.alterMode && env.changeType === 'migration' && options.sqlDialect === 'postgres';
-    const quotedElementName = quoteSqlId(elementName);
+    const quotedElementName = quoteSqlId(elementName, env.path);
     if (duplicateChecker)
       duplicateChecker.addElement(quotedElementName, elm.$location, elementName);
 
@@ -1451,7 +1451,7 @@ function toSqlDdl( csn, options, messageFunctions ) {
    * @returns {string} Rendered type
    */
   function renderBuiltinType( typeName ) {
-    const types = cdsToSqlTypes[options.sqlDialect];
+    const types = cdsToSqlTypes[options.sqliteRealAffinityForDecimal && options.sqlDialect === 'sqlite' ? 'sqlitereal' : options.sqlDialect];
     const result = types?.[typeName] || cdsToSqlTypes.standard[typeName];
     if (!result && options.testMode)
       throw new CompilerAssertion(`Expected to find a type mapping for ${ typeName }`);

package/lib/render/utils/common.js

@@ -21,7 +21,7 @@ const {
   hasValidSkipOrExists, forEachDefinition, getNamespace, getUnderscoredName,
 } = require('../../model/csnUtils');
 
-const { implicitAs } = require('../../model/csnRefs');
+const { implicitAs } = require('../../base/csnRefs');
 
 /**
  * Render the given function
@@ -294,7 +294,7 @@ const cdsToSqlTypes = {
     'cds.Binary': 'BINARY_BLOB',
     'cds.hana.BINARY': 'BINARY_BLOB',
     'cds.hana.SMALLDECIMAL': 'SMALLDECIMAL',
-    'cds.Vector': 'BINARY_BLOB', // Not supported; see #11725
+    'cds.Vector': 'FLOAT32',
     'cds.Map': 'JSON_TEXT', // '_TEXT' suffix required for text affinity
   },
   plain: {
@@ -325,6 +325,13 @@ const cdsToSqlTypes = {
   },
 };
 
+cdsToSqlTypes.sqlitereal = {
+  ...cdsToSqlTypes.sqlite,
+  'cds.Decimal': 'REAL_DECIMAL',
+  'cds.DecimalFloat': 'REAL_DECIMAL',
+  'cds.hana.SMALLDECIMAL': 'REAL_SMALLDECIMAL',
+};
+
 // Type mapping from cds type names to HDBCDS type names:
 // Only those types, that need mapping, are listed.
 const cdsToHdbcdsTypes = {

package/lib/render/utils/sql.js

@@ -3,9 +3,9 @@
 'use strict';
 
 const { getResultingName } = require('../../model/csnUtils');
-const { smartId, delimitedId } = require('../../sql-identifier');
+const { smartId, delimitedId, sqlDialects } = require('../../sql-identifier');
 const { ModelError } = require('../../base/error');
-const { setProp } = require('../../base/model');
+const { setProp } = require('../../utils/objectUtils');
 
 /**
  * Render a given referential constraint as part of a SQL CREATE TABLE statement, or as .hdbconstraint artefact.
@@ -66,10 +66,12 @@ function renderReferentialConstraint( constraint, indent, toUpperCase, csn, opti
 /**
  * Get functions which can be used to prepare and quote SQL identifiers based on the options provided.
  *
+ * @param {CSN.Model} csn
  * @param {CSN.Options} options
+ * @param {function} warning
  * @returns quoteSqlId and prepareIdentifier function
  */
-function getIdentifierUtils( csn, options ) {
+function getIdentifierUtils( csn, options, warning ) {
   return { quoteSqlId, prepareIdentifier, renderArtifactName };
   /**
    * Return 'name' with appropriate "-quotes.
@@ -81,10 +83,17 @@ function getIdentifierUtils( csn, options ) {
    * Complain about names that collide with known SQL keywords or functions
    *
    * @param {string} name Identifier to quote
+   * @param {CSN.Path} path Path to the identifier in the CSN model (for warnings)
    * @returns {string} Quoted identifier
    */
-  function quoteSqlId( name ) {
+  function quoteSqlId( name, path ) {
     name = prepareIdentifier(name);
+    const s = sqlDialects[options.sqlDialect];
+    if ( warning && name.length > s.maxIdentifierLength ) {
+      warning( 'query-invalid-identifier',
+               path,
+               { name: options.sqlDialect, number: s.maxIdentifierLength });
+    }
 
     switch (options.sqlMapping) {
       case 'plain':
@@ -139,7 +148,7 @@ function getIdentifierUtils( csn, options ) {
    * @returns {string} Artifact name
    */
   function renderArtifactName( artifactName ) {
-    return quoteSqlId(getResultingName(csn, options.sqlMapping, artifactName));
+    return quoteSqlId(getResultingName(csn, options.sqlMapping, artifactName), [ 'definitions', artifactName ] );
   }
 }