@sap/cds 6.3.1 → 6.3.2

package/CHANGELOG.md

@@ -4,9 +4,20 @@
 - The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - This project adheres to [Semantic Versioning](http://semver.org/).
 
+## Version 6.3.2 - 2022-11-21
+
+### Fixed
+
+- `cds deploy` reports errors correctly
+- Reference resolution in QL API
+- `cds.parse.path` to correctly handle special characters
+- `cds build` issues on Windows: build with large number of files and build on Git Bash.
+- `odata` as default protocol for enabled middlewares feature
+
 ## Version 6.3.1 - 2022-11-04
 
 ### Fixed
+
 - `cds build` no longer reports false positive validation errors for built-in MTX models like `@sap/cds/srv/mtx` or `@sap/cds-mtxs/srv/bootstrap`
 - `cds deploy` handles empty result from `cf` call correctly
 - `$search` fails on columns composed by a CQL expression that uses the SAP HANA `coalesce` predicate

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

@@ -88,9 +88,10 @@ class CfUtil {
         }
 
         if (response.errors) {
-            const errorMessage = result.errors.map((entry) => `${entry.title}: ${entry.detail} (${entry.code})`).join('\n');
+            const errorMessage = response.errors.map((entry) => `${entry.title || ''}: ${entry.detail || ''} (${entry.code || ''})`).join('\n');
             throw new Error(errorMessage);
         }
+
         return response;
     }
 

package/lib/compile/parse.js

@@ -16,7 +16,8 @@ const parse = module.exports = Object.assign (cds_parse, {
   }},
   path: (x,...values) => {
     if (x && x.raw) return tagged (parse.path,x,...values)
-    if (/^[A-Za-z_$][A-Za-z_0-9.$]*$/.test(x)) return {ref:[x]}
+    if (/^[A-Za-z_0-9.$]*$/.test(x)) return {ref:[x]}
+    if ((cds.context?.model || cds.model)?.definitions[x]) return {ref:[x]}
     let {SELECT} = parse.cql('SELECT from '+x)
     return SELECT.from
   },

package/lib/srv/protocols/index.js

@@ -10,7 +10,9 @@ class ProtocolAdapter {
     for (let [k,o] of Object.entries(protocols)) if (typeof o === 'string') protocols[k] = {path:o}
     if (!protocols.odata) protocols.odata = { impl: join(__dirname,'odata-v4') }
     if (!protocols.rest) protocols.rest = { impl: join(__dirname,'rest') }
-    return this.protocols = protocols
+    
+    // odata must always be first for fallback
+    return this.protocols = { odata: protocols.odata, ...protocols }
   }
 
   /**

package/lib/utils/tar.js

@@ -5,7 +5,7 @@ const spawn = /\btar\b/.test(process.env.DEBUG) ? (cmd, args, options) => {
   return child_process.spawn(cmd, args, options)
 } : child_process.spawn
 
-const cds = require('../index'), { fs, path, mkdirp } = cds.utils
+const cds = require('../index'), { fs, path, mkdirp, exists, rimraf } = cds.utils
 const _resolve = (...x) => path.resolve (cds.root,...x)
 
 // tar does not work properly on Windows (by npm/jest tests) w/o this change
@@ -15,6 +15,21 @@ const win = path => {
   if (Array.isArray(path)) return path.map(el => win(el))
 }
 
+// Copy files to temp dir on Windows and pack temp dir.
+// cli tar has a size limit on Windows.
+const createTemp = async (root, files) => {
+  const temp = await fs.promises.mkdtemp(`${fs.realpathSync(require('os').tmpdir())}${path.sep}tar-`)    
+  for (const file of files) {
+      const fname = 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)          
+  }
+
+  return temp
+}
+
 /**
  * Creates a tar archive, to an in-memory Buffer, or piped to write stream or file.
  * @example ```js
@@ -39,15 +54,31 @@ const win = path => {
  * - `.then()` collects the tar output into an in-memory `Buffer`
  * - `.to()` is a convenient shortcut to pipe the output into a write stream
  */
-exports.create = (dir='.', ...args) => {
+exports.create = async (dir='.', ...args) => {
 
   if (typeof dir === 'string') dir = _resolve(dir)
   if (Array.isArray(dir)) [ dir, ...args ] = [ cds.root, dir, ...args ]
-  if (Array.isArray(args[0])) args.push (...args.shift().map (f => path.isAbsolute(f) ? path.relative(dir,f) : f))
-  else args.push('.')
-  const c = process.platform === 'linux' 
-    ? spawn (`tar c -C ${dir}`, args, { shell:true })
-    : spawn (`tar cf - -C ${win(dir)}`, args, { shell:true })
+  
+  let c, temp
+  if (process.platform === 'win32') {
+    const spawnDir = (dir, args) => {      
+      if (args.some(arg => arg === '-f')) return spawn ('tar', ['c', '-C', win(dir), ...win(args)])
+      else return spawn ('tar', ['cf', '-', '-C', win(dir), ...win(args)])
+    }
+    args.push('.')
+    if (Array.isArray(args[0])) {
+      temp = await createTemp(dir, args[0])
+      args.shift()
+      c = spawnDir(temp, args)
+    } else {
+      c = spawnDir(dir, args)
+    }
+  } else {
+    if (Array.isArray(args[0])) args.push (...args.shift().map (f => path.isAbsolute(f) ? path.relative(dir,f) : f))
+    else args.push('.')
+
+    c = spawn ('tar', ['c', '-C', dir, ...args])
+  }
 
   return {__proto__:c, // returning a thenable + fluent ChildProcess...
 
@@ -60,6 +91,10 @@ exports.create = (dir='.', ...args) => {
       const bb=[]; c.stdout.on('data', b => bb.push(b))
       c.on('close', ()=>r(Buffer.concat(bb)))
       c.on('error', e)
+      if (process.platform === 'win32') {
+        c.on('close', async () => temp && exists(temp) && await rimraf(temp))
+        c.on('error', async () => temp && exists(temp) && await rimraf(temp))
+      }
     },
 
     /**
@@ -107,7 +142,7 @@ exports.extract = (archive, ...args) => ({
   to (...dest) {
     if (typeof dest === 'string') dest = _resolve(...dest)
     const input = typeof archive !== 'string' || archive == '-' ? '-' : _resolve(archive)
-    const x = spawn(`tar xf ${win(input)} -C ${win(dest)}`, args, { shell:true })
+    const x = spawn('tar', ['xf', win(input), '-C', win(dest), ...args])
     if (archive === '-') return x.stdin
     if (Buffer.isBuffer(archive)) archive = require('stream').Readable.from (archive)
     if (typeof archive !== 'string') archive.pipe (x.stdin)

package/package.json

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