@sap/cds-compiler 2.15.8 → 3.1.0

package/lib/transform/transformUtilsNew.js

@@ -6,10 +6,10 @@
 
 const { hasErrors, makeMessageFunction } = require('../base/messages');
 const { setProp } = require('../base/model');
-const { csnRefs } = require('../model/csnRefs');
 
 const { copyAnnotations, applyTransformations } = require('../model/csnUtils');
-const { cloneCsnNonDict, cloneCsnDictionary, getUtils, isBuiltinType } = require('../model/csnUtils');
+const { cloneCsnNonDict, cloneCsnDictionary, getUtils } = require('../model/csnUtils');
+const { typeParameters, isBuiltinType } = require('../compiler/builtins');
 const { ModelError } = require("../base/error");
 const { forEach } = require('../utils/objectUtils');
 
@@ -20,20 +20,18 @@ const { forEach } = require('../utils/objectUtils');
 // TODO: check the situation with assocs with values. In compacted CSN such elements have only "@Core.Computed": true
 function getTransformers(model, options, pathDelimiter = '_') {
   const { error, warning, info } = makeMessageFunction(model, options);
+  const csnUtils = getUtils(model);
   const {
     getCsnDef,
-    getFinalBaseType,
+    getFinalBaseTypeWithProps,
     hasAnnotationValue,
     inspectRef,
     isStructured,
-  } = getUtils(model);
-
-  const {
     effectiveType,
-  } = csnRefs(model);
-
+  } = csnUtils;
 
   return {
+    csnUtils,
     resolvePath,
     flattenPath,
     addDefaultTypeFacets,
@@ -45,7 +43,6 @@ function getTransformers(model, options, pathDelimiter = '_') {
     copyTypeProperties,
     isAssociationOperand,
     isDollarSelfOrProjectionOperand,
-    getFinalBaseType,
     createExposingProjection,
     createAndAddDraftAdminDataProjection,
     createScalarElement,
@@ -243,21 +240,19 @@ function getTransformers(model, options, pathDelimiter = '_') {
     // for type of 'x' -> elem.type is an object, not a string -> use directly
     let elemType;
     if (!elem.elements) // structures do not have final base type
-      elemType = getFinalBaseType(elem.type);
+      elemType = getFinalBaseTypeWithProps(elem.type);
 
     const struct = elemType ? elemType.elements : elem.elements;
 
     // Collect all child elements (recursively) into 'result'
     // TODO: Do not report collisions in the generated elements here, but instead
-    // leave that work to the receiver of this result
+    //       leave that work to the receiver of this result
     let result = Object.create(null);
     const addGeneratedFlattenedElement = (e, eName) => {
-      if(result[eName]){
-        error(null, pathInCsn, { name: eName },
-          'Generated element $(NAME) conflicts with other generated element')
-      } else {
+      if (result[eName])
+        error('name-duplicate-element', pathInCsn, { '#': 'flatten-element-gen', name: eName })
+      else
         result[eName] = e;
-      }
     }
     forEach(struct, (childName, childElem) => {
       if (isStructured(childElem)) {
@@ -287,7 +282,11 @@ function getTransformers(model, options, pathDelimiter = '_') {
 
     // Fix all collected flat elements (names, annotations, properties, origin ..)
     forEach(result, (name, flatElem) => {
-      // Copy annotations from struct (not overwriting, because deep annotations should have precedence)
+      // Copy annotations from struct (not overwriting, because deep annotations should have precedence).
+      // Attention:
+      // This has historic reasons. We don't copy doc-comments because copying annotations
+      // is questionable to begin with.  Only selected annotations should have been copied,
+      // if at all.
       copyAnnotations(elem, flatElem, false);
       // Copy selected type properties
       const props = ['key', 'virtual', 'masked', 'viaAll'];
@@ -395,78 +394,65 @@ function getTransformers(model, options, pathDelimiter = '_') {
   }
 
   /**
-   * Replace the type of 'node' with its final base type (in contrast to the compiler,
-   * also unravel derived enum types, i.e. take the final base type of the enum's base type.
-   * Similar with associations and compositions (we probably need a _baseType link)
+   * Replace the type of 'nodeWithType' with its final base type, i.e. copy relevant type properties and
+   * set the `type` property to the builtin if scalar or delete it if structured/arrayed.
    *
-   * @param {CSN.Artifact} node
+   * @param {object} nodeWithType
    * @param {WeakMap} [resolved] WeakMap containing already resolved refs
    * @param {boolean} [keepLocalized=false] Whether to clone .localized from a type def
-   * @returns {void}
    */
-  function toFinalBaseType(node, resolved, keepLocalized=false) {
-    // Nothing to do if no type (or if array/struct type)
-    if (!node || !node.type) return;
-    // In case of a ref -> Follow the ref
-    if (node.type && node.type.ref) {
-      const finalBaseType = getFinalBaseType(node.type, undefined, resolved);
-      if(finalBaseType === null)
-        throw Error('Failed to obtain final base type for reference : ' + node.type.ref.join('/'));
-      if(finalBaseType.elements) {
-          // This changes the order - to be discussed!
-        node.elements = cloneCsnNonDict(finalBaseType, options).elements; // copy elements
-        delete node.type; // delete the type reference as edm processing does not expect it
-      } else if(finalBaseType.items) {
-          // This changes the order - to be discussed!
-        node.items = cloneCsnNonDict(finalBaseType.items, options); // copy items
-        delete node.type;
-      } else {
-        node.type=finalBaseType;
-      }
+  function toFinalBaseType(nodeWithType, resolved = new WeakMap(), keepLocalized = false) {
+    const type = nodeWithType?.type;
+    if (!type || nodeWithType.elements || nodeWithType.items || resolved.has(nodeWithType)) {
       return;
     }
-    // ..  or builtin already
-    if (node.type && isBuiltinType(node.type)) return;
+    // The caller may use `{ art }` syntax for `{ ref }` objects, but we only use
+    // it to indicate that an artifact has been processed.
+    resolved.set(nodeWithType, nodeWithType);
 
-    // The type might already be a full fledged type def (array of)
-    let typeDef = typeof node.type === 'string' ? getCsnDef(node.type) : node.type;
-    // Nothing to do if type is an array or a struct type
-    if (typeDef.items || typeDef.elements) {
-      // cloneCsn only works correctly if we start "from the top"
-      const cloneTypeDef = cloneCsnNonDict(typeDef, options);
-      // With hdbcds-hdbcds, don't resolve structured types - but propagate ".items", to turn into LargeString later on.
-      if(typeDef.items) {
-        delete node.type;
-        if(!node.items)
-          Object.assign(node, {items: cloneTypeDef.items});
-      }
-      if(typeDef.elements && !(options.transformation === 'hdbcds' && options.sqlMapping === 'hdbcds')) {
-        if(!typeDef.items)
-          delete node.type;
-        if(!node.elements)
-          Object.assign(node, {elements: cloneTypeDef.elements});
-      }
+    // Nothing to copy from builtin.
+    if (typeof type === 'string' && isBuiltinType(type))
+      return;
 
+    let typeRef = null;
+    if (resolved.has(type)) {
+      typeRef = resolved.get(type)?.art
+      // The cached entry may not be resolved, yet.
+      if (typeRef.type && !isBuiltinType(typeRef.type))
+        typeRef = getFinalBaseTypeWithProps(typeRef.type);
+    } else {
+      typeRef = getFinalBaseTypeWithProps(type);
+    }
 
+    if (typeRef.elements || typeRef.items) {
+      // Copy elements/items and we're finished. No need to look up actual base type,
+      // since it must also be structured and must contain at least as many elements,
+      // if not more (in client style CSN).
+      if (typeRef.elements && !(options.transformation === 'hdbcds' && options.sqlMapping === 'hdbcds')) {
+        nodeWithType.elements = cloneCsnDictionary(typeRef.elements, options);
+        delete nodeWithType.type;
+      }
+      if (typeRef.items) {
+        nodeWithType.items = cloneCsnNonDict(typeRef.items, options);
+        delete nodeWithType.type;
+      }
       return;
     }
-    // if the declared element is an enum, these values are with priority
-    if (!node.enum && typeDef.enum) {
-      const clone = cloneCsnDictionary(typeDef.enum, options);
-      Object.assign(node, { enum: clone });
+
+    if (typeRef.enum && nodeWithType.enum === undefined)
+      nodeWithType.enum = cloneCsnDictionary(typeRef.enum, options);
+
+    // Copy type and type arguments (+ localized)
+
+    for (const param of typeParameters.list) {
+      if (nodeWithType[param] === undefined && typeRef[param] !== undefined &&!typeRef.$default) {
+        nodeWithType[param] = typeRef[param];
+      }
     }
-    if (node.length === undefined && typeDef.length !== undefined)
-      Object.assign(node, { length: typeDef.length });
-    if (node.precision === undefined && typeDef.precision !== undefined)
-      Object.assign(node, { precision: typeDef.precision });
-    if (node.scale === undefined && typeDef.scale !== undefined)
-      Object.assign(node, { scale: typeDef.scale });
-    if (node.srid === undefined && typeDef.srid !== undefined)
-      Object.assign(node, { srid: typeDef.srid });
-    if (keepLocalized && node.localized === undefined && typeDef.localized !== undefined)
-      Object.assign(node, { localized: typeDef.localized });
-    node.type = typeDef.type;
-    toFinalBaseType(node);
+    if (keepLocalized && nodeWithType.localized === undefined && typeRef.localized !== undefined)
+      nodeWithType.localized = typeRef.localized;
+    if (typeRef.type)
+      nodeWithType.type = typeRef.type;
   }
 
   // Return a full projection 'projectionId' of artifact 'art' for exposure in 'service'.

package/lib/transform/translateAssocsToJoins.js

@@ -57,10 +57,10 @@ function translateAssocsToJoins(model, inputOptions = {})
   const options = model.options || inputOptions;
 
   // create JOINs for foreign key paths
-  const noJoinForFK = options.forHana ? !options.forHana.joinfk : true;
+  const noJoinForFK = options.forHana ? !options.joinfk : true;
 
   // Note: This is called from the 'forHana' transformations, so it is controlled by its options)
-  const pathDelimiter = (options.forHana && options.forHana.names === 'hdbcds') ? '.' : '_';
+  const pathDelimiter = (options.forHana && options.sqlMapping === 'hdbcds') ? '.' : '_';
 
   forEachDefinition(model, prepareAssociations);
   forEachDefinition(model, transformQueries);

package/lib/transform/universalCsn/.eslintrc.json

@@ -21,11 +21,11 @@
     "sonarjs/no-duplicate-string": "off"
   },
   "parserOptions": {
-    "ecmaVersion": 2018,
+    "ecmaVersion": 2020,
     "sourceType": "script"
   },
   "env": {
-    "es6": true,
+    "es2020": true,
     "node": true
   },
   "settings": {

package/lib/transform/universalCsn/coreComputed.js

@@ -12,7 +12,7 @@ const { setAnnotationIfNotDefined } = require('./utils');
  */
 function setCoreComputedOnViews(csn) {
   const {
-    artifactRef, getColumn, getElement,
+    artifactRef, getColumn, getElement, getOrigin,
   } = getUtils(csn, 'init-all');
 
   forEachDefinition(csn, (artifact) => {
@@ -57,7 +57,15 @@ function setCoreComputedOnViews(csn) {
       const column = getColumn(element);
       if (column)
         return column;
-      return getElementFromFrom(name, base.from);
+      const from = getElementFromFrom(name, base.from);
+      if (from)
+        return from;
+      // For .expand/.inline, we can find it via origin
+      // Although I would have expected to find it via getColumn...
+      const origin = getOrigin(element);
+      if (origin)
+        return origin;
+      throw new Error(`Could not find ancestor for ${JSON.stringify(element)} named ${name}`);
     }
 
     /**
@@ -87,10 +95,7 @@ function setCoreComputedOnViews(csn) {
         return getElementFromFrom(name, base.SET.args[0]);
       }
       else if (base.args && base.join) {
-        const result = checkJoinSources(base.args, name);
-        if (!result)
-          throw new Error(`Could not find ${name} in ${JSON.stringify(base.args)}`);
-        return result;
+        return checkJoinSources(base.args, name);
       }
 
       throw new Error(JSON.stringify(base));

package/lib/transform/universalCsn/universalCsnEnricher.js

@@ -29,10 +29,7 @@ module.exports = (csn, options) => {
   const definitionPropagationRules = {
     '@cds.autoexpose': onlyViaArtifact,
     '@fiori.draft.enabled': onlyViaArtifact,
-    '@': (prop, target, source) => {
-      if (source[prop] !== null)
-        target[prop] = source[prop];
-    },
+    '@': nullStopsPropagation,
     // Example: `type E : F;` does not have `elements`, but they are required for e.g. OData.
     elements: onlyTypeDef,
     '@cds.persistence.exists': skip,
@@ -48,7 +45,7 @@ module.exports = (csn, options) => {
     '@cds.autoexposed': skip,
     '@cds.redirection.target': skip,
     type: always,
-    doc: always,
+    doc: nullStopsPropagation,
     length: always,
     precision: always,
     scale: always,
@@ -94,6 +91,10 @@ module.exports = (csn, options) => {
     }, // overwrite from defProps
     kind: skip,
     val: always,
+    type: notWithItemsOrElements,
+    target: notWithItemsOrElements,
+    keys: notWithItemsOrElements,
+    cardinality: notWithItemsOrElements,
   };
 
   generate();
@@ -702,6 +703,19 @@ function notWithTypeOrigin(prop, target, source) {
     target[prop] = source[prop];
 }
 
+/**
+ * The value `null` tells us to skip the propagation of the property.
+ * This is the case e.g. for `doc` or for annotations.
+ *
+ * @param {string} prop
+ * @param {CSN.Element} target
+ * @param {CSN.Element} source
+ */
+function nullStopsPropagation(prop, target, source) {
+  if (source[prop] !== null)
+    target[prop] = source[prop];
+}
+
 /**
  * Special propagation rules for .items - depending on the exact type of .items and the
  * way it was referenced (type of, direct type, direct many), we need to propagate (or not).
@@ -722,6 +736,20 @@ function specialItemsRules(prop, target, source) {
     target[prop] = source[prop];
 }
 
+/**
+ * Don't propagate certain properties if the target already has a .items or .elements
+ *
+ * This happens with .expand/.inline
+ *
+ * @param {string} prop
+ * @param {CSN.Element} target
+ * @param {CSN.Element} source
+ */
+function notWithItemsOrElements(prop, target, source) {
+  if (!target.items && !target.elements || !source.target)
+    target[prop] = source[prop];
+}
+
 /**
  * Some properties must not be copied over if the type of this member
  * is a reference to another element.

package/lib/utils/file.js

@@ -61,12 +61,12 @@ function cdsFs(fileCache, enableTrace) {
   };
 
   function realpath(path, cb) {
-    return fs.realpath(path, cb);
+    return fs.realpath.native(path, cb);
   }
 
   function realpathSync(path, cb) {
     try {
-      cb(null, fs.realpathSync(path));
+      cb(null, fs.realpathSync.native(path));
     }
     catch (err) {
       cb(err, null);
@@ -87,7 +87,7 @@ function cdsFs(fileCache, enableTrace) {
       }
       let body = fileCache[filename];
       if (body && typeof body === 'object' && body.realname) {
-        filename = body.realname; // use fs.realpath name
+        filename = body.realname; // use fs.realpath.native name
         body = fileCache[filename];
       }
       if (body !== undefined && body !== true) { // true: we just know it is there
@@ -113,11 +113,16 @@ function cdsFs(fileCache, enableTrace) {
         traceFS( 'READFILE:start:', filename );
         // TODO: set cache directly to some "delay" - store error differently?
         // e.g. an error of callback functions!
-        reader(filename, enc, ( err, data ) => {
-          fileCache[filename] = err || data;
-          traceFS( 'READFILE:data:', filename, err || data );
-          cb( err, data );
-        });
+        try {
+          reader(filename, enc, (err, data) => {
+            fileCache[filename] = err || data;
+            traceFS('READFILE:data:', filename, err || data);
+            cb(err, data);
+          });
+        }
+        catch (err) {
+          cb(err); // if filename is not a valid (e.g. contains NUL byte), readFile() may throw
+        }
       }
     };
   }
@@ -143,19 +148,24 @@ function cdsFs(fileCache, enableTrace) {
         // in the future (if we do module resolve ourself with just readFile),
         // we avoid parallel readFile by storing having an array of `cb`s in
         // fileCache[ filename ] before starting fs.readFile().
-        fsStat( filename, ( err, stat ) => {
-          if (err)
-            body = (err.code === 'ENOENT' || err.code === 'ENOTDIR') ? false : err;
-          else
-            body = !!(stat.isFile() || stat.isFIFO());
-          if (fileCache[filename] === undefined) // parallel readFile() has been processed
-            fileCache[filename] = body;
-          traceFS( 'ISFILE:data:', filename, body );
-          if (body instanceof Error)
-            cb( err );
-          else
-            cb( null, body );
-        });
+        try {
+          fsStat(filename, (err, stat) => {
+            if (err)
+              body = (err.code === 'ENOENT' || err.code === 'ENOTDIR') ? false : err;
+            else
+              body = !!(stat.isFile() || stat.isFIFO());
+            if (fileCache[filename] === undefined) // parallel readFile() has been processed
+              fileCache[filename] = body;
+            traceFS('ISFILE:data:', filename, body);
+            if (body instanceof Error)
+              cb(err);
+            else
+              cb(null, body);
+          });
+        }
+        catch (err) {
+          cb(err); // if filename is not a valid (e.g. contains NUL byte), fsStat() may throw
+        }
       }
     };
   }

package/lib/utils/moduleResolve.js

@@ -25,7 +25,6 @@ const extensions = [ '.cds', '.csn', '.json' ];
  * @todo Re-think:
  *   - Why can't a JAVA installation set a (symbolic) link?
  *   - Preferred to a local installation? Not the node-way!
- *   - Why a global?  The Umbrella could pass it as an option.
  *
  * @param {string} modulePath
  * @param {CSN.Options} options

package/lib/utils/timetrace.js

@@ -14,47 +14,43 @@ class StopWatch {
    */
   constructor(id) {
     this.id = id;
-    // TODO: If we require Node 12, use process.hrtime.bigint()
-    //       as process.hrtime() is deprecated.
-    // eslint-disable-next-line no-multi-assign
-    this.startTime = this.lapTime = process.hrtime();
+    this.startTime = process.hrtime.bigint();
+    this.lapTime = this.startTime;
   }
 
   /**
-     * Start watch.
-     */
+   * Start watch.
+   */
   start() {
-    // eslint-disable-next-line no-multi-assign
-    this.startTime = this.lapTime = process.hrtime();
+    this.startTime = process.hrtime.bigint();
+    this.lapTime = this.startTime;
   }
 
   /**
-   * Stop and return delta T
+   * Stop and return delta T in nanoseconds,
    * but do not set start time
    */
   stop() {
-    return process.hrtime(this.startTime);
+    const endTime = process.hrtime.bigint();
+    return endTime - this.startTime;
   }
 
-  /**
-   * return lap time
-   */
   lap() {
-    const dt = process.hrtime(this.lapTime);
-    this.lapTime = process.hrtime();
+    const endTime = process.hrtime.bigint();
+    const dt = endTime - this.startTime;
+    this.lapTime = process.hrtime.bigint();
     return dt;
   }
 
-  // stop as sec.ns float
   stopInFloatSecs() {
     const dt = this.stop();
-    return dt[0] + dt[1] / 1000000000;
+    return dt / BigInt(1000000000);
   }
 
   // lap as sec.ns float
   lapInFloatSecs() {
     const dt = this.lap();
-    return dt[0] + dt[1] / 1000000000;
+    return dt / BigInt(1000000000);
   }
 }
 
@@ -63,7 +59,7 @@ class StopWatch {
  *
  * Results are logged to stderr
  *
- * To enable time tracing, set CDSC_TIMETRACE to true in the environment
+ * To enable time tracing, set CDSC_TIMETRACING to true in the environment
  *
  * @class TimeTracer
  */
@@ -107,10 +103,13 @@ class TimeTracer {
   stop() {
     try {
       const current = this.traceStack.pop();
-      const dT = current.stop();
+      const dt = current.stop();
       const base = `${ ' '.repeat(this.traceStack.length * 2) }${ current.id } took:`;
+      const sec = (dt / BigInt(1000000000)).toString();
+      // first, get remaining ns, then convert to ms.
+      const msec = ((dt % BigInt(1000000000)) / BigInt(1000000)).toString();
       // eslint-disable-next-line no-console
-      console.error( `${ base }${ ' '.repeat(60 - base.length) } %ds %dms`, dT[0], dT[1] / 1000000);
+      console.error( `${ base }${ ' '.repeat(60 - base.length) } %ds %dms`, sec, msec );
     }
     catch (e) {
       // eslint-disable-next-line no-console

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@sap/cds-compiler",
-  "version": "2.15.8",
+  "version": "3.1.0",
   "description": "CDS (Core Data Services) compiler and backends",
   "homepage": "https://cap.cloud.sap/",
   "author": "SAP SE (https://www.sap.com)",
   "license": "SEE LICENSE IN LICENSE",
+  "type": "commonjs",
   "bin": {
     "cdsc": "bin/cdsc.js",
     "cdshi": "bin/cdshi.js",
@@ -13,13 +14,42 @@
   "main": "lib/main.js",
   "types": "lib/main.d.ts",
   "scripts": {
-    "postinstall": "node lib/fix_antlr4-8_warning.js"
+    "download": "node scripts/downloadANTLR.js",
+    "gen": "node ./scripts/build.js && node scripts/genGrammarChecksum.js",
+    "xmakeBeforeInstall": "echo \"Due to binary mirror, use sqlite 5.0.11 explicitly\" && npm install --save --save-exact --no-package-lock sqlite3@5.0.11",
+    "xmakeAfterInstall": "npm run gen",
+    "xmakePrepareRelease": "echo \"$(node scripts/stripReadme.js README.md)\" > README.md && node scripts/assertSnapshotVersioning.js && node scripts/assertChangelog.js && node scripts/cleanup.js --remove-dev",
+    "test": "node scripts/verifyGrammarChecksum.js && mocha --reporter min --reporter-option maxDiffSize=0 scripts/testLazyLoading.js && mocha --parallel --reporter min --reporter-option maxDiffSize=0 test/ test3/",
+    "testverbose": "node scripts/verifyGrammarChecksum.js && mocha --parallel test/ test3/",
+    "test3": "node scripts/verifyGrammarChecksum.js && node scripts/linter/lintTests.js test3/ && mocha --reporter-option maxDiffSize=0 scripts/linter/lintMessages.js test3/",
+    "deployTest3SQL": "deployRefs=true mocha --reporter-option maxDiffSize=0 test3/testHANASQLDeployment.js",
+    "deployTest3": "deployRefs=true mocha --reporter-option maxDiffSize=0 test3/testDeployment.js",
+    "deployDiffs": "deployRefs=true mocha --reporter-option maxDiffSize=0 test3/deployDiffs.js",
+    "gentest3": "cross-env MAKEREFS=${MAKEREFS:-'true'} mocha --reporter-option maxDiffSize=0 test3/testRefFiles.js",
+    "testdb": "node scripts/verifyGrammarChecksum.js && cross-env TESTDB='TRUE' mocha",
+    "testmigration": "npm install --no-save @sap/hana-client@2.3.123 @sap/hdi-deploy@3.10.0 && node scripts/verifyGrammarChecksum.js && cross-env TESTMIGRATION='TRUE' mocha",
+    "testall": "npm install --no-save @sap/hana-client@2.3.123 @sap/hdi-deploy@3.10.0 && node scripts/verifyGrammarChecksum.js && cross-env TESTDB='TRUE' TESTMIGRATION='TRUE' mocha",
+    "coverage": "cross-env nyc mocha --reporter-option maxDiffSize=0 test/ test3/ && nyc report --reporter=lcov",
+    "lint": "eslint bin/ benchmark/ lib/ test/ test3/ scripts/ types/ && node scripts/linter/lintGrammar.js && node scripts/linter/lintTests.js test3/ && markdownlint README.md CHANGELOG.md doc/ internalDoc/ && cd share/messages && markdownlint .",
+    "tslint": "tsc --pretty -p .",
+    "updateVocs": "node scripts/odataAnnotations/generateDictMain.js && npm run generateAllRefs",
+    "generateCompilerRefs": "cross-env MAKEREFS='true' mocha test/testCompiler.js",
+    "generateEdmRefs": "cross-env MAKEREFS='true' mocha test/testEdmPositive.js",
+    "generateForHanaRefs": "cross-env MAKEREFS='true' mocha test/testHanaTransformation.js",
+    "generateOdataRefs": "cross-env MAKEREFS='true' mocha test/testODataTransformation.js",
+    "generateOdataAnnoRefs": "cross-env MAKEREFS='true' mocha test/testODataAnnotations.js",
+    "generateToSqlRefs": "cross-env MAKEREFS='true' mocha test/testToSql.js",
+    "generateToRenameRefs": "cross-env MAKEREFS='true' mocha test/testToRename.js",
+    "generateChecksRefs": "cross-env MAKEREFS='true' mocha test/testChecks.js",
+    "generateScenarioRefs": "cross-env MAKEREFS='true' mocha test/testScenarios.js",
+    "generateDraftRefs": "cross-env MAKEREFS='true' mocha test/testDraft.js",
+    "generateAllRefs": "node scripts/verifyGrammarChecksum.js && cross-env MAKEREFS='true' mocha --reporter-option maxDiffSize=0 test/ test3/"
   },
   "keywords": [
     "CDS"
   ],
   "dependencies": {
-    "antlr4": "4.8.0"
+    "antlr4": "4.9.3"
   },
   "files": [
     "bin",
@@ -32,6 +62,6 @@
     "LICENSE"
   ],
   "engines": {
-    "node": ">=12"
+    "node": ">=14"
   }
 }

package/share/messages/syntax-expected-integer.md

@@ -1,12 +1,12 @@
 # syntax-expected-integer
 
 The compiler expects a safe integer here.
-The last safe Integer is `2^53 - 1` or `9007199254740991`.
+The last safe integer is `2^53 - 1` or `9007199254740991`.
 
-A safe integer is an integer that
+A safe integer is an integer that fulfills all of the following:
 
-- can be exactly represented as an IEEE-754 double precision number, and
-- whose IEEE-754 representation cannot be the result of rounding any
+- Can be exactly represented as an IEEE-754 double precision number.
+- The IEEE-754 representation cannot be the result of rounding any
   other integer to fit the IEEE-754 representation.
 
 The message's severity is `Error`.
@@ -15,13 +15,14 @@ The message's severity is `Error`.
 
 Erroneous code example:
 
+<!-- cds-mode: ignore -->
 ```cdl
 type LengthIsUnsafe : String(9007199254740992);
 type NotAnInteger : String(42.1);
 ```
 
-In the above example, the string length for the type `LengthIsUnsafe` is not a
-safe Integer. It is too large.
+In the erroneous example, the string length for the type `LengthIsUnsafe` is
+not a safe integer. It is too large.
 Likewise, the string length for the type `NotAnInteger` is a decimal.
 
 ## How to Fix
@@ -33,5 +34,5 @@ type LengthIsSafe : String(9007199254740991);
 type AnInteger : String(42);
 ```
 
-If not feasible, a string representation of the number needs to be used,
-e.g. in annotation values.
+If it's not feasible to use a safe integer, a string representation of the
+number needs to be used, for example, in annotation values.