@sap/cds-dk 4.4.2 → 4.5.4

package/lib/import/index.js

@@ -35,45 +35,42 @@ async function isValidInputFile(inputFileLoc) {
 	}
 	else if (inputFileLoc.endsWith(".edmx") || inputFileLoc.endsWith(".xml")) {
 		file = fileResolved;
+		defaultFileName = file;
 	} else {
 		throw new Error(messages.INVALID_INPUT_FILE);
 	}
 	return file;
 }
 
-function validateAndComputeOutputFilePath(outputFileLoc) {
-	let filePath, index, extension;
+function validateAndComputeOutputFilePath(outputFileLoc, as) {
+	let index, extension, expectedExtension, supportedExtension;
 	if (typeof(outputFileLoc) !== 'boolean') {
 		index = outputFileLoc.lastIndexOf(".");
 		extension = outputFileLoc.substring(index + 1);
+		expectedExtension = (as) ? common.getSuffix(as) : "csn";
+		supportedExtension = (index > 0) ? common.supportedFormats().includes(extension) : false;
 	}
+
 	if (outputFileLoc === true || // if output file is not mentioned
+		outputFileLoc[0] === "-" || // if output file is missing and "--as" is considered as output file
 		outputFileLoc.trim() === "") {
 		throw new Error(messages.SPECIFY_OUTPUT_FILE);
-	} else if (outputFileLoc.endsWith(".json") || outputFileLoc.endsWith(".csn")) {
-		filePath = outputFileLoc;
-	} else if (index > 0 &&
-		!extension.endsWith("/") && // to ignore "../test/lib/import/output/tempOutput/"
-		!extension.endsWith("\\") && // to ignore "c:\windows\output\test\"
-		extension !== 'json' &&
-		extension !== 'csn') {
-		// Output file extension is not either .json or .csn ("test.abcde", "./srv/external/test.abcde")
+	} else if (index > 0 && !supportedExtension) { 
+		// extension not supported, eg., "test.abs", "./sv/external.test.abcs", "./a."
 		throw new Error(messages.INVALID_OUTPUT_FILE);
-	} else if (!outputFileLoc.endsWith(".json") &&
-		!outputFileLoc.endsWith(".csn") &&
-		!outputFileLoc.endsWith("\\") &&
-		!outputFileLoc.endsWith("/")) {
-		// Output file extension is not mentioned ("./srv/external/test", "test", "c:\windows\output\test")
-		filePath = outputFileLoc + ".csn";
-	} else { // File name not specified ("./srv/external/", "c:\windows\output\test\")
-		if (outputFileLoc.endsWith("/") || outputFileLoc.endsWith("\\")) {
-			filePath = outputFileLoc + _getDefaultFileName();
-		} else {
-			filePath = outputFileLoc + "/" + _getDefaultFileName();
-		}
+	} else if (index > 0 && !as && extension != "json" && extension != "csn") {
+		// --as option is not provided but output file is like: "test.cds", "./srv/external/test.cds"
+		throw new Error(messages.INCORRECT_EXTENSION);
+	} else if (index > 0 && as && extension != expectedExtension){ 
+		// extension not supported by --as option, e.g., "cds import <file> --out test.yml --as cds"
+		throw new Error(messages.OUTPUT_FILE_MISMATCH);
+	} else if (supportedExtension || (!outputFileLoc.endsWith("\\") && !outputFileLoc.endsWith("/"))) {
+		// eg., "./a.csn", "tst.cds", "./srv/external/test", "test", "c:\windows\output\test"
+		return outputFileLoc;
+	} else if (outputFileLoc.endsWith("/") || outputFileLoc.endsWith("\\")){ 
+		// File name not specified ("./srv/external/", "c:\windows\output\test\") 
+		return outputFileLoc + path.parse(defaultFileName).name;
 	}
-
-	return filePath;
 }
 
 async function getMetadataFromFile(path) {
@@ -135,9 +132,9 @@ async function edmx2csn(edmx, filename, context) {
     if (multipleSchemas.test(edmx)) {
         edmx = _convertEDMXWithMultipleSchemas(edmx, multipleSchemas, namespace);
     }
-	let csn = await generateCSN(edmx, false, true, context);
+	let csn = await generateCSN(edmx, true, context);
 	if (filename) {
-        // Replace namespace by given filename in the csn file instead of edmx file
+		// Replace namespace by given filename in the csn file instead of edmx file
         const re = RegExp(`([("/])${namespace}([/").])`, 'g');
         const fn = `$1${path.parse(filename).name}$2`;
 		csn = csn.replace(re, fn);
@@ -154,7 +151,7 @@ async function _generateEDMX2JSON(edmx) {
 	return JSON.parse(cjson);
 }
 
-async function generateCSN(edmx, ignorePersistenceSkip, mockServerUc, context) {
+async function generateCSN(edmx, mockServerUc, context) {
 	let csn;
 	let odataVersion;
 	let edmx2jsonModel;
@@ -167,7 +164,6 @@ async function generateCSN(edmx, ignorePersistenceSkip, mockServerUc, context) {
 		return new Promise(function getCsn(resolve, reject) {
 			csn = edmxv2CSN.getEdmxv2CSN(
 				edmx2jsonModel,
-				ignorePersistenceSkip,
 				mockServerUc
 			);
 			if (csn) {
@@ -181,24 +177,12 @@ async function generateCSN(edmx, ignorePersistenceSkip, mockServerUc, context) {
 		if(context){
 			context.oDataVersion = "V4";
 		}
-		return edmxv4CSN.getEdmxv4CSN(edmx, ignorePersistenceSkip, mockServerUc);
+		return edmxv4CSN.getEdmxv4CSN(edmx, mockServerUc);
 	}
 	return new Promise(function invalidFile(resolve, reject) {
 		reject(new Error(messages.INVALID_EDMX_METADATA));
 	});
 }
-
-function _getDefaultFileName() {
-	let nameSpace;
-	if (defaultFileName === undefined) {
-		nameSpace = edmxv2CSN.getNamespace();
-		if (nameSpace) {
-			defaultFileName = nameSpace + ".csn"; //".json";
-		}
-	}
-	return defaultFileName;
-}
-
 async function saveCSNModel(csnDataModel, fileLoc) {
 	await fs.write(fileLoc, csnDataModel, "utf-8");
 }

package/lib/import/message.js

@@ -1,14 +1,18 @@
 "use strict";
 
 const messages = {
-	INVALID_EDMX_METADATA: "The OData model is not valid. Specify the correct OData model.",
-	INVALID_OUTPUT_FILE: "Please provide an output file with either .json or .csn extension.",
-	MISSING_ENTITIES: "There are no entities in the OData model. Specify the correct OData model in the provided file.",
-	SPECIFY_INPUT_FILE: "Specify an input file that exists.",
-	SPECIFY_OUTPUT_FILE: "Specify an output file.",
+	INVALID_EDMX_METADATA: 'The OData model is not valid. Specify the correct OData model.',
+	INVALID_OUTPUT_FILE: 'Please provide an output file with one of these [cds, csn, json] file extension.',
+	MISSING_ENTITIES: 'There are no entities in the OData model. Specify the correct OData model in the provided file.',
+	SPECIFY_INPUT_FILE: 'Specify an input file that exists.',
+	SPECIFY_OUTPUT_FILE: 'Specify an output file or correct the output file path provided.',
 	MISSING_ENTITY_CONTAINER: 'There is no entity container in the OData model. Specify the correct OData model.',
 	MISSING_ENTITY_SETS: 'There are no entity sets in the OData model. Specify the correct OData model.',
-	INVALID_INPUT_FILE: 'Input file provided is not valid. Please provide a file with either .edmx or .xml extension.'
+	INVALID_INPUT_FILE: 'Input file provided is not valid. Please provide a file with either .edmx or .xml extension.',
+	FILE_MODIFIED: 'The file with the same name exists and is been modified. Use --force flag to forcefully overwrite the file.',
+	OUTPUT_FILE_MISMATCH: 'Specify the file extension that --as option supports.',
+	INVALID_AS_OPTION: 'For --as option, please specify one of these output file format [cds, csn, json].',
+	INCORRECT_EXTENSION: 'If --as option is not provided, then please provide either .json or .csn output file extension.',
 };
 
 function getMessages() {