@sap/cds 6.0.2 → 6.1.0

package/lib/utils/cds-utils.js

@@ -0,0 +1,146 @@
+const cwd = process.env._original_cwd || process.cwd()
+const path = require ('path'), { dirname, extname, join, resolve, relative } = path
+const fs = require('fs')
+const cds = require('../index')
+
+const all = module.exports = exports = { ...fs,
+  get inspect() { return $set (this, 'inspect', require('util').inspect) },
+  get uuid() { return $set (this, 'uuid', require('@sap/cds-foss').uuid) },
+}
+
+exports.fs = all
+exports.path = path
+
+exports.local = (file) => relative(cwd,file)
+
+exports.readdir = async function (x) {
+  const d = resolve (cds.root,x)
+  return fs.promises.readdir(d)
+}
+
+exports.stat = async function (x) {
+  const d = resolve (cds.root,x)
+  return fs.promises.stat(d)
+}
+
+exports.exists = function exists (x) {
+  if (x) {
+    const y = resolve (cds.root,x)
+    return fs.existsSync(y)
+  }
+}
+
+exports.isdir = function isdir (x) {
+  if (x) try {
+    const y = resolve (cds.root,x)
+    const ls = fs.lstatSync(y)
+    if (ls.isDirectory()) return y
+    if (ls.isSymbolicLink()) return isdir (join (dirname(y), fs.readlinkSync(y)))
+  } catch(e){/* ignore */}
+}
+
+exports.isfile = function isfile (x) {
+  if (x) try {
+    const y = resolve (cds.root,x)
+    const ls = fs.lstatSync(y)
+    if (ls.isFile()) return y
+    if (ls.isSymbolicLink()) return isfile (join (dirname(y), fs.readlinkSync(y)))
+  } catch(e){/* ignore */}
+}
+
+exports.read = async function read (file, _encoding) {
+  const f = resolve (cds.root,file)
+  const src = await fs.promises.readFile (f, _encoding !== 'json' && _encoding || 'utf8')
+  return _encoding === 'json' || !_encoding && f.endsWith('.json') ? JSON.parse(src) : src
+}
+
+exports.write = function write (file, data, o) {
+  if (arguments.length === 1) return {to:(...path) => write(join(...path),file)}
+  if (typeof data === 'object' && !Buffer.isBuffer(data))
+    data = JSON.stringify(data, null, ' '.repeat(o && o.spaces))
+  const f = resolve (cds.root,file)
+  return mkdirp (dirname(f)).then (()=> fs.promises.writeFile (f,data,o))
+}
+
+exports.mkdirp = async function (...path) {
+  const d = resolve (cds.root,...path)
+  await fs.promises.mkdir (d,{recursive:true})
+  return d
+}
+
+exports.rmdir = (...path) => {
+  const d = resolve (cds.root,...path)
+  return (fs.promises.rm || fs.promises.rmdir) (d, {recursive:true})
+}
+
+exports.rimraf = (...path) => {
+  const d = resolve (cds.root,...path)
+  return (fs.promises.rm || fs.promises.rmdir) (d, {recursive:true,force:true})
+}
+
+exports.rm = async function rm (x) {
+  const y = resolve (cds.root,x)
+  return (fs.promises.rm || fs.promises.unlink)(y)
+}
+
+exports.copy = async function copy (x,y) {
+  const src = resolve (cds.root,x)
+  const dst = resolve (cds.root,y)
+  if (fs.promises.cp) return fs.promises.cp (src,dst,{recursive:true})
+  await mkdirp (dirname(dst))
+  if (isdir(src)) {
+    const entries = await fs.promises.readdir(src)
+    return Promise.all (entries.map (async each => {
+      const e = join (src,each)
+      const f = join (dst,each)
+      return copy (e,f)
+    }))
+  } else {
+    return fs.promises.copyFile (src,dst)
+  }
+}
+
+exports.find = function find (base, patterns='*', filter=()=>true) {
+  const files=[];  base = resolve (cds.root,base)
+  if (typeof patterns === 'string')  patterns = patterns.split(',')
+  if (typeof filter === 'string')  filter = this[filter]
+  patterns.forEach (pattern => {
+    const star = pattern.indexOf('*')
+    if (star >= 0) {
+      const head = pattern.slice(0,star).replace(/[^/\\]*$/,'')
+      const dir = join (base,head)
+      try {
+        const ls = fs.lstatSync(dir)
+        if (ls.isDirectory()) {
+          const [,suffix,tail] = /([^/\\]*)?(?:.(.*))?/.exec (pattern.slice(star+1))
+          const prefix = pattern.slice(head.length,star)
+          let entries = fs.readdirSync(dir) //.filter (_filter)
+          if (prefix)  entries = entries.filter (e => e.startsWith(prefix));  if (!entries.length) return
+          if (suffix)  entries = entries.filter (e => e.endsWith(suffix));  if (!entries.length) return
+          let paths = entries.map (e=>join(dir,e))
+          if (filter)  paths = paths.filter (filter);  if (!paths.length) return
+          if (tail)  for (let _files of paths.map (e=>find (e,tail,filter)))  files.push (..._files)
+          else  files.push (...paths)
+        }
+      } catch(e) {/* ignore */}
+    } else {
+      const file = join (base, pattern)
+      if (fs.existsSync(file))  files.push (file)
+    }
+  })
+  return files
+}
+
+
+// internal utility to load a file through ESM or CommonJs.  TODO find a better place.
+const { pathToFileURL } = require('url')
+exports._import = async function(filePath) {
+  return typeof jest !== 'undefined' || extname(filePath) === '.ts' // ts-node w/ ESM not working (cap/issues#11980)
+    ? require(filePath)
+    : import (pathToFileURL(filePath).href) // must use a file: URL, esp. on Windows for C:\... paths
+}
+
+
+/** @type <T>(o,p,v:T) => T */
+const $set = (o,p,v) => { Object.defineProperty(o,p,{value:v}); return v }
+const { mkdirp, isdir } = exports

