@sap/cds-dk 8.6.1 → 8.7.1

package/lib/build/plugins/helm/files/subcharts/web-application/Chart.yaml

@@ -5,4 +5,4 @@ name: web-application
 sources:
 - https://github.tools.sap/unified-runtime/web-application
 type: application
-version: 1.20.0
+version: 1.22.0

package/lib/build/plugins/helm/files/subcharts/web-application/templates/_helpers.tpl

@@ -208,11 +208,11 @@ If release name contains chart name it will be used as service instance name.
 {{ .checkName }}:
 {{- if .checkValues.path }}
   httpGet:
-    path: {{ .checkValues.path }}
-    port: http
+    path: {{ tpl .checkValues.path .context }}
+    port: {{ .values.port | default .context.Values.port }}
 {{- else }}
   tcpSocket:
-    port: {{ .context.Values.port }}
+    port: {{ .values.port | default .context.Values.port}}
 {{- end }}
 {{- if eq .checkName "startupProbe" }}
   periodSeconds: 2

package/lib/build/plugins/helm/files/subcharts/web-application/templates/api-rule.yaml

@@ -20,7 +20,7 @@ spec:
     name: {{ include "web-application.fullname" . }}
     port: {{ .Values.port }}
   rules:
-    {{- toYaml .Values.expose.rules | nindent 4 }}
+    {{- tpl (toYaml .Values.expose.rules) $ | nindent 4 }}
   {{- if .Values.expose.corsPolicy }}
   corsPolicy:
     {{- toYaml .Values.expose.corsPolicy | nindent 4 }}

package/lib/build/plugins/helm/files/subcharts/web-application/templates/deployment.yaml

@@ -19,9 +19,8 @@ spec:
       {{- if .Values.istio }}
         sidecar.istio.io/inject: {{ .Values.istio.enabled | quote }}
       {{ end }}
-      annotations:
-        container.apparmor.security.beta.kubernetes.io/{{ include "web-application.name" . }}: runtime/default
         {{- if or .Values.annotations.deployment }}
+      annotations:
         {{- tpl (toYaml .Values.annotations.deployment) $ | nindent 8 }}
         {{- end }}
     spec:
@@ -73,9 +72,9 @@ spec:
         {{- if not (eq (len $envVars.vars) 0) }}
         {{- $envVars.vars | toYaml | nindent 8}}
         {{- end }}
-        {{ include "web-application.internal.healthCheck" (dict "checkName" "livenessProbe" "checkValues" .Values.health.liveness "context" $) | nindent 8}}
-        {{ include "web-application.internal.healthCheck" (dict "checkName" "readinessProbe" "checkValues" .Values.health.readiness "context" $) | nindent 8}}
-        {{ include "web-application.internal.healthCheck" (dict "checkName" "startupProbe" "checkValues" .Values.health.liveness "context" $) | nindent 8}}
+        {{ include "web-application.internal.healthCheck" (dict "checkName" "livenessProbe" "checkValues" .Values.health.liveness "values" .Values.health "context" $) | nindent 8}}
+        {{ include "web-application.internal.healthCheck" (dict "checkName" "readinessProbe" "checkValues" .Values.health.readiness "values" .Values.health "context" $) | nindent 8}}
+        {{ include "web-application.internal.healthCheck" (dict "checkName" "startupProbe" "checkValues" .Values.health.liveness "values" .Values.health "context" $) | nindent 8}}
         volumeMounts:
         - name: tmp
           mountPath: /tmp
@@ -101,6 +100,8 @@ spec:
           readOnlyRootFilesystem: {{ .Values.readOnlyRootFilesystem | default false }}
           seccompProfile:
             type: RuntimeDefault
+          appArmorProfile:
+            type: RuntimeDefault
       {{- range $key, $sidecar := .Values.sidecars }}
       - image: {{ include "web-application.internal.imageName" (dict "image" $sidecar.image "context" $) }}
       {{- if ( or $.Values.global.imagePullPolicy $sidecar.imagePullPolicy ) }}
@@ -143,6 +144,11 @@ spec:
         resources:
           {{- toYaml $sidecar.resources | nindent 10 }}
         {{- end }}
