projen 0.99.71 → 0.99.73

package/node_modules/shelljs/src/grep.js

@@ -1,5 +1,5 @@
-var common = require('./common');
 var fs = require('fs');
+var common = require('./common');
 
 common.register('grep', _grep, {
   globStart: 2, // don't glob-expand the regex
@@ -9,6 +9,9 @@ common.register('grep', _grep, {
     'l': 'nameOnly',
     'i': 'ignoreCase',
     'n': 'lineNumber',
+    'B': 'beforeContext',
+    'A': 'afterContext',
+    'C': 'context',
   },
 });
 
@@ -22,12 +25,18 @@ common.register('grep', _grep, {
 //@ + `-l`: Print only filenames of matching files.
 //@ + `-i`: Ignore case.
 //@ + `-n`: Print line numbers.
+//@ + `-B <num>`: Show `<num>` lines before each result.
+//@ + `-A <num>`: Show `<num>` lines after each result.
+//@ + `-C <num>`: Show `<num>` lines before and after each result. -B and -A override this option.
 //@
 //@ Examples:
 //@
 //@ ```javascript
 //@ grep('-v', 'GLOBAL_VARIABLE', '*.js');
 //@ grep('GLOBAL_VARIABLE', '*.js');
+//@ grep('-B', 3, 'GLOBAL_VARIABLE', '*.js');
+//@ grep({ '-B': 3 }, 'GLOBAL_VARIABLE', '*.js');
+//@ grep({ '-B': 3, '-C': 2 }, 'GLOBAL_VARIABLE', '*.js');
 //@ ```
 //@
 //@ Reads input string from given files and returns a
@@ -39,7 +48,41 @@ function _grep(options, regex, files) {
 
   if (!files && !pipe) common.error('no paths given', 2);
 
-  files = [].slice.call(arguments, 2);
+  var idx = 2;
+  var contextError = ': invalid context length argument';
+  // If the option has been found but not read, copy value from arguments
+  if (options.beforeContext === true) {
+    idx = 3;
+    options.beforeContext = Number(arguments[1]);
+    if (options.beforeContext < 0) {
+      common.error(options.beforeContext + contextError, 2);
+    }
+  }
+  if (options.afterContext === true) {
+    idx = 3;
+    options.afterContext = Number(arguments[1]);
+    if (options.afterContext < 0) {
+      common.error(options.afterContext + contextError, 2);
+    }
+  }
+  if (options.context === true) {
+    idx = 3;
+    options.context = Number(arguments[1]);
+    if (options.context < 0) {
+      common.error(options.context + contextError, 2);
+    }
+  }
+  //  If before or after not given but context is, update values
+  if (typeof options.context === 'number') {
+    if (options.beforeContext === false) {
+      options.beforeContext = options.context;
+    }
+    if (options.afterContext === false) {
+      options.afterContext = options.context;
+    }
+  }
+  regex = arguments[idx - 1];
+  files = [].slice.call(arguments, idx);
 
   if (pipe) {
     files.unshift('-');
@@ -62,16 +105,79 @@ function _grep(options, regex, files) {
       }
     } else {
       var lines = contents.split('\n');
+      var matches = [];
+
       lines.forEach(function (line, index) {
         var matched = line.match(regex);
         if ((options.inverse && !matched) || (!options.inverse && matched)) {
-          var result = line;
-          if (options.lineNumber) {
-            result = '' + (index + 1) + ':' + line;
+          var lineNumber = index + 1;
+          var result = {};
+          if (matches.length > 0) {
+            // If the last result intersects, combine them
+            var last = matches[matches.length - 1];
+            var minimumLineNumber = Math.max(
+              1,
+              lineNumber - options.beforeContext - 1,
+            );
+            if (
+              last.hasOwnProperty('' + lineNumber) ||
+              last.hasOwnProperty('' + minimumLineNumber)
+            ) {
+              result = last;
+            }
+          }
+          result[lineNumber] = {
+            line,
+            match: true,
+          };
+          if (options.beforeContext > 0) {
+            // Store the lines with their line numbers to check for overlap
+            lines
+              .slice(Math.max(index - options.beforeContext, 0), index)
+              .forEach(function (v, i, a) {
+                var lineNum = '' + (index - a.length + i + 1);
+                if (!result.hasOwnProperty(lineNum)) {
+                  result[lineNum] = { line: v, match: false };
+                }
+              });
+          }
+          if (options.afterContext > 0) {
+            // Store the lines with their line numbers to check for overlap
+            lines
+              .slice(
+                index + 1,
+                Math.min(index + options.afterContext + 1, lines.length - 1),
+              )
+              .forEach(function (v, i) {
+                var lineNum = '' + (index + 1 + i + 1);
+                if (!result.hasOwnProperty(lineNum)) {
+                  result[lineNum] = { line: v, match: false };
+                }
+              });
+          }
+          // Only add the result if it's new
+          if (!matches.includes(result)) {
+            matches.push(result);
           }
-          grep.push(result);
         }
       });
+
+      // Loop through the matches and add them to the output
+      Array.prototype.push.apply(
+        grep,
+        matches.map(function (result) {
+          return Object.entries(result)
+            .map(function (entry) {
+              var lineNumber = entry[0];
+              var line = entry[1].line;
+              var match = entry[1].match;
+              return options.lineNumber
+                ? lineNumber + (match ? ':' : '-') + line
+                : line;
+            })
+            .join('\n');
+        }),
+      );
     }
   });
 
@@ -79,6 +185,14 @@ function _grep(options, regex, files) {
     // We didn't hit the error above, but pattern didn't match
     common.error('', { silent: true });
   }
-  return grep.join('\n') + '\n';
+
+  var separator = '\n';
+  if (
+    typeof options.beforeContext === 'number' ||
+    typeof options.afterContext === 'number'
+  ) {
+    separator = '\n--\n';
+  }
+  return grep.join(separator) + '\n';
 }
 module.exports = _grep;

package/node_modules/shelljs/src/head.js

@@ -1,5 +1,5 @@
-var common = require('./common');
 var fs = require('fs');
+var common = require('./common');
 
 common.register('head', _head, {
   canReceivePipe: true,

package/node_modules/shelljs/src/ls.js

@@ -1,7 +1,7 @@
 var path = require('path');
 var fs = require('fs');
-var common = require('./common');
 var glob = require('fast-glob');
+var common = require('./common');
 
 // glob patterns use the UNIX path seperator
 var globPatternRecursive = '/**';

package/node_modules/shelljs/src/mkdir.js

@@ -1,6 +1,6 @@
-var common = require('./common');
 var fs = require('fs');
 var path = require('path');
+var common = require('./common');
 
 common.register('mkdir', _mkdir, {
   cmdOptions: {

package/node_modules/shelljs/src/rm.js

@@ -1,5 +1,5 @@
-var common = require('./common');
 var fs = require('fs');
+var common = require('./common');
 
 common.register('rm', _rm, {
   cmdOptions: {

package/node_modules/shelljs/src/sed.js

@@ -1,5 +1,5 @@
-var common = require('./common');
 var fs = require('fs');
+var common = require('./common');
 
 common.register('sed', _sed, {
   globStart: 3, // don't glob-expand regexes

package/node_modules/shelljs/src/sort.js

@@ -1,5 +1,5 @@
-var common = require('./common');
 var fs = require('fs');
+var common = require('./common');
 
 common.register('sort', _sort, {
   canReceivePipe: true,

package/node_modules/shelljs/src/tail.js

@@ -1,5 +1,5 @@
-var common = require('./common');
 var fs = require('fs');
+var common = require('./common');
 
 common.register('tail', _tail, {
   canReceivePipe: true,

package/node_modules/shelljs/src/tempdir.js

@@ -1,6 +1,6 @@
-var common = require('./common');
 var os = require('os');
 var fs = require('fs');
+var common = require('./common');
 
 common.register('tempdir', _tempDir, {
   allowGlobbing: false,

package/node_modules/shelljs/src/test.js

@@ -1,5 +1,5 @@
-var common = require('./common');
 var fs = require('fs');
+var common = require('./common');
 
 common.register('test', _test, {
   cmdOptions: {

package/node_modules/shelljs/src/to.js

@@ -1,6 +1,6 @@
-var common = require('./common');
 var fs = require('fs');
 var path = require('path');
+var common = require('./common');
 
 common.register('to', _to, {
   pipeOnly: true,

package/node_modules/shelljs/src/toEnd.js

@@ -1,6 +1,6 @@
-var common = require('./common');
 var fs = require('fs');
 var path = require('path');
+var common = require('./common');
 
 common.register('toEnd', _toEnd, {
   pipeOnly: true,

package/node_modules/shelljs/src/touch.js

@@ -1,5 +1,5 @@
-var common = require('./common');
 var fs = require('fs');
+var common = require('./common');
 
 common.register('touch', _touch, {
   cmdOptions: {

package/node_modules/shelljs/src/uniq.js

@@ -1,5 +1,5 @@
-var common = require('./common');
 var fs = require('fs');
+var common = require('./common');
 
 // add c spaces to the left of str
 function lpad(c, str) {

package/node_modules/shelljs/src/which.js

@@ -1,6 +1,6 @@
-var common = require('./common');
 var fs = require('fs');
 var path = require('path');
+var common = require('./common');
 
 common.register('which', _which, {
   allowGlobbing: false,

package/node_modules/strip-final-newline/index.js

@@ -0,0 +1,16 @@
+'use strict';
+
+module.exports = input => {
+	const LF = typeof input === 'string' ? '\n' : '\n'.charCodeAt();
+	const CR = typeof input === 'string' ? '\r' : '\r'.charCodeAt();
+
+	if (input[input.length - 1] === LF) {
+		input = input.slice(0, input.length - 1);
+	}
+
+	if (input[input.length - 1] === CR) {
+		input = input.slice(0, input.length - 1);
+	}
+
+	return input;
+};

package/node_modules/strip-final-newline/license

@@ -0,0 +1,9 @@
+MIT License
+
+Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/node_modules/strip-final-newline/package.json

@@ -0,0 +1,40 @@
+{
+	"name": "strip-final-newline",
+	"version": "2.0.0",
+	"description": "Strip the final newline character from a string/buffer",
+	"license": "MIT",
+	"repository": "sindresorhus/strip-final-newline",
+	"author": {
+		"name": "Sindre Sorhus",
+		"email": "sindresorhus@gmail.com",
+		"url": "sindresorhus.com"
+	},
+	"engines": {
+		"node": ">=6"
+	},
+	"scripts": {
+		"test": "xo && ava"
+	},
+	"files": [
+		"index.js"
+	],
+	"keywords": [
+		"strip",
+		"trim",
+		"remove",
+		"delete",
+		"final",
+		"last",
+		"end",
+		"file",
+		"newline",
+		"linebreak",
+		"character",
+		"string",
+		"buffer"
+	],
+	"devDependencies": {
+		"ava": "^0.25.0",
+		"xo": "^0.23.0"
+	}
+}

package/node_modules/strip-final-newline/readme.md

@@ -0,0 +1,30 @@
+# strip-final-newline [![Build Status](https://travis-ci.com/sindresorhus/strip-final-newline.svg?branch=master)](https://travis-ci.com/sindresorhus/strip-final-newline)
+
+> Strip the final [newline character](https://en.wikipedia.org/wiki/Newline) from a string/buffer
+
+Can be useful when parsing the output of, for example, `ChildProcess#execFile`, as [binaries usually output a newline at the end](https://stackoverflow.com/questions/729692/why-should-text-files-end-with-a-newline). Normally, you would use `stdout.trim()`, but that would also remove newlines at the start and whitespace.
+
+
+## Install
+
+```
+$ npm install strip-final-newline
+```
+
+
+## Usage
+
+```js
+const stripFinalNewline = require('strip-final-newline');
+
+stripFinalNewline('foo\nbar\n\n');
+//=> 'foo\nbar\n'
+
+stripFinalNewline(Buffer.from('foo\nbar\n\n')).toString();
+//=> 'foo\nbar\n'
+```
+
+
+## License
+
+MIT © [Sindre Sorhus](https://sindresorhus.com)

package/node_modules/{shelljs/node_modules/which → which}/README.md

@@ -17,6 +17,9 @@ which('node', function (er, resolvedPath) {
   // if it is found, then the absolute path to the exec is returned
 })
 
+// or promise
+which('node').then(resolvedPath => { ... }).catch(er => { ... not found ... })
+
 // sync usage
 // throws if not found
 var resolved = which.sync('node')

package/node_modules/which/package.json

@@ -0,0 +1,43 @@
+{
+  "author": "Isaac Z. Schlueter <i@izs.me> (http://blog.izs.me)",
+  "name": "which",
+  "description": "Like which(1) unix command. Find the first instance of an executable in the PATH.",
+  "version": "2.0.2",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/node-which.git"
+  },
+  "main": "which.js",
+  "bin": {
+    "node-which": "./bin/node-which"
+  },
+  "license": "ISC",
+  "dependencies": {
+    "isexe": "^2.0.0"
+  },
+  "devDependencies": {
+    "mkdirp": "^0.5.0",
+    "rimraf": "^2.6.2",
+    "tap": "^14.6.9"
+  },
+  "scripts": {
+    "test": "tap",
+    "preversion": "npm test",
+    "postversion": "npm publish",
+    "prepublish": "npm run changelog",
+    "prechangelog": "bash gen-changelog.sh",
+    "changelog": "git add CHANGELOG.md",
+    "postchangelog": "git commit -m 'update changelog - '${npm_package_version}",
+    "postpublish": "git push origin --follow-tags"
+  },
+  "files": [
+    "which.js",
+    "bin/node-which"
+  ],
+  "tap": {
+    "check-coverage": true
+  },
+  "engines": {
+    "node": ">= 8"
+  }
+}

package/node_modules/which/which.js

@@ -0,0 +1,125 @@
+const isWindows = process.platform === 'win32' ||
+    process.env.OSTYPE === 'cygwin' ||
+    process.env.OSTYPE === 'msys'
+
+const path = require('path')
+const COLON = isWindows ? ';' : ':'
+const isexe = require('isexe')
+
+const getNotFoundError = (cmd) =>
+  Object.assign(new Error(`not found: ${cmd}`), { code: 'ENOENT' })
+
+const getPathInfo = (cmd, opt) => {
+  const colon = opt.colon || COLON
+
+  // If it has a slash, then we don't bother searching the pathenv.
+  // just check the file itself, and that's it.
+  const pathEnv = cmd.match(/\//) || isWindows && cmd.match(/\\/) ? ['']
+    : (
+      [
+        // windows always checks the cwd first
+        ...(isWindows ? [process.cwd()] : []),
+        ...(opt.path || process.env.PATH ||
+          /* istanbul ignore next: very unusual */ '').split(colon),
+      ]
+    )
+  const pathExtExe = isWindows
+    ? opt.pathExt || process.env.PATHEXT || '.EXE;.CMD;.BAT;.COM'
+    : ''
+  const pathExt = isWindows ? pathExtExe.split(colon) : ['']
+
+  if (isWindows) {
+    if (cmd.indexOf('.') !== -1 && pathExt[0] !== '')
+      pathExt.unshift('')
+  }
+
+  return {
+    pathEnv,
+    pathExt,
+    pathExtExe,
+  }
+}
+
+const which = (cmd, opt, cb) => {
+  if (typeof opt === 'function') {
+    cb = opt
+    opt = {}
+  }
+  if (!opt)
+    opt = {}
+
+  const { pathEnv, pathExt, pathExtExe } = getPathInfo(cmd, opt)
+  const found = []
+
+  const step = i => new Promise((resolve, reject) => {
+    if (i === pathEnv.length)
+      return opt.all && found.length ? resolve(found)
+        : reject(getNotFoundError(cmd))
+
+    const ppRaw = pathEnv[i]
+    const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw
+
+    const pCmd = path.join(pathPart, cmd)
+    const p = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd
+      : pCmd
+
+    resolve(subStep(p, i, 0))
+  })
+
+  const subStep = (p, i, ii) => new Promise((resolve, reject) => {
+    if (ii === pathExt.length)
+      return resolve(step(i + 1))
+    const ext = pathExt[ii]
+    isexe(p + ext, { pathExt: pathExtExe }, (er, is) => {
+      if (!er && is) {
+        if (opt.all)
+          found.push(p + ext)
+        else
+          return resolve(p + ext)
+      }
+      return resolve(subStep(p, i, ii + 1))
+    })
+  })
+
+  return cb ? step(0).then(res => cb(null, res), cb) : step(0)
+}
+
+const whichSync = (cmd, opt) => {
+  opt = opt || {}
+
+  const { pathEnv, pathExt, pathExtExe } = getPathInfo(cmd, opt)
+  const found = []
+
+  for (let i = 0; i < pathEnv.length; i ++) {
+    const ppRaw = pathEnv[i]
+    const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw
+
+    const pCmd = path.join(pathPart, cmd)
+    const p = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd
+      : pCmd
+
+    for (let j = 0; j < pathExt.length; j ++) {
+      const cur = p + pathExt[j]
+      try {
+        const is = isexe.sync(cur, { pathExt: pathExtExe })
+        if (is) {
+          if (opt.all)
+            found.push(cur)
+          else
+            return cur
+        }
+      } catch (ex) {}
+    }
+  }
+
+  if (opt.all && found.length)
+    return found
+
+  if (opt.nothrow)
+    return null
+
+  throw getNotFoundError(cmd)
+}
+
+module.exports = which
+which.sync = whichSync

package/package.json

@@ -100,7 +100,7 @@
     "fast-json-patch": "^3.1.1",
     "ini": "^2.0.0",
     "parse-conflict-json": "^4.0.0",
-    "semver": "^7.8.2",
+    "semver": "^7.8.3",
     "shx": "^0.4.0",
     "xmlbuilder2": "^4.0.3",
     "yaml": "^2.2.2",
@@ -122,6 +122,9 @@
     "yaml",
     "yargs"
   ],
+  "overrides": {
+    "shelljs": "^0.10.0"
+  },
   "keywords": [
     "cdk",
     "cicd",
@@ -144,7 +147,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.99.71",
+  "version": "0.99.73",
   "jest": {
     "coverageProvider": "v8",
     "coverageReporters": [

package/node_modules/end-of-stream/LICENSE

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2014 Mathias Buus
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.