package/lib/utils/index.js

@@ -1,136 +1,2 @@
-const cwd = process.env._original_cwd || process.cwd()
-const path = require ('path'), { dirname, join, resolve, sep, relative } = path
-const fs = require('fs')
-const cds = require('../index')
-
-const all = module.exports = exports = { ...fs,
-  get inspect() { return $set (this, 'inspect', require('util').inspect) },
-  get uuid() { return $set (this, 'uuid', require('@sap/cds-foss').uuid) },
-}
-
-exports.fs = all
-exports.path = path
-
-exports.local = (file) => relative(cwd,file)
-
-exports.readdir = async function (x) {
-  const d = resolve (cds.root,x)
-  return fs.promises.readdir(d)
-}
-
-exports.stat = async function (x) {
-  const d = resolve (cds.root,x)
-  return fs.promises.stat(d)
-}
-
-exports.exists = function exists (x) {
-  if (x) {
-    const y = resolve (cds.root,x)
-    return fs.existsSync(y)
-  }
-}
-
-exports.isdir = function isdir (x) {
-  if (x) try {
-    const y = resolve (cds.root,x)
-    const ls = fs.lstatSync(y)
-    if (ls.isDirectory()) return y
-    if (ls.isSymbolicLink()) return isdir (join (dirname(y), fs.readlinkSync(y)))
-  } catch(e){/* ignore */}
-}
-
-exports.isfile = function isfile (x) {
-  if (x) try {
-    const y = resolve (cds.root,x)
-    const ls = fs.lstatSync(y)
-    if (ls.isFile()) return y
-    if (ls.isSymbolicLink()) return isfile (join (dirname(y), fs.readlinkSync(y)))
-  } catch(e){/* ignore */}
-}
-
-exports.read = async function read (file, _encoding) {
-  const f = resolve (cds.root,file)
-  const src = await fs.promises.readFile (f, _encoding !== 'json' && _encoding || 'utf8')
-  return _encoding === 'json' || !_encoding && f.endsWith('.json') ? JSON.parse(src) : src
-}
-
-exports.write = function write (file, data, o) {
-  if (arguments.length === 1) return {to:(...path) => write(join(...path),file)}
-  if (typeof data === 'object' && !Buffer.isBuffer(data))
-    data = JSON.stringify(data, null, ' '.repeat(o && o.spaces))
-  const f = resolve (cds.root,file)
-  return mkdirp (dirname(f)).then (()=> fs.promises.writeFile (f,data,o))
-}
-
-exports.mkdirp = async function (...path) {
-  const d = resolve (cds.root,...path)
-  await fs.promises.mkdir (d,{recursive:true})
-  return d
-}
-
-exports.rmdir = (...path) => {
-  const d = resolve (cds.root,...path)
-  return (fs.promises.rm || fs.promises.rmdir) (d, {recursive:true})
-}
-
-exports.rimraf = (...path) => {
-  const d = resolve (cds.root,...path)
-  return (fs.promises.rm || fs.promises.rmdir) (d, {recursive:true,force:true})
-}
-
-exports.rm = async function rm (x) {
-  const y = resolve (cds.root,x)
-  return (fs.promises.rm || fs.promises.unlink)(y)
-}
-
-exports.copy = async function copy (x,y) {
-  const src = resolve (cds.root,x)
-  const dst = resolve (cds.root,y)
-  if (fs.promises.cp) return fs.promises.cp (src,dst,{recursive:true})
-  await mkdirp (dirname(dst))
-  if (isdir(src)) {
-    const entries = await fs.promises.readdir(src)
-    return Promise.all (entries.map (async each => {
-      const e = join (src,each)
-      const f = join (dst,each)
-      return copy (e,f)
-    }))
-  } else {
-    return fs.promises.copyFile (src,dst)
-  }
-}
-
-exports.find = function find (base, patterns='*', filter=()=>true) {
-  const files=[];  base = resolve (cds.root,base)
-  if (typeof patterns === 'string')  patterns = patterns.split(',')
-  if (typeof filter === 'string')  filter = this[filter]
-  patterns.forEach (pattern => {
-    const star = pattern.indexOf('*')
-    if (star >= 0) {
-      const head = pattern.slice(0,star).replace(/[^/\\]*$/,'')
-      const dir = join (base,head)
-      try {
-        const ls = fs.lstatSync(dir)
-        if (ls.isDirectory()) {
-          const [,suffix,tail] = /([^/\\]*)?(?:.(.*))?/.exec (pattern.slice(star+1))
-          const prefix = pattern.slice(head.length,star)
-          let entries = fs.readdirSync(dir) //.filter (_filter)
-          if (prefix)  entries = entries.filter (e => e.startsWith(prefix));  if (!entries.length) return
-          if (suffix)  entries = entries.filter (e => e.endsWith(suffix));  if (!entries.length) return
-          let paths = entries.map (e=>join(dir,e))
-          if (filter)  paths = paths.filter (filter);  if (!paths.length) return
-          if (tail)  for (let _files of paths.map (e=>find (e,tail,filter)))  files.push (..._files)
-          else  files.push (...paths)
-        }
-      } catch(e) {/* ignore */}
-    } else {
-      const file = join (base, pattern)
-      if (fs.existsSync(file))  files.push (file)
-    }
-  })
-  return files
-}
-
-/** @type <T>(o,p,v:T) => T */
-const $set = (o,p,v) => { Object.defineProperty(o,p,{value:v}); return v }
-const { mkdirp, isdir } = exports
+// for compatibility with old releases of cds-lint
+module.exports = require('./cds-utils')