+        {{- if $sidecar.health }}
+        {{ include "web-application.internal.healthCheck" (dict "checkName" "livenessProbe" "checkValues" $sidecar.health.liveness "values" $sidecar.health "context" $) | nindent 8}}
+        {{ include "web-application.internal.healthCheck" (dict "checkName" "readinessProbe" "checkValues" $sidecar.health.readiness "values" $sidecar.health "context" $) | nindent 8}}
+        {{ include "web-application.internal.healthCheck" (dict "checkName" "startupProbe" "checkValues" $sidecar.health.liveness "values" $sidecar.health "context" $) | nindent 8}}
+        {{- end }}
         securityContext:
           allowPrivilegeEscalation: false
           capabilities:
@@ -156,6 +162,8 @@ spec:
           readOnlyRootFilesystem: {{ $.Values.readOnlyRootFilesystem | default false }}
           seccompProfile:
             type: RuntimeDefault
+          appArmorProfile:
+            type: RuntimeDefault
       {{- end }}
       restartPolicy: Always
       terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}

package/lib/build/plugins/helm/files/subcharts/web-application/templates/service-binding.yaml

@@ -28,6 +28,7 @@ spec:
   {{- end }}
   {{- if $mergedParams.parametersFrom }}
   parametersFrom: {{ tpl ($mergedParams.parametersFrom | toYaml) $ | nindent 4 }}
+  watchParametersFromChanges: true
   {{- end }}
   {{- if $mergedParams.credentialsRotationPolicy }}
   credentialsRotationPolicy: {{ $mergedParams.credentialsRotationPolicy | toYaml | nindent 4 }}

package/lib/build/plugins/helm/files/subcharts/web-application/values.schema.json

@@ -72,9 +72,7 @@
         },
         "port": {
             "$id": "#/properties/port",
-            "type": "integer",
-            "minimum": 1,
-            "maximum": 65535,
+            "$ref": "#/definitions/Port",
             "default": 8080
         },
         "serviceAccountName": {
@@ -333,18 +331,7 @@
         },
         "health": {
             "$id": "#/properties/health",
-            "type": "object",
-            "additionalProperties": false,
-            "properties": {
-                "liveness": {
-                    "$id": "#/properties/health/properties/liveness",
-                    "$ref": "#/definitions/Probe"
-                },
-                "readiness": {
-                    "$id": "#/properties/health/properties/readiness",
-                    "$ref": "#/definitions/Probe"
-                }
-            }
+            "$ref": "#/definitions/Health"
         },
         "startupTimeoutSeconds": {
             "$id": "#/properties/startupTimeoutSeconds",
@@ -1193,6 +1180,10 @@
                             "title": "User to be used for running the container.",
                             "type": "integer",
                             "minimum": 1
+                        },
+                        "health": {
+                            "$id": "#/properties/health",
+                            "$ref": "#/definitions/Health"
                         }
                     }
                 }
@@ -1313,6 +1304,22 @@
             "type": "string",
             "enum": ["Always", "IfNotPresent", "Never"]
         },
+        "Health": {
+            "title": "Health Configuration",
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+                "port": {
+                    "$ref": "#/definitions/Port"
+                },
+                "liveness": {
+                    "$ref": "#/definitions/Probe"
+                },
+                "readiness": {
+                    "$ref": "#/definitions/Probe"
+                }
+            }
+        },
         "Probe": {
             "title": "Probe configuration",
             "type": "object",
@@ -1339,6 +1346,12 @@
                     "minimum": 1
                 }
             }
+        },
+        "Port": {
+            "title": "Port configuration",
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 65535
         }
     }
 }

package/lib/build/plugins/helm/files/subcharts/web-application/values.yaml

@@ -14,7 +14,7 @@ global:
     _internal:
       web-application:
         versions:
-          1.20.0: true
+          1.22.0: true
 ## Will be used instead of the `.Chart.Name`, e.g. when generating the Deployment name.
 # nameOverride: name
 
@@ -94,6 +94,8 @@ availability:
         - pod-template-hash
 # Health-check configuration
 health:
