@sap/cds-compiler 3.1.2 → 3.4.0

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',
@@ -864,5 +842,109 @@ module.exports = {
     'WHERE',
     'WINDOW',
     'WITH'
+  ],
+  // H2 keywords, used for smart quoting in to-sql.plain.postgres
+  // Taken from http://www.h2database.com/html/advanced.html#keywords
+  h2: [
+    'ALL',
+    'AND',
+    'ANY',
+    'ARRAY',
+    'AS',
+    'ASYMMETRIC',
+    'AUTHORIZATION',
+    'BETWEEN',
+    'BOTH',
+    'CASE',
+    'CAST',
+    'CHECK',
+    'CONSTRAINT',
+    'CROSS',
+    'CURRENT_CATALOG',
+    'CURRENT_DATE',
+    'CURRENT_PATH',
+    'CURRENT_ROLE',
+    'CURRENT_SCHEMA',
+    'CURRENT_TIME',
+    'CURRENT_TIMESTAMP',
+    'CURRENT_USER',
+    'DAY',
+    'DEFAULT',
+    'DISTINCT',
+    'ELSE',
+    'END',
+    'EXCEPT',
+    'EXISTS',
+    'FALSE',
+    'FETCH',
+    'FOR',
+    'FOREIGN',
+    'FROM',
+    'FULL',
+    'GROUP',
+    'GROUPS',
+    'HAVING',
+    'HOUR',
+    'IF',
+    'ILIKE',
+    'IN',
+    'INNER',
+    'INTERSECT',
+    'INTERVAL',
+    'IS',
+    'JOIN',
+    'KEY',
+    'LEADING',
+    'LEFT',
+    'LIKE',
+    'LIMIT',
+    'LOCALTIME',
+    'LOCALTIMESTAMP',
+    'MINUS',
+    'MINUTE',
+    'MONTH',
+    'NATURAL',
+    'NOT',
+    'NULL',
+    'OFFSET',
+    'ON',
+    'OR',
+    'ORDER',
+    'OVER',
+    'PARTITION',
+    'PRIMARY',
+    'QUALIFY',
+    'RANGE',
+    'REGEXP',
+    'RIGHT',
+    'ROW',
+    'ROWNUM',
+    'ROWS',
+    'SECOND',
+    'SELECT',
+    'SESSION_USER',
+    'SET',
+    'SOME',
+    'SYMMETRIC',
+    'SYSTEM_USER',
+    'TABLE',
+    'TO',
+    'TOP',
+    'TRAILING',
+    'TRUE',
+    'UESCAPE',
+    'UNION',
+    'UNIQUE',
+    'UNKNOWN',
+    'USER',
+    'USING',
+    'VALUE',
+    'VALUES',
+    'WHEN',
+    'WHERE',
+    'WINDOW',
+    'WITH',
+    'YEAR',
+    '_ROWID_'
   ]
 }

package/lib/base/message-registry.js

@@ -37,7 +37,11 @@ const { createDict } = require("../utils/objectUtils");
  * Central register of messages and their configuration.
  * Group by id-category.
  *
- * configurableFor: 'deprecated' = severity can only be changed with deprecated.downgradableErrors
+ * configurableFor: truthy = error can be downgraded in certain situations
+ *  - true = can always be downgraded, we do not really care
+ *  - [‹module›, …] = can be downgraded in compiler function ‹module›
+ *  - 'deprecated' = severity can only be changed with deprecated.downgradableErrors
+ *  - 'v3' = currently like true, but should be 'deprecated' in v4
  *
  * @type {Object<string, MessageConfig>}
  */
@@ -74,12 +78,11 @@ const centralMessages = {
 
   'empty-type':   { severity: 'Info' }, // only still an error in old transformers
 
-  // Structured types were warned about but made CSN un-recompilable.
-  'enum-invalid-type': { severity: 'Error', configurableFor: 'deprecated' },
-
   // TODO: rename to ref-expected-XYZ
   'expected-type': { severity: 'Error' },
   'ref-sloppy-type': { severity: 'Error' },
+  'ref-unexpected-self': { severity: 'Error' },
+  'ref-expecting-bare-aspect': { severity: 'Error' },
   'type-unexpected-typeof': { severity: 'Error', configurableFor: 'deprecated' }, // TODO: make it non-config
   'type-ignoring-argument': { severity: 'Error', configurableFor: true },
   'type-expected-builtin': { severity: 'Error', configurableFor: true },
@@ -97,6 +100,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,44 +121,33 @@ 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' },
 
-  'rewrite-key-not-covered-explicit': { severity: 'Error', configurableFor: 'deprecated' },
-  'rewrite-key-not-covered-implicit': { severity: 'Error', configurableFor: 'deprecated' },
-  'rewrite-key-not-matched-explicit': { severity: 'Error', configurableFor: 'deprecated' },
-  'rewrite-key-not-matched-implicit': { severity: 'Error', configurableFor: 'deprecated' },
-  'rewrite-key-for-unmanaged': { severity: 'Error', configurableFor: 'deprecated' },
-  'rewrite-not-supported': { severity: 'Error' },
-  'rewrite-on-for-managed': { severity: 'Error', configurableFor: 'deprecated' },
+  'rewrite-key-not-covered-explicit': { severity: 'Error' },
+  'rewrite-key-not-covered-implicit': { severity: 'Error' },
+  'rewrite-key-not-matched-explicit': { severity: 'Error' },
+  'rewrite-key-not-matched-implicit': { severity: 'Error' },
 
   '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):
   'syntax-duplicate-annotate': { severity: 'Error', configurableFor: true },
-  'syntax-expected-cardinality': { severity: 'Error' },
-  'syntax-expected-length': { severity: 'Error' },
-  'syntax-expected-translation': { severity: 'Error' },
-  'syntax-required-subproperty': { severity: 'Error' },
-  'syntax-unexpected-property': { severity: 'Error', configurableFor: true }, // is the removed
+  'syntax-unexpected-property': { severity: 'Error' },
   'syntax-deprecated-ident': { severity: 'Error', configurableFor: true },
   'syntax-fragile-alias': { severity: 'Error', configurableFor: true },
   'syntax-fragile-ident': { severity: 'Error', configurableFor: true },
-
-  'syntax-invalid-extend': { severity: 'Error' },
-
-  'syntax-invalid-text-block' : { severity: 'Error' },
   'syntax-unknown-escape': { severity: 'Error', configurableFor: true },
-  'syntax-invalid-escape': { severity: 'Error' },
-  'syntax-missing-escape': { severity: 'Error' },
 
-  'syntax-expected-integer': { severity: 'Error' },
-  'syntax-invalid-masked': { severity: 'Error', configurableFor: true },
+  'syntax-unsupported-masked': { severity: 'Error', configurableFor: 'v3' },
   'syntax-unexpected-null': { severity: 'Error', configurableFor: true },
 
   'type-managed-composition': { severity: 'Error', configurableFor: 'deprecated' }, // TODO: non-config
@@ -162,9 +157,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 +184,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.
@@ -206,9 +201,14 @@ for (const oldName in oldMessageIds) {
 }
 
 
-// For messageIds, where no text has been provided via code (central def)
+// For messageIds, where no text has been provided via code (central def).
+// DO NOT CHANGE THE VARIABLE NAME!
+// If you change it, keep in sync with scripts/eslint/rules/message-text.js
+
 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',
@@ -231,42 +231,118 @@ const centralMessageTexts = {
     'flatten-fkey-gen': 'Duplicate definition of foreign key element $(NAME) for association $(ART)',
     'flatten-fkey-exists': 'Generated foreign key element $(NAME) for association $(ART) conflicts with existing element',
   },
-
-  'syntax-anno-ignored': {
+  
+  // Syntax messages, both CDL and CSN parser: ----------------------------------
+  'syntax-dollar-ident': {      // Warning, TODO: make it name-invalid-alias
+    std: 'An artifact starting with $(NAME) might shadow a special variable - replace by another name',
+    $tableAlias: 'A table alias name starting with $(NAME) might shadow a special variable - replace by another name',
+    $tableImplicit: 'The resulting table alias starts with $(NAME) and might shadow a special variable - specify another name with $(KEYWORD)',
+    mixin: 'A mixin name starting with $(NAME) might shadow a special variable - replace by another name',
+  },
+  // 'syntax-duplicate-excluding' (TODO: also CDL)
+  'syntax-ignoring-anno': {
     std: 'Annotations can\'t be used at prefix references',
     doc: 'Doc comments can\'t be used at prefix references',
   },
+  'syntax-invalid-name': {
+    std: 'Identifier for name must not be empty', // TODO: use
+    csn: 'Property name in dictionary $(PARENTPROP) must not be empty',
+  },
+  'syntax-invalid-literal': {   // TODO: write texts less CDL specific
+    'std': 'Invalid literal',
+    'uneven-hex': 'A binary literal must have an even number of characters',
+    'invalid-hex': 'A binary literal must only contain characters 0-9, a-f and A-F',
+    'time': 'Expecting time\'hh:mm:ss\' where hh, mm and the optional ss are numbers',
+    'date': 'Expecting date\'YYYY-MM-DD\' where YYYY, MM and DD are numbers',
+    'timestamp': 'Expecting timestamp\'YYYY-MM-DD hh:mm:ss.u…u\' where YYYY, MM, DD, hh, mm, ss and u are numbers (optional 1-7×u)',
+  },
+  'syntax-missing-ellipsis': 'Expecting an array item $(NEWCODE) after an item with $(CODE)',
   'syntax-unexpected-ellipsis': {
-    std: 'Expected no more than one $(CODE)',
-    'nested-array': 'Unexpected $(CODE) in nested array'
-  },
-  'syntax-expected-object': 'Expected object for property $(PROP)',
-  'syntax-expected-column': 'Expected object or string \'*\' for property $(PROP)',
-  'syntax-expected-natnum': 'Expected non-negative number for property $(PROP)',
-  'syntax-expected-cardinality': 'Expected non-negative number or string \'*\' for property $(PROP)',
-  'syntax-expected-reference': 'Expected non-empty string or object for property $(PROP)',
-  'syntax-expected-term': 'Expected non-empty string or object for property $(PROP)',
-  'syntax-dollar-ident': {
-    std: 'An artifact starting with $(NAME) might shadow a special variable - replace by another name',
-    $tableAlias: 'A table alias name starting with $(NAME) might shadow a special variable - replace by another name',
-    $tableImplicit: 'The resulting table alias starts with $(NAME) and might shadow a special variable - specify another name with $(KEYWORD)',
-    mixin: 'A mixin name starting with $(NAME) might shadow a special variable - replace by another name' ,
+    std: 'Unexpected array item $(CODE)',
+    duplicate: 'Unexpected array item $(CODE) after previous $(CODE) without $(KEYWORD)',
+    'csn-duplicate': 'Unexpected object with property $(PROP) after previous array item $(CODE)',
+    'csn-nested': 'Unexpected object with property $(PROP) in nested array',
   },
-  'syntax-expected-length': {
-    std: 'Expected array in $(PROP) to have at least $(N) items',
-    one: 'Expected array in $(PROP) to have at least one item',
-    suffix: 'With sibling property $(OTHERPROP), expected array in $(PROP) to have at least one item',
+  'syntax-unsupported-masked': { // configurable Error
+    std: 'The keyword $(KEYWORD) is not supported',
+    csn: 'The property $(PROP) is not supported',
+  },
+
+  // Syntax messages, CDL parser - default: Error  ------------------------------
+  'syntax-duplicate-annotate': 'You can\'t refer to $(NAME) repeatedly with property $(PROP) in the same annotate statement',
+  'syntax-duplicate-extend': {
+    std: 'You can\'t define and refer to $(NAME) repeatedly in the same extend statement',
+    define: 'You can\'t refer to $(NAME) in the same extend statement where it was defined',
+    extend: 'You can\'t refer to $(NAME) repeatedly in the same extend statement',
   },
   'syntax-invalid-extend': 'Can\'t extend an element with $(KIND)',
   'syntax-invalid-text-block': 'Missing newline in text block',
+  'syntax-unsupported-param': {
+    std: 'Parameter not supported', // unused
+    dynamic: 'Dynamic parameter $(NAME) is not supported',
+    positional: 'Positional parameter $(NAME) is not supported',
+  },
+
+  // Syntax messages, CSN parser - default: Error  ------------------------------
+  // TODO: use one id with text variants instead of several message ids
+  'syntax-deprecated-property': {  // Warning
+    std: 'Deprecated property $(PROP)', // unused
+    'zero': 'Deprecated CSN v0.1.0 property $(PROP) is ignored',
+    'zero-replace': 'Replace CSN v0.1.0 property $(PROP) by $(OTHERPROP)',
+  },
+  'syntax-deprecated-value': {  // Warning
+    std: 'Deprecated representation of the value in property $(PROP)',
+    replace: 'Replace value in $(PROP) by $(VALUE)',
+    'zero-parens': 'Deprecated CSN v.0.1.0 representation of expressions in parentheses',
+    'zero-replace': 'Replace CSN v0.1.0 value in $(PROP) by $(VALUE)',
+  },
+
+  'syntax-expecting-object': 'Expecting object for property $(PROP)',
+  'syntax-expecting-column': 'Expecting object or string \'*\' for property $(PROP)',
+  'syntax-expecting-natnum': 'Expecting non-negative number for property $(PROP)',
+  'syntax-expecting-cardinality': 'Expecting non-negative number or string \'*\' for property $(PROP)',
+  'syntax-expecting-reference': 'Expecting non-empty string or object for property $(PROP)',
+  'syntax-expecting-term': 'Expecting non-empty string or object for property $(PROP)',
+  // 'syntax-expecting-string', 'syntax-expecting-boolean' (Warning), 'syntax-expecting-scalar',
+  // 'syntax-expecting-args', 'syntax-expecting-translation', 'syntax-expecting-array'
+  'syntax-incomplete-array': {  // location at ']'
+    std: 'Expecting array in $(PROP) to have at least $(N) items',
+    one: 'Expecting array in $(PROP) to have at least one item',
+    suffix: 'With sibling property $(SIBLINGPROP), expecting array in $(PROP) to have at least one item',
+  },
+  'syntax-incomplete-object': { // location at '}'
+    std: 'Object in $(PROP) must have at least one valid CSN property',
+    as: 'Object in $(PROP) must have at least one valid CSN property other than $(OTHERPROP)',
+  },
+  // 'syntax-invalid-ref' (Warning?), 'syntax-invalid-kind', 'syntax-invalid-literal' (Warning)
+  'syntax-invalid-string': {
+    std: 'Invalid string value in property $(PROP)',
+  },
+  'syntax-missing-property': {  // location at sibling or '}' otherwise
+    std: 'Object in $(PARENTPROP) must have the property $(PROP)',
+    sibling: 'Object with property $(SIBLINGPROP) must also have a property $(PROP)',
+    columns: 'Object in $(PARENTPROP) must have an expression property like $(PROP)',
+    extensions: 'Object in $(PARENTPROP) must have the property $(PROP) or $(OTHERPROP)',
+  },
+  'syntax-unexpected-property': {
+    std: 'Unexpected CSN property $(PROP)',
+    sibling: 'CSN property $(PROP) is not expected in an object with property $(SIBLINGPROP)',
+    prop: 'CSN property $(PROP) is not expected in $(PARENTPROP)',
+    top: 'CSN property $(PROP) is not expected top-level',
+    kind: 'CSN property $(PROP) is not expected by a definition of kind $(KIND)',
+    extend: 'CSN property $(PROP) is not expected by an extend in $(PARENTPROP)',
+    annotate: 'CSN property $(PROP) is not expected by an annotate in $(PARENTPROP)',
+  },
+  // 'syntax-unknown-property' (Warning? Better configurable Error)
+
   'syntax-unknown-escape': 'Unknown escape sequence $(CODE)',
   'syntax-invalid-escape': {
     std: 'Invalid escape sequence $(CODE)',
     octal: 'Octal escape sequences are not supported. Use unicode escapes instead',
     whitespace: 'Unknown escape sequence: Can\'t escape whitespace',
     codepoint: 'Undefined code-point for $(CODE)',
-    'unicode-hex': 'Expected hexadecimal numbers for unicode escape but found $(CODE)',
-    'hex-count': 'Expected $(NUMBER) hexadecimal numbers for escape sequence but found $(CODE)',
+    'unicode-hex': 'Expecting hexadecimal numbers for unicode escape but found $(CODE)',
+    'hex-count': 'Expecting $(NUMBER) hexadecimal numbers for escape sequence but found $(CODE)',
     'unicode-brace': 'Missing closing brace for unicode escape sequence',
     'language-identifier': 'Escape sequences in text-block\'s language identifier are not allowed',
   },
@@ -274,41 +350,34 @@ const centralMessageTexts = {
     std: 'Missing escape. Replace $(CODE) with $(NEWCODE)',
     placeholder: 'Placeholders are not supported. Replace $(CODE) with $(NEWCODE)',
   },
-  'syntax-expected-integer': {
+  'syntax-expecting-integer': {
     std: 'A safe integer is expected here',
     normal: 'An integer number is expected here',
     unsafe: 'The provided integer is too large',
   },
-  'syntax-duplicate-argument': {
+  'syntax-duplicate-argument': { // TODO: also CDL
     std: 'Unexpected argument $(CODE)',
-    unknown: 'Unknown argument $(CODE)',
+    unknown: 'Unknown argument $(CODE)', // huh?
     duplicate: 'Duplicate argument $(CODE)',
   },
-  'syntax-duplicate-annotate': 'You can\'t refer to $(NAME) repeatedly with property $(PROP) in the same annotate statement',
-  'syntax-duplicate-extend': {
-    std: 'You can\'t define and refer to $(NAME) repeatedly in the same extend statement',
-    define: 'You can\'t refer to $(NAME) in the same extend statement where it was defined',
-    extend: 'You can\'t refer to $(NAME) repeatedly in the same extend statement',
-  },
-  'syntax-invalid-literal': {
-    'std': 'Invalid literal',
-    'uneven-hex': 'A binary literal must have an even number of characters',
-    'invalid-hex': 'A binary literal must only contain characters 0-9, a-f and A-F',
-    'time': 'Expected time\'hh:mm:ss\' where hh, mm and the optional ss are numbers',
-    'date': 'Expected date\'YYYY-MM-DD\' where YYYY, MM and DD are numbers',
-    'timestamp': 'Expected timestamp\'YYYY-MM-DD hh:mm:ss.u…u\' where YYYY, MM, DD, hh, mm, ss and u are numbers (optional 1-7×u)',
-  },
   'syntax-unexpected-null': 'Keyword $(KEYWORD) must appear after the enum definition and not before',
   'syntax-unexpected-vocabulary': {
     std: 'Annotations can\'t be defined inside contexts or services',
     service: 'Annotations can\'t be defined inside services',
     context: 'Annotations can\'t be defined inside contexts',
   },
+  'syntax-fragile-ident': '$(ID) is a reserved name here - write $(DELIMITED) instead if you want to use it',
+  'syntax-unsupported-field': 'Calculated fields are not supported, yet',
+
+  // Syntax messages for errorneous references ----------------------------------
+  // location at errorneous reference (if possible)
+  'ref-unexpected-self': 'Unexpected $(ID) reference; is valid only in ON-conditions',
   'ref-undefined-def': {
     std: 'Artifact $(ART) has not been found',
     // TODO: proposal 'No definition of $(NAME) found',
-    element: 'Artifact $(ART) has no element $(MEMBER)'
+    element: 'Artifact $(ART) has no element $(MEMBER)',
   },
+  'ref-undefined-param': 'Entity $(ART) has no parameter $(ID)',
   'ref-undefined-art': 'No artifact has been found with name $(NAME)',
   // TODO: proposal 'No definition found for $(NAME)',
   'ref-undefined-element': {
@@ -316,6 +385,7 @@ const centralMessageTexts = {
     element: 'Artifact $(ART) has no element $(MEMBER)',
     aspect: 'Element $(ID) has not been found in the anonymous target aspect'
   },
+  'ref-undefined-var': 'Element or variable $(ID) has not been found',
   'ref-unknown-var': {
     std: 'No replacement found for special variable $(ID)'
   },
@@ -403,12 +473,37 @@ 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',
-
+  'extend-unexpected-include': 'Can\'t extend $(KIND) with includes',
+  'ref-expecting-bare-aspect': 'An aspect without elements is expected here',
+
+  '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 $(VALUE) is smaller than $(NUMBER) of type definition',
+    // eslint-disable-next-line max-len
+    'ext-smaller': 'Property $(PROP) can only be extended, but extended value $(VALUE) 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-undefined-element': {
+    std: 'Element $(ID) has not been found in the elements of the query',
+    redirected: 'Element $(ID) has not been found in the elements of the query; please use REDIRECTED TO with an explicit ON-condition',
+  },
   '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 +572,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)',
 }
 
 /**
@@ -501,4 +597,6 @@ const centralMessageTexts = {
  *                                 Don't set this property directly! Append to object oldMessageIds instead!
  */
 
+//console.log('FOO')
+
 module.exports = { centralMessages, centralMessageTexts, oldMessageIds };