package/lib/utils/jest.js

@@ -0,0 +1,43 @@
+let vm = require('vm')
+if (!vm.__caching__) {
+  vm.__caching__ = true
+  const scriptCache = {}
+  vm._Script = vm._Script || vm.Script
+  class CachedScript extends vm._Script {
+    constructor(src, options) {
+      const cached = scriptCache[options.filename]
+      if (cached) {
+        return cached
+      }
+      super(src, options)
+      // Assume that .test.js files are only loaded once
+      if (!options.filename.endsWith('.test.js')) {
+        scriptCache[options.filename] = this
+      }
+    }
+  }
+
+  vm.Script = CachedScript
+}
+vm = undefined
+
+let asyncHooks = require('async_hooks')
+if (!asyncHooks._AsyncLocalStorage) {
+  asyncHooks._AsyncLocalStorage = asyncHooks.AsyncLocalStorage
+  class TmpAsyncLocalStorage extends asyncHooks._AsyncLocalStorage {
+    disable() {
+      if (this._timer) clearTimeout(this._timer)
+      return super.disable()
+    }
+
+    _enable() {
+      if (this._timer) clearTimeout(this._timer)
+      this._timer = setTimeout(() => this.disable(), 60 * 1000)
+      this._timer.unref()
+      return super._enable()
+    }
+  }
+
+  asyncHooks.AsyncLocalStorage = TmpAsyncLocalStorage
+}
+asyncHooks = null