+  ## If the probes are using ports other than the application port, specify them here.
+  # port: 8081
   # Liveness-probe configuration.
   liveness:
     # HTTP path used by Kubernetes, to perform liveness-probe calls.
@@ -286,6 +288,20 @@ annotations:
 #     envFrom:
 #       - configMapRef:
 #           name: my-configmap1
+#     health:
+#         port: 8082
+#       liveness:
+#         path: /healthz
+#         periodSeconds: 3
+#         failureThreshold: 5
+#         successThreshold: 1
+#         timeoutSeconds: 1
+#       readiness:
+#         path: /healthz
+#         periodSeconds: 3
+#         failureThreshold: 5
+#         successThreshold: 1
+#         timeoutSeconds: 1
 #   sidecar-2:
 #     image:
 #       repository: gcr.io/my-sidecar-2
@@ -305,7 +321,12 @@ annotations:
 #     envFrom:
 #       - configMapRef:
 #           name: my-configmap1
+
+# Optional configuration for creating Horizontal Pod Autoscaling
 hpa:
   enabled: false
   minReplicas: 1
   maxReplicas: 3
+  ## See https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/horizontal-pod-autoscaler-v2/#HorizontalPodAutoscalerSpec
+  # behavior: {}
+  # metrics: {}

package/lib/import/common.js

@@ -1,13 +1,15 @@
 /* eslint-disable no-prototype-builtins */
 'use strict';
 
+/** @type { import('@sap/cds') } */
+const cds = require('../cds');
 let convert = require('xml-js');
 let axios = require('axios');
 const messages = require("./message").getMessages();
-const cds = require('../cds');
 const { fs, path, write, mkdirp, exists, read } = cds.utils;
 const cdsCompiler = require('..').compile.to;
 const md5 = data => require('crypto').createHash('md5').update(data).digest('hex');
