@sap/cds-compiler 3.1.0 → 3.3.2

package/CHANGELOG.md

@@ -7,6 +7,91 @@
 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.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
+
+- to.edm(x):
+  + `@Capabilities` 'pull up' for containment trees should not prefix the
+    dynamic annotation paths of the root container.
+  + Remove service namespace prefix of a parameter type for function/action annotation targets
+    in multi schema mode if the parameter type is defined in an alternative schema.
+
 ## Version 3.1.0 - 2022-08-04
 
 ### Added
@@ -15,8 +100,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`
 
@@ -41,8 +126,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

@@ -409,7 +409,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;
   }

package/doc/CHANGELOG_BETA.md

@@ -8,6 +8,24 @@ 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.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

@@ -15,7 +15,7 @@ const modelCompare = lazyload('../modelCompare/compare');
 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
@@ -93,12 +93,12 @@ function checkPreTransformedCsn(csn, options, relevantOptionNames, warnAboutMism
 
   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] }"`);
+      error('wrong-pretransformed-csn', null, {}, `Expected pre-processed CSN to have option "${ name }" set to "${ options[name] }". Found: "${ csn.meta.options[name] }"`);
   }
 
   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] }"`);
+      warning('options-mismatch-pretransformed-csn', null, {}, `Expected pre-processed CSN to have option "${ name }" set to "${ options[name] }". Found: "${ csn.meta.options[name] }"`);
   }
 
   throwWithAnyError();
