@sap/cds-compiler 4.0.2 → 4.2.2

package/CHANGELOG.md

@@ -7,6 +7,155 @@
 Note: `beta` fixes, changes and features are usually not listed in this ChangeLog but [here](doc/CHANGELOG_BETA.md).
 The compiler behavior concerning `beta` features can change at any time without notice.
 
+## Version 4.2.2 - 2023-08-31
+
+### Fixed
+
+- to.sql|hdi.migration: Fix bug that caused a migration to be rendered for the HANA CDS types that were removed from the CSN
+
+## Version 4.2.0 - 2023-08-29
+
+### Added
+
+- Compiler:
+  + Option `moduleLookupDirectories: [ 'strings' ]` can be used to specify additional module lookup
+    directories, similar to `node_modules/`.
+  + LIMIT and OFFSET clauses can now contain expressions, including parameter references.
+- to.edm(x):
+  + Detect spec violation `scale` > `precision`.
+- to.sql/for.odata:
+  + With the new option `fewerLocalizedViews: true|false`, an entity/view will not get a localized convenience
+    view, if it only has associations to localized entities/views.  Only if there is actually a localized
+    element (e.g. new localized element or reference to one), will it get a convenience view.
+- to.sql
+  + In a localized scenario, create foreign key constraints for the generated `.texts` entities.
+  + Casting `null` to a structure such as `null as field : StructT` is now supported.  For each leaf element,
+    an additional `null as field_name` column is added.
+
+### Changed
+
+- Compiler:
+  + Selecting fields of structures or associations (without filters) are now candidates for ON-condition
+    rewrites: It is no longer necessary to select the struct/association directly.
+  + Consistently handle the case when type elements are defined to be a `key`:
+    the `key` property is not only preserved with `includes`, but also in other cases.
+    Use option `deprecated.noKeyPropagationWithExpansions` to switch to the v3 behavior.
+  + When including aspects or entities into structured type definitions,
+    do not add actions to the type.
+  + An `annotate` statement in the `extensions` section of a CSN now consistently uses the
+    `elements` property even if the `annotate` is intended to be used for an enum symbol.
+    Before v4.2, the compiler has used the `enum` property in a CSN of flavor `xtended`
+    (`gensrc`) if it was certain that it was to be applied to an enum symbol.
+- to.cdl: If a definition has an `actions` property, an `actions {…}` block is now always rendered,
+  and is not ignored if empty.
+- to.sql:
+  + For SQL dialect "sqlite", `cds.DateTime` is now rendered as `DATETIME_TEXT` instead of `TIMESTAMP_TEXT`.
+  + Casting a literal (except `null`) to a structure now yields a proper error.
+  + `.texts` entities annotated with `@cds.persistence.skip` (without their original entity having that annotation)
+    lead to deployment issues later.  It is now an error.
+
+### Fixed
+
+- Compiler:
+  + Reject invalid reference in the `on` of `join`s already while compiling,
+    not just when calling the (SQL) backend.
+  + Correct the calculation of annotation assignments on the return structure of actions
+    when both `annotate … with {…}` and `annotate … with returns {…}` had been used
+    on the same structure element.  Ensure that it works when non-applied, too.
+  + Do not remove or invent `actions` properties with zero actions or functions in it.
+  + Correct auto-redirection of direct cycle associations: if the source and target of a
+    model association are the same entity, and the main artifact of the service association
+    based on the model association is a suitable auto-redirection target, then use it
+    as new target, independently from the value of `@cds.redirection.target`.
+- to.cdl: Indirectly structured types (`type T: Struct;`) with `includes` (`extend T with T2;`), are now properly rendered.
+- to.sql/hdi/hdbcds:
+  + Views on views with parameters did not have localized convenience views based on
+  other localized views (missing `localized.` prefix in FROM clause)
+  + Run less checks on entities marked with `@cds.persistence.exists`
+  + Correctly render SELECT items where the column name conflicts with a table alias
+- to.sql: Casting expressions to a structured type yields a proper error instead of strange compiler error.
+- to.edm(x):
+  + Don't expand `@mandatory` if element has an annotation with prefix `@Common.FieldControl.`.
+  + Fix a bug when referencing nested many structures, especially referring to a managed association via
+  `$self` comparison.
+  + Improve handling of non-collection annotation values for collection-like vocabulary types.
+  + Don't render `Scale: variable` for `cds.Decimal(scale:0)`.
+- to.sql|hdi.migration:
+  + Fixed a bug that caused rendering of `ALTER` statements to abort early and not render some statements.
+  + CSN output now only contains real `cds` builtins, no early remapping to HANA CDS types or similar.
+- to.sql.migration: Don't drop-create views marked with `@cds.persistence.exists`
+
+### Removed
+
+## Version 4.1.2 - 2023-07-31
+
+### Fixed
+
+- to.hdi.migration: Changes in constraints are not rendered as part of the .hdbmigrationtable file,
+  as they belong in other HDI artifacts
+
+## Version 4.1.0 - 2023-07-28
+
+### Added
+
+- Calculated elements "on-read" can now reference localized elements.
+- Aliases for columns inside sub-queries are now optional, also for expressions.
+- for.odata/to.hdi/to.sql: Specified default value on a managed association is forwarded to a foreign key
+  if association has exactly one foreign key.
+- CDL: Annotation-only aspects having no `elements` and `actions` can now be defined with
+  the CDL syntax `@Anno… aspect Name;`.  They cannot be extended with elements or actions
+  in order to ensure that they can always be used to extend non-structures.
+  To allow the former but not the latter, use `@Anno… aspect Name {…};`.
+- to.sql: Support session variables for h2
+
+### Changed
+
+- api: Function `isInReservedNamespace(name)` handles name `cds` as being in a reserved namespace as well.
+- `CompilationError.messages` are now sorted severity aware. Errors are listed first.
+- Compiler:
+  + Improve the calculation of semantic code completion candidates.
+  + Some checks, like those for valid `on` conditions of associations,
+    are now already done with `compile` and not just the backends.
+  + SQL `cast()`s must always have a `type` property
+  + Type properties such as `precision` or `length` must be accompanied by a type (possibly inferred).
+- for.odata/to.hdi/to.sql: No longer reject unmanaged associations as foreign keys of a managed association.
+  Instead, ignore such references during ON-condition rewriting and foreign key generation. Referring to
+  unmanaged associations is incompatible with SAP HANA CDS naming mode 'hdbcds'.
+- to.sql: Rework session variables for postgres.
+- Update OData vocabularies: 'Common', 'HTML5', 'PersonalData', 'UI'.
+
+### Fixed
+
+- Compiler:
+  + ensure that annotations of elements in anonymous aspects of managed compositions
+    are not lost.
+  + issue error for definitions like `entity Self as projection on Base { $self.* };`
+    instead of simply concluding that the projection has zero elements.
+  + do not report a invalid cyclic dependency if associations between two entities
+    are valid cycles.
+  + Element type references can again follow associations (removed v4.0 incompatibility).
+- to.sql:
+  + `$self` references inside a nested projection using `$self` was incorrectly resolved.
+  + associations to entities marked with `@cds.persistence.skip` were not properly
+    checked inside nested projections.
+  + Select items casting `null` to an arrayed type work again, e.g. `null as ManyType`.
+- to.sql/hdi/hdbcds: Raise a nice error message for `@sql.append` on managed associations/compositions,
+  as we do for structured error messages.
+- to.cdl: Annotations with multiple qualifiers (`#`) are now rendered correctly.
+- to.edm(x): Revert change introduced with [3.9.0](#version-390---2023-04-20)
+    "Correct referential constraint calculation for `[0..1]` backlink associations".
+- for.odata: Process shortcut annotations sequence independent.
+- to.sql.migration:
+  + Respect unique and referential constraints for delta calculation.
+  + Added a configurable error for primary key additions, as those will lead to errors if the table
+    contains data. This could lead to inconsistent states if
+    some deployments succeed and others fail, so by default it is an error.
+
+### Removed
+
+- Compiler:
+  + forbid wildcards in projection extensions: `extend … with columns { * )`.
+  + forbid column references such as `$user.*`, `$user.{id}` and `$user {id}`.
 
 ## Version 4.0.2 - 2023-06-22
 
@@ -77,8 +226,6 @@ The compiler behavior concerning `beta` features can change at any time without
   + Table alias and mixin names can no longer start with `$`. Choose a different name. With this change
     we avoid unexpected name resolution effects in combination with built-in `$`-variables.
   + A semicolon is now required after a type definition like `type T : many {} null`.
-  + It is no longer possible to write `type of $self.‹elem›` to refer to the element `‹Def›.‹elem›`
-    where `‹Def›` is the main artifact where the type expression is embedded in. Replace by `type of <Def>:‹elem›`.
   + Message ID `duplicate-autoexposed` was changed to `def-duplicate-autoexposed`.
 - Update OData vocabularies 'Common', 'UI'.
 - to.sql:
@@ -96,7 +243,12 @@ The compiler behavior concerning `beta` features can change at any time without
   + `parseCdl` CSN did not include correct `...` entries for annotations containing `... up to`
   + Type references inside calculated elements were not always correctly resolved.
   + `USING` empty files were incorrectly marked as "not found".
+  + Correct the handling of `$self` references in nested projections and filters in queries.
   + If an association was inside `items`, e.g. via type chains, the compiler crashes instead of emitting proper errors.
+  + References in the user-provided `on` conditions of associations with a to be
+    auto-redirected model entity as target were not always resolved correctly.
+    Complain in error situations.
+  + Make extend code robust against prototype-polluted JS classes.
 - Localized convenience views for projections (not views) did not have references rewritten.
   This only affects CSN, the SQL result was correct.
 - Calculated elements in composition-of-aspect lost their `value` when generating composition targets.
@@ -116,9 +268,52 @@ The compiler behavior concerning `beta` features can change at any time without
 - NodeJs 14 is no longer supported.
 - `CompileMessage` no longer has property `location`, which was deprecated in v2.1.0, but `$location`,
   which is supported since v2.1.0
-- "Smart type references" such as `Entity.myElement` instead of `Entity:myElement` are removed, because since
-  compiler v2, `Entity.myElement` could also be a definition, creating ambiguities.
-- Element type references can no longer follow associations, i.e. `E:assoc.id` is not allowed.
+- compiler:
+  + It is no longer possible to write `type of $self.‹elem›` to refer to the element `‹Def›.‹elem›`
+    where `‹Def›` is the main artifact where the type expression is embedded in. Replace by `type of <Def>:‹elem›`.
+  + Element type references can no longer follow associations, i.e. `E:assoc.id` is not allowed
+    (v4.0 only, re-introduced with v4.1).
+  + "Smart type references" such as `Entity.myElement` instead of `Entity:myElement`
+    are removed, because since - `Entity.myElement` could also be a definition,
+    creating ambiguities. This did not work always, anyway.
+
+## Version 3.9.10 - 2023-08-25
+
+### Fixed
+
+- to.edm(x): Error reporting for incorrect handling of "Collection()" has been improved.
+- to.sql/hdi/hdbcds: Views on views with parameters did not have localized convenience views based on
+  other localized views (missing `localized.` prefix in FROM clause)
+- to.sql: Casting expressions to a structured type yields a proper error instead of strange compiler error.
+- to.sql.migration: Don't drop-create views marked with `@cds.persistence.exists` or `@cds.persistence.skip`
+
+## Version 3.9.8 - 2023-08-03
+
+### Fixed
+
+- to.edm(x):
+  + Don't expand `@mandatory` if element has an annotation with prefix `@Common.FieldControl.`.
+  + Fix a bug when referencing nested many structures, especially referring to a managed association via
+  `$self` comparison.
+- to.sql/hdi/hdbcds: Detect navigation into arrayed structures and raise helpful errors instead of running into internal errors.
+
+## Version 3.9.6 - 2023-07-27
+
+### Fixed
+
+- to.edm(x): Revert change introduced with [3.9.0](#version-390---2023-04-20)
+    "Correct referential constraint calculation for `[0..1]` backlink associations".
+- for.odata: Process shortcut annotations sequence independent.
+
+## Version 3.9.4 - 2023-06-07
+
+### Fixed
+
+- compiler: `USING` empty files were incorrectly marked as "not found".
+- Localized convenience views for projections (not views) did not have references rewritten.
+  This only affects CSN, the SQL result was correct.
+- to.edm(x): Render correct EntitySetPath and annotation target path for actions/functions
+  with explicit binding parameter.
 
 ## Version 3.9.2 - 2023-04-27
 

package/bin/cdsc.js

@@ -162,7 +162,7 @@ function cdsc_main() {
     validateDirectBackendOption(cmdLine.command, cmdLine.options, cmdLine.args);
 
   // If set through CLI (and not options file), `beta` is a string and needs processing.
-  if (cmdLine.options.beta && typeof cmdLine.options.beta === 'string') {
+  if (typeof cmdLine.options.beta === 'string') {
     const features = cmdLine.options.beta.split(',');
     cmdLine.options.beta = {};
     features.forEach((val) => {
@@ -191,14 +191,17 @@ function cdsc_main() {
     console.error( `Running ‘${cmdLine.command}’ with test-mode shuffle ${cmdLine.options.testMode} …` );
   }
 
-  // If set through CLI (and not options file), `deprecated` is a string and needs processing.
-  if (cmdLine.options.deprecated && typeof cmdLine.options.deprecated === 'string') {
+  // If set through CLI (and not options file), `deprecated` and `moduleLookupDirectories`
+  // are strings and needs processing.
+  if (typeof cmdLine.options.deprecated === 'string') {
     const features = cmdLine.options.deprecated.split(',');
     cmdLine.options.deprecated = {};
     features.forEach((val) => {
       cmdLine.options.deprecated[val] = true;
     });
   }
+  if (typeof cmdLine.options.moduleLookupDirectories === 'string')
+    cmdLine.options.moduleLookupDirectories = cmdLine.options.moduleLookupDirectories.split(',');
 
   parseSeverityOptions(cmdLine);
 
@@ -499,29 +502,29 @@ function executeCommandLine( command, options, args ) {
 
     sortMessages(messages);
 
+    const msgConfig = {
+      normalizeFilename,
+      noMessageId: !!options.noMessageId,
+      hintExplanation: true,
+      color: options.color,
+      module: options.testMode && 'compile', // TODO: use module name
+      sourceMap: fileCache,
+      cwd: '',
+    };
+
     if (options.internalMsg) {
       messages.map(msg => util.inspect( msg, { depth: null, maxArrayLength: null } ) )
         .forEach(msg => log(msg));
     }
     else if (options.noMessageContext) {
       messages.filter(msg => (messageLevels[msg.severity] <= options.warning))
-        .forEach(msg => log(main.messageString(msg, normalizeFilename, !!options.noMessageId, false, options.testMode && 'compile'))); // TODO: use module name
+        .forEach(msg => log(main.messageString( msg, msgConfig )));
     }
     else {
       let hasAtLeastOneExplanation = false;
-      const config = {
-        normalizeFilename,
-        noMessageId: !!options.noMessageId,
-        hintExplanation: true,
-        color: options.color,
-        module: options.testMode && 'compile', // TODO: use module name
-        sourceMap: fileCache,
-        cwd: '',
-      };
-
       messages.filter(msg => messageLevels[msg.severity] <= options.warning).forEach((msg) => {
         hasAtLeastOneExplanation = hasAtLeastOneExplanation || main.hasMessageExplanation(msg.messageId);
-        log(main.messageStringMultiline(msg, config));
+        log(main.messageStringMultiline(msg, msgConfig));
         log(); // newline
       });
       if (!options.noMessageId && hasAtLeastOneExplanation)

package/doc/CHANGELOG_BETA.md

@@ -8,6 +8,17 @@ Note: `beta` fixes, changes and features are listed in this ChangeLog just for i
 The compiler behavior concerning `beta` features can change at any time without notice.
 **Don't use `beta` fixes, changes and features in productive mode.**
 
+## Version 4.1.0 - 2023-07-28
+
+### Added `associationDefault`
+
+With this beta flag enabled, managed associations with exactly one foreign key can now
+have a default value.
+
+### Removed `aspectWithoutElements`
+
+Aspects without elements can now be defined without beta flag, e.g. `aspect A;`.
+
 ## Version 4.0.0 - 2023-06-06
 
 ### Removed `v4preview`
@@ -62,6 +73,11 @@ Now enabled per default.
 
 ## Version 3.7.0 - 2023-02-22
 
+### Added `annotationExpressions`
+
+This option allows to use expressions as annotation values, e.g.
+`@anno: (1+2)`.
+
 ### Added `calculatedElements`
 
 Allows to define calculated elements in entities and aspects.  When used in views, they

package/doc/CHANGELOG_DEPRECATED.md

@@ -11,6 +11,21 @@ Note: `deprecated` features are listed in this ChangeLog just for information.
 **When the `deprecated` option is set, the `beta` option is ignored,
 and several new features are not available.**
 
+## Version 4.2.0 - 2023-08-29
+
+### Added `noKeyPropagationWithExpansions`
+
+When this option is set, element `id` in types `Orig` and `I` are keys,
+but `id` in `D` is not.
+
+```cds
+type Orig { key id: Integer };
+type I: Orig {};
+type D: Orig;
+```
+
+When this option is not set, element `id` in all three types are keys.
+
 ## Version 4.0.0 - 2023-06-06
 
 ### Added `downgradableErrors`

package/lib/api/main.js

@@ -8,7 +8,7 @@ const location = lazyload('../base/location');
 const messages = lazyload('../base/messages');
 const compiler = lazyload('../compiler/index');
 const toCsn = lazyload('../json/to-csn');
-const forOdataNew = lazyload('../transform/forOdataNew.js');
+const forOdataNew = lazyload('../transform/forOdata.js');
 const toSql = lazyload('../render/toSql');
 const toCdl = require('../render/toCdl');
 const modelCompare = lazyload('../modelCompare/compare');
@@ -95,14 +95,14 @@ function checkPreTransformedCsn( csn, options, relevantOptionNames, warnAboutMis
 
   for (const name of relevantOptionNames ) {
     if (options[name] !== csn.meta.options?.[name]) {
-      error('wrong-pretransformed-csn', null, { prop: name, value: options[name], othervalue: csn.meta.options[name] },
+      error('api-invalid-option-preprocessed', null, { prop: name, value: options[name], othervalue: csn.meta.options[name] },
             'Expected pre-processed CSN to have option $(PROP) set to $(VALUE). Found: $(OTHERVALUE)');
     }
   }
 
   for (const name of warnAboutMismatch ) {
     if (options[name] !== csn.meta.options[name]) {
-      warning('options-mismatch-pretransformed-csn', null, { prop: name, value: options[name], othervalue: csn.meta.options[name] },
+      warning('api-mismatched-option-preprocessed', null, { prop: name, value: options[name], othervalue: csn.meta.options[name] },
               'Expected pre-processed CSN to have option $(PROP) set to $(VALUE). Found: $(OTHERVALUE)');
     }
   }
@@ -242,8 +242,10 @@ function sql( csn, options = {} ) {
   const sqls = toSql.toSqlDdl(transformedCsn, internalOptions);
 
   const result = sortViews({ csn: transformedCsn, sql: sqls.sql });
-
-  return result.map(obj => obj.sql).filter(create => create);
+  return [
+    ...result.map(obj => obj.sql).filter(create => create),
+    ...Object.values(sqls.constraints || {}),
+  ];
 }
 
 /**
@@ -359,7 +361,9 @@ function remapName( key, csn, filter = () => true ) {
 function sqlMigration( csn, options, beforeImage ) {
   traceApi("Options passed into 'to.sql.migration'", options);
   const internalOptions = prepareOptions.to.sql(options);
-  const { error, throwWithError } = messages.makeMessageFunction(csn, internalOptions, 'to.sql.migration');
+  const {
+    error, warning, info, throwWithError, message,
+  } = messages.makeMessageFunction(csn, internalOptions, 'to.sql.migration');
 
   // Prepare after-image.
   const afterImage = internalOptions.filterCsn
@@ -369,8 +373,12 @@ function sqlMigration( csn, options, beforeImage ) {
   const diffFilterObj = diffFilter[internalOptions.sqlDialect];
 
   if (diffFilterObj) {
-    diff.extensions.forEach(ex => diffFilterObj.extension(ex, error));
-    diff.migrations.forEach(migration => diffFilterObj.migration(migration, error));
+    diff.extensions = diff.extensions.filter(ex => diffFilterObj.extension(ex, {
+      error, warning, info, throwWithError, message,
+    }));
+    diff.migrations.forEach(migration => diffFilterObj.migration(migration, {
+      error, warning, info, throwWithError, message,
+    }));
     Object.entries(diff.deletions).forEach(entry => diffFilterObj.deletion(entry, error));
   }
 
@@ -392,8 +400,7 @@ function sqlMigration( csn, options, beforeImage ) {
       const beforeArtifact = beforeImage.definitions[artifactName];
       const diffArtifact = diff.definitions[artifactName];
       // TODO: exists, abstract? isPersistedOnDb?
-      if (diffArtifact && diffArtifact['@cds.persistence.name'] && !diffArtifact['@cds.persistence.skip'] &&
-        (diffArtifact.query || diffArtifact.projection) &&
+      if (diffArtifact && diffArtifact['@cds.persistence.name'] && csnUtils.isPersistedAsView(diffArtifact) &&
         (diffArtifact[modelCompare.isChanged] === true || // we know it changed because we compared two views
           diffArtifact[modelCompare.isChanged] === undefined)) { // if it was removed in the after, then we don't have the flag
         drops.creates[artifactName] = `DROP VIEW ${ identifierUtils.renderArtifactName(artifactName) };`;
@@ -401,6 +408,7 @@ function sqlMigration( csn, options, beforeImage ) {
       else if (diffArtifact &&
         diffArtifact['@cds.persistence.skip'] !== true &&
         diffArtifact.kind === beforeArtifact.kind && // detect action -> entity
+        csnUtils.isPersistedAsTable(diffArtifact) === csnUtils.isPersistedAsTable(beforeArtifact) && // detect removal of @cds.persistence.exists
         csnUtils.isPersistedAsView(diffArtifact) === csnUtils.isPersistedAsView(beforeArtifact) // detect view -> entity
       ) { // don't render again, but need info for primary key extension
         diffArtifact['@cds.persistence.skip'] = true;
@@ -443,8 +451,10 @@ function sqlMigration( csn, options, beforeImage ) {
 
   internalOptions.beta.sqlExtensions = true;
 
-  // eslint-disable-next-line no-unused-vars
-  const { deletions, migrations, ...hdbkinds } = toSql.toSqlDdl(diff, internalOptions);
+  const {
+    // eslint-disable-next-line no-unused-vars
+    deletions, constraintDeletions, migrations, constraints, ...hdbkinds
+  } = toSql.toSqlDdl(diff, internalOptions);
 
   cleanup.forEach(fn => fn());
   // TODO: Handle `ADD CONSTRAINT` etc!
@@ -473,6 +483,12 @@ function sqlMigration( csn, options, beforeImage ) {
       createAndAlterSqls.push(...migrations[name].map(m => m.sql));
   }
 
+  if (constraints)
+    Object.values(constraints).forEach(constraint => createAndAlterSqls.push(constraint));
+
+  if (constraintDeletions)
+    Object.values(constraintDeletions).forEach(constraint => dropSqls.push(constraint));
+
   // We need to drop the things without dependants first - so inversely sorted
   dropSqls.reverse();
 
@@ -510,7 +526,11 @@ function hdiMigration( csn, options, beforeImage ) {
 
   internalOptions.beta.sqlExtensions = true;
 
-  const { deletions, migrations, ...hdbkinds } = toSql.toSqlDdl(diff, internalOptions);
+  // Ignore constraint drops - that is handled by .hdbconstraint et. al.
+  const {
+    // eslint-disable-next-line no-unused-vars
+    deletions, migrations, constraintDeletions, ...hdbkinds
+  } = toSql.toSqlDdl(diff, internalOptions);
 
   return {
     afterImage,

package/lib/api/options.js

@@ -30,6 +30,7 @@ const publicOptionsNewAPI = [
   'pre2134ReferentialConstraintNames',
   'generatedByComment',
   'betterSqliteSessionVariables',
+  'fewerLocalizedViews',
   // ODATA
   'odataOpenapiHints',
   'odataVersion',
@@ -52,7 +53,6 @@ const privateOptions = [
   // Not callable via cdsc, keep private for now until we are sure that we want this
   'filterCsn',
   'lintMode',
-  'fuzzyCsnError',
   'traceFs',
   'traceParser',
   'traceParserAmb',
@@ -66,7 +66,7 @@ const privateOptions = [
   'noRecompile',
   'internalMsg',
   'disableHanaComments',      // in case of issues with hana comment rendering
-  'localizedWithoutCoalesce', // deprecated version of 'localizedLanguageFallback', TODO(v4): Remove option
+  'localizedWithoutCoalesce', // deprecated version of 'localizedLanguageFallback', TODO(v5): Remove option
 ];
 
 const overallOptions = publicOptionsNewAPI.concat(privateOptions);

package/lib/api/validate.js

@@ -115,7 +115,7 @@ const validators = {
     found: val => `type ${ typeof val }`,
   },
   testMode: {
-    validate: val => typeof val === 'boolean' || typeof val === 'number',
+    validate: val => typeof val === 'boolean' || typeof val === 'number' || val === '$noAssertConsistency',
     expected: () => 'type boolean|number',
     found: val => `type ${ typeof val }`,
   },
@@ -130,26 +130,28 @@ const validators = {
   assertIntegrityType: generateStringValidator([ 'DB', 'RT' ]),
 };
 
+// Note: if `validate()` returns true, it means the option is _invalid_!
 const allCombinationValidators = {
-  'valid-structured': {
-    validate: options => options.odataVersion === 'v2' && options.odataFormat === 'structured',
-    severity: 'error',
-    getParameters: () => {},
-    getMessage: () => 'Structured OData is only supported with OData version v4',
-  },
-  'sql-dialect-and-naming': {
-    validate: options => options.sqlDialect && options.sqlMapping && ![ 'hana' ].includes(options.sqlDialect) && [ 'quoted', 'hdbcds' ].includes(options.sqlMapping),
-    severity: 'error',
-    getParameters: options => ({ name: options.sqlDialect, prop: options.sqlMapping }),
-    getMessage: () => 'sqlDialect $(NAME) can\'t be combined with sqlMapping $(PROP)',
-  },
-  'beta-no-test': {
-    validate: options => options.beta && !options.testMode,
-    severity: 'warning',
-    getParameters: () => {},
-    getMessage: () => 'Option "beta" was used. This option should not be used in productive scenarios!',
+  'valid-structured': (options, message) => {
+    if (options.odataVersion === 'v2' && options.odataFormat === 'structured')
+      message.error('api-invalid-combination', null, { '#': 'valid-structured' });
+  },
+  'sql-dialect-and-naming': (options, message) => {
+    if (options.sqlDialect && options.sqlMapping && options.sqlDialect !== 'hana' && [ 'quoted', 'hdbcds' ].includes(options.sqlMapping))
+      message.error('api-invalid-combination', null, { '#': 'sql-dialect-and-naming', name: options.sqlDialect, prop: options.sqlMapping });
+  },
+  'sql-dialect-and-localized': (options, message) => {
+    if (options.fewerLocalizedViews && options.sqlDialect === 'hana')
+      message.error('api-invalid-combination', null, { '#': 'sql-dialect-and-localized', option: 'fewerLocalizedViews', value: 'hana' });
+  },
+  'beta-no-test': (options, message) => {
+    if (options.beta && !options.testMode)
+      message.warning('api-unexpected-combination', null, { '#': 'beta-no-test', option: 'beta' });
   },
 };
+
+const alwaysRunValidators = [ 'beta-no-test', 'sql-dialect-and-localized' ];
+
 /* eslint-disable jsdoc/no-undefined-types */
 /**
  * Run the validations for each option.
@@ -172,11 +174,12 @@ function validate( options, moduleName, customValidators = {}, combinationValida
       const validator = customValidators[optionName] || validators[optionName] || booleanValidator;
 
       if (!validator.validate(optionValue)) {
-        error('invalid-option', null, {
+        error('api-invalid-option', null, {
+          '#': 'value',
           prop: optionName,
           value: validator.expected(optionValue),
           othervalue: validator.found(optionValue),
-        }, 'Expected option $(PROP) to have $(VALUE). Found: $(OTHERVALUE)');
+        });
       }
     });
     throwWithAnyError();
@@ -184,11 +187,8 @@ function validate( options, moduleName, customValidators = {}, combinationValida
 
   const message = makeMessageFunction(null, options, moduleName);
 
-  for (const combinationValidatorName of combinationValidators.concat([ 'beta-no-test' ])) {
-    const combinationValidator = allCombinationValidators[combinationValidatorName];
-    if (combinationValidator.validate(options))
-      message[combinationValidator.severity]('invalid-option-combination', null, combinationValidator.getParameters(options), combinationValidator.getMessage(options));
-  }
+  for (const combinationValidatorName of combinationValidators.concat(alwaysRunValidators))
+    allCombinationValidators[combinationValidatorName](options, message);
 
   message.throwWithAnyError();
 }

package/lib/base/location.js

@@ -4,6 +4,7 @@
 // but not semantic locations (which are message-specific),
 
 const { copyPropIfExist } = require('../utils/objectUtils');
+const { CsnLocation } = require('../compiler/classes');
 
 /**
  * Create a location with properties `file`, `line` and `col` from argument
@@ -41,6 +42,7 @@ function combinedLocation( start, end ) {
  */
 function emptyLocation( filename ) {
   return {
+    __proto__: CsnLocation.prototype,
     file: filename,
     line: 1,
     col: 1,
@@ -60,9 +62,12 @@ function emptyLocation( filename ) {
  */
 function emptyWeakLocation( filename ) {
   return {
+    __proto__: CsnLocation.prototype,
     file: filename,
     line: 1,
     col: 1,
+    endLine: undefined,
+    endCol: undefined,
   };
 }
 
@@ -140,13 +145,7 @@ function dictLocation( dict, extraLocation ) {
     const lineB = (b.endLine || b.line);
     return (lineA > lineB || (lineA === lineB && (a.endCol || a.col) > (b.endCol || b.col)) ? a : b);
   });
-  return {
-    file: min.file,
-    line: min.line,
-    col: min.col,
-    endLine: max.endLine,
-    endCol: max.endCol,
-  };
+  return new CsnLocation( min.file, min.line, min.col, max.endLine, max.endCol );
 }
 
 function _objLocations( obj ) {