+const { info } = require("../util/term")
 
 let optionsMapping = {
     'keep-namespace': 'keepNamespace',
@@ -16,8 +18,9 @@ let optionsMapping = {
     'no-save': 'no_save'
 };
 
-let apiOptions = ['includeNamespaces', 'keepNamespace', 'beta'];
-let commonOptions = ['no_copy', 'no_save', 'out', 'dry', 'as', 'from', 'force', 'config', 'destination', 'group', 'name'];
+let apiOptions = ['includeNamespaces', 'keepNamespace'];
+let commonOptions = ['for', 'no_copy', 'no_save', 'out', 'dry', 'as', 'from', 'force', 'config', 'destination', 'group', 'name'];
+let usingStatements = [];
 
 async function generateEDMX2JSON(edmx) {
     let cjson = convert.xml2json(edmx, {
@@ -163,6 +166,7 @@ async function processOptions(cliOptions, options) {
             delete cliOptions[key];
         }
     }
+
     // segregating cli/odata options
     apiOptions.forEach(function (item) {
         if (cliOptions[item]) {
@@ -268,7 +272,18 @@ async function _generateChecksumValidate(dest, output, force) {
     return "/* checksum : " + currentChecksum + " */\n" + output;
 }
 
-async function _getResult(output, as, dest, force, kind) {
+// Modify the output to replace the using statements with the dependency services
+function _replaceUsingStatementsForDependent(output) {
+    let using = usingStatements.join('\n');
+    usingStatements = [];
+    let startIndex = output.indexOf('using');
+    let endIndex = output.indexOf(';', startIndex);
+    let usingStatement = output.substring(startIndex, endIndex+1);
+    output = output.replace(usingStatement, using);
+    return output;
+}
+
+async function _getResult(output, as, dest, force, kind, isDependent) {
     let extension = dest.substring(dest.lastIndexOf(".") + 1);
     as = (as === "cds") ? "cdl" : as;
 
@@ -286,6 +301,9 @@ async function _getResult(output, as, dest, force, kind) {
     if (as && as != "csn" && as != "json") {
         // cdsCompiler[as] will convert the csn output into various output formats
         output = cdsCompiler[as](output);
+        if (isDependent && kind === 'V4') {
+            output = _replaceUsingStatementsForDependent(output);
+        }
     }
 
     switch (as) {
@@ -304,52 +322,64 @@ async function _getResult(output, as, dest, force, kind) {
     return [output, dest];
 }
 
-async function _write(result, service, cwd) {
-    let dest, output, using, message, extension;
-    output = result[0];
-    dest = result[1];
-    await write(dest, output, "utf-8");
-    extension = dest.substring(dest.lastIndexOf('.'));
+function _printUsageHint(dest, service, cwd) {
+    const extension = dest.substring(dest.lastIndexOf('.'));
     dest = dest.replace(extension, '');
-     if (service.length > 1){
+    let using
+    if (service.length > 1){
         using = `using { ${service.join(', ')}} from './${path.relative(cds.env.folders.srv, dest).replace(/\\/g, '/')}'`;
-     }
-     else{
+    } else {
         using = `using { ${service} as external } from './${path.relative(cds.env.folders.srv, dest).replace(/\\/g, '/')}'`;
-     }
-    using = require('../util/term').info(using);
-    message = `[cds] - imported API to ${path.relative(cwd, dest)}
+    }
+    const message = `\n[cds] - imported API to ${path.relative(cwd, dest)}
 > use it in your CDS models through the like of:
 
-${using}
+${require('../util/term').info(using)}
 `;
-
     console.log(message);
 }
 
-async function _updatePackageJson(dest, services, kind, cwd, config, destination) {
+async function _updateNodeConfig(dest, services, kind, cwd, options) {
+    let config
+    if (typeof options.config === 'string') {
+        if (options.config.trim().startsWith('{')) {
+            config = JSON.parse(options.config.trim());
+        } else {
+            config = {};
+            options.config.trim().split(',').forEach(kv => {
+                const [key, val] = kv.split('=');
+                config[key] = val;
+            })
+            normalizeToDeepObject(config);
+        }
+    }
+
     // try to find package.json in the srv folder
     let package_json = _findPackageJson(path.resolve(cwd, dest), cwd);
-    let conf = {};
+    let pkgConf = {};
     if (package_json) {
-        conf = JSON.parse(await read(package_json, "utf-8"));
+        pkgConf = JSON.parse(await read(package_json, "utf-8"));
     } else {
         package_json = path.resolve(cwd, 'package.json');
     }
-    const requires = ['cds', 'requires'].reduce((p, n) => p[n] || (p[n] = {}), conf);
+
+    const requires = ['cds', 'requires'].reduce((p, n) => p[n] || (p[n] = {}), pkgConf);
     if (kind !== 'rest' && kind !== 'rfc') {
         kind = (kind === "V2") ? 'odata-v2' : 'odata';
     }
+
     // add destination configuration
-    if (!config && destination) {
-        config = { "[production]": { credentials: { destination } } };
+    if (!config && options.destination) {
+        const profile = options.for || 'production';
+        config = { [`[${profile}]`]: { credentials: { destination: options.destination } }};
     }
 
     let package_json_updated = false;
     for (let service of services) {
         // existing service configuration data can be updated, e.g. in case of delta imports
         const model = path.relative(cwd, dest).replace(/\\/g, '/'); // cds env must not be platform specific
-        const serviceConfig = { kind, model, ...config }
+        let serviceConfig = { kind, model, ...config }
+        if (options.for) serviceConfig = { [`[${options.for}]`]: serviceConfig };
         if (!requires[service]) {
             cds.env.requires[service] = requires[service] = serviceConfig;
             package_json_updated = true;
@@ -359,12 +389,44 @@ async function _updatePackageJson(dest, services, kind, cwd, config, destination
             }
         }
     }
+
     if (package_json_updated) {
-        await write(package_json, JSON.stringify(conf, null, '  '));
+        await write(package_json, JSON.stringify(pkgConf, null, '  '));
         console.log(`[cds] - updated ./package.json`);
     }
 }
 
+async function _updateJavaConfig(kind, serviceNames, csn, options={}) {
+    const mvn = require('../init/mvn')
+    for (let name of serviceNames) {
+        let type = kind
+        if (!options.from || options.from === 'edmx')  type = `odata-${kind.toLowerCase()}`
+        const javaOptions = {
+            name, type,
+            'destination.name': options.destination ?? name,
+        }
+        // if the name is not in the model, set the first/only service there as 'model', assuming only one was imported
+        if (!csn.definitions[name]) {
+            const srv = cds.reflect(csn).find('service')
+            if (srv)  javaOptions['service.model'] = srv.name
+        }
+
+        // normalize config object into our flat list of key-value pairs
+        if (typeof options.config === 'string') {
+            if (options.config.trim().startsWith('{')) {
+                const cfg = JSON.parse(options.config)
+                _flattenConfigInto(cfg, javaOptions)
+            } else {
+                options.config.trim().split(',').forEach(kv => {
+                    const [key, val] = kv.split('=')
+                    javaOptions[key] = val
+                })
+            }
+        }
+        await mvn.add('remote-service', javaOptions)
+    }
+}
+
 function _findPackageJson(dir, cwd) {
     const packageJsonPath = path.join(dir, 'package.json');
     if (fs.existsSync(packageJsonPath)) {
@@ -380,29 +442,96 @@ function _findPackageJson(dir, cwd) {
     return _findPackageJson(parentDir, cwd);
 }
 
-function _parseValidJsonConfig(config) {
-    try {
-        if (config) {
-            return JSON.parse(config);
+async function postProcess(filePath, options, csn, cwd) {
+    const services = _getServiceNames(csn);
+    let destFilePath;
+
+    if (options.isDependency || options.isDependent) {
+        destFilePath = path.resolve(cwd, options.out ? path.join(options.out, path.basename(filePath)) : path.join(cds.env.folders.srv, 'external', path.basename(filePath)));
+    } else {
+        destFilePath = path.resolve(cwd, options.out ? path.join(path.dirname(options.out), path.basename(filePath)) : path.join(cds.env.folders.srv, 'external', path.basename(filePath)));
+    }
+
+    if (options.out) {
+        options.out = _validateAndComputeOutputFilePath(options.out, options.as, destFilePath);
+        if (options.isDependency || options.isDependent) {
+            // output is a dirname in case of import with dependencies, then append the filename to it
+            let fileName = path.basename(filePath);
+            let index = fileName.lastIndexOf(".");
+            options.out = path.join(options.out, fileName.substring(0, index));
         }
-    } catch (error) {
-        throw new Error(messages.SPECIFY_CONFIG);
     }
-}
 
-async function postProcess(filePath, options, csn, cwd) {
-    const services = _getServiceNames(csn);
-    let config = _parseValidJsonConfig(options.config);
-    const destFilePath = path.resolve(cwd, options.out ? path.join(options.out, path.basename(filePath)) : path.join(cds.env.folders.srv, 'external', path.basename(filePath)));
-    if (options.out) options.out = _validateAndComputeOutputFilePath(options.out, options.as, destFilePath);
     const kind = options.inputFileKind;
-    const result = await _getResult(csn, options.as, options.out || destFilePath.replace(/\.[^.]+$/, ''), options.force, kind);
-    const written = options.dry || await _write(result, services, cwd);
-    const registered = options.dry || options.no_save || await _updatePackageJson(result[1].replace(/\.[^.]+$/, ''), services, kind, cwd, config, options.destination);
+    let result;
+    try {
+        result = await _getResult(csn, options.as, options.out || destFilePath.replace(/\.[^.]+$/, ''), options.force, kind, options.isDependent);  
+    } catch (error) {
+        if (options.isDependency && error.message === messages.FILE_MODIFIED) {
+            return console.log(info(`[cds] - skipping import of ${path.basename(filePath)} as it is already imported`));
+        } else {
+            throw error;
+        }
+    }
+
+    const [serviceCsn, csnFile] = result;
+
+    if (!options.dry && !options.no_save) {
+        if (cds.env['project-nature'] === 'java') {
+            await _updateJavaConfig(kind, services, csn, options)
+        } else {
+            await _updateNodeConfig(result[1].replace(/\.[^.]+$/, ''), services, kind, cwd, options);
+        }
+    }
+    if (!options.dry)
+        await write(csnFile, serviceCsn, "utf-8");
+
+    if (options.isDependency) {
+        if (services.length > 1){
+            usingStatements.push(`using { ${services.join(', ')}} from './${path.basename(csnFile)}';`);
+        } else {
+            usingStatements.push(`using { ${services} } from './${path.basename(csnFile)}';`);
+        }
+    }
+
+    _printUsageHint(csnFile, services, cwd);
+
     if (!options.dry && !options.no_copy)
         await _copyToSrvExternal(filePath, destFilePath, cwd);
-    if (options.dry) return console.log(result[0]);
-    return Promise.all([written, registered]);
+
+    if (options.dry)
+        return console.log(result[0]);
+}
+
+function _flattenConfigInto (config, target, prefix='') {
+    for (let each in config) {
+        if (typeof config[each] === 'object')  _flattenConfigInto (config[each], target, prefix + each + '.')
+        else target[prefix + each] = config[each]
+    }
+    return target
+}
+
+/**
+ * Normalizes an dot-separated keys in the object to a deep structure.
+ * Example is the SpringBoot config that allows dots in keys to express nested objects.
+ */
+function normalizeToDeepObject(obj) {
+    if (typeof obj !== 'object')  return obj
+    Object.keys(obj).forEach(k => {
+      const prop = k.split('.')
+      const last = prop.pop()
+      // and define the object if not already defined
+      const res = prop.reduce((o, key) => {
+        // define the object if not defined and return
+        return o[key] = o[key] ?? {}
+      }, obj)
+      res[last] = obj[k]
+      // recursively normalize
+      normalizeToDeepObject(obj[k])
+      // delete the original property from object if it was rewritten
+      if (prop.length)  delete obj[k]
+    })
+    return obj
 }
 
 async function identifyFile(filepath) {
@@ -454,5 +583,6 @@ module.exports = {
     postProcess,
     identifyFile,
     readEnvVariables,
-    processOptions
+    processOptions,
+    normalizeToDeepObject
 };

package/lib/import/importapi.js

@@ -64,7 +64,7 @@ async function cds_import_from_edmx(filepath, options = { keepNamespace: false }
     filepath = await common.isValidInputFile(path.resolve(process.cwd(), filepath));
     const src = await common.getContentFromFile(filepath);
     // takes the api specific options and reads it from env
-    let odataOptions = { include_namespaces: options.includeNamespaces, keep_namespace: options.keepNamespace, beta: options.beta};
+    let odataOptions = { include_namespaces: options.includeNamespaces, keep_namespace: options.keepNamespace};
     if (cds.env.import) {
         common.readEnvVariables(odataOptions, false);
     }

package/lib/import/message.js

@@ -37,8 +37,8 @@ const messages = {
 	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.',
 	COLLISION_DETECTED: `INFO: Element name collision detected. Adding suffix to affected type category.`,
-	SPECIFY_CONFIG: 'For --config option, please specify correct JSON Object.',
 	INVALID_ANNOTATION: 'Annotation element must have a Term attribute',
+	DEPENDENCY_NOT_SUPPORTED: '--dependencies option is only supported for OData V4 files, not for other imports.',
 };
 
 function getMessages() {

package/lib/import/odata/ParserContext.js

@@ -0,0 +1,46 @@
+// Singleton class to hold the parser context
+const MultiMap = require("./util/MultiMap");
+
+module.exports = class ParserContext {
+
+    static #instance = null;
+    
+    static getInstance(mockServerUc) {
+        if (!ParserContext.#instance) {
+            ParserContext.#instance = new ParserContext(mockServerUc);
+        }
+        return ParserContext.#instance;
+    }
+
+    static resetInstance() {
+        ParserContext.#instance = null;
+    }
+
+    constructor(mockServerUc) {
+        this.#initialize(mockServerUc);
+    }
+
+    #initialize(mockServerUc) {
+        this.unboundActions = {};
+        this.unboundFunctions = {};
+        this.entityTypes = [];
+        this.entityTypeOpenEntries = [];
+        this.complexTypeOpenEntries = [];
+        this.complexTypes = [];
+        this.enumTypes = [];
+        this.typeDefinitions = [];
+        this.entityContainerName = "";
+        this.entityToEntitySetMap = new MultiMap();
+        this.entityToSingletonMap = new MultiMap();
+        this.actionToActionImportMap = new MultiMap();
+        this.functionToFunctionImportMap = new MultiMap();
+        this.primarySchema = "";
+        this.schemaAliasToNamespace = {};
+        this.schemaToSchemaDataIndex = {};
+        this.vocabNamespaceToAlias = {};
+        this.entityToBoundActions = {};
+        this.entityToBoundFunctions = {};
+        this.entityContainerAnnotations = {};
+        this.mockServerUc = mockServerUc;
+    }
+}

package/lib/import/odata/index.js

@@ -6,6 +6,8 @@ const messages = require("../message").getMessages();
 let common = require("../common");
 const { path } = require('../../cds').utils;
 
+let namespaceFileObject = {};
+
 function getNamespaces(context) {
 	if (context.include_namespaces === "*") context.include_all_namespaces = true;
 	else if (typeof context.include_namespaces === 'string' && !context.include_namespaces.startsWith('-')) context.namespaces = context.include_namespaces.replace(/ /g, "").split(',');
@@ -73,9 +75,11 @@ async function edmx2csn(edmx, filename, context) {
 		edmx = _convertEDMXWithMultipleSchemas(edmx, multipleSchemas, namespace);
 	}
 	let csn = await _generateCSN(edmx, false, true, context);
-	const regex = /^[\p{Letter}\p{Nl}_]{1}[_\p{Letter}\p{Nl}\p{Nd}\p{Mn}\p{Mc}\p{Pc}\p{Cf}]{0,127}$/gu
-	// Regex checks for this condition “A-B” must start with a letter or underscore, followed by at most 127 letters, underscores or digits in the fileName
+
 	if (filename) {
+		// Regex checks for this condition “A-B” must start with a letter or underscore, followed by at most 127 letters, underscores or digits in the fileName
+		const regex = /^[\p{Letter}\p{Nl}_]{1}[_\p{Letter}\p{Nl}\p{Nd}\p{Mn}\p{Mc}\p{Pc}\p{Cf}]{0,127}$/gu
+		
 		/**
 		 * V4: <Schema Namespace="Full.Schema.Name" xmlns="http://docs.oasis-open.org/odata/ns/edm" Alias="aliasedValue">
 		 * V2: <Schema Namespace="Full.Schema.Name" xmlns="http://schemas.microsoft.com/ado/2008/09/edm" Alias="aliasedValue">
@@ -83,17 +87,22 @@ async function edmx2csn(edmx, filename, context) {
 		 * context.schemaNamespace is set to correct namespace value by the respective parsers
 		 */
 		if (context.schemaNamespace) {
-			namespace = context.schemaNamespace;	
+			namespaceFileObject[context.schemaNamespace] = filename;
+		} else {
+			namespaceFileObject[namespace] = filename;
 		}
-		// Replace namespace by given filename in the csn file instead of edmx file
-		const re = RegExp(`([("/])${namespace}([/").])`, 'g');
-		let name = path.parse(filename).name;
-		if (!(name.match(regex))) { // check if the filename is in the right format with the regex if not replace unaccepted characters with underscore (_)
-			name = name.replace(/^[^a-z\p{Nl}_]/gui, '_');
-			name = name.replace(/[^a-z0-9_\p{Nl}\p{Nd}\p{Mn}\p{Mc}\p{Pc}\p{Cf}]/gui, '_');
+
+		for (const [namespace, filename] of Object.entries(namespaceFileObject)) {
+			// Replace namespace by given filename in the csn file instead of edmx file
+			const re = RegExp(`([("/])${namespace}([/").])`, 'g');
+			let name = path.parse(filename).name;
+			if (!(name.match(regex))) { // check if the filename is in the right format with the regex if not replace unaccepted characters with underscore (_)
+				name = name.replace(/^[^a-z\p{Nl}_]/gui, '_');
+				name = name.replace(/[^a-z0-9_\p{Nl}\p{Nd}\p{Mn}\p{Mc}\p{Pc}\p{Cf}]/gui, '_');
+			}
+			const fn = `$1${name}$2`;
+			csn = csn.replace(re, fn);
 		}
-		const fn = `$1${name}$2`;
-		csn = csn.replace(re, fn);
 	}
 	return JSON.parse(csn);
 }