@sap/cds-dk 6.1.1 → 6.1.4

package/lib/import/odata/v2parser.js

@@ -448,38 +448,63 @@ function _getServiceEntityProperty(
 		propertyJson = propertyJson + '"key": true,\n';
 	}
 	if (isCollection === 1) {
-		propertyJson = propertyJson + '"items": { \n'
-	}
-	propertyJson = propertyJson + '"type":"' + cdsDataType + '"';
+		//if annotations to be added
+		if (edmxncdsdatatype[dataType + "_a"] && cdsDataType != "cds.Date") {
+			if (dataType === 'Edm.Stream') 
+				propertyJson = propertyJson + '"@Core.MediaType": "application/octet-stream",\n';
+			else 
+				propertyJson = propertyJson + '"@odata.Type": "' + dataType + '",\n';
+		}
 
-	//if annotations to be added
-	if (edmxncdsdatatype[dataType + "_a"] && cdsDataType != "cds.Date") {
-		if (dataType === 'Edm.Stream') 
-			propertyJson = propertyJson + ',\n"@Core.MediaType": "application/octet-stream"';
-		else 
-			propertyJson = propertyJson + ',\n"@odata.Type": "' + dataType + '"';
-	}
+		//adding precision in case of DateTime datatypes
+		if ((dataType === "Edm.DateTimeOffset" || dataType === "Edm.DateTime") && cdsDataType != "cds.Date") {
+			if (!precision || precision === -1) precision = 0;
+			propertyJson = propertyJson + '"@odata.Precision": ' + precision + ',\n';
+		}
 
-	if (length && length > 0) {
-		propertyJson = propertyJson + ',\n"length":' + length;
-	} else if (precision && precision > 0 && hasInvalidPrecision === false) {
-		propertyJson = propertyJson + ',\n"precision":' + precision;
-		if (scale && scale > 0) {
-			propertyJson = propertyJson + ',\n"scale":' + scale;
-		} else {
-			propertyJson = propertyJson + ',\n"scale":' + 0;
+		propertyJson = propertyJson + '"items": { \n'
+		propertyJson = propertyJson + '"type":"' + cdsDataType + '"';
+		
+		if (length && length > 0) {
+			propertyJson = propertyJson + ',\n"length":' + length;
+		} else if (precision && precision > 0 && hasInvalidPrecision === false) {
+			propertyJson = propertyJson + ',\n"precision":' + precision;
+			if (scale && scale > 0) {
+				propertyJson = propertyJson + ',\n"scale":' + scale;
+			} else {
+				propertyJson = propertyJson + ',\n"scale":' + 0;
+			}
 		}
+		propertyJson = propertyJson + '\n}'
 	}
+	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"';
+			else 
+				propertyJson = propertyJson + ',\n"@odata.Type": "' + dataType + '"';
+		}
 
-	//adding precision in case of DateTime datatypes
-	if ((dataType === "Edm.DateTimeOffset" || dataType === "Edm.DateTime") && cdsDataType != "cds.Date") {
-		if (!precision || precision === -1) precision = 0;
-		propertyJson = propertyJson + ',\n"@odata.Precision": ' + precision;
-	}
+		if (length && length > 0) {
+			propertyJson = propertyJson + ',\n"length":' + length;
+		} else if (precision && precision > 0 && hasInvalidPrecision === false) {
+			propertyJson = propertyJson + ',\n"precision":' + precision;
+			if (scale && scale > 0) {
+				propertyJson = propertyJson + ',\n"scale":' + scale;
+			} else {
+				propertyJson = propertyJson + ',\n"scale":' + 0;
+			}
+		}
 
-	if (isCollection === 1) {
-		propertyJson = propertyJson + '\n}'
+		//adding precision in case of DateTime datatypes
+		if ((dataType === "Edm.DateTimeOffset" || dataType === "Edm.DateTime") && cdsDataType != "cds.Date") {
+			if (!precision || precision === -1) precision = 0;
+			propertyJson = propertyJson + ',\n"@odata.Precision": ' + precision;
+		}
 	}
+
 	if (documentation != -1 && documentation) {
 		propertyJson = propertyJson + ',\n"doc":"' + documentation + '"';
 	}

package/lib/import/odata/v4parser.js

