@sap/cds-dk 4.6.3 → 4.6.4

package/CHANGELOG.md

@@ -6,6 +6,17 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
+## Version 4.6.4 - 2021-11-24
+
+### Fixed
+
+- `cds import` fix for TypeError issue during OData V2 EDMX conversion to CSN.
+- `cds import <file_name>` fix now updates the service name in the `package.json` with only the file name. Earlier, the service name sometimes used to be of the form `A.B`, with `A` being file name and `B` being a part of the schema namespace value in the EDMX file
+
+### Changed
+
+- `cds init` uses latest `Maven Java archetype` version `1.20.3` for creating Java projects.
+
 ## Version 4.6.3 - 2021-11-16
 
 ### Fixed

package/lib/import/index.js

@@ -130,12 +130,13 @@ function _convertEDMXWithMultipleSchemas(edmx, multipleSchemas, namespace) {
 }
 
 async function edmx2csn(edmx, filename, context) {
-    const result = edmx.match(/EntityType="([^.]+)/);
+    const result = edmx.match(/EntityType="([^"]+)/);
     const multipleSchemas = /(\s*<\/Schema>\s*<Schema [^>]*>)\s*/m;
     if (!result) {
         throw new Error(messages.MISSING_ENTITIES);
     }
-    const namespace = result[1];
+    const index = result[1].lastIndexOf(".");
+	const namespace = (index > 0 ) ? result[1].substring(0, index) : result[1];
 
     if (multipleSchemas.test(edmx)) {
         edmx = _convertEDMXWithMultipleSchemas(edmx, multipleSchemas, namespace);

package/lib/import/v2parser.js

@@ -1400,6 +1400,7 @@ function _getEntitesWithNamesFromEntitySets(
 		: (name) => allEntities.indexOf(name) >= 0;
 
 	const getEntitySetNames = entityWithName => {
+		if (!entityWithName.name) return false;
 		for (let i = 0; i < entityWithName.name.length; i++) {
 			if (!isNameInEntitySet(entityWithName.name[i]))
 				return false;

package/lib/init/constants.js

@@ -1,6 +1,6 @@
 const os = require('os');
 
-const MAVEN_ARCHETYPE_VERSION = '1.20.0';
+const MAVEN_ARCHETYPE_VERSION = '1.20.3';
 
 const constants = {
     IS_WIN: (os.platform() === 'win32'),