@sap/cds-dk 7.1.1 → 7.3.0

package/lib/compile/openapi/csdl2openapi.js

@@ -52,6 +52,7 @@ module.exports.csdl2openapi = function (
     {
         url: serviceRoot,
         servers: serversObject,
+        odataVersion: odataVersion,
         scheme: scheme = 'https',
         host: host = 'localhost',
         basePath: basePath = '/service-root',
@@ -61,6 +62,7 @@ module.exports.csdl2openapi = function (
 ) {
     // as preProcess below mutates the csdl, copy it before, to avoid side-effects on the caller side
     csdl = JSON.parse(JSON.stringify(csdl))
+    csdl.$Version = odataVersion ? odataVersion : '4.01'
     serviceRoot = serviceRoot || (scheme + '://' + host + basePath);
     const queryOptionPrefix = csdl.$Version <= '4.0' ? '$' : '';
     const typesToInline = {}; // filled in schema() and used in inlineTypes()
@@ -82,7 +84,7 @@ module.exports.csdl2openapi = function (
         openapi: '3.0.2',
         info: getInfo(csdl, entityContainer),
         'x-sap-api-type': 'ODATAV4',
-        'x-odata-version': '4.0',
+        'x-odata-version': csdl.$Version,
         'x-sap-shortText': getShortText(csdl, entityContainer),
         servers: getServers(serviceRoot, serversObject),
         tags: entityContainer ? getTags(entityContainer) : {},
@@ -638,12 +640,12 @@ module.exports.csdl2openapi = function (
      */
     function operationCreate(pathItem, element, name, sourceName, targetName, target, level, restrictions) {
         const insertRestrictions = restrictions.InsertRestrictions || target && target[voc.Capabilities.InsertRestrictions] || {};
-
+        let countRestrictions = target && (target[voc.Capabilities.CountRestrictions]?.Countable === false); // count property will be added if CountRestrictions is false
         if (insertRestrictions.Insertable !== false) {
             const lname = pluralize.singular(splitName(name));
             const type = modelElement(element.$Type);
             pathItem.post = {
-                summary: insertRestrictions.Description || operationSummary('Create', name, sourceName, level, true, true),
+                summary: insertRestrictions.Description || operationSummary('Creates', name, sourceName, level, true, true),
                 tags: [sourceName],
                 requestBody: {
                     description: type && type[voc.Core.Description] || 'New ' + lname,
@@ -653,8 +655,8 @@ module.exports.csdl2openapi = function (
                             schema: ref(element.$Type, SUFFIX.create),
                         }
                     }
-                },
-                responses: response(201, 'Created ' + lname, { $Type: element.$Type }, insertRestrictions.ErrorResponses),
+                },              
+                responses: response(201, 'Created ' + lname, { $Type: element.$Type }, insertRestrictions.ErrorResponses, !countRestrictions),
             };
             if (insertRestrictions.LongDescription) pathItem.post.description = insertRestrictions.LongDescription;
             if (targetName && sourceName != targetName) pathItem.post.tags.push(targetName);
@@ -711,6 +713,7 @@ module.exports.csdl2openapi = function (
         const readRestrictions = restrictions.ReadRestrictions || targetRestrictions || {};
         const readByKeyRestrictions = readRestrictions.ReadByKeyRestrictions;
         let readable = true;
+        let countRestrictions = target && (target[voc.Capabilities.CountRestrictions]?.Countable === false);
         if (byKey && readByKeyRestrictions && readByKeyRestrictions.Readable !== undefined)
             readable = readByKeyRestrictions.Readable;
         else if (readRestrictions.Readable !== undefined)
@@ -722,11 +725,11 @@ module.exports.csdl2openapi = function (
             const lname = splitName(name);
             const collection = !byKey && element.$Collection;
             const operation = {
-                summary: descriptions.Description || operationSummary('Retrieve', name, sourceName, level, element.$Collection, byKey),
+                summary: descriptions.Description || operationSummary('Retrieves', name, sourceName, level, element.$Collection, byKey),
                 tags: [sourceName],
                 parameters: [],
                 responses: response(200, 'Retrieved ' + (byKey ? pluralize.singular(lname) : lname), { $Type: element.$Type, $Collection: collection },
-                    byKey ? readByKeyRestrictions?.ErrorResponses : readRestrictions?.ErrorResponses)
+                    byKey ? readByKeyRestrictions?.ErrorResponses : readRestrictions?.ErrorResponses, !countRestrictions)
             };
             const deltaSupported = element[voc.Capabilities.ChangeTracking] && element[voc.Capabilities.ChangeTracking].Supported;
             if (!byKey && deltaSupported) {
@@ -1165,11 +1168,11 @@ see [Expand](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-prot
      */
     function operationUpdate(pathItem, element, name, sourceName, target, level, restrictions, byKey) {
         const updateRestrictions = restrictions.UpdateRestrictions || target && target[voc.Capabilities.UpdateRestrictions] || {};
-
+        let countRestrictions = target && (target[voc.Capabilities.CountRestrictions]?.Countable === false);
         if (updateRestrictions.Updatable !== false) {
             const type = modelElement(element.$Type);
             const operation = {
-                summary: updateRestrictions.Description || operationSummary('Change', name, sourceName, level, element.$Collection, byKey),
+                summary: updateRestrictions.Description || operationSummary('Changes', name, sourceName, level, element.$Collection, byKey),
                 tags: [sourceName],
                 requestBody: {
                     description: type && type[voc.Core.Description] || 'New property values',
@@ -1180,7 +1183,7 @@ see [Expand](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-prot
                         }
                     }
                 },
-                responses: response(204, "Success", undefined, updateRestrictions.ErrorResponses),
+                responses: response(204, "Success", undefined, updateRestrictions.ErrorResponses, !countRestrictions),
             };
             if (updateRestrictions.LongDescription) operation.description = updateRestrictions.LongDescription;
             customParameters(operation, updateRestrictions);
@@ -1202,12 +1205,12 @@ see [Expand](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-prot
      */
     function operationDelete(pathItem, element, name, sourceName, target, level, restrictions, byKey) {
         const deleteRestrictions = restrictions.DeleteRestrictions || target && target[voc.Capabilities.DeleteRestrictions] || {};
-
+        let countRestrictions = target && (target[voc.Capabilities.CountRestrictions]?.Countable === false);
         if (deleteRestrictions.Deletable !== false) {
             pathItem.delete = {
-                summary: deleteRestrictions.Description || operationSummary('Delete', name, sourceName, level, element.$Collection, byKey),
+                summary: deleteRestrictions.Description || operationSummary('Deletes', name, sourceName, level, element.$Collection, byKey),
                 tags: [sourceName],
-                responses: response(204, "Success", undefined, deleteRestrictions.ErrorResponses),
+                responses: response(204, "Success", undefined, deleteRestrictions.ErrorResponses, !countRestrictions),
             };
             if (deleteRestrictions.LongDescription) pathItem.delete.description = deleteRestrictions.LongDescription;
             customParameters(pathItem.delete, deleteRestrictions);
@@ -1423,7 +1426,7 @@ see [Expand](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-prot
         const name = actionName.indexOf('.') === -1 ? actionName : nameParts(actionName).name;
         const pathItem = {
             post: {
-                summary: actionImport[voc.Core.Description] || overload[voc.Core.Description] || 'Invoke action ' + name,
+                summary: actionImport[voc.Core.Description] || overload[voc.Core.Description] || 'Invokes action ' + name,
                 tags: [overload[voc.Common.Label] || sourceName || 'Service Operations'],
                 responses: overload.$ReturnType ? response(200, "Success", overload.$ReturnType, overload[voc.Capabilities.OperationRestrictions]?.ErrorResponses)
                     : response(204, "Success", undefined, overload[voc.Capabilities.OperationRestrictions]?.ErrorResponses),
@@ -1479,7 +1482,6 @@ see [Expand](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-prot
         const name = functionName.indexOf('.') === -1 ? functionName : nameParts(functionName).name;
         let parameters = overload.$Parameter || [];
         if (overload.$IsBound) parameters = parameters.slice(1);
-
         const pathSegments = [];
         const params = [];
 
@@ -1534,7 +1536,7 @@ see [Expand](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-prot
         const pathParameters = implicitAliases ? '' : '(' + pathSegments.join(',') + ')';
         const pathItem = {
             get: {
-                summary: functionImport[voc.Core.Description] || overload[voc.Core.Description] || 'Invoke function ' + name,
+                summary: functionImport[voc.Core.Description] || overload[voc.Core.Description] || 'Invokes function ' + name,
                 tags: [overload[voc.Common.Label] || sourceName || 'Service Operations'],
                 parameters: prefixParameters.concat(params),
                 responses: response(200, "Success", overload.$ReturnType, overload[voc.Capabilities.OperationRestrictions]?.ErrorResponses),
@@ -1558,7 +1560,7 @@ see [Expand](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-prot
             const firstEntitySet = Object.keys(container).filter(child => isIdentifier(child) && container[child].$Collection)[0];
             paths['/$batch'] = {
                 post: {
-                    summary: batchSupport[voc.Core.Description] || 'Send a group of requests',
+                    summary: batchSupport[voc.Core.Description] || 'Sends a group of requests',
                     description: (batchSupport[voc.Core.LongDescription] || 'Group multiple requests into a single request payload, see '
                         + '[Batch Requests](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-protocol.html#sec_BatchRequests).')
                         + '\n\n*Please note that "Try it out" is not supported for this request.*',
@@ -1613,11 +1615,12 @@ see [Expand](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-prot
      * @param {object} type Response type object
      * @param {array} errors Array of operation-specific status codes with descriptions
      */
-    function response(code, description, type, errors) {
+    function response(code, description, type, errors, isCount = true) {
         const r = {};
         r[code] = {
             description: description
         };
+        let CountPropertyObj = {[csdl.$Version > '4.0' ? '@count' : '@odata.count'] : ref('count')} ;
         if (code != 204) {
             const s = getSchema(type);
             r[code].content = {
@@ -1627,7 +1630,7 @@ see [Expand](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-prot
                             type: 'object',
                             title: 'Collection of ' + nameParts(type.$Type || 'Edm.String').name,
                             properties: {
-                                [csdl.$Version > '4.0' ? '@count' : '@odata.count']: ref('count'),
+                                ...(isCount && CountPropertyObj),
                                 value: s
                             }
                         }
@@ -1806,14 +1809,20 @@ see [Expand](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-prot
         const isKey = keyMap(type);
         const required = Object.keys(isKey);
         const schemaProperties = {};
-
+        let isCount = true;
+        if (csdl[qualifier]?.$Annotations) {
+            const annotations = csdl[qualifier].$Annotations[`${qualifier}.EntityContainer/${name}`];
+            if (annotations && annotations[voc.Capabilities.CountRestrictions] && annotations[voc.Capabilities.CountRestrictions]?.Countable === false) {
+                isCount = false;
+            }
+        }
         const properties = propertiesOfStructuredType(type);
         Object.keys(properties).forEach(iName => {
             const property = properties[iName];
             if (suffix === SUFFIX.read) schemaProperties[iName] = getSchema(property);
             if ((Object.prototype.hasOwnProperty.call(property, '@Common.FieldControl')) && property['@Common.FieldControl'] === 'Mandatory') { required.push(iName) }
             if (property.$Kind == 'NavigationProperty') {
-                if (property.$Collection && suffix === "") {
+                if (property.$Collection && suffix === "" && isCount === true) {
                     schemaProperties[`${iName}@${csdl.$Version === '4.0' ? 'odata.' : ''}count`] = ref('count');
                 }
                 if (property[voc.Core.Permissions] != "Read" && !property[voc.Core.Computed] && property.$ContainsTarget) {

package/lib/compile/openapi/index.js

@@ -34,11 +34,15 @@ function _getOpenApi(csdl, options) {
     return openapi;
 }
 
-function toOpenApiOptions(csdl, csn, options={}) {
+function toOpenApiOptions(csdl, csn, options = {}) {
     const result = {}
     for (const key in options) {
-        if (/^openapi:(.*)/.test(key) && RegExp.$1)
-            result[RegExp.$1] = options[key]
+        if (/^openapi:(.*)/.test(key) && RegExp.$1) {
+            result[RegExp.$1] = options[key];
+        }
+        else if (key === 'odata-version') {
+            result['odataVersion'] = options[key];
+        }
     }
     if (result.url) {
         result.url = result.url.replace(/\/*\$\{service-path\}/g, servicePath(csdl, csn))

package/lib/env/schema.js

@@ -0,0 +1,36 @@
+const { join } = require('path')
+const { mergeJSON } = require('../init/util/merge')
+const { readJSON } = require('../util/fs')
+
+module.exports = async function overlay4(schemaName, cwd = process.cwd()) {
+
+    // need to load @sap/cds from current cwd which might
+    // differ from initial cwd to get project specific cds version
+    const cds = require(require.resolve('@sap/cds', {
+        paths: [cwd, __dirname]
+    }))
+
+    // force cds.root to be project root
+    cds.root = cwd
+
+    // load defaults, throw err if schema not found
+    let result;
+    if (typeof cds.schema?.default4 === 'function') {
+        result = await cds.schema.default4(schemaName)
+    } else if (cds.env?.schemas?.[schemaName]) {
+        // backwards compatibility
+        result = await readJSON(cds.env.schemas[schemaName])
+    } else {
+        throw new Error(`cds ${cds.version} in ${cwd} does not support schema retrieval.`)
+    }
+
+    // optional, don't throw if file not found
+    try {
+        await mergeJSON(result, join(__dirname, 'schemas', schemaName))
+        result.description = result.description + ' - overlaid'
+    } catch (err) {
+        if (err.code !== 'ENOENT') throw err
+    }
+
+    return result
+}

package/lib/env/schemas/cds-rc.json

@@ -0,0 +1,101 @@
+{
+    "title": "JSON schema for CDS-DK configuration",
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
+    "description": "This is a JSON schema representation for CDS project configuration",
+    "type": "object",
+    "additionalProperties": true,
+    "properties": {
+        "build": {
+            "type": "object",
+            "description": "Customize CDS build settings.",
+            "additionalProperties": true,
+            "properties": {
+                "target": {
+                    "type": "string",
+                    "description": "Specify the folder which contains generated build results. Defaults to './gen'.",
+                    "format": "uri-reference"
+                },
+                "tasks": {
+                    "type": "array",
+                    "description": "Control which tasks 'cds build' will execute on your project modules. This is a typical task configuration: '\"tasks\": [{ \"for\": \"hana\"}];",
+                    "uniqueItems": true,
+                    "default": [
+                        {}
+                    ],
+                    "items": {
+                        "type": "object",
+                        "additionalProperties": true,
+                        "properties": {
+                            "dest": {
+                                "type": "string",
+                                "description": "Optional: Define the destination folder for this build task, relative to build target folder. \nFor example: Destination defined as 'custom' results in an output written to 'gen/custom'.",
+                                "format": "uri-reference"
+                            },
+                            "src": {
+                                "type": "string",
+                                "description": "Optional: Prefer defining 'cds.folders'. Use 'src' if you want it only to be valid for this specific build task, which excludes, for example, 'cds watch'.",
+                                "format": "uri-reference"
+                            },
+                            "for": {
+                                "type": "string",
+                                "description": "Define the target technology for this build task.",
+                                "minLength": 1,
+                                "enum": [
+                                    "nodejs",
+                                    "java",
+                                    "hana",
+                                    "mtx-sidecar",
+                                    "mtx-extension",
+                                    "mtx",
+                                    "fiori",
+                                    "node-cf",
+                                    "java-cf"
+                                ]
+                            },
+                            "options": {
+                                "type": "object",
+                                "description": "Optional: Set target technology specific options for this build task.",
+                                "additionalProperties": true,
+                                "properties": {
+                                    "model": {
+                                        "$ref": "#/$defs/foldersStringArray"
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        "deploy": {
+            "type": "object",
+            "description": "Customize 'cds deploy' settings.",
+            "additionalProperties": true,
+            "properties": {
+                "no_save": {
+                    "type": "boolean",
+                    "description": "Do / don't update configuration in package.json.",
+                    "default": true
+                }
+            }
+        }
+    },
+    "$defs": {
+        "foldersStringArray": {
+            "oneOf": [
+                {
+                    "type": "string",
+                    "format": "uri-reference"
+                },
+                {
+                    "type": "array",
+                    "uniqueItems": true,
+                    "items": {
+                        "type": "string",
+                        "format": "uri-reference"
+                    }
+                }
+            ]
+        }
+    }
+}

package/lib/import/common.js

@@ -7,7 +7,7 @@ const messages = require("./message").getMessages();
 const cds = require('../cds');
 const { fs, path, write, mkdirp, exists, read } = cds.utils;
 const cdsCompiler = require('..').compile.to;
-const md5 = require('md5');
+const md5 = data => require('crypto').createHash('md5').update(data).digest('hex');
 
 let optionsMapping = {
     'keep-namespace': 'keepNamespace',
@@ -17,7 +17,7 @@ let optionsMapping = {
 };
 
 let apiOptions = ['includeNamespaces', 'keepNamespace'];
-let commonOptions = ['no_copy', 'no_save', 'out', 'dry', 'as', 'from', 'force'];
+let commonOptions = ['no_copy', 'no_save', 'out', 'dry', 'as', 'from', 'force', 'config'];
 
 async function generateEDMX2JSON(edmx) {
     let cjson = convert.xml2json(edmx, {
@@ -148,6 +148,18 @@ async function _copyToSrvExternal(file, dst, cwd) {
     return file;
 }
 
+async function isValidJsonObject(options){
+    let config;
+    try {
+        if (options.config) {
+            config = JSON.parse(options.config);
+            return config;
+        }
+    } catch (error) {
+        throw new Error(messages.SPECIFY_CONFIG);
+    }
+} 
+
 async function preProcess(file, options, cwd) {
     let srcFilePath = await isValidInputFile(path.resolve(cwd, file));
     if (options.as && !_supportedAsFormats().includes(options.as))
@@ -266,12 +278,12 @@ async function _generateChecksumValidate(dest, output, force) {
     return "/* checksum : " + currentChecksum + " */\n" + output;
 }
 
-async function _getResult(output, as, dest, force, version) {
+async function _getResult(output, as, dest, force, kind) {
     let extension = dest.substring(dest.lastIndexOf(".") + 1);
     as = (as === "cds") ? "cdl" : as;
 
     // output filepath should simply contain .csn as extension
-    if (version === 'rest' &&  ['swagger', 'openapi3'].includes(extension)) {
+    if (kind === 'rest' &&  ['swagger', 'openapi3'].includes(extension)) {
         dest = dest.replace('.' + extension, '');
     }
 
@@ -325,19 +337,19 @@ ${using}
     console.log(message);
 }
 
-async function _updatePackageJson(dest, services, version, cwd) {
+async function _updatePackageJson(dest, services, kind, cwd, config) {
     const package_json = path.resolve(cwd, 'package.json');
     const conf = await exists(package_json) ? require(package_json) : {};
     const requires = ['cds', 'requires'].reduce((p, n) => p[n] || (p[n] = {}), conf);
-    if (version !== 'rest') {
-        version = (version === "V2") ? 'odata-v2' : 'odata';
+    if (kind !== 'rest') {
+        kind = (kind === "V2") ? 'odata-v2' : 'odata';
     }
     let package_json_updated = false;
     for (let service of services) {
         if (!requires[service]) {
             const initial_model = path.relative(cwd, dest);
             const model = isLinux() ? initial_model.replace(/\\/g, '/') : initial_model;
-            cds.env.requires[service] = requires[service] = { kind: version, model };
+            cds.env.requires[service] = requires[service] = { kind: kind, model, ...config };
             await write(package_json, JSON.stringify(conf, null, '  '));
             package_json_updated = true;
         }
@@ -349,11 +361,12 @@ async function _updatePackageJson(dest, services, version, cwd) {
 
 async function postProcess(filePath, options, csn, cwd) {
     const services = _getServiceNames(csn);
+    let config = await isValidJsonObject(options);
     if (options.out) options.out = _validateAndComputeOutputFilePath(options.out, options.as, filePath);
-    const version = options.inputFileVersion;
-    const result = await _getResult(csn, options.as, options.out || filePath.replace(/\.[^.]+$/, ''), options.force, version);
+    const kind = options.inputFileKind;
+    const result = await _getResult(csn, options.as, options.out || filePath.replace(/\.[^.]+$/, ''), options.force, kind);
     const written = options.dry || await _write(result, services, cwd);
-    const registered = options.dry || options.no_save || await _updatePackageJson(result[1].replace(/\.[^.]+$/, ''), services, version, cwd);
+    const registered = options.dry || options.no_save || await _updatePackageJson(result[1].replace(/\.[^.]+$/, ''), services, kind, cwd, config);
     if (options.dry) return console.log(result[0]);
     return Promise.all([written, registered]);
 }

package/lib/import/importapi.js

@@ -91,7 +91,7 @@ async function cds_import_from_openapi(filepath, options = {}) {
     filepath = await common.isValidInputFile(path.resolve(process.cwd(), filepath));
     const src = await common.getContentFromFile(filepath);
     let csn = openapi.openAPI2csn(src);
-    options.inputFileVersion = 'rest';
+    options.inputFileKind = 'rest';
     return csn;
 }
 
@@ -106,6 +106,6 @@ async function cds_import_from_asyncapi(filepath, options = {}) {
     filepath = await common.isValidInputFile(path.resolve(process.cwd(), filepath));
     const src = await common.getContentFromFile(filepath);
     let csn = asyncapi.asyncapi2csn(src);
-    options.inputFileVersion = 'odata';
+    options.inputFileKind = 'odata';
     return csn;
 }

package/lib/import/message.js

@@ -34,7 +34,9 @@ const messages = {
 	BINARY_MAXLENGTH: 'WARNING: MaxLength for type Edm.Binary should not exceed 5000.',
 	SCALE_GT_PRECISION: 'WARNING: Scale value should not be greater than Precision value.',
 	FIXED_PRECISION_VARIABLE_SCALE: 'WARNING: Fixed Precision with Variable or Floating Scale is not supported in CDS.',
-	NULLABLE_KEY: 'WARNING: Key element cannot be Nullable.'
+	NULLABLE_KEY: 'WARNING: Key element cannot be Nullable.',
+	COLLISION_DETECTED: `INFO: Element name collision detected. Adding suffix to affected type category.`,
+	SPECIFY_CONFIG: 'For --config option, please specify correct JSON Object.',
 };
 
 function getMessages() {

package/lib/import/odata/v4parser.js

@@ -9,7 +9,7 @@ let common = require("../common");
 let versionInfo = require("../../../package.json").version;
 let Multimap = require("./util/MultiMap");
 const ignoreObjects = ["$Reference"]; // add all the objects that needs to be ignored for parsing.
-const { warn } = require("../../util/term");
+const { warn, info } = require("../../util/term");
 const MetadataConverterFactory = require("./metadataconverter/MetadataConverterFactory");
 
 const edmPrimitiveTypes = [
@@ -1216,6 +1216,12 @@ function _parseAnnotations(schemaAnnotations, csnDefs, parserContext) {
     });
 }
 
+function _addSuffixForCollisionTypes(fqName, suffix) {
+    console.log(info(`INFO: Due to collision in ${fqName} suffix "${suffix}" is added.`));
+    const suffixedFqElementName = (fqName + suffix);
+    return suffixedFqElementName;
+}
+
 function _parseEntityContainer(csnDefs, entityContainerElements, parserContext) {
     const entityContainerElementNames = Object.keys(entityContainerElements);
     const redundantElementNames = [];
@@ -1241,16 +1247,26 @@ function _parseEntityContainer(csnDefs, entityContainerElements, parserContext)
             let fqDefRefName = _resolveAliasedElementName(definitionRefName, parserContext);
             let fqElementName = parserContext.primarySchema + "." + ecElement;
 
-            /**
-             * For now we don't support the collision between entitycontainer element name
-             * and any of the schema elemetents like entitytype, complextype, etc.
-             * TODO: In future we might have to support it.
-             */
             if (csnDefs[fqElementName] && csnDefs[fqElementName].kind !== kind) {
-                throw new Error(messages.ELEMENT_NAME_COLLISION + ecElement);
+                console.log(info(messages.COLLISION_DETECTED));
+                let suffixedFqElementName;
+                // Check the type category that experienced the collision
+                if (parserContext.complexTypes.includes(fqElementName)) {
+                    suffixedFqElementName = _addSuffixForCollisionTypes(fqElementName, "_ComplexType");
+                } else if (parserContext.enumTypes.includes(fqElementName)) {
+                    suffixedFqElementName = _addSuffixForCollisionTypes(fqElementName, "_EnumType");
+                } else if (parserContext.typeDefinitions.includes(fqElementName)) {
+                    suffixedFqElementName = _addSuffixForCollisionTypes(fqElementName, "_TypeDefinition");
+                }
+                // copy the definition with new suffixed name and delete the old definition from csnDefs
+                csnDefs[suffixedFqElementName] = csnDefs[fqElementName];
+                delete csnDefs[fqElementName];
             }
 
             if (fqElementName !== fqDefRefName) {
+                if (csnDefs[fqElementName] && !parserContext.entityToEntitySetMap.get(fqElementName)) {
+                    fqElementName = _addSuffixForCollisionTypes(fqElementName, "_EntityType");
+                }
                 csnDefs[fqElementName] = Object.assign({}, csnDefs[fqDefRefName]);
                 /**
                  * Capture all the defintion reference element name which are no

package/lib/index.js

@@ -18,3 +18,8 @@ cds.extend (cds.compile.to.constructor) .with (class {
 if (cds.compile.to.constructor.name === 'Object') { // not a class as in cds 7
   cds.compile.to.xsuaa = require('./compile/to-xsuaa')
 }
+
+cds.schema = cds.schema || {} // backward compatibility
+cds.extend (cds.schema) .with ( {
+  overlay4: require('./env/schema')
+})

package/lib/init/constants.js

@@ -1,14 +1,10 @@
-const os = require('os');
-
-const MAVEN_ARCHETYPE_VERSION = '2.1.0';
-
-const constants = {
-    IS_WIN: (os.platform() === 'win32'),
+module.exports = {
+    IS_WIN: require('os').platform() === 'win32',
 
     COMMAND_INIT: 'init',
     COMMAND_ADD: 'add',
 
-    MAVEN_ARCHETYPE_VERSION,
+    MAVEN_ARCHETYPE_VERSION: '2.3.0',
 
     OPTIONS: Object.freeze({
         JAVA: 'java',
@@ -28,8 +24,9 @@ const constants = {
         EXTENSIBILITY: 'extensibility',
         XSUAA: 'xsuaa',
         HANA: 'hana',
+        POSTGRES: 'postgres',
         SQLITE: 'sqlite',
-        AUDITLOG: 'auditlog',
+        H2: 'h2',
         ENTERPRISE_MESSAGING: 'enterprise-messaging',
         ENTERPRISE_MESSAGING_SHARED: 'enterprise-messaging-shared',
         FILE_BASED_MESSAGING: 'file-based-messaging',
@@ -42,12 +39,15 @@ const constants = {
         LINT_GLOBAL: 'lint:global',
         LINT_DEV: 'lint:dev',
         HELM: 'helm',
-        TYPER: 'typer'
+        TYPER: 'typer',
+        HTML5_REPO: 'html5-repo'
     }),
 
     PROJECT_TYPE: Object.freeze({ nodejs: 1, java: 2, unknown: 3 }),
 
     REGEX_JAVA_PACKAGE: /^[a-z_][a-z0-9_]*(\.[a-z_][a-z0-9_]*)*$/g,
+    // copied from mbt error message
+    REGEX_JAVA_VERSION: /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(-(0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(\.(0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*)?(\+[0-9a-zA-Z-]+(\.[0-9a-zA-Z-]+)*)?$/,
     REGEX_PROJECT_NAME: /[^0-9a-zA-Z_-]/g,
 
     URLS: Object.freeze({
@@ -57,11 +57,8 @@ const constants = {
         MAVEN_ARCHETYPE_HELP: `https://cap.cloud.sap/docs/java/development/#the-maven-archetype`,
         MAVEN_INSTALL_HELP: `https://maven.apache.org/install.html`,
         VSCODE: 'https://code.visualstudio.com/',
-        VSCODE_NBVIEWER: 'https://marketplace.visualstudio.com/items?itemName=ms-python.python',
         VSCODE_ESLINT: 'https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint'
     }),
 
     PROJECT_FILES: ['package.json', 'pom.xml', '.cdsrc.json']
 }
-
-module.exports = constants;