package/lib/utils/resources/index.js

@@ -1,36 +1,26 @@
 const fs = require('fs')
 const path = require('path')
 
-const cds = require('../../../libx/_runtime/cds')
-const { packArchive, packArchiveCLI, unpackArchive, unpackArchiveCLI } = require('./tar')
+const { packArchiveCLI, unpackArchiveCLI } = require('./tar')
 const { exists } = require('./utils')
 
-// use tar command line interface
 const TEMP_DIR = fs.realpathSync(require('os').tmpdir())
 
-const packTarArchive = async (files, root, flat = false, cli = true) => {
+const packTarArchive = async (files, root, flat = false) => {
+  if (typeof files === 'string') return await packArchiveCLI(files)
+  
   let tgzBuffer, temp
-
   try {
-    temp = await fs.promises.mkdtemp(`${TEMP_DIR}${path.sep}tar-`)
-    if (flat) {
-      const files_ = []
-      for (const file of files) {
-        const destination = path.join(temp, path.basename(file))
-        await fs.promises.copyFile(file, destination)
-        files_.push(destination)
-      }
-      files = files_
-      root = temp
+    temp = await fs.promises.mkdtemp(`${TEMP_DIR}${path.sep}tar-`)    
+    for (const file of files) {
+      const fname = flat ? path.basename(file) : path.relative(root, file)
+      const destination = path.join(temp, fname)
+      const dirname = path.dirname(destination)
+      if (!await exists(dirname)) await fs.promises.mkdir(dirname, { recursive: true })
+      await fs.promises.copyFile(file, destination)      
     }
 
-    const relativeFiles = files.map(file => path.relative(root, file))
-    if (cli) {
-      const output = path.relative(root, path.join(temp, `${cds.utils.uuid()}.tgz`))
-      tgzBuffer = await packArchiveCLI(relativeFiles, root, output)
-    } else {
-      tgzBuffer = await packArchive(relativeFiles, root)
-    }
+    tgzBuffer = await packArchiveCLI(temp)
   } finally {
     if (await exists(temp)) {
       await (fs.promises.rm || fs.promises.rmdir)(temp, { recursive: true, force: true })
@@ -40,13 +30,13 @@ const packTarArchive = async (files, root, flat = false, cli = true) => {
   return tgzBuffer
 }
 
-const unpackTarArchive = async (buffer, folder, cli = true) => {
+const unpackTarArchive = async (buffer, folder) => {
   const temp = await fs.promises.mkdtemp(`${TEMP_DIR}${path.sep}tar-`)
   const tgz = path.join(temp, 'resources.tgz')
   await fs.promises.writeFile(tgz, Buffer.from(buffer), 'binary')
 
   try {
-    cli ? await unpackArchiveCLI(tgz, folder) : await unpackArchive(tgz, folder)
+    await unpackArchiveCLI(tgz, folder)
   } finally {
     if (await exists(temp)) await (fs.promises.rm || fs.promises.rmdir)(temp, { recursive: true, force: true })
   }

package/lib/utils/resources/tar.js

@@ -1,21 +1,13 @@
 const fs = require('fs')
 const path = require('path')
 const exec = require('child_process').exec
+const cds = require('../../../libx/_runtime/cds')
+const { exists } = require('./utils')
 
-const _createArchive = (files, root) => {
-  const tar = require('tar')
-  return tar.c(
-    {
-      gzip: true,
-      preservePaths: false,
-      cwd: root
-    },
-    files
-  )
-}
+const TEMP_DIR = fs.realpathSync(require('os').tmpdir())
 
-const _createArchiveCLI = (files, root, output) => {
-  const cmd = 'cd ' + root + ' && tar -czf ' + output + ' ' + files.join(' ')
+const _createArchiveCLI = (root, output) => {
+  const cmd = 'tar -zcvf ' + output + ' -C ' + root + '  .'
 
   return new Promise((resolve, reject) => {
     exec(cmd, err => {
@@ -25,32 +17,19 @@ const _createArchiveCLI = (files, root, output) => {
   })
 }
 
-const packArchive = (files, root) => {
-  _createArchive(files, root)
-  const stream = _createArchive(files, root)
-  return new Promise((resolve, reject) => {
-    const chunks = []
-    stream.on('data', data => chunks.push(data))
-    stream.on('error', error => reject(error))
-    stream.on('end', () => {
-      resolve(Buffer.concat(chunks))
-    })
-  })
-}
-
-const packArchiveCLI = async (files, root, output) => {
-  await _createArchiveCLI(files, root, output)
-
-  return fs.promises.readFile(path.join(root, output))
-}
-
-const unpackArchive = async (tgz, folder) => {
-  const tar = require('tar')
-  await tar.x({
-    file: tgz,
-    gzip: true,
-    C: folder
-  })
+const packArchiveCLI = async (root) => {
+  const temp = await fs.promises.mkdtemp(`${TEMP_DIR}${path.sep}tar-`)
+  const output = path.join(temp, `${cds.utils.uuid()}.tgz`)
+  try {
+    await _createArchiveCLI(root, output)
+
+    return fs.promises.readFile(output)
+  }
+  finally {
+    if (await exists(temp)) {
+      await (fs.promises.rm || fs.promises.rmdir)(temp, { recursive: true, force: true })
+    }
+  }
 }
 
 const unpackArchiveCLI = async (tgz, folder) => {
@@ -65,8 +44,6 @@ const unpackArchiveCLI = async (tgz, folder) => {
 }
 
 module.exports = {
-  packArchive,
   packArchiveCLI,
-  unpackArchive,
   unpackArchiveCLI
 }

package/libx/_runtime/auth/index.js

@@ -57,7 +57,7 @@ const _log = (req, challenges) => {
   LOG.debug(`User "${req.user.id}" request URL`, req.url, '\n', ...challengesLog)
 }
 
-const _authCallback = (req, res, next, internalError, user, challenges) => {
+const cap_auth_callback = (req, res, next, internalError, user, challenges) => {
   // An internal error occurs during the authentication process
   if (internalError) {
     // REVISIT: What to do? Security log?
@@ -83,7 +83,7 @@ const _authCallback = (req, res, next, internalError, user, challenges) => {
 
 const _mountCustomAuth = (srv, app, config) => {
   const impl = cds.resolve(config.impl)
-  app.use(srv.path, _require(impl))
+  app.use(_require(impl))
 }
 
 const _mountMockAuth = (srv, app, strategy, config) => {
@@ -92,12 +92,12 @@ const _mountMockAuth = (srv, app, strategy, config) => {
       ? new (require('./strategies/dummy'))()
       : new (require('./strategies/mock'))(config, `mock_${srv.name}`)
 
-  app.use(srv.path, (req, res, next) => {
+  app.use(function cap_auth(req, res, next) {
     let user, challenge
     impl.success = arg => (user = arg)
     impl.fail = arg => (challenge = arg)
     impl.authenticate(req)
-    _authCallback(req, res, next, undefined, user, [challenge])
+    cap_auth_callback(req, res, next, undefined, user, [challenge])
   })
 }
 
@@ -119,10 +119,10 @@ const _mountPassportAuth = (srv, app, strategy, config) => {
   }
 
   // authenticate
-  app.use(srv.path, passport.initialize())
-  app.use(srv.path, (req, res, next) => {
+  app.use(passport.initialize())
+  app.use((req, res, next) => {
     const options = { session: false, failWithError: true }
-    const callback = _authCallback.bind(undefined, req, res, next)
+    const callback = cap_auth_callback.bind(undefined, req, res, next)
     passport.authenticate(strategy === 'jwt' ? 'JWT' : strategy, options, callback)(req, res, next)
   })
 }
@@ -131,7 +131,9 @@ const _mountPassportAuth = (srv, app, strategy, config) => {
  * export authentication middleware
  */
 // eslint-disable-next-line complexity
-module.exports = (srv, app, options) => {
+module.exports = (srv, options = srv.options) => {
+  const handlers = [],
+    app = { use: h => handlers.push(h) }
   // NOTE: options.auth is not an official API
   let config = 'auth' in options ? options.auth : cds.env.requires.auth
   if (!config) {
@@ -147,7 +149,7 @@ module.exports = (srv, app, options) => {
       LOG._warn && LOG.warn(`No authentication configured. This is not recommended in production.`)
     }
     // no auth wanted > return
-    return
+    return handlers
   }
 
   // cds.env.requires.auth = { kind: 'xsuaa-auth' } was briefly documented on capire -> also support
@@ -181,11 +183,12 @@ module.exports = (srv, app, options) => {
     (process.env.NODE_ENV === 'production' && config.credentials && config.restrict_all_services)
   ) {
     if (!logged) LOG._debug && LOG.debug(`Enforcing authenticated users for all services`)
-    app.use(srv.path, _enforce_authenticated_user)
+    app.use(_enforce_authenticated_user)
   }
 
   // so we don't log the same stuff multiple times
   logged = true
+  return handlers
 }
 
 const _strategy4 = config => {

package/libx/_runtime/cds-services/adapter/odata-v4/OData.js

@@ -107,8 +107,7 @@ class OData {
   constructor(edm, csn, options = {}) {
     this._validateEdm(edm)
     this._options = options
-    this._csn = csn
-    this._createOdataService(edm)
+    this._createOdataService(edm, csn)
   }
 
   _validateEdm(edm) {
@@ -118,7 +117,7 @@ class OData {
     }
   }
 
-  _createOdataService(edm) {
+  _createOdataService(edm, csn) {
     const ServiceFactory = require('./okra/odata-server').ServiceFactory
 
     // skip okra's validation in production or implicitly for w4 and x4
@@ -133,7 +132,7 @@ class OData {
       effective.odata.proxies ||
       effective.odata.xrefs
 
-    this._odataService = ServiceFactory.createService(edm, _config(edm, this._csn, this._options)).trust(isTrusted)
+    this._odataService = ServiceFactory.createService(edm, _config(edm, csn, this._options)).trust(isTrusted)
 
     // will be added to express app like app.use('/base/path/', service) and odata-v4 wants app.use('/', service) if basePath is set
     this._odataService.setBasePath('/')
@@ -162,10 +161,10 @@ class OData {
       const txs = (data.txs = data.txs || {})
       const {
         req: { user },
-        req
+        req,
+        res
       } = data
-      // REVISIT: _model should not be necessary
-      const tx = (txs[odataContext.id] = cdsService.tx({ user, req, _model: cdsService.model }))
+      const tx = (txs[odataContext.id] = cdsService.tx({ user, req, res }))
       cds.context = tx.context
       // for collecting results and errors
       data.results = data.results || {}
@@ -182,19 +181,8 @@ class OData {
       if (errors) {
         // rollback without errors to not trigger srv.on('error') with array
         await tx.rollback()
-        // invoke srv.on('error') for each error and build failedRequests that reflects error modifications
-        errors = odataContext.applicationData.errors[odataContext.id]
-        const failedRequests = {}
-
-        for (const e of errors) {
-          const { error: err, req } = e
-          for (const each of cdsService._handlers._error) each.handler.call(cdsService, err, req)
-          const requestId = req._.odataReq.getOdataRequestId()
-          const { error, statusCode } = normalizeError(err, req)
-          failedRequests[requestId] = Object.assign(error, { statusCode })
-        }
-
-        done(new Error(`Atomicity group "${odataContext.id}" failed`), { failedRequests })
+
+        done()
         return
       }
 
@@ -225,6 +213,7 @@ class OData {
     this._odataService.use(DATA_DELETE_HANDLER, _delete(cdsService))
 
     this._odataService.use(ACTION_EXECUTE_HANDLER, _action(cdsService))
+    return this
   }
 
   /**

package/libx/_runtime/cds-services/adapter/odata-v4/ODataRequest.js

@@ -163,12 +163,9 @@ class ODataRequest extends cds.Request {
        */
       const { user } = req
 
-      // REVISIT: _model should not be necessary
-      const _model = service.model
-
       // REVISIT: public API for query options (express style req.query already in use)?
       const _queryOptions = odataReq.getQueryOptions()
-      super({ event, target, data, query, user, method, headers, req, res, _model, _queryOptions })
+      super({ event, target, data, query, user, method, headers, req, res, _queryOptions })
     }
 
     /*