@sap/cds-dk 6.5.1 → 6.6.0

package/lib/import/odata/v2parser.js

@@ -9,7 +9,7 @@ let common = require("../common");
 let versionInfo = require('../../../package.json').version;
 const { warn } = require('../../util/term');
 
-let edmxncdsdatatype = {
+const edmxncdsdatatype = {
 	"Edm.String": "cds.LargeString",
 	"Edm.Boolean": "cds.Boolean",
 	"Edm.Int16": "cds.Integer",
@@ -39,6 +39,26 @@ let edmxncdsdatatype = {
 	"Edm.DateTime_a": "cds.Timestamp" //precision > 0
 };
 
+const extendedPrimitiveTypes = [
+    "Edm.Duration",
+	"Edm.Geography",
+	"Edm.GeographyPoint",
+	"Edm.GeographyLineString",
+	"Edm.GeographyPolygon",
+	"Edm.GeographyMultiPoint",
+	"Edm.GeographyMultiLineString",
+	"Edm.GeographyMultiPolygon",
+	"Edm.GeographyCollection",
+	"Edm.Geometry",
+	"Edm.GeometryPoint",
+	"Edm.GeometryLineString",
+	"Edm.GeometryPolygon",
+	"Edm.GeometryMultiPoint",
+	"Edm.GeometryMultiLineString",
+	"Edm.GeometryMultiPolygon",
+	"Edm.GeometryCollection"
+];
+
 function _initialize(parserContext) {
 	parserContext.serviceNamespace = "";
 	parserContext.allEntities = [];
@@ -54,7 +74,7 @@ function _initialize(parserContext) {
 	parserContext.allComplexTypeDocs = {};
 	parserContext.allComplexTypeNamespaces = {};
 	parserContext.allInheritedComplexTypes = {};
-	parserContext.allInheritedEntityTypes = {};
+	parserContext.allInheritedEntityTypes = [];
 	parserContext.allowedNamespaces = [];
 	parserContext.allowAllNamespaces = false;
 }
@@ -380,6 +400,7 @@ function _getServiceEntityProperty(
 	documentation,
 	allowedNamespaceAttributes = -1,
 	nullable,
+	defaultValue,
 	collectionKind,
 	parserContext
 ) {
@@ -441,14 +462,16 @@ function _getServiceEntityProperty(
 		cdsDataType = dataType;
 	}
 
+	let hasCdsTypeMapping = false;
+	if (extendedPrimitiveTypes.includes(dataType)) {
+		cdsDataType = dataType;
+		hasCdsTypeMapping = true;
+	}
+
 	//if the cdsDataType is undefined/ not supported
 	if (cdsDataType === undefined) {
-		let message = '"' + dataType + '" is not supported';
 		if (propertyName)
-			message += ' (in element:"' + propertyName + '")';
-		else
-			message += ' (in return type)'
-		console.log(warn(message));
+			console.log(warn('"' + dataType + '" is not supported (in element:"' + propertyName + '")'));
 		return "";
 	}
 
@@ -473,10 +496,15 @@ function _getServiceEntityProperty(
 				propertyJson = propertyJson + '"@odata.Precision": ' + precision + ',\n';
 			}
 		}
+		if (hasCdsTypeMapping) {
+			propertyJson = propertyJson + '"@odata.Type": "' + dataType + '"';
+			propertyJson = propertyJson + ',\n"items": { \n'
+			propertyJson = propertyJson + '"type": "cds.String"';
+		} else {
+			propertyJson = propertyJson + '"items": { \n'
+			propertyJson = propertyJson + '"type":"' + cdsDataType + '"';
+		}
 
-		propertyJson = propertyJson + '"items": { \n'
-		propertyJson = propertyJson + '"type":"' + cdsDataType + '"';
-		
 		if (length && length > 0) {
 			propertyJson = propertyJson + ',\n"length":' + length;
 		} else if (precision && precision > 0 && hasInvalidPrecision === false) {
@@ -492,8 +520,13 @@ function _getServiceEntityProperty(
 		propertyJson = propertyJson + '\n}'
 	}
 	else {
-		propertyJson = propertyJson + '"type":"' + cdsDataType + '"';
-			//if annotations to be added
+		if (hasCdsTypeMapping) {
+			propertyJson = propertyJson + '"type": "cds.String"';
+			propertyJson = propertyJson + ',\n"@odata.Type": "' + dataType + '"';
+		} else {
+			propertyJson = propertyJson + '"type":"' + cdsDataType + '"';
+		}
+		// if annotations to be added
 		if (edmxncdsdatatype[dataType + "_a"] && cdsDataType != "cds.Date") {
 			if (dataType === 'Edm.Stream') 
 				propertyJson = propertyJson + ',\n"@Core.MediaType": "application/octet-stream"';
@@ -501,7 +534,7 @@ function _getServiceEntityProperty(
 				propertyJson = propertyJson + ',\n"@odata.Type": "' + dataType + '"';
 		}
 
-		if (length && length > 0) {
+		if (length && length > 0 && !hasCdsTypeMapping) {
 			propertyJson = propertyJson + ',\n"length":' + length;
 		} else if (precision && precision > 0 && hasInvalidPrecision === false) {
 			propertyJson = propertyJson + ',\n"precision":' + precision;
@@ -513,7 +546,7 @@ function _getServiceEntityProperty(
 		}
 
 		//adding precision in case of DateTime datatypes
-		if ((dataType === "Edm.DateTimeOffset" || dataType === "Edm.DateTime") && cdsDataType != "cds.Date") {
+		if ((dataType === "Edm.DateTimeOffset" || dataType === "Edm.DateTime") && cdsDataType !== "cds.Date" && !hasCdsTypeMapping) {
 			if (precision && precision > 0){
 				propertyJson = propertyJson + ',\n"@odata.Precision": ' + precision;
 			}
@@ -532,6 +565,10 @@ function _getServiceEntityProperty(
 		propertyJson = propertyJson + ',\n"notNull": true';
 	}
 
+	if (defaultValue !== -1 && defaultValue) {
+		propertyJson = propertyJson + ', \n"default": {\n"val": "' + defaultValue + '"\n}';
+	}
+
 	if (propertyName)
 		propertyJson = propertyJson + "\n}";
 	return propertyJson;
@@ -542,7 +579,7 @@ function _getServiceComplexType(complexTypeKey, complexType, parserContext, isOp
 	let complexTypeProperty;
 	complexTypeCSN = complexTypeCSN + '"kind": "type",\n';
 	// checking if the ComplexType is marked open or acts as a BaseType
-	if (isOpenType === true || Object.values(parserContext.allInheritedComplexTypes).indexOf(complexTypeKey) > -1) {
+	if (isOpenType || Object.values(parserContext.allInheritedComplexTypes).indexOf(complexTypeKey) > -1) {
 		complexTypeCSN = complexTypeCSN + '"@open": true,\n';
 	}
 	complexTypeCSN = complexTypeCSN + '"@cds.external": true,\n';
@@ -564,7 +601,7 @@ function _getServiceComplexType(complexTypeKey, complexType, parserContext, isOp
 						complexType.CollectionKind = 1;
 					}
 				let namespaceAttributes = namespaceAttributeFilter(complexTypeProperty, parserContext);
-				const complexTypePropertyNamespace = namespaceAttributes.length ? namespaceAttributes : -1
+				const complexTypePropertyNamespace = namespaceAttributes.length ? namespaceAttributes : -1;
 
 				let complexProperty =
 					_getServiceEntityProperty(
@@ -578,6 +615,7 @@ function _getServiceComplexType(complexTypeKey, complexType, parserContext, isOp
 						complexTypeProperty.doc,
 						complexTypePropertyNamespace,
 						complexTypeProperty.Nullable,
+						complexTypeProperty.DefaultValue,
 						complexType.CollectionKind,
 						parserContext
 					);
@@ -613,6 +651,7 @@ function _getServiceComplexType(complexTypeKey, complexType, parserContext, isOp
 					complexTypeProperty.doc,
 					complexTypePropertyNamespace,
 					complexTypeProperty.Nullable,
+					complexTypeProperty.DefaultValue,
 					complexTypeProperty.CollectionKind,
 					parserContext
 				);
@@ -623,10 +662,16 @@ function _getServiceComplexType(complexTypeKey, complexType, parserContext, isOp
 		}
 	}
 	complexTypeCSN = complexTypeCSN + "}\n";
+
 	if (parserContext.allInheritedComplexTypes[complexTypeKey]) {
-		complexTypeCSN = complexTypeCSN + ",\n";
-		complexTypeCSN = complexTypeCSN +
-			'"includes": ["' + parserContext.allInheritedComplexTypes[complexTypeKey] + '"]\n';
+		let baseType = parserContext.allInheritedComplexTypes[complexTypeKey];
+
+		if (parserContext.allComplexTypes[baseType]) {
+			complexTypeCSN = complexTypeCSN + ',\n"includes": ["' + baseType + '"]\n';
+		}
+		else {
+			console.log(warn("BaseType " + baseType + " couldn't be resolved"));
+		}
 	}
 	complexTypeCSN = complexTypeCSN + "}\n";
 	return complexTypeCSN;
@@ -673,6 +718,7 @@ function _parseParameter(parameter, parserContext) {
 			doc,
 			parameterNamespaceAttributes,
 			parameter["_attributes"].Nullable,
+			-1,
 			parameter["_attributes"].CollectionKind,
 			parserContext
 		);
@@ -748,17 +794,28 @@ function _getFunctionImport(functionImport, isBounded, entityKeysList, parserCon
 			}
 		}
 	}
+	// if return type exist
 	if (functionImport[2] !== -1) {
-		let returnCsn = _getServiceEntityProperty(noValue, functionImport[2], noValue, noValue, noValue, 
-			noValue, noValue, noValue, -1, noValue, noValue, parserContext);
-		if (returnCsn != "") {
+		let returnValue = _getServiceEntityProperty(noValue, functionImport[2], noValue, noValue, noValue, noValue, 
+			noValue, noValue, noValue, noValue, -1, noValue, parserContext);
+		
+		if (returnValue !== "") {
 			csn = csn + ", \n";
 			csn = csn + '"returns": { \n';
 			//return type
-			csn = csn + returnCsn;
+			csn = csn + returnValue;
 			csn = csn + '\n }';
+		} else {
+			throw new Error(messages.UNRESOLVED_TYPE + `'${functionImport[2]}'`);
 		}
 	}
+	// if return type is missing, add boolean only for functions
+	if (functionImport[2] === -1 && functionImport[1] === "GET") {
+		csn = csn + ", \n";
+		csn = csn + '"returns": { \n';
+		csn = csn + '"type": "cds.Boolean"';
+		csn = csn + '\n }';
+	}
 	if (functionImport[4] !== -1 && functionImport[4]) {
 		csn = csn + ',\n "doc": "' + _replaceSpecialCharacters(functionImport[4]) + '"';
 	}
@@ -868,6 +925,12 @@ function _getPropertyAttributes(propAttributes, parserContext) {
 	} else {
 		propOthers.push("true");
 	}
+	
+	if (propAttributes.DefaultValue) {
+		propOthers.push(propAttributes.DefaultValue);
+	} else {
+		propOthers.push(-1);
+	}
 
 	if (propAttributes.CollectionKind === 'List' || propAttributes.CollectionKind === 'Bag') {
 		propOthers.push(1);
@@ -933,7 +996,7 @@ function _generateCSNEntityKeys(entityKeysList, entityPropertiesMap, parserConte
 
 	for (let i = 0; i < entityKeysList.length; i++) {
 		propAttributes = entityPropertiesMap[entityKeysList[i]];
-		if (propAttributes[7] == "true") {
+		if (propAttributes[7] === "true") {
 			console.log(warn("Expected key element to be not nullable"));
 		}
 
@@ -950,6 +1013,7 @@ function _generateCSNEntityKeys(entityKeysList, entityPropertiesMap, parserConte
 				propAttributes[6],
 				"false",
 				propAttributes[8],
+				propAttributes[9],
 				parserContext
 			);
 		csnEntity = csnEntity + keyCsn;
@@ -984,16 +1048,17 @@ function _generateCSNEntityProperties(entityKeysList, entityPropertiesMap, parse
 			let propertyString =
 				_getServiceEntityProperty(
 					property,
-					propAttributes[0],
-					propAttributes[1],
-					propAttributes[2],
-					propAttributes[3],
-					propAttributes[4],
-					false,
-					propAttributes[5],
-					propAttributes[6],
-					propAttributes[7],
-					propAttributes[8],
+					propAttributes[0], // dataType
+					propAttributes[1], // length
+					propAttributes[2], // precision
+					propAttributes[3], // scale
+					propAttributes[4], // display
+					false, // isKey
+					propAttributes[5], // doc
+					propAttributes[6], // allowed namespace
+					propAttributes[7], // nullable
+					propAttributes[8], // defaultVal
+					propAttributes[9], // collection
 					parserContext
 				);
 			csnEntity = csnEntity + propertyString;
@@ -1426,7 +1491,7 @@ function _constructServiceEntity(
 		csnEntity = csnEntity + '"@cds.persistence.skip": true,\n';
 	}
 
-	if ((entityAttributes.Abstract && entityAttributes.Abstract.toUpperCase() === "TRUE") || (entityAttributes.OpenType && entityAttributes.OpenType.toUpperCase() === "TRUE")) {
+	if ((entityAttributes.Abstract?.toUpperCase() === "TRUE") || (entityAttributes.OpenType?.toUpperCase() === "TRUE")) {
 		csnEntity = csnEntity + '"@open": true,\n'
 	}
 
@@ -1488,12 +1553,17 @@ function _constructServiceEntity(
 	csnEntity = csnEntity + "}\n";
 
 	if (entityAttributes.BaseType) {
-		let baseTypeName = _getBaseTypeEntityName(entityAttributes.BaseType, parserContext);
-		csnEntity = csnEntity + ",\n";
-		csnEntity = csnEntity + '"includes": ["' + baseTypeName + '"]\n';
+		let baseTypeName = _getBaseTypeEntityName(entityAttributes.BaseType, parserContext).replace(parserContext.serviceNamespace + '.', '');
+
+		if (parserContext.allEntitiesMC.includes(baseTypeName) || parserContext.allEntities.includes(baseTypeName)) {
+			csnEntity = csnEntity + ',\n"includes": ["' + parserContext.serviceNamespace + '.' + baseTypeName + '"]\n';
+		}
+		else {
+			throw new Error(messages.UNRESOLVED_TYPE + `'${parserContext.serviceNamespace}.${baseTypeName}'`);
+		}
 	}
 
-	//if the function import is bounded to entitySet 
+	// if the function import is bounded to entitySet 
 	if (parserContext.allFunctionImportsMap[entityName]) {	
 		csnEntity = csnEntity + ', \n "actions": {\n';
 		csnEntity = csnEntity + 
@@ -1554,8 +1624,12 @@ function _parseServiceEntity(entityName, entity, ignorePersistenceSkip, mockServ
 	}
 	// If inherited entity found
 	if (entityAttributes.BaseType) {
-		parserContext.allEntities.push(_extractEntityFromNamespace(entityAttributes.BaseType));
-		parserContext.allInheritedEntityTypes[_extractEntityFromNamespace(entityAttributes.BaseType)] = entity["_attributes"].Name;
+		let entityName;
+		if (parserContext.allEntitySetMapMC && parserContext.allEntitySetMapMC[entityAttributes.BaseType]) {
+			entityName = parserContext.allEntitySetMapMC[entityAttributes.BaseType][0];
+		}
+		else entityName = _extractEntityFromNamespace(entityAttributes.BaseType);
+		if (!parserContext.allInheritedEntityTypes.includes(entityName)) parserContext.allInheritedEntityTypes.push(entityName);
 	}
 	// adding blob element if entity has m:HasStream as true
 	const checkProperty = entityAttributes["allowedNamespaceAttributes"].filter(e => e["m.HasStream"] === 'true');
@@ -1643,16 +1717,25 @@ function _getServiceEntitites(entityJson = [], ignorePersistenceSkip, mockServer
 
 	for (let i = 0; i < 2; i++) {
 		if (entitiesWithNames[i].length) {
-			parsedEntities[i] = _parsingServiceEntities(entitiesWithNames[i],
-				ignorePersistenceSkip, mockServerUc, parserContext);
-			// adding @open annotation to BaseTypes
-			for (let j = 0; j < parsedEntities[i].length; j++) {
-				if (parserContext.allInheritedEntityTypes[_extractEntityFromNamespace(parserContext.allEntitySetMap[entitiesWithNames[i][j].name])] != undefined || parserContext.allInheritedEntityTypes[entitiesWithNames[i][j].name]) {
-					parsedEntities[i][j] = parsedEntities[i][j].replace(/}$/, ',"@open": true' + '}');
+			parsedEntities[i] = _parsingServiceEntities(entitiesWithNames[i], ignorePersistenceSkip, mockServerUc, parserContext);
+		}
+	}
+
+	// adding @open annotation to BaseTypes
+	for (let i = 0; i < parsedEntities.length; i++) {
+		for (let j = 0; j < parserContext.allInheritedEntityTypes.length ; j++) {
+			let entityName = parserContext.allInheritedEntityTypes[j];
+			const regEx = RegExp(`"${parserContext.serviceNamespace}.${entityName}": {`, 'g');
+			for (let k = 0; k < parsedEntities[i].length; k++) {
+				let entityString = parsedEntities[i][k];
+				if (entityString.match(regEx)) {
+					parsedEntities[i][k] = parsedEntities[i][k].replace(/}$/, ',"@open": true' + '}');
+					break;
 				}
 			}
 		}
 	}
+
 	// if entities from entity set and entity type both are parsed
 	if (parsedEntities[0] && parsedEntities[1])
 		return parsedEntities[0].concat(parsedEntities[1]);
@@ -1719,9 +1802,7 @@ function _generateEDMXJSON2CSN(jsonObj, ignorePersistenceSkip, mockServerUc, par
 	}
 
 	if (entityJson) {
-		definitions.push(
-			_getServiceEntitites(entityJson, ignorePersistenceSkip, mockServerUc, parserContext)
-		);
+		definitions.push(_getServiceEntitites(entityJson, ignorePersistenceSkip, mockServerUc, parserContext));
 	}
 
 	// If complex type exists