@sap/cds-dk 7.2.0 → 7.3.1

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,14 @@ 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')
+})
+
+// set build API, potentially removing the old API facade from sap/cds 7
+delete cds.__proto__?.build
+cds.extend (cds.constructor) .with (class {
+  get build() { return super.build = require('./build') }
+})

package/lib/init/constants.js

@@ -4,7 +4,7 @@ module.exports = {
     COMMAND_INIT: 'init',
     COMMAND_ADD: 'add',
 
-    MAVEN_ARCHETYPE_VERSION: '2.2.0',
+    MAVEN_ARCHETYPE_VERSION: '2.3.0',
 
     OPTIONS: Object.freeze({
         JAVA: 'java',
@@ -24,6 +24,7 @@ module.exports = {
         EXTENSIBILITY: 'extensibility',
         XSUAA: 'xsuaa',
         HANA: 'hana',
+        POSTGRES: 'postgres',
         SQLITE: 'sqlite',
         H2: 'h2',
         ENTERPRISE_MESSAGING: 'enterprise-messaging',
@@ -38,7 +39,9 @@ module.exports = {
         LINT_GLOBAL: 'lint:global',
         LINT_DEV: 'lint:dev',
         HELM: 'helm',
-        TYPER: 'typer'
+        TYPER: 'typer',
+        HTML5_REPO: 'html5-repo',
+        NOTIFICATIONS: 'notifications'
     }),
 
     PROJECT_TYPE: Object.freeze({ nodejs: 1, java: 2, unknown: 3 }),

package/lib/init/index.js

@@ -126,9 +126,8 @@ module.exports = class CDSGenerator {
     }
 
     async stepInit(projectName, options) {
-
-        if (!cds.cli?.command) {
-            // called from CAP generator
+        if (options) {
+            // called from CAP generator with options
             cds.cli = {
                 command: COMMAND_INIT,
                 // keep caller independent from internal names

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

@@ -112,6 +112,17 @@ const hdiContainer = {
     }]
 }
 
+const notificationTypesDeployer = {
+    in: 'modules',
+    where: [{
+        property: 'name',
+        isEqualTo: 'notification-content-deployment'
+    }, {
+        property: 'type',
+        isEqualTo: 'nodejs'
+    }]
+}
+
 const serviceManager = {
     in: 'resources',
     where: [{
@@ -126,6 +137,25 @@ const serviceManager = {
     }]
 }
 
+const postgres = {
+    in: 'resources',
+    where: [{
+        property: 'parameters.service',
+        isEqualTo: 'postgresql-db',
+    }]
+}
+
+const postgresDeployer = {
+    in: 'modules',
+    where: [{
+        property: 'type',
+        isEqualTo: 'nodejs',
+    }, {
+        property: 'path',
+        isEqualTo: 'gen/pg',
+    }]
+}
+
 const saasRegistry = {
     in: 'resources',
     where: [{
@@ -254,7 +284,10 @@ module.exports = {
     enterpriseMessaging,
     hdbDeployer,
     hdiContainer,
+    notificationTypesDeployer,
     serviceManager,
+    postgres,
+    postgresDeployer,
     saasRegistry,
     redis,
     srvApi4,

package/lib/init/template/approuter/files/mta.yaml.hbs

@@ -19,7 +19,7 @@ modules:
 
   - name: {{appName}}
     type: approuter.nodejs
-    path: {{& approuterPath }}
+    path: {{& appPath}}
     parameters:
       keep-existing-routes: true
       disk-quota: 256M

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

@@ -3,7 +3,7 @@ const { exists } = cds.utils
 const { join } = require('path')
 const { readProject } = require('../../util/projectReader')
 const { mergeJSON, mergeYAML, sort } = require('../../util/merge')
-const { XSUAA, KIBANA } = require('../../constants').OPTIONS
+const { XSUAA, KIBANA, HTML5_REPO } = require('../../constants').OPTIONS
 const {
     srvNode4, srvJava4, mtxSidecar4, approuter, // Modules
     xsuaa, // BTP Services
@@ -16,8 +16,7 @@ const { copyAndTrack, parseMd5File, writeMd5File } = require('../../util/md5')
 module.exports = class ApprouterTemplate extends require('../templateBase') {
 
     static hasFacet(env) {
-        return exists(join(env.folders.app, 'router', 'xs-app.json')) ||
-               exists(join(env.folders.app, 'xs-app.json'))
+        return exists(join(env.folders.app, 'xs-app.json'))
     }
 
     getDependencies() {
@@ -25,20 +24,20 @@ module.exports = class ApprouterTemplate extends require('../templateBase') {
     }
 
     getRelatedFacets() {
-        return [KIBANA]
+        return [KIBANA, HTML5_REPO]
     }
 
     async run() {
-        const { approuterPath } = await readProject()
-        const appPackageJSONPath = join(approuterPath, 'package.json')
+        const { appPath = 'app' } = await readProject()
+        const appPackageJSONPath = join(appPath, 'package.json')
         await mergeJSON(appPackageJSONPath, join(__dirname, 'files', 'package.json'))
         await sort(appPackageJSONPath, 'dependencies')
-        await mergeJSON(join(approuterPath, 'default-env.json'), join(__dirname, 'files', 'default-env.json'))
+        await mergeJSON(join(appPath, 'default-env.json'), join(__dirname, 'files', 'default-env.json'))
     }
 
     async runDependentMerging(context = {}) {
         const project = await readProject()
-        const { isNodejs, isJava, isExtensible, isMultitenant, hasMta, hasHelm, srvPath, approuterPath } = project
+        const { isNodejs, isJava, isExtensible, isMultitenant, hasMta, hasHelm, srvPath, appPath } = project
 
         if (hasMta) {
             const srv = (isNodejs ? srvNode4 : srvJava4)(srvPath)
@@ -115,9 +114,10 @@ module.exports = class ApprouterTemplate extends require('../templateBase') {
             }
 
             if (isIndependentCommand) await writeMd5File(join('chart', '.cds-add-helm-files.md5'), context.newTrackingData);
+
         }
 
-        const xsAppPath = join(approuterPath, 'xs-app.json')
+        const xsAppPath = join(appPath, 'xs-app.json')
         const additions = isExtensible ? [{ ...approuterExtensibility, at: 0 }] : []
         await mergeJSON(xsAppPath, join(__dirname, 'files', 'xs-app.json.hbs'), project, { additions })
     }

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

@@ -1,6 +1,6 @@
 const { join } = require('path')
 const { readProject } = require('../../util/projectReader')
-const { mergeJSON, mergeYAML } = require('../../util/merge')
+const { mergeYAML } = require('../../util/merge')
 const { copyAndTrack, parseMd5File, writeMd5File } = require('../../util/md5')
 const { srvJava4, srvNode4, connectivity } = require('../_merging/registry-mta')
 
@@ -11,9 +11,10 @@ module.exports = class ConnectivityTemplate extends require('../templateBase') {
     }
 
     async run() {
-        const project = await readProject()
-        const { configFile } = project
-        await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), project)
+        // Disable setting cds.requires.connectivity for now.
+        // const project = await readProject()
+        // const { configFile } = project
+        // await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), project)
     }
 
     async runDependentMerging(context = {}) {

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

@@ -22,7 +22,7 @@ module.exports = class DestinationTemplate extends require('../templateBase') {
 
     async runDependentMerging(context = {}) {
         const project = await readProject()
-        const { isJava, hasHelm, hasDestination, hasMta, srvPath, hasHtml5Repo } = project
+        const { isJava, hasHelm, hasDestination, hasMta, srvPath } = project
 
         if (hasMta) {
             const srv = (isJava ? srvJava4 : srvNode4)(srvPath)
@@ -36,7 +36,6 @@ module.exports = class DestinationTemplate extends require('../templateBase') {
 
         if (hasHelm) {
             const binding = hasDestination && { srv: { bindings: { destination: { serviceInstanceName: 'destination' }}}}
-            const html5Binding = hasHtml5Repo && { 'html5-apps-deployer': { bindings: { destination: { serviceInstanceName: 'destination' }}}}
 
             //in case facet is being added to the already exisiting charts folder
             let isIndependentCommand = false
@@ -48,13 +47,11 @@ module.exports = class DestinationTemplate extends require('../templateBase') {
                 join('chart', 'values.yaml'),
                 {
                     ...binding,
-                    ...html5Binding,
                     destination: {
                         serviceOfferingName: 'destination',
                         servicePlanName: 'lite',
                         parameters: {
-                            version: '1.0.0',
-                            ...(hasHtml5Repo) && { HTML5Runtime_enabled: true }
+                            version: '1.0.0'
                         }
                     }
                 }

package/lib/init/template/helm/subcharts/content-deployment/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
-name: content-deployment
 description: A Helm Chart for creating a Content Deployment job
-type: application
-version: 0.1.0
+name: content-deployment
 sources:
-- "https://github.tools.sap/unified-runtime/content-deployment"
+- https://github.tools.sap/unified-runtime/content-deployment
+type: application
+version: 1.3.0

package/lib/init/template/helm/subcharts/content-deployment/templates/_helpers.tpl

@@ -118,6 +118,8 @@ Name of the imagePullSecret
 {{- $ips.global.name }}
 {{- else if or $ips.local.dockerconfigjson $ips.global.dockerconfigjson }}
 {{- include "content-deployment.internal.fullname" . }}
+{{- else }}
+{{- "image-pull-secret" }}
 {{- end }}
 {{- end }}
 
@@ -128,9 +130,9 @@ Calculate the final image name
 {{- $tag := .Values.image.tag | default .Values.global.image.tag | default "latest" }}
 {{- $registry := .Values.image.registry | default .Values.global.image.registry }}
 {{- if $registry }}
-{{- $registry | trimSuffix "/" }}/{{ .Values.image.repository }}:{{ $tag }}
+{{- $registry | trimSuffix "/" | trimPrefix "https://" }}/{{ .Values.image.repository | trimSuffix "/" }}:{{ $tag }}
 {{- else }}
-{{- .Values.image.repository }}:{{ $tag }}
+{{- .Values.image.repository | trimSuffix "/" | trimPrefix "https://" }}:{{ $tag }}
 {{- end }}
 {{- end }}
 

package/lib/init/template/helm/subcharts/content-deployment/templates/job.yaml

@@ -50,15 +50,16 @@ spec:
             drop:
             - ALL
           privileged: false
+          runAsNonRoot: true
+          {{- if .Values.runAsUser }}
+          runAsUser: {{ .Values.runAsUser }}
+          {{- end }}
           readOnlyRootFilesystem: false
         volumeMounts:
         - mountPath: /tmp
           name: tmp
         {{- include "content-deployment.internal.serviceMounts" . | nindent 8 }}
       restartPolicy: OnFailure
-      securityContext:
-        runAsNonRoot: true
-        runAsUser: 1000
       volumes:
       - name: tmp
         emptyDir: {}