@@ -147,7 +147,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 +165,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 +180,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 +196,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 +212,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);
@@ -514,7 +509,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;

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}`);
   }
 }
 

package/lib/base/keywords.js

@@ -188,10 +188,7 @@ module.exports = {
     'WITHOUT'
   ],
   // SAP HANA keywords, used for smart quoting in to-hdi.plain
-  // Taken from https://help.sap.com/viewer/7c78579ce9b14a669c1f3295b0d8ca16/Cloud/en-US/28bcd6af3eb6437892719f7c27a8a285.html
-  // Better use keywords in ptime/query/parser/syntax/qp_keyword.cc minus those
-  // in rule unreserved_keyword_column (=…_common - 'CONSTRAINT') in
-  // ptime/query/parser/syntax/qp_gram.y of the HANA sources.
+  // See './scripts/keywords/hana/generateSqlKeywords.js'
   hana: [
     'ABAPITAB',
     'ABAPSTRUCT',
@@ -215,12 +212,10 @@ module.exports = {
     'ADD_MONTHS',
     'ADD_SECONDS',
     'ADD_YEARS',
-    'ADJACENCY',
     'ADOPT',
     'ALL',
     'ALPHANUM',
     'ALTER',
-    'ANALYTIC',
     'ANY',
     'APPLY_FILTER',
     'ARRAY',
@@ -397,7 +392,6 @@ module.exports = {
     'DISTANCE',
     'DISTINCT',
     'DOUBLE',
-    'DW_OPTIMIZED',
     'ELSE',
     'ELSEIF',
     'EMPTY',
@@ -411,12 +405,9 @@ module.exports = {
     'FALSE',
     'FILTER',
     'FIRST_VALUE',
-    'FLATTEN',
     'FLOAT',
     'FLOOR',
     'FOR',
-    'FORCE_FIRST_PASSWORD_CHANGE',
-    'FREESTYLESEARCHATTRIBUTE',
     'FROM',
     'FULL',
     'GET_NUM_SERVERS',
@@ -515,7 +506,6 @@ module.exports = {
     'NUMBER',
     'NUMERIC',
     'NVARCHAR',
-    'OBJECT',
     'OCCURRENCES_REGEXPR',
     'OF',
     'OLYMP',
@@ -640,16 +630,11 @@ module.exports = {
     'SYSTEM_TIME',
     'SYSUUID',
     'TABLE',
-    'TABLES',
     'TABLESAMPLE',
     'TAN',
     'TANH',
-    'TARGET',
-    'TEMPORARY',
     'TEXT',
     'TEXT_FILTER',
-    'THEN',
-    'THREAD',
     'TIME',
     'TIMELINE',
     'TIMESTAMP',
@@ -662,11 +647,8 @@ module.exports = {
     'TM_GET_RELEVANT_DOCUMENTS',
     'TM_GET_RELEVANT_TERMS',
     'TM_GET_SUGGESTED_TERMS',
-    'TOKEN',
-    'TOOLOPTION',
+    'TO',
     'TOP',
-    'TOPK',
-    'TOTAL',
     'TO_BIGINT',
     'TO_BINARY',
     'TO_BLOB',
@@ -694,11 +676,7 @@ module.exports = {
     'TO_VARBINARY',
     'TO_VARCHAR',
     'TRACE',
-    'TRACEPROFILE',
-    'TRACES',
     'TRAILING',
-    'TRANSACTION',
-    'TREE',
     'TRIGGER_UPDATE_COLUMN',
     'TRIM',
     'TRUE',

package/lib/base/message-registry.js

@@ -97,6 +97,9 @@ const centralMessages = {
   'extend-repeated-intralayer': { severity: 'Warning' },
   'extend-unrelated-layer':     { severity: 'Warning' },
 
+  'ext-duplicate-extend-type': { severity: 'Error' },
+  'ext-duplicate-extend-type-unrelated-layer': { severity: 'Error', configurableFor: true },
+
   'param-default': { severity: 'Error', configurableFor: 'deprecated' }, // not supported yet
 
   'query-undefined-element': { severity: 'Error' },
@@ -115,7 +118,8 @@ const centralMessages = {
   'ref-undefined-var':    { severity: 'Error' },
   'ref-undefined-element': { severity: 'Error' },
   'ref-unknown-var': { severity: 'Info', errorFor: [ 'to.hdbcds', 'to.sql', 'to.hdi', 'to.rename' ] },
-  'ref-obsolete-parameters': { severity: 'Error', configurableFor: true }, // does not hurt us
+  'ref-obsolete-parameters': { severity: 'Error', configurableFor: true },
+           // does not hurt us, but makes it tedious to detect parameter refs
   'ref-undefined-param': { severity: 'Error' },
   'ref-rejected-on': { severity: 'Error' },
   'ref-expected-element': { severity: 'Error' },
@@ -131,6 +135,8 @@ const centralMessages = {
   'service-nested-context': { severity: 'Error', configurableFor: true }, // does not hurt compile, TODO
   'service-nested-service': { severity: 'Error', configurableFor: 'deprecated' }, // not supported yet
 
+  'expr-unexpected-operator': { severity: 'Error', configurableFor: true },
+
   // 'syntax-duplicate-annotate' came late with v3 - make it configurable as
   // fallback, but then parse.cdl is not supposed to work correctly (it can
   // then either issue an error or produce a CSN missing some annotations):
@@ -162,9 +168,18 @@ const centralMessages = {
   'unexpected-keys-for-composition': { severity: 'Error' }, // TODO: more than 30 chars
   'unmanaged-as-key': { severity: 'Error', configurableFor: 'deprecated' }, // is confusing
   'composition-as-key': { severity: 'Error', configurableFor: 'deprecated' }, // is confusing and not supported
-  'odata-spec-violation-array':  { severity: 'Warning' }, // more than 30 chars
+  // Published! Used in @sap/cds-odata-v2-adapter-proxy; if renamed, add to oldMessageIds
+  'odata-spec-violation-array': { severity: 'Warning' }, // more than 30 chars
+  // Published! Used in @sap/cds-odata-v2-adapter-proxy; if renamed, add to oldMessageIds
+  'odata-spec-violation-assoc': { severity: 'Warning' }, // more than 30 chars
+  // Published! Used in @sap/cds-odata-v2-adapter-proxy; if renamed, add to oldMessageIds
   'odata-spec-violation-constraints': { severity: 'Info' }, // more than 30 chars
   'odata-spec-violation-id': { severity: 'Error', configurableFor: true },
+  'odata-spec-violation-namespace': { severity: 'Warning' }, // more than 30 chars
+  // Published! Used in @sap/cds-odata-v2-adapter-proxy; if renamed, add to oldMessageIds
+  'odata-spec-violation-param': { severity: 'Warning' }, // more than 30 chars
+  // Published! Used in @sap/cds-odata-v2-adapter-proxy; if renamed, add to oldMessageIds
+  'odata-spec-violation-returns': { severity: 'Warning' }, // more than 30 chars
   'odata-spec-violation-type': { severity: 'Error', configurableFor: true },
   'odata-spec-violation-type-unknown': { severity: 'Warning' },
   'odata-spec-violation-no-key':  { severity: 'Warning' },
@@ -180,15 +195,6 @@ const centralMessages = {
 // The keys will be added to `oldNames` of the new message, which is used for reclassification.
 const oldMessageIds = createDict({
   'old-anno-duplicate': 'anno-duplicate', // Example
-
-  // These IDs are used by large stakeholders.  If we change them, we should
-  // be backward-compatible.
-  // 'redirected-to-complex': 'TODO',
-  // 'wildcard-excluding-one': 'TODO',
-  // 'wildcard-excluding-many': 'TODO',
-  // 'assoc-outside-service': 'TODO',
-  // 'redirected-to-same': 'TODO',
-  // 'query-navigate-many': 'TODO',
 });
 
 // Set up the old-to-new message ID mapping in the message registry.
@@ -209,6 +215,8 @@ for (const oldName in oldMessageIds) {
 // For messageIds, where no text has been provided via code (central def)
 const centralMessageTexts = {
   'api-invalid-option': {
+    // TODO: too many different error situations for one message id,
+    // TODO: use message parameter - do not use quotes in message texts
     std: 'Option $(NAME) is no longer supported! Use SNAPI options instead',
     magicVars: 'Option “magicVars” is no longer supported! Use “variableReplacements” instead. See <https://cap.cloud.sap/docs/guides/databases#configuring-variables> for details',
     user: 'Option “variableReplacements” expects “$user” instead of “user”. See <https://cap.cloud.sap/docs/guides/databases#configuring-variables> for details',
@@ -232,7 +240,7 @@ const centralMessageTexts = {
     'flatten-fkey-exists': 'Generated foreign key element $(NAME) for association $(ART) conflicts with existing element',
   },
 
-  'syntax-anno-ignored': {
+  'syntax-ignoring-anno': {
     std: 'Annotations can\'t be used at prefix references',
     doc: 'Doc comments can\'t be used at prefix references',
   },
@@ -403,12 +411,32 @@ const centralMessageTexts = {
   'expected-entity': 'An entity, projection or view is expected here',
   'expected-struct': 'A type, entity, aspect or event with direct elements is expected here',
   'expected-type': 'A type or an element is expected here',
-  // TOODO: text variant if the association does not start an an entity
+  // TODO: text variant if the association does not start an entity
   'expected-source': 'A query source must be an entity or an association',
   'expected-target': 'An entity or an aspect is expected here',
   'extend-columns': 'Artifact $(ART) can\'t be extended with columns, only projections can',
   'extend-repeated-intralayer': 'Unstable element order due to repeated extensions in same layer',
 
+
+  'ext-duplicate-extend-type': 'Duplicate type extension for type $(TYPE)',
+  'ext-duplicate-extend-type-unrelated-layer': 'Duplicate type extension for type $(TYPE)',
+  'ext-invalid-type-property':  {
+    std: 'Property $(PROP) can only be extended',
+    'new-prop': 'Property $(PROP) can only be extended, not added',
+    // eslint-disable-next-line max-len
+    smaller: 'Property $(PROP) can only be extended, but $(LITERAL) is smaller than $(NUMBER) of type definition',
+    // eslint-disable-next-line max-len
+    'ext-smaller': 'Property $(PROP) can only be extended, but extended value $(LITERAL) is smaller than $(NUMBER) from previous type extension',
+    prop: 'Type property $(PROP) can\'t be extended',
+    scale: 'If property $(PROP) is increased, then so must $(OTHERPROP)',
+    string: 'Only numerical properties can be extended, but found string for $(PROP)',
+  },
+  'ref-expected-scalar-type': {
+    std: 'Only scalar type definitions can be extended with type properties',
+    unsupported: 'Only integer-, decimal-, binary-, and string-types can be extended but found $(PROP)',
+    inferred: 'Only direct types can be extended',
+  },
+
   'query-unexpected-assoc-hdbcds': 'Publishing a managed association in a view is not possible for “hdbcds” naming mode',
   'query-unexpected-structure-hdbcds': 'Publishing a structured element in a view is not possible for “hdbcds” naming mode',
   'query-ignoring-param-nullability': {
@@ -477,9 +505,10 @@ const centralMessageTexts = {
   },
   'odata-navigation': {
     std: 'No OData navigation property generated, target $(TARGET) is outside of service $(SERVICE)',
-    oncond: 'No OData navigation property generated for association with arbitrary ON condition and target $(TARGET) outside of service $(SERVICE)'
+    oncond: 'No OData navigation property generated for association with arbitrary ON-condition and target $(TARGET) outside of service $(SERVICE)'
   },
   'odata-parameter-order': 'Unexpected mandatory after optional parameter',
+  'odata-key-recursive': 'Unexpected recursive key $(NAME)',
 }
 
 /**

package/lib/base/messages.js

@@ -136,14 +136,11 @@ class CompileMessage {
     this.location = location;
     this.$location = { ...this.location, address: undefined };
     this.validNames = null;
-    if (home)                   // semantic location, e.g. 'entity:"E"/element:"x"'
-      this.home = home;
+    this.home = home;  // semantic location, e.g. 'entity:"E"/element:"x"'
     this.severity = severity;
-    if (id)
-      Object.defineProperty( this, 'messageId', { value: id } );
-      // this.messageId = id;  // ids not yet finalized
-    if (moduleName)
-      Object.defineProperty( this, '$module', { value: moduleName, configurable: true } );
+    Object.defineProperty( this, 'messageId', { value: id } );
+    // this.messageId = id;  // ids not yet finalized
+    Object.defineProperty( this, '$module', { value: moduleName, configurable: true } );
   }
 
   toString() {                  // should have no argument...
@@ -676,6 +673,7 @@ const paramsTransform = {
   elemref: transformElementRef,
   type: transformArg,
   offending: tokenSymbol,
+  op: quote.prop,
   expecting: transformManyWith( tokenSymbol ),
   // msg: m => m,
   $reviewed: ignoreTextTransform,
@@ -801,6 +799,7 @@ function messageText( texts, params, transform ) {
 }
 
 function replaceInString( text, params ) {
+  const usedParams = [ '#', '$reviewed' ];
   let pattern = /\$\(([A-Z_]+)\)/g;
   let parts = [];
   let start = 0;
@@ -808,11 +807,11 @@ function replaceInString( text, params ) {
     let prop = p[1].toLowerCase();
     parts.push( text.substring( start, p.index ),
                 (prop in params ? params[prop] : p[0]) );
-    delete params[prop];
+    usedParams.push(prop);
     start = pattern.lastIndex;
   }
   parts.push( text.substring( start ) );
-  let remain = (params['#']) ? [] : Object.keys( params ).filter( n => params[n] );
+  let remain = (params['#']) ? [] : Object.keys( params ).filter( n => !usedParams.includes(n) );
   return (remain.length)
          ? parts.join('') + '; ' +
            remain.map( n => n.toUpperCase() + ' = ' + params[n] ).join(', ')
@@ -1024,6 +1023,7 @@ function compareMessage( a, b ) {
              c( aEnd.endLine, bEnd.endLine ) ||
              c( aEnd.endCol, bEnd.endCol ) ||
              c( homeSortName( a ), homeSortName( b ) ) ||
+             // TODO: severities?
              c( a.message, b.message ) );
   }
   else if (!aFile && !bFile)
@@ -1172,7 +1172,9 @@ function homeNameForExtend( art ) {
 
   // Surrounding parent may be another extension.
   const parent = art._parent;
-  if (!parent)
+  if (!parent && art.name.absolute)
+    return kind + ':' + artName(removeBlock(art));
+  else if (!parent)
     return kind + ':' + quoted(absoluteName);
 
   if (art.name.param && parent.params) {
@@ -1199,6 +1201,14 @@ function homeNameForExtend( art ) {
   }
   // This case should not happen, but just in case
   return kind + ':' + artName(parent);
+
+  /**
+   * Remove `select` from the 'art's name to avoid `block:1` in artName().
+   * @TODO: Refactor homeNameForExtend (and possibly artName) to get rid of this function
+   **/
+  function removeBlock(obj) {
+    return { ...obj, name: { ...obj.name, select: null } };
+  }
 }
 
 function constructSemanticLocationFromCsnPath(csnPath, model) {

package/lib/base/model.js

@@ -26,8 +26,8 @@ const availableBetaFlags = {
   hanaAssocRealCardinality: true,
   mapAssocToJoinCardinality: true,
   ignoreAssocPublishingInUnion: true,
-  nestedProjections: true,
   enableUniversalCsn: true,
+  postgres: true,
   // disabled by --beta-mode
   nestedServices: false,
   odataOpenType: true,

package/lib/checks/actionsFunctions.js

@@ -22,7 +22,7 @@ function checkActionOrFunction(art, artName, prop, path) {
 
   const serviceName = this.csnUtils.getServiceName(artName);
   if (!serviceName)
-    this.warning(null, path, `Functions and actions must be declared in a service`);
+    this.warning(null, path, {}, `Functions and actions must be declared in a service`);
 
   if (art.kind === 'entity') {
     for (const [ actName, act ] of Object.entries(art.actions)) {

package/lib/checks/annotationsOData.js

@@ -36,7 +36,7 @@ function checkCoreMediaTypeAllowence(member) {
  */
 function checkAnalytics(member) {
   if (member['@Analytics.Measure'] && !member['@Aggregation.default']) {
-    this.info(null, member.$path,
+    this.info(null, member.$path, {},
               'Annotation “@Analytics.Measure” expects “@Aggregation.default” to be assigned for the same element as well');
   }
 }
@@ -63,7 +63,7 @@ function checkReadOnlyAndInsertOnly(artifact, artifactName) {
   if (!this.csnUtils.getServiceName(artifactName))
     return;
   if (artifact.kind === 'entity' && artifact['@readonly'] && artifact['@insertonly'])
-    this.warning(null, artifact.$path, 'Annotations “@readonly” and “@insertonly” can\'t be assigned in combination');
+    this.warning(null, artifact.$path, {}, 'Annotations “@readonly” and “@insertonly” can\'t be assigned in combination');
 }
 
 module.exports = {

package/lib/checks/arrayOfs.js

@@ -1,5 +1,7 @@
 'use strict';
 
+const { setProp } = require('../base/model');
+
 // Only to be used with validator.js - a correct `this` value needs to be provided!
 
 /**
@@ -24,20 +26,26 @@ function validateAssociationsInItems(member) {
           if (element.on) { // Unmanaged association
             // Unmanaged associations are always forbidden for now
             // TODO: Check if the on-condition only references things inside of the .items
-            this.error(null, member.$path, 'Unmanaged associations in "array of" or "many" are not allowed');
+            this.error(null, member.$path, {}, 'Unmanaged associations in "array of" or "many" are not allowed');
           }
         }
       }
     }
   };
   if (this.artifact && ( this.artifact.kind === 'entity' || this.artifact.query ) && member && member.items && member.$path[2] === 'elements') {
-    if (member.items.type && member.items.type.ref)
-      validate(this.artifactRef(member.items.type));
-
-    else if (member.items.type)
-      validate(this.csn.definitions[member.items.type]);
-    else
+    if (member.items.type) {
+      const type = member.items.type.ref
+        ? this.artifactRef(member.items.type)
+        : this.csn.definitions[member.items.type];
+      if (type && !type.$visited) {
+        setProp(type, '$visited', true);
+        validate(type);
+        delete type.$visited;
+      }
+    }
+    else {
       validate(member.items);
+    }
   }
 }
 

package/lib/checks/cdsPersistence.js

@@ -17,7 +17,7 @@ function validateCdsPersistenceAnnotation(artifact, artifactName, prop, path) {
     // TODO: Why not filter over persistenceAnnos, is shorter!
     const TableUdfCv = Object.keys(artifact).filter(p => persistenceAnnos.includes(p) && artifact[p]);
     if (TableUdfCv.length > 1)
-      this.error(null, path, `Annotations ${ TableUdfCv.join(', ') } can't be used in combination`);
+      this.error(null, path, {}, `Annotations ${ TableUdfCv.join(', ') } can't be used in combination`);
   }
 }