@sap/cds-compiler 3.1.2 → 3.4.0

package/CHANGELOG.md

@@ -7,6 +7,102 @@
 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 3.4.0 - 2022-10-26
+
+### Added
+
+- to.sql: Add support for sql dialect `h2`, which renders SQL for H2 2.x
+
+### Fixed
+
+- Properly report an error for bare `$self` references,
+  except in the `on` condition of unmanaged associations.
+- Do not dump with references to CDS variables like `$now` in `expand`/`inline`.
+- Properly report an error when trying to `cast` a column to an association.
+- to.cdl: Identifiers that are always keywords in special functions are now escaped.
+- to.edm(x):
+  + Nested annotation was not applied if outer annotation has value zero.
+  + Fix `AppliesTo=ComplexType, TypeDefinition` term definition directive.
+- to.sql/hdi/hdbcds:
+  + Properly report an error for `exists` with `$self.managed-association`
+  + For sql dialect `hana`, add an implicit alias when using `:param` in the select list
+  + Handle `$self` and magic variables during expansion of nested projections
+
+## Version 3.3.2 - 2022-09-30
+
+### Fixed
+
+- to.edm(x): Set `Scale` (V4) or `@sap:variable-scale` (V2) attributes correctly when overwriting `cds.Decimal`
+  with `@odata.Scale`.
+- to.sql: For dialect `postgres`, add braces around `$now`, `$at.from` and `$at.to`.
+
+## Version 3.3.0 - 2022-09-29
+
+### Added
+
+- Nested projections can be used without `beta` option:
+  + Support `expand`: columns can look like `assoc_or_struct_or_tabalias { col_expression1, … }`,
+    `longer.ref as name { *, … } excluding { … }`, `{ col_expression1 as sub1, … } as name`, etc.
+  + Support `inline`: columns can look like `assoc_or_struct_or_tabalias.{ col_expression1, … }`,
+    `longer.ref[filter = condition].{ *, … } excluding { … }`, `assoc_or_struct_or_tabalias.*`, etc.
+- to.sql/hdi/hdbcds/edm(x)/for.odata: Allow to structure comparison against `is [not] null`.
+- to.sql: Support dialect `postgres` - generates SQL intended for PostgreSQL. Not supported are `cds.hana` data types and views with parameters.
+
+### Changed
+
+- A valid redirection target does not depend on parameters anymore.  This
+  change could induce a redirection error, which could easily solved by assigning
+  `@cds.redirection.target: false` to the entity with “non-matching” parameters.
+- Properly issue an error when projecting associations with parameter
+  references in the `on` condition.  Before this change, the compiler dumped
+  when projecting such an association in a view on top.
+- Update OData vocabularies 'Capabilities', 'Common', 'UI'.
+- to.cdl:
+  + Extensions are now always put into property `model` of `to.cdl()`s result.
+  + Actions on views and projections are now rendered as part of the definition, instead of an extension.
+- to.edm(x): `@Capabilities` 'pull up' supports all counterpart properties of `@Capabilities.NavigationPropertyRestriction`
+  except for properties `NavigationProperty` and `Navigability`.
+- to.hdi: Updated list of `keywords` which must be quoted in naming mode `plain`.
+- to.sql/hdi/hdbcds/edm(x)/for.odata: Reject structure comparison with operators `<,>,<=,>=`. Message id `expr-unexpected-operator`
+  is downgradable to a warning.
+
+### Fixed
+
+- Do not issue a warning anymore when adding elements via multiple `extend` statements in the same file.
+- An info message for annotating builtins through `extend` statements is now reported, similar to `annotate`.
+- Fix auto-redirection for target of new assoc in query entity
+- for.odata: `@readonly/insertonly/mandatory: false` are not expanded.
+
+## Version 3.2.0 - 2022-08-30
+
+### Added
+
+- New Integer types with these mappings:
+
+  | CDS       | OData     | SQL      | HANA CDS      |
+  | --------- | --------- | -------- | ------------- |
+  | cds.UInt8 | Edm.Byte  | TINYINT  | hana.TINYINT  |
+  | cds.Int16 | Edm.Int16 | SMALLINT | hana.SMALLINT |
+  | cds.Int32 | Edm.Int32 | INTEGER  | cds.Integer   |
+  | cds.Int64 | Edm.Int64 | BIGINT   | cds.Integer64 |
+
+- Properties of type definitions and types of direct elements can now be extended,
+  e.g. `extend T with (length: 10);`
+
+- CDL parser: support SQL function `substr_regexpr` with its special argument syntax.
+
+### Fixed
+
+- An internal dump could have occurred in certain situations
+  for models with cyclic type definitions.
+- Annotations on inferred enum elements of views were lost during recompilation.
+- to.cdl: Annotations on enum value in query elements were lost.
+- for.odata: Allow dynamic shortcut annotation values (`$edmJson`).
+- to.edm(x):
+  + Don't overwrite annotations of input model.
+  + Ignore `null` values in `$edmJson` strings.
+- to.hdi.migration: Don't interpret bound action changes as element changes.
+
 ## Version 3.1.2 - 2022-08-19
 
 ### Fixed
