@sap/cds-dk 4.8.2 → 4.9.2

package/lib/bind/cfKeyProvider.js

@@ -39,29 +39,21 @@ class CFKeyProvider {
         return result.data;
     }
 
-    extract(string, pattern, defaultValue) {
-        const array = string.split(/[\n\r]+/);
-        for (let line of array) {
-            const match = line.match(pattern);
-            if (match) {
-                return match[1];
-            }
-        }
-
-        if (typeof defaultValue === 'undefined') {
-            throw Error(`Pattern not found: ${pattern}`);
-        } else {
-            return defaultValue;
+    extract(string, pattern, errorMsg) {
+        const match = string.match(pattern);
+        if (!match || !match[1]) {
+            throw new Error(errorMsg);
         }
+        return match[1];
     }
 
     async getCfTargetFromCli() {
         const result = await this._cfRead('target');
         return {
-            apiEndpoint: this.extract(result, /^api endpoint:\s+(.*)$/i),
-            user: this.extract(result, /^user:\s+(.*)$/i),
-            org: this.extract(result, /^org:\s+(.*)$/i),
-            space: this.extract(result, /^space:\s+(.*)$/i),
+            apiEndpoint: this.extract(result, /api endpoint\s*:\s*(.*)/i, `CF API endpoint is missing. Use 'cf login' to login.`),
+            user: this.extract(result, /user\s*:\s*(.*)/i, `CF user is missing. Use 'cf login' to login.`),
+            org: this.extract(result, /org\s*:\s*(.*)/i, `CF org is missing. Use 'cf target -o <ORG> to specify.`),
+            space: this.extract(result, /space\s*:\s*(.*)/i, `CF space is missing. Use 'cf target -s <SPACE>' to specify.`),
         };
     }
 

package/lib/bind/userCdsrcJsonStorageProvider.js

@@ -2,6 +2,7 @@ const os = require('os');
 const path = require('path');
 const readline = require('readline');
 
+// TODO transition to fs → need to mock fs and fse in test (cf. MTX client)
 const { fse } = require('@sap/cds-foss');
 const { highlight } = require('../util/term');
 

package/lib/client/activate.js

@@ -1,6 +1,6 @@
+const fs = require('fs').promises;
 const path = require('path');
 const axios = require('axios');
-const { fse } = require('@sap/cds-foss');
 
 const AuthManager = require('./auth_manager');
 const BaseCommand = require('./base_command');
@@ -122,6 +122,7 @@ module.exports = class Activate extends BaseCommand {
             return !(/.*node_modules\/_base\/.*/.test(unixFilename));
         });
 
+        // FIXME remove async
         i18nFolders.forEach(async(folder) => {
             const i18nFiles = collectFiles(projectFolder, folder, entry => {
                 const ext = path.extname(entry);
@@ -131,7 +132,7 @@ module.exports = class Activate extends BaseCommand {
         });
 
         try {
-            const pkgJson = await fse.readFile(path.join(absoluteFolder, 'package.json'), 'utf-8');
+            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');

package/lib/client/extend.js

@@ -1,5 +1,6 @@
-const axios = require('axios');
+const fs = require('fs');
 const path = require('path');
+const axios = require('axios');
 const { fse } = require('@sap/cds-foss');
 
 const AuthManager = require('./auth_manager');
@@ -24,10 +25,8 @@ module.exports = class Extend extends BaseCommand {
     static get COMMAND_URL_SUFFIX() { return COMMAND_URL_SUFFIX; }
 
     static async storeFiles(content, targetDirectory, filter) {
-        if (!fse.existsSync(targetDirectory)) {
-            fse.mkdirpSync(targetDirectory);
-        }
-        targetDirectory = fse.realpathSync(targetDirectory)
+        fse.mkdirpSync(targetDirectory);
+        targetDirectory = fs.realpathSync(targetDirectory)
         const writtenFiles = new Set();
         const filesToWrite = new Map();
         for (const [filename, filecontent] of content) {
@@ -39,7 +38,7 @@ module.exports = class Extend extends BaseCommand {
         for (const [filepath, content] of [...filesToWrite.entries()]) {
             const normalizedFilepath = normalizePath(filepath);
             fse.mkdirpSync(path.dirname(normalizedFilepath));
-            fse.writeFileSync(normalizedFilepath, content);
+            fs.writeFileSync(normalizedFilepath, content);
             writtenFiles.add(path.relative(process.cwd(), normalizedFilepath));
             Extend._logWrittenFile(normalizedFilepath);
         }

package/lib/client/helper/fs_helper.js

@@ -1,10 +1,10 @@
+const fs = require('fs');
 const path = require('path');
-const { fse } = require('@sap/cds-foss');
 
 async function collectFileContent(filePaths, root) {
     const resultMap = new Map();
     filePaths.forEach((filePath) => {
-        const fileContent = fse.readFileSync(filePath);
+        const fileContent = fs.readFileSync(filePath);
         resultMap.set(toUnixPath(path.relative(root, filePath)), fileContent.toString('utf-8'));
     });
     return resultMap;
@@ -26,20 +26,20 @@ function collectFiles(root, sourceDir, filter) {
 
 function _traverseFileSystem(root, sourceDir, files, filter) {
     let absoluteDir = path.resolve(root, sourceDir);
-    if (!fse.existsSync(absoluteDir)) {
+    if (!fs.existsSync(absoluteDir)) {
         return;
     }
-    absoluteDir = fse.realpathSync(absoluteDir);
-    if (fse.statSync(absoluteDir)) {
-        fse.readdirSync(absoluteDir)
+    absoluteDir = fs.realpathSync(absoluteDir);
+    if (fs.statSync(absoluteDir)) {
+        fs.readdirSync(absoluteDir)
             .map(subDirEntry => path.join(absoluteDir, subDirEntry))
             .forEach(entry => {
-                const stats = fse.statSync(entry)
+                const stats = fs.statSync(entry)
                 if (stats.isDirectory()) {
                     _traverseFileSystem(root, entry, files, filter);
                 }
                 if (stats.isFile() && (!filter || filter.call(this, entry))) {
-                    const fileContent = fse.readFileSync(entry);
+                    const fileContent = fs.readFileSync(entry);
                     files.set(toUnixPath(path.relative(root, entry)), fileContent.toString('utf-8'));
                 }
             });

package/lib/client/settings_manager.js

@@ -1,3 +1,4 @@
+const fs = require('fs');
 const os = require('os');
 const path = require('path');
 const { fse } = require('@sap/cds-foss');
@@ -54,12 +55,14 @@ function other(tokenStorage) {
 }
 
 function getProjectFolder(params) {
-    const relativePath = params.get('projectFolder') || params.get('directory') || (
-        params.has('subdomain') && fse.existsSync(params.get('subdomain'))
-            ? params.get('subdomain')
-            : '.'
-    );
-    return fse.realpathSync(relativePath);
+    if (params.has('projectFolder')) {
+        const maybeExistentPath = path.resolve(params.get('projectFolder'));
+        return maybeExistentPath;
+    }
+    const existentPath = params.has('subdomain') && fs.existsSync(params.get('subdomain'))
+        ? params.get('subdomain')
+        : '.';
+    return fs.realpathSync(existentPath);
 }
 
 async function getAppUrlAndSubdomainFromSuggestions(params) {
@@ -348,7 +351,7 @@ class SettingsManager {
         const deletionUrlsAndSubdomains = new Set();
 
         Object.entries(settingsByFolder)
-            .filter(entry => ! fse.pathExistsSync(entry[0]))
+            .filter(entry => ! fs.existsSync(entry[0]))
             .forEach(entry => {
                 delete settingsByFolder[entry[0]];
                 deletionFolders.push(entry[0]);
@@ -433,7 +436,7 @@ class SettingsManager {
     static async _loadFromFile(projectFolder) {
         const all = !projectFolder;
 
-        if (!fse.existsSync(CONFIG.paths.settings)) {
+        if (!fs.existsSync(CONFIG.paths.settings)) {
             Logger.debug('Settings file absent');
             return emptyData(all);
         }
@@ -461,7 +464,7 @@ class SettingsManager {
     static async _loadAuthFromFile(appUrl, subdomain) {
         const all = !appUrl;
 
-        if (!fse.existsSync(CONFIG.paths.auth)) {
+        if (!fs.existsSync(CONFIG.paths.auth)) {
             Logger.debug('Authentication-data file absent');
             return emptyData(all);
         }