@@ -138,6 +138,13 @@ function _includeExternalNamespaceAnnotation(source, target) {
 
 function _typeWithCollections(property, type, isCollection) {
     if (isCollection === true) {
+        let typeKeys = Object.keys(type);
+        for (let i = 0; i < typeKeys.length; i++) {
+            if(typeKeys[i].startsWith("@")){
+                property[typeKeys[i]] = type[typeKeys[i]];
+                delete type[typeKeys[i]];
+            }
+        }
         property.items = type;
     } else {
         Object.assign(property, type);

package/lib/init/constants.js

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

package/lib/init/template/_merging/registry-mta.js

@@ -233,13 +233,10 @@ const approuterExtensibility = {
     in: 'routes',
     where: [{
         property: 'source',
-        isEqualTo: '^/extend/(.*)'
+        isEqualTo: '^/-/cds/.*'
     }, {
         property: 'destination',
         isEqualTo: 'mtx-api',
-    }, {
-        property: 'target',
-        isEqualTo: '$1',
     }, {
         property: 'authenticationType',
         isEqualTo: 'none',
@@ -251,13 +248,10 @@ const approuterExtensibilityJava = {
     in: 'routes',
     where: [{
         property: 'source',
-        isEqualTo: '^/extend/(.*)'
+        isEqualTo: '^/-/cds/.*'
     }, {
         property: 'destination',
         isEqualTo: 'mtx-api',
-    }, {
-        property: 'target',
-        isEqualTo: '$1',
     }, {
         property: 'authenticationType',
         isEqualTo: 'none',

package/lib/init/template/approuter/files/xs-app.json.hbs

@@ -1,6 +1,13 @@
 {
   "authenticationMethod": "route",
   "routes": [
+    {{#cap.isMultitenant}}
+    {
+      "source": "^/-/cds/.*",
+      "destination": "mtx-api",
+      "authenticationType": "none"
+    },
+    {{/cap.isMultitenant}}
     {
       "source": "^/app/(.*)$",
       "target": "$1",
@@ -14,13 +21,6 @@
       "destination": "srv-api",
       "authenticationType": "xsuaa",
       "csrfProtection": true
-    }{{#cap.isMultitenant}},
-    {
-      "source": "^/extend/(.*)",
-      "destination": "mtx-api",
-      "target": "$1",
-      "authenticationType": "none"
     }
-    {{/cap.isMultitenant}}
   ]
 }

package/lib/init/template/approuter/index.js

@@ -45,8 +45,8 @@ module.exports = class ApprouterTemplate extends TemplateBase {
         }
 
         const appPath = join(this.projectPath, projectDescriptor.ui.appPath || 'app')
-        const additions = isExtensible && isJava ? [approuterExtensibilityJava] :
-                          isExtensible && isNodejs ? [approuterExtensibility] : []
+        const additions = isExtensible && isJava ? [{ ...approuterExtensibilityJava, at: 0 }] :
+                          isExtensible && isNodejs ? [{ ...approuterExtensibility, at: 0 }] : []
         await this.templateUtil.mergeJSON(
             `${appPath}/xs-app.json`,
             `${__dirname}/files/xs-app.json.hbs`,

package/lib/init/template/data/index.js

@@ -148,9 +148,8 @@ function getNamespace(csn, artifactName) {
 
   // First step is not a namespace (we faked those in the CSN)
   // No subsequent step can be a namespace then
-  if (art && art.kind !== 'namespace') {
+  if (art && art.kind !== 'namespace' && art.kind !== 'context')
     return null;
-  }
 
 
   for (let i = 1; i < parts.length; i++) {
@@ -159,9 +158,8 @@ function getNamespace(csn, artifactName) {
     seen = `${seen}.${parts[i]}`;
     // This might not be - if it isn't, return the result.
     const currentArtifact = csn.definitions[seen];
-    if (currentArtifact && currentArtifact.kind !== 'namespace') {
+    if (currentArtifact && currentArtifact.kind !== 'namespace' && currentArtifact.kind !== 'context')
       return previousArtifactName;
-    }
   }
   // We came till here - so the full artifactName is a namespace
   return artifactName;

package/lib/init/template/nodejs/files/package.json.hbs

@@ -6,7 +6,7 @@
   "license": "UNLICENSED",
   "private": true,
   "dependencies": {
-    "@sap/cds": ">=5",
+    "@sap/cds": "^6",
     "express": "^4"
   },
   "devDependencies": {

package/lib/init/util/templateUtil.js

@@ -174,7 +174,7 @@ module.exports = class TemplateUtil {
             } else if (YAML.isPair(node) && node.value?.items) {
                 collectionStack.unshift(node.value)
             } else if (YAML.isScalar(node) && semantics.forceOverwrite && templateNode) {
-                node.value = templateNode.value
+                node.value = templateNode.value ?? templateNode.items?.[0]?.value?.value
             }
 
             if (node.items) {
@@ -293,13 +293,13 @@ module.exports = class TemplateUtil {
             mergeCollection: (targetNode, templateNode) => {
                 if (YAML.isSeq(templateNode)) {
                     let [,parent] = collectionStack
-                    additions?.filter(existence => {
-                            if (typeof existence.in === 'string' || Array.isArray(existence.in) && typeof existence.in[0] === 'string') return true
-                            const inExistence = Array.isArray(existence.in) ? existenceMap.get(existence.in[0].ref) : existenceMap.get(existence.in.ref)
+                    additions?.filter(addition => {
+                            if (typeof addition.in === 'string' || Array.isArray(addition.in) && typeof addition.in[0] === 'string') return true
+                            const inExistence = Array.isArray(addition.in) ? existenceMap.get(addition.in[0].ref) : existenceMap.get(addition.in.ref)
                             return inExistence?.node === parent
                         })
-                        .filter(existence => {
-                            const keyPath = typeof existence.in === 'string' ? existence.in : Array.isArray(existence.in) && typeof existence.in[0] === 'string' ? existence.in[0] : existence.in[1]
+                        .filter(addition => {
+                            const keyPath = typeof addition.in === 'string' ? addition.in : Array.isArray(addition.in) && typeof addition.in[0] === 'string' ? addition.in[0] : addition.in[1]
                             const keys = keyPath.split('.')
                             if (keys.length > collectionStack.length + 1) return
                             if (keys.length > 1) parent = collectionStack[keys.length]
@@ -308,9 +308,9 @@ module.exports = class TemplateUtil {
                         .filter(({ ref }) => {
                             return !existenceMap.get(ref)
                         })
-                        .forEach(({ ref }) => {
+                        .forEach(({ ref, at }) => {
                             const templateNode = templateExistenceMap.get(ref).node
-                            targetNode.add(templateNode)
+                            at !== undefined ? targetNode.items.splice(at, 0, templateNode) : targetNode.add(templateNode)
                         })
                 }
             },

package/lib/k8s/ChartAdder.js

@@ -33,9 +33,11 @@ class ChartAdder {
     }
 
     async copySchema() {
-        let schema = JSON.parse(await fs.readFile(path.join(this.resources, 'values.schema.json'), { encoding: 'utf8' }))
+        let valuesSchema = JSON.parse(await fs.readFile(path.join(this.resources, 'schemas', 'values.schema.json'), { encoding: 'utf8' }))
+        let valuesRootSchema = JSON.parse(await fs.readFile(path.join(this.resources, 'schemas', 'values.root.schema.json'), { encoding: 'utf8' }))
 
-        await this.builder.writeChartFile('values.schema.json', JSON.stringify(schema, null, 4));
+        await this.builder.writeChartFile('values.schema.json', JSON.stringify(valuesSchema, null, 4));
+        await this.builder.writeChartFile('values.root.schema.json', JSON.stringify(valuesRootSchema, null, 4));
     }
 
     async addChartValues() {

package/lib/k8s/ChartBuilder.js

@@ -53,7 +53,7 @@ class ChartBuilder {
         } else {
 
             const header = `
-# yaml-language-server: $schema=./values.schema.json
+# yaml-language-server: $schema=./values.root.schema.json
 
 `
             data = header + data;

package/lib/k8s/resources/helm/chart/schemas/values.root.schema.json

@@ -0,0 +1,11 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema",
+    "allOf": [{ "$ref": "./values.schema.json" }],
+    "properties": {
+        "srv": {
+            "$id": "#/properties/srv",
+            "description": "Deployment",
+            "$ref": "./charts/web-application/values.schema.json"
+        }
+    }
+}

package/lib/k8s/resources/helm/chart/{values.schema.json → schemas/values.schema.json}

@@ -124,6 +124,21 @@
                 "resources": {
                     "$id": "#/properties/hana_deployer/resources",
                     "$ref": "#/definitions/Resources"
+                },
+                "env": {
+                    "$id": "#/properties/hana_deployer/env",
+                    "description": "Key-value map of environment variables, which should be added to the Pod spec.",
+                    "type": "object",
+                    "patternProperties": {
+                        "^[-._a-zA-Z][-._a-zA-Z0-9]*$": {
+                            "$comment": "regex above copied from https://github.com/kubernetes/kubernetes/blob/ea0764452222146c47ec826977f49d7001b0ea8c/staging/src/k8s.io/apimachinery/pkg/util/validation/validation.go#L402",
+                            "not": {
+                                "type": ["null", "object", "array"]
+                            }
+                        }
+                    },
+                    "additionalProperties": false,
+                    "default": {}
                 }
             }
         },
@@ -150,6 +165,21 @@
                     "$id": "#/properties/html5_apps_deployer/resources",
                     "$ref": "#/definitions/Resources"
                 },
+                "env": {
+                    "$id": "#/properties/html5_apps_deployer/env",
+                    "description": "Key-value map of environment variables, which should be added to the Pod spec.",
+                    "type": "object",
+                    "patternProperties": {
+                        "^[-._a-zA-Z][-._a-zA-Z0-9]*$": {
+                            "$comment": "regex above copied from https://github.com/kubernetes/kubernetes/blob/ea0764452222146c47ec826977f49d7001b0ea8c/staging/src/k8s.io/apimachinery/pkg/util/validation/validation.go#L402",
+                            "not": {
+                                "type": ["null", "object", "array"]
+                            }
+                        }
+                    },
+                    "additionalProperties": false,
+                    "default": {}
+                },
                 "backendDestinations": {
                     "$id": "#/properties/html5_apps_deployer/backendDestinations",
                     "title": "Backend Destinations for HTML5 Application",

package/lib/lint/io.js

@@ -63,7 +63,6 @@ module.exports = {
     const isFilePath = typeof configIn === "string";
     if (isFilePath) {
       if (await fsUtil.pathExists(configIn)) {
-        console.log('+++', configIn)
         configContents = (await this.readEslintConfig(configIn)) || {};
       }
     } else {