@@ -25,8 +121,8 @@ The compiler behavior concerning `beta` features can change at any time without
   `extend SomeEntity with FirstInclude, SecondInclude;`
 - Aspects can now have actions and functions, similar to entities.  Aspects can be extended by actions as well.
 - `cdsc`:
-  - `toCsn` now supports `--with-locations` which adds a `$location` property to artifacts
-  - `toHana`/`toSql` now supports `--disable-hana-comments`, which disables rendering of doc-comments for HANA.
+  + `toCsn` now supports `--with-locations` which adds a `$location` property to artifacts
+  + `toHana`/`toSql` now supports `--disable-hana-comments`, which disables rendering of doc-comments for HANA.
 - to.hdi/sql/hdbcds: Support FK-access in `ORDER BY` and `GROUP BY`
 - to.hdi.migration: Detect an implicit change from `not null` to `null` and render corresponding `ALTER`
 
@@ -51,8 +147,10 @@ The compiler behavior concerning `beta` features can change at any time without
 - compiler:
   + `cast(elem as EnumType)` crashed the compiler.
   + Annotations on sub-elements in query entities were lost during re-compilation.
-  + An association's cardinality was lost for associations published in projections.  
+  + An association's cardinality was lost for new associations published in projections.
   + Annotations on indirect action parameters were lost in CSN flavor `gensrc`.
+  + Re-allow `annotate` statements referring to the same element twice,
+    even if there are annotation assignments for sub elements.
   + If a file's content starts with `{` and if neither file extension is known nor
     `fallbackParser` is set, assume the source is CSN.
 - all backends: references in `order by` _expressions_ are correctly resolved.

package/bin/cdsc.js

@@ -153,7 +153,9 @@ function cdsc_main() {
     cmdLine.args.files = [ cmdLine.args.file ];
   }
   else if (cmdLine.command === 'parseOnly') {
+    // Remap command and command-specific options.
     cmdLine.command = 'toCsn';
+    cmdLine.options.toCsn = cmdLine.options.parseOnly;
     cmdLine.options.parseOnly = true;
     cmdLine.args.files = [ cmdLine.args.file ];
   }
@@ -409,7 +411,7 @@ function executeCommandLine(command, options, args) {
     }
     else {
       const sqlResult = main.to.sql(csn, options);
-      writeToFileOrDisplay(options.out, 'model.sql', sqlResult.join('\n'), true);
+      writeToFileOrDisplay(options.out, 'model.sql', sqlResult.join('\n\n'), true);
     }
     return model;
   }
@@ -521,7 +523,7 @@ function executeCommandLine(command, options, args) {
         log(); // newline
       });
       if (options.showMessageId && hasAtLeastOneExplanation)
