@sap/cds-dk 4.6.4 → 4.8.0

package/lib/bind/cfKeyProvider.js

@@ -8,18 +8,6 @@ const { URL } = require('url');
 const execAsync = util.promisify(cp.exec);
 const IS_WIN = os.platform() === 'win32';
 
-const KindToRequiresNameMap = {
-    xsuaa: 'uaa',
-    hana: 'db',
-    destinations: 'destinations',
-    connectivity: 'connectivity',
-    'audit-log': 'audit-log',
-    'enterprise-messaging': 'messaging',
-    'enterprise-messaging-amqp': 'messaging',
-    'enterprise-messaging-http': 'messaging',
-    'enterprise-messaging-shared': 'messaging'
-}
-
 class CFKeyProvider {
 
     constructor() {
@@ -69,7 +57,6 @@ class CFKeyProvider {
 
     async getCfTargetFromCli() {
         const result = await this._cfRead('target');
-
         return {
             apiEndpoint: this.extract(result, /^api endpoint:\s+(.*)$/i),
             user: this.extract(result, /^user:\s+(.*)$/i),
@@ -142,7 +129,7 @@ class CFKeyProvider {
         name = name || `${instance}:${key}`;
 
         if (apiEndpoint && apiEndpoint !== target.apiEndpoint) {
-            throw new Error(`Current Cloud Foundry api endpoint "${target.apiEndpoint}" doesn't match with requested api endpoint "${apiEndpoint}" for service binding "${name}".`);
+            throw new Error(`Current Cloud Foundry api endpoint "${target.apiEndpoint}" different than api endpoint "${apiEndpoint}" for service binding "${name}".`);
         }
 
         let spaceGuid;
@@ -182,6 +169,7 @@ class CFKeyProvider {
                 vcap: {
                     label: offeringObj.name,
                     plan: planObj.name,
+                    tags: offeringObj.tags
                 },
                 resolved: true,
             },
@@ -190,72 +178,6 @@ class CFKeyProvider {
 
         return resolvedBinding;
     }
-
-    getRequiresNameFromKind(service, kind) {
-        const requiresName = KindToRequiresNameMap[kind];
-        if (!requiresName) throw new Error(`Unknown CDS service name for service "${service}". Please specify as argument for "cds bind".`)
-        return requiresName;
-    }
-
-    /**
-     * Determine kind value for services based on VCAP binding
-     * information in the configuration.
-     */
-    determineKinds(services) {
-        const vcapServices = {}
-
-        const getIndex = service => {
-            const { credentials } = service;
-            return credentials && credentials.binding && credentials.binding.index;
-        }
-
-        // Build VCAP_SERVICES
-        for (let index = 0; index<services.length; index++) {
-            const service = services[index];
-            const { label, name, tags } = service.binding.vcap;
-            if (!vcapServices[label]) vcapServices[label] = [];
-            vcapServices[label].push({ credentials: { binding: { index } }, label, name, tags });
-
-            service.kindCandidates = [ ]
-            service.nameCandidates = [ ]
-        }
-
-        // Auto configure services based on VCAP_SERVICES
-        const cds = require('@sap/cds/lib');
-        const VCAP_SERVICES = process.env.VCAP_SERVICES;
-        try {
-            process.env.VCAP_SERVICES = JSON.stringify(vcapServices);
-            const env = cds.env.for('cds', '.');
-
-            // Extract "kind" from auto configured services
-            for (const kind of Object.keys(env.requires)) {
-                const requireService = env.requires[kind];
-                const superKind = requireService.kind;
-                const index = getIndex(requireService);
-                if (!Number.isInteger(index)) continue;
-
-                const superRequireService = env.requires[superKind];
-                if (superRequireService) {
-                    const superIndex = getIndex(superRequireService);
-                    if (index === superIndex) continue;
-                }
-
-                services[index].kindCandidates.push(kind);
-            }
-
-            // Check if one "kind" per service was found
-            for (const service of services) {
-                if (service.kindCandidates.length !== 1) {
-                    throw new Error(`Unknown kind for service "${service.binding.instance}". Please specify with "--kind" option.`);
-                }
-
-                service.kind = service.kindCandidates[0];
-                delete service.kindCandidates;
-            }
-        } finally {
-            process.env.VCAP_SERVICES = VCAP_SERVICES;
-        }
-    }
 }
 
 class BatchRequest {

package/lib/bind/kubernetesCredentialsProvider.js

@@ -0,0 +1,157 @@
+const cp = require('child_process');
+const os = require('os');
+const util = require('util');
+const yaml = require("@sap/cds-foss")("yaml");
+
+const axios = require('axios');
+const { URL } = require('url');
+
+const execFile = util.promisify(cp.execFile);
+const IS_WIN = os.platform() === 'win32';
+
+class KubernetesCredentialsProvider {
+
+    constructor() {
+        this.logger = console;
+    }
+
+    setLogger(logger) {
+        this.logger = logger;
+    }
+
+    async _kubectlRead(...args) {
+        this.logger.debug(`_kubectlRead: kubectl ${args.join(" ")}`);
+
+        const result = await execFile("kubectl", args, {
+            shell: IS_WIN,
+            stdio: ['inherit', 'pipe', 'inherit'],
+        });
+
+        return result.stdout.toString().trim();
+    }
+
+
+    async _kubectlConfig() {
+        const configString = await this._kubectlRead('config', 'view', '--raw');
+        const config = yaml.parse(configString);
+
+        const currentContextName = config["current-context"];
+        if (!currentContextName) throw new Error(`No current context in kubectl config.`);
+        const currentContextEntry = config.contexts && config.contexts.find( entry => entry.name === currentContextName && entry.context && entry.context.cluster && entry.context.user );
+        if (!currentContextEntry) throw new Error(`Current context not found in kubectl config.`);
+        const currentContext = currentContextEntry.context;
+        const clusterEntry = config.clusters && config.clusters.find( entry => entry.name === currentContext.cluster && entry.cluster && entry.cluster.server );
+        if (!currentContextEntry) throw new Error(`Cluster ${currentContext.cluster} not found in kubectl config.`);
+        const cluster = clusterEntry.cluster;
+        const userEntry = config.users && config.users.find( entry => entry.name === currentContext.user && entry.user && entry.user.token );
+        if (!userEntry) throw new Error(`User ${currentContext.user} not found in kubectl config.`);
+        const user = userEntry.user;
+
+        return {
+            url: cluster.server,
+            namespace: currentContext.namespace || 'default',
+            token: user.token
+        }
+    }
+
+    async init() {
+        this.config = await this._kubectlConfig();
+    }
+
+    async _req(urlPath) {
+
+        const url = new URL(urlPath, this.config.url);
+        this.logger.debug(`_req: ${url.toString()}`);
+
+        const result = await axios.get(url.toString(), {
+            validateStatus: status => status === 200 || status === 404,
+            headers: {
+                authorization: `Bearer ${this.config.token}`
+            }
+        });
+
+        if (result.status === 200) {
+            return result.data;
+        } else {
+            return null
+        }
+    }
+
+
+    async resolve(name, binding) {
+        if (!this.initPromise) {
+            this.initPromise = this.init();
+        }
+        await this.initPromise;
+
+        let {cluster, namespace, name: bindingName, secret } = binding;
+        let instance;
+        let secretOrBindingResource = 'Secret';
+
+        if (!namespace) namespace = this.config.namespace;
+        if (cluster && cluster !== this.config.url) throw new Error(`Current Kubernetes cluster "${this.config.url}" different than Kubernetes cluster "${cluster}" for service binding "${name}".`);
+
+        if (bindingName) {
+            const bindingResource = await this._req(`/apis/servicecatalog.k8s.io/v1beta1/namespaces/${encodeURIComponent(namespace)}/servicebindings/${encodeURIComponent(bindingName)}`);
+            if (bindingResource === null) {
+                // Fallback to secret instead of service binding;
+                secret = bindingName;
+                bindingName = undefined;
+                secretOrBindingResource = 'Service Binding or Secret';
+            } else {
+                secret = bindingResource.spec.secretName || throwError();
+                instance = bindingResource.spec.instanceRef && bindingResource.spec.instanceRef.name || throwError();
+            }
+        }
+
+        const secretResource = await this._req(`/api/v1/namespaces/${encodeURIComponent(namespace)}/secrets/${encodeURIComponent(secret)}`);
+        if (secretResource === null) throwError(`${secretOrBindingResource} '${secret}' not found.`);
+
+        const credentials = {};
+        for (const name in secretResource.data) {
+            let value = secretResource.data[name];
+            value = Buffer.from(value, "base64").toString(); // secret values are base64 encoded
+            // TODO: TESTIT
+            if (value && value[0] === '{') try { value = JSON.parse(value); } catch(e) {/* ignored */} // secret values may contain JSON objects
+            credentials[name] = value;
+        }
+
+        const resolvedBinding = {
+            binding: {
+                type: "k8s",
+                name: bindingName,
+                cluster: this.config.url,
+                instance,
+                namespace,
+                secret: secret,
+                resolved: true,
+            },
+            credentials
+        };
+
+
+        if (instance) {
+            const serviceInstanceResource = await this._req(`/apis/servicecatalog.k8s.io/v1beta1/namespaces/${encodeURIComponent(namespace)}/serviceinstances/${encodeURIComponent(instance)}`);
+
+            resolvedBinding.binding.vcap = {
+                label: serviceInstanceResource.spec.clusterServiceClassExternalName,
+                plan: serviceInstanceResource.spec.clusterServicePlanExternalName
+            }
+        }
+
+        return resolvedBinding;
+    }
+
+}
+
+
+/**
+ *
+ * @param {string} msg
+ * @returns {never}
+ */
+function throwError(msg = 'Internal Error') {
+    throw new Error(msg);
+}
+
+module.exports = new KubernetesCredentialsProvider();

package/lib/bind/userCdsrcJsonStorageProvider.js

@@ -3,7 +3,7 @@ const path = require('path');
 const readline = require('readline');
 
 const { fse } = require('@sap/cds-foss');
-const { highlight, warn } = require('../util/term');
+const { highlight } = require('../util/term');
 
 const commandUtil = require('../init/util/commandUtil');
 
@@ -108,19 +108,19 @@ ${file}
         }
 
         for (const service of services) {
-            const { name, kind, binding, credentials } = service;
+            const { name, kind, binding, credentials, vcap } = service;
             const requireService = section[name] = section[name] || {};
 
-            Object.assign(requireService, { kind, binding, credentials });
-
-            options.logger.log(`Binding ${highlight(name)} to Cloud Foundry service ${highlight(binding.instance)} key ${highlight(binding.key)} with kind ${highlight(kind)}.`);
+            Object.assign(requireService, { binding, credentials });
+            if (kind) requireService.kind = kind;
+            if (vcap) requireService.vcap = vcap;
         }
 
         await this.writeJsonFile(jsonPath, jsonObject, options.logger);
         if (options.profile) {
-            options.logger.log(`Saving bindings to ${highlight(jsonPath)} in profile ${highlight(options.profile)} .`);
+            options.logger.log(`Saving bindings to ${highlight(jsonPath)} in profile ${highlight(options.profile)}`);
         } else {
-            options.logger.log(`Saving bindings to ${highlight(jsonPath)}.`);
+            options.logger.log(`Saving bindings to ${highlight(jsonPath)}`);
         }
     }
 

package/lib/client/activate.js

@@ -8,6 +8,7 @@ const { collectFileContent, collectFiles, toUnixPath } = require('./helper/fs_he
 const Logger = require('./helper/logging');
 
 const COMMAND_URL_SUFFIX = 'asyncActivate';
+const COMMAND_URL_SUFFIX_SYNC = 'activate';
 const UPDATE_CUSTOM_FILE_URL_SUFFIX = 'updateCustomTenantContent';
 
 const I18N_WHITELIST = ['.properties', '.csv'];
@@ -36,6 +37,7 @@ async function checkFinished(jobId, statusUrl, params, finisher) {
 module.exports = class Activate extends BaseCommand {
 
     static get COMMAND_URL_SUFFIX() { return COMMAND_URL_SUFFIX; }
+    static get COMMAND_URL_SUFFIX_SYNC() { return COMMAND_URL_SUFFIX_SYNC; }
     static get UPDATE_CUSTOM_FILE_URL_SUFFIX() { return UPDATE_CUSTOM_FILE_URL_SUFFIX; }
 
     static async run(injection, paramValues) {
@@ -46,7 +48,8 @@ module.exports = class Activate extends BaseCommand {
                 Logger.log('Activating extension with parameters ' + JSON.stringify({
                     appUrl: params.get('appUrl'),
                     projectFolder: params.get('projectFolder'),
-                    undeploy: params.get('undeploy')
+                    undeploy: params.get('undeploy'),
+                    sync: params.get('sync')
                 }));
             } else {
                 Logger.log(`Activating extension located at ${params.get('projectFolder')} to URL ${params.get('appUrl')}`);
@@ -155,6 +158,7 @@ module.exports = class Activate extends BaseCommand {
 
     static async runActivate(cds, params) {
         let activationUrl;
+        const isSync = params.get('sync');
 
         return Activate.collectExtensionFiles(cds, params.get('projectFolder'))
         .then(allFiles => {
@@ -164,20 +168,20 @@ module.exports = class Activate extends BaseCommand {
 
             Logger.log('Activating extension...');
 
-            activationUrl = Activate.getMtxApiUrl(params.get('appUrl'), COMMAND_URL_SUFFIX);
+            const urlSuffix = isSync ? Activate.COMMAND_URL_SUFFIX_SYNC : Activate.COMMAND_URL_SUFFIX;
+            activationUrl = Activate.getMtxApiUrl(params.get('appUrl'), urlSuffix);
             const requestOptions = Object.assign({
-                headers: {},
-                data: {
-                    extension: [...allFiles],
-                    undeployExtension: params.get('undeploy')
-                }
+                headers: {}
             }, params.get('reqAuth'));
             requestOptions.headers['Content-Type'] = 'application/json';
 
-            return axios.post(activationUrl, requestOptions);
+            return axios.post(activationUrl, {
+                extension: [...allFiles],
+                undeployExtension: params.get('undeploy')
+            }, requestOptions);
         })
         .then(response => {
-            if (response === null) {
+            if (isSync || response === null) {
                 return;
             }
 
@@ -223,13 +227,12 @@ module.exports = class Activate extends BaseCommand {
         const customFileUrl = Activate.getMtxApiUrl(params.get('appUrl'), Activate.UPDATE_CUSTOM_FILE_URL_SUFFIX);
         const requestOptions = Object.assign({
             headers: {},
-            data: {
-                content: customFilesSerialized
-            }
         }, params.get('reqAuth'));
         requestOptions.headers['Content-Type'] = 'application/json';
 
-        await axios.post(customFileUrl, requestOptions);
+        await axios.post(customFileUrl, {
+            content: customFilesSerialized
+        }, requestOptions);
 
         Logger.log('Custom file upload finished');
     }

package/lib/client/base_command.js

@@ -19,7 +19,7 @@ module.exports = class BaseCommand {
             throw error;
         }
 
-        switch (error.response.status) {
+        switch (error.response && error.response.status) {
             case 401:
                 Logger.error('Request failed: authorization might have expired. Please retry with valid passcode' +
                     (params.has('passcodeUrl') ? ` from ${params.get('passcodeUrl')}` : ''), error);
@@ -52,4 +52,8 @@ module.exports = class BaseCommand {
     static getMtxApiUrl(url, action) {
         return BaseCommand.concatUrls(url, MTX_URL_PATH_PREFIX, action);
     }
+
+    static getMtxApiUrlSync(url, action) {
+        return BaseCommand.concatUrls(url, MTX_URL_PATH_PREFIX, action);
+    }
 }

package/lib/client/helper/cf_helper.js

@@ -154,12 +154,13 @@ async function getSubdomain(appName) {
                 }
             }
 
+            Logger.debug(`Subdomain determined from CF app environment: ${value}`);
             return resolve(value);
         });
     });
 
     function errorResult(message) {
-        Logger.debug(message);
+        Logger.debug(`Failed to get subdomain: ${message}`);
         return undefined;
     }
 }
@@ -174,8 +175,10 @@ async function getAppName(appUrl) {
     const app = apps.find(app => equalIgnoringTls(app.url, appUrl));
     if (!app) {
         Logger.debug(`Failed to find app with URL ${appUrl}.  Running apps: ${apps.map(app => app.name)}`);
+        return;
     }
-    return app && app.name;
+    Logger.debug(`App name determined from CF: ${app.name}`);
+    return app.name;
 }
 
 module.exports = {

package/lib/client/params.js

@@ -20,7 +20,7 @@ const ObfuscationLevel = Object.freeze({
     full: 1,
     partial: 2  // Allows a few start and end characters displayed in DEBUG output; only use with string-type params
 });
-const DISCLOSURE_LENGTH = 3;
+const DISCLOSURE_LENGTH = 2;
 
 /**
  * Parameters hold a name and a value and can only be set to compatible values.
@@ -205,6 +205,7 @@ class AllParams extends BasicParams {
         // `activate` PARAMS
         this.undeploy               = new Param('undeploy',               false);
         this.wsdl                   = new Param('wsdl',                   false);
+        this.sync                   = new Param('sync',                   false);
 
         // `logout` PARAMS
         this.deleteSettings         = new Param('deleteSettings',         false);
@@ -331,7 +332,7 @@ class ParamCollection {
     }
 
     /**
-     * Add all params contained in another collection to this.
+     * Add all params contained in another collection to this, replacing existing params.
      * @param params the other `ParamCollection`
      */
     merge(params) {
@@ -341,6 +342,19 @@ class ParamCollection {
         }
     }
 
+    /**
+     * Add all params contained in another collection to this, not replacing existing params.
+     * @param params the other `ParamCollection`
+     */
+    mergeLower(params) {
+        this.checkFrozen();
+        for (const param of params) {
+            if (!this.has(param.name)) {
+                this.set(param.name, param.val);
+            }
+        }
+    }
+
     /**
      * Iterate through all contained param objects.
      */

package/lib/client/settings_manager.js

@@ -71,13 +71,18 @@ async function getAppUrlAndSubdomainFromSuggestions(params) {
     params.set('appUrl', app.url);
 
     if (!params.has('subdomain')) {
-        params.set('subdomain', await getSubdomain(app.name));
-        if (params.has('subdomain')) {
-            Logger.log(`Subdomain determined from CF app environment: ${params.get('subdomain')}`);
-        } else {
-            Logger.log('Failed to determine subdomain from CF app environment');
-        }
+        params.set('subdomain', await getSubdomainFromCfAndNotify(app.name));
+    }
+}
+
+async function getSubdomainFromCfAndNotify(appName) {
+    const subdomain = await getSubdomain(appName);
+    if (subdomain) {
+        Logger.log(`Subdomain determined from CF app environment: ${subdomain}`);
+    } else {
+        Logger.log('Failed to determine subdomain from CF app environment');
     }
+    return subdomain;
 }
 
 function getTokenBaseUrl(params, renewUrl) {
@@ -156,7 +161,7 @@ class SettingsManager {
         const loadedSettings = await this._loadFromFile(projectFolder);
         Logger.debug(`Loaded project settings: ${loadedSettings.format()}`);
 
-        params.merge(loadedSettings);
+        params.mergeLower(loadedSettings);
 
         await this.updateUrls(params, logout);
         await this.checkKeytar(params, logout);
@@ -172,12 +177,13 @@ class SettingsManager {
             }
             if (!logout) {
                 if (!params.has('appUrl')) {
+                    Logger.debug('App URL not given');
                     await getAppUrlAndSubdomainFromSuggestions(params);
                 } else if (!params.has('subdomain')) {
                     Logger.debug('Subdomain not given');
                     const appName = await getAppName(params.get('appUrl'));
                     if (appName) {
-                        params.set('subdomain', await getSubdomain(appName));
+                        params.set('subdomain', await getSubdomainFromCfAndNotify(appName));
                     }
                 }
             }
@@ -189,6 +195,7 @@ class SettingsManager {
                 if (!params.has('subdomain')) {
                     throw new Error('Subdomain not given');
                 }
+                Logger.log(`Subdomain determined from app URL: ${params.get('subdomain')}`);
             }
         }
         function renewTokenUrl() {

package/lib/compile/openapi/csdl2openapi.js

@@ -1,7 +1,5 @@
 /**
  * Converts OData CSDL JSON to OpenAPI 3.0.2
- *
- * Latest version: https://github.wdf.sap.corp/d037427/odata-openapi/blob/master/lib/csdl2openapi.js
 */
 
 var pluralize = require('pluralize')
@@ -776,7 +774,7 @@ module.exports.csdl2openapi = function (
 
     /**
      * Unpack EnumMember value if it uses CSDL JSON CS01 style, like CAP does
-     * @param {string or object} path Qualified name of referenced type 
+     * @param {string or object} path Qualified name of referenced type
      * @return {object} Reference Object
      */
     function enumMember(member) {
@@ -788,7 +786,7 @@ module.exports.csdl2openapi = function (
 
     /**
      * Unpack NavigationPropertyPath value if it uses CSDL JSON CS01 style, like CAP does
-     * @param {string or object} path Qualified name of referenced type 
+     * @param {string or object} path Qualified name of referenced type
      * @return {object} Reference Object
      */
     function navigationPropertyPath(path) {
@@ -800,7 +798,7 @@ module.exports.csdl2openapi = function (
 
     /**
      * Unpack PropertyPath value if it uses CSDL JSON CS01 style, like CAP does
-     * @param {string or object} path Qualified name of referenced type 
+     * @param {string or object} path Qualified name of referenced type
      * @return {object} Reference Object
      */
     function propertyPath(path) {
@@ -2147,7 +2145,7 @@ module.exports.csdl2openapi = function (
 
     /**
      * Augment OpenAPI document with Security Requirements Object
-     * @param {object} openapi OpenAPI document to augment 
+     * @param {object} openapi OpenAPI document to augment
      * @param {object} entityContainer Entity Container object
      */
     function security(openapi, entityContainer) {
@@ -2162,7 +2160,7 @@ module.exports.csdl2openapi = function (
 
     /**
      * a qualified name consists of a namespace or alias, a dot, and a simple name
-     * @param {string} qualifiedName 
+     * @param {string} qualifiedName
      * @return {string} namespace-qualified name
      */
     function namespaceQualifiedName(qualifiedName) {
@@ -2172,7 +2170,7 @@ module.exports.csdl2openapi = function (
 
     /**
      * a qualified name consists of a namespace or alias, a dot, and a simple name
-     * @param {string} qualifiedName 
+     * @param {string} qualifiedName
      * @return {object} with components qualifier and name
      */
     function nameParts(qualifiedName) {

package/lib/compile/to-xsuaa.js

@@ -107,8 +107,6 @@ module.exports = function compile_to_xsuaa (model, options) {
 
 function mergeConfig(base, generated) {
   const result = base
-  result.xsappname = base.xsappname || appName()
-  result['tenant-mode'] = base['tenant-mode'] || 'dedicated'
 
   const mergeByName = (type) => {
     if (!generated[type]) return
@@ -140,15 +138,3 @@ function getBaseModel(options = {}) {
   }
   return options.base || {}
 }
-
-function appName() {
-  const cwd = cds.root || process.cwd()
-  let name
-  try {
-    name = require(path.resolve(cwd,'package.json')).name
-  } catch (err) { // no package.json
-    name = path.basename(cwd)
-  }
-  // remove any @foo/ from @foo/bar, truncate to max length
-  return name.split('/').pop().substring(0, 100)
-}

package/lib/import/utils/MetadataConverter.js

@@ -396,7 +396,6 @@ class Expression {
         const target = this.getTarget();
         const element = this.getElement();
         const attribs = element.attributes;
-        let custom_namespace = MetadataConverter.custom_namespace;
         if (attribs == null) return;
         let realType = attribs.Type || attribs.EntityType || attribs.UnderlyingType;
         const propertyName = attribs.UnderlyingType == null ? '$Type' : '$UnderlyingType';
@@ -574,6 +573,9 @@ class Expression {
             !(target.$Kind === 'NavigationProperty' && target.$Collection === true)) {
             target.$Nullable = true;
         }
+        this.includeExternalAnnotations(element,target);
+    }
+    includeExternalAnnotations(element,target){
         const nonStdAttributes = this.getNonStdAttributes(element.attributes);
         for (let i = 0; i < nonStdAttributes.length; i++) {
             let attr = nonStdAttributes[i];
@@ -581,7 +583,7 @@ class Expression {
             if(attrName)
                 attrName = attrName.replace(/-/g,'.');
             let attribute;
-            if ((custom_namespace.includes(prefix) && attrName !== undefined) || custom_namespace.includes(true))
+            if ((MetadataConverter.custom_namespace.includes(prefix) && attrName !== undefined) || MetadataConverter.custom_namespace.includes(true))
                 attribute = "@" + prefix + "." + attrName;
             else if (attrName === undefined)
                 attribute = "$" + prefix;
@@ -2221,10 +2223,10 @@ class EntityContainerExpression extends Expression {
     interpret() {
         const element = this.getElement();
         const target = { $Kind: 'EntityContainer' };
+        this.includeExternalAnnotations(element,target);
         this.setTarget(target);
         super.interpret();
-
-        return { [element.attributes.Name]: target };
+        return { [element.attributes.Name]: target};
     }
 }
 

package/lib/import/utils/MultiMap.js

@@ -49,6 +49,7 @@ var Multimap = (function () {
      * @param {Object} key
      * @param {Object} val...
      */
+    // eslint-disable-next-line no-unused-vars
     Multimap.prototype.set = function (key, val) {
         var args = Array.prototype.slice.call(arguments);