@sap/cds-dk 7.1.1 → 7.3.0

package/lib/init/template/postgres/files/package.json.hbs

@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "@cap-js/postgres": "^1"
+  }
+}

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

@@ -0,0 +1,52 @@
+const { join } = require('path')
+const cds = require('../../../cds')
+const { read } = cds.utils
+const { readProject } = require('../../util/projectReader')
+const { mergeJSON, mergeYAML } = require('../../util/merge')
+const { srvNode4, srvJava4, postgres, postgresDeployer } = require('../_merging/registry-mta')
+
+module.exports = class PostgresTemplate extends require('../templateBase') {
+
+  async canRun() {
+    const { hasMta, hasHelm, isJava } = await readProject(this.options)
+    if (isJava)             throw `'cds add postgres' is not available for Java yet`
+    if (hasHelm && !hasMta) throw `'cds add postgres' is not available for Kyma yet`
+    return true
+  }
+
+  static hasFacet(env) {
+    return env.requires?.db?.kind === 'postgres'
+  }
+
+  async run() {
+    const project = await readProject(this.options)
+    const { configFile } = project
+    project.shortcut = !(await read(configFile)).cds?.requires?.db?.kind
+    await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), project)
+    await this.runDependentMerging()
+  }
+
+  async runDependentMerging() {
+    const project = await readProject(this.options)
+    const { hasMta, isNodejs, srvPath } = project
+
+    if (hasMta) {
+      const srv = (isNodejs ? srvNode4 : srvJava4)(srvPath)
+      await mergeYAML(
+          'mta.yaml',
+          join(__dirname, 'files', 'mta.yaml.hbs'),
+          project,
+          {
+              additions: [srv, postgres, postgresDeployer],
+              relationships: [{
+                  insert: [postgres, 'name'],
+                  into: [srv, 'requires', 'name']
+              }, {
+                insert: [postgres, 'name'],
+                into: [postgresDeployer, 'requires', 'name']
+            }]
+          }
+      )
+    }
+  }
+}

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

@@ -1,7 +1,6 @@
 const { join } = require('path')
-const cds = require('../../../cds'), { exists } = cds.utils
+const cds = require('../../../cds'), { exists, copy } = cds.utils
 const { readProject } = require('../../util/projectReader')