-        log(`${colorTerm.help('help')}: Messages marked with '…' have an explanation text. Use \`cdsc explain <message-id>\` for a more detailed error description.`);
+        log(`${colorTerm.asHelp('help')}: Messages marked with '…' have an explanation text. Use \`cdsc explain <message-id>\` for a more detailed error description.`);
     }
     return model;
   }

package/doc/CHANGELOG_BETA.md

@@ -8,6 +8,41 @@ 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 3.4.0 - 2022-MM-DD
+
+### Added `aspectWithoutElements`
+
+- Aspects can now be defined without elements, e.g. `aspect A;`. This allows the definition of annotation-only aspects.
+ Views can be extended by such an aspect. For example:
+  ```cds
+  entity V as projection on SomeEntity;
+  @anno aspect A;
+  extend V with A;
+  ```
+
+### Added `sqlMigration`
+
+- to.sql.migration: Offer something similar to to.hdi.migration, but for general SQL. Don't offer a complete out-of-the-box schema evolution, instead only
+allow lossless, easy to revert actions like adding a column or extending a string length.
+
+## Version 3.3.0 - 2022-09-29
+
+### Removed `nestedProjections`
+
+- This is now the default - see CHANGELOG entry for 3.3.0.
+
+### Fixed `nestedProjections`
+
+- Issue an error for an unexpected `as ‹alias›` for references with `inline`;
+  people likely have confused `inline` with `expand`.
+- Resolving references in the user-provided `on` condition of projected or newly-defined
+  associations inside `expand` and `inline` now works correctly.
+- Correct `key` propagation for references with `expand` or `inline`.
+- If an element is projected with sibling `expand`, the original data structure is usually
+  _not preserved_ (why use an `expand` if it is?).  Therefore, the compiler cannot auto-rewrite
+  the `on` condition of unmanaged associations if such an element is referred to in the original
+  `on` condition.  In that case, provide your own via `…: redirected to … on ‹condition›`.
+
 ## Version 3.1.0 - 2022-08-04
 
 ### Added `optionalActionFunctionParameters`

package/lib/api/main.js

@@ -12,10 +12,11 @@ const forOdataNew = lazyload('../transform/forOdataNew.js');
 const toSql = lazyload('../render/toSql');
 const toCdl = require('../render/toCdl');
 const modelCompare = lazyload('../modelCompare/compare');
+const diffFilter = lazyload('../modelCompare/filter');
 const sortViews = lazyload('../model/sortViews');
 const csnUtils = lazyload('../model/csnUtils');
 const timetrace = lazyload('../utils/timetrace');
-const forHanaNew = lazyload('../transform/forHanaNew');
+const forRelationalDB = lazyload('../transform/forRelationalDB');
 
 /**
  * Return the artifact name for use for the hdbresult object
@@ -33,7 +34,7 @@ const { cloneCsnNonDict } = require('../model/csnUtils');
 const { toHdbcdsSource } = require('../render/toHdbcds');
 const { ModelError } = require('../base/error');
 const { forEach, forEachKey } = require('../utils/objectUtils');
-const { checkRemovedDeprecatedFlags } = require('../base/model');
+const { checkRemovedDeprecatedFlags, isBetaEnabled } = require('../base/model');
 const { csn2edm, csn2edmAll } = require('../edm/csn2edm');
 
 const relevantGeneralOptions = [ /* for future generic options */ ];
