@sap/cds-dk 4.5.3 → 4.5.4

package/CHANGELOG.md

@@ -6,6 +6,12 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
+## Version 4.5.4 - 2021-10-07
+
+### Fixed
+
+- `cds watch` no longer fails if started with `--ext`, `--livereload`, or `--open` arguments
+
 ## Version 4.5.3 - 2021-10-05
 
 ### Fixed

package/bin/watch.js

@@ -1,6 +1,7 @@
+const watchOnlyOptions = ['--ext', '--livereload', '--open']
 module.exports = Object.assign ( watch, {
   flags: [ '--debug', '--in-memory', '--in-memory?' ],
-  options: [ '--port', '--ext', '--livereload', '--open' ],
+  options: [ '--port', ...watchOnlyOptions ],
   help: `
 # SYNOPSIS
 
@@ -61,15 +62,16 @@ async function watch ([cwd], {
   ext = extDefaults,
   ...options
 }={}) {
-
   args.push (`--${Object.keys(options).find(a => /^in-memory\??$/.test(a)) || 'in-memory?'}`)
-  args.push (...process.argv.slice(3).filter(a => a !== cwd))
+  args.push (...process.argv.slice(3)
+    .filter(removeArgsIn(watchOnlyOptions))  // remove all watch-only options, as `cds serve` would not accept them
+    .filter(a => a !== cwd))
+
   const env = Object.assign (process.env, {
     _args: JSON.stringify(args),
     _options: JSON.stringify(options)
   })
   if (typeof ext !== 'string')  ext = extDefaults
-  if ('port' in options) env.PORT = options.port
   env.NODE_PATH = path.resolve (__dirname,'../node_modules') // allow global sqlite to be resolved
 
   let liveReload //= ...
@@ -143,7 +145,20 @@ const FileHandlers = {
   },
 }
 
-
+function removeArgsIn (toRemove) {
+  let argRemoved = false
+  return arg => { // filter function
+    if (toRemove.includes(arg)) {
+      argRemoved = true
+      return false
+    }
+    else if (argRemoved) {  // if next arg is a value, skip it as well
+      argRemoved = false
+      if (!arg.startsWith('-'))  return false
+    }
+    return true
+  }
+}
 
 //
 // Child process impl launched by watch