-const { copyFiles } = require('../../util/template')
 
 module.exports = class SampleTemplate extends require('../templateBase') {
 
@@ -14,12 +13,11 @@ module.exports = class SampleTemplate extends require('../templateBase') {
     async run() {
         const { db, srv, app } = (await this.getEnv()).folders
         const language = exists('pom.xml') ? 'java' : 'nodejs'
-        const { force } = cds.cli.options
         await Promise.all([
-          copyFiles(join(__dirname, 'files', 'db'),  db, {}, force),
-          copyFiles(join(__dirname, 'files', 'app'), app, {}, force),
-          copyFiles(join(__dirname, 'files', 'srv'), srv, {}, force),
-          copyFiles(join(__dirname, 'files', language), srv, {}, force)
+          copy(join(__dirname, 'files', 'db')).to(db),
+          copy(join(__dirname, 'files', 'app')).to(app),
+          copy(join(__dirname, 'files', 'srv')).to(srv),
+          copy(join(__dirname, 'files', language)).to(srv)
         ])
     }
 }

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

@@ -1,6 +1,7 @@
 const { join } = require('path')
 const cds = require('../../../cds')
 const { read } = cds.utils
+const mvn = require('../../util/mvn')
 const { readProject } = require('../../util/projectReader')
 const { mergeJSON } = require('../../util/merge')
 
@@ -8,8 +9,12 @@ module.exports = class SQLiteTemplate extends require('../templateBase') {
 
     async run() {
       const project = await readProject()
-      const { configFile } = project
-      project.shortcut = !(await read(configFile)).cds?.requires?.db?.kind
-      await mergeJSON(configFile, join(__dirname, 'files', `package.json.hbs`), project)
+      const { isNodejs, isJava, configFile } = project
+      if (isNodejs) {
+        project.shortcut = !(await read(configFile)).cds?.requires?.db?.kind
+        await mergeJSON(configFile, join(__dirname, 'files', `package.json.hbs`), project)
+      } else if (isJava) {
+        await mvn.add('sqlite')
+      }
     }
 }

package/lib/init/template/tiny-sample/index.js

@@ -1,39 +1,25 @@
 const { join } = require('path')
-const cds = require('../../../cds')
-const { copyFiles } = require('../../util/template')
-const commandUtil = require('../../../util/command')
-const mvnArchetypes = require('../../util/mvn')
-const term = require('../../../util/term')
-const { PROJECT_TYPE: { java, nodejs }, OPTIONS: { JAVA }, URLS } = require('../../constants')
+const cds = require('../../../../lib/cds'), { copy } = cds.utils
+const { renderAndCopy } = require('../../util/template')
+const mvn = require('../../util/mvn')
+const { readProject } = require('../../util/projectReader')
+const { JAVA } = require('../../constants')
 
 module.exports = class TinySampleTemplate extends require('../templateBase') {
 
     async run() {
-        switch (this.getProjectType()) {
-            case java:   return this._addJavaSamples()
-            case nodejs: return this._addNodejsSamples()
-        }
-    }
-
-    async _addJavaSamples() {
-        if (!cds.cli.options.add.has(JAVA)) {
-            const mvnAddSamplesArgs = mvnArchetypes.getAddSamplesCmdArgs()
-            try {
-                await commandUtil.spawnCommand('mvn', mvnAddSamplesArgs, { cwd: cds.root })
-                const mvnAddTestsArgs = mvnArchetypes.getAddTestsCmdArgs()
-                await commandUtil.spawnCommand('mvn', mvnAddTestsArgs, { cwd: cds.root })
-            } catch (err) {
-                if (err.code === 'ENOENT' && err.path === 'mvn') {
-                    throw `Maven executable 'mvn' not found, follow ${term.info(URLS.MAVEN_INSTALL_HELP)} and install Maven on your machine.`
-                }
-                throw err
+        const { isJava } = await readProject()
+        if (isJava) {
+            if (!cds.cli.options.add.has(JAVA)) {
+                await mvn.execMvn(mvn.getAddSamplesCmdArgs())
+                await mvn.execMvn(mvn.getAddTestsCmdArgs())
             }
+        } else {
+            const { db, srv } = (await this.getEnv()).folders
+            await Promise.all([
+                copy(join(__dirname, 'files', 'nodejs', 'db')).to(db),
+                renderAndCopy(join(__dirname, 'files', 'nodejs', 'srv'), srv, { dbFolder: db.replace(/[\\/]+$/, '') })
+            ])
         }
     }
-
-    async _addNodejsSamples() {
-        const { db, srv } = (await this.getEnv()).folders
-        await copyFiles(join(__dirname, 'files', 'nodejs', 'db'), db, {}, cds.cli.options.force)
-        await copyFiles(join(__dirname, 'files', 'nodejs', 'srv'), srv, { dbFolder: db.replace(/[\\/]+$/, '') }, cds.cli.options.force)
-    }
 }

package/lib/init/util/mvn.js

@@ -33,7 +33,6 @@ class MvnArchetypeUtil {
     }
 
     _finalize(params) {
-        // `-DcdsVersion=3.0.0`,
         params.set(`-Dstyle.color`, `always`);
 
         params.set('-B');
@@ -48,6 +47,31 @@ class MvnArchetypeUtil {
         return Array.from(params, ([arg, val]) => val !== null && val !== undefined ? `${arg}=${val}` : arg)
     }
 
+    // REVISIT: make this only public API once mvn:addSample etc. have been moved to generic mvn:add
+    async add(feature) {
+        return this.execMvn(this.getAddArgs(feature))
+    }
+
+    getAddArgs(feature) {
+        const params = new Map();
+
+        params.set(`com.sap.cds:cds-maven-plugin:${MAVEN_ARCHETYPE_VERSION}:add`);
+        params.set(`-Dfeature`, feature)
+        const profile = cds.cli.options.for
+        params.set(`-Dprofile`, profile === 'production' ? 'cloud' : profile)
+
+        const { options } = cds.cli
+        if (options[JAVA_MVN]) {
+            this._scanMvnParams(options[JAVA_MVN], params);
+        }
+
+        if (options.force) {
+            params.set(`-Doverwrite`, true);
+        }
+
+        return this._finalize(params);
+    }
+
     getAddSamplesCmdArgs() {
         const params = new Map();
 

package/lib/init/util/projectReader.js

@@ -2,6 +2,7 @@ const cds = require('../../cds')
 const { join, resolve, basename } = require('path')
 const { fs, exists } = cds.utils
 const { parseXml } = require('./xml')
+const { REGEX_JAVA_VERSION } = require('../constants')
 const DEBUG = cds.debug('cli')
 
 module.exports = new class ProjectReader {
@@ -18,12 +19,7 @@ module.exports = new class ProjectReader {
         if (exists('pom.xml')) {
             const { artifactId = [], description = [], version = [], properties = [] } = parseXml(resolve(cds.root, 'pom.xml')) ?? {}
             const v = version[0] === '${revision}' ? properties[0]?.revision[0] : version[0]
-            if (v) {
-                // check compliance with mta version format - copied from mbt error message
-                if (/^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(-(0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(\.(0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*)?(\+[0-9a-zA-Z-]+(\.[0-9a-zA-Z-]+)*)?$/.test(v)) {
-                    this.appVersion = v
-                }
-            }
+            if (v && REGEX_JAVA_VERSION.test(v)) this.appVersion = v
             if (artifactId[0])  this.appName = this.appId = artifactId[0].split(/-parent/)[0]
             if (description[0]) this.appDescription = description[0]
         }
@@ -79,7 +75,6 @@ module.exports = new class ProjectReader {
             get isExtensible()   { return _hasFacet('extensibility') },
             get hasHana()        { return _hasFacet('hana') },
             get hasXsuaa()       { return _hasFacet('xsuaa') },
-            get hasAuditlog()    { return _hasFacet('auditlog') },
             get hasApprouter()   { return _hasFacet('approuter') },
             get hasDestination() { return _hasFacet('destination') },
             get hasHtml5Repo()   { return _hasFacet('html5-repo') },

package/lib/init/util/template.js

@@ -1,7 +1,8 @@
 const Mustache = require('mustache')
-const { copy, read, write, exists, readdir, path, isdir } = require('../../cds').utils
+const cds = require('../../cds')
+const { copy, read, write, exists, readdir, path, isdir } = cds.utils
 
-async function copyFiles(from, into, replacements, overwrite = false) {
+async function renderAndCopy(from, into, replacements, overwrite = cds.cli.options.force) {
     const dirents = await readdir(from)
     await Promise.all(dirents.map(async dirent => {
         const fileNew = Mustache.render(dirent, replacements)
@@ -9,7 +10,7 @@ async function copyFiles(from, into, replacements, overwrite = false) {
         const dest = path.join(into, fileNew)
 
         if (isdir(src)) {
-            return copyFiles(path.join(from, dirent), dest, replacements, overwrite)
+            return renderAndCopy(path.join(from, dirent), dest, replacements, overwrite)
         } else if (path.extname(dirent) === '.hbs') {
             const destinationPath = dest.replace('.hbs', '')
             if (overwrite || !exists(destinationPath)) {
@@ -23,11 +24,11 @@ async function copyFiles(from, into, replacements, overwrite = false) {
 }
 
 async function render(src, templateValues) {
-    const content = await read(src, 'utf-8');
-    return Mustache.render(content, templateValues);
+    const content = await read(src, 'utf-8')
+    return Mustache.render(content, templateValues)
 }
 
 module.exports = {
     render,
-    copyFiles
+    renderAndCopy
 }

package/lib/util/pruneAxiosErrors.js

@@ -1,19 +1,33 @@
+function stacklessError(message) {
+    const { stackTraceLimit } = Error;
+    Error.stackTraceLimit = 0;
+    const error = new Error(message);
+    Error.stackTraceLimit = stackTraceLimit;
+    return error;
+}
+
 require('axios').interceptors.response.use(
     response => response,
     axError => {
+        const { inspect } = require('util');
         const { url, method } = axError.config ?? {};
-        const { code, response } = axError;
-        const { status, data } = response ?? {};
-        const reason = data?.error /* RFC 6749 */ ?? axError.message;
+        const { response = {} } = axError;
+        const { status, statusText } = response;
+        let { data } = response;
+        if (Buffer.isBuffer(data)) {
+            data = JSON.parse(data.toString());
+        }
+        const reason = data?.error /* RFC 6749 */ && (typeof data.error === 'string' ? data.error : inspect(data.error));
         const message = (url && method ? `${method.toUpperCase()} ${url} ` : '') +
             'failed' +
-            (status || code ? ':' : '') +
+            (status || statusText ? ':' : '') +
             (status ? ` ${status}` : '') +
-            (code ? ` ${code}` : '') +
-            `. ${reason}.` +
-            (data ? ` Details: '${data.error_description /* RFC 6749 */ || require('util').inspect(data)}'.` : '');
+            (statusText ? ` ${statusText}` : '') +
+            (reason ? `. ${reason}` : '') +
+            (data ? `. Details: '${data.error_description /* RFC 6749 */ || inspect(data)}'` : '');
 
-        const error = new Error(message);
+        const error = stacklessError(message);
+        error.status = status;
         if (require('../').debug('req')) {
             error.cause = axError;
         }

package/lib/watch/node-watch.js

@@ -1,5 +1,6 @@
 const cds = require ('../cds')
 const DEBUG = cds.debug('cli|watch')
+const { relative } = require('path')
 
 module.exports = ({ cwd, script, ext, includes=RegExp(), ignore=RegExp(), env={}, delay=200, options={} })=>{
 
@@ -52,7 +53,11 @@ module.exports = ({ cwd, script, ext, includes=RegExp(), ignore=RegExp(), env={}
   // Watching for touched files...
   const watch = require('node-watch')
   const include = RegExp(`\\.(${ext.replace(/,/g,'|')})$|${includes.source}`)
-  const filter = f => !ignore.test(f) && include.test(f)
+  const filter = f => {
+    const isIn = !ignore.test(f) && include.test(f)
+    if (!isIn)  DEBUG?. (`ignored: ${relative(cwd||process.cwd(), f)}`)
+    return isIn
+  }
   const watcher = watch (cwd||process.cwd(),{ recursive:true, filter, delay:0 })
   if (DEBUG) watcher.on('close', ()=> DEBUG('⚡️', 'cds watch - file watcher closed'))
   watcher.on('change', restart)