@sap/cds-dk 6.1.5 → 6.2.1

package/lib/client/activate.js

@@ -2,12 +2,13 @@ const fs = require('fs').promises;
 const path = require('path');
 const axios = require('axios');
 
-const AuthManager = require('./auth_manager');
-const BaseCommand = require('./base_command');
+const log = require('./helper/logging');
 const { collectFileContent, collectFiles, toUnixPath } = require('./helper/fs_helper');
-const Logger = require('./helper/logging');
 const { CliError } = require('./helper/errors');
 
+const AuthManager = require('./auth_manager');
+const BaseCommand = require('./base_command');
+
 const COMMAND_URL_SUFFIX = 'asyncActivate';
 const COMMAND_URL_SUFFIX_SYNC = 'activate';
 const UPDATE_CUSTOM_FILE_URL_SUFFIX = 'updateCustomTenantContent';
@@ -28,9 +29,9 @@ async function checkFinished(jobId, statusUrl, params, finisher) {
         finisher.finished = true;
         clearInterval(finisher.timer);
         if (status === JOB_STATUS.FAILED) {
-            return finisher.reject(new CliError(`Job ${jobId} failed: ${error.message || JSON.stringify(error)}`));
+            return finisher.reject(new CliError(`Job ${jobId} failed`, error));
         }
-        Logger.log('Extension active');
+        console.log('Extension active');
         finisher.resolve();
     }
 }