@@ -92,13 +93,17 @@ function checkPreTransformedCsn(csn, options, relevantOptionNames, warnAboutMism
   const { error, warning, throwWithAnyError } = messages.makeMessageFunction(csn, options, module);
 
   for (const name of relevantOptionNames ) {
-    if (options[name] !== csn.meta.options[name])
-      error('wrong-pretransformed-csn', null, `Expected pre-processed CSN to have option "${ name }" set to "${ options[name] }". Found: "${ csn.meta.options[name] }"`);
+    if (options[name] !== csn.meta.options[name]) {
+      error('wrong-pretransformed-csn', 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, `Expected pre-processed CSN to have option "${ name }" set to "${ options[name] }". Found: "${ csn.meta.options[name] }"`);
+    if (options[name] !== csn.meta.options[name]) {
+      warning('options-mismatch-pretransformed-csn', null, { prop: name, value: options[name], othervalue: csn.meta.options[name] },
+              'Expected pre-processed CSN to have option $(PROP) set to $(VALUE). Found: $(OTHERVALUE)');
+    }
   }
 
   throwWithAnyError();
@@ -147,7 +152,7 @@ function odata(csn, options = {}) {
  *
  * @param {object} csn CSN to process
  * @param {object} [externalOptions={}] Options
- * @returns {object} { model: string,  namespace: string, unappliedExtensions: string }
+ * @returns {object} { model: string, namespace: string }
  */
 function cdl(csn, externalOptions = {}) {
   const internalOptions = prepareOptions.to.cdl(externalOptions);
@@ -165,7 +170,7 @@ function cdl(csn, externalOptions = {}) {
 function forSql(csn, options = {}) {
   const internalOptions = prepareOptions.to.sql(options);
   internalOptions.transformation = 'sql';
-  const transformedCsn = forHanaNew.transformForHanaWithCsn(csn, internalOptions, 'to.sql');
+  const transformedCsn = forRelationalDB.transformForRelationalDBWithCsn(csn, internalOptions, 'to.sql');
 
   return internalOptions.testMode ? toCsn.sortCsn(transformedCsn, internalOptions) : transformedCsn;
 }
@@ -180,7 +185,7 @@ function forSql(csn, options = {}) {
 function forHdi(csn, options = {}) {
   const internalOptions = prepareOptions.to.hdi(options);
   internalOptions.transformation = 'sql';
-  const transformedCsn = forHanaNew.transformForHanaWithCsn(csn, internalOptions, 'to.hdi');
+  const transformedCsn = forRelationalDB.transformForRelationalDBWithCsn(csn, internalOptions, 'to.hdi');
 
   return internalOptions.testMode ? toCsn.sortCsn(transformedCsn, internalOptions) : transformedCsn;
 }
@@ -196,7 +201,7 @@ function forHdbcds(csn, options = {}) {
   const internalOptions = prepareOptions.to.hdbcds(options);
   internalOptions.transformation = 'hdbcds';
 
-  const hanaCsn = forHanaNew.transformForHanaWithCsn(csn, internalOptions, 'to.hdbcds');
+  const hanaCsn = forRelationalDB.transformForRelationalDBWithCsn(csn, internalOptions, 'to.hdbcds');
 
   return internalOptions.testMode ? toCsn.sortCsn(hanaCsn, internalOptions) : hanaCsn;
 }
@@ -212,11 +217,6 @@ function sql(csn, options = {}) {
   const internalOptions = prepareOptions.to.sql(options);
   internalOptions.transformation = 'sql';
 
-  const { error } = messages.makeMessageFunction(csn, internalOptions, 'for.odata');
-
-  if (internalOptions.sqlDialect === 'postgres' && !baseModel.isBetaEnabled(internalOptions, 'postgres'))
-    error(null, null, 'sqlDialect: \'postgres\' is only supported with beta-flag \'postgres\'');
-
   // we need the CSN for view sorting
   const transformedCsn = forSql(csn, options);
   const sqls = toSql.toSqlDdl(transformedCsn, internalOptions);
@@ -366,6 +366,119 @@ function remapName(key, csn, filter = () => true) {
   return key;
 }
 
+/**
+ * Return all changes in artifacts between two given models.
+ * Note: Only supports changes in artifacts compiled/rendered as db-CSN/SQL.
+ *
+ * @param {CSN.Model}  csn          A clean input CSN representing the desired "after-image"
+ * @param {HdiOptions} options      Options
+ * @param {CSN.Model}  beforeImage  A db-transformed CSN representing the "before-image", or null in case no such image
+ *                                  is known, i.e. for the very first migration step
+ * @returns {object}                An object with three properties:
+ *                                  - afterImage: A db-transformed CSN representing the "after-image"
+ *                                  - drops: An array of SQL statements to drop views/tables
+ *                                  - createsAndAlters: An array of SQL statements to ALTER/CREATE tables/views
+ */
+function sqlMigration(csn, options, beforeImage) {
+  const internalOptions = prepareOptions.to.sql(options);
+  const { error, throwWithError } = messages.makeMessageFunction(csn, options, 'to.sql.migration');
+
+  if (!isBetaEnabled(internalOptions, 'sqlMigration'))
+    throw new Error('Function `to.sql.migration` requires beta-flag `sqlMigration`');
+
+  // Prepare after-image.
+  const afterImage = forSql(csn, options);
+  // Compare both images.
+  const diff = modelCompare.compareModels(beforeImage || afterImage, afterImage, internalOptions);
+  const diffFilterObj = diffFilter[options.sqlDialect];
+
+  if (diffFilterObj) {
+    diff.extensions.forEach(ex => diffFilterObj.extension(ex, error));
+    diff.migrations.forEach(migration => diffFilterObj.migration(migration, error));
+    Object.entries(diff.deletions).forEach(entry => diffFilterObj.deletion(entry, error));
+  }
+
+  const drops = {
+    creates: {},
+    final: Object.entries(diff.deletions).reduce((previous, [ name, artifact ]) => {
+      previous[name] = `DROP ${ (artifact.query || artifact.projection) ? 'VIEW' : 'TABLE' } ${ artifact['@cds.persistence.name'] };`;
+      return previous;
+    }, {}),
+  };
+
+  const cleanup = [];
+  // Delete artifacts that are already present in csn
+  if (beforeImage?.definitions) {
+    Object.keys(beforeImage.definitions).forEach((artifactName) => {
+      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) &&
+        (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 ${ diffArtifact['@cds.persistence.name'] };`;
+      } // TODO: What happens with a changed kind -> entity becomes a view?
+      else if (diffArtifact &&
+        diffArtifact['@cds.persistence.skip'] !== true &&
+        diffArtifact.kind === beforeArtifact.kind && // detect action -> entity
+        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;
+        cleanup.push(() => delete diffArtifact['@cds.persistence.skip']);
+      }
+    });
+  }
+
+  // Convert the diff to SQL.
+  if (!internalOptions.beta)
+    internalOptions.beta = {};
+
+  internalOptions.beta.sqlExtensions = true;
+
+  // eslint-disable-next-line no-unused-vars
+  const { deletions, migrations, ...hdbkinds } = toSql.toSqlDdl(diff, internalOptions);
+
+  cleanup.forEach(fn => fn());
+  // TODO: Handle `ADD CONSTRAINT` etc!
+  const sortOrder = sortViews({ sql: {}, csn: afterImage });
+
+  const dropSqls = [];
+  const createAndAlterSqls = [];
+  // Turn the structured result into just a flat dictionary of "artifact name": "sql"
+  const flatSqlDict = Object.values(hdbkinds).reduce((prev, curr) => {
+    forEach(curr, (name, value) => {
+      prev[name] = value;
+    });
+    return prev;
+  }, Object.create(null));
+
+  // Sort all the SQL statements according to the overall order
+  for (const { name } of sortOrder) {
+    if (drops.final[name])
+      dropSqls.push(drops.final[name]);
+    else if (drops.creates[name])
+      dropSqls.push(drops.creates[name]);
+
+    // No else-if, since we have drop-creates for views!
+    if (flatSqlDict[name])
+      createAndAlterSqls.push(flatSqlDict[name]);
+    else if (migrations[name])
+      createAndAlterSqls.push(...migrations[name].map(m => m.sql));
+  }
+
+  // We need to drop the things without dependants first - so inversely sorted
+  dropSqls.reverse();
+
+  throwWithError();
+
+  return {
+    afterImage,
+    drops: dropSqls,
+    createsAndAlters: createAndAlterSqls,
+  };
+}
+
 /**
  * Return all changes in artifacts between two given models.
  * Note: Only supports changes in entities (not views etc.) compiled/rendered as HANA-CSN/SQL.
@@ -374,17 +487,7 @@ function remapName(key, csn, filter = () => true) {
  * @param {HdiOptions} options      Options
  * @param {CSN.Model}  beforeImage  A HANA-transformed CSN representing the "before-image", or null in case no such image
  *                                  is known, i.e. for the very first migration step
- * @returns {object} - afterImage:  The desired after-image in HANA-CSN format
- *                   - definitions: An array of objects with all artifacts in the after-image. Each object specifies
- *                                  the artifact filename, the suffix, and the corresponding SQL statement to create
- *                                  the artifact.
- *                   - deletions:   An array of objects with the deleted artifacts. Each object specifies the artifact
- *                                  filename and the suffix.
- *                   - migrations:  An array of objects with the changed (migrated) artifacts. Each object specifies the
- *                                  artifact filename, the suffix, and the changeset (an array of changes, each specifying
- *                                  whether it incurs potential data loss, and its respective SQL statement(s), with
- *                                  multiple statements concatenated as a multi-line string in case the change e.g.
- *                                  consists of a column drop and add).
+ * @returns {migration} The migration result
  */
 function hdiMigration(csn, options, beforeImage) {
   const internalOptions = prepareOptions.to.hdi(options);
@@ -392,11 +495,14 @@ function hdiMigration(csn, options, beforeImage) {
   // Prepare after-image.
   const afterImage = forHdi(csn, options);
 
-  // Compare both images.
   const diff = modelCompare.compareModels(beforeImage || afterImage, afterImage, internalOptions);
 
   // Convert the diff to SQL.
-  internalOptions.forHana = true; // Make it pass the SQL rendering
+  if (!internalOptions.beta)
+    internalOptions.beta = {};
+
+  internalOptions.beta.sqlExtensions = true;
+
   const { deletions, migrations, ...hdbkinds } = toSql.toSqlDdl(diff, internalOptions);
 
   return {
@@ -454,6 +560,8 @@ function createSqlMigrations(migrations, afterImage) {
 
 hdi.migration = hdiMigration;
 
+sql.migration = sqlMigration;
+
 /**
  * Process the given CSN into HDBCDS artifacts.
  *
@@ -514,7 +622,7 @@ function edmall(csn, options = {}) {
   const { error } = messages.makeMessageFunction(csn, internalOptions, 'for.odata');
 
   if (internalOptions.odataVersion === 'v2')
-    error(null, null, 'OData JSON output is not available for OData V2');
+    error(null, null, {}, 'OData JSON output is not available for OData V2');
 
   const result = {};
   let oDataCsn = csn;
@@ -927,3 +1035,19 @@ function lazyload(moduleName) {
  *
  * @typedef {object} edms
  */
+
+/**
+ * - afterImage:  The desired after-image in db-CSN format
+ * - definitions: An array of objects with all artifacts in the after-image. Each object specifies
+ *                the artifact filename, the suffix, and the corresponding SQL statement to create
+ *                the artifact.
+ * - deletions:   An array of objects with the deleted artifacts. Each object specifies the artifact
+ *                filename and the suffix.
+ * - migrations:  An array of objects with the changed (migrated) artifacts. Each object specifies the
+ *                artifact filename, the suffix, and the changeset (an array of changes, each specifying
+ *                whether it incurs potential data loss, and its respective SQL statement(s), with
+ *                multiple statements concatenated as a multi-line string in case the change e.g.
+ *                consists of a column drop and add).
+ *
+ * @typedef {object} migration
+ */

package/lib/api/validate.js

@@ -78,7 +78,7 @@ const validators = {
     expected: () => 'type array',
     found: val => `type ${ typeof val }`,
   },
-  sqlDialect: generateStringValidator([ 'sqlite', 'hana', 'plain', 'postgres' ]),
+  sqlDialect: generateStringValidator([ 'sqlite', 'hana', 'plain', 'postgres', 'h2' ]),
   sqlMapping: generateStringValidator([ 'plain', 'quoted', 'hdbcds' ]),
   odataVersion: generateStringValidator([ 'v2', 'v4' ]),
   odataFormat: generateStringValidator([ 'flat', 'structured' ]),
@@ -161,8 +161,13 @@ function validate(options, moduleName, customValidators = {}, combinationValidat
     forEach(options, (optionName, optionValue) => {
       const validator = customValidators[optionName] || validators[optionName] || booleanValidator;
 
-      if (!validator.validate(optionValue))
-        error('invalid-option', null, {}, `Expected option "${ optionName }" to have "${ validator.expected(optionValue) }". Found: "${ validator.found(optionValue) }"`);
+      if (!validator.validate(optionValue)) {
+        error('invalid-option', null, {
+          prop: optionName,
+          value: validator.expected(optionValue),
+          othervalue: validator.found(optionValue),
+        }, 'Expected option $(PROP) to have $(VALUE). Found: $(OTHERVALUE)');
+      }
     });
     throwWithAnyError();
   }

package/lib/base/dictionaries.js

@@ -19,7 +19,7 @@ function dictAdd( dict, name, entry, duplicateCallback ) {
       duplicateCallback( name, found.name.location, found );
   }
   found.$duplicates.push( entry );
-  if (Array.isArray(entry.$duplicates))
+  if (Array.isArray( entry.$duplicates ))
     found.$duplicates.push( ...entry.$duplicates )
   else if (duplicateCallback && name) // do not complain with empty name ''
     duplicateCallback( name, entry.name.location, entry );
@@ -31,7 +31,7 @@ function dictForEach( dict, callback ) {
   // TODO: probably define an extra dictForEachArray()
   for (const name in dict) {
     const entry = dict[name];
-    if (Array.isArray(entry)) {
+    if (Array.isArray( entry )) {
       entry.forEach( callback );
     }
     else {
@@ -53,8 +53,8 @@ function dictAddArray( dict, name, entry, messageCallback ) {
     dict[name] = entry;         // also ok if array (redefined)
     return entry;
   }
-  if (Array.isArray(entry)) {
-    if (Array.isArray(found)) {
+  if (Array.isArray( entry )) {
+    if (Array.isArray( found )) {
       dict[name] = [ ...found, ...entry ];
     }
     else {
@@ -65,7 +65,7 @@ function dictAddArray( dict, name, entry, messageCallback ) {
     }
   }
   else {
-    if (Array.isArray(found)) {
+    if (Array.isArray( found )) {
       dict[name] = [ ...found, entry ];
     }
     else {
@@ -84,7 +84,7 @@ function dictAddArray( dict, name, entry, messageCallback ) {
 // Push `entry` to the array value with key `name` in the dictionary `dict`.
 function pushToDict( dict, name, entry ) {
   if (dict[name])
-    dict[name].push(entry);
+    dict[name].push( entry );
   else
     dict[name] = [entry];
 }

package/lib/base/error.js

@@ -6,7 +6,7 @@
  */
 class CompilerAssertion extends Error {
   constructor(message) {
-    super(message);
+    super(`cds-compiler assertion failed: ${message}`);
   }
 }
 
@@ -16,7 +16,7 @@ class CompilerAssertion extends Error {
  */
 class ModelError extends Error {
   constructor(message) {
-    super(message);
+    super(`cds-compiler model error: ${message}`);
   }
 }