@sap/cds 5.7.2 → 5.8.0

package/libx/rest/middleware/parse.js

@@ -35,6 +35,7 @@ module.exports = (req, res, next) => {
 
   // query based on method
   switch (req.method) {
+    case 'HEAD':
     case 'GET':
       if (operation) {
         // function

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds",
-  "version": "5.7.2",
+  "version": "5.8.0",
   "description": "SAP Cloud Application Programming Model - CDS for Node.js",
   "homepage": "https://cap.cloud.sap/",
   "keywords": [

package/server.js

@@ -92,7 +92,7 @@ const defaults = {
   get logger() {
     const LOG = cds.log(), DEBUG = cds.debug('server')
     return (req,_,next) => {
-      LOG && LOG (req.method, decodeURI(req.url))
+      LOG && LOG (req.method, decodeURI(req.url), req.body||'')
       if (/\$batch/.test(req.url))  req.on ('dispatch', (req) => {
         LOG && LOG ('>', req.event, decodeURI(req._path), req._query||'')
         if (DEBUG && req.query) DEBUG (req.query)

package/bin/deploy/to-hana/logger.js

@@ -1,27 +0,0 @@
-module.exports = {
-
-    defaultLogger: {
-        ...console,
-        isTTY: () => {
-            return process.stdout.isTTY;
-        },
-        write: (message, clearLine) => {
-            if (clearLine && process.stdout.isTTY) {
-                process.stdout.clearLine();  // clear the line
-                process.stdout.cursorTo(0);  // move cursor to begin of line
-            }
-            process.stdout.write(message);
-        }
-    },
-
-    nullLogger: {
-        log: () => { },
-        error: () => { },
-        debug: () => { },
-        warn: () => { },
-        write: () => { },
-        time: () => { },
-        timeEnd: () => { },
-        isTTY: () => { }
-    }
-}

package/bin/deploy/to-hana/runCommand.js

@@ -1,113 +0,0 @@
-module.exports = runCommand;
-
-const cp = require('child_process');
-const { nullLogger } = require('./logger');
-const term = require('../../utils/term');
-
-const IS_DEBUG = process.env.DEBUG;
-const TIMEOUT = 2 * 60 * 1000; // 2min
-
-function _removeColorCodes(chunk) {
-  // eslint-disable-next-line no-control-regex
-  return chunk.replace(/\x1b\[[;\d]*m/g, '');
-}
-
-// start kill timer, reset everytime a chunk arrives
-function _startTimer(oldTimer, spawnedProcess, timeOut) {
-  clearTimeout(oldTimer);
-
-  return setTimeout(() => {
-    spawnedProcess.kill();
-  }, timeOut);
-}
-
-function _getTimeKey(cmd, args = []) {
-  return `[cds.deploy] - ${cmd} ${args.join(' ')}`;
-}
-
-function _validate(cmd, cmdArgs = []) {
-  // validate input
-  if (/[|&;]+/g.exec(cmd)) {
-    throw new Error(`[cds.deploy] - Command ${cmd} contains at least one bad character (|, &, or ;) which might be used to concatenate commands.`);
-  }
-
-  cmdArgs.forEach((arg) => {
-    if (/[|&;]+/g.exec(arg)) {
-      throw new Error(`[cds.deploy] - Argument ${arg} contains at least one bad character (|, &, or ;) which might be used to concatenate commands.`);
-    }
-  });
-}
-
-function runCommand(cmd, cmdArgs = [], logger = nullLogger, options = {}, timeOut = TIMEOUT) {
-
-  _validate(cmd, cmdArgs);
-
-  return new Promise((resolve, reject) => {
-
-    try {
-
-      if (IS_DEBUG) {
-        logger.time(_getTimeKey(cmd, cmdArgs));
-      }
-
-      logger.log();
-      logger.log(`[cds.deploy] - Running '${term.as(term.codes.bold, cmd + ' ' + cmdArgs.join(' '))}' with options ${JSON.stringify(options)}`);
-
-      const spawnOptions = { ...options, cwd: process.env._TEST_CWD || process.cwd() };
-      spawnOptions.env = Object.assign (process.env, {CF_COLOR:logger.isTTY()}, options.env)
-
-      const spawnedProcess = cp.spawn(cmd, cmdArgs, spawnOptions);
-      let spawnTimer = _startTimer(null, spawnedProcess, timeOut);
-
-      let stdout = '';
-      let stderr = '';
-
-      if (!options.stdio) {
-        spawnedProcess.stdout.on('data', (data) => {
-          spawnTimer = _startTimer(spawnTimer, spawnedProcess, timeOut);
-          const chunk = data.toString();
-          stdout = stdout + chunk;
-          logger.write(chunk);
-        });
-
-        spawnedProcess.stderr.on('data', (data) => {
-          spawnTimer = _startTimer(spawnTimer, spawnedProcess, timeOut);
-          const chunk = data.toString();
-          stderr = stderr + chunk;
-          logger.write(chunk);
-        });
-      }
-
-      spawnedProcess.on('error', (err) => {
-        reject(err);
-      });
-
-      spawnedProcess.on('close', (code, signal) => {
-        clearTimeout(spawnTimer);
-
-        if (IS_DEBUG) {
-          logger.timeEnd(_getTimeKey(cmd, cmdArgs));
-        }
-
-        if (!signal) {
-          // exited normally
-          stdout = _removeColorCodes(stdout);
-          stderr = _removeColorCodes(stderr);
-          resolve({ code, stdout, stderr });
-        } else {
-          // sigterm if timer kills spawned process
-          const spawnError = new Error(`[cds.deploy] - Failed with signal '${signal}' and code ${code}`);
-          spawnError.args = cmdArgs;
-          spawnError.options = options;
-          spawnError.stdout = stdout;
-          spawnError.stderr = stderr;
-          spawnError.signal = signal;
-          reject(spawnError);
-        }
-      });
-    } catch (err) {
-      reject(err);
-    }
-
-  });
-}

package/libx/_runtime/cds-services/adapter/odata-v4/odata-to-cqn/selectHelper.js

@@ -1,37 +0,0 @@
-const { getFeatureNotSupportedError } = require('../../../util/errors')
-const { deepCopyArray } = require('../../../../common/utils/copy')
-const cds = require('../../../../cds')
-const { cqn2cqn4sql } = require('../../../../common/utils/cqn2cqn4sql')
-
-const isNavigation = pathSegments => {
-  return pathSegments.length > 1 && pathSegments[1].getKind().startsWith('NAVIGATION')
-}
-
-const isViewWithParams = target => {
-  return target.params && Object.keys(target.params).length > 0
-}
-
-const getValidationQuery = (ref, model) => {
-  const refQuery = deepCopyArray(ref.slice(0, ref.length - 1))
-  const cqn = cds.ql.SELECT.from({ ref: refQuery }).columns({
-    val: 1,
-    as: 'validationQuery'
-  })
-
-  return cqn2cqn4sql(cqn, model)
-}
-
-const isPathSupported = (supported, pathSegments) => {
-  for (const segment of pathSegments) {
-    if (!supported[segment.getKind()]) {
-      throw getFeatureNotSupportedError(`Request parameter "${segment.getKind()}"`)
-    }
-  }
-}
-
-module.exports = {
-  isNavigation,
-  isViewWithParams,
-  isPathSupported,
-  getValidationQuery
-}

package/libx/_runtime/common/utils/auth.js

@@ -1,16 +0,0 @@
-const UNAUTHORIZED = { statusCode: 401, code: '401', message: 'Unauthorized' }
-const FORBIDDEN = { statusCode: 403, code: '403', message: 'Forbidden' }
-
-const getRequiresAsArray = definition => {
-  if (!definition['@requires']) {
-    return []
-  }
-
-  return Array.isArray(definition['@requires']) ? definition['@requires'] : [definition['@requires']]
-}
-
-module.exports = {
-  UNAUTHORIZED,
-  FORBIDDEN,
-  getRequiresAsArray
-}