@@ -42,34 +43,30 @@ module.exports = class Activate extends BaseCommand {
     static get UPDATE_CUSTOM_FILE_URL_SUFFIX() { return UPDATE_CUSTOM_FILE_URL_SUFFIX; }
 
     static async run(injection, paramValues) {
-        try {
-            const params = await AuthManager.login(paramValues);
-
-            if (process.env.DEBUG) {
-                Logger.log('Activating extension with parameters ' + JSON.stringify({
-                    appUrl: params.get('appUrl'),
-                    projectFolder: params.get('projectFolder'),
-                    undeploy: params.get('undeploy'),
-                    sync: params.get('sync')
-                }));
-            } else {
-                Logger.log(`Activating extension located at ${params.get('projectFolder')} to URL ${params.get('appUrl')}`);
-            }
+        const params = await AuthManager.login(paramValues);
+
+        if (process.env.DEBUG) {
+            console.log('Activating extension with parameters', JSON.stringify({
+                appUrl: params.get('appUrl'),
+                projectFolder: params.get('projectFolder'),
+                undeploy: params.get('undeploy'),
+                sync: params.get('sync')
+            }));
+        } else {
+            console.log('Activating extension located at', params.get('projectFolder'), 'to URL', params.get('appUrl'));
+        }
 
-            if (!await this.checkProject(params.get('projectFolder'))) {
-                throw new CliError(params.get('projectFolder') + ' is not a valid extension project');
-            }
+        if (!await this.checkProject(params.get('projectFolder'))) {
+            throw new CliError(params.get('projectFolder') + ' is not a valid extension project');
+        }
 
-            try {
-                await this.runActivate(injection.cds, params);
-                if (params.get('wsdl')) {
-                    await this.runCustomFileUpload(params);
-                }
-            } catch (error) {
-                await this.handleHttpError(error, params);
+        try {
+            await this.runActivate(injection.cds, params);
+            if (params.get('wsdl')) {
+                await this.runCustomFileUpload(params);
             }
         } catch (error) {
-            Logger.error(undefined, error);
+            await this.handleHttpError(error, params);
         }
     }
 
@@ -94,7 +91,7 @@ module.exports = class Activate extends BaseCommand {
         let allFiles = new Map();
 
         if (resolvedPaths.length < 1) {
-            Logger.log('No extension files found');
+            console.warn('No extension files found');
             return allFiles;
         }
 
@@ -105,7 +102,7 @@ module.exports = class Activate extends BaseCommand {
             if (! entry.startsWith(projectFolder)) {
                 /* Current file might be below the base model's node_modules, in which case compilation on server should succeed.
                    Otherwise, compilation will probably fail, with this message giving a hint. */
-                Logger.debug(`Source file outside project folder will not be uploaded: ${entry}`);
+                log.debug(`Source file outside project folder will not be uploaded: ${entry}`);
                 return false;
             }
             const unixFilename = toUnixPath(entry);
@@ -123,8 +120,7 @@ module.exports = class Activate extends BaseCommand {
             return !(/.*node_modules\/_base\/.*/.test(unixFilename));
         });
 
-        // FIXME remove async
-        i18nFolders.forEach(async(folder) => {
+        i18nFolders.forEach(folder => {
             const i18nFiles = collectFiles(projectFolder, folder, entry => {
                 const ext = path.extname(entry);
                 return I18N_WHITELIST.includes(ext);
@@ -132,13 +128,13 @@ module.exports = class Activate extends BaseCommand {
             allFiles = new Map([...allFiles, ...i18nFiles]);
         });
 
+        let pkgJson;
         try {
-            const pkgJson = await fs.readFile(path.join(absoluteFolder, 'package.json'), 'utf-8');
-            allFiles.set('package.json', pkgJson);
-        } catch(e) {
-            Logger.log('No package.json file found');
-            Logger.error('No package.json file found', e);
+            pkgJson = await fs.readFile(path.join(absoluteFolder, 'package.json'), 'utf-8');
+        } catch (error) {
+            throw new CliError('No package.json file found', error);
         }
+        allFiles.set('package.json', pkgJson);
 
         return allFiles;
     }
@@ -146,16 +142,11 @@ module.exports = class Activate extends BaseCommand {
     static collectCustomFiles(projectFolder) {
         const wsdlFolder = path.join(projectFolder, 'wsdl');
 
-        try {
-            const wsdlFiles = collectFiles(projectFolder, wsdlFolder);
-            if (wsdlFiles.size === 0) {
-                Logger.log('No custom files found');
-            }
-            return wsdlFiles;
-        } catch (error) {
-            Logger.error(undefined, error);
-            throw new CliError('No custom files found');
+        const wsdlFiles = collectFiles(projectFolder, wsdlFolder);
+        if (wsdlFiles.size === 0) {
+            console.log('No custom files found');
         }
+        return wsdlFiles;
     }
 
     static async runActivate(cds, params) {
@@ -168,7 +159,7 @@ module.exports = class Activate extends BaseCommand {
                 return null;
             }
 
-            Logger.log('Activating extension...');
+            console.log('Activating extension...');
 
             const urlSuffix = isSync ? this.COMMAND_URL_SUFFIX_SYNC : this.COMMAND_URL_SUFFIX;
             activationUrl = this.getMtxApiUrl(params.get('appUrl'), urlSuffix);
@@ -197,7 +188,7 @@ module.exports = class Activate extends BaseCommand {
                 throw new CliError(`Job ${jobId} failed: did not receive job-status path`);
             }
 
-            Logger.debug(`Job ID: ${jobId}`);
+            log.debug(`Job ID: ${jobId}`);
 
             return new Promise((resolve, reject) => {
                 const statusUrl = this.concatUrls(params.get('appUrl'), statusPath);
@@ -213,7 +204,7 @@ module.exports = class Activate extends BaseCommand {
     }
 
     static async runCustomFileUpload(params) {
-        Logger.log(`Uploading custom files to ${params.get('appUrl')}...`);
+        console.log('Uploading custom files to', params.get('appUrl'), '...');
 
         const customFiles = this.collectCustomFiles(params.get('projectFolder'));
 
@@ -236,7 +227,7 @@ module.exports = class Activate extends BaseCommand {
             content: customFilesSerialized
         }, requestOptions);
 
-        Logger.log('Custom file upload finished');
+        console.log('Custom file upload finished');
     }
 
 }

package/lib/client/auth_manager.js

@@ -1,7 +1,6 @@
-const util = require('util');
 const axios = require('axios');
 
-const Logger = require('./helper/logging');
+const log = require('./helper/logging');
 const { SettingsManager } = require('./settings_manager');
 const { ParamCollection } = require('./params');
 const { CliError } = require('./helper/errors');
@@ -40,7 +39,7 @@ function getTokenUrl(params) {
 async function retrieveTokenOrPasscodeUrl(params) {
     if (params.has('token')) {
         if (params.get('renewLogin') || params.get('tokenExpirationDate') <= Date.now()) {
-            Logger.debug((params.get('renewLogin') ? 'Renewing' : 'Refreshing expired') + ' authentication token');
+            log.debug((params.get('renewLogin') ? 'Renewing' : 'Refreshing expired') + ' authentication token');
             params.delete('token');
             params.delete('tokenExpirationDate');
         } else {
@@ -55,13 +54,13 @@ async function retrieveTokenOrPasscodeUrl(params) {
     let authData;
     do {
         const tokenUrl = getTokenUrl(params);
-        Logger.debug(`Getting authentication token or passcode URL from ${(params.obfuscateQueryParams(tokenUrl))}`);
+        log.debug(`Getting authentication token or passcode URL from ${(params.obfuscateQueryParams(tokenUrl))}`);
 
         let response;
         try {
             response = await axios.get(tokenUrl);
         } catch (error) {
-            throw new CliError(`Failed to get authentication token: ${error}.\nResponse body: ${util.inspect(error.response && error.response.data)}`);
+            throw new CliError('Failed to get authentication token', error);
         }
         authData = response.data;
 
@@ -90,9 +89,9 @@ module.exports = class AuthManager {
                 if (params.get('saveData')) {
                     await SettingsManager.saveSettings(params);
                 }
-                throw new CliError('Failed to login: no valid token or passcode provided. ' +
-                    'Get a passcode' + (params.get('passcodeUrl') ? ' from ' + params.get('passcodeUrl') : '') +
-                    ' and supply the code when re-running the command');
+                throw new CliError(`Failed to login: no valid token or passcode provided. Get a passcode${
+                    params.get('passcodeUrl') ? ' from ' + params.get('passcodeUrl') : ''
+                } and supply the code when re-running the command`);
             }
             params.set('reqAuth', { headers: { Authorization: 'Bearer ' + params.get('token') } });
         }

package/lib/client/base_command.js

@@ -26,9 +26,12 @@ module.exports = class BaseCommand {
                     (params.has('passcodeUrl') ? ` from ${params.get('passcodeUrl')}` : ''), error);
             case 404:
                 throw new CliError(`Request failed. Please check application URL ${params.get('appUrl')}`, error);
-            default:
-                // Including 422 (compilation or native-extension error).
+            case 422:
+                // Compilation or native-extension error.
                 throw new CliError(undefined, error);
+            default:
+                // Unexpected error should be transparent to user.
+                throw error;
         }
     }
 

package/lib/client/extend.js

@@ -5,7 +5,6 @@ const axios = require('axios');
 const AuthManager = require('./auth_manager');
 const BaseCommand = require('./base_command');
 const { normalizePath, isParent } = require('./helper/fs_helper');
-const Logger = require('./helper/logging');
 const Question = require('./helper/question');
 const { CliError } = require('./helper/errors');
 
@@ -63,7 +62,7 @@ module.exports = class Extend extends BaseCommand {
         await Extend.storeFiles(templates, directory, async filepath => {
             const normalizedPath = normalizePath(filepath);
             if (!isParent(path.join(directory, DB_FOLDER), normalizedPath) && !isParent(path.join(directory, SRV_FOLDER), normalizedPath)) {
-                Logger.log(`Ignoring template ${normalizedPath}: not in ${DB_FOLDER} or ${SRV_FOLDER}`);
+                console.log('Ignoring template', normalizedPath, ': not in', DB_FOLDER, 'or', SRV_FOLDER);
                 return false;
             }
             return true;
@@ -71,34 +70,30 @@ module.exports = class Extend extends BaseCommand {
     }
 
     static async run(paramValues) {
-        try {
-            const params = await AuthManager.login(paramValues);
-
-            if (process.env.DEBUG) {
-                Logger.log(`\n\nCreating extension project with parameters ${JSON.stringify({
-                    appUrl: params.get('appUrl'),
-                    projectFolder: params.get('projectFolder'),
-                    subdomain: params.get('subdomain'),
-                    passcode: params.get('passcode'),
-                    username: params.get('username'),
-                    password: params.get('password') ? '***' : 'undefined'
-                })}`);
-            } else {
-                Logger.log(`\n\nCreating extension project for ${params.get('appUrl')}, subdomain '${params.get('subdomain')}', in folder '${params.get('projectFolder')}'`);
-            }
+        const params = await AuthManager.login(paramValues);
+
+        if (process.env.DEBUG) {
+            console.log('\n\nCreating extension project with parameters', JSON.stringify({
+                appUrl: params.get('appUrl'),
+                projectFolder: params.get('projectFolder'),
+                subdomain: params.get('subdomain'),
+                passcode: params.get('passcode'),
+                username: params.get('username'),
+                password: params.get('password') ? '***' : 'undefined'
+            }));
+        } else {
+            console.log('\n\nCreating extension project for', params.get('appUrl'), 'subdomain', params.get('subdomain'), 'in folder', params.get('projectFolder'));
+        }
 
-            const runOnExistingProject = await Extend.checkProject(params.get('projectFolder'));
-            if (runOnExistingProject && !(params.get('force') || params.get('templates'))) {
-                throw new CliError(folderExists(params.get('projectFolder')));
-            }
+        const runOnExistingProject = await Extend.checkProject(params.get('projectFolder'));
+        if (runOnExistingProject && !(params.get('force') || params.get('templates'))) {
+            throw new CliError(folderExists(params.get('projectFolder')));
+        }
 
-            try {
-                await Extend.runExtend(params);
-            } catch (error) {
-                await Extend.handleHttpError(error, params);
-            }
-        } catch (mainError) {
-            Logger.error(undefined, mainError);
+        try {
+            await Extend.runExtend(params);
+        } catch (error) {
+            await Extend.handleHttpError(error, params);
         }
     }
 
@@ -106,11 +101,11 @@ module.exports = class Extend extends BaseCommand {
         const contentUrl = Extend.getMtxApiUrl(params.get('appUrl'), COMMAND_URL_SUFFIX);
         const requestOptions = Object.assign({ retry: 0 }, params.get('reqAuth'));
 
-        Logger.log('Retrieving files...');
+        console.log('Retrieving files...');
 
         const [ response ] = (await axios.get(contentUrl, requestOptions)).data;
 
-        Logger.log('\nWriting files to: ' + params.get('projectFolder'));
+        console.log('\nWriting files to', params.get('projectFolder'));
 
         if (params.get('templates')) {
             await Extend.storeTemplateFilesToTpl(response.templates, params.get('projectFolder'));
@@ -124,21 +119,21 @@ module.exports = class Extend extends BaseCommand {
         await fs.promises.mkdir(path.join(params.get('projectFolder'), DB_FOLDER), { recursive: true });
         await fs.promises.mkdir(path.join(params.get('projectFolder'), SRV_FOLDER), { recursive: true });
 
-        Logger.log(`\nPut database extension models into ${DB_FOLDER} folder.`);
-        Logger.log(`Put service extension models into ${SRV_FOLDER} folder.`);
+        console.log('\nPut database extension models into', DB_FOLDER, 'folder.');
+        console.log('Put service extension models into', SRV_FOLDER, 'folder.');
 
         if (response.templates && response.templates.length > 0) {
             // only write templates if there are no extensions so far
             if (response.extension && response.extension.length === 0) {
-                Logger.log(`Writing template files to ${DB_FOLDER} and ${SRV_FOLDER} folder`);
+                console.log('Writing template files to', DB_FOLDER, 'and', SRV_FOLDER, 'folder');
                 await Extend.storeTemplateFiles(response.templates, params.get('projectFolder'));
             } else {
-                Logger.log('Ignoring templates because extension is already active.');
+                console.log('Ignoring templates because extension is already active.');
             }
         }
 
         if (params.get('wsdl')) {
-            Logger.log('Writing custom files');
+            console.log('Writing custom files');
             const customFileUrl = Extend.getMtxApiUrl(params.get('appUrl'), Extend.CUSTOM_FILE_URL_SUFFIX);
             const customFiles = (await axios.get(customFileUrl, requestOptions)).data;
             await Extend.storeCustomFiles(params.get('projectFolder'), customFiles);
@@ -153,12 +148,12 @@ module.exports = class Extend extends BaseCommand {
                 if (targetExists) {
                     await fs.promises.rm(targetDirectory, { force: true, recursive: true });
                 }
-                Logger.log(`Writing template files to ${TEMPLATE_FOLDER} folder`);
+                console.log('Writing template files to', TEMPLATE_FOLDER, 'folder');
                 await Extend.storeTemplateFiles(templates, targetDirectory);
             }
 
         } else {
-            Logger.log('No templates available');
+            console.log('No templates available');
         }
     }
 
@@ -167,7 +162,7 @@ module.exports = class Extend extends BaseCommand {
     }
 
     static _logWrittenFile(file) {
-        Logger.log('CREATE: ' + file);
+        console.log('CREATE:', file);
     }
 
 }

package/lib/client/helper/cf_helper.js

@@ -1,7 +1,7 @@
 const os = require('os');
 const { execFile } = require('child_process');
 
-const Logger = require('./logging');
+const log = require('./logging');
 const Question = require('./question');
 const { formatObjectsFixedWidth } = require('./string_helper');
 const { schemaRegex } = require('./url_helper');
@@ -20,7 +20,7 @@ function getErrorMessage(error, stdout) {
 async function getAppFromSuggestions() {
     const apps = await getApps();
     if (apps.length === 0) {
-        Logger.debug('Failed to obtain list of apps from CF');
+        log.debug('Failed to obtain list of apps from CF');
         return undefined;
     }
 
@@ -36,7 +36,7 @@ Your choice: `);
         console.log();
 
         if (!choice) {
-            Logger.debug('No app URL selected');
+            log.debug('No app URL selected');
             return undefined;
         }
         choiceNr = Number(choice);
@@ -46,7 +46,7 @@ Your choice: `);
 }
 
 async function getApps(nameRegex = /(?<!-db)$/) {
-    Logger.debug('Getting running apps from CF');
+    log.debug('Getting running apps from CF');
 
     return new Promise(resolve => {
         runCf(['apps'], function(error, stdout) {
@@ -120,13 +120,13 @@ async function getApps(nameRegex = /(?<!-db)$/) {
     }
 
     function errorResult(message) {
-        Logger.debug(`Failed to get apps: ${message}`);
+        log.debug(`Failed to get apps: ${message}`);
         return [];
     }
 }
 
 async function getSubdomain(appName) {
-    Logger.debug('Getting subdomain from CF env');
+    log.debug('Getting subdomain from CF env');
 
     return new Promise(resolve => {
         runCf(['env', appName], function(error, stdout) {
@@ -155,13 +155,13 @@ async function getSubdomain(appName) {
                 }
             }
 
-            Logger.debug(`Subdomain determined from CF app environment: ${value}`);
+            log.debug(`Subdomain determined from CF app environment: ${value}`);
             return resolve(value);
         });
     });
 
     function errorResult(message) {
-        Logger.debug(`Failed to get subdomain: ${message}`);
+        log.debug(`Failed to get subdomain: ${message}`);
         return undefined;
     }
 }
@@ -171,14 +171,14 @@ async function getAppName(appUrl) {
         return url1.replace(schemaRegex, '') === url2.replace(schemaRegex, '');
     }
 
-    Logger.debug('Getting app name from CF apps');
+    log.debug('Getting app name from CF apps');
     const apps = await getApps();
     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)}`);
+        log.debug(`Failed to find app with URL ${appUrl}.  Running apps: ${apps.map(app => app.name)}`);
         return;
     }
-    Logger.debug(`App name determined from CF: ${app.name}`);
+    log.debug(`App name determined from CF: ${app.name}`);
     return app.name;
 }
 

package/lib/client/helper/dependency_helper.js

@@ -1,7 +1,7 @@
 const os = require('os');
 const { execFileSync } = require('child_process');
 
-const Logger = require('./logging');
+const log = require('./logging');
 
 let cachedDir;
 
@@ -21,6 +21,6 @@ module.exports = function requireGlobal(packageId) {
         return require(packagePath);
     } catch (error) {
         // Ignore error.
-        Logger.debug(`Failed to find module '${packageId}' in ${globalModulesDir()}: ${error}`);
+        log.debug(`Failed to find module '${packageId}' in ${globalModulesDir()}`, error);
     }
 }

package/lib/client/helper/errors.js

@@ -1,8 +1,9 @@
-const Logger = require('./logging');
+const { getMessage } = require('./logging');
+
 class CliError extends Error {
-    stack = '';
+    // noinspection JSAnnotator
     constructor(message, error) {
-        super(Logger.getMessage(message, error));
+        throw getMessage(message, error);
     }
 }
 

package/lib/client/helper/logging.js

@@ -1,30 +1,24 @@
 /* eslint-disable no-console */
 
-module.exports = class Logger {
-
-    static log(logText) {
-        console.log(logText);
-    }
-
-    static error(errorText, error) {
-        console.error(this.getMessage(errorText, error));
-    }
-
-    static debug(debugText, error) {
-        if (process.env.DEBUG) {
-            console.error(this.getMessage(debugText, error));
-        }
+function debug(debugText, error) {
+    if (process.env.DEBUG) {
+        console.error(getMessage(debugText, error));
     }
+}
 
-    static getMessage(errorText, error) {
-        let message = errorText ? errorText + '\n' : '';
-        if (!error) {
-            return message;
-        }
-        message += error.response?.data?.error?.message || error.message;
-        if (process.env.DEBUG && error.stack) {
-            message += '\n' + error.stack;
-        }
+function getMessage(errorText, error) {
+    let message = errorText ? errorText : '';
+    if (!error) {
         return message;
     }
+    message += '\n' + (error.response?.data?.error?.message || error.message);
+    if (process.env.DEBUG && error.stack) {
+        message += '\n' + error.stack;
+    }
+    return message;
 }
+
+module.exports = {
+    debug,
+    getMessage
+};

package/lib/client/params.js

@@ -1,4 +1,4 @@
-const Logger = require('./helper/logging');
+const log = require('./helper/logging');
 const { escapeRegex } = require('./helper/string_helper');
 const { CliError } = require('./helper/errors');
 
@@ -178,7 +178,7 @@ class BasicParams {
         this.appUrl                 = new Param('appUrl',                 '', { persist: Persistence.setting });
         this.to                     = this.appUrl.newAlias('to');
         this.url                    = this.appUrl.newAlias('url');
-        this.subdomain              = new Param('subdomain',              '', { persist: Persistence.setting });
+        this.subdomain              = new Param('subdomain',              '', { persist: Persistence.setting }); // only needed to fetch token
         this.passcodeUrl            = new Param('passcodeUrl',            '', { persist: Persistence.setting, abbreviate: true });
         this.passcode_url           = this.passcodeUrl.newAlias('passcode_url');
         this.tokenUrl               = new Param('tokenUrl',               '', { persist: Persistence.setting, abbreviate: true })
@@ -247,7 +247,7 @@ class ParamCollection {
      */
     checkFrozen() {
         if (this.isFrozen) {
-            throw new CliError('cannot modify read-only parameter collection');
+            throw new Error('cannot modify read-only parameter collection');
         }
     }
 
@@ -268,7 +268,7 @@ class ParamCollection {
     static mainName(name) {
         const paramDef = ParamDefs[name];
         if (!paramDef) {
-            throw new CliError(`Unknown parameter: '${name}'`);
+            throw new Error(`Unknown parameter: '${name}'`);
         }
         return paramDef.mainName;
     }
@@ -312,7 +312,7 @@ class ParamCollection {
             this.params[mainName] = ParamDefs[mainName].clone(val);
         }
         if (mainName !== name) {
-            Logger.debug(`Migrated setting '${name}' to new key '${mainName}'`);
+            log.debug(`Migrated setting '${name}' to new key '${mainName}'`);
         }
     }
 

package/lib/client/pull.js

@@ -1,40 +1,38 @@
+const cds = require ('../cds')
+const { local, tar } = cds.utils;
+
 const fs = require('fs');
 const { join } = require('path');
 const axios = require('axios');
 
-const { unpackTarArchive } = require('@sap/cds/lib/utils/resources');
-
 const { login } = require('./auth_manager');
 const BaseCommand = require('./base_command');
-const Logger = require('./helper/logging');
-const { CliError } = require('./helper/errors');
 
 module.exports = class Pull extends BaseCommand {
 
     static async run(paramValues) {
-        try {
-            const params = await login(paramValues);
-            Logger.log(`Pulling base model from ${params.get('appUrl')}, for subdomain '${params.get('subdomain')}', to project folder '${params.get('projectFolder')}'`);
+        if (!tar) {
+            console.error(`cds pull requires @sap/cds version >= 6.2. Current version is ${cds.version}\n`);
+            return process.exitCode = 1;
+        }
 
-            const projectFolder = params.get('projectFolder');
-            const targetDir = join(projectFolder, 'node_modules', this.getAppPackageName(projectFolder));
-            fs.rmSync(targetDir, { force: true, recursive: true });
-            fs.mkdirSync(targetDir, { recursive: true });
+        const params = await login(paramValues);
+        const url = params.get('appUrl')
+        const home = params.get('projectFolder');
+        const target = join(home, 'node_modules', this.getAppPackageName(home));
+        const subdomain = params.get('subdomain') // REVISIT: Why are subdomains not transparently encoded in URLs?
+        console.log(`Pulling app base model`, Object.assign({ from: url, to: local(target) }, subdomain && {subdomain}))
 
-            const tgzBuffer = Buffer.from(await this.getTgz(params));
-            return unpackTarArchive(tgzBuffer, targetDir, false);
+        fs.rmSync(target, { force: true, recursive: true });
+        fs.mkdirSync(target, { recursive: true });
 
-        } catch (error) {
-            throw new CliError(undefined, error);
-        }
+        const tgzBuffer = Buffer.from(await this.getTgz(params));
+        return tar.xz(tgzBuffer).to(target);
     }
 
     static getAppPackageName(projectFolder) {
-        try {
-            return require(join(projectFolder, 'package.json')).cds.extends;
-        } catch (error) {
-            return '_base';
-        }
+        const env = cds.env.for('cds', projectFolder);
+        return env.extends || '_base';
     }
 
     static async getTgz(params) {