@sap/cds-compiler 3.0.0 → 3.0.2

package/CHANGELOG.md

@@ -7,27 +7,46 @@
 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.0.2 - 2022-07-05
+
+### Fixed
+
+- to.sql: For `sqlDialect` `plain`, `$now` is replaced by `CURRENT_TIMESTAMP` again.
+- compiler:
+  + Don't crash if a USING filename is invalid on the operating system, e.g. if `\0` is used.
+  + Info messages for annotations on localized convenience views are only emitted for unknown ones.
+  + Improve error message for an `extend` statement which had added a new element
+    and tried to extend that element further.  Similarly for a new action.
+    (If you consider this really of any use, use two `extend` statements.)
+- for.odata: expand `@readonly`/`@insertonly` on aspects as for entities into `@Capabilities`.
+- to.edm(x):
+  + Exclude managed association as primary key on value list annotation preprocessing.
+  + Don't render annotations for aspects defined in a service.
+
 ## Version 3.0.0 - 2022-06-23
 
 ### Added
 
 - Instead of requiring all files on startup, they are required on an as-needed basis to reduce startup times.
-- Allow `*` as argument in SQL functions `count`, `min`, `max`, `sum`, `avg`, `stddev`, `var`.
+- CDL parser: support SQL functions `locate_regexpr`, `occurrences_regexpr`,
+  `replace_regexpr` and `substring_regexpr` with their special argument syntax.
+- CDL parser: the names `trim` and `extract` are not reserved anymore.
 
 ### Changed
 
 - cds-compiler now requires Node 14.
 - `compile()` and its derivates now use `fs.realpath.native()` instead of `fs.realpath()`.
-- Multi-line doc comments without leading `*` were inconsistently trimmed.
+- CDL parser:
+  + Multi-line doc comments without leading `*` were inconsistently trimmed.
+  + As before, a structure value for an annotation assignment in a CDL source is flattened,
+    i.e. `@Anno: { foo: 1, @bar: 2 }` becomes `@Anno.foo: 1 @Anno.@bar: 2`.
+    Now, the structure property name `$value` is basically ignored:
+    `@Anno: { $value: 1, @bar: 2 }` becomes `@Anno: 1 @Anno.@bar: 2`.
+    The advantage is that overwriting or appending the annotation value works as expected.
+  + Keywords `not null` is only valid after `many String enum {...}` and no longer after `String`.
 - `@cds.persistence.skip` and `@cds.persistence.exists` are both copied to generated child artifacts
   such as localized convenience views, texts entities and managed compositions.
-- As before, a structure value for an annotation assignment in a CDL source is flattened,
-  i.e. `@Anno: { foo: 1, @bar: 2 }` becomes `@Anno.foo: 1 @Anno.@bar: 2`.
-  Now, the structure property name `$value` is basically ignored:
-  `@Anno: { $value: 1, @bar: 2 }` becomes `@Anno: 1 @Anno.@bar: 2`.
-  The advantage is that overwriting or appending the annotation value works as expected.
 - Update OData vocabularies 'Common', 'UI'.
-- Keywords `not null` is only valid after `many String enum {...}` and no longer after `String`.
 - (Sub-)Elements of localized convenience views can now be annotated, e.g. `annotate localized.E:elem`.
 - `getArtifactCdsPersistenceName` now enforces the `csn` argument and can optionally have the `sqlDialect` passed in.
 - `getElementCdsPersistenceName` can optionally have the `sqlDialect` passed in.
@@ -36,7 +55,8 @@ The compiler behavior concerning `beta` features can change at any time without
 
 - All v2 deprecated flags.
 - Keyword `masked`.
-- `*` as generic argument to SQL functions/expressions.
+- CDL parser: `*` is not parsed anymore as argument to all SQL functions;
+  it is now only allowed for `count`, `min`, `max`, `sum`, `avg`, `stddev`, `var`.
 - All non-SNAPI options.
 
 ## Version 2.15.4 - 2022-06-09

package/bin/cdsc.js

@@ -63,9 +63,6 @@ function remapCmdOptions(options, command) {
 
   for (const [ key, value ] of Object.entries(options[command])) {
     switch (key) {
-      case 'names':
-        options.sqlMapping = value;
-        break;
       case 'user':
         if (!options.variableReplacements)
           options.variableReplacements = {};
@@ -73,12 +70,6 @@ function remapCmdOptions(options, command) {
           options.variableReplacements.$user = {};
         options.variableReplacements.$user.id = value;
         break;
-      case 'dialect':
-        options.sqlDialect = value;
-        break;
-      case 'version':
-        options.odataVersion = value;
-        break;
       case 'locale':
         if (!options.variableReplacements)
           options.variableReplacements = {};
@@ -89,9 +80,6 @@ function remapCmdOptions(options, command) {
       case 'serviceNames':
         options.serviceNames = value.split(',');
         break;
-      case 'flavor':
-        options.csnFlavor = value;
-        break;
       default:
         options[key] = value;
     }
@@ -158,12 +146,17 @@ function cdsc_main() {
   if (cmdLine.options.rawOutput)
     cmdLine.options.attachValidNames = true;
 
-  // Internally, parseCdl is an option so we map the command to it.
+  // Internally, parseCdl/parseOnly are options, so we map the command to it.
   if (cmdLine.command === 'parseCdl') {
     cmdLine.command = 'toCsn';
     cmdLine.options.parseCdl = true;
     cmdLine.args.files = [ cmdLine.args.file ];
   }
+  else if (cmdLine.command === 'parseOnly') {
+    cmdLine.command = 'toCsn';
+    cmdLine.options.parseOnly = true;
+    cmdLine.args.files = [ cmdLine.args.file ];
+  }
 
   if (cmdLine.options.directBackend)
     validateDirectBackendOption(cmdLine.command, cmdLine.options, cmdLine.args);
@@ -525,7 +518,7 @@ function executeCommandLine(command, options, args) {
     else if (options.internalMsg) {
       writeToFileOrDisplay(options.out, `${name}_raw.txt`, util.inspect(reveal(xsn).messages, { depth: null, maxArrayLength: null }), true);
     }
-    else if (!options.lintMode) {
+    else if (!options.parseOnly) { // no output if parseOnly but not rawOutput
       const csn = compactModel(xsn, options);
       if (command === 'toCsn' && options.withLocalized)
         addLocalizationViews(csn, options);
@@ -545,7 +538,7 @@ function executeCommandLine(command, options, args) {
     if (options.internalMsg) {
       writeToFileOrDisplay(options.out, `${name}_raw.txt`, options.messages, true);
     }
-    else if (!options.lintMode && !options.internalMsg) {
+    else if (!options.internalMsg) {
       if (command === 'toCsn' && options.withLocalized)
         addLocalizationViews(csn, options);
       writeToFileOrDisplay(options.out, `${name}.json`, csn, true);
@@ -558,7 +551,7 @@ function executeCommandLine(command, options, args) {
   // If displaying to stdout, prepend a headline containing 'filename', unless 'omitHeadline' is set.
   // For filenames, illegal characters (slash, backslash, colon) are replaced by '_'.
   function writeToFileOrDisplay(dir, fileName, content, omitHeadline = false) {
-    if (options.lintMode && !options.rawOutput || options.internalMsg)
+    if (options.internalMsg)
       return;
     fileName = fileName.replace(/[:/\\]/g, '_');
 

package/lib/api/main.js

@@ -226,6 +226,50 @@ function sql(csn, options = {}) {
   return result.map(obj => obj.sql).filter(create => create);
 }
 
+/**
+ * Render the given deltaCSN as SQL.
+ *
+ * @param {CSN.Model} csn A clean input CSN
+ * @param {CSN.Model} deltaCsn A CSN representing new entities and extensions
+ * @param {SqlOptions} [options={}] Options
+ * @returns {object} - 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).
+ */
+function mtx(csn, deltaCsn, options = {}) {
+  if (!baseModel.isBetaEnabled(options, 'to.mtx'))
+    throw new Error('to.mtx is only available with beta flag `to.mtx`');
+
+  const internalOptions = prepareOptions.to.sql(options);
+  // TODO: Use compiler.compileSources() when this function is moved to lib/main.js
+  const merged = toCsn.compactModel(compiler.compileSourcesX({ 'base.csn': csn, 'delta.csn': deltaCsn }), options);
+  const baseSql = forSql(csn, options);
+  const mergedSql = forSql(merged, options);
+  const diff = modelCompare.compareModels(baseSql, mergedSql, options);
+  // Delete artifacts that are already present in csn
+  Object.keys(baseSql.definitions).forEach((artifactName) => {
+    if (diff.definitions[artifactName]) // don't render again, but need info for primary key extension
+      diff.definitions[artifactName]['@cds.persistence.skip'] = true;
+  });
+
+  internalOptions.forHana = true;
+  internalOptions.beta.sqlExtensions = true;
+  const { deletions, migrations, ...additions } = toSql.toSqlDdl(diff, internalOptions);
+
+  return {
+    additions: createSqlDefinitions(additions, mergedSql),
+    deletions: createSqlDeletions(deletions, baseSql),
+    migrations: createSqlMigrations(migrations, mergedSql),
+  };
+}
+
 /**
  * Process the given CSN into HDI artifacts.
  *
@@ -357,49 +401,55 @@ function hdiMigration(csn, options, beforeImage) {
 
   return {
     afterImage,
-    definitions: createDefinitions(),
-    deletions: createDeletions(),
-    migrations: createMigrations(),
+    definitions: createSqlDefinitions(hdbkinds, afterImage),
+    deletions: createSqlDeletions(deletions, beforeImage),
+    migrations: createSqlMigrations(migrations, afterImage),
   };
+}
 
-  /**
-   * From the given HDI artifacts, create the the correct result structure.
-   *
-   * @returns {object[]} Array of objects, each having: name, suffix and sql
-   */
-  function createDefinitions() {
-    const result = [];
-    forEach(hdbkinds, (kind, artifacts) => {
-      const suffix = `.${ kind }`;
-      forEach(artifacts, (name, sqlStatement) => {
-        if ( kind !== 'hdbindex' )
-          result.push({ name: getFileName(name, afterImage), suffix, sql: sqlStatement });
-        else
-          result.push({ name, suffix, sql: sqlStatement });
-      });
+/**
+ * From the given SQLs, create the the correct result structure.
+ *
+ * @param {object} hdbkinds
+ * @param {CSN.Model} afterImage
+ * @returns {object[]} Array of objects, each having: name, suffix and sql
+ */
+function createSqlDefinitions(hdbkinds, afterImage) {
+  const result = [];
+  forEach(hdbkinds, (kind, artifacts) => {
+    const suffix = `.${ kind }`;
+    forEach(artifacts, (name, sqlStatement) => {
+      if ( kind !== 'hdbindex' )
+        result.push({ name: getFileName(name, afterImage), suffix, sql: sqlStatement });
+      else
+        result.push({ name, suffix, sql: sqlStatement });
     });
-    return result;
-  }
-  /**
-   * From the given deletions, create the correct result structure.
-   *
-   * @returns {object[]} Array of objects, each having: name and suffix - only .hdbtable as suffix for now
-   */
-  function createDeletions() {
-    const result = [];
-    forEach(deletions, name => result.push({ name: getFileName(name, beforeImage), suffix: '.hdbtable' }));
-    return result;
-  }
-  /**
-   * From the given migrations, create the correct result structure.
-   *
-   * @returns {object[]} Array of objects, each having: name, suffix and changeset.
-   */
-  function createMigrations() {
-    const result = [];
-    forEach(migrations, (name, changeset) => result.push({ name: getFileName(name, afterImage), suffix: '.hdbmigrationtable', changeset }));
-    return result;
-  }
+  });
+  return result;
+}
+/**
+ * From the given deletions, create the correct result structure.
+ *
+ * @param {object} deletions
+ * @param {CSN.Model} beforeImage
+ * @returns {object[]} Array of objects, each having: name and suffix - only .hdbtable as suffix for now
+ */
+function createSqlDeletions(deletions, beforeImage) {
+  const result = [];
+  forEach(deletions, name => result.push({ name: getFileName(name, beforeImage), suffix: '.hdbtable' }));
+  return result;
+}
+/**
+ * From the given migrations, create the correct result structure.
+ *
+ * @param {object} migrations
+ * @param {CSN.Model} afterImage
+ * @returns {object[]} Array of objects, each having: name, suffix and changeset.
+ */
+function createSqlMigrations(migrations, afterImage) {
+  const result = [];
+  forEach(migrations, (name, changeset) => result.push({ name: getFileName(name, afterImage), suffix: '.hdbmigrationtable', changeset }));
+  return result;
 }
 
 hdi.migration = hdiMigration;
@@ -649,6 +699,8 @@ module.exports = {
   for_sql: publishCsnProcessor(forSql, 'for.sql'),
   for_hdi: publishCsnProcessor(forHdi, 'for.hdi'),
   for_hdbcds: publishCsnProcessor(forHdbcds, 'for.hdbcds'),
+  /** beta - WIP */
+  mtx: publishCsnProcessor(mtx, 'to.mtx'),
   /** Deprecated, will be removed in cds-compiler@v4 */
   preparedCsnToEdmx,
   preparedCsnToEdm,

package/lib/base/keywords.js

@@ -190,7 +190,7 @@ module.exports = {
   // 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
+  // in rule unreserved_keyword_column (=…_common - 'CONSTRAINT') in
   // ptime/query/parser/syntax/qp_gram.y of the HANA sources.
   hana: [
     'ABAPITAB',
@@ -209,12 +209,16 @@ module.exports = {
     'ABAP_STRING',
     'ABAP_TIME',
     'ABAP_XSTRING',
+    'ABS',
+    'ACOS',
     'ADD_DAYS',
     'ADD_MONTHS',
     'ADD_SECONDS',
     'ADD_YEARS',
+    'ADJACENCY',
     'ADOPT',
     'ALL',
+    'ALPHANUM',
     'ALTER',
     'ANALYTIC',
     'ANY',
@@ -222,7 +226,11 @@ module.exports = {
     'ARRAY',
     'ARRAY_AGG',
     'AS',
+    'ASCII',
+    'ASIN',
     'AT',
+    'ATAN',
+    'ATAN2',
     'AUTHORIZATION',
     'AUTO',
     'AVG',
@@ -240,6 +248,9 @@ module.exports = {
     'BIND_DOUBLE',
     'BIND_NCHAR',
     'BIND_REAL',
+    'BINTEXT',
+    'BINTOHEX',
+    'BITAND',
     'BLOB',
     'BOOLEAN',
     'BOTH',
@@ -249,9 +260,25 @@ module.exports = {
     'BY',
     'CASE',
     'CAST',
+    'CEIL',
+    'CEILING',
+    'CE_AGGREGATION',
     'CE_CALC',
+    'CE_CALC_VIEW',
+    'CE_COLUMN_TABLE',
+    'CE_COMM2R',
+    'CE_CONVERSION',
+    'CE_FULL_OUTER_JOIN',
     'CE_JOIN',
+    'CE_JOIN_VIEW',
+    'CE_LEFT_OUTER_JOIN',
+    'CE_MERGE',
+    'CE_OLAP_VIEW',
+    'CE_PARTITION',
     'CE_PROJECTION',
+    'CE_RIGHT_OUTER_JOIN',
+    'CE_UNION_ALL',
+    'CE_VERTICAL_UNION',
     'CHAR',
     'CHARACTER',
     'CLOB',
@@ -262,8 +289,12 @@ module.exports = {
     'CONNECT',
     'CONSTANT',
     'CONSTRAINT',
+    'COS',
+    'COSH',
+    'COT',
     'COUNT',
     'CROSS',
+    'CS_ALPHANUM',
     'CS_DATE',
     'CS_DAYDATE',
     'CS_DECIMAL_FLOAT',
@@ -285,6 +316,7 @@ module.exports = {
     'CS_TEXT',
     'CS_TEXT_AE',
     'CS_TIME',
+    'CS_ZONE',
     'CUBE',
     'CUME_DIST',
     'CURDATE',
@@ -313,6 +345,7 @@ module.exports = {
     'DAYOFWEEK',
     'DAYS_BETWEEN',
     'DDIC_ACCP',
+    'DDIC_ALNM',
     'DDIC_CDAY',
     'DDIC_CHAR',
     'DDIC_CLNT',
@@ -373,12 +406,14 @@ module.exports = {
     'EXCEPTION',
     'EXEC',
     'EXISTS',
+    'EXP',
     'EXTRACT',
     'FALSE',
     'FILTER',
     'FIRST_VALUE',
     'FLATTEN',
     'FLOAT',
+    'FLOOR',
     'FOR',
     'FORCE_FIRST_PASSWORD_CHANGE',
     'FREESTYLESEARCHATTRIBUTE',
@@ -390,6 +425,7 @@ module.exports = {
     'GROUPING',
     'GROUPING_FILTER',
     'GROUPING_ID',
+    'GROUP_SCORE',
     'HASANYPRIVILEGES',
     'HASSYSTEMPRIVILEGE',
     'HAVING',
@@ -403,6 +439,7 @@ module.exports = {
     'HIERARCHY_SIBLINGS',
     'HIERARCHY_SPANTREE',
     'HIERARCHY_TEMPORAL',
+    'HIGHLIGHTED',
     'HILBERT',
     'HOST',
     'HOUR',
@@ -426,10 +463,12 @@ module.exports = {
     'JSON_TABLE',
     'JSON_VALUE',
     'LAG',
+    'LANGUAGE',
     'LAST_DAY',
     'LAST_VALUE',
     'LATERAL',
     'LAYOUT',
+    'LCASE',
     'LEAD',
     'LEADING',
     'LEAST',
@@ -439,10 +478,13 @@ module.exports = {
     'LENGTHB',
     'LEVELS',
     'LIMIT',
+    'LN',
     'LOCATE',
     'LOCATE_REGEXPR',
+    'LOG',
     'LONGDATE',
     'LOOP',
+    'LOWER',
     'LPAD',
     'LTRIM',
     'MAP',
@@ -450,9 +492,11 @@ module.exports = {
     'MAP_REDUCE',
     'MAX',
     'MEASURES',
+    'MIMETYPE',
     'MIN',
     'MINUS',
     'MINUTE',
+    'MOD',
     'MONTH',
     'MULTIPARENT',
     'NATURAL',
@@ -486,9 +530,11 @@ module.exports = {
     'PERCENTILE_DISC',
     'PERCENT_RANK',
     'PLAIN',
+    'POWER',
     'PRIOR',
     'PRODUCT',
     'RANGE',
+    'RANGE_RESTRICTION',
     'RANK',
     'RAW',
     'RDICT',
@@ -525,11 +571,17 @@ module.exports = {
     'SESSION_CONTEXT',
     'SESSION_USER',
     'SET',
+    'SHORTTEXT',
     'SIBLING',
+    'SIGN',
+    'SIN',
+    'SINH',
     'SMALLDECIMAL',
     'SMALLINT',
+    'SNIPPETS',
     'SOME',
     'SQL',
+    'SQRT',
     'START',
     'STDDEV',
     'STRING',
@@ -537,6 +589,7 @@ module.exports = {
     'ST_ALPHASHAPEAGGR',
     'ST_ALPHASHAPEAREAAGGR',
     'ST_ALPHASHAPEEDGEAGGR',
+    'ST_ASMVT',
     'ST_ASSVGAGGR',
     'ST_CIRCULARSTRING',
     'ST_CLUSTERCELL',
@@ -552,6 +605,7 @@ module.exports = {
     'ST_FROMTEXT',
     'ST_GEOMETRY',
     'ST_GEOMETRYCOLLECTION',
+    'ST_GEOMFROMESRIJSON',
     'ST_GEOMFROMEWKB',
     'ST_GEOMFROMEWKT',
     'ST_GEOMFROMGEOHASH',
@@ -562,6 +616,8 @@ module.exports = {
     'ST_INTERSECTIONAGGR',
     'ST_LINESTRING',
     'ST_MAKELINE',
+    'ST_MAKEPOLYGON',
+    'ST_MEMORY_LOB',
     'ST_MULTILINESTRING',
     'ST_MULTIPOINT',
     'ST_MULTIPOLYGON',
@@ -586,9 +642,12 @@ module.exports = {
     'TABLE',
     'TABLES',
     'TABLESAMPLE',
+    'TAN',
+    'TANH',
     'TARGET',
     'TEMPORARY',
     'TEXT',
+    'TEXT_FILTER',
     'THEN',
     'THREAD',
     'TIME',
@@ -614,6 +673,7 @@ module.exports = {
     'TO_CHAR',
     'TO_CLOB',
     'TO_DATE',
+    'TO_DATS',
     'TO_DECIMAL',
     'TO_DOUBLE',
     'TO_INT',
@@ -642,9 +702,12 @@ module.exports = {
     'TRIGGER_UPDATE_COLUMN',
     'TRIM',
     'TRUE',
+    'UCASE',
+    'UNICODE',
     'UNION',
     'UNKNOWN',
     'UNNEST',
+    'UPPER',
     'USER',
     'USING',
     'UTCTIMESTAMP',

package/lib/base/message-registry.js

@@ -176,6 +176,15 @@ 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.
@@ -197,7 +206,7 @@ for (const oldName in oldMessageIds) {
 const centralMessageTexts = {
   'api-invalid-option': {
     std: 'Option $(NAME) is deprecated! Use SNAPI options instead',
-    magicVars: 'Option “magicVars” is deprecated! Use “variableReplacements” instead. See <https://cap.cloud.sap/docs/guides/databases#configuring-variables> for details',
+    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',
     locale: 'Option “variableReplacements” expects “$user.locale” instead of “locale”. See <https://cap.cloud.sap/docs/guides/databases#configuring-variables> for details',
     'noDollar': 'Option “variableReplacements” does not know $(NAME). Did you forget a leading “$”?'
@@ -267,6 +276,12 @@ const centralMessageTexts = {
     unknown: 'Unknown argument $(CODE)',
     duplicate: 'Duplicate argument $(CODE)',
   },
+  'syntax-duplicate-annotate': 'You shouldn\'t refer to $(NAME) repeatedly 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',
@@ -312,6 +327,7 @@ const centralMessageTexts = {
     event: 'Unexpected $(KEYWORD) for the type of an event',
     param: 'Unexpected $(KEYWORD) for the type of a parameter definition',
     select: 'Unexpected $(KEYWORD) for type references in queries',
+    annotation: '$(KEYWORD) can\'t be used in annotation definitions',
   },
 
   'type-missing-argument': 'Missing value for argument $(NAME) in reference to type $(ID)',