[release] prepare v0.29.0 release
5bbdabb test/integration/goTest: log suspicious tests
6d4d3bf src/goInstallTools: use `go install -v` instead of `go install -x`
dbf1440 goDeveloperSurvey: update link and start/end date
9a0cabf settings: update for gopls/v0.7.3
ee7c340 goLanguageServer: print out all GOPATHs when there are multiple
656865d src/goInstallTools: use `go install` for go1.16+
af8377d goSurvey: update language in Go Developer survey prompt
8ac427b test: fix broken debugger tests
bdb0b61 src/goTest: visualize profiles
1f4e83b package.json: update mocha & run npm audit fix
4e2e945 src/goDebugConfiguration: handle directory with '.' in its name
337e533 src/goTest: show test output on run
1f8bf32 src/goTest: add single-test debugging
afc7d07 goSurvey: add a setting to disable all survey prompts
a90d590 src/goTest: update go.tests after resolving tests
e01db48 goDeveloperSurvey: prompt vscode-go users for the Go dev survey
5691e02 src/goDebugFactory: add program filepath to program error message
9b3e92e CHANGELOG.md: v0.28.1 note
5ecabf9 src/goTest: populate tests for open docs on start
079e752 src/goTest: ensure that cursorOrPrevious always saves
11afec4 src/goInstallTools: bugfix for grammar
bf9a5a1 src/goImpl: allow `-` as an acceptable char for interface names (package/variable)
cfee3e1 src/goDebugConfiguration: take program verbatim with external adapter
022e403 package.json: add showLog/logOutput/dlvFlags to go.delveConfig setting
6f98706 src/goTest: add view for profiles
b82ed6c package.json: start v0.29.0-dev
0f196ff package.json: support testAtCursor (and co.) despite codelenses
Change-Id: I36daf79425451ef500ad5a45301c9f2631700fa0
diff --git a/docs/commands.md b/docs/commands.md
index 316235e..ee71ec0 100644
--- a/docs/commands.md
+++ b/docs/commands.md
@@ -71,6 +71,10 @@
Run a test and capture a profile
+### `Go Test: Delete Profile`
+
+Delete selected profile
+
### `Go: Benchmark Package`
Runs all benchmarks in the package of the current file.
diff --git a/docs/settings.md b/docs/settings.md
index 5f34fdc..51350f3 100644
--- a/docs/settings.md
+++ b/docs/settings.md
@@ -142,28 +142,14 @@
Delve settings that applies to all debugging sessions. Debug configuration in the launch.json file will override these values.
| Properties | Description |
| --- | --- |
-| `apiVersion` | Delve Api Version to use. Default value is 2. <br/> Allowed Options: `1`, `2` <br/> Default: `2` |
+| `apiVersion` | Delve Api Version to use. Default value is 2. This applies only when using the 'legacy' debug adapter. <br/> Allowed Options: `1`, `2` <br/> Default: `2` |
| `debugAdapter` | Select which debug adapter to use by default. This is also used for choosing which debug adapter to use when no launch.json is present and with codelenses. <br/> Allowed Options: `legacy`, `dlv-dap` <br/> Default: `"dlv-dap"` |
+| `dlvFlags` | Extra flags for `dlv`. See `dlv help` for the full list of supported. Flags such as `--log-output`, `--log`, `--log-dest`, `--api-version`, `--output`, `--backend` already have corresponding properties in the debug configuration, and flags such as `--listen` and `--headless` are used internally. If they are specified in `dlvFlags`, they may be ignored or cause an error. |
| `dlvLoadConfig` | LoadConfig describes to delve, how to load values from target's memory. Ignored by 'dlv-dap'. <br/> Default: ``` { <pre>"followPointers" : true,<br/>"maxArrayValues" : 64,<br/>"maxStringLen" : 64,<br/>"maxStructFields" : -1,<br/>"maxVariableRecurse" : 1,</pre>} ``` |
+| `logOutput` | Comma separated list of components that should produce debug output. Maps to dlv's `--log-output` flag. Check `dlv log` for details. <br/> Allowed Options: `debugger`, `gdbwire`, `lldbout`, `debuglineerr`, `rpc`, `dap` <br/> Default: `"debugger"` |
| `showGlobalVariables` | Boolean value to indicate whether global package variables should be shown in the variables pane or not. <br/> Default: `false` |
+| `showLog` | Show log output from the delve debugger. Maps to dlv's `--log` flag. <br/> Default: `false` |
| `substitutePath` | An array of mappings from a local path to the remote path that is used by the debuggee. The debug adapter will replace the local path with the remote path in all of the calls. Overriden by `remotePath` (in attach request). |
-
-Default:
-```
-{
- "apiVersion" : 2,
- "debugAdapter" : "legacy",
- "dlvLoadConfig" : {
- "followPointers" : true,
- "maxArrayValues" : 64,
- "maxStringLen" : 64,
- "maxStructFields" : -1,
- "maxVariableRecurse" : 1,
- },
- "showGlobalVariables" : false,
- "substitutePath" : [],
-}
-```
### `go.disableConcurrentTests`
If true, tests will not run concurrently. When a new test run is started, the previous will be cancelled.
@@ -182,15 +168,15 @@
| --- | --- |
| `addImport` | If true, adds command to import a package to the editor context menu <br/> Default: `true` |
| `addTags` | If true, adds command to add configured tags from struct fields to the editor context menu <br/> Default: `true` |
-| `benchmarkAtCursor` | If true, adds command to benchmark the test under the cursor to the editor context menu <br/> Default: `true` |
-| `debugTestAtCursor` | If true, adds command to debug the test under the cursor to the editor context menu <br/> Default: `true` |
+| `benchmarkAtCursor` | If true, adds command to benchmark the test under the cursor to the editor context menu <br/> Default: `false` |
+| `debugTestAtCursor` | If true, adds command to debug the test under the cursor to the editor context menu <br/> Default: `false` |
| `fillStruct` | If true, adds command to fill struct literal with default values to the editor context menu <br/> Default: `true` |
| `generateTestForFile` | If true, adds command to generate unit tests for current file to the editor context menu <br/> Default: `true` |
| `generateTestForFunction` | If true, adds command to generate unit tests for function under the cursor to the editor context menu <br/> Default: `true` |
| `generateTestForPackage` | If true, adds command to generate unit tests for currnt package to the editor context menu <br/> Default: `true` |
| `playground` | If true, adds command to upload the current file or selection to the Go Playground <br/> Default: `true` |
| `removeTags` | If true, adds command to remove configured tags from struct fields to the editor context menu <br/> Default: `true` |
-| `testAtCursor` | If true, adds command to run the test under the cursor to the editor context menu <br/> Default: `true` |
+| `testAtCursor` | If true, adds command to run the test under the cursor to the editor context menu <br/> Default: `false` |
| `testCoverage` | If true, adds command to run test coverage to the editor context menu <br/> Default: `true` |
| `testFile` | If true, adds command to run all tests in the current file to the editor context menu <br/> Default: `true` |
| `testPackage` | If true, adds command to run all tests in the current package to the editor context menu <br/> Default: `true` |
@@ -382,6 +368,11 @@
"tags" : "",
}
```
+### `go.survey.prompt`
+
+Prompt for surveys, including the gopls survey and the Go developer survey.
+
+Default: `true`
### `go.terminal.activateEnvironment`
Apply the Go & PATH environment variables used by the extension to all integrated terminals.
@@ -419,6 +410,11 @@
Set the source location of dynamically discovered subtests to the location of the containing function. As a result, dynamically discovered subtests will be added to the gutter test widget of the containing function.
Default: `false`
+### `go.testExplorer.showOutput`
+
+Open the test output terminal when a test run is started.
+
+Default: `true`
### `go.testFlags`
Flags to pass to `go test`. If null, then buildFlags will be used. This is not propagated to the language server.
@@ -641,7 +637,7 @@
```json5
"gopls": {
...
- "codelens": {
+ "codelenses": {
"generate": false, // Don't show the `go generate` lens.
"gc_details": true // Show a code lens toggling the display of gc's choices.
}
@@ -726,6 +722,7 @@
| `fillstruct` | note incomplete struct initializations <br/> This analyzer provides diagnostics for any struct literals that do not have any fields initialized. Because the suggested fix for this analysis is expensive to compute, callers should compute it separately, using the SuggestedFix function below. <br/> <br/> Default: `true` |
| `httpresponse` | check for mistakes using HTTP responses <br/> A common mistake when using the net/http package is to defer a function call to close the http.Response Body before checking the error that determines whether the response is valid: <br/> <pre>resp, err := http.Head(url)<br/>defer resp.Body.Close()<br/>if err != nil {<br/> log.Fatal(err)<br/>}<br/>// (defer statement belongs here)</pre><br/> This checker helps uncover latent nil dereference bugs by reporting a diagnostic for such mistakes. <br/> Default: `true` |
| `ifaceassert` | detect impossible interface-to-interface type assertions <br/> This checker flags type assertions v.(T) and corresponding type-switch cases in which the static type V of v is an interface that cannot possibly implement the target interface T. This occurs when V and T contain methods with the same name but different signatures. Example: <br/> <pre>var v interface {<br/> Read()<br/>}<br/>_ = v.(io.Reader)</pre><br/> The Read method in v has a different signature than the Read method in io.Reader, so this assertion cannot succeed. <br/> <br/> Default: `true` |
+| `infertypeargs` | check for unnecessary type arguments in call expressions <br/> Explicit type arguments may be omitted from call expressions if they can be inferred from function arguments, or from other type arguments: <br/> func f[T any](T) {} <br/> func _() { <pre>f[string]("foo") // string could be inferred</pre>} <br/> <br/> Default: `true` |
| `loopclosure` | check references to loop variables from within nested functions <br/> This analyzer checks for references to loop variables from within a function literal inside the loop body. It checks only instances where the function literal is called in a defer or go statement that is the last statement in the loop body, as otherwise we would need whole program analysis. <br/> For example: <br/> <pre>for i, v := range s {<br/> go func() {<br/> println(i, v) // not what you might expect<br/> }()<br/>}</pre><br/> See: https://golang.org/doc/go_faq.html#closures_and_goroutines <br/> Default: `true` |
| `lostcancel` | check cancel func returned by context.WithCancel is called <br/> The cancellation function returned by context.WithCancel, WithTimeout, and WithDeadline must be called or the new context will remain live until its parent context is cancelled. (The background context is never cancelled.) <br/> Default: `true` |
| `nilfunc` | check for useless comparisons between functions and nil <br/> A useless comparison is one like f == nil as opposed to f() == nil. <br/> Default: `true` |
@@ -744,13 +741,14 @@
| `structtag` | check that struct field tags conform to reflect.StructTag.Get <br/> Also report certain struct tags (json, xml) used with unexported fields. <br/> Default: `true` |
| `testinggoroutine` | report calls to (*testing.T).Fatal from goroutines started by a test. <br/> Functions that abruptly terminate a test, such as the Fatal, Fatalf, FailNow, and Skip{,f,Now} methods of *testing.T, must be called from the test goroutine itself. This checker detects calls to these functions that occur within a goroutine started by the test. For example: <br/> func TestFoo(t *testing.T) { go func() { t.Fatal("oops") // error: (*T).Fatal called from non-test goroutine }() } <br/> <br/> Default: `true` |
| `tests` | check for common mistaken usages of tests and examples <br/> The tests checker walks Test, Benchmark and Example functions checking malformed names, wrong signatures and examples documenting non-existent identifiers. <br/> Please see the documentation for package testing in golang.org/pkg/testing for the conventions that are enforced for Tests, Benchmarks, and Examples. <br/> Default: `true` |
-| `undeclaredname` | suggested fixes for "undeclared name: <>" <br/> This checker provides suggested fixes for type errors of the type "undeclared name: <>". It will insert a new statement: "<> := ". <br/> Default: `true` |
+| `undeclaredname` | suggested fixes for "undeclared name: <>" <br/> This checker provides suggested fixes for type errors of the type "undeclared name: <>". It will either insert a new statement, such as: <br/> "<> := " <br/> or a new function declaration, such as: <br/> func <>(inferred parameters) { <pre>panic("implement me!")</pre>} <br/> <br/> Default: `true` |
| `unmarshal` | report passing non-pointer or non-interface values to unmarshal <br/> The unmarshal analysis reports calls to functions such as json.Unmarshal in which the argument type is not a pointer or an interface. <br/> Default: `true` |
| `unreachable` | check for unreachable code <br/> The unreachable analyzer finds statements that execution can never reach because they are preceded by an return statement, a call to panic, an infinite loop, or similar constructs. <br/> Default: `true` |
| `unsafeptr` | check for invalid conversions of uintptr to unsafe.Pointer <br/> The unsafeptr analyzer reports likely incorrect uses of unsafe.Pointer to convert integers to pointers. A conversion from uintptr to unsafe.Pointer is invalid if it implies that there is a uintptr-typed word in memory that holds a pointer value, because that word will be invisible to stack copying and to the garbage collector. <br/> Default: `true` |
| `unusedparams` | check for unused parameters of functions <br/> The unusedparams analyzer checks functions to see if there are any parameters that are not being used. <br/> To reduce false positives it ignores: - methods - parameters that do not have a name or are underscored - functions in test files - functions with empty bodies or those with just a return stmt <br/> Default: `false` |
| `unusedresult` | check for unused results of calls to some functions <br/> Some functions like fmt.Errorf return a result and have no side effects, so it is always a mistake to discard the result. This analyzer reports calls to certain functions in which the result of the call is ignored. <br/> The set of functions may be controlled using flags. <br/> Default: `true` |
| `unusedwrite` | checks for unused writes <br/> The analyzer reports instances of writes to struct fields and arrays that are never read. Specifically, when a struct object or an array is copied, its elements are copied implicitly by the compiler, and any element write to this copy does nothing with the original object. <br/> For example: <br/> <pre>type T struct { x int }<br/>func f(input []T) {<br/> for i, v := range input { // v is a copy<br/> v.x = i // unused write to field x<br/> }<br/>}</pre><br/> Another example is about non-pointer receiver: <br/> <pre>type T struct { x int }<br/>func (t T) f() { // t is a copy<br/> t.x = i // unused write to field x<br/>}</pre><br/> <br/> Default: `false` |
+| `useany` | check for constraints that could be simplified to "any" <br/> Default: `true` |
### `ui.diagnostic.annotations`
(Experimental) annotations specifies the various kinds of optimization diagnostics
@@ -850,7 +848,7 @@
```json5
"gopls": {
...
- "symbolStyle": "dynamic",
+ "symbolStyle": "Dynamic",
...
}
```
diff --git a/docs/test-explorer.md b/docs/test-explorer.md
new file mode 100644
index 0000000..a20bfdd
--- /dev/null
+++ b/docs/test-explorer.md
@@ -0,0 +1,10 @@
+# Test explorer implementation (src/goTest)
+
+## Mapping tests
+
+`TestItem`s themselves cannot be used with `Map`s. For non-primitive (object)
+keys, Map uses strict equality. Two objects are only strictly equal to each
+other if they are the exact same object. Because of this, `TestItem`s cannot be
+used as map keys, as the extension host may provide different objects for the
+same test. Therefore, if we want to use `TestItem`s as a map key, we must use
+their ID instead.
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index f83d3a7..63c1c5f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "go",
- "version": "0.28.1",
+ "version": "0.29.0",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "go",
- "version": "0.28.1",
+ "version": "0.29.0",
"license": "MIT",
"dependencies": {
"deep-equal": "^2.0.2",
@@ -38,7 +38,7 @@
"fs-extra": "^9.0.0",
"get-port": "^5.1.1",
"gts": "^3.1.0",
- "mocha": "^7.1.1",
+ "mocha": "^9.1.2",
"prettier": "^2.2.1",
"sinon": "^9.0.2",
"ts-loader": "^7.0.5",
@@ -513,6 +513,12 @@
"url": "https://opencollective.com/typescript-eslint"
}
},
+ "node_modules/@ungap/promise-all-settled": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz",
+ "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==",
+ "dev": true
+ },
"node_modules/acorn": {
"version": "7.4.1",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
@@ -571,62 +577,12 @@
}
},
"node_modules/ansi-align": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz",
- "integrity": "sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw==",
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.1.tgz",
+ "integrity": "sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==",
"dev": true,
"dependencies": {
- "string-width": "^3.0.0"
- }
- },
- "node_modules/ansi-align/node_modules/ansi-regex": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
- "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
- "dev": true,
- "engines": {
- "node": ">=6"
- }
- },
- "node_modules/ansi-align/node_modules/emoji-regex": {
- "version": "7.0.3",
- "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
- "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
- "dev": true
- },
- "node_modules/ansi-align/node_modules/is-fullwidth-code-point": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
- "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
- "dev": true,
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/ansi-align/node_modules/string-width": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
- "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
- "dev": true,
- "dependencies": {
- "emoji-regex": "^7.0.1",
- "is-fullwidth-code-point": "^2.0.0",
- "strip-ansi": "^5.1.0"
- },
- "engines": {
- "node": ">=6"
- }
- },
- "node_modules/ansi-align/node_modules/strip-ansi": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
- "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
- "dev": true,
- "dependencies": {
- "ansi-regex": "^4.1.0"
- },
- "engines": {
- "node": ">=6"
+ "string-width": "^4.1.0"
}
},
"node_modules/ansi-colors": {
@@ -666,9 +622,9 @@
}
},
"node_modules/ansi-regex": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
- "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+ "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
"dev": true,
"engines": {
"node": ">=8"
@@ -690,9 +646,9 @@
}
},
"node_modules/anymatch": {
- "version": "3.1.1",
- "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
- "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
+ "version": "3.1.2",
+ "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
+ "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
"dev": true,
"dependencies": {
"normalize-path": "^3.0.0",
@@ -1096,24 +1052,24 @@
"dev": true
},
"node_modules/chokidar": {
- "version": "3.3.0",
- "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.3.0.tgz",
- "integrity": "sha512-dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A==",
+ "version": "3.5.2",
+ "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz",
+ "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==",
"dev": true,
"dependencies": {
- "anymatch": "~3.1.1",
+ "anymatch": "~3.1.2",
"braces": "~3.0.2",
- "glob-parent": "~5.1.0",
+ "glob-parent": "~5.1.2",
"is-binary-path": "~2.1.0",
"is-glob": "~4.0.1",
"normalize-path": "~3.0.0",
- "readdirp": "~3.2.0"
+ "readdirp": "~3.6.0"
},
"engines": {
"node": ">= 8.10.0"
},
"optionalDependencies": {
- "fsevents": "~2.1.1"
+ "fsevents": "~2.3.2"
}
},
"node_modules/ci-info": {
@@ -1156,105 +1112,14 @@
}
},
"node_modules/cliui": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
- "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+ "version": "7.0.4",
+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+ "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
"dev": true,
"dependencies": {
- "string-width": "^3.1.0",
- "strip-ansi": "^5.2.0",
- "wrap-ansi": "^5.1.0"
- }
- },
- "node_modules/cliui/node_modules/ansi-regex": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
- "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
- "dev": true,
- "engines": {
- "node": ">=6"
- }
- },
- "node_modules/cliui/node_modules/ansi-styles": {
- "version": "3.2.1",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
- "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
- "dev": true,
- "dependencies": {
- "color-convert": "^1.9.0"
- },
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/cliui/node_modules/color-convert": {
- "version": "1.9.3",
- "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
- "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
- "dev": true,
- "dependencies": {
- "color-name": "1.1.3"
- }
- },
- "node_modules/cliui/node_modules/color-name": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
- "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
- "dev": true
- },
- "node_modules/cliui/node_modules/emoji-regex": {
- "version": "7.0.3",
- "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
- "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
- "dev": true
- },
- "node_modules/cliui/node_modules/is-fullwidth-code-point": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
- "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
- "dev": true,
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/cliui/node_modules/string-width": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
- "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
- "dev": true,
- "dependencies": {
- "emoji-regex": "^7.0.1",
- "is-fullwidth-code-point": "^2.0.0",
- "strip-ansi": "^5.1.0"
- },
- "engines": {
- "node": ">=6"
- }
- },
- "node_modules/cliui/node_modules/strip-ansi": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
- "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
- "dev": true,
- "dependencies": {
- "ansi-regex": "^4.1.0"
- },
- "engines": {
- "node": ">=6"
- }
- },
- "node_modules/cliui/node_modules/wrap-ansi": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
- "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
- "dev": true,
- "dependencies": {
- "ansi-styles": "^3.2.0",
- "string-width": "^3.0.0",
- "strip-ansi": "^5.0.0"
- },
- "engines": {
- "node": ">=6"
+ "string-width": "^4.2.0",
+ "strip-ansi": "^6.0.0",
+ "wrap-ansi": "^7.0.0"
}
},
"node_modules/clone-response": {
@@ -1363,9 +1228,9 @@
}
},
"node_modules/debug": {
- "version": "4.3.1",
- "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
- "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+ "version": "4.3.2",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
+ "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
"dependencies": {
"ms": "2.1.2"
},
@@ -1710,6 +1575,15 @@
"esbuild": "bin/esbuild"
}
},
+ "node_modules/escalade": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+ "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+ "dev": true,
+ "engines": {
+ "node": ">=6"
+ }
+ },
"node_modules/escape-goat": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-2.1.1.tgz",
@@ -2163,25 +2037,26 @@
}
},
"node_modules/find-up": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
- "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+ "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
"dev": true,
"dependencies": {
- "locate-path": "^3.0.0"
+ "locate-path": "^6.0.0",
+ "path-exists": "^4.0.0"
},
"engines": {
- "node": ">=6"
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/flat": {
- "version": "4.1.1",
- "resolved": "https://registry.npmjs.org/flat/-/flat-4.1.1.tgz",
- "integrity": "sha512-FmTtBsHskrU6FJ2VxCnsDb84wu9zhmO3cUX2kGFb5tuwhfXxGciiT0oRY+cck35QmG+NmGh5eLz6lLCpWTqwpA==",
+ "version": "5.0.2",
+ "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
+ "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
"dev": true,
- "dependencies": {
- "is-buffer": "~2.0.3"
- },
"bin": {
"flat": "cli.js"
}
@@ -2252,10 +2127,9 @@
"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
},
"node_modules/fsevents": {
- "version": "2.1.3",
- "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
- "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
- "deprecated": "\"Please update to latest v2.3 or v2.2\"",
+ "version": "2.3.2",
+ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+ "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
"dev": true,
"hasInstallScript": true,
"optional": true,
@@ -2359,9 +2233,9 @@
}
},
"node_modules/glob": {
- "version": "7.1.6",
- "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
- "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+ "version": "7.1.7",
+ "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
+ "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
"dependencies": {
"fs.realpath": "^1.0.0",
"inflight": "^1.0.4",
@@ -2855,29 +2729,6 @@
"url": "https://github.com/sponsors/ljharb"
}
},
- "node_modules/is-buffer": {
- "version": "2.0.5",
- "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz",
- "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==",
- "dev": true,
- "funding": [
- {
- "type": "github",
- "url": "https://github.com/sponsors/feross"
- },
- {
- "type": "patreon",
- "url": "https://www.patreon.com/feross"
- },
- {
- "type": "consulting",
- "url": "https://feross.org/support"
- }
- ],
- "engines": {
- "node": ">=4"
- }
- },
"node_modules/is-callable": {
"version": "1.2.3",
"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
@@ -3128,6 +2979,18 @@
"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
},
+ "node_modules/is-unicode-supported": {
+ "version": "0.1.0",
+ "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
+ "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
+ "dev": true,
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
"node_modules/is-weakmap": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz",
@@ -3376,16 +3239,18 @@
}
},
"node_modules/locate-path": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
- "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+ "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
"dev": true,
"dependencies": {
- "p-locate": "^3.0.0",
- "path-exists": "^3.0.0"
+ "p-locate": "^5.0.0"
},
"engines": {
- "node": ">=6"
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/lodash": {
@@ -3400,77 +3265,19 @@
"dev": true
},
"node_modules/log-symbols": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz",
- "integrity": "sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==",
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+ "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
"dev": true,
"dependencies": {
- "chalk": "^2.4.2"
+ "chalk": "^4.1.0",
+ "is-unicode-supported": "^0.1.0"
},
"engines": {
- "node": ">=8"
- }
- },
- "node_modules/log-symbols/node_modules/ansi-styles": {
- "version": "3.2.1",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
- "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
- "dev": true,
- "dependencies": {
- "color-convert": "^1.9.0"
+ "node": ">=10"
},
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/log-symbols/node_modules/chalk": {
- "version": "2.4.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
- "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
- "dev": true,
- "dependencies": {
- "ansi-styles": "^3.2.1",
- "escape-string-regexp": "^1.0.5",
- "supports-color": "^5.3.0"
- },
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/log-symbols/node_modules/color-convert": {
- "version": "1.9.3",
- "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
- "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
- "dev": true,
- "dependencies": {
- "color-name": "1.1.3"
- }
- },
- "node_modules/log-symbols/node_modules/color-name": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
- "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
- "dev": true
- },
- "node_modules/log-symbols/node_modules/has-flag": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
- "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
- "dev": true,
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/log-symbols/node_modules/supports-color": {
- "version": "5.5.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
- "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
- "dev": true,
- "dependencies": {
- "has-flag": "^3.0.0"
- },
- "engines": {
- "node": ">=4"
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/lowercase-keys": {
@@ -3696,177 +3503,115 @@
}
},
"node_modules/mocha": {
- "version": "7.2.0",
- "resolved": "https://registry.npmjs.org/mocha/-/mocha-7.2.0.tgz",
- "integrity": "sha512-O9CIypScywTVpNaRrCAgoUnJgozpIofjKUYmJhiCIJMiuYnLI6otcb1/kpW9/n/tJODHGZ7i8aLQoDVsMtOKQQ==",
+ "version": "9.1.2",
+ "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.1.2.tgz",
+ "integrity": "sha512-ta3LtJ+63RIBP03VBjMGtSqbe6cWXRejF9SyM9Zyli1CKZJZ+vfCTj3oW24V7wAphMJdpOFLoMI3hjJ1LWbs0w==",
"dev": true,
"dependencies": {
- "ansi-colors": "3.2.3",
+ "@ungap/promise-all-settled": "1.1.2",
+ "ansi-colors": "4.1.1",
"browser-stdout": "1.3.1",
- "chokidar": "3.3.0",
- "debug": "3.2.6",
- "diff": "3.5.0",
- "escape-string-regexp": "1.0.5",
- "find-up": "3.0.0",
- "glob": "7.1.3",
+ "chokidar": "3.5.2",
+ "debug": "4.3.2",
+ "diff": "5.0.0",
+ "escape-string-regexp": "4.0.0",
+ "find-up": "5.0.0",
+ "glob": "7.1.7",
"growl": "1.10.5",
"he": "1.2.0",
- "js-yaml": "3.13.1",
- "log-symbols": "3.0.0",
+ "js-yaml": "4.1.0",
+ "log-symbols": "4.1.0",
"minimatch": "3.0.4",
- "mkdirp": "0.5.5",
- "ms": "2.1.1",
- "node-environment-flags": "1.0.6",
- "object.assign": "4.1.0",
- "strip-json-comments": "2.0.1",
- "supports-color": "6.0.0",
- "which": "1.3.1",
- "wide-align": "1.1.3",
- "yargs": "13.3.2",
- "yargs-parser": "13.1.2",
- "yargs-unparser": "1.6.0"
+ "ms": "2.1.3",
+ "nanoid": "3.1.25",
+ "serialize-javascript": "6.0.0",
+ "strip-json-comments": "3.1.1",
+ "supports-color": "8.1.1",
+ "which": "2.0.2",
+ "workerpool": "6.1.5",
+ "yargs": "16.2.0",
+ "yargs-parser": "20.2.4",
+ "yargs-unparser": "2.0.0"
},
"bin": {
"_mocha": "bin/_mocha",
"mocha": "bin/mocha"
},
"engines": {
- "node": ">= 8.10.0"
+ "node": ">= 12.0.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/mochajs"
}
},
- "node_modules/mocha/node_modules/ansi-colors": {
- "version": "3.2.3",
- "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz",
- "integrity": "sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==",
- "dev": true,
- "engines": {
- "node": ">=6"
- }
- },
- "node_modules/mocha/node_modules/debug": {
- "version": "3.2.6",
- "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
- "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
- "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
- "dev": true,
- "dependencies": {
- "ms": "^2.1.1"
- }
+ "node_modules/mocha/node_modules/argparse": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+ "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+ "dev": true
},
"node_modules/mocha/node_modules/diff": {
- "version": "3.5.0",
- "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
- "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
+ "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
"dev": true,
"engines": {
"node": ">=0.3.1"
}
},
- "node_modules/mocha/node_modules/glob": {
- "version": "7.1.3",
- "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
- "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+ "node_modules/mocha/node_modules/escape-string-regexp": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+ "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
"dev": true,
- "dependencies": {
- "fs.realpath": "^1.0.0",
- "inflight": "^1.0.4",
- "inherits": "2",
- "minimatch": "^3.0.4",
- "once": "^1.3.0",
- "path-is-absolute": "^1.0.0"
+ "engines": {
+ "node": ">=10"
},
- "engines": {
- "node": "*"
- }
- },
- "node_modules/mocha/node_modules/has-flag": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
- "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
- "dev": true,
- "engines": {
- "node": ">=4"
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/mocha/node_modules/js-yaml": {
- "version": "3.13.1",
- "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
- "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+ "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
"dev": true,
"dependencies": {
- "argparse": "^1.0.7",
- "esprima": "^4.0.0"
+ "argparse": "^2.0.1"
},
"bin": {
"js-yaml": "bin/js-yaml.js"
}
},
"node_modules/mocha/node_modules/ms": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
- "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+ "version": "2.1.3",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
"dev": true
},
- "node_modules/mocha/node_modules/object.assign": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
- "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
- "dev": true,
- "dependencies": {
- "define-properties": "^1.1.2",
- "function-bind": "^1.1.1",
- "has-symbols": "^1.0.0",
- "object-keys": "^1.0.11"
- },
- "engines": {
- "node": ">= 0.4"
- }
- },
- "node_modules/mocha/node_modules/strip-json-comments": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
- "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
- "dev": true,
- "engines": {
- "node": ">=0.10.0"
- }
- },
"node_modules/mocha/node_modules/supports-color": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.0.0.tgz",
- "integrity": "sha512-on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg==",
+ "version": "8.1.1",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+ "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
"dev": true,
"dependencies": {
- "has-flag": "^3.0.0"
+ "has-flag": "^4.0.0"
},
"engines": {
- "node": ">=6"
- }
- },
- "node_modules/mocha/node_modules/which": {
- "version": "1.3.1",
- "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
- "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
- "dev": true,
- "dependencies": {
- "isexe": "^2.0.0"
+ "node": ">=10"
},
- "bin": {
- "which": "bin/which"
+ "funding": {
+ "url": "https://github.com/chalk/supports-color?sponsor=1"
}
},
"node_modules/mocha/node_modules/yargs-parser": {
- "version": "13.1.2",
- "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
- "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
+ "version": "20.2.4",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
+ "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
"dev": true,
- "dependencies": {
- "camelcase": "^5.0.0",
- "decamelize": "^1.2.0"
+ "engines": {
+ "node": ">=10"
}
},
"node_modules/moment": {
@@ -3888,6 +3633,18 @@
"integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
"dev": true
},
+ "node_modules/nanoid": {
+ "version": "3.1.25",
+ "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.25.tgz",
+ "integrity": "sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q==",
+ "dev": true,
+ "bin": {
+ "nanoid": "bin/nanoid.cjs"
+ },
+ "engines": {
+ "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+ }
+ },
"node_modules/natural-compare": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
@@ -3916,25 +3673,6 @@
"path-to-regexp": "^1.7.0"
}
},
- "node_modules/node-environment-flags": {
- "version": "1.0.6",
- "resolved": "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.6.tgz",
- "integrity": "sha512-5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw==",
- "dev": true,
- "dependencies": {
- "object.getownpropertydescriptors": "^2.0.3",
- "semver": "^5.7.0"
- }
- },
- "node_modules/node-environment-flags/node_modules/semver": {
- "version": "5.7.1",
- "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
- "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
- "dev": true,
- "bin": {
- "semver": "bin/semver"
- }
- },
"node_modules/normalize-package-data": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.1.tgz",
@@ -4044,23 +3782,6 @@
"url": "https://github.com/sponsors/ljharb"
}
},
- "node_modules/object.getownpropertydescriptors": {
- "version": "2.1.2",
- "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.2.tgz",
- "integrity": "sha512-WtxeKSzfBjlzL+F9b7M7hewDzMwy+C8NRssHd1YrNlzHzIDrXcXiNOMrezdAEM4UXixgV+vvnyBeN7Rygl2ttQ==",
- "dev": true,
- "dependencies": {
- "call-bind": "^1.0.2",
- "define-properties": "^1.1.3",
- "es-abstract": "^1.18.0-next.2"
- },
- "engines": {
- "node": ">= 0.8"
- },
- "funding": {
- "url": "https://github.com/sponsors/ljharb"
- }
- },
"node_modules/once": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -4135,15 +3856,33 @@
}
},
"node_modules/p-locate": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
- "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+ "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
"dev": true,
"dependencies": {
- "p-limit": "^2.0.0"
+ "p-limit": "^3.0.2"
},
"engines": {
- "node": ">=6"
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/p-locate/node_modules/p-limit": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+ "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+ "dev": true,
+ "dependencies": {
+ "yocto-queue": "^0.1.0"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/p-try": {
@@ -4210,12 +3949,12 @@
}
},
"node_modules/path-exists": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
- "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+ "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
"dev": true,
"engines": {
- "node": ">=4"
+ "node": ">=8"
}
},
"node_modules/path-is-absolute": {
@@ -4417,6 +4156,15 @@
"node": ">=8"
}
},
+ "node_modules/randombytes": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+ "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+ "dev": true,
+ "dependencies": {
+ "safe-buffer": "^5.1.0"
+ }
+ },
"node_modules/rc": {
"version": "1.2.8",
"resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
@@ -4516,15 +4264,6 @@
"node": ">=8"
}
},
- "node_modules/read-pkg-up/node_modules/path-exists": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
- "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
- "dev": true,
- "engines": {
- "node": ">=8"
- }
- },
"node_modules/read-pkg/node_modules/hosted-git-info": {
"version": "2.8.9",
"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
@@ -4583,15 +4322,15 @@
"dev": true
},
"node_modules/readdirp": {
- "version": "3.2.0",
- "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.2.0.tgz",
- "integrity": "sha512-crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ==",
+ "version": "3.6.0",
+ "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+ "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
"dev": true,
"dependencies": {
- "picomatch": "^2.0.4"
+ "picomatch": "^2.2.1"
},
"engines": {
- "node": ">= 8"
+ "node": ">=8.10.0"
}
},
"node_modules/redent": {
@@ -4707,12 +4446,6 @@
"node": ">=0.10.0"
}
},
- "node_modules/require-main-filename": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
- "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
- "dev": true
- },
"node_modules/resolve": {
"version": "1.20.0",
"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
@@ -4871,11 +4604,14 @@
"semver": "bin/semver.js"
}
},
- "node_modules/set-blocking": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
- "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
- "dev": true
+ "node_modules/serialize-javascript": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
+ "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
+ "dev": true,
+ "dependencies": {
+ "randombytes": "^2.1.0"
+ }
},
"node_modules/setimmediate": {
"version": "1.0.5",
@@ -5837,12 +5573,6 @@
"url": "https://github.com/sponsors/ljharb"
}
},
- "node_modules/which-module": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
- "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
- "dev": true
- },
"node_modules/which-typed-array": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.4.tgz",
@@ -5863,58 +5593,6 @@
"url": "https://github.com/sponsors/ljharb"
}
},
- "node_modules/wide-align": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
- "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
- "dev": true,
- "dependencies": {
- "string-width": "^1.0.2 || 2"
- }
- },
- "node_modules/wide-align/node_modules/ansi-regex": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
- "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
- "dev": true,
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/wide-align/node_modules/is-fullwidth-code-point": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
- "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
- "dev": true,
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/wide-align/node_modules/string-width": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
- "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
- "dev": true,
- "dependencies": {
- "is-fullwidth-code-point": "^2.0.0",
- "strip-ansi": "^4.0.0"
- },
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/wide-align/node_modules/strip-ansi": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
- "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
- "dev": true,
- "dependencies": {
- "ansi-regex": "^3.0.0"
- },
- "engines": {
- "node": ">=4"
- }
- },
"node_modules/widest-line": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz",
@@ -5936,6 +5614,12 @@
"node": ">=0.10.0"
}
},
+ "node_modules/workerpool": {
+ "version": "6.1.5",
+ "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.5.tgz",
+ "integrity": "sha512-XdKkCK0Zqc6w3iTxLckiuJ81tiD/o5rBE/m+nXpRCB+/Sq4DqkfXZ/x0jW02DG1tGsfUGXbTJyZDP+eu67haSw==",
+ "dev": true
+ },
"node_modules/wrap-ansi": {
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
@@ -5980,10 +5664,13 @@
}
},
"node_modules/y18n": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz",
- "integrity": "sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==",
- "dev": true
+ "version": "5.0.8",
+ "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+ "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+ "dev": true,
+ "engines": {
+ "node": ">=10"
+ }
},
"node_modules/yallist": {
"version": "4.0.0",
@@ -5991,21 +5678,21 @@
"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
},
"node_modules/yargs": {
- "version": "13.3.2",
- "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
- "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
+ "version": "16.2.0",
+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+ "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
"dev": true,
"dependencies": {
- "cliui": "^5.0.0",
- "find-up": "^3.0.0",
- "get-caller-file": "^2.0.1",
+ "cliui": "^7.0.2",
+ "escalade": "^3.1.1",
+ "get-caller-file": "^2.0.5",
"require-directory": "^2.1.1",
- "require-main-filename": "^2.0.0",
- "set-blocking": "^2.0.0",
- "string-width": "^3.0.0",
- "which-module": "^2.0.0",
- "y18n": "^4.0.0",
- "yargs-parser": "^13.1.2"
+ "string-width": "^4.2.0",
+ "y18n": "^5.0.5",
+ "yargs-parser": "^20.2.2"
+ },
+ "engines": {
+ "node": ">=10"
}
},
"node_modules/yargs-parser": {
@@ -6018,77 +5705,51 @@
}
},
"node_modules/yargs-unparser": {
- "version": "1.6.0",
- "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.0.tgz",
- "integrity": "sha512-W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw==",
- "dev": true,
- "dependencies": {
- "flat": "^4.1.0",
- "lodash": "^4.17.15",
- "yargs": "^13.3.0"
- },
- "engines": {
- "node": ">=6"
- }
- },
- "node_modules/yargs/node_modules/ansi-regex": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
- "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
- "dev": true,
- "engines": {
- "node": ">=6"
- }
- },
- "node_modules/yargs/node_modules/emoji-regex": {
- "version": "7.0.3",
- "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
- "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
- "dev": true
- },
- "node_modules/yargs/node_modules/is-fullwidth-code-point": {
"version": "2.0.0",
- "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
- "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
- "dev": true,
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/yargs/node_modules/string-width": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
- "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+ "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz",
+ "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==",
"dev": true,
"dependencies": {
- "emoji-regex": "^7.0.1",
- "is-fullwidth-code-point": "^2.0.0",
- "strip-ansi": "^5.1.0"
+ "camelcase": "^6.0.0",
+ "decamelize": "^4.0.0",
+ "flat": "^5.0.2",
+ "is-plain-obj": "^2.1.0"
},
"engines": {
- "node": ">=6"
+ "node": ">=10"
}
},
- "node_modules/yargs/node_modules/strip-ansi": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
- "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+ "node_modules/yargs-unparser/node_modules/camelcase": {
+ "version": "6.2.0",
+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
+ "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
"dev": true,
- "dependencies": {
- "ansi-regex": "^4.1.0"
- },
"engines": {
- "node": ">=6"
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
}
},
- "node_modules/yargs/node_modules/yargs-parser": {
- "version": "13.1.2",
- "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
- "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
+ "node_modules/yargs-unparser/node_modules/decamelize": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz",
+ "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==",
"dev": true,
- "dependencies": {
- "camelcase": "^5.0.0",
- "decamelize": "^1.2.0"
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/yargs-unparser/node_modules/is-plain-obj": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
+ "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
}
},
"node_modules/yarn": {
@@ -6105,6 +5766,18 @@
"node": ">=4.0.0"
}
},
+ "node_modules/yocto-queue": {
+ "version": "0.1.0",
+ "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+ "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+ "dev": true,
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
"third_party/tree-kill": {
"version": "1.2.2",
"license": "MIT"
@@ -6468,6 +6141,12 @@
"eslint-visitor-keys": "^2.0.0"
}
},
+ "@ungap/promise-all-settled": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz",
+ "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==",
+ "dev": true
+ },
"acorn": {
"version": "7.4.1",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
@@ -6508,52 +6187,12 @@
}
},
"ansi-align": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz",
- "integrity": "sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw==",
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.1.tgz",
+ "integrity": "sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==",
"dev": true,
"requires": {
- "string-width": "^3.0.0"
- },
- "dependencies": {
- "ansi-regex": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
- "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
- "dev": true
- },
- "emoji-regex": {
- "version": "7.0.3",
- "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
- "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
- "dev": true
- },
- "is-fullwidth-code-point": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
- "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
- "dev": true
- },
- "string-width": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
- "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
- "dev": true,
- "requires": {
- "emoji-regex": "^7.0.1",
- "is-fullwidth-code-point": "^2.0.0",
- "strip-ansi": "^5.1.0"
- }
- },
- "strip-ansi": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
- "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
- "dev": true,
- "requires": {
- "ansi-regex": "^4.1.0"
- }
- }
+ "string-width": "^4.1.0"
}
},
"ansi-colors": {
@@ -6580,9 +6219,9 @@
}
},
"ansi-regex": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
- "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+ "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
"dev": true
},
"ansi-styles": {
@@ -6595,9 +6234,9 @@
}
},
"anymatch": {
- "version": "3.1.1",
- "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
- "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
+ "version": "3.1.2",
+ "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
+ "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
"dev": true,
"requires": {
"normalize-path": "^3.0.0",
@@ -6897,19 +6536,19 @@
"dev": true
},
"chokidar": {
- "version": "3.3.0",
- "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.3.0.tgz",
- "integrity": "sha512-dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A==",
+ "version": "3.5.2",
+ "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz",
+ "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==",
"dev": true,
"requires": {
- "anymatch": "~3.1.1",
+ "anymatch": "~3.1.2",
"braces": "~3.0.2",
- "fsevents": "~2.1.1",
- "glob-parent": "~5.1.0",
+ "fsevents": "~2.3.2",
+ "glob-parent": "~5.1.2",
"is-binary-path": "~2.1.0",
"is-glob": "~4.0.1",
"normalize-path": "~3.0.0",
- "readdirp": "~3.2.0"
+ "readdirp": "~3.6.0"
}
},
"ci-info": {
@@ -6940,89 +6579,14 @@
"dev": true
},
"cliui": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
- "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+ "version": "7.0.4",
+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+ "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
"dev": true,
"requires": {
- "string-width": "^3.1.0",
- "strip-ansi": "^5.2.0",
- "wrap-ansi": "^5.1.0"
- },
- "dependencies": {
- "ansi-regex": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
- "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
- "dev": true
- },
- "ansi-styles": {
- "version": "3.2.1",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
- "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
- "dev": true,
- "requires": {
- "color-convert": "^1.9.0"
- }
- },
- "color-convert": {
- "version": "1.9.3",
- "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
- "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
- "dev": true,
- "requires": {
- "color-name": "1.1.3"
- }
- },
- "color-name": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
- "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
- "dev": true
- },
- "emoji-regex": {
- "version": "7.0.3",
- "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
- "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
- "dev": true
- },
- "is-fullwidth-code-point": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
- "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
- "dev": true
- },
- "string-width": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
- "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
- "dev": true,
- "requires": {
- "emoji-regex": "^7.0.1",
- "is-fullwidth-code-point": "^2.0.0",
- "strip-ansi": "^5.1.0"
- }
- },
- "strip-ansi": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
- "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
- "dev": true,
- "requires": {
- "ansi-regex": "^4.1.0"
- }
- },
- "wrap-ansi": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
- "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
- "dev": true,
- "requires": {
- "ansi-styles": "^3.2.0",
- "string-width": "^3.0.0",
- "strip-ansi": "^5.0.0"
- }
- }
+ "string-width": "^4.2.0",
+ "strip-ansi": "^6.0.0",
+ "wrap-ansi": "^7.0.0"
}
},
"clone-response": {
@@ -7113,9 +6677,9 @@
}
},
"debug": {
- "version": "4.3.1",
- "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
- "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+ "version": "4.3.2",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
+ "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
"requires": {
"ms": "2.1.2"
}
@@ -7383,6 +6947,12 @@
"integrity": "sha512-7hyXbU3g94aREufI/5nls7Xcc+RGQeZWZApm6hoBaFvt2BPtpT4TjFMQ9Tb1jU8XyBGz00ShmiyflCogphMHFQ==",
"dev": true
},
+ "escalade": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+ "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+ "dev": true
+ },
"escape-goat": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-2.1.1.tgz",
@@ -7717,22 +7287,20 @@
}
},
"find-up": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
- "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+ "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
"dev": true,
"requires": {
- "locate-path": "^3.0.0"
+ "locate-path": "^6.0.0",
+ "path-exists": "^4.0.0"
}
},
"flat": {
- "version": "4.1.1",
- "resolved": "https://registry.npmjs.org/flat/-/flat-4.1.1.tgz",
- "integrity": "sha512-FmTtBsHskrU6FJ2VxCnsDb84wu9zhmO3cUX2kGFb5tuwhfXxGciiT0oRY+cck35QmG+NmGh5eLz6lLCpWTqwpA==",
- "dev": true,
- "requires": {
- "is-buffer": "~2.0.3"
- }
+ "version": "5.0.2",
+ "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
+ "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
+ "dev": true
},
"flat-cache": {
"version": "3.0.4",
@@ -7788,9 +7356,9 @@
"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
},
"fsevents": {
- "version": "2.1.3",
- "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
- "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
+ "version": "2.3.2",
+ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+ "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
"dev": true,
"optional": true
},
@@ -7865,9 +7433,9 @@
}
},
"glob": {
- "version": "7.1.6",
- "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
- "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+ "version": "7.1.7",
+ "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
+ "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
"requires": {
"fs.realpath": "^1.0.0",
"inflight": "^1.0.4",
@@ -8225,12 +7793,6 @@
"call-bind": "^1.0.0"
}
},
- "is-buffer": {
- "version": "2.0.5",
- "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz",
- "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==",
- "dev": true
- },
"is-callable": {
"version": "1.2.3",
"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
@@ -8385,6 +7947,12 @@
"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
},
+ "is-unicode-supported": {
+ "version": "0.1.0",
+ "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
+ "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
+ "dev": true
+ },
"is-weakmap": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz",
@@ -8594,13 +8162,12 @@
}
},
"locate-path": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
- "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+ "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
"dev": true,
"requires": {
- "p-locate": "^3.0.0",
- "path-exists": "^3.0.0"
+ "p-locate": "^5.0.0"
}
},
"lodash": {
@@ -8615,64 +8182,13 @@
"dev": true
},
"log-symbols": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz",
- "integrity": "sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==",
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+ "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
"dev": true,
"requires": {
- "chalk": "^2.4.2"
- },
- "dependencies": {
- "ansi-styles": {
- "version": "3.2.1",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
- "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
- "dev": true,
- "requires": {
- "color-convert": "^1.9.0"
- }
- },
- "chalk": {
- "version": "2.4.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
- "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
- "dev": true,
- "requires": {
- "ansi-styles": "^3.2.1",
- "escape-string-regexp": "^1.0.5",
- "supports-color": "^5.3.0"
- }
- },
- "color-convert": {
- "version": "1.9.3",
- "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
- "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
- "dev": true,
- "requires": {
- "color-name": "1.1.3"
- }
- },
- "color-name": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
- "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
- "dev": true
- },
- "has-flag": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
- "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
- "dev": true
- },
- "supports-color": {
- "version": "5.5.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
- "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
- "dev": true,
- "requires": {
- "has-flag": "^3.0.0"
- }
- }
+ "chalk": "^4.1.0",
+ "is-unicode-supported": "^0.1.0"
}
},
"lowercase-keys": {
@@ -8836,139 +8352,84 @@
}
},
"mocha": {
- "version": "7.2.0",
- "resolved": "https://registry.npmjs.org/mocha/-/mocha-7.2.0.tgz",
- "integrity": "sha512-O9CIypScywTVpNaRrCAgoUnJgozpIofjKUYmJhiCIJMiuYnLI6otcb1/kpW9/n/tJODHGZ7i8aLQoDVsMtOKQQ==",
+ "version": "9.1.2",
+ "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.1.2.tgz",
+ "integrity": "sha512-ta3LtJ+63RIBP03VBjMGtSqbe6cWXRejF9SyM9Zyli1CKZJZ+vfCTj3oW24V7wAphMJdpOFLoMI3hjJ1LWbs0w==",
"dev": true,
"requires": {
- "ansi-colors": "3.2.3",
+ "@ungap/promise-all-settled": "1.1.2",
+ "ansi-colors": "4.1.1",
"browser-stdout": "1.3.1",
- "chokidar": "3.3.0",
- "debug": "3.2.6",
- "diff": "3.5.0",
- "escape-string-regexp": "1.0.5",
- "find-up": "3.0.0",
- "glob": "7.1.3",
+ "chokidar": "3.5.2",
+ "debug": "4.3.2",
+ "diff": "5.0.0",
+ "escape-string-regexp": "4.0.0",
+ "find-up": "5.0.0",
+ "glob": "7.1.7",
"growl": "1.10.5",
"he": "1.2.0",
- "js-yaml": "3.13.1",
- "log-symbols": "3.0.0",
+ "js-yaml": "4.1.0",
+ "log-symbols": "4.1.0",
"minimatch": "3.0.4",
- "mkdirp": "0.5.5",
- "ms": "2.1.1",
- "node-environment-flags": "1.0.6",
- "object.assign": "4.1.0",
- "strip-json-comments": "2.0.1",
- "supports-color": "6.0.0",
- "which": "1.3.1",
- "wide-align": "1.1.3",
- "yargs": "13.3.2",
- "yargs-parser": "13.1.2",
- "yargs-unparser": "1.6.0"
+ "ms": "2.1.3",
+ "nanoid": "3.1.25",
+ "serialize-javascript": "6.0.0",
+ "strip-json-comments": "3.1.1",
+ "supports-color": "8.1.1",
+ "which": "2.0.2",
+ "workerpool": "6.1.5",
+ "yargs": "16.2.0",
+ "yargs-parser": "20.2.4",
+ "yargs-unparser": "2.0.0"
},
"dependencies": {
- "ansi-colors": {
- "version": "3.2.3",
- "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz",
- "integrity": "sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==",
+ "argparse": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+ "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
"dev": true
},
- "debug": {
- "version": "3.2.6",
- "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
- "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
- "dev": true,
- "requires": {
- "ms": "^2.1.1"
- }
- },
"diff": {
- "version": "3.5.0",
- "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
- "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
+ "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
"dev": true
},
- "glob": {
- "version": "7.1.3",
- "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
- "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
- "dev": true,
- "requires": {
- "fs.realpath": "^1.0.0",
- "inflight": "^1.0.4",
- "inherits": "2",
- "minimatch": "^3.0.4",
- "once": "^1.3.0",
- "path-is-absolute": "^1.0.0"
- }
- },
- "has-flag": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
- "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+ "escape-string-regexp": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+ "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
"dev": true
},
"js-yaml": {
- "version": "3.13.1",
- "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
- "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+ "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
"dev": true,
"requires": {
- "argparse": "^1.0.7",
- "esprima": "^4.0.0"
+ "argparse": "^2.0.1"
}
},
"ms": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
- "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
- "dev": true
- },
- "object.assign": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
- "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
- "dev": true,
- "requires": {
- "define-properties": "^1.1.2",
- "function-bind": "^1.1.1",
- "has-symbols": "^1.0.0",
- "object-keys": "^1.0.11"
- }
- },
- "strip-json-comments": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
- "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+ "version": "2.1.3",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
"dev": true
},
"supports-color": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.0.0.tgz",
- "integrity": "sha512-on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg==",
+ "version": "8.1.1",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+ "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
"dev": true,
"requires": {
- "has-flag": "^3.0.0"
- }
- },
- "which": {
- "version": "1.3.1",
- "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
- "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
- "dev": true,
- "requires": {
- "isexe": "^2.0.0"
+ "has-flag": "^4.0.0"
}
},
"yargs-parser": {
- "version": "13.1.2",
- "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
- "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
- "dev": true,
- "requires": {
- "camelcase": "^5.0.0",
- "decamelize": "^1.2.0"
- }
+ "version": "20.2.4",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
+ "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
+ "dev": true
}
}
},
@@ -8988,6 +8449,12 @@
"integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
"dev": true
},
+ "nanoid": {
+ "version": "3.1.25",
+ "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.25.tgz",
+ "integrity": "sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q==",
+ "dev": true
+ },
"natural-compare": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
@@ -9013,24 +8480,6 @@
"path-to-regexp": "^1.7.0"
}
},
- "node-environment-flags": {
- "version": "1.0.6",
- "resolved": "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.6.tgz",
- "integrity": "sha512-5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw==",
- "dev": true,
- "requires": {
- "object.getownpropertydescriptors": "^2.0.3",
- "semver": "^5.7.0"
- },
- "dependencies": {
- "semver": {
- "version": "5.7.1",
- "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
- "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
- "dev": true
- }
- }
- },
"normalize-package-data": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.1.tgz",
@@ -9104,17 +8553,6 @@
"object-keys": "^1.1.1"
}
},
- "object.getownpropertydescriptors": {
- "version": "2.1.2",
- "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.2.tgz",
- "integrity": "sha512-WtxeKSzfBjlzL+F9b7M7hewDzMwy+C8NRssHd1YrNlzHzIDrXcXiNOMrezdAEM4UXixgV+vvnyBeN7Rygl2ttQ==",
- "dev": true,
- "requires": {
- "call-bind": "^1.0.2",
- "define-properties": "^1.1.3",
- "es-abstract": "^1.18.0-next.2"
- }
- },
"once": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -9168,12 +8606,23 @@
}
},
"p-locate": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
- "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+ "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
"dev": true,
"requires": {
- "p-limit": "^2.0.0"
+ "p-limit": "^3.0.2"
+ },
+ "dependencies": {
+ "p-limit": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+ "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+ "dev": true,
+ "requires": {
+ "yocto-queue": "^0.1.0"
+ }
+ }
}
},
"p-try": {
@@ -9224,9 +8673,9 @@
}
},
"path-exists": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
- "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+ "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
"dev": true
},
"path-is-absolute": {
@@ -9371,6 +8820,15 @@
"integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
"dev": true
},
+ "randombytes": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+ "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+ "dev": true,
+ "requires": {
+ "safe-buffer": "^5.1.0"
+ }
+ },
"rc": {
"version": "1.2.8",
"resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
@@ -9479,12 +8937,6 @@
"requires": {
"p-limit": "^2.2.0"
}
- },
- "path-exists": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
- "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
- "dev": true
}
}
},
@@ -9512,12 +8964,12 @@
}
},
"readdirp": {
- "version": "3.2.0",
- "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.2.0.tgz",
- "integrity": "sha512-crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ==",
+ "version": "3.6.0",
+ "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+ "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
"dev": true,
"requires": {
- "picomatch": "^2.0.4"
+ "picomatch": "^2.2.1"
}
},
"redent": {
@@ -9602,12 +9054,6 @@
"integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
"dev": true
},
- "require-main-filename": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
- "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
- "dev": true
- },
"resolve": {
"version": "1.20.0",
"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
@@ -9717,11 +9163,14 @@
}
}
},
- "set-blocking": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
- "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
- "dev": true
+ "serialize-javascript": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
+ "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
+ "dev": true,
+ "requires": {
+ "randombytes": "^2.1.0"
+ }
},
"setimmediate": {
"version": "1.0.5",
@@ -10481,12 +9930,6 @@
"is-weakset": "^2.0.1"
}
},
- "which-module": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
- "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
- "dev": true
- },
"which-typed-array": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.4.tgz",
@@ -10501,48 +9944,6 @@
"is-typed-array": "^1.1.3"
}
},
- "wide-align": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
- "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
- "dev": true,
- "requires": {
- "string-width": "^1.0.2 || 2"
- },
- "dependencies": {
- "ansi-regex": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
- "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
- "dev": true
- },
- "is-fullwidth-code-point": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
- "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
- "dev": true
- },
- "string-width": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
- "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
- "dev": true,
- "requires": {
- "is-fullwidth-code-point": "^2.0.0",
- "strip-ansi": "^4.0.0"
- }
- },
- "strip-ansi": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
- "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
- "dev": true,
- "requires": {
- "ansi-regex": "^3.0.0"
- }
- }
- }
- },
"widest-line": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz",
@@ -10558,6 +9959,12 @@
"integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
"dev": true
},
+ "workerpool": {
+ "version": "6.1.5",
+ "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.5.tgz",
+ "integrity": "sha512-XdKkCK0Zqc6w3iTxLckiuJ81tiD/o5rBE/m+nXpRCB+/Sq4DqkfXZ/x0jW02DG1tGsfUGXbTJyZDP+eu67haSw==",
+ "dev": true
+ },
"wrap-ansi": {
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
@@ -10593,9 +10000,9 @@
"dev": true
},
"y18n": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz",
- "integrity": "sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==",
+ "version": "5.0.8",
+ "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+ "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
"dev": true
},
"yallist": {
@@ -10604,71 +10011,18 @@
"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
},
"yargs": {
- "version": "13.3.2",
- "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
- "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
+ "version": "16.2.0",
+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+ "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
"dev": true,
"requires": {
- "cliui": "^5.0.0",
- "find-up": "^3.0.0",
- "get-caller-file": "^2.0.1",
+ "cliui": "^7.0.2",
+ "escalade": "^3.1.1",
+ "get-caller-file": "^2.0.5",
"require-directory": "^2.1.1",
- "require-main-filename": "^2.0.0",
- "set-blocking": "^2.0.0",
- "string-width": "^3.0.0",
- "which-module": "^2.0.0",
- "y18n": "^4.0.0",
- "yargs-parser": "^13.1.2"
- },
- "dependencies": {
- "ansi-regex": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
- "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
- "dev": true
- },
- "emoji-regex": {
- "version": "7.0.3",
- "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
- "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
- "dev": true
- },
- "is-fullwidth-code-point": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
- "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
- "dev": true
- },
- "string-width": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
- "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
- "dev": true,
- "requires": {
- "emoji-regex": "^7.0.1",
- "is-fullwidth-code-point": "^2.0.0",
- "strip-ansi": "^5.1.0"
- }
- },
- "strip-ansi": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
- "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
- "dev": true,
- "requires": {
- "ansi-regex": "^4.1.0"
- }
- },
- "yargs-parser": {
- "version": "13.1.2",
- "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
- "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
- "dev": true,
- "requires": {
- "camelcase": "^5.0.0",
- "decamelize": "^1.2.0"
- }
- }
+ "string-width": "^4.2.0",
+ "y18n": "^5.0.5",
+ "yargs-parser": "^20.2.2"
}
},
"yargs-parser": {
@@ -10678,14 +10032,35 @@
"dev": true
},
"yargs-unparser": {
- "version": "1.6.0",
- "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.0.tgz",
- "integrity": "sha512-W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw==",
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz",
+ "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==",
"dev": true,
"requires": {
- "flat": "^4.1.0",
- "lodash": "^4.17.15",
- "yargs": "^13.3.0"
+ "camelcase": "^6.0.0",
+ "decamelize": "^4.0.0",
+ "flat": "^5.0.2",
+ "is-plain-obj": "^2.1.0"
+ },
+ "dependencies": {
+ "camelcase": {
+ "version": "6.2.0",
+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
+ "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
+ "dev": true
+ },
+ "decamelize": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz",
+ "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==",
+ "dev": true
+ },
+ "is-plain-obj": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
+ "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
+ "dev": true
+ }
}
},
"yarn": {
@@ -10693,6 +10068,12 @@
"resolved": "https://registry.npmjs.org/yarn/-/yarn-1.22.10.tgz",
"integrity": "sha512-IanQGI9RRPAN87VGTF7zs2uxkSyQSrSPsju0COgbsKQOOXr5LtcVPeyXWgwVa0ywG3d8dg6kSYKGBuYK021qeA==",
"dev": true
+ },
+ "yocto-queue": {
+ "version": "0.1.0",
+ "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+ "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+ "dev": true
}
}
}
diff --git a/package.json b/package.json
index 8a7e8d7..6aeab6f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "go",
"displayName": "Go",
- "version": "0.28.1",
+ "version": "0.29.0",
"publisher": "golang",
"description": "Rich Go language support for Visual Studio Code",
"author": {
@@ -77,7 +77,7 @@
"fs-extra": "^9.0.0",
"get-port": "^5.1.1",
"gts": "^3.1.0",
- "mocha": "^7.1.1",
+ "mocha": "^9.1.2",
"prettier": "^2.2.1",
"sinon": "^9.0.2",
"ts-loader": "^7.0.5",
@@ -99,7 +99,8 @@
"onCommand:go.run.modinit",
"onDebugInitialConfigurations",
"onDebugResolve:go",
- "onWebviewPanel:welcomeGo"
+ "onWebviewPanel:welcomeGo",
+ "onView:go.test.profile"
],
"main": "./dist/goMain.js",
"capabilities": {
@@ -252,6 +253,13 @@
"category": "Test"
},
{
+ "command": "go.test.deleteProfile",
+ "title": "Go Test: Delete Profile",
+ "shortTitle": "Delete",
+ "description": "Delete selected profile",
+ "category": "Test"
+ },
+ {
"command": "go.benchmark.package",
"title": "Go: Benchmark Package",
"description": "Runs all benchmarks in the package of the current file."
@@ -1330,6 +1338,12 @@
"description": "Set the source location of dynamically discovered subtests to the location of the containing function. As a result, dynamically discovered subtests will be added to the gutter test widget of the containing function.",
"scope": "resource"
},
+ "go.testExplorer.showOutput": {
+ "type": "boolean",
+ "default": true,
+ "description": "Open the test output terminal when a test run is started.",
+ "scope": "window"
+ },
"go.generateTestsFlags": {
"type": "array",
"items": {
@@ -1636,6 +1650,11 @@
"run": true
}
},
+ "go.survey.prompt": {
+ "type": "boolean",
+ "default": true,
+ "description": "Prompt for surveys, including the gopls survey and the Go developer survey."
+ },
"go.editorContextMenuCommands": {
"type": "object",
"properties": {
@@ -1661,7 +1680,7 @@
},
"testAtCursor": {
"type": "boolean",
- "default": true,
+ "default": false,
"description": "If true, adds command to run the test under the cursor to the editor context menu"
},
"testFile": {
@@ -1706,12 +1725,12 @@
},
"debugTestAtCursor": {
"type": "boolean",
- "default": true,
+ "default": false,
"description": "If true, adds command to debug the test under the cursor to the editor context menu"
},
"benchmarkAtCursor": {
"type": "boolean",
- "default": true,
+ "default": false,
"description": "If true, adds command to benchmark the test under the cursor to the editor context menu"
}
},
@@ -1792,7 +1811,7 @@
1,
2
],
- "description": "Delve Api Version to use. Default value is 2.",
+ "description": "Delve Api Version to use. Default value is 2. This applies only when using the 'legacy' debug adapter.",
"default": 2
},
"showGlobalVariables": {
@@ -1800,6 +1819,24 @@
"description": "Boolean value to indicate whether global package variables should be shown in the variables pane or not.",
"default": false
},
+ "showLog": {
+ "type": "boolean",
+ "description": "Show log output from the delve debugger. Maps to dlv's `--log` flag.",
+ "default": false
+ },
+ "logOutput": {
+ "type": "string",
+ "enum": [
+ "debugger",
+ "gdbwire",
+ "lldbout",
+ "debuglineerr",
+ "rpc",
+ "dap"
+ ],
+ "description": "Comma separated list of components that should produce debug output. Maps to dlv's `--log-output` flag. Check `dlv log` for details.",
+ "default": "debugger"
+ },
"debugAdapter": {
"type": "string",
"enum": [
@@ -1809,6 +1846,14 @@
"description": "Select which debug adapter to use by default. This is also used for choosing which debug adapter to use when no launch.json is present and with codelenses.",
"default": "dlv-dap"
},
+ "dlvFlags": {
+ "type": "array",
+ "description": "Extra flags for `dlv`. See `dlv help` for the full list of supported. Flags such as `--log-output`, `--log`, `--log-dest`, `--api-version`, `--output`, `--backend` already have corresponding properties in the debug configuration, and flags such as `--listen` and `--headless` are used internally. If they are specified in `dlvFlags`, they may be ignored or cause an error.",
+ "items": {
+ "type": "string"
+ },
+ "default": []
+ },
"substitutePath": {
"type": "array",
"items": {
@@ -1830,19 +1875,7 @@
"default": []
}
},
- "default": {
- "dlvLoadConfig": {
- "followPointers": true,
- "maxVariableRecurse": 1,
- "maxStringLen": 64,
- "maxArrayValues": 64,
- "maxStructFields": -1
- },
- "apiVersion": 2,
- "showGlobalVariables": false,
- "debugAdapter": "legacy",
- "substitutePath": []
- },
+ "default": {},
"description": "Delve settings that applies to all debugging sessions. Debug configuration in the launch.json file will override these values.",
"scope": "resource"
},
@@ -1911,6 +1944,7 @@
"build.directoryFilters": {
"type": "array",
"markdownDescription": "directoryFilters can be used to exclude unwanted directories from the\nworkspace. By default, all directories are included. Filters are an\noperator, `+` to include and `-` to exclude, followed by a path prefix\nrelative to the workspace folder. They are evaluated in order, and\nthe last filter that applies to a path controls whether it is included.\nThe path prefix can be empty, so an initial `-` excludes everything.\n\nExamples:\n\nExclude node_modules: `-node_modules`\n\nInclude only project_a: `-` (exclude everything), `+project_a`\n\nInclude only project_a, but not node_modules inside it: `-`, `+project_a`, `-project_a/node_modules`\n",
+ "default": "[\"-node_modules\"]",
"scope": "resource"
},
"build.env": {
@@ -1976,7 +2010,7 @@
},
"ui.codelenses": {
"type": "object",
- "markdownDescription": "codelenses overrides the enabled/disabled state of code lenses. See the\n\"Code Lenses\" section of the\n[Settings page](https://github.com/golang/tools/blob/master/gopls/doc/settings.md)\nfor the list of supported lenses.\n\nExample Usage:\n\n```json5\n\"gopls\": {\n...\n \"codelens\": {\n \"generate\": false, // Don't show the `go generate` lens.\n \"gc_details\": true // Show a code lens toggling the display of gc's choices.\n }\n...\n}\n```\n",
+ "markdownDescription": "codelenses overrides the enabled/disabled state of code lenses. See the\n\"Code Lenses\" section of the\n[Settings page](https://github.com/golang/tools/blob/master/gopls/doc/settings.md)\nfor the list of supported lenses.\n\nExample Usage:\n\n```json5\n\"gopls\": {\n...\n \"codelenses\": {\n \"generate\": false, // Don't show the `go generate` lens.\n \"gc_details\": true // Show a code lens toggling the display of gc's choices.\n }\n...\n}\n```\n",
"scope": "resource",
"properties": {
"gc_details": {
@@ -2135,6 +2169,11 @@
"markdownDescription": "detect impossible interface-to-interface type assertions\n\nThis checker flags type assertions v.(T) and corresponding type-switch cases\nin which the static type V of v is an interface that cannot possibly implement\nthe target interface T. This occurs when V and T contain methods with the same\nname but different signatures. Example:\n\n\tvar v interface {\n\t\tRead()\n\t}\n\t_ = v.(io.Reader)\n\nThe Read method in v has a different signature than the Read method in\nio.Reader, so this assertion cannot succeed.\n",
"default": true
},
+ "infertypeargs": {
+ "type": "boolean",
+ "markdownDescription": "check for unnecessary type arguments in call expressions\n\nExplicit type arguments may be omitted from call expressions if they can be\ninferred from function arguments, or from other type arguments:\n\nfunc f[T any](T) {}\n\nfunc _() {\n\tf[string](\"foo\") // string could be inferred\n}\n",
+ "default": true
+ },
"loopclosure": {
"type": "boolean",
"markdownDescription": "check references to loop variables from within nested functions\n\nThis analyzer checks for references to loop variables from within a\nfunction literal inside the loop body. It checks only instances where\nthe function literal is called in a defer or go statement that is the\nlast statement in the loop body, as otherwise we would need whole\nprogram analysis.\n\nFor example:\n\n\tfor i, v := range s {\n\t\tgo func() {\n\t\t\tprintln(i, v) // not what you might expect\n\t\t}()\n\t}\n\nSee: https://golang.org/doc/go_faq.html#closures_and_goroutines",
@@ -2227,7 +2266,7 @@
},
"undeclaredname": {
"type": "boolean",
- "markdownDescription": "suggested fixes for \"undeclared name: <>\"\n\nThis checker provides suggested fixes for type errors of the\ntype \"undeclared name: <>\". It will insert a new statement:\n\"<> := \".",
+ "markdownDescription": "suggested fixes for \"undeclared name: <>\"\n\nThis checker provides suggested fixes for type errors of the\ntype \"undeclared name: <>\". It will either insert a new statement,\nsuch as:\n\n\"<> := \"\n\nor a new function declaration, such as:\n\nfunc <>(inferred parameters) {\n\tpanic(\"implement me!\")\n}\n",
"default": true
},
"unmarshal": {
@@ -2259,6 +2298,11 @@
"type": "boolean",
"markdownDescription": "checks for unused writes\n\nThe analyzer reports instances of writes to struct fields and\narrays that are never read. Specifically, when a struct object\nor an array is copied, its elements are copied implicitly by\nthe compiler, and any element write to this copy does nothing\nwith the original object.\n\nFor example:\n\n\ttype T struct { x int }\n\tfunc f(input []T) {\n\t\tfor i, v := range input { // v is a copy\n\t\t\tv.x = i // unused write to field x\n\t\t}\n\t}\n\nAnother example is about non-pointer receiver:\n\n\ttype T struct { x int }\n\tfunc (t T) f() { // t is a copy\n\t\tt.x = i // unused write to field x\n\t}\n",
"default": false
+ },
+ "useany": {
+ "type": "boolean",
+ "markdownDescription": "check for constraints that could be simplified to \"any\"",
+ "default": true
}
}
},
@@ -2375,7 +2419,7 @@
},
"ui.navigation.symbolStyle": {
"type": "string",
- "markdownDescription": "(Advanced) symbolStyle controls how symbols are qualified in symbol responses.\n\nExample Usage:\n\n```json5\n\"gopls\": {\n...\n \"symbolStyle\": \"dynamic\",\n...\n}\n```\n",
+ "markdownDescription": "(Advanced) symbolStyle controls how symbols are qualified in symbol responses.\n\nExample Usage:\n\n```json5\n\"gopls\": {\n...\n \"symbolStyle\": \"Dynamic\",\n...\n}\n```\n",
"enum": [
"Dynamic",
"Full",
@@ -2418,6 +2462,10 @@
{
"command": "go.test.captureProfile",
"when": "false"
+ },
+ {
+ "command": "go.test.deleteProfile",
+ "when": "false"
}
],
"editor/context": [
@@ -2442,17 +2490,17 @@
"group": "Go group 1"
},
{
- "when": "editorTextFocus && config.go.editorContextMenuCommands.testAtCursor && resourceLangId == go && !config.editor.codeLens",
+ "when": "editorTextFocus && config.go.editorContextMenuCommands.testAtCursor && resourceLangId == go",
"command": "go.test.cursor",
"group": "Go group 1"
},
{
- "when": "editorTextFocus && config.go.editorContextMenuCommands.benchmarkAtCursor && resourceLangId == go && !config.editor.codeLens",
+ "when": "editorTextFocus && config.go.editorContextMenuCommands.benchmarkAtCursor && resourceLangId == go",
"command": "go.benchmark.cursor",
"group": "Go group 1"
},
{
- "when": "editorTextFocus && config.go.editorContextMenuCommands.debugTestAtCursor && resourceLangId == go && !config.editor.codeLens",
+ "when": "editorTextFocus && config.go.editorContextMenuCommands.debugTestAtCursor && resourceLangId == go",
"command": "go.debug.cursor",
"group": "Go group 1"
},
@@ -2518,6 +2566,23 @@
"when": "testId in go.tests && testId =~ /\\?(test|benchmark)/",
"group": "profile"
}
+ ],
+ "view/item/context": [
+ {
+ "command": "go.test.deleteProfile",
+ "when": "viewItem == go:test:file"
+ }
+ ]
+ },
+ "views": {
+ "test": [
+ {
+ "id": "go.test.profile",
+ "name": "Profiles",
+ "contextualTitle": "Go",
+ "icon": "$(graph)",
+ "when": "go.hasProfiles"
+ }
]
}
}
diff --git a/src/goDebugConfiguration.ts b/src/goDebugConfiguration.ts
index 97e705e..c21ec0a 100644
--- a/src/goDebugConfiguration.ts
+++ b/src/goDebugConfiguration.ts
@@ -7,10 +7,10 @@
'use strict';
+import { lstatSync } from 'fs';
import path = require('path');
import vscode = require('vscode');
import { getGoConfig } from './config';
-import { parseProgramArgSync } from './goDebugFactory';
import { toolExecutionEnvironment } from './goEnv';
import {
declinedToolInstall,
@@ -20,8 +20,8 @@
shouldUpdateTool
} from './goInstallTools';
import { packagePathToGoModPathMap } from './goModules';
-import { getTool, getToolAtVersion } from './goTools';
-import { pickGoProcess, pickProcess, pickProcessByName } from './pickProcess';
+import { getToolAtVersion } from './goTools';
+import { pickProcess, pickProcessByName } from './pickProcess';
import { getFromGlobalState, updateGlobalState } from './stateUtils';
import { getBinPath, getGoVersion } from './util';
import { parseEnvFiles } from './utils/envUtils';
@@ -197,18 +197,18 @@
"'dlvLoadConfig' is deprecated with dlv-dap debug adapter.\n\nDlv-dap loads composite data on demand and uses increased string limits on source code hover, in Debug Console and via Copy Value. Please file an issue if these are not sufficient for your use case."
);
}
- if (!debugConfiguration.hasOwnProperty('dlvLoadConfig') && dlvConfig.hasOwnProperty('dlvLoadConfig')) {
- debugConfiguration['dlvLoadConfig'] = dlvConfig['dlvLoadConfig'];
+
+ // Reflect the defaults set through go.delveConfig setting.
+ const dlvProperties = ['showGlobalVariables', 'substitutePath', 'showLog', 'logOutput', 'dlvFlags'];
+ if (debugAdapter !== 'dlv-dap') {
+ dlvProperties.push('dlvLoadConfig');
}
- if (
- !debugConfiguration.hasOwnProperty('showGlobalVariables') &&
- dlvConfig.hasOwnProperty('showGlobalVariables')
- ) {
- debugConfiguration['showGlobalVariables'] = dlvConfig['showGlobalVariables'];
- }
- if (!debugConfiguration.hasOwnProperty('substitutePath') && dlvConfig.hasOwnProperty('substitutePath')) {
- debugConfiguration['substitutePath'] = dlvConfig['substitutePath'];
- }
+ dlvProperties.forEach((p) => {
+ if (!debugConfiguration.hasOwnProperty(p) && dlvConfig.hasOwnProperty(p)) {
+ debugConfiguration[p] = dlvConfig[p];
+ }
+ });
+
if (debugAdapter !== 'dlv-dap' && debugConfiguration.request === 'attach' && !debugConfiguration['cwd']) {
debugConfiguration['cwd'] = '${workspaceFolder}';
if (vscode.workspace.workspaceFolders?.length > 1) {
@@ -413,28 +413,26 @@
// Compute the launch dir heuristically, and translate the dirname in program to a path relative to buildDir.
// We skip this step when working with externally launched debug adapter
// because we do not control the adapter's launch process.
- if (
- debugConfiguration.request === 'launch' &&
- // Presence of the following attributes indicates externally launched debug adapter.
- !debugConfiguration.port &&
- !debugConfiguration.host &&
- !debugConfiguration.debugServer
- ) {
+ if (debugConfiguration.request === 'launch') {
const mode = debugConfiguration['mode'] || 'debug';
if (['debug', 'test', 'auto'].includes(mode)) {
// Massage config to build the target from the package directory
// with a relative path. (https://github.com/golang/vscode-go/issues/1713)
- try {
- const { program, dirname, programIsDirectory } = parseProgramArgSync(debugConfiguration);
- if (dirname) {
- debugConfiguration['__buildDir'] = dirname;
- debugConfiguration['program'] = programIsDirectory
- ? '.'
- : '.' + path.sep + path.relative(dirname, program);
- }
- } catch (e) {
- this.showWarning('invalidProgramArg', `Invalid 'program': ${e}`);
- // keep going - just in case dlv knows how to handle this better.
+ // parseDebugProgramArgSync will throw an error if `program` is invalid.
+ const { program, dirname, programIsDirectory } = parseDebugProgramArgSync(
+ debugConfiguration['program']
+ );
+ if (
+ dirname &&
+ // Presence of the following attributes indicates externally launched debug adapter.
+ // Don't mess with 'program' if the debug adapter was launched externally.
+ !debugConfiguration.port &&
+ !debugConfiguration.debugServer
+ ) {
+ debugConfiguration['__buildDir'] = dirname;
+ debugConfiguration['program'] = programIsDirectory
+ ? '.'
+ : '.' + path.sep + path.relative(dirname, program);
}
}
}
@@ -463,3 +461,29 @@
});
}
}
+
+// parseDebugProgramArgSync parses program arg of debug/auto/test launch requests.
+export function parseDebugProgramArgSync(
+ program: string
+): { program: string; dirname: string; programIsDirectory: boolean } {
+ if (!program) {
+ throw new Error('The program attribute is missing in the debug configuration in launch.json');
+ }
+ try {
+ const pstats = lstatSync(program);
+ if (pstats.isDirectory()) {
+ return { program, dirname: program, programIsDirectory: true };
+ }
+ const ext = path.extname(program);
+ if (ext === '.go') {
+ // TODO(hyangah): .s?
+ return { program, dirname: path.dirname(program), programIsDirectory: false };
+ }
+ } catch (e) {
+ console.log(`parseDebugProgramArgSync failed: ${e}`);
+ }
+ // shouldn't reach here if program was a valid directory or .go file.
+ throw new Error(
+ `The program attribute '${program}' must be a valid directory or .go file in debug/test/auto modes.`
+ );
+}
diff --git a/src/goDebugFactory.ts b/src/goDebugFactory.ts
index cf9cea7..b58f665 100644
--- a/src/goDebugFactory.ts
+++ b/src/goDebugFactory.ts
@@ -494,41 +494,3 @@
});
});
}
-
-export function parseProgramArgSync(
- launchAttachArgs: vscode.DebugConfiguration
-): { program: string; dirname: string; programIsDirectory: boolean } {
- // attach request:
- // irrelevant
- if (launchAttachArgs.request !== 'launch') return;
-
- const mode = launchAttachArgs.mode || 'debug';
- const program = launchAttachArgs.program;
-
- if (!program) {
- throw new Error('The program attribute is missing in the debug configuration in launch.json');
- }
-
- // debug, test, auto mode in launch request:
- // program ends with .go file -> file, otherwise -> programIsDirectory.
- // exec mode
- // program should be executable.
- // other modes:
- // not relevant
- if (['debug', 'test', 'auto'].includes(mode)) {
- // `auto` shouldn't happen other than in testing.
- const ext = path.extname(program);
- if (ext === '') {
- // the last path element doesn't have . or the first char is .
- // Treat this like a directory.
- return { program, dirname: program, programIsDirectory: true };
- }
- if (ext === '.go') {
- return { program, dirname: path.dirname(program), programIsDirectory: false };
- } else {
- throw new Error('The program attribute must be a directory or .go file in debug and test mode');
- }
- }
- // Otherwise, let delve handle.
- return { program, dirname: '', programIsDirectory: false };
-}
diff --git a/src/goDeveloperSurvey.ts b/src/goDeveloperSurvey.ts
new file mode 100644
index 0000000..d3cd5a5
--- /dev/null
+++ b/src/goDeveloperSurvey.ts
@@ -0,0 +1,195 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+/*---------------------------------------------------------
+ * Copyright 2021 The Go Authors. All rights reserved.
+ * Licensed under the MIT License. See LICENSE in the project root for license information.
+ *--------------------------------------------------------*/
+
+'use strict';
+
+import vscode = require('vscode');
+import { getGoConfig } from './config';
+import { lastUserAction } from './goLanguageServer';
+import { daysBetween, flushSurveyConfig, getStateConfig, minutesBetween, timeMinute } from './goSurvey';
+
+// Start and end dates of the survey.
+export const startDate = new Date('2021-10-27');
+export const endDate = new Date('2021-11-16');
+
+// DeveloperSurveyConfig is the set of global properties used to determine if
+// we should prompt a user to take the gopls survey.
+export interface DeveloperSurveyConfig {
+ // prompt is true if the user can be prompted to take the survey.
+ // It is false if the user has responded "Never" to the prompt.
+ prompt?: boolean;
+
+ // datePromptComputed is the date on which the value of the prompt field
+ // was set. It is usually the same as lastDatePrompted, but not
+ // necessarily.
+ datePromptComputed?: Date;
+
+ // lastDatePrompted is the most recent date that the user has been prompted.
+ lastDatePrompted?: Date;
+
+ // lastDateAccepted is the most recent date that the user responded "Yes"
+ // to the survey prompt. The user need not have completed the survey.
+ lastDateAccepted?: Date;
+}
+
+export function maybePromptForDeveloperSurvey() {
+ // First, check the value of the 'go.survey.prompt' setting to see
+ // if the user has opted out of all survey prompts.
+ const goConfig = getGoConfig();
+ if (goConfig.get('survey.prompt') === false) {
+ return;
+ }
+ const now = new Date();
+ let cfg = shouldPromptForSurvey(now, getDeveloperSurveyConfig());
+ if (!cfg) {
+ return;
+ }
+ if (!cfg.prompt) {
+ return;
+ }
+ const callback = async () => {
+ const currentTime = new Date();
+
+ // Make sure the user has been idle for at least a minute.
+ if (minutesBetween(lastUserAction, currentTime) < 1) {
+ setTimeout(callback, 5 * timeMinute);
+ return;
+ }
+ cfg = await promptForDeveloperSurvey(cfg, now);
+ if (cfg) {
+ flushSurveyConfig(developerSurveyConfig, cfg);
+ }
+ };
+ callback();
+}
+
+// shouldPromptForSurvey decides if we should prompt the given user to take the
+// survey. It returns the DeveloperSurveyConfig if we should prompt, and
+// undefined if we should not prompt.
+export function shouldPromptForSurvey(now: Date, cfg: DeveloperSurveyConfig): DeveloperSurveyConfig {
+ // TODO(rstambler): Merge checks for surveys into a setting.
+
+ // Don't prompt if the survey hasn't started or is over.
+ if (!inDateRange(startDate, endDate, now)) {
+ return;
+ }
+
+ // Reset the values if we're outside of the previous survey period.
+ if (cfg.datePromptComputed && !inDateRange(startDate, endDate, cfg.datePromptComputed)) {
+ cfg = {};
+ }
+ // If the prompt value is undefined, then this is the first activation
+ // for this survey period, so decide if we should prompt the user. This
+ // is done by generating a random number in the range [0, 1) and checking
+ // if it is < probability.
+ if (cfg.prompt === undefined) {
+ const probability = 0.2;
+ cfg.datePromptComputed = now;
+ cfg.prompt = Math.random() < probability;
+ }
+ flushSurveyConfig(developerSurveyConfig, cfg);
+ if (!cfg.prompt) {
+ return;
+ }
+
+ // Check if the user has taken the survey in the current survey period.
+ // Don't prompt them if they have.
+ if (cfg.lastDateAccepted) {
+ if (inDateRange(startDate, endDate, cfg.lastDateAccepted)) {
+ return;
+ }
+ }
+
+ // Check if the user has been prompted for the survey in the last 5 days.
+ // Don't prompt them if they have been.
+ if (cfg.lastDatePrompted) {
+ const daysSinceLastPrompt = daysBetween(now, cfg.lastDatePrompted);
+ // Don't prompt twice on the same day, even if it's the last day of the
+ // survey.
+ if (daysSinceLastPrompt < 1) {
+ return;
+ }
+ // If the survey will end in 5 days, prompt on the next day.
+ // Otherwise, wait for 5 days.
+ if (daysBetween(now, endDate) > 5) {
+ return;
+ }
+ }
+ return cfg;
+}
+
+export async function promptForDeveloperSurvey(cfg: DeveloperSurveyConfig, now: Date): Promise<DeveloperSurveyConfig> {
+ let selected = await vscode.window.showInformationMessage(
+ // TODO(rstambler): Figure out how to phrase this.
+ `Looks like you are coding in Go! Would you like to help ensure that Go is meeting your needs
+by participating in this 10-minute survey before ${endDate.toDateString()}?`,
+ 'Yes',
+ 'Remind me later',
+ 'Never'
+ );
+
+ // Update the time last asked.
+ cfg.lastDatePrompted = now;
+ cfg.datePromptComputed = now;
+
+ switch (selected) {
+ case 'Yes':
+ {
+ cfg.lastDateAccepted = now;
+ cfg.prompt = true;
+ const surveyURL = 'https://google.qualtrics.com/jfe/form/SV_0BwHwKSaeE9Cx2S?s=p';
+ await vscode.env.openExternal(vscode.Uri.parse(surveyURL));
+ }
+ break;
+ case 'Remind me later':
+ cfg.prompt = true;
+
+ vscode.window.showInformationMessage("No problem! We'll ask you again another time.");
+ break;
+ case 'Never':
+ cfg.prompt = false;
+
+ selected = await vscode.window.showInformationMessage(
+ `No problem! We won't ask again.
+If you'd like to opt-out of all survey prompts, you can set 'go.survey.prompt' to false.`,
+ 'Open Settings'
+ );
+ switch (selected) {
+ case 'Open Settings':
+ vscode.commands.executeCommand('workbench.action.openSettings', 'go.survey.prompt');
+ break;
+ default:
+ break;
+ }
+ break;
+ default:
+ // If the user closes the prompt without making a selection, treat it
+ // like a "Not now" response.
+ cfg.prompt = true;
+
+ break;
+ }
+ return cfg;
+}
+
+export const developerSurveyConfig = 'developerSurveyConfig';
+
+export function getDeveloperSurveyConfig(): DeveloperSurveyConfig {
+ return getStateConfig(developerSurveyConfig) as DeveloperSurveyConfig;
+}
+
+// Assumes that end > start.
+export function inDateRange(start: Date, end: Date, date: Date): boolean {
+ // date is before the start time.
+ if (date.getTime() - start.getTime() < 0) {
+ return false;
+ }
+ // end is before the date.
+ if (end.getTime() - date.getTime() < 0) {
+ return false;
+ }
+ return true;
+}
diff --git a/src/goImpl.ts b/src/goImpl.ts
index bf467ec..c9c59f4 100644
--- a/src/goImpl.ts
+++ b/src/goImpl.ts
@@ -15,7 +15,7 @@
import vscode = require('vscode');
// Supports only passing interface, see TODO in implCursor to finish
-const inputRegex = /^(\w+\ \*?\w+\ )?([\w./]+)$/;
+const inputRegex = /^(\w+\ \*?\w+\ )?([\w\.\-\/]+)$/;
export function implCursor() {
const editor = vscode.window.activeTextEditor;
diff --git a/src/goInstallTools.ts b/src/goInstallTools.ts
index b8b8071..5fc4aa5 100644
--- a/src/goInstallTools.ts
+++ b/src/goInstallTools.ts
@@ -157,32 +157,23 @@
outputChannel.appendLine(''); // Blank line for spacing.
- const toInstall: Promise<{ tool: Tool; reason: string }>[] = [];
+ const failures: { tool: ToolAtVersion; reason: string }[] = [];
for (const tool of missing) {
const modulesOffForTool = modulesOff;
- const reason = installTool(tool, goVersion, envForTools, !modulesOffForTool);
- toInstall.push(Promise.resolve({ tool, reason: await reason }));
- }
-
- const results = await Promise.all(toInstall);
-
- const failures: { tool: ToolAtVersion; reason: string }[] = [];
- for (const result of results) {
- if (result.reason === '') {
+ const failed = await installTool(tool, goVersion, envForTools, !modulesOffForTool);
+ if (failed) {
+ failures.push({ tool, reason: failed });
+ } else if (tool.name === 'gopls') {
// Restart the language server if a new binary has been installed.
- if (result.tool.name === 'gopls') {
- restartLanguageServer('installation');
- }
- } else {
- failures.push(result);
+ restartLanguageServer('installation');
}
}
// Report detailed information about any failures.
outputChannel.appendLine(''); // blank line for spacing
if (failures.length === 0) {
- outputChannel.appendLine('All tools successfully installed. You are ready to Go :).');
+ outputChannel.appendLine('All tools successfully installed. You are ready to Go. :)');
} else {
// Show the output channel on failures, even if the installation should
// be silent.
@@ -222,35 +213,10 @@
return reason;
}
}
- let toolsTmpDir = '';
- try {
- toolsTmpDir = await tmpDirForToolInstallation();
- } catch (e) {
- return `Failed to create a temp directory: ${e}`;
- }
const env = Object.assign({}, envForTools);
env['GO111MODULE'] = modulesOn ? 'on' : 'off';
- // Some users use direnv-like setup where the choice of go is affected by
- // the current directory path. In order to avoid choosing a different go,
- // we will explicitly use `GOROOT/bin/go` instead of goVersion.binaryPath
- // (which can be a wrapper script that switches 'go').
- const goBinary = getCurrentGoRoot()
- ? path.join(getCurrentGoRoot(), 'bin', correctBinname('go'))
- : goVersion.binaryPath;
-
- // Build the arguments list for the tool installation.
- const args = ['get', '-v'];
- // Only get tools at master if we are not using modules.
- if (!modulesOn) {
- args.push('-u');
- }
- // dlv-dap or tools with a "mod" suffix can't be installed with
- // simple `go install` or `go get`. We need to get, build, and rename them.
- if (hasModSuffix(tool) || tool.name === 'dlv-dap') {
- args.push('-d'); // get the version, but don't build.
- }
let importPath: string;
if (!modulesOn) {
importPath = getImportPath(tool, goVersion);
@@ -265,19 +231,80 @@
}
importPath = getImportPathWithVersion(tool, version, goVersion);
}
+
+ try {
+ if (!modulesOn || goVersion.lt('1.16') || hasModSuffix(tool) || tool.name === 'dlv-dap') {
+ await installToolWithGoGet(tool, goVersion, env, modulesOn, importPath);
+ } else {
+ await installToolWithGoInstall(goVersion, env, importPath);
+ }
+ const toolInstallPath = getBinPath(tool.name);
+ outputChannel.appendLine(`Installing ${importPath} (${toolInstallPath}) SUCCEEDED`);
+ } catch (e) {
+ outputChannel.appendLine(`Installing ${importPath} FAILED`);
+ outputChannel.appendLine(`${JSON.stringify(e, null, 1)}`);
+ return `failed to install ${tool.name}(${importPath}): ${e}`;
+ }
+}
+
+async function installToolWithGoInstall(goVersion: GoVersion, env: NodeJS.Dict<string>, importPath: string) {
+ // Unlike installToolWithGoGet, `go install` in module mode
+ // can run in the current directory safely. So, use the user-specified go tool path.
+ const goBinary = goVersion.binaryPath || getBinPath('go');
+ const opts = {
+ env,
+ cwd: getWorkspaceFolderPath()
+ };
+
+ const execFile = util.promisify(cp.execFile);
+ logVerbose(`$ ${goBinary} install -v ${importPath}} (cwd: ${opts.cwd})`);
+ await execFile(goBinary, ['install', '-v', importPath], opts);
+}
+
+async function installToolWithGoGet(
+ tool: ToolAtVersion,
+ goVersion: GoVersion,
+ env: NodeJS.Dict<string>,
+ modulesOn: boolean,
+ importPath: string
+) {
+ // Some users use direnv-like setup where the choice of go is affected by
+ // the current directory path. In order to avoid choosing a different go,
+ // we will explicitly use `GOROOT/bin/go` instead of goVersion.binaryPath
+ // (which can be a wrapper script that switches 'go').
+ const goBinary = getCurrentGoRoot()
+ ? path.join(getCurrentGoRoot(), 'bin', correctBinname('go'))
+ : goVersion.binaryPath;
+
+ // Build the arguments list for the tool installation.
+ const args = ['get', '-x'];
+ // Only get tools at master if we are not using modules.
+ if (!modulesOn) {
+ args.push('-u');
+ }
+ // dlv-dap or tools with a "mod" suffix can't be installed with
+ // simple `go install` or `go get`. We need to get, build, and rename them.
+ if (hasModSuffix(tool) || tool.name === 'dlv-dap') {
+ args.push('-d'); // get the version, but don't build.
+ }
args.push(importPath);
- let output = 'no output';
- let result = '';
+ let toolsTmpDir = '';
try {
- const opts = {
- env,
- cwd: toolsTmpDir
- };
+ toolsTmpDir = await tmpDirForToolInstallation();
+ } catch (e) {
+ throw new Error(`Failed to create a temp directory: ${e}`);
+ }
+
+ const opts = {
+ env,
+ cwd: toolsTmpDir
+ };
+ try {
const execFile = util.promisify(cp.execFile);
- const { stdout, stderr } = await execFile(goBinary, args, opts);
- output = `${stdout} ${stderr}`;
- logVerbose(`install: ${goBinary} ${args.join(' ')}\n${stdout}${stderr}`);
+ logVerbose(`$ ${goBinary} ${args.join(' ')} (cwd: ${opts.cwd})`);
+ await execFile(goBinary, args, opts);
+
if (hasModSuffix(tool) || tool.name === 'dlv-dap') {
// Actual installation of the -gomod tool and dlv-dap is done by running go build.
let destDir = env['GOBIN'];
@@ -291,21 +318,17 @@
const outputFile = path.join(destDir, correctBinname(tool.name));
// go build does not take @version suffix yet.
- const importPath = getImportPath(tool, goVersion);
- await execFile(goBinary, ['build', '-o', outputFile, importPath], opts);
+ const importPathWithoutVersion = getImportPath(tool, goVersion);
+ logVerbose(`$ ${goBinary} build -o ${outputFile} ${importPathWithoutVersion} (cwd: ${opts.cwd})`);
+ await execFile(goBinary, ['build', '-o', outputFile, importPathWithoutVersion], opts);
}
- const toolInstallPath = getBinPath(tool.name);
- outputChannel.appendLine(`Installing ${importPath} (${toolInstallPath}) SUCCEEDED`);
} catch (e) {
- outputChannel.appendLine(`Installing ${importPath} FAILED`);
- outputChannel.appendLine(`${JSON.stringify(e, null, 1)}`);
- result = `failed to install ${tool.name}(${importPath}): ${e} ${output}`;
+ logVerbose(`FAILED: ${JSON.stringify(e, null, 1)}`);
+ throw e;
} finally {
// Delete the temporary installation directory.
rmdirRecursive(toolsTmpDir);
}
-
- return result;
}
export function declinedToolInstall(toolName: string) {
@@ -662,11 +685,11 @@
dep github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
if the binary was built in GOPATH mode => the following code will throw an error which will be handled.
- /Users/hakim/go/bin/gopls: go1.16
+ /Users/hakim/go/bin/gopls: go1.16
if the binary was built in dev branch, in module mode => the following code will not throw an error,
and return (devel) as the moduleVersion.
- /Users/hakim/go/bin/gopls: go1.16
+ /Users/hakim/go/bin/gopls: go1.16
path golang.org/x/tools/gopls
mod golang.org/x/tools/gopls (devel)
dep github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
diff --git a/src/goLanguageServer.ts b/src/goLanguageServer.ts
index 680dfe3..07d425d 100644
--- a/src/goLanguageServer.ts
+++ b/src/goLanguageServer.ts
@@ -73,7 +73,8 @@
import WebRequest = require('web-request');
import { FoldingContext } from 'vscode';
import { ProvideFoldingRangeSignature } from 'vscode-languageclient/lib/common/foldingRange';
-import { daysBetween, getStateConfig, maybePromptForSurvey, timeDay, timeMinute } from './goSurvey';
+import { daysBetween, getStateConfig, maybePromptForGoplsSurvey, timeDay, timeMinute } from './goSurvey';
+import { maybePromptForDeveloperSurvey } from './goDeveloperSurvey';
export interface LanguageServerConfig {
serverName: string;
@@ -277,7 +278,8 @@
if (!foundGo) {
return;
}
- maybePromptForSurvey();
+ maybePromptForGoplsSurvey();
+ maybePromptForDeveloperSurvey();
};
setTimeout(update, 10 * timeMinute);
setTimeout(survey, 30 * timeMinute);
@@ -1018,7 +1020,7 @@
// Check that all workspace folders are configured with the same GOPATH.
if (!allFoldersHaveSameGopath()) {
vscode.window.showInformationMessage(
- 'The Go language server is currently not supported in a multi-root set-up with different GOPATHs.'
+ `The Go language server is currently not supported in a multi-root set-up with different GOPATHs (${gopathsPerFolder()}).`
);
return;
}
@@ -1052,6 +1054,14 @@
return vscode.workspace.workspaceFolders.find((x) => tempGopath !== getCurrentGoPath(x.uri)) ? false : true;
}
+function gopathsPerFolder(): string[] {
+ const result: string[] = [];
+ for (const folder of vscode.workspace.workspaceFolders) {
+ result.push(getCurrentGoPath(folder.uri));
+ }
+ return result;
+}
+
export async function shouldUpdateLanguageServer(
tool: Tool,
cfg: LanguageServerConfig,
diff --git a/src/goMain.ts b/src/goMain.ts
index 30fd73a..02ed360 100644
--- a/src/goMain.ts
+++ b/src/goMain.ts
@@ -112,11 +112,11 @@
import semver = require('semver');
import vscode = require('vscode');
import { getFormatTool } from './goFormat';
-import { resetSurveyConfig, showSurveyConfig, timeMinute } from './goSurvey';
+import { resetSurveyConfigs, showSurveyConfig, timeMinute } from './goSurvey';
import { ExtensionAPI } from './export';
import extensionAPI from './extensionAPI';
import { GoTestExplorer, isVscodeTestingAPIAvailable } from './goTest/explore';
-import { ProfileDocumentContentProvider } from './goToolPprof';
+import { killRunningPprof } from './goTest/profile';
export let buildDiagnosticCollection: vscode.DiagnosticCollection;
export let lintDiagnosticCollection: vscode.DiagnosticCollection;
@@ -341,10 +341,6 @@
}
ctx.subscriptions.push(
- vscode.workspace.registerTextDocumentContentProvider('go-tool-pprof', new ProfileDocumentContentProvider())
- );
-
- ctx.subscriptions.push(
vscode.commands.registerCommand('go.subtest.cursor', (args) => {
const goConfig = getGoConfig();
subTestAtCursor(goConfig, args);
@@ -716,7 +712,7 @@
// Survey related commands
ctx.subscriptions.push(vscode.commands.registerCommand('go.survey.showConfig', () => showSurveyConfig()));
- ctx.subscriptions.push(vscode.commands.registerCommand('go.survey.resetConfig', () => resetSurveyConfig()));
+ ctx.subscriptions.push(vscode.commands.registerCommand('go.survey.resetConfig', () => resetSurveyConfigs()));
vscode.languages.setLanguageConfiguration(GO_MODE.language, {
wordPattern: /(-?\d*\.\d\w*)|([^`~!@#%^&*()\-=+[{\]}\\|;:'",.<>/?\s]+)/g
@@ -802,6 +798,7 @@
export function deactivate() {
return Promise.all([
cancelRunningTests(),
+ killRunningPprof(),
Promise.resolve(cleanupTempDir()),
Promise.resolve(disposeGoStatusBar())
]);
diff --git a/src/goSurvey.ts b/src/goSurvey.ts
index 6169358..901a9ee 100644
--- a/src/goSurvey.ts
+++ b/src/goSurvey.ts
@@ -11,10 +11,17 @@
import { outputChannel } from './goStatus';
import { extensionId } from './const';
import { getFromGlobalState, getFromWorkspaceState, updateGlobalState } from './stateUtils';
+import {
+ developerSurveyConfig,
+ getDeveloperSurveyConfig,
+ maybePromptForDeveloperSurvey,
+ promptForDeveloperSurvey
+} from './goDeveloperSurvey';
+import { getGoConfig } from './config';
-// SurveyConfig is the set of global properties used to determine if
+// GoplsSurveyConfig is the set of global properties used to determine if
// we should prompt a user to take the gopls survey.
-export interface SurveyConfig {
+export interface GoplsSurveyConfig {
// prompt is true if the user can be prompted to take the survey.
// It is false if the user has responded "Never" to the prompt.
prompt?: boolean;
@@ -40,13 +47,18 @@
lastDateAccepted?: Date;
}
-export function maybePromptForSurvey() {
+export function maybePromptForGoplsSurvey() {
+ // First, check the value of the 'go.survey.prompt' setting to see
+ // if the user has opted out of all survey prompts.
+ const goConfig = getGoConfig();
+ if (goConfig.get('survey.prompt') === false) {
+ return;
+ }
const now = new Date();
- let cfg = shouldPromptForSurvey(now, getSurveyConfig());
+ let cfg = shouldPromptForSurvey(now, getGoplsSurveyConfig());
if (!cfg) {
return;
}
- flushSurveyConfig(cfg);
if (!cfg.dateToPromptThisMonth) {
return;
}
@@ -58,21 +70,22 @@
setTimeout(callback, 5 * timeMinute);
return;
}
- cfg = await promptForSurvey(cfg, now);
+ cfg = await promptForGoplsSurvey(cfg, now);
if (cfg) {
- flushSurveyConfig(cfg);
+ flushSurveyConfig(goplsSurveyConfig, cfg);
}
};
const ms = msBetween(now, cfg.dateToPromptThisMonth);
setTimeout(callback, ms);
}
-export function shouldPromptForSurvey(now: Date, cfg: SurveyConfig): SurveyConfig {
+export function shouldPromptForSurvey(now: Date, cfg: GoplsSurveyConfig): GoplsSurveyConfig {
// If the prompt value is not set, assume we haven't prompted the user
// and should do so.
if (cfg.prompt === undefined) {
cfg.prompt = true;
}
+ flushSurveyConfig(goplsSurveyConfig, cfg);
if (!cfg.prompt) {
return;
}
@@ -122,6 +135,7 @@
cfg.dateToPromptThisMonth = undefined;
}
cfg.dateComputedPromptThisMonth = now;
+ flushSurveyConfig(goplsSurveyConfig, cfg);
return cfg;
}
@@ -132,8 +146,8 @@
return Math.floor(Math.random() * (high - low + 1)) + low;
}
-async function promptForSurvey(cfg: SurveyConfig, now: Date): Promise<SurveyConfig> {
- const selected = await vscode.window.showInformationMessage(
+async function promptForGoplsSurvey(cfg: GoplsSurveyConfig, now: Date): Promise<GoplsSurveyConfig> {
+ let selected = await vscode.window.showInformationMessage(
`Looks like you are using the Go extension for VS Code.
Could you help us improve this extension by filling out a 1-2 minute survey about your experience with it?`,
'Yes',
@@ -166,7 +180,18 @@
case 'Never':
cfg.prompt = false;
- vscode.window.showInformationMessage("No problem! We won't ask again.");
+ selected = await vscode.window.showInformationMessage(
+ `No problem! We won't ask again.
+To opt-out of all survey prompts, please disable the 'Go > Survey: Prompt' setting.`,
+ 'Open Settings'
+ );
+ switch (selected) {
+ case 'Open Settings':
+ vscode.commands.executeCommand('workbench.action.openSettings', 'go.survey.prompt');
+ break;
+ default:
+ break;
+ }
break;
default:
// If the user closes the prompt without making a selection, treat it
@@ -180,19 +205,20 @@
export const goplsSurveyConfig = 'goplsSurveyConfig';
-function getSurveyConfig(): SurveyConfig {
- return getStateConfig(goplsSurveyConfig) as SurveyConfig;
+function getGoplsSurveyConfig(): GoplsSurveyConfig {
+ return getStateConfig(goplsSurveyConfig) as GoplsSurveyConfig;
}
-export function resetSurveyConfig() {
- flushSurveyConfig(null);
+export function resetSurveyConfigs() {
+ flushSurveyConfig(goplsSurveyConfig, null);
+ flushSurveyConfig(developerSurveyConfig, null);
}
-function flushSurveyConfig(cfg: SurveyConfig) {
+export function flushSurveyConfig(key: string, cfg: any) {
if (cfg) {
- updateGlobalState(goplsSurveyConfig, JSON.stringify(cfg));
+ updateGlobalState(key, JSON.stringify(cfg));
} else {
- updateGlobalState(goplsSurveyConfig, null); // reset
+ updateGlobalState(key, null); // reset
}
}
@@ -222,17 +248,33 @@
}
export async function showSurveyConfig() {
- outputChannel.appendLine('Gopls Survey Configuration');
- outputChannel.appendLine(JSON.stringify(getSurveyConfig(), null, 2));
+ // TODO(rstambler): Add developer survey config.
+ outputChannel.appendLine('HaTs Survey Configuration');
+ outputChannel.appendLine(JSON.stringify(getGoplsSurveyConfig(), null, 2));
outputChannel.show();
- const selected = await vscode.window.showInformationMessage('Prompt for survey?', 'Yes', 'Maybe', 'No');
+ outputChannel.appendLine('Developer Survey Configuration');
+ outputChannel.appendLine(JSON.stringify(getDeveloperSurveyConfig(), null, 2));
+ outputChannel.show();
+
+ let selected = await vscode.window.showInformationMessage('Prompt for HaTS survey?', 'Yes', 'Maybe', 'No');
switch (selected) {
case 'Yes':
- promptForSurvey(getSurveyConfig(), new Date());
+ promptForGoplsSurvey(getGoplsSurveyConfig(), new Date());
break;
case 'Maybe':
- maybePromptForSurvey();
+ maybePromptForGoplsSurvey();
+ break;
+ default:
+ break;
+ }
+ selected = await vscode.window.showInformationMessage('Prompt for Developer survey?', 'Yes', 'Maybe', 'No');
+ switch (selected) {
+ case 'Yes':
+ promptForDeveloperSurvey(getDeveloperSurveyConfig(), new Date());
+ break;
+ case 'Maybe':
+ maybePromptForDeveloperSurvey();
break;
default:
break;
@@ -249,7 +291,7 @@
}
// minutesBetween returns the number of minutes between a and b.
-function minutesBetween(a: Date, b: Date): number {
+export function minutesBetween(a: Date, b: Date): number {
return msBetween(a, b) / timeMinute;
}
diff --git a/src/goTest.ts b/src/goTest.ts
index 325c08c..09875ad 100644
--- a/src/goTest.ts
+++ b/src/goTest.ts
@@ -88,14 +88,20 @@
* @param cmd Whether the command is test, benchmark, or debug.
* @param args
*/
-export function testAtCursorOrPrevious(goConfig: vscode.WorkspaceConfiguration, cmd: TestAtCursorCmd, args: any) {
- _testAtCursor(goConfig, cmd, args).catch((err) => {
+export async function testAtCursorOrPrevious(goConfig: vscode.WorkspaceConfiguration, cmd: TestAtCursorCmd, args: any) {
+ try {
+ await _testAtCursor(goConfig, cmd, args);
+ } catch (err) {
if (err instanceof NotFoundError) {
- testPrevious();
+ const editor = vscode.window.activeTextEditor;
+ if (editor) {
+ await editor.document.save();
+ }
+ await testPrevious();
} else {
console.error(err);
}
- });
+ }
}
/**
@@ -201,14 +207,23 @@
/**
* Debugs the test at cursor.
+ * @param editorOrDocument The text document (or editor) that defines the test.
+ * @param testFunctionName The name of the test function.
+ * @param testFunctions All test function symbols defined by the document.
+ * @param goConfig Go configuration, i.e. flags, tags, environment, etc.
+ * @param sessionID If specified, `sessionID` is added to the debug
+ * configuration and can be used to identify the debug session.
+ * @returns Whether the debug session was successfully started.
*/
-async function debugTestAtCursor(
- editor: vscode.TextEditor,
+export async function debugTestAtCursor(
+ editorOrDocument: vscode.TextEditor | vscode.TextDocument,
testFunctionName: string,
testFunctions: vscode.DocumentSymbol[],
- goConfig: vscode.WorkspaceConfiguration
+ goConfig: vscode.WorkspaceConfiguration,
+ sessionID?: string
) {
- const args = getTestFunctionDebugArgs(editor.document, testFunctionName, testFunctions);
+ const doc = 'document' in editorOrDocument ? editorOrDocument.document : editorOrDocument;
+ const args = getTestFunctionDebugArgs(doc, testFunctionName, testFunctions);
const tags = getTestTags(goConfig);
const buildFlags = tags ? ['-tags', tags] : [];
const flagsFromConfig = getTestFlags(goConfig);
@@ -224,17 +239,18 @@
}
buildFlags.push(x);
});
- const workspaceFolder = vscode.workspace.getWorkspaceFolder(editor.document.uri);
+ const workspaceFolder = vscode.workspace.getWorkspaceFolder(doc.uri);
const debugConfig: vscode.DebugConfiguration = {
name: 'Debug Test',
type: 'go',
request: 'launch',
mode: 'test',
- program: path.dirname(editor.document.fileName),
+ program: path.dirname(doc.fileName),
env: goConfig.get('testEnvVars', {}),
envFile: goConfig.get('testEnvFile'),
args,
- buildFlags: buildFlags.join(' ')
+ buildFlags: buildFlags.join(' '),
+ sessionID
};
lastDebugConfig = debugConfig;
lastDebugWorkspaceFolder = workspaceFolder;
diff --git a/src/goTest/explore.ts b/src/goTest/explore.ts
index 2d9615e..765b244 100644
--- a/src/goTest/explore.ts
+++ b/src/goTest/explore.ts
@@ -40,7 +40,13 @@
symProvider.provideDocumentSymbols(doc, token)
);
+ // Process already open editors
+ vscode.window.visibleTextEditors.forEach((ed) => {
+ inst.documentUpdate(ed.document);
+ });
+
context.subscriptions.push(ctrl);
+ context.subscriptions.push(vscode.window.registerTreeDataProvider('go.test.profile', inst.profiler.view));
context.subscriptions.push(
vscode.commands.registerCommand('go.test.refresh', async (item) => {
@@ -51,7 +57,7 @@
try {
await inst.resolver.resolve(item);
- inst.updateGoTestContext();
+ inst.resolver.updateGoTestContext();
} catch (error) {
const m = 'Failed to resolve tests';
outputChannel.appendLine(`${m}: ${error}`);
@@ -69,7 +75,7 @@
}
try {
- await inst.profiler.showProfiles(item);
+ await inst.profiler.show(item);
} catch (error) {
const m = 'Failed to open profiles';
outputChannel.appendLine(`${m}: ${error}`);
@@ -99,7 +105,26 @@
return;
}
- await inst.profiler.showProfiles(item);
+ await inst.profiler.show(item);
+ })
+ );
+
+ context.subscriptions.push(
+ vscode.commands.registerCommand('go.test.deleteProfile', async (file) => {
+ if (!file) {
+ await vscode.window.showErrorMessage('No profile selected');
+ return;
+ }
+
+ try {
+ await inst.profiler.delete(file);
+ } catch (error) {
+ const m = 'Failed to delete profile';
+ outputChannel.appendLine(`${m}: ${error}`);
+ outputChannel.show();
+ await vscode.window.showErrorMessage(m);
+ return;
+ }
})
);
@@ -204,7 +229,7 @@
protected async didChangeWorkspaceFolders(e: WorkspaceFoldersChangeEvent) {
if (e.added.length > 0) {
await this.resolver.resolve();
- this.updateGoTestContext();
+ this.resolver.updateGoTestContext();
}
if (e.removed.length === 0) {
@@ -219,7 +244,7 @@
const ws = this.workspace.getWorkspaceFolder(item.uri);
if (!ws) {
- dispose(item);
+ dispose(this.resolver, item);
}
});
}
@@ -246,8 +271,8 @@
const found = find(this.ctrl.items);
if (found) {
- dispose(found);
- disposeIfEmpty(found.parent);
+ dispose(this.resolver, found);
+ disposeIfEmpty(this.resolver, found.parent);
}
}
@@ -255,14 +280,14 @@
let update = false;
this.ctrl.items.forEach((item) => {
if (e.affectsConfiguration('go.testExplorerPackages', item.uri)) {
- dispose(item);
+ dispose(this.resolver, item);
update = true;
}
});
if (update) {
this.resolver.resolve();
- this.updateGoTestContext();
+ this.resolver.updateGoTestContext();
}
}
@@ -270,25 +295,11 @@
// Handle opened documents, document changes, and file creation.
private async documentUpdate(doc: TextDocument, ranges?: Range[]) {
- if (doc.uri.scheme === 'git') {
- // TODO(firelizzard18): When a workspace is reopened, VSCode passes us git: URIs. Why?
- const { path } = JSON.parse(doc.uri.query);
- doc = await vscode.workspace.openTextDocument(path);
- }
-
if (!doc.uri.path.endsWith('_test.go')) {
return;
}
await this.resolver.processDocument(doc, ranges);
- this.updateGoTestContext();
- }
-
- private updateGoTestContext() {
- const items = [];
- for (const item of this.resolver.allItems) {
- items.push(item.id);
- }
- vscode.commands.executeCommand('setContext', 'go.tests', items);
+ this.resolver.updateGoTestContext();
}
}
diff --git a/src/goTest/profile.ts b/src/goTest/profile.ts
index ebdd13b..f507bba 100644
--- a/src/goTest/profile.ts
+++ b/src/goTest/profile.ts
@@ -1,19 +1,47 @@
+/* eslint-disable node/no-unsupported-features/node-builtins */
/*---------------------------------------------------------
* Copyright 2021 The Go Authors. All rights reserved.
* Licensed under the MIT License. See LICENSE in the project root for license information.
*--------------------------------------------------------*/
-import { Memento, TestItem, Uri } from 'vscode';
+import {
+ EventEmitter,
+ Memento,
+ Range,
+ TestItem,
+ TextDocumentShowOptions,
+ TreeDataProvider,
+ TreeItem,
+ TreeItemCollapsibleState,
+ Uri,
+ ViewColumn
+} from 'vscode';
import vscode = require('vscode');
-import { getTempFilePath } from '../util';
+import { promises as fs } from 'fs';
+import { ChildProcess, spawn } from 'child_process';
+import { getBinPath, getTempFilePath } from '../util';
import { GoTestResolver } from './resolve';
+import { killProcessTree } from '../utils/processUtils';
+import { correctBinname } from '../utils/pathUtils';
export type ProfilingOptions = { kind?: Kind['id'] };
const optionsMemento = 'testProfilingOptions';
const defaultOptions: ProfilingOptions = { kind: 'cpu' };
+const pprofProcesses = new Set<ChildProcess>();
+
+export function killRunningPprof() {
+ return new Promise<boolean>((resolve) => {
+ pprofProcesses.forEach((proc) => killProcessTree(proc));
+ pprofProcesses.clear();
+ resolve(true);
+ });
+}
export class GoTestProfiler {
- private readonly lastRunFor = new Map<string, Run>();
+ public readonly view = new ProfileTreeDataProvider(this);
+
+ // Maps test IDs to profile files. See docs/test-explorer.md for details.
+ private readonly runs = new Map<string, File[]>();
constructor(private readonly resolver: GoTestResolver, private readonly workspaceState: Memento) {}
@@ -24,27 +52,27 @@
this.workspaceState.update(optionsMemento, v);
}
- preRun(options: ProfilingOptions, items: TestItem[]): string[] {
+ preRun(options: ProfilingOptions, item: TestItem): string[] {
const kind = Kind.get(options.kind);
- if (!kind) {
- items.forEach((x) => this.lastRunFor.delete(x.id));
- return [];
- }
+ if (!kind) return [];
- const flags = [];
- const run = new Run(items, kind);
- flags.push(run.file.flag);
- items.forEach((x) => this.lastRunFor.set(x.id, run));
+ const run = new File(kind, item);
+ const flags = [...run.flags];
+ if (this.runs.has(item.id)) this.runs.get(item.id).unshift(run);
+ else this.runs.set(item.id, [run]);
return flags;
}
postRun() {
// Update the list of tests that have profiles.
- vscode.commands.executeCommand('setContext', 'go.profiledTests', Array.from(this.lastRunFor.keys()));
+ vscode.commands.executeCommand('setContext', 'go.profiledTests', Array.from(this.runs.keys()));
+ vscode.commands.executeCommand('setContext', 'go.hasProfiles', this.runs.size > 0);
+
+ this.view.fireDidChange();
}
hasProfileFor(id: string): boolean {
- return this.lastRunFor.has(id);
+ return this.runs.has(id);
}
async configure(): Promise<ProfilingOptions | undefined> {
@@ -61,21 +89,134 @@
};
}
- async showProfiles(item: TestItem) {
+ async delete(file: File) {
+ await file.delete();
+
+ const runs = this.runs.get(file.target.id);
+ if (!runs) return;
+
+ const i = runs.findIndex((x) => x === file);
+ if (i < 0) return;
+
+ runs.splice(i, 1);
+ if (runs.length === 0) {
+ this.runs.delete(file.target.id);
+ }
+ this.view.fireDidChange();
+ }
+
+ async show(item: TestItem) {
const { query: kind, fragment: name } = Uri.parse(item.id);
if (kind !== 'test' && kind !== 'benchmark' && kind !== 'example') {
await vscode.window.showErrorMessage('Selected item is not a test, benchmark, or example');
return;
}
- const run = this.lastRunFor.get(item.id);
- if (!run) {
- await vscode.window.showErrorMessage(`${name} was not profiled the last time it was run`);
+ const runs = this.runs.get(item.id);
+ if (!runs || runs.length === 0) {
+ await vscode.window.showErrorMessage(`${name} has not been profiled`);
return;
}
- await run.file.show();
+ await runs[0].show();
}
+
+ // Tests that have been profiled
+ get tests() {
+ const items = Array.from(this.runs.keys());
+ items.sort((a: string, b: string) => {
+ const aWhen = this.runs.get(a)[0].when.getTime();
+ const bWhen = this.runs.get(b)[0].when.getTime();
+ return bWhen - aWhen;
+ });
+
+ // Filter out any tests that no longer exist
+ return items.map((x) => this.resolver.all.get(x)).filter((x) => x);
+ }
+
+ // Profiles associated with the given test
+ get(item: TestItem) {
+ return this.runs.get(item.id) || [];
+ }
+}
+
+async function show(profile: string) {
+ const foundDot = await new Promise<boolean>((resolve, reject) => {
+ const proc = spawn(correctBinname('dot'), ['-V']);
+
+ proc.on('error', (err) => {
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
+ if ((err as any).code === 'ENOENT') resolve(false);
+ else reject(err);
+ });
+
+ proc.on('exit', (code, signal) => {
+ if (signal) reject(new Error(`Received signal ${signal}`));
+ else if (code) reject(new Error(`Exited with code ${code}`));
+ else resolve(true);
+ });
+ });
+ if (!foundDot) {
+ const r = await vscode.window.showErrorMessage(
+ 'Failed to execute dot. Is Graphviz installed?',
+ 'Open graphviz.org'
+ );
+ if (r) await vscode.env.openExternal(vscode.Uri.parse('https://graphviz.org/'));
+ return;
+ }
+
+ const proc = spawn(getBinPath('go'), ['tool', 'pprof', '-http=:', '-no_browser', profile]);
+ pprofProcesses.add(proc);
+
+ const port = await new Promise<string>((resolve, reject) => {
+ proc.on('error', (err) => {
+ pprofProcesses.delete(proc);
+ reject(err);
+ });
+
+ proc.on('exit', (code, signal) => {
+ pprofProcesses.delete(proc);
+ reject(signal || code);
+ });
+
+ let stderr = '';
+ function captureStdout(b: Buffer) {
+ stderr += b.toString('utf-8');
+
+ const m = stderr.match(/^Serving web UI on http:\/\/localhost:(?<port>\d+)\n/);
+ if (!m) return;
+
+ resolve(m.groups.port);
+ proc.stdout.off('data', captureStdout);
+ }
+
+ proc.stderr.on('data', captureStdout);
+ });
+
+ const panel = vscode.window.createWebviewPanel('go.profile', 'Profile', ViewColumn.Active);
+ panel.webview.options = { enableScripts: true };
+ panel.webview.html = `<html>
+ <head>
+ <style>
+ body {
+ padding: 0;
+ background: white;
+ overflow: hidden;
+ }
+
+ iframe {
+ border: 0;
+ width: 100%;
+ height: 100vh;
+ }
+ </style>
+ </head>
+ <body>
+ <iframe src="http://localhost:${port}"></iframe>
+ </body>
+ </html>`;
+
+ panel.onDidDispose(() => killProcessTree(proc));
}
class Kind {
@@ -103,34 +244,82 @@
static readonly Block = new Kind('block', 'Block', '--blockprofile');
}
-class Run {
+class File {
private static nextID = 0;
+ public readonly id = File.nextID++;
public readonly when = new Date();
- public readonly id = Run.nextID++;
- public readonly file: File;
- constructor(public readonly targets: TestItem[], kind: Kind) {
- this.file = new File(this, kind);
+ constructor(public readonly kind: Kind, public readonly target: TestItem) {}
+
+ async delete() {
+ return Promise.all(
+ [getTempFilePath(`${this.name}.prof`), getTempFilePath(`${this.name}.test`)].map((file) => fs.unlink(file))
+ );
}
-}
-class File {
- constructor(public readonly run: Run, public readonly kind: Kind) {}
+ get label() {
+ return `${this.kind.label} @ ${this.when.toTimeString()}`;
+ }
get name() {
- return `profile-${this.run.id}.${this.kind.id}.prof`;
+ return `profile-${this.id}.${this.kind.id}`;
}
- get flag(): string {
- return `${this.kind.flag}=${getTempFilePath(this.name)}`;
+ get flags(): string[] {
+ return [this.kind.flag, getTempFilePath(`${this.name}.prof`), '-o', getTempFilePath(`${this.name}.test`)];
}
- get uri(): Uri {
- return Uri.from({ scheme: 'go-tool-pprof', path: getTempFilePath(this.name) });
+ get uri() {
+ return Uri.file(getTempFilePath(`${this.name}.prof`));
}
async show() {
- await vscode.window.showTextDocument(this.uri);
+ await show(getTempFilePath(`${this.name}.prof`));
+ }
+}
+
+type TreeElement = TestItem | File;
+
+class ProfileTreeDataProvider implements TreeDataProvider<TreeElement> {
+ private readonly didChangeTreeData = new EventEmitter<void | TreeElement>();
+ public readonly onDidChangeTreeData = this.didChangeTreeData.event;
+
+ constructor(private readonly profiler: GoTestProfiler) {}
+
+ fireDidChange() {
+ this.didChangeTreeData.fire();
+ }
+
+ getTreeItem(element: TreeElement): TreeItem {
+ if (element instanceof File) {
+ const item = new TreeItem(element.label);
+ item.contextValue = 'go:test:file';
+ item.command = {
+ title: 'Open',
+ command: 'vscode.open',
+ arguments: [element.uri]
+ };
+ return item;
+ }
+
+ const item = new TreeItem(element.label, TreeItemCollapsibleState.Collapsed);
+ item.contextValue = 'go:test:test';
+ const options: TextDocumentShowOptions = {
+ preserveFocus: false,
+ selection: new Range(element.range.start, element.range.start)
+ };
+ item.command = {
+ title: 'Go to test',
+ command: 'vscode.open',
+ arguments: [element.uri, options]
+ };
+ return item;
+ }
+
+ getChildren(element?: TreeElement): TreeElement[] {
+ if (!element) return this.profiler.tests;
+ if (element instanceof File) return [];
+ return this.profiler.get(element);
}
}
diff --git a/src/goTest/resolve.ts b/src/goTest/resolve.ts
index ead2a47..444e333 100644
--- a/src/goTest/resolve.ts
+++ b/src/goTest/resolve.ts
@@ -37,6 +37,7 @@
}
export class GoTestResolver {
+ public readonly all = new Map<string, TestItem>();
public readonly isDynamicSubtest = new WeakSet<TestItem>();
public readonly isTestMethod = new WeakSet<TestItem>();
public readonly isTestSuiteFunc = new WeakSet<TestItem>();
@@ -50,6 +51,7 @@
ctrl.resolveHandler = async (item) => {
try {
await this.resolve(item);
+ this.updateGoTestContext();
} catch (error) {
if (isInTest()) throw error;
@@ -75,7 +77,7 @@
}
if (this.workspace.getWorkspaceFolder(item.uri)) {
- dispose(item);
+ dispose(this, item);
}
});
@@ -212,16 +214,24 @@
item.children.forEach((child) => {
const { name } = GoTest.parseId(child.id);
if (!seen.has(name)) {
- dispose(child);
+ dispose(this, child);
return;
}
if (ranges?.some((r) => !!child.range.intersection(r))) {
- item.children.forEach(dispose);
+ item.children.forEach((x) => dispose(this, x));
}
});
- disposeIfEmpty(item);
+ disposeIfEmpty(this, item);
+ }
+
+ public updateGoTestContext() {
+ const items = [];
+ for (const item of this.allItems) {
+ items.push(item.id);
+ }
+ vscode.commands.executeCommand('setContext', 'go.tests', items);
}
/* ***** Private ***** */
@@ -233,7 +243,10 @@
// Create an item.
private createItem(label: string, uri: Uri, kind: GoTestKind, name?: string): TestItem {
- return this.ctrl.createTestItem(GoTest.id(uri, kind, name), label, uri.with({ query: '', fragment: '' }));
+ const id = GoTest.id(uri, kind, name);
+ const item = this.ctrl.createTestItem(id, label, uri.with({ query: '', fragment: '' }));
+ this.all.set(id, item);
+ return item;
}
// Retrieve an item.
diff --git a/src/goTest/run.ts b/src/goTest/run.ts
index e9c2178..d2f1a17 100644
--- a/src/goTest/run.ts
+++ b/src/goTest/run.ts
@@ -4,6 +4,7 @@
*--------------------------------------------------------*/
import {
CancellationToken,
+ DebugSession,
Location,
OutputChannel,
Position,
@@ -20,10 +21,13 @@
import { outputChannel } from '../goStatus';
import { isModSupported } from '../goModules';
import { getGoConfig } from '../config';
-import { getTestFlags, goTest, GoTestOutput } from '../testUtils';
+import { getBenchmarkFunctions, getTestFlags, getTestFunctions, goTest, GoTestOutput } from '../testUtils';
import { GoTestResolver } from './resolve';
import { dispose, forEachAsync, GoTest, Workspace } from './utils';
import { GoTestProfiler, ProfilingOptions } from './profile';
+import { debugTestAtCursor } from '../goTest';
+
+let debugSessionID = 0;
type CollectedTest = { item: TestItem; explicitlyIncluded?: boolean };
@@ -90,6 +94,21 @@
true
);
+ ctrl.createRunProfile(
+ 'Go (Debug)',
+ TestRunProfileKind.Debug,
+ async (request, token) => {
+ try {
+ await this.debug(request, token);
+ } catch (error) {
+ const m = 'Failed to debug tests';
+ outputChannel.appendLine(`${m}: ${error}`);
+ await vscode.window.showErrorMessage(m);
+ }
+ },
+ true
+ );
+
const pprof = ctrl.createRunProfile(
'Go (Profile)',
TestRunProfileKind.Run,
@@ -112,6 +131,91 @@
};
}
+ async debug(request: TestRunRequest, token?: CancellationToken) {
+ if (!request.include) {
+ await vscode.window.showErrorMessage('The Go test explorer does not support debugging multiple tests');
+ return;
+ }
+
+ const collected = new Map<TestItem, CollectedTest[]>();
+ const files = new Set<TestItem>();
+ for (const item of request.include) {
+ await this.collectTests(item, true, request.exclude || [], collected, files);
+ }
+
+ const tests = Array.from(collected.values()).reduce((a, b) => a.concat(b), []);
+ if (tests.length > 1) {
+ await vscode.window.showErrorMessage('The Go test explorer does not support debugging multiple tests');
+ return;
+ }
+
+ const test = tests[0].item;
+ const { kind, name } = GoTest.parseId(test.id);
+ const doc = await vscode.workspace.openTextDocument(test.uri);
+ await doc.save();
+
+ const goConfig = getGoConfig(test.uri);
+ const getFunctions = kind === 'benchmark' ? getBenchmarkFunctions : getTestFunctions;
+ const testFunctions = await getFunctions(doc, token);
+
+ // TODO Can we get output from the debug session, in order to check for
+ // run/pass/fail events?
+
+ const id = `debug #${debugSessionID++} ${name}`;
+ const subs: vscode.Disposable[] = [];
+ const sessionPromise = new Promise<DebugSession>((resolve) => {
+ subs.push(
+ vscode.debug.onDidStartDebugSession((s) => {
+ if (s.configuration.sessionID === id) {
+ resolve(s);
+ subs.forEach((s) => s.dispose());
+ }
+ })
+ );
+
+ if (token) {
+ subs.push(
+ token.onCancellationRequested(() => {
+ resolve(null);
+ subs.forEach((s) => s.dispose());
+ })
+ );
+ }
+ });
+
+ const run = this.ctrl.createTestRun(request, `Debug ${name}`);
+ const started = await debugTestAtCursor(doc, name, testFunctions, goConfig, id);
+ if (!started) {
+ subs.forEach((s) => s.dispose());
+ run.end();
+ return;
+ }
+
+ const session = await sessionPromise;
+ if (!session) {
+ run.end();
+ return;
+ }
+
+ token.onCancellationRequested(() => vscode.debug.stopDebugging(session));
+
+ await new Promise<void>((resolve) => {
+ const sub = vscode.debug.onDidTerminateDebugSession(didTerminateSession);
+
+ token?.onCancellationRequested(() => {
+ resolve();
+ sub.dispose();
+ });
+
+ function didTerminateSession(s: DebugSession) {
+ if (s.id !== session.id) return;
+ resolve();
+ sub.dispose();
+ }
+ });
+ run.end();
+ }
+
// Execute tests - TestController.runTest callback
async run(request: TestRunRequest, token?: CancellationToken, options: ProfilingOptions = {}): Promise<boolean> {
const collected = new Map<TestItem, CollectedTest[]>();
@@ -151,8 +255,13 @@
return isInMod(item.parent);
}
- let success = true;
const run = this.ctrl.createTestRun(request);
+ const windowGoConfig = getGoConfig();
+ if (windowGoConfig.get<boolean>('testExplorer.showOutput')) {
+ await vscode.commands.executeCommand('testing.showMostRecentOutput');
+ }
+
+ let success = true;
const subItems: string[] = [];
for (const [pkg, items] of collected.entries()) {
const isMod = isInMod(pkg) || (await isModSupported(pkg.uri, true));
@@ -200,7 +309,7 @@
// Remove subtests created dynamically from test output
item.children.forEach((child) => {
if (this.resolver.isDynamicSubtest.has(child)) {
- dispose(child);
+ dispose(this.resolver, child);
}
});
@@ -327,15 +436,21 @@
}
private async runGoTest(config: RunConfig): Promise<boolean> {
- const { run, options, pkg, functions, record, concat, flags, ...rest } = config;
+ const { run, options, pkg, functions, record, concat, ...rest } = config;
if (Object.keys(functions).length === 0) return true;
+ if (options.kind) {
+ if (Object.keys(functions).length > 1) {
+ throw new Error('Profiling more than one test at once is unsupported');
+ }
+ rest.flags.push(...this.profiler.preRun(options, Object.values(functions)[0]));
+ }
+
const complete = new Set<TestItem>();
const outputChannel = new TestRunOutput(run);
const success = await goTest({
...rest,
- flags: [...flags, ...this.profiler.preRun(options, Object.values(functions))],
outputChannel,
dir: pkg.uri.fsPath,
functions: Object.keys(functions),
diff --git a/src/goTest/utils.ts b/src/goTest/utils.ts
index 4d81422..9cc92c4 100644
--- a/src/goTest/utils.ts
+++ b/src/goTest/utils.ts
@@ -3,6 +3,7 @@
* Licensed under the MIT License. See LICENSE in the project root for license information.
*--------------------------------------------------------*/
import * as vscode from 'vscode';
+import { GoTestResolver } from './resolve';
// GoTestKind indicates the Go construct represented by a test item.
//
@@ -91,13 +92,14 @@
return Promise.all(promises);
}
-export function dispose(item: vscode.TestItem) {
+export function dispose(resolver: GoTestResolver, item: vscode.TestItem) {
+ resolver.all.delete(item.id);
item.parent.children.delete(item.id);
}
// Dispose of the item if it has no children, recursively. This facilitates
// cleaning up package/file trees that contain no tests.
-export function disposeIfEmpty(item: vscode.TestItem) {
+export function disposeIfEmpty(resolver: GoTestResolver, item: vscode.TestItem) {
// Don't dispose of empty top-level items
const { kind } = GoTest.parseId(item.id);
if (kind === 'module' || kind === 'workspace' || (kind === 'package' && !item.parent)) {
@@ -108,6 +110,6 @@
return;
}
- dispose(item);
- disposeIfEmpty(item.parent);
+ dispose(resolver, item);
+ disposeIfEmpty(resolver, item.parent);
}
diff --git a/src/goToolPprof.ts b/src/goToolPprof.ts
deleted file mode 100644
index d947006..0000000
--- a/src/goToolPprof.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-/*---------------------------------------------------------
- * Copyright 2021 The Go Authors. All rights reserved.
- * Licensed under the MIT License. See LICENSE in the project root for license information.
- *--------------------------------------------------------*/
-import { execFile } from 'child_process';
-import { window, CancellationToken, TextDocumentContentProvider, Uri } from 'vscode';
-import { outputChannel } from './goStatus';
-import { getBinPath } from './util';
-
-export class ProfileDocumentContentProvider implements TextDocumentContentProvider {
- provideTextDocumentContent(uri: Uri, token: CancellationToken): Promise<string | undefined> {
- return this.pprof(uri, token);
- }
-
- private pprof(uri: Uri, token: CancellationToken) {
- const goBin = getBinPath('go');
- return new Promise<string | undefined>((resolve) => {
- const cp = execFile(goBin, ['tool', 'pprof', '-tree', uri.fsPath], async (err, stdout, stderr) => {
- if (err || stderr) {
- const m = 'Failed to execute `go tool pprof`';
- if (err) outputChannel.appendLine(`${m}: ${err}`);
- else outputChannel.append(`${m}:\n${stderr}`);
- outputChannel.show();
- await window.showErrorMessage(m);
- resolve(void 0);
- } else {
- resolve(stdout);
- }
- });
-
- token?.onCancellationRequested(() => cp.kill());
- });
- }
-}
diff --git a/src/goTools.ts b/src/goTools.ts
index cb68bd0..d6eba5a 100644
--- a/src/goTools.ts
+++ b/src/goTools.ts
@@ -86,7 +86,7 @@
return importPath + '@' + version;
}
}
- return importPath;
+ return importPath + '@latest';
}
export function containsTool(tools: Tool[], tool: Tool): boolean {
diff --git a/test/gopls/survey.test.ts b/test/gopls/survey.test.ts
index 3a32954..652bb37 100644
--- a/test/gopls/survey.test.ts
+++ b/test/gopls/survey.test.ts
@@ -8,11 +8,12 @@
import vscode = require('vscode');
import goLanguageServer = require('../../src/goLanguageServer');
import goSurvey = require('../../src/goSurvey');
+import goDeveloperSurvey = require('../../src/goDeveloperSurvey');
suite('gopls survey tests', () => {
test('prompt for survey', () => {
// global state -> offer survey
- const testCases: [goSurvey.SurveyConfig, boolean][] = [
+ const testCases: [goSurvey.GoplsSurveyConfig, boolean][] = [
// User who is activating the extension for the first time.
[{}, true],
// User who has already taken the survey.
@@ -65,7 +66,7 @@
]
];
testCases.map(([testConfig, wantPrompt], i) => {
- // Replace Math.Random so that it always returns 1. This means
+ // Replace Math.Random so that it always returns 0. This means
// that we will always choose to prompt, in the event that the
// user can be prompted that month.
sinon.replace(Math, 'random', () => 0);
@@ -82,6 +83,109 @@
});
});
+suite('developer survey tests', () => {
+ test('inRange', () => {
+ // start, end, date => inRange
+ const testCases: [Date, Date, Date, boolean][] = [
+ [new Date('2021-09-01'), new Date('2021-11-10'), new Date('2021-10-31'), true],
+ [new Date('2021-09-01'), new Date('2021-11-10'), new Date('2020-10-31'), false],
+ [new Date('2021-09-01'), new Date('2021-11-10'), new Date('2022-10-31'), false]
+ ];
+ testCases.map(([start, end, date, want]) => {
+ const got = goDeveloperSurvey.inDateRange(start, end, date);
+ assert.equal(got, want, `expected inRange(${start}, ${end}, ${date} = ${want}, got: ${got})`);
+ });
+ });
+
+ test('prompt for survey', () => {
+ // global state -> offer survey
+ const testCases: [goDeveloperSurvey.DeveloperSurveyConfig, boolean][] = [
+ // User who is activating the extension for the first time.
+ [{}, true],
+ // User who has already taken the survey.
+ [
+ {
+ lastDateAccepted: new Date('2020-04-02'),
+ datePromptComputed: new Date('2020-04-02'),
+ lastDatePrompted: new Date('2020-04-02'),
+ prompt: true
+ },
+ undefined
+ ],
+ // User who has declined survey prompting.
+ [
+ {
+ datePromptComputed: new Date('2020-04-10'),
+ lastDatePrompted: new Date('2020-04-02'),
+ prompt: false
+ },
+ undefined
+ ],
+ // User who has opted into prompting, but hasn't opened the
+ // extension in a while.
+ [
+ {
+ datePromptComputed: new Date('2019-04-10'),
+ lastDatePrompted: new Date('2019-04-10'),
+ prompt: true
+ },
+ true
+ ],
+ // User who has opted into prompting, but has been prompted < 5
+ // days ago.
+ [
+ {
+ datePromptComputed: new Date('2019-04-27'),
+ lastDatePrompted: new Date('2019-04-28'),
+ prompt: true
+ },
+ true
+ ],
+ // User accepted the survey a year ago.
+ [
+ {
+ datePromptComputed: new Date('2018-04-27'),
+ lastDatePrompted: new Date('2018-04-28'),
+ prompt: true,
+ lastDateAccepted: new Date('2018-04-28')
+ },
+ true
+ ],
+ // User declined the survey a year ago.
+ [
+ {
+ datePromptComputed: new Date('2018-04-27'),
+ lastDatePrompted: new Date('2018-04-28'),
+ prompt: false
+ },
+ true
+ ]
+ ];
+ testCases.map(([testConfig, wantPrompt], i) => {
+ // Replace Math.Random so that it always returns a value less than
+ // 0.2. This means that we will always choose to prompt, in the
+ // event that the user can be prompted that month.
+ sinon.replace(Math, 'random', () => 0);
+
+ sinon.replace(goDeveloperSurvey, 'startDate', new Date('2020-03-10'));
+ sinon.replace(goDeveloperSurvey, 'endDate', new Date('2020-07-10'));
+
+ const now = new Date('2020-04-29');
+ const gotPrompt = goDeveloperSurvey.shouldPromptForSurvey(now, testConfig);
+ if (wantPrompt) {
+ assert.ok(gotPrompt, `prompt determination failed for ${i}: expected ${wantPrompt}, got ${gotPrompt}`);
+ } else {
+ assert.equal(
+ gotPrompt,
+ wantPrompt,
+ `prompt determination failed for ${i}: expected undefined, got ${gotPrompt}`
+ );
+ }
+ sinon.restore();
+ });
+ });
+});
+
suite('gopls opt out', () => {
let sandbox: sinon.SinonSandbox;
diff --git a/test/integration/goDebug.test.ts b/test/integration/goDebug.test.ts
index 8ebb288..aa66322 100644
--- a/test/integration/goDebug.test.ts
+++ b/test/integration/goDebug.test.ts
@@ -26,12 +26,11 @@
RemoteSourcesAndPackages
} from '../../src/debugAdapter/goDebug';
import * as extConfig from '../../src/config';
-import { GoDebugConfigurationProvider } from '../../src/goDebugConfiguration';
+import { GoDebugConfigurationProvider, parseDebugProgramArgSync } from '../../src/goDebugConfiguration';
import { getBinPath, rmdirRecursive } from '../../src/util';
import { killProcessTree } from '../../src/utils/processUtils';
import getPort = require('get-port');
import util = require('util');
-import { parseProgramArgSync } from '../../src/goDebugFactory';
import { TimestampedLogger } from '../../src/goLogging';
// For debugging test and streaming the trace instead of buffering, set this.
@@ -1145,11 +1144,7 @@
await new Promise((resolve) => setTimeout(resolve, 2_000));
});
- test('should set breakpoints during continue (legacy)', async function () {
- if (isDlvDap) {
- this.skip(); // not working in dlv-dap.
- }
-
+ test('should set breakpoints during continue', async () => {
const PROGRAM = path.join(DATA_ROOT, 'sleep');
const FILE = path.join(DATA_ROOT, 'sleep', 'sleep.go');
@@ -1176,7 +1171,7 @@
]);
});
- async function setBreakpointsWhileRunning(resumeFunc: () => void) {
+ async function setBreakpointsWhileRunningStep(resumeFunc: () => Promise<void>) {
const PROGRAM = path.join(DATA_ROOT, 'sleep');
const FILE = path.join(DATA_ROOT, 'sleep', 'sleep.go');
@@ -1198,18 +1193,16 @@
// The program is now stopped at the line containing time.Sleep().
// Issue a next request, followed by a setBreakpointsRequest.
- resumeFunc();
+ await resumeFunc();
- // Note: the current behavior of setting a breakpoint during a next
- // request will cause the step to be interrupted, so it may not be
- // stopped on the next line.
+ // Assert that the program completes the step request.
await Promise.all([
dc.setBreakpointsRequest({
lines: [resumeBreakpoint.line],
breakpoints: [{ line: resumeBreakpoint.line, column: 0 }],
source: { path: resumeBreakpoint.path }
}),
- dc.assertStoppedLocation('pause', {})
+ dc.assertStoppedLocation('step', {})
]);
// Once the 'step' has completed, continue the program and
@@ -1221,21 +1214,11 @@
]);
}
- test('should set breakpoints during continue', async function () {
- if (!isDlvDap) {
- this.skip();
- }
- await setBreakpointsWhileRunning(async () => {
- const nextResponse = await dc.continueRequest({ threadId: 1 });
- assert.ok(nextResponse.success);
- });
- });
-
test('should set breakpoints during next', async function () {
if (!isDlvDap) {
this.skip();
}
- await setBreakpointsWhileRunning(async () => {
+ await setBreakpointsWhileRunningStep(async () => {
const nextResponse = await dc.nextRequest({ threadId: 1 });
assert.ok(nextResponse.success);
});
@@ -1246,7 +1229,9 @@
this.skip();
}
- await setBreakpointsWhileRunning(async () => {
+ await setBreakpointsWhileRunningStep(async () => {
+ await Promise.all([dc.stepInRequest({ threadId: 1 }), dc.assertStoppedLocation('step', {})]);
+
const stepOutResponse = await dc.stepOutRequest({ threadId: 1 });
assert.ok(stepOutResponse.success);
});
@@ -2207,8 +2192,8 @@
// that the second test could build the binary, and then the
// first test could delete that binary during cleanup before the
// second test has a chance to run it.
- if (!config['output'] && config['mode'] !== 'remote') {
- const dir = parseProgramArgSync(config).dirname;
+ if (!config['output'] && ['debug', 'auto', 'test'].includes(config['mode'])) {
+ const dir = parseDebugProgramArgSync(config['program']).dirname;
config['output'] = path.join(dir, `__debug_bin_${testNumber}`);
}
testNumber++;
diff --git a/test/integration/goDebugConfiguration.test.ts b/test/integration/goDebugConfiguration.test.ts
index 7e3b4f9..d874546 100644
--- a/test/integration/goDebugConfiguration.test.ts
+++ b/test/integration/goDebugConfiguration.test.ts
@@ -14,16 +14,17 @@
import goEnv = require('../../src/goEnv');
import { isInPreviewMode } from '../../src/goLanguageServer';
import { MockCfg } from '../mocks/MockCfg';
+import { fileURLToPath } from 'url';
suite('Debug Environment Variable Merge Test', () => {
const debugConfigProvider = new GoDebugConfigurationProvider();
+ // Set up the test fixtures.
+ const fixtureSourcePath = path.join(__dirname, '..', '..', '..', 'test', 'testdata');
+ const filePath = path.join(fixtureSourcePath, 'baseTest', 'test.go');
+
suiteSetup(async () => {
await updateGoVarsFromConfig();
-
- // Set up the test fixtures.
- const fixtureSourcePath = path.join(__dirname, '..', '..', '..', 'test', 'testdata');
- const filePath = path.join(fixtureSourcePath, 'baseTest', 'test.go');
await vscode.workspace.openTextDocument(vscode.Uri.file(filePath));
});
@@ -59,7 +60,8 @@
request: 'launch',
env: input.env,
envFile: input.envFile,
- debugAdapter: input.debugAdapter
+ debugAdapter: input.debugAdapter,
+ program: filePath
});
const actual = config.env;
@@ -280,7 +282,10 @@
apiVersion: 1,
showGlobalVariables: true,
debugAdapter: 'dlv-dap',
- substitutePath: [{ from: 'hello', to: 'goodbye' }]
+ substitutePath: [{ from: 'hello', to: 'goodbye' }],
+ showLog: true,
+ logOutput: 'dap,debugger',
+ dlvFlags: ['--check-go-version=false']
}
});
sinon.stub(config, 'getGoConfig').returns(goConfig);
@@ -300,12 +305,11 @@
assert.strictEqual(result.substitutePath.length, 1);
assert.strictEqual(result.substitutePath[0].from, 'hello');
assert.strictEqual(result.substitutePath[0].to, 'goodbye');
+ assert.strictEqual(result.showLog, true);
+ assert.strictEqual(result.logOutput, 'dap,debugger');
+ assert.deepStrictEqual(result.dlvFlags, ['--check-go-version=false']);
const dlvLoadConfig = result.dlvLoadConfig;
- assert.strictEqual(dlvLoadConfig.followPointers, false);
- assert.strictEqual(dlvLoadConfig.maxVariableRecurse, 3);
- assert.strictEqual(dlvLoadConfig.maxStringLen, 32);
- assert.strictEqual(dlvLoadConfig.maxArrayValues, 32);
- assert.strictEqual(dlvLoadConfig.maxStructFields, 5);
+ assert.strictEqual(dlvLoadConfig, undefined); // dlvLoadConfig does not apply in dlv-dap mode.
});
test('delve config in settings.json is overriden by launch.json', async () => {
@@ -337,8 +341,8 @@
request: 'launch',
mode: 'auto',
program: '${fileDirname}',
- apiVersion: 2,
showGlobalVariables: false,
+ apiVersion: 2,
dlvLoadConfig: {
followPointers: true,
maxVariableRecurse: 6,
@@ -347,7 +351,8 @@
maxStructFields: -1
},
debugAdapter: 'legacy',
- substitutePath: []
+ substitutePath: [],
+ logOutput: 'rpc'
};
const result = await debugConfigProvider.resolveDebugConfiguration(undefined, cfg);
@@ -355,6 +360,8 @@
assert.strictEqual(result.showGlobalVariables, false);
assert.strictEqual(result.debugAdapter, 'legacy');
assert.strictEqual(result.substitutePath.length, 0);
+ assert.strictEqual(result.showLog, undefined);
+ assert.strictEqual(result.logOutput, 'rpc');
const dlvLoadConfig = result.dlvLoadConfig;
assert.strictEqual(dlvLoadConfig.followPointers, true);
assert.strictEqual(dlvLoadConfig.maxVariableRecurse, 6);
@@ -492,9 +499,106 @@
});
});
+function writeEmptyFile(filename: string) {
+ const dir = path.dirname(filename);
+ if (!fs.existsSync(dir)) {
+ createDirRecursively(dir);
+ }
+ try {
+ fs.writeFileSync(filename, '');
+ } catch (e) {
+ console.log(`failed to write a file: ${e}`);
+ }
+}
+
+function createDirRecursively(dir: string) {
+ try {
+ fs.mkdirSync(dir, { recursive: true });
+ } catch (e) {
+ console.log(`failed to create directory: ${e}`);
+ }
+}
+
+suite('Debug Configuration With Invalid Program', () => {
+ const debugConfigProvider = new GoDebugConfigurationProvider();
+
+ let workspaceDir = '';
+ setup(() => {
+ workspaceDir = fs.mkdtempSync(path.join(os.tmpdir(), 'godebugrelpath_test'));
+ });
+
+ teardown(() => {
+ rmdirRecursive(workspaceDir);
+ });
+
+ function debugConfig(adapter: string) {
+ return {
+ name: 'Launch',
+ type: 'go',
+ request: 'launch',
+ mode: 'auto',
+ debugAdapter: adapter,
+ program: path.join('foo', 'bar.go'),
+ cwd: '.',
+ output: 'debug'
+ };
+ }
+
+ test('empty, undefined program is an error', () => {
+ const config = debugConfig('dlv-dap');
+ config.program = '';
+
+ const workspaceFolder = {
+ uri: vscode.Uri.file(workspaceDir),
+ name: 'test',
+ index: 0
+ };
+ assert.throws(() => {
+ debugConfigProvider.resolveDebugConfigurationWithSubstitutedVariables(workspaceFolder, config);
+ }, /The program attribute is missing/);
+ });
+
+ test('non-existing file/directory is an error', () => {
+ const config = debugConfig('dlv-dap');
+ config.program = '/notexists';
+
+ const workspaceFolder = {
+ uri: vscode.Uri.file(workspaceDir),
+ name: 'test',
+ index: 0
+ };
+ assert.throws(() => {
+ debugConfigProvider.resolveDebugConfigurationWithSubstitutedVariables(workspaceFolder, config);
+ }, /The program attribute.* must be a valid directory or .go file/);
+ });
+
+ test('files other than .go file with debug/test/auto mode is an error', () => {
+ writeEmptyFile(path.join(workspaceDir, 'foo', 'bar.test'));
+ const config = debugConfig('dlv-dap');
+ config.program = path.join(workspaceDir, 'foo', 'bar.test');
+ const workspaceFolder = {
+ uri: vscode.Uri.file(workspaceDir),
+ name: 'test',
+ index: 0
+ };
+ assert.throws(() => {
+ debugConfigProvider.resolveDebugConfigurationWithSubstitutedVariables(workspaceFolder, config);
+ }, /The program attribute.* must be a valid directory or .go file/);
+ });
+});
+
suite('Debug Configuration Converts Relative Paths', () => {
const debugConfigProvider = new GoDebugConfigurationProvider();
+ let workspaceDir = '';
+ setup(() => {
+ workspaceDir = fs.mkdtempSync(path.join(os.tmpdir(), 'godebugrelpath_test'));
+ });
+
+ teardown(() => {
+ rmdirRecursive(workspaceDir);
+ });
+
function debugConfig(adapter: string) {
return {
name: 'Launch',
@@ -509,11 +613,14 @@
}
test('resolve relative paths with workspace root in dlv-dap mode, exec mode does not set __buildDir', () => {
+ writeEmptyFile(path.join(workspaceDir, 'foo', 'bar.exe'));
+
const config = debugConfig('dlv-dap');
config.mode = 'exec';
config.program = path.join('foo', 'bar.exe');
+
const workspaceFolder = {
- uri: vscode.Uri.file(os.tmpdir()),
+ uri: vscode.Uri.file(workspaceDir),
name: 'test',
index: 0
};
@@ -524,18 +631,20 @@
assert.deepStrictEqual(
{ program, cwd, __buildDir },
{
- program: path.join(os.tmpdir(), 'foo', 'bar.exe'),
- cwd: os.tmpdir(),
+ program: path.join(workspaceDir, 'foo', 'bar.exe'),
+ cwd: workspaceDir,
__buildDir: undefined
}
);
});
test('program and __buildDir are updated while resolving debug configuration in dlv-dap mode', () => {
+ createDirRecursively(path.join(workspaceDir, 'foo', 'bar', 'pkg'));
+
const config = debugConfig('dlv-dap');
config.program = path.join('foo', 'bar', 'pkg');
const workspaceFolder = {
- uri: vscode.Uri.file(os.tmpdir()),
+ uri: vscode.Uri.file(workspaceDir),
name: 'test',
index: 0
};
@@ -549,19 +658,21 @@
{ program, cwd, output, __buildDir },
{
program: '.',
- cwd: os.tmpdir(),
- output: path.join(os.tmpdir(), 'debug'),
- __buildDir: path.join(os.tmpdir(), 'foo', 'bar', 'pkg')
+ cwd: workspaceDir,
+ output: path.join(workspaceDir, 'debug'),
+ __buildDir: path.join(workspaceDir, 'foo', 'bar', 'pkg')
}
);
});
test('program and __buildDir are not updated when working with externally launched adapters', () => {
+ createDirRecursively(path.join(workspaceDir, 'foo', 'bar', 'pkg'));
+
const config: vscode.DebugConfiguration = debugConfig('dlv-dap');
config.program = path.join('foo', 'bar', 'pkg');
config.port = 12345;
const workspaceFolder = {
- uri: vscode.Uri.file(os.tmpdir()),
+ uri: vscode.Uri.file(workspaceDir),
name: 'test',
index: 0
};
@@ -572,19 +683,21 @@
assert.deepStrictEqual(
{ program, cwd, __buildDir },
{
- program: path.join(os.tmpdir(), 'foo', 'bar', 'pkg'),
- cwd: os.tmpdir(),
+ program: path.join(workspaceDir, 'foo', 'bar', 'pkg'),
+ cwd: workspaceDir,
__buildDir: undefined
}
);
});
test('program and __buildDir are not updated when working with externally launched adapters (debugServer)', () => {
+ createDirRecursively(path.join(workspaceDir, 'foo', 'bar', 'pkg'));
+
const config: vscode.DebugConfiguration = debugConfig('dlv-dap');
config.program = path.join('foo', 'bar', 'pkg');
config.debugServer = 4777;
const workspaceFolder = {
- uri: vscode.Uri.file(os.tmpdir()),
+ uri: vscode.Uri.file(workspaceDir),
name: 'test',
index: 0
};
@@ -595,40 +708,70 @@
assert.deepStrictEqual(
{ program, cwd, __buildDir },
{
- program: path.join(os.tmpdir(), 'foo', 'bar', 'pkg'),
- cwd: os.tmpdir(),
+ program: path.join(workspaceDir, 'foo', 'bar', 'pkg'),
+ cwd: workspaceDir,
__buildDir: undefined
}
);
});
- test('empty, undefined paths are not affected', () => {
- const config = debugConfig('dlv-dap');
- config.program = undefined;
- config.cwd = '';
- delete config.output;
+ test('directory as program still works when directory name contains .', () => {
+ createDirRecursively(path.join(workspaceDir, 'foo.test'));
+ const config: vscode.DebugConfiguration = debugConfig('dlv-dap');
+ config.program = 'foo.test';
const workspaceFolder = {
- uri: vscode.Uri.file(os.tmpdir()),
+ uri: vscode.Uri.file(workspaceDir),
name: 'test',
index: 0
};
- const { program, cwd, output } = debugConfigProvider.resolveDebugConfigurationWithSubstitutedVariables(
+ const { program, cwd, __buildDir } = debugConfigProvider.resolveDebugConfigurationWithSubstitutedVariables(
workspaceFolder,
config
);
assert.deepStrictEqual(
- { program, cwd, output },
+ { program, cwd, __buildDir },
{
- program: undefined,
+ program: '.',
+ cwd: workspaceDir,
+ __buildDir: path.join(workspaceDir, 'foo.test')
+ }
+ );
+ });
+
+ test('empty, undefined paths are not affected', () => {
+ writeEmptyFile(path.join(workspaceDir, 'bar_test.go'));
+
+ const config = debugConfig('dlv-dap');
+ config.program = 'bar_test.go';
+ config.cwd = '';
+ delete config.output;
+
+ const workspaceFolder = {
+ uri: vscode.Uri.file(workspaceDir),
+ name: 'test',
+ index: 0
+ };
+ const {
+ program,
+ cwd,
+ output,
+ __buildDir
+ } = debugConfigProvider.resolveDebugConfigurationWithSubstitutedVariables(workspaceFolder, config);
+ assert.deepStrictEqual(
+ { program, cwd, output, __buildDir },
+ {
+ program: '.' + path.sep + 'bar_test.go',
cwd: '',
- output: undefined
+ output: undefined,
+ __buildDir: workspaceDir
}
);
});
test('relative paths with no workspace root are not expanded', () => {
const config = debugConfig('dlv-dap');
+ config.program = '.'; // the program must be a valid directory or .go file.
const {
program,
cwd,
@@ -638,18 +781,20 @@
assert.deepStrictEqual(
{ program, cwd, output, __buildDir },
{
- program: '.' + path.sep + 'bar.go',
+ program: '.',
cwd: '.',
output: 'debug',
- __buildDir: 'foo'
+ __buildDir: '.'
}
);
});
test('do not affect relative paths (workspace) in legacy mode', () => {
+ writeEmptyFile(path.join(workspaceDir, 'foo', 'bar.go'));
+
const config = debugConfig('legacy');
const workspaceFolder = {
- uri: vscode.Uri.file(os.tmpdir()),
+ uri: vscode.Uri.file(workspaceDir),
name: 'test',
index: 0
};
@@ -669,6 +814,7 @@
test('do not affect relative paths (no workspace) in legacy mode', () => {
const config = debugConfig('legacy');
+ config.program = '.'; // program must be a valid directory or .go file.
const { program, cwd, output } = debugConfigProvider.resolveDebugConfigurationWithSubstitutedVariables(
undefined,
config
@@ -676,7 +822,7 @@
assert.deepStrictEqual(
{ program, cwd, output },
{
- program: path.join('foo', 'bar.go'),
+ program: '.',
cwd: '.',
output: 'debug'
}
diff --git a/test/integration/goTest.run.test.ts b/test/integration/goTest.run.test.ts
index 5db5448..76f3d84 100644
--- a/test/integration/goTest.run.test.ts
+++ b/test/integration/goTest.run.test.ts
@@ -56,7 +56,7 @@
'Failed to execute `go test`'
);
assert.strictEqual(stub.callCount, 1, 'expected one call to goTest');
- assert(stub.lastCall.args[0].flags.some((x) => x.startsWith('--cpuprofile=')));
+ assert(stub.lastCall.args[0].flags.some((x) => x === '--cpuprofile'));
assert(testExplorer.profiler.hasProfileFor(test.id), 'Did not create profile for test');
});
@@ -76,10 +76,13 @@
const tests = Array.from(testExplorer.resolver.allItems).filter((x) => GoTest.parseId(x.id).name);
assert(tests, 'No tests found');
+ console.log(`running ${tests.length} tests`);
+
assert(
await testExplorer.runner.run({ include: tests }, null, { kind: 'cpu' }),
'Failed to execute `go test`'
);
+ console.log('verify we got expected calls');
const calls = await stub.getCalls();
assert.strictEqual(calls.length, tests.length, 'expected one call to goTest per test');
calls.forEach((call, i) =>
@@ -114,6 +117,7 @@
});
test('discover and run', async () => {
+ console.log('discover and run');
// Locate TestMain and TestOther
const tests = testExplorer.resolver.find(uri).filter((x) => GoTest.parseId(x.id).kind === 'test');
tests.sort((a, b) => a.label.localeCompare(b.label));
@@ -124,33 +128,40 @@
const [tMain, tOther] = tests;
// Run TestMain
+ console.log('Run TestMain');
assert(await testExplorer.runner.run({ include: [tMain] }), 'Failed to execute `go test`');
assert.strictEqual(spy.callCount, 1, 'expected one call to goTest');
// Verify TestMain was run
+ console.log('Verify TestMain was run');
let call = spy.lastCall.args[0];
assert.strictEqual(call.dir, subTestDir);
assert.deepStrictEqual(call.functions, ['TestMain']);
spy.resetHistory();
// Locate subtest
+ console.log('Locate subtest');
const tSub = tMain.children.get(GoTest.id(uri, 'test', 'TestMain/Sub'));
assert(tSub, 'Subtest was not created');
// Run subtest by itself
+ console.log('Run subtest by itself');
assert(await testExplorer.runner.run({ include: [tSub] }), 'Failed to execute `go test`');
assert.strictEqual(spy.callCount, 1, 'expected one call to goTest');
// Verify TestMain/Sub was run
+ console.log('Verify TestMain/Sub was run');
call = spy.lastCall.args[0];
assert.strictEqual(call.dir, subTestDir);
assert.deepStrictEqual(call.functions, ['TestMain/Sub']);
spy.resetHistory();
// Ensure the subtest hasn't been disposed
+ console.log('Ensure the subtest has not been disposed');
assert(tSub.parent, 'Subtest was disposed');
// Attempt to run subtest and other test - should not work
+ console.log('Attempt to run subtest and other test');
assert(await testExplorer.runner.run({ include: [tSub, tOther] }), 'Failed to execute `go test`');
assert.strictEqual(spy.callCount, 0, 'expected no calls to goTest');
});
