@sap/cds-dk 4.6.2 → 4.7.2

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

@@ -11,16 +11,12 @@ module.exports = class DataTemplate extends TemplateBase {
   async run() {
     const env = await this.getEnv();
 
-    const prefix = (typeof this.options.for === 'string') // --for <prefix>
-      ? this.options.for
-      : '';
-    const prefixedWith = (definition) => definition.name === prefix || definition.name.startsWith(prefix);
-
     let dest = (typeof this.options.out === 'string') // target folder
       ? this.options.out
       : getDefaultTargetFolder(env, this.projectPath);
     dest = resolve(this.projectPath, dest);
 
+    const nameFilter = asRegex(this.options.for)
     const force = this.options.force;
     const logger = this.logger;
 
@@ -29,18 +25,44 @@ module.exports = class DataTemplate extends TemplateBase {
 
     // Also include 'external' entities w/ cds.persistence.skip (similar to 'mocked' option of serve).
     // Could be too much sometimes, but don't want to bother users w/ a separate option for this.
-    cds.deploy.include_external_entities_in(csn)
+    includeExternalEntities(csn, logger)
 
     csn = cds.compile.for.sql(csn, { names:env.sql.names, messages:[] })  // CSN w/ persistence information
     csn = cds.reflect(csn); // reflected model (adds additional helper functions)
 
     csn.all('entity')
-      .filter(prefixedWith)
+      .filter (e => e.name.match(nameFilter)) // --for prefix|regex
       .filter (e => !e.query) // exclude entities with queries (projection on, select from ...)
       .filter (e => e.name !== 'DRAFT.DraftAdministrativeData' && !e.name.endsWith('.drafts')) // exclude draft stuff
       .forEach(e => processEntity(e, dest, this.projectPath, csn, force, logger));
   }
+}
+
+function includeExternalEntities(model, logger) {
+  for (let each in model.definitions) {
+    const def = model.definitions[each]
+    if (def['@cds.persistence.skip'] === true) {
+      logger.debug ('Including skipped entity '+each)
+      delete def['@cds.persistence.skip']
+    }
+  }
+  return model
+}
 
+function asRegex(spec) {
+  if (typeof spec === 'string') {
+    try {
+      if (spec.match(/[\^$|*]/))
+        return new RegExp(spec)
+      else { // no meta chars -> prefix semantics
+        spec = spec.replace(/\./g, '\\.') // escape dot
+        return new RegExp('^'+spec+'.*')
+      }
+    } catch (err) {
+      throw new Error (err.message) // user error, so cut off stack trace
+    }
+  }
+  return /.*/
 }
 
 function processEntity (entity, dest, projectPath, csn, force, logger) {

package/lib/init/template/hana/files/common/undeploy.json

@@ -0,0 +1,5 @@
+[
+    "src/gen/**/*.hdbview",
+    "src/gen/**/*.hdbindex",
+    "src/gen/**/*.hdbconstraint"
+]

package/lib/init/template/hana/files/java/package.json

@@ -3,6 +3,9 @@
   "dependencies": {
     "@sap/hdi-deploy": "^4"
   },
+  "engines": {
+    "node": "^16"
+  },
   "scripts": {
     "start": "node node_modules/@sap/hdi-deploy/deploy.js"
   }

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

@@ -13,8 +13,6 @@ const { nullLogger } = require('../../util/logger');
 module.exports = class HanaTemplate extends TemplateBase {
     constructor(projectPath, generator) {
         super(projectPath, generator, __dirname);
-
-        this.env = null;
     }
 
     async checkEnabled() {
@@ -22,34 +20,32 @@ module.exports = class HanaTemplate extends TemplateBase {
             return true;
         }
 
-        this.env = await this.getEnv(true);
+        const env = await this.getEnv();
 
-        const hdiConfigPath = path.join(this.projectPath, this.env.folders.db, 'src/.hdiconfig');
-        if (await this.fsUtil.pathExists(hdiConfigPath)) {
-            const configFilePath = path.join(this.env.folders.db, 'src/.hdiconfig');
-            throw new Error(`Database config file ${configFilePath} already exists. Use --force to overwrite.`);
-        }
+        await Promise.all(['src/.hdiconfig', 'undeploy.json'].map(async(filePath) => {
+            if (await this.fsUtil.pathExists(path.join(this.projectPath, env.folders.db, filePath))) {
+                throw new Error(`File ${path.join(env.folders.db, filePath)} already exists. Use --force to overwrite.`);
+            }
+        }))
 
         return true;
     }
 
     // read env from project
-    async getEnv(force) {
+    async getEnv() {
         const cdsEnvVar = process.env.CDS_ENV;
         process.env.CDS_ENV = 'production'
-        let env
         try {
-            env = await super.getEnv(force);
+            return await super.getEnv();
         } finally {
             cdsEnvVar ? process.env.CDS_ENV = cdsEnvVar : delete process.env.CDS_ENV
         }
-        return env
     }
 
     async run() {
-        this.env = await this.getEnv(true);
+        const env = await this.getEnv();
 
-        await this.templateUtil.copyFiles('common', path.join(this.projectPath, this.env.folders.db), {
+        await this.templateUtil.copyFiles('common', path.join(this.projectPath, env.folders.db), {
             projectName: this.projectName
         }, this.options.force);
 
@@ -57,13 +53,13 @@ module.exports = class HanaTemplate extends TemplateBase {
         const projectType = await this.getProjectType();
         switch (projectType) {
             case PROJECT_TYPE.java:
-                await this.templateUtil.copyFiles('java', path.join(this.projectPath, this.env.folders.db), {}, this.options.force);
+                await this.templateUtil.copyFiles('java', path.join(this.projectPath, env.folders.db), {}, this.options.force);
                 await this._updatePomXml();
-                await this._updateCdsrcJson(cdsrcJsonPath, this.env.folders.db);
+                await this._updateCdsrcJson(cdsrcJsonPath, env.folders.db, env);
                 break;
 
             case PROJECT_TYPE.nodejs:
-                await this._updatePackageJson(path.join(this.projectPath, 'package.json'), this.env.folders.db);
+                await this._updatePackageJson(path.join(this.projectPath, 'package.json'), env.folders.db, env);
                 break;
 
             default: break;
@@ -87,7 +83,7 @@ module.exports = class HanaTemplate extends TemplateBase {
         }
     }
 
-    async _updatePackageJson(packageJsonPath, modelName) { //NOSONAR
+    async _updatePackageJson(packageJsonPath, modelName, env) { //NOSONAR
         modelName = path.basename(modelName);
 
         if (!await this.fsUtil.pathExists(packageJsonPath)) {
@@ -109,7 +105,7 @@ module.exports = class HanaTemplate extends TemplateBase {
             changed = true
         }
 
-        if (!this._isUsingHana(modelName)) {
+        if (!this._isUsingHana(modelName, env)) {
             packageJson.cds = packageJson.cds || {};
             packageJson.cds.requires = packageJson.cds.requires || {};
             packageJson.cds.requires[modelName] = packageJson.cds.requires[modelName] || {};
@@ -130,7 +126,7 @@ module.exports = class HanaTemplate extends TemplateBase {
         }
     }
 
-    async _updateCdsrcJson(cdsrcJsonPath, modelName) {
+    async _updateCdsrcJson(cdsrcJsonPath, modelName, env) {
         modelName = path.basename(modelName);
 
         let changed;
@@ -143,7 +139,7 @@ module.exports = class HanaTemplate extends TemplateBase {
 
         this.logger.isDebug && this.logger.debug(`_updateCdsrcJson before: ${JSON.stringify(cdsrcJson, null, 2)}`);
 
-        if (!this._isUsingHana(modelName)) {
+        if (!this._isUsingHana(modelName, env)) {
             cdsrcJson.requires = cdsrcJson.requires || {};
             cdsrcJson.requires[modelName] = cdsrcJson.requires[modelName] || {};
             cdsrcJson.requires[modelName].kind = KIND_SQL;
@@ -161,7 +157,7 @@ module.exports = class HanaTemplate extends TemplateBase {
         }
     }
 
-    _isUsingHana(db) {
-        return this.env.get(`requires.${db}.kind`) === KIND_HANA || this.env.get(`requires.${db}.dialect`) === KIND_HANA || this.env.get(`requires.${db}.use`) === KIND_HANA;
+    _isUsingHana(db, env) {
+        return env.get(`requires.${db}.kind`) === KIND_HANA || env.get(`requires.${db}.dialect`) === KIND_HANA || env.get(`requires.${db}.use`) === KIND_HANA;
     }
 }

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

@@ -9,10 +9,15 @@ const readline = require("readline");
 
 const { OPTION_LINT_DEV, OPTION_LINT_GLOBAL } = require("../../constants");
 const { mkdirp, fs } = require("@sap/cds/lib/utils");
-const { getConfigPath } = require("@sap/eslint-plugin-cds/lib/api");
+const { getConfigPath, getFileExtensions } = require("@sap/eslint-plugin-cds/lib/api");
 const generators = require("../../../lint/generators");
 
 const IS_WIN = os.platform() === "win32";
+const ALLOWED_FILE_EXTENSIONS = getFileExtensions();
+const VSCODE_FILE_ASSOCIATIONS = {
+  "csv": [ "csv", "csv (semicolon)", "tsv", "tab" ]
+}
+
 module.exports = class LintTemplate extends TemplateBase {
   constructor(projectPath, generator) {
     super(projectPath, generator, __dirname);
@@ -68,10 +73,21 @@ module.exports = class LintTemplate extends TemplateBase {
       }
 
       // Generate VS Code extension settings
+      const extensions = ALLOWED_FILE_EXTENSIONS.map((ext) => {
+        return path.extname(ext).replace('.', '');
+      })
+      extensions.forEach((ext) => {
+        if (ext in VSCODE_FILE_ASSOCIATIONS) {
+          VSCODE_FILE_ASSOCIATIONS[ext].forEach((assoc) => {
+            extensions.push(assoc)
+          })
+        }
+      });
       await io.sanitizeVscodeSettings(
         this.projectPath,
         path.join(this.projectPath, ".vscode/settings.json"),
         this.lintType,
+        extensions,
         this.customRuleExample
       );
     }

package/lib/init/template/mta/files/mta.yaml.hbs

@@ -13,7 +13,12 @@ build-parameters:
   before-all:
    - builder: custom
      commands:
+{{#cap.isNodejs}}
+      - npm ci
+{{/cap.isNodejs}}
+{{#cap.isJava}}
       - npm install --production
+{{/cap.isJava}}
       - npx -p @sap/cds-dk cds build --production
 
 {{! This template creates one or two deployable modules:
@@ -30,6 +35,8 @@ modules:
 {{#cap.isNodejs}}
    parameters:
      buildpack: nodejs_buildpack
+   build-parameters:
+     builder: npm-ci
 {{/cap.isNodejs}}
 {{#cap.isJava}}
    parameters:
@@ -207,11 +214,11 @@ resources:
    type: org.cloudfoundry.managed-service
    requires:
       - name: {{cap.appName}}-uaa-mt
-      - name: mtx-api 
-        properties: 
-           prop: ~{mtx-url} 
-        parameters: 
-           param: ~{mtx-url} 
+      - name: mtx-api
+        properties:
+           prop: ~{mtx-url}
+        parameters:
+           param: ~{mtx-url}
    parameters:
       service: saas-registry
       service-plan: application

package/lib/init/template/mta/projectReader.js

@@ -22,13 +22,11 @@ module.exports = class ProjectReader {
     async getEnv(profile = 'production') {
         const cdsEnvVar = process.env.CDS_ENV
         process.env.CDS_ENV = profile
-        let env
         try {
-            env = await this.template.getEnv(true);
+            return await this.template.getEnv();
         } finally {
             cdsEnvVar ? process.env.CDS_ENV = cdsEnvVar : delete process.env.CDS_ENV
         }
-        return env
     }
 
     get fsUtil() {

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

@@ -58,7 +58,7 @@ module.exports = class SamplesTemplate extends TemplateBase {
     }
 
     async _addNodejsSamples() {
-        const folders = (await this.getEnv(true)).folders;
+        const folders = (await this.getEnv()).folders;
         const dbFolder = path.join(this.projectPath, folders.db);
         await this.templateUtil.copyFiles('nodejs/db', dbFolder, {}, this.options.force);
 

package/lib/init/template/templateBase.js

@@ -1,11 +1,9 @@
 const path = require('path');
-const cds = require('@sap/cds/lib');
+const Config = require('@sap/cds/lib/env');
 
 const TemplateUtil = require('../util/templateUtil');
-const commandUtil = require('../util/commandUtil');
-const { nullLogger } = require('../util/logger');
 
-const { IS_WIN, PROJECT_TYPE } = require('../constants');
+const { PROJECT_TYPE } = require('../constants');
 
 
 module.exports = class TemplateBase {
@@ -43,49 +41,20 @@ module.exports = class TemplateBase {
         return true;
     }
 
-    getCdsModulePath() {
-        return path.join(__dirname, '../../../bin/cds.js');
-    }
-
     /**
      * calls cds env and caches result
      * @param {boolean} force, ignore cached value
      * @returns {object} the current cds env
      */
-    async getEnv(force = false) {
-        if (!this.env || force) {
-            let projectPath;
-            if (await this.fsUtil.pathExists(this.projectPath)) {
-                projectPath = this.projectPath;
-            } else {
-                projectPath = this.cwd;
-            }
-
-            const logger = (this.logger.isDebug ? this.logger : nullLogger);
-
-            let modPath = this.getCdsModulePath();
-            if (IS_WIN) {
-                modPath = `"${modPath}"`;
-            }
-
-            let envJsonOutput = await commandUtil.spawnCommand('node', [modPath, 'env', 'json'], {
-                cwd: projectPath,
-                env: process.env
-            }, logger, true);
-
-            if (envJsonOutput) {
-                // cheap check to see if json is valid
-                if (envJsonOutput.indexOf('":') < 0) {
-                    // eslint-disable-next-line no-control-regex
-                    envJsonOutput = envJsonOutput.replace(/'/g, '"').replace(/\s(\w+):\s/g, ' "$1": ').replace(/\x1b\[\w+m/g, '');
-                }
-
-                this.env = JSON.parse(envJsonOutput);
-                // env has additional getters and setters
-                Object.setPrototypeOf(this.env, cds.env.__proto__);
-            }
+    async getEnv() {
+        let projectPath;
+        if (await this.fsUtil.pathExists(this.projectPath)) {
+            projectPath = this.projectPath;
+        } else {
+            projectPath = this.cwd;
         }
-        return this.env;
+
+        return Config.for('cds', projectPath);
     }
 
     /**

package/lib/init/util/fsUtil.js

@@ -18,7 +18,7 @@ module.exports = class FsUtil {
         await fse.outputFile(filepath, content, UTF_8);
     }
 
-    async writeJSON(filepath, object, options = { spaces: 4 }, skipFileLog = false) {
+    async writeJSON(filepath, object, options = { spaces: 2 }, skipFileLog = false) {
         if (!skipFileLog) {
             this._addTouchedFile(filepath);
         }

package/lib/init/util/mvnArchetypeUtil.js

@@ -31,7 +31,9 @@ class MvnArchetypeUtil {
 
         params.set('-B');
 
-        defaultLogger.isDebug && params.set('-X');
+        if (defaultLogger.isDebug) {
+            params.set('-X'); params.set('-e');
+        }
 
         return Array.from(params, (e) => {
             let result = e[0];

package/lib/lint/Linter.js

@@ -23,7 +23,6 @@ class Linter {
     this.eslintCmdOpts = {};
     this.eslintCmdOptsIndex = 0;
     this.eslintCmdFileExpr = "";
-    this.formatter = false;
     this.isFile = false;
     this.help = "";
     this.debug = "";
@@ -141,16 +140,14 @@ class Linter {
 
   _addExtensions() {
     // Add CDS file extensions to lint
-    const extensions = ALLOWED_FILE_EXTENSIONS.map((ext) => ext.replace('*.', '.'));
+    const extensions = ALLOWED_FILE_EXTENSIONS.map((ext) => path.extname(ext));
     this.eslintCmdOpts = io.mergeWithUserOpts(
       this.eslintCmdOpts,
       "ext",
       extensions.join(',')
     );
     // Enable colored output
-    if (process.stdout.isTTY) {
-      this.eslintCmdOpts = io.mergeWithUserOpts(this.eslintCmdOpts, "color");
-    }
+    this.eslintCmdOpts = io.mergeWithUserOpts(this.eslintCmdOpts, "color");
     return;
   }
 
@@ -205,22 +202,18 @@ class Linter {
       } else {
         input = `'${this.eslintCmdFileExpr.join("' '")}'`;
       }
-      const eslintCmdSplit = this.eslintCmd.split(" ");
-      this.eslintCmd = eslintCmdSplit[0];
-      eslintCmdOpts.unshift(eslintCmdSplit[1]);
-      eslintCmdOpts.push(input);
       // Run ESLint with given cmd line options
-      // - Show 'eslint' instead of 'node ...eslint.js' cmd
-      // - Remove debug flag for printed cmd
+      // - Show 'eslint' instead of actual eslint cmd ('node .../.eslint.js')
+      // - Remove debug flag for printed cmd line
       if (this.eslintCmdOpts.debug) {
         eslintCmdOpts.splice(eslintCmdOpts.indexOf('--debug'), 1);
         console.log(
-          `Linting:\n ${term.info(`eslint ${eslintCmdOpts.slice(1).join(' ')}`)}\n`
+          `Linting:\n ${term.info(`eslint ${eslintCmdOpts.concat(input).join(' ')}`)}\n`
         );
         eslintCmdOpts.push('--debug');
       }
       if (!dryRun) {
-        return commandUtil.spawnCommand(this.eslintCmd, eslintCmdOpts, {
+        return commandUtil.spawnCommand(this.eslintCmd, eslintCmdOpts.concat(input), {
           cwd: process.cwd(),
           shell: true,
           stdio: process.env.NODE_ENV === 'test' ? 'pipe' : 'inherit',

package/lib/lint/io.js

@@ -22,7 +22,7 @@ module.exports = {
       case ".eslintrc.js":
       case ".eslintrc.cjs":
         try {
-          config = JSON.parse(configString.replace(/^module\.exports =/, ""));
+          config = JSONC.parse((configString.replace(/^module\.exports =/, "")));
         } catch (err) {
           config = {};
         }
@@ -33,14 +33,14 @@ module.exports = {
         break;
       case ".eslintrc.json":
       case ".eslintrc":
+        config = await fsUtil.readJSONC(configPath);
+        break;
       case "package.json":
-        try {
-          config = JSON.parse(await fsp.readFile(configPath, "utf8"));
-          if (configFile === "package.json" && "eslintConfig" in config) {
-            config = config["eslintConfig"];
-          }
-        } catch (err) {
-          // Do nothing
+        config = JSON.parse(await fsp.readFile(configPath, "utf8"));
+        if ("eslintConfig" in config) {
+          config = config["eslintConfig"];
+        } else {
+          config = {}
         }
         break;
       default:
@@ -138,21 +138,20 @@ module.exports = {
         break;
       case ".eslintrc.json":
       case ".eslintrc":
+        await fsUtil.writeFile(configPath, `${JSON.stringify(configContents, null, 2)}`);
+        break;
       case "package.json":
-        if (configFile === "package.json") {
-          if (await fsUtil.pathExists(configPath)) {
-            contents = JSON.parse(await fsp.readFile(configPath, "utf8"));
-          } else {
-            contents = {};
-          }
-          if (!("eslintConfig" in configContents)) {
-            contents["eslintConfig"] = configContents;
-          } else {
-            contents["eslintConfig"] = [...configContents, ...contents["eslintConfig"]];
-          }
-          configContents = contents;
+        if (await fsUtil.pathExists(configPath)) {
+          contents = JSON.parse(await fsp.readFile(configPath, "utf8"));
+        } else {
+          contents = {};
         }
-        await fsUtil.writeFile(configPath, `${JSON.stringify(configContents, null, 2)}`);
+        if (!("eslintConfig" in configContents)) {
+          contents["eslintConfig"] = configContents;
+        } else {
+          contents["eslintConfig"] = [...configContents, ...contents["eslintConfig"]];
+        }
+        await fsUtil.writeFile(configPath, `${JSON.stringify(contents, null, 2)}`);
         break;
       default:
         break;
@@ -202,18 +201,9 @@ module.exports = {
    * (3) "Global" case adds configFile and removes rulePaths
    * @param {*} settingsPath VS Code settings file
    */
-  async sanitizeVscodeSettings(projectPath, settingsPath, lintType, customRuleExample = false) {
+  async sanitizeVscodeSettings(projectPath, settingsPath, lintType, lintFileTypes, customRuleExample = false) {
     let settings = (await this.readVscodeSettings(settingsPath)) || {};
-    const lintFileTypes = ["cds", "csn"];
     const rulePaths = [path.join(".eslint/rules")];
-    const configFile = path.join(__dirname, ".eslintrc.js");
-
-    function _addArrayOrString(array) {
-      if (array.length === 1) {
-        return array[0];
-      }
-      return array;
-    }
 
     if (settings["eslint.validate"]) {
       settings["eslint.validate"] = this.mergeArrays(settings["eslint.validate"], lintFileTypes);

package/lib/watch/node-watch.js

@@ -1,3 +1,5 @@
+const DEBUG = /\bwatch\b/.test(process.env.DEBUG) && console.debug
+
 module.exports = ({ cwd, script, ext, ignore=RegExp(), env={}, delay=200, options={} })=>{
 
   let child
@@ -5,19 +7,23 @@ module.exports = ({ cwd, script, ext, ignore=RegExp(), env={}, delay=200, option
   // Phoning home...
   const EventEmitter = require('events')
   const emitter = new EventEmitter
-  process.on('exit', () => { gracefullyKill (child);  emitter.emit('quit') })
+  process.on('exit', () => { _kill (child);  emitter.emit('quit') })
 
   // Re-starting child process...
   const { fork } = require('child_process')
-  const restart = (evt, name)=>{
-    gracefullyKill (child, () => {
+  const restart = _coalesceEvents(delay, (events) => {
+    DEBUG && DEBUG('>> Events:', events)
+    _kill (child, () => {
       const execArgv = [...process.execArgv]
-      if (evt && evt.startsWith('--')) execArgv.push(evt)
-      if (name && name.startsWith('--')) execArgv.push(name)
+      events.forEach(evt => {
+        if (evt.type && evt.type.startsWith('--')) execArgv.push(evt.type)
+        if (evt.name && evt.name.startsWith('--')) execArgv.push(evt.name)
+      })
       if (options.debug) execArgv.push('--inspect')
       if (options['debug-brk']) execArgv.push('--inspect-brk')
-      const files = evt === "update" ? [ name ] : undefined
-      emitter.emit ('restart', files)
+
+      const updated = events.filter(evt => evt.type && evt.type === 'update').map(evt => evt.name)
+      emitter.emit ('restart', updated)
       child = fork (script, { cwd, env, stdio:'inherit', execArgv }, (err)=>{
         if (err) console.error (err)
       })
@@ -26,14 +32,16 @@ module.exports = ({ cwd, script, ext, ignore=RegExp(), env={}, delay=200, option
         emitter.emit('message', msg)
       })
     })
-  }
+
+  })
+
   restart()
 
   // Watching for touched files...
   const watch = require('node-watch')
   const include = RegExp(`\\.(${ext.replace(/,/g,'|')})$`)
   const filter = f => !ignore.test(f) && include.test(f)
-  watch (process.cwd(),{ recursive:true, filter, delay }, restart)
+  watch (process.cwd(),{ recursive:true, filter, delay:0 }, restart)
 
   // Live commands...
   const readline = require('readline')
@@ -44,12 +52,12 @@ module.exports = ({ cwd, script, ext, ignore=RegExp(), env={}, delay=200, option
     else if (input === 'break' || input === 'brk')  restart('--inspect-brk')
     else if (input === 'debug-brk')  restart('--inspect-brk')
     else if (input === 'ps') ps(child,env)
-    else if (input === 'bye' || input.match(/^n$/i)) { gracefullyKill (child, () => process.exit())  }
+    else if (input === 'bye' || input.match(/^n$/i)) { _kill (child, () => process.exit())  }
     else console.log ('?\n')
   })
 
   emitter.restart = restart
-  emitter.stop    = () => { gracefullyKill(child, () => false); child = undefined; }
+  emitter.stop    = () => { _kill(child, () => false); child = undefined; }
   emitter.setEnv = (name, value) => {
     if (typeof value === "undefined") {
       delete env[name]
@@ -67,14 +75,32 @@ const ps = (child,env) => console.log (`\x1b[32m
   \x1b[0m`
 )
 
-// On Windows, kill() abruptly kills the child process (https://nodejs.org/api/child_process.html#subprocesskillsignal)
-// Send a custom message an wait a bit to give cleanup code a chance to execute.
-const isWindows = (process.platform === 'win32')
-const waitTime = parseInt(process.env.CDS_WATCH_KILL_DELAY) || (isWindows ? 500 : 0)
-function gracefullyKill (proc, fn=()=>{}) {
-  if (proc)  {
-    proc.send({ exit: true })
-    setTimeout(()=> { proc.kill(); fn()}, waitTime)
+// reduces mutiple node-watch events in a time frame into a bulk
+function _coalesceEvents(delay, fn) {
+  let timer, cache = []
+  function handle() {
+    fn(cache)
+    timer = null
+    cache = []
+  }
+  return function(type, name) { // node-watch callback signature
+    cache.push({type, name})
+    if (!timer) {
+      timer = setTimeout(handle, delay);
+    }
+  }
+}
+
+function _kill (proc, fn=()=>{}) {
+  if (!proc)  return fn()
+
+  // On Windows, child_process.kill() abruptly kills the process (https://nodejs.org/api/child_process.html#subprocesskillsignal)
+  // Server has cleanup code to run, so send a custom message and give it a bit time.
+  if (process.platform === 'win32') {
+    proc.send({ exit: true }, () => {})
+    const waitTime = parseInt(process.env.CDS_WATCH_KILL_DELAY) || 500
+    setTimeout(()=> { proc.kill(); fn() }, waitTime)
+  } else {
+    proc.kill(); fn()
   }
